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

Community Scripts/AutoRetainer Companions/AutoMaintenance/FUTA_GC.lua

@@ -42,7 +42,14 @@ koffers = {
 {38476,"Paladin's Dzemael Arms (Lv. 44)"},
 {38473,"Paladin's Flametongue Arms (Lv. 35)"},
 {38472,"Paladin's Longstop Arms (Lv. 32)"},
-{38477,"Paladin's Templar Arms (Lv. 47)"}
+{38477,"Paladin's Templar Arms (Lv. 47)"},
+{36137,"Crag Weapon Coffer (IL 80)"},
+{36616,"Heavens Weapon Coffer (IL 205)"},
+{36143,"Hive Weapon Coffer (IL 190)"},
+{36141,"Ice Weapon Coffer (IL 110)"},
+{36135,"Inferno Weapon Coffer (IL 60)"},
+{36138,"Mogpon Coffer (IL 75)"},
+{36136,"Vortex Weapon Coffer (IL 70)"}
 }
 
 --[[

Community Scripts/AutoRetainer Companions/AutoMaintenance/FUTA_fishing.lua

@@ -35,7 +35,8 @@ function fishing()
 		yield("/pcall Repair true 0")
 		yield("/wait 1")
 		yield("/pcall Repair true 1")
-		yield("/wait 1")
+		yield("/wait 3")
+		yield("/pcall SelectYesno true 0")
 		ungabunga()
 	end
 	 yield("/bait Versatile Lure")

Community Scripts/AutoRetainer Companions/AutoMaintenance/FulllyUnifiedTaskAutomation_McVaxius.lua

@@ -8,7 +8,7 @@ This script will, after AR is done, do various things based on a set of rules yo
 
 It could be ocean fishing, triple triad, inventory cleaning, going for a jog around the housing ward, delivering something to specific person, crafting. or whatever!
 
-Requirements : SND
+Requirements : SND, vnavmesh, dropbox, visland, pandora, simpletweaks
 and maybe more - let's see where we go with it
 everything from the folder you found this
 and https://github.com/Jaksuhn/SomethingNeedDoing/blob/master/Community%20Scripts/AutoRetainer%20Companions/RobustGCturnin/_functions.lua
@@ -23,7 +23,7 @@ What is working?
 	Updating Inventories, FC, Chocobo saddlebags for Atools by opening them.
 		******************************************************************************************
 		*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.
+		*Repricing items in retainers first time 100%, 11% chance after that unless you configure it differently.
 		you may need to turn off retainer window bailout in /ays expert   or set it to 30 or 60 seconds.. still tbd on this
 		*DONT ASK ABOUT THIS IN PUNISH DISC OR YOU WILL BE SENT TO THE TEASPOON DROPPING CLOSET
 		******************************************************************************************
@@ -32,9 +32,6 @@ What is working?
 	Rebuying Ceruleum Fuel
 	Trickling in repair kits
 
-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
-
 nice to have working
 	(From Cabbage @ Punish disc) gardening -> https://gist.github.com/cabbscripts/6d265058d5e605b90adb8362c7638976
 		it uses YA's list priority to harvest -> reseed -> quit, could add watering in too
@@ -43,6 +40,7 @@ nice to have working
 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 :(
+	also - if you dont have a fully busy roster of retainers, ocean fishing via this method isnt reccommended, you should just use the persistent ocean fishing script thats also on this repo somewhere. i won't be updating that one though.
 	
 
 --]]
@@ -63,6 +61,7 @@ functionsToLoad = loadfile(loadfiyel)
 functionsToLoad()
 dont_report_good_stuff = 0 --by default reporting everything, if you turn this on, it will not report on "good" stuff (we made x MRK!) aside from personal home entries
 logfile_differentiator = " - Account 1"  --example of extra text to throw into log file say if your pointing a few clients to same log file for convenience
+force_equipstuff = 0 --should we try to force recommended equip every chance we get? by default we won't do it
 ------------------------------------------
 --Config and change back after done!------
 ------------------------------------------
@@ -76,6 +75,7 @@ re_organize_return_locations = 0 -- only set this one time and run the script so
 --yield("/waitaddon _ActionBar <maxwait.600><wait.2>")
 
 --update atools w fc and inventory
+RestoreYesAlready()
 yield("/echo Fully Unified Task Automation (F.U.T.A.) Initializing .....")
 yield("/freecompanycmd")
 yield("/echo Free Company command executed.")
@@ -232,7 +232,7 @@ check_ro_helm()
 ---------------------------------------------------------------------------------
 ------------------------------FISHING  START-------------------------------------
 ---------------------------------------------------------------------------------
-if FUTA_processors[hoo_arr_weeeeee][2][2] == 0 then
+if FUTA_processors[hoo_arr_weeeeee][2][2] > -1 then  -- -1 is ignore+disable for this feature
 	--we dont have a fishing level setup
     yield("/echo Let's see if fishing is even a thing on this char and update the database")
 	yield("/wait 0.5")	
@@ -272,7 +272,7 @@ for i = 1, #FUTA_processors do
     end
 end
 
-yield("/echo Debug: Lowest ID determined -> "..lowestID.." Corresponding to -> "..FUTA_processors[lowestID][1][1])
+yield("/echo Debug: Lowest ID determined -> "..lowestID.." Corresponding to -> "..FUTA_processors[lowestID][1][1].. " With a level of -> "..FUTA_processors[lowestID][2][2])
 
 -- If the lowest guy is max level, we aren't fishing
 if FUTA_processors[lowestID][2][2] == 100 and force_fishing == 0 or FUTA_processors[lowestID][2][2] == -1 then
@@ -357,8 +357,9 @@ if wheeequeheeheheheheheehhhee == 0 then
 	----------------------------
     -- Start of processing things when there is no fishing   
 	if FUTA_processors[hoo_arr_weeeeee][3][2] > 0 then
-		yield("/echo rolling dice to see if we do a repricing !")
-        if getRandomNumber(0, 99) < FUTA_processors[hoo_arr_weeeeee][3][2] then
+		cleanrand = getRandomNumber(0, 99)
+		yield("/echo rolling dice to see if we do a repricing -> "..cleanrand.." out of chance -> "..FUTA_processors[hoo_arr_weeeeee][3][2])
+        if cleanrand < FUTA_processors[hoo_arr_weeeeee][3][2] then
 			wheeequeheeheheheheheehhhee = 1  --re using this var because we can and it means the same thing at end of script
             yield("/echo Debug: Inventory cleaning adjustment started")
 			--kneecapping AR for now because it interferes with am
@@ -382,7 +383,7 @@ if wheeequeheeheheheheheehhhee == 0 then
 	 --In case we just ran it and need to avoid double triggering it
 	if FUTA_processors[hoo_arr_weeeeee][3][2] == -1 then
 		yield("/echo Debug: Inventory cleaning adjustment completed -> -1 changed to 11")
-		FUTA_processors[hoo_arr_weeeeee][3][2] = 11 
+		FUTA_processors[hoo_arr_weeeeee][3][2] = 5 
 	end
 	if wheeequeheeheheheheheehhhee == 1 then
 		FUTA_processors[hoo_arr_weeeeee][3][2] = -1
@@ -394,7 +395,7 @@ if wheeequeheeheheheheheehhhee == 0 then
 	----------------------------
 	--check inventory size and do gcturnin shit 
 	yield("/echo Do we need to clear inventory?")
-	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
+	if GetInventoryFreeSlotCount() < FUTA_processors[hoo_arr_weeeeee][3][5] and FUTA_processors[hoo_arr_weeeeee][3][5] > 0 or GetItemCount(21072) < venture_cleaning then
 		FUTA_processors[hoo_arr_weeeeee][3][2] = 100 --queue up a "clean" after next set of QV
 		yield("/echo Yes we need to clean inventory and turnin GC stuff!")
 		loadfiyel2 = os.getenv("appdata").."\\XIVLauncher\\pluginConfigs\\SomethingNeedDoing\\FUTA_GC.lua"
@@ -411,6 +412,7 @@ if wheeequeheeheheheheheehhhee == 0 then
 	----------------------------
 	if FUTA_processors[hoo_arr_weeeeee][4][2] > 0 then
 		if GetItemCount(10155) < FUTA_processors[hoo_arr_weeeeee][4][2] then
+			ungabungabunga() -- get out of any screens we are in
 			enter_workshop()
 			try_to_buy_fuel(FUTA_processors[hoo_arr_weeeeee][4][3])
 		end
@@ -481,7 +483,7 @@ end
 yield("/echo Debug: Finished all processing")
 tablebunga(FUTA_config_file, "FUTA_processors", folderPath)
 zungazunga()
-
+yield("/echo onto the next one ..... ")
 if wheeequeheeheheheheheehhhee == 1 then
 	yield("/ays multi e") --if we had to toggle AR
 end

Community Scripts/AutoRetainer Companions/RobustGCturnin/_functions.lua

@@ -209,11 +209,12 @@ function WalkTo(x, y, z)
 		yield("/wait 0.5")
 		--if GetZoneID() == 130 or GetZoneID() == 341 then --130 is uldah. dont need to jump anymore it paths properly. we will test anyways.
 		countee = countee + 1
+		--yield("/echo we are still pathfinding apparently -> countee -> "..countee)
 		if gachi_jumpy == 1 and countee == 10 and GetZoneID() ~= 129 then --we only doing jumps if we configured for it
 		--if GetZoneID() == 341 then --only need to jump in goblet for now
 			yield("/gaction jump")
 			countee = 0
-			yield("/echo we are still pathfinding apparently")
+			yield("/echo we are REALLY still pathfinding apparently")
 		end
 	end
 end
@@ -226,8 +227,12 @@ function ZoneTransition()
         yield("/echo Are we ready? -> "..iswoah.."/20")
 		iswehehe = IsPlayerAvailable() 
 		iswoah = iswoah + 1
+		if 	iswoah == 5 then yield("/pcall SelectYesno true 0") end
+		if 	iswoah == 10 then yield("/pcall SelectYesno true 0") end
+		if 	iswoah == 15 then yield("/pcall SelectYesno true 0") end
 		if 	iswoah == 20 then
 			iswehehe = false
+			yield("/pcall SelectYesno true 0")
 		end
     until not iswehehe
 	iswoah = 0
@@ -236,8 +241,12 @@ function ZoneTransition()
         yield("/echo Are we ready? (backup check)-> "..iswoah.."/20")
 		iswehehe = IsPlayerAvailable() 
 		iswoah = iswoah + 1
+		if 	iswoah == 5 then yield("/pcall SelectYesno true 0") end
+		if 	iswoah == 10 then yield("/pcall SelectYesno true 0") end
+		if 	iswoah == 15 then yield("/pcall SelectYesno true 0") end
 		if 	iswoah == 20 then
 			iswehehe = true
+			yield("/pcall SelectYesno true 0")
 		end
     until iswehehe
 end
@@ -273,7 +282,9 @@ function WalkToGC()
 			visland_stop_moving()
 		end
 		if movementtype == 0 then --default navmesh
-			WalkTo(-142.5, 4, -106.5)
+			--WalkTo(-129.5, -1.9, -151.6)
+			--WalkTo(-116, 2, -136.9)
+			WalkTo(-141.7, 4.1, -106.8)
 		end
     end
 end
@@ -295,16 +306,19 @@ function CharacterSafeWait()
 end
 
 function visland_stop_moving()
- yield("/equipguud")
- yield("/equiprecommended")
- yield("/character")
- yield("/pcall Character true 15")
- yield("/wait 0.5")
- yield("/pcall SelectYesno true 0")
- yield("/character")
- yield("/pcall Character true 15")
- yield("/pcall SelectYesno true 0")
- yield("/wait 3")
+ do_we_force_equip = force_equipstuff or 1  --default is on, unless we specify the global force_equipstuff in the calling script
+ if do_we_force_equip == 1 then
+	 yield("/equipguud")
+	 yield("/equiprecommended")
+	 yield("/character")
+	 yield("/pcall Character true 15")
+	 yield("/wait 0.5")
+	 yield("/pcall SelectYesno true 0")
+	 yield("/character")
+	 yield("/pcall Character true 15")
+	 yield("/pcall SelectYesno true 0")
+	 yield("/wait 3")
+ end
  muuv = 1
  muuvX = GetPlayerRawXPos()
  muuvY = GetPlayerRawYPos()
@@ -324,12 +338,14 @@ function visland_stop_moving()
  yield("/vnavmesh stop")
  yield("/wait 3")
  --added becuase simpletweaks is slow to update :(
- yield("/character")
- yield("/wait 1")
- yield("/pcall Character true 12")
- yield("/wait 1")
- yield("/pcall RecommendEquip true 0")
- yield("/wait 1")
+ if do_we_force_equip == 1 then
+	 yield("/character")
+	 yield("/wait 1")
+	 yield("/pcall Character true 12")
+	 yield("/wait 1")
+	 yield("/pcall RecommendEquip true 0")
+	 yield("/wait 1")
+ end
 end
 
 

Community Scripts/AutoRetainer Companions/RobustGCturnin/bagman_mcvaxius.lua

@@ -50,12 +50,17 @@ for bagman its similar
 PandoraSetFeatureState("Auto-Fill Numeric Dialogs", false) 
 --End because nobody read the instructions at the top <3
 
+--TURN OFF RSR!
+yield("/rotation Cancel")
+--TURN OFF RSR!
+
 tonys_turf = "Maduin" --what server is tony on
 tonys_spot = "Pavolis Meats" --where we tping to aka aetheryte name
 tony_zoneID = 132 --this is the zone id for where the aetheryte is, if its anything other than 0, it will be evaluated to see if your already in teh zone for cases of multi transfer from or to same
 tonys_house = 0 --0 fc 1 personal 2 apartment. don't judge. tony doesnt trust your bagman to come to the big house
 tony_type = 0 --0 = specific aetheryte name, 1 first estate in list outside, 2 first estate in list inside
 bagmans_take = 1000000 -- how much gil remaining should the bagma(e)n shave off the top for themselves?
+dropboxhack = 1 --for bagman type 2 - if gil isnt being changed after a while. we will force a trade window because maybe there was a race condition as mentione above
 tonyception = 0 --0 = dont be fancy, 1 = we have multiple fat tonies in the table and therefore we need to give 1 gil at the end of the trade so tony will leave and the next tony can come
 bagman_type = 0 --[[
 0 = pcalls (gil only, a bit sloppy too with no multi tony support), 
@@ -185,8 +190,11 @@ end
 get_to_the_choppa = 0 -- alternate exit var
 horrible_counter_method = 0
 windex = 1 --bagman index
+bagmantype2check = GetItemCount(1)
+bagmantype2checkcounter = 0
 
 local function shake_hands()
+	bagmantype2checkcounter = 0
 	get_to_the_choppa = 0
 	horrible_counter_method = 0
 	--get_to_the_choppa = 1 -- alternate exit var
@@ -324,6 +332,18 @@ local function shake_hands()
 		  floo = DropboxIsBusy()
 		  yield("/wait 2")
 		  yield("/echo Trading happening!")
+		  if bagman_type == 2 and dropboxhack == 1 then
+			bagmantype2checkcounter = bagmantype2checkcounter + 1
+			if bagmantype2checkcounter == 5 then
+				if bagmantype2check == GetItemCount(1) then
+					yield("/target \""..fat_tony.."\"")
+					yield("/trade")
+					yield("/echo oops couldn't trade .. trying again!")
+				end
+				bagmantype2checkcounter = 0
+				bagmantype2check = GetItemCount(1)
+			end
+		  end
 		end
 		yield("/wait 5")
 		if tonyception == 1 then
@@ -433,6 +453,7 @@ for i=1,#franchise_owners do
 		end
 		shake_hands() -- its a business doing pleasure with you tony as always
 	--end
+	zungazunga() --close any trailing dialogs in case a trade was errantly opened.
 	if road_trip == 1 then --we need to get home
 		--time to go home.. maybe?
 		if franchise_owners[i][2] == 0 then

Community Scripts/AutoRetainer Companions/RobustGCturnin/fat_tony_McVaxius.lua

@@ -18,6 +18,9 @@ Vnavmesh
 Simpletweaks -> enable targeting fix
 YesAlready -> /Enter .*/
 ]]
+--TURN OFF RSR!
+yield("/rotation Cancel")
+--TURN OFF RSR!
 
 tonys_turf = "Maduin" --what server will our tonies run to
 tonys_spot = "Pavolis Meats" --where we tping to aka aetheryte name
@@ -172,6 +175,7 @@ for i=1,#franchise_owners do
 		visland_stop_moving()
 	end
 	shake_hands() -- its a business doing pleasure with you tony as always
+	zungazunga() --close any trailing dialogs in case a trade was errantly opened.
 	if road_trip == 1 then --we need to get home
 		--time to go home.. maybe?
 		if franchise_owners[i][2] == 0 then