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

Community Scripts/AutoRetainer Companions/AutoMaintenance/FUTA_GC.lua

@@ -164,7 +164,7 @@ function Final_GC_Cleaning()
 		if GCrenk == 5 then SealCap = 29000 end  --requires R1 Hunting Log done
 		if GCrenk == 6 then SealCap = 34000 end
 		if GCrenk == 7 then SealCap = 39000 end
-		if GCrenk == 8 then SealCap = 44000 end  --requires R1 Hunting Log done + Aurum Vale
+		if GCrenk == 8 then SealCap = 44000 end  --requires R2 Hunting Log done + Aurum Vale
 		if GCrenk == 9 then SealCap = 49000 end  --requires Dzemael Darkhold
 		yield("/echo Seal Cap is -> "..SealCap)
 		SetFlamesGCRank(9)

Community Scripts/AutoRetainer Companions/AutoMaintenance/FUTA_fishing.lua

@@ -3,6 +3,7 @@ function fishing()
 
 	--now we have to keep trying until we are on the right character.... just in case we are not.
 	while FUTA_processors[lowestID][1][1] ~= GetCharacterName(true) do
+		yield("/echo Load -> "..FUTA_processors[lowestID][1][1])
 		yield("/ays relog " ..FUTA_processors[lowestID][1][1])
 		yield("/wait 3")
 

Community Scripts/AutoRetainer Companions/AutoMaintenance/FulllyUnifiedTaskAutomation_McVaxius.lua

@@ -16,27 +16,37 @@ and https://github.com/Jaksuhn/SomethingNeedDoing/blob/master/Community%20Script
 throw everything into %AppData%\XIVLauncher\pluginConfigs\SomethingNeedDoing\
 
 What is working?
-	Geting Fisher Levels and determining who is the lowest level fisher - we cant safely AYS RELOG yet..
+	Fishing
+		Geting Fisher Levels and determining who is the lowest level fisher - we cant safely AYS RELOG yet..
+		Fully cycling ocean fishing to the char with lowest level of fishing job
 	Outputting to log file if Red Onion Helm Detected
 	Updating Inventories, FC, Chocobo saddlebags for Atools by opening them.
-	Repricing items in retainers first time 100%, 10% chance after that unless you configure it differently. DONT ASK ABOUT THIS IN PUNISH DISC OR YOU WILL BE SENT TO THE TEASPOON DROPPING CLOSET
+		******************************************************************************************
+		*DONT ASK ABOUT THIS IN PUNISH DISC OR YOU WILL BE SENT TO THE TEASPOON DROPPING CLOSET
+		*Repricing items in retainers first time 100%, 10% chance after that unless you configure it differently.
+		*DONT ASK ABOUT THIS IN PUNISH DISC OR YOU WILL BE SENT TO THE TEASPOON DROPPING CLOSET
+		******************************************************************************************
 	Doing GC Turnins when configured inventory slots free is below a certain amount
 	Visiting personal houses when we reach specified number of retainer cleanings
 	Rebuying Ceruleum Fuel
 
 Soon to be working
 	Automatic Magitek Repair kit trickling -> requirements you will restock the stuff yourself, if your out of materials youll get a log message
 
-What is almost working
-	Ocean fishing would work if i could bypass the post AR lock on ays relog. thats coming soon. purposefully locked it out for
-	now but if your smart you can install AHK And wintitle plugin and comment out one line of code and try it. its messy and i dont recommend it
+Known issues and resolution
+	changing the table structure right now i can't do dynamically and safely (please help me!) so i am versioning things if i change the table structure so you
+	can at least keep your old configs / counters if you need them.    there is probably a nice way to do this without deleting your configs but this is where we are :(
+	
 
 --]]
-
+------------------------------------------------------------
+-------------------Static Variables-------------------------
+------------------------------------------------------------
+table_version = 2 -- don't change this. I will change it. this way your old configs are stored and someday someone can help me figure out how to migrate shit
 ------------------------------------------------------------
 ----------------------GLOBAL VARIABLES----------------------
 ------------------------------------------------------------
-FUTA_config_file = "FUTAconfig_McVaxius.lua"
+FUTA_config_file = "FUTAconfig_McVaxius_"..table_version..".lua"
 force_fishing = 0 -- Set to 1 if you want the default indexed char to fish whenever possible
 venture_cleaning = 20 -- How many venture coins do we need to have left we do a cleaning - useful for leveling new retainer abusers 21072 is item id
 folderPath = os.getenv("appdata").."\\XIVLauncher\\pluginConfigs\\SomethingNeedDoing\\"
@@ -66,14 +76,16 @@ yield("/saddlebag")
 yield("/echo Saddlebag command executed.")
 yield("/echo Fully Unified Task Automation (F.U.T.A.) atools database updated")
 yield("/echo Non Aggregated Recursive Integration (N.A.R.I.) Initializing .....")
-
+yield("/bmrai off")
+yield("/vbmai off")
+yield("/rotation Cancel")
+yield("/echo Script breakers disabled")		
 FUTA_processors = {} -- Initialize variable
 
 -- 3D Table   {}[i][j][k]
 ----  -> --?- -> not possible yet/partially implemented
 ----  -> --X- -> not implemented
 ----  -> --Y- -> not implemented
-
 FUTA_defaults = {
     {
         {"Firstname Lastname@Server", 0}, 			--Y--{}[i][1][1..2]--name@server and return type 0 return home to fc entrance, 1 return home to a bell, 2 don't return home, 3 is gridania inn, 4 limsa bell near aetheryte, 5 personal estate entrance, 6 bell near personal home
@@ -258,7 +270,6 @@ if FUTA_processors[lowestID][2][2] == 100 and force_fishing == 0 or FUTA_process
     yield("/echo Lowest char is max level or no chars have fishing so we aren't fishing")
 end
 
-wheeequeheeheheheheheehhhee = 0 --meh we cant do this safely 			--FOR HACKY FISHIN SWITCHER WITH AHK --- REMOVE IF YOU WANT TO USE IT
 -- It's fishing time
 if wheeequeheeheheheheheehhhee == 1 then
     if GetCharacterCondition(31) == false then
@@ -275,31 +286,36 @@ if wheeequeheeheheheheheehhhee == 1 then
 			--FOR HACKY FISHIN SWITCHER WITH AHK --- START
 			if FUTA_processors[lowestID][1][1] ~= GetCharacterName(true) then
 				--if we are on wrong char. we gotta kill AR And let AHK fire up the right char in a sec ;o
-				yield("/echo Hacky whacky")
 				yield("/ays multi d")
-				yield("/wait 3")
-				--do sheet
-				yield("/echo Hacky AHK shit")
-				-- make a ahk file from scratch
-				local file = io.open(folderPath .. "not_a_key_logger.ahk", "w")
-                file:write("WinActivate, Flantasy\n")
-                file:write("Sleep, 5000\n")
-                --file:write("Send, {ENTER}/ays relog "..string.match(FUTA_processors[lowestID][1][1], "([^@]+)").." {ENTER}\n")
-                file:write("Send, {ENTER}/ays relog "..FUTA_processors[lowestID][1][1].." {ENTER}\n")
-                file:write("Sleep, 45000\n")
-                file:write("Send, {ENTER}/pcraft run FUTA {ENTER}\n")
-                file:close()
-				-- Call a batch file using its full path
-				--os.execute("cmd /c start \"\" \ "..os.getenv("appdata").."\\XIVLauncher\\pluginConfigs\\SomethingNeedDoing\\not_a_key_logger.ahk")
-				os.execute('cmd /c start "" "' .. os.getenv("appdata") .. '\\XIVLauncher\\pluginConfigs\\SomethingNeedDoing\\not_a_key_logger.ahk"')
-				yield("/wintitle Flantasy")
-				--end the script here
-				yield("/pcraft stop")				--os.execute(os.getenv("appdata").."\\XIVLauncher\\pluginConfigs\\SomethingNeedDoing\\not_a_key_logger.ahk")
-				yield("/wintitle Flantasy")
-				--end the script here
-				yield("/pcraft stop")
+				yield("/wait 1")
+				yield("/ays reset")
+				yield("/wait 5")
+
+				--[[Hacky shit left here for posterity
+					--FOR HACKY FISHING SWITCHER WITH AHK --- START
+					--do sheet
+					yield("/echo Hacky AHK shit")
+					-- make a ahk file from scratch
+					local file = io.open(folderPath .. "not_a_key_logger.ahk", "w")
+					file:write("WinActivate, Flantasy\n")
+					file:write("Sleep, 5000\n")
+					--file:write("Send, {ENTER}/ays relog "..string.match(FUTA_processors[lowestID][1][1], "([^@]+)").." {ENTER}\n")
+					file:write("Send, {ENTER}/ays relog "..FUTA_processors[lowestID][1][1].." {ENTER}\n")
+					file:write("Sleep, 45000\n")
+					file:write("Send, {ENTER}/pcraft run FUTA {ENTER}\n")
+					file:close()
+					-- Call a batch file using its full path
+					--os.execute("cmd /c start \"\" \ "..os.getenv("appdata").."\\XIVLauncher\\pluginConfigs\\SomethingNeedDoing\\not_a_key_logger.ahk")
+					os.execute('cmd /c start "" "' .. os.getenv("appdata") .. '\\XIVLauncher\\pluginConfigs\\SomethingNeedDoing\\not_a_key_logger.ahk"')
+					yield("/wintitle Flantasy")
+					--end the script here
+					yield("/pcraft stop")				--os.execute(os.getenv("appdata").."\\XIVLauncher\\pluginConfigs\\SomethingNeedDoing\\not_a_key_logger.ahk")
+					yield("/wintitle Flantasy")
+					--end the script here
+					yield("/pcraft stop")
+					--FOR HACKY FISHING SWITCHER WITH AHK --- END
+				--]]
 			end
-			--FOR HACKY FISHIN SWITCHER WITH AHK --- END
 
             fishing()
             yield("/echo Debug: Fishing completed")
@@ -353,20 +369,24 @@ if wheeequeheeheheheheheehhhee == 0 then
 	if GetInventoryFreeSlotCount() < FUTA_processors[hoo_arr_weeeeee][3][5] and FUTA_processors[hoo_arr_weeeeee][3][5] > 0 or GetItemCount(21072) > 0 and GetItemCount(21072) < venture_cleaning then
 		yield("/echo Yes we need to clean inventory and turnin GC stuff! 1/5 debug")
 		loadfiyel2 = os.getenv("appdata").."\\XIVLauncher\\pluginConfigs\\SomethingNeedDoing\\FUTA_GC.lua"
-		yield("/echo Yes we need to clean inventory and turnin GC stuff! 2/5 debug")
+		--yield("/echo Yes we need to clean inventory and turnin GC stuff! 2/5 debug")
 		functionsToLoad = loadfile(loadfiyel2)
-		yield("/echo Yes we need to clean inventory and turnin GC stuff! 3/5 debug")
+		--yield("/echo Yes we need to clean inventory and turnin GC stuff! 3/5 debug")
 		functionsToLoad()
-		yield("/echo Yes we need to clean inventory and turnin GC stuff! 4/5 debug")
+		--yield("/echo Yes we need to clean inventory and turnin GC stuff! 4/5 debug")
 		FUTA_robust_gc()
-		yield("/echo Yes we need to clean inventory and turnin GC stuff! 5/5 debug")
+		--yield("/echo Yes we need to clean inventory and turnin GC stuff! 5/5 debug")
+		if GetInventoryFreeSlotCount() < (FUTA_processors[hoo_arr_weeeeee][3][5] + 20) then
+			loggabunga("FUTA_", " - Inventory still low after cleaning -> "..FUTA_processors[hoo_arr_weeeeee][1][1])
+		end
 	end
 
 	----------------------------
 	-----Buy Ceruleum Fuel------
 	-----------------------------
 	if FUTA_processors[hoo_arr_weeeeee][4][2] > 0 then
 		if GetItemCount(10155) < FUTA_processors[hoo_arr_weeeeee][4][2] then
+			enter_workshop()
 			try_to_buy_fuel(FUTA_processors[hoo_arr_weeeeee][4][3])
 		end
 	end

Community Scripts/AutoRetainer Companions/RobustGCturnin/RobustGCTurnIn_McVaxius.lua

@@ -269,18 +269,12 @@ function Final_GC_Cleaning()
 		yield("/wait 1")
 		yield("/target Personnel Officer")
 		yield("/wait 1")
-		yield("/send NUMPAD0")
+		yield("/interact")
+		yield("/wait 2")
 		yield("/pcall SelectString true 0 <wait.1>")
-		yield("/send NUMPAD0")
-		yield("/wait 1")
-		yield("/send NUMPAD0")
-		yield("/wait 1")
+		yield("/wait 2")
 		yield("/pcall GrandCompanySupplyList true 0 1 2")
-		yield("/wait 1")
-		yield("/send NUMPAD0")
-		yield("/wait 1")
-		yield("/send NUMPAD0")
-		yield("/wait 1")
+		yield("/wait 2")
 		yield("/send ESCAPE <wait.1.5>")
 		yield("/send ESCAPE <wait.1.5>")
 		yield("/wait 3")

Community Scripts/AutoRetainer Companions/RobustGCturnin/_functions.lua

@@ -519,41 +519,42 @@ function clean_inventory()
 	--/automarket start|stop
 	zungazunga()
 	yield("/target Summoning Bell")
+	yield("/wait 1")
 	yield("/lockon on")
-	yield("/automove on <wait.3.5>")
+	yield("/automove on <wait.5.0>") --sometimes it takes a while to path over 3.5 seconds worked in testing and even 1.5 and 2.5 seconds worked but we gonna do 5 seconds to cover all issues
 	yield("/interact")
 	yield("/automarket start")
 	yield("/wait 5")
 	yield("/target Summoning Bell")
 	yield("/wait 1")
 	yield("/interact")
-	yield("/automarket start")
+--	yield("/automarket start")
 	exit_cleaning = 0
 	while GetCharacterCondition(50) == false and exit_cleaning < 20 do
 		yield("/wait 1")
 		exit_cleaning = exit_cleaning + 1
 		yield("/echo Waiting for repricer to start -> "..exit_cleaning.."/20")
 	end
 	exit_cleaning = 0
-	--forced_am = 0
+	forced_am = 0
+	bungaboard = SetClipboard("123123123")
 	while GetCharacterCondition(50) == true and exit_cleaning < 300 do
 		yield("/wait 1")
 		exit_cleaning = exit_cleaning + 1
 		flandom = getRandomNumber(1,20)
 		--yield("/echo Waiting for repricer to end -> "..exit_cleaning.." seconds duration so far flandom -> "..flandom)
 		yield("/echo Waiting for repricer to end -> "..exit_cleaning.."/300")
---[[
 		forced_am = forced_am + 1
-		if flandom == 1 and exit_cleaning > 50 and forced_am > 49 then
-			ungabunga()
-			ungabunga()
+		if forced_am > 15 then --every 15 cycles we will update clipboard if it hasnt changed then we have a problem!
+			yield("/echo Clipboard contains -> "..GetClipboard())
+			if bungaboard == GetClipboard() then
+				yield("/echo oops Automarket is stuck ! let's help it!")
+				ungabunga()
+				exit_cleaning = exit_cleaning + 25
+			end
+			bungaboard = GetClipboard()
 			forced_am = 0
-			--yield("/automarket start")
-			yield("Giving Automarket a little push to get it moving and waiting 20 seconds")
-			--yield("/wait 20")
-			exit_cleaning = exit_cleaning + 25
 		end
-		--]]
 	end
 	CharacterSafeWait()
 	zungazunga()

Community Scripts/AutoRetainer Companions/RobustGCturnin/bagman_mcvaxius.lua

@@ -3,6 +3,7 @@ Have you ever wanted your alts that have been making gil for you on other accoun
 well this script (will eventually) rotate through your alts, and visit a server and or place to deliver gil.
 
 requires plugins
+Autoretainer
 Lifestream
 Teleporter
 Pandora -> TURN OFF AUTO NUMERICS
@@ -15,9 +16,11 @@ Simpletweaks -> enable estate list
 YesAlready -> /Enter .*/
 Something Need Doing -> Turn off SND Targeting in options
 
+If YOU HAVE BOSSMOD OF ANY KIND OR RSR -> please set them to :OFF: in the DTR bar or turn the plugins off!
+	bossmod in particular will interfere with focus targeting
+	RSR will interfere with movement in some cases
+
 Optional:
-Autoretainer
-Liza's plugin : Kitchen Sink if you want to use her queue method
 Simpletweaks -> enable auto equip recommended
 
 Known issues:
@@ -111,6 +114,7 @@ you can set quantity higher than existing to ensure max out
 1 = Gil
 10155 = Ceruleum Fuel
 10373 = Magitek Repair Mats
+6600 = Miniature Aetheryte
 ill add more commonly used IDs here eventually dont wanna clutter too much though.
 ]]
 local filled_bags = {
@@ -193,17 +197,17 @@ local function shake_hands()
 	end
 
 	--loop until we have tony targeted
-	yield("/target "..fat_tony)
+	yield("/target \""..fat_tony.."\"")
 	yield("/wait 1")
 	while string.len(GetTargetName()) == 0 do
-		yield("/target "..fat_tony)
+		yield("/target \""..fat_tony.."\"")
 		yield("/wait 1")
 	end
 
 	--we got fat tony.  we just need to make sure he is within targeting distance. say <1 yalms before we continue
 	while distance(GetPlayerRawXPos(), GetPlayerRawYPos(), GetPlayerRawZPos(), GetObjectRawXPos(fat_tony),GetObjectRawYPos(fat_tony),GetObjectRawZPos(fat_tony)) > 1.5 do
 		yield("/echo this fat bastard better hurry up he is  "..distance(GetPlayerRawXPos(), GetPlayerRawYPos(), GetPlayerRawZPos(), GetObjectRawXPos(fat_tony),GetObjectRawYPos(fat_tony),GetObjectRawZPos(fat_tony)).." away!")
-		yield("/target "..fat_tony)   --just in case we had wrong "tony" targeted
+		yield("/target \""..fat_tony.."\"")   --just in case we had wrong "tony" targeted
 		yield("/wait 1")
 	end
 
@@ -215,7 +219,7 @@ local function shake_hands()
 		if (GetGil() < (bagmans_take + 1)) and (tony_type == 0 or tony_type == 2) then
 			get_to_the_choppa = 1
 		end
-		yield("/target "..fat_tony)
+		yield("/target \""..fat_tony.."\"")
 		yield("/echo here you go "..fat_tony..", another full bag, with respect")
 		if bagman_type == 0 then
 			yield("/trade")

Community Scripts/AutoRetainer Companions/RobustGCturnin/fat_tony_McVaxius.lua

@@ -7,6 +7,7 @@ Otherwise it won't do anything really different than bagman.
 --[[
 
 requires plugins
+Autoretainer
 Lifestream
 Teleporter
 Pandora -> TURN OFF AUTO NUMERICS
@@ -16,10 +17,6 @@ Visland
 Vnavmesh
 Simpletweaks -> enable targeting fix
 YesAlready -> /Enter .*/
-
-Optional:
-Autoretainer
-Liza's plugin : Kitchen Sink if you want to use her queue method
 ]]
 
 tonys_turf = "Maduin" --what server will our tonies run to

Community Scripts/Misc/frenrider_McVaxius.lua

@@ -294,7 +294,8 @@ function clingmove(nemm)
 	if zclingtype == 4 then
 		--we only doing this silly method out of combat
 		if GetCharacterCondition(26) == false then
-			yield("/target "..nemm)
+			--yield("/target "..nemm)
+			yield("/target \""..nemm.."\"")
 			yield("/follow")
 		end
 		--if we in combat and target is nemm we will clear it becuase that may bork autotarget from RSR