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

Community Scripts/AutoRetainer Companions/RobustGCturnin/_functions.lua

@@ -386,7 +386,8 @@ function return_to_fc()
 	yield("/li fc") --new way notice the brackets --this also respects house regisrtations in lifestream
 	yield("/wait 1")
 	--yield("/waitaddon Nowloading <maxwait.15>")
-	yield("/wait 15")
+	ZoneTransition()
+--	yield("/wait 15")
 	yield("/waitaddon NamePlate <maxwait.600><wait.5>")
 end
 
@@ -395,7 +396,8 @@ function return_to_lair()
 	yield("/tp Estate Hall (Private)")
 	yield("/wait 1")
 	--yield("/waitaddon Nowloading <maxwait.15>")
-	yield("/wait 15")
+--	yield("/wait 15")
+	ZoneTransition()
 	yield("/waitaddon NamePlate <maxwait.600><wait.5>")
 end
 
@@ -445,54 +447,15 @@ function return_fc_entrance()
 	double_check_nav(GetTargetRawXPos(),GetTargetRawYPos(),GetTargetRawZPos())
 	visland_stop_moving()
 	yield("/target Entrance <wait.1>")
+
+	--apparently this part is screwing with enabling/disabling retainers sometimes.
+	--[[
 	yield("/interact")
 	yield("/wait 1")
 	yield("/callback SelectYesno true 0")
 	yield("/interact")
 	yield("/wait 1")
 	yield("/callback SelectYesno true 0")
-	--commented out this garbage finally
---[[
-	yield("/hold W <wait.1.0>")
-	yield("/release W")
-	yield("/target Entrance <wait.1>")
-	yield("/interact")
-	yield("/lockon on")
-	yield("/automove on")
-	yield("/wait 0.5")
-	yield("/interact")
-	yield("/wait 0.5")
-	yield("/interact")
-	yield("/wait 0.5")
-	yield("/interact")
-	yield("/wait 0.5")
-	yield("/interact")
-	yield("/wait 0.5")
-	yield("/interact")
-	yield("/wait 0.5")
-	yield("/interact")
-	yield("/wait 0.5")
-	yield("/interact")
-	yield("/automove off")
-	yield("/hold Q")
-	yield("/interact")
-	yield("/wait 0.5")
-	yield("/interact")
-	yield("/wait 0.5")
-	yield("/interact")
-	yield("/automove on")
-	yield("/release Q")
-	yield("/interact")
-	yield("/hold Q")
-	yield("/wait 0.5")
-	yield("/interact")
-	yield("/wait 0.5")
-	yield("/interact")
-	yield("/interact")
-	yield("/release Q")
-	yield("/interact")
-	yield("/wait 1")
-	yield("/callback SelectYesno true 0")
 	--]]
 end
 

Community Scripts/Gathering/DeluxeOceanFishingCharSwapping_MxVaxius.lua

@@ -143,9 +143,9 @@ function fishing()
 	yield("/wait 3")
 
 	yield("/pinteract <wait.2>")
-	yield("/pcall SelectString true 0")
-	yield("/pcall TelepotTown false 11 3u <wait.1>") -- Arcanists' Guild
-	yield("/pcall TelepotTown false 11 3u <wait.1>")
+	yield("/callback SelectString true 0")
+	yield("/callback TelepotTown false 11 3u <wait.1>") -- Arcanists' Guild
+	yield("/callback TelepotTown false 11 3u <wait.1>")
 	yield("/wait 10")
 	]]
 
@@ -163,11 +163,11 @@ function fishing()
 		yield("/wait 1")
 		yield("/pinteract")
 		yield("/wait 1")
-		yield("/pcall SelectIconString true 1")
+		yield("/callback SelectIconString true 1")
 		yield("/wait 1")
-		yield("/pcall Repair true 0")
+		yield("/callback Repair true 0")
 		yield("/wait 1")
-		yield("/pcall Repair true 1")
+		yield("/callback Repair true 1")
 		yield("/wait 1")
 		ungabunga()
 	end
@@ -202,6 +202,8 @@ function fishing()
 	--dryskthota
 	PathfindAndMoveTo(-409.42459106445,3.9999997615814,74.483444213867,false) 
 	visland_stop_moving()
+	PathfindAndMoveTo(-409.42459106445,3.9999997615814,74.483444213867,false) 
+	visland_stop_moving()
 	yield("/wait 1")
 	fishqtest = false
 	toolong = 0
@@ -274,7 +276,7 @@ function fishing()
 		--try to exit the completion window faster
 		if IsAddonVisible("IKDResult") then
 			yield("/wait 15")
-			yield("/pcall IKDResult false 0")
+			yield("/callback IKDResult false 0")
 		end
 		if GetCharacterCondition(33)==true then
 			if GetCharacterCondition(34)==true then