Merge branch 'master' of https://github.com/Jaksuhn/SomethingNeedDoing

Community Scripts/AutoRetainer Companions/RobustGCturnin/RobustGCTurnIn_McVaxius.lua

@@ -33,6 +33,7 @@ local process_fc_buffs = 1
 local process_players = 1
 
 
+yield("/ays multi d")
 --some ideas for next version
 --deliveroo config suggestion: add some seals. and we can have a seal 0 or 1 option in settings
 --add instructions for how to use this script
@@ -70,6 +71,7 @@ function Final_GC_Cleaning()
 	--yield("/automove on")
 	--yield("/wait 1")
 
+	visland_stop_moving() --just in case we want to auto equip rq before dumping gear
 	--deliveroo i choose you
 	yield("/deliveroo enable")
 	yield("/wait 1")
@@ -177,5 +179,5 @@ if process_players == 1 then
 	end
 end
 --last one out turn off the lights
-yield("/ays multi")
+yield("/ays multi e")
 yield("/pcraft stop")

Community Scripts/AutoRetainer Companions/RobustGCturnin/_functions.lua

@@ -2,7 +2,9 @@ function WalkTo(x, y, z)
     PathfindAndMoveTo(x, y, z, false)
     while (PathIsRunning() or PathfindInProgress()) do
         yield("/wait 0.5")
-        yield("/gaction jump")
+		if GetZoneID() == 130 then
+			yield("/gaction jump")
+		end
     end
 end
 
@@ -63,5 +65,6 @@ function visland_stop_moving()
  end
  yield("/echo movement stopped - time for GC turn ins or whatever")
  yield("/visland stop")
+ yield("/vnavmesh stop")
  yield("/wait 3")
 end

Community Scripts/AutoRetainer Companions/RobustGCturnin/turninDOLandPromote_McVaxius.lua

@@ -0,0 +1,70 @@
+--so this will go to your GC desk try a single DOL turn in, then try to run a promotion. then teleport back to FC Estate.
+--this is meant to be used from where ever you are after you acquire the daily DOL item
+
+--borrowed some code and ideas from the wonderful:  (make sure the _functions is in the snd folder)
+--https://github.com/elijabesu/ffxiv-scripts/blob/main/snd/_functions.lua
+loadfiyel = os.getenv("appdata").."\\XIVLauncher\\pluginConfigs\\SomethingNeedDoing\\_functions.lua"
+functionsToLoad = loadfile(loadfiyel)
+functionsToLoad()
+DidWeLoadcorrectly()
+
+yield("/wait 2")
+CharacterSafeWait()
+yield("/echo Attempting to turn in DOL turnin item")
+TeleportToGCTown()
+ZoneTransition()
+WalkToGC()
+
+ yield("/echo movement stopped - time for GC turn ins")
+--yield("<wait.15>")
+--yield("/waitaddon SelectString <maxwait.120>")
+ yield("/visland stop")
+yield("/wait 1")
+yield("/target Personnel Officer")
+yield("/wait 1")
+yield("/send NUMPAD0")
+yield("/pcall SelectString true 0 <wait.1>")
+yield("/send NUMPAD0")
+yield("/wait 1")
+yield("/send NUMPAD0")
+yield("/wait 1")
+yield("/pcall GrandCompanySupplyList true 0 1 2")
+yield("/wait 1")
+yield("/send NUMPAD0")
+yield("/wait 1")
+yield("/send NUMPAD0")
+yield("/wait 1")
+yield("/send ESCAPE <wait.1.5>")
+yield("/send ESCAPE <wait.1.5>")
+yield("/wait 3")
+
+--try to promote
+yield("/wait 1")
+yield("/target Personnel Officer")
+yield("/wait 1")
+yield("/send NUMPAD0")
+yield("/wait 1")
+yield("/send NUMPAD2")
+yield("/wait 0.5")
+yield("/send NUMPAD0")
+yield("/wait 0.5")
+yield("/send NUMPAD0")
+yield("/send ESCAPE <wait.1.5>")
+yield("/send ESCAPE <wait.1.5>")
+yield("/wait 3")
+
+
+-- Teleport back to FC House
+yield("/tp Estate Hall <wait.10>")
+yield("/waitaddon _ActionBar <maxwait.600><wait.5>")
+for i=1, 20 do
+  yield("/send W")
+end
+
+yield("/send Right")
+yield("/send Right")
+
+yield("/target Entrance <wait.1>")
+yield("/lockon on")
+yield("/automove on <wait.2.5>")
+yield("/automove off <wait.1.5>")

Community Scripts/Dungeons/arbitrary duty solver/arbitraryduty_McVaxius.ini

@@ -36,7 +36,7 @@ local repeat_trial = 5
 local repeat_type = 0
 --**Info**
 --How is the party formed?
---0 is premade, 1 is trust, 2 is Grand Company Squadrons (not implemented yet. need some pcalls probably)
+--0 is premade, 1 is trust, 2 is Grand Company Squadrons
 --for premade/unsync and for trust, open the respective windows and preselect the duty you want to farm
 
 

Community Scripts/Dungeons/arbitrary duty solver/arbitraryduty_McVaxius.lua

@@ -482,7 +482,7 @@ local function searchNearestWP()
 			local tempsearchdist = 9000
 			local tempstoredist = 0
 			for i=2, #doodies do
-				tempstoredist = distance(GetPlayerRawXPos,GetObjectRawYPos,GetObjectRawZPos,doodies[i][2],doodies[i][3],doodies[i][4])
+				tempstoredist = distance(GetPlayerRawXPos(),GetObjectRawYPos(),GetObjectRawZPos(),doodies[i][2],doodies[i][3],doodies[i][4])
 				if  tempstoredist < tempsearchdist then
 					tempsearchdist = tempstoredist
 					whereismydoodie = i
@@ -921,6 +921,13 @@ while repeated_trial < (repeat_trial + 1) do
 			--yield("/wait 2")
 			yield("/pcall DawnStory true 14") --START THE DUTY
 		end
+		if repeat_type == 2 then --just you using GC Squad guy
+			yield("/target Sergeant")
+			yield("/wait 1")
+			yield("/interact")
+			yield("/pcall SelectString true 1 <wait.1>")
+			--*TBD once i get char up to test strings with
+		end
 
 		yield("/echo Total Trials triggered for "..char_snake..": "..repeated_trial)
 		yield("/wait 10")

Community Scripts/Gathering/DeluxeOceanFishingCharSwapping_MxVaxius.lua

@@ -148,21 +148,33 @@ function fishing()
 	yield("/wait 10")
 
 	yield("/ac sprint")
-	--TODO better / faster way to get to dryskthoa
-	PathfindAndMoveTo(-409.42459106445,3.9999997615814,74.483444213867,false) 
-	 muuv = 1
-	 muuvX = GetPlayerRawXPos()
-	 muuvY = GetPlayerRawYPos()
-	 muuvZ = GetPlayerRawZPos()
-	 while muuv == 1 do
+
+	--repair catte if we are at 99% durability or lower and have at least 5000 gil
+	while NeedsRepair(99) and  GetItemCount(1) > 4999 do
+		PathfindAndMoveTo(-397.46423339844,3.0999958515167,78.562309265137,false) 
+		visland_stop_moving()
+		yield("/target Merchant & Mender")
 		yield("/wait 1")
-		if muuvX == GetPlayerRawXPos() and muuvY == GetPlayerRawYPos() and muuvZ == GetPlayerRawZPos() then
-			muuv = 0
-		end
-		muuvX = GetPlayerRawXPos()
-		muuvY = GetPlayerRawYPos()
-		muuvZ = GetPlayerRawZPos()
-	 end
+		yield("/lockon on")
+		yield("/wait 1")
+		yield("/pinteract")
+		yield("/wait 1")
+		yield("/pcall SelectIconString true 1")
+		yield("/wait 1")
+		yield("/pcall Repair true 0")
+		yield("/wait 1")
+		yield("/pcall Repair true 1")
+		yield("/wait 1")
+		yield("/send ESCAPE <wait.1.5>")
+		yield("/send ESCAPE <wait.1.5>")
+		yield("/send ESCAPE <wait.1.5>")
+		yield("/send ESCAPE <wait.1>")
+		yield("/wait 3")
+	end
+
+	--dryskthota
+	PathfindAndMoveTo(-409.42459106445,3.9999997615814,74.483444213867,false) 
+	visland_stop_moving()
 	yield("/wait 1")
 	fishqtest = false
 	toolong = 0
@@ -291,8 +303,8 @@ while true do
 			 fishing()
 			 --drop a log file entry on the charname + Level
 			 -- Define the folder path
-			feesh_c = feesh_c - 1
-			vich_one()
+			--feesh_c = feesh_c - 1
+			--vich_one()
 			-- Open a file in write mode within the specified folder
 			local file = io.open(folderPath .. "FeeshLevels.txt", "a")
 
@@ -312,7 +324,7 @@ while true do
 				yield("/echo Error: Unable to open file for writing")
 				--file:write("Error: Unable to open file for writing\n")
 			end
-			feesh_c = feesh_c + 1
+			--feesh_c = feesh_c + 1
 			vich_one()
  			--yield("/ays multi")
  			yield("/ays multi e")