Add files via upload

Author: coderwilson

Diff for: FFX_Auto_Main.py

@@ -61,18 +61,19 @@
 #StepCounter = 2
 #Gamestate = "Home"
 #StepCounter = 1
-#Gamestate = "rescueYuna"
+Gamestate = "rescueYuna"
 #StepCounter = 1
-#StepCounter = 2
+StepCounter = 2
 #Gamestate = "Gagazet"
 #StepCounter = 1
+#StepCounter = 4
 #Gamestate = "Zanarkand"
 #StepCounter = 4
 #Gamestate = "Sin"
 #StepCounter = 2
 #StepCounter = 4
-Gamestate = "none"
-StepCounter = 1
+#Gamestate = "none"
+#StepCounter = 1
 
 #Game length. Full is the same as any%, short is about 35 minutes with memory manip.
 #gameLength = "short"
@@ -85,8 +86,8 @@
 #rngSeedNum = 31 #Potential
 #rngSeedNum = 45 #Potential
 #rngSeedNum = 49 #Favorite one so far, but problem on Chocobo Eater
-rngSeedNum = 56
-rngReviewOnly = True
+rngSeedNum = 58
+rngReviewOnly = False
 print("Game type will be: ", gameLength)
 ####################################################################################################
 
@@ -671,6 +672,7 @@ def reportGamestate():
     if Gamestate == "rescueYuna" and StepCounter == 2:
         reportGamestate()
         FFX_rescueYuna.trials()
+        FFX_rescueYuna.trialsEnd()
         StepCounter = 3
 
     if Gamestate == "rescueYuna" and StepCounter == 3:

Diff for: FFX_Baaj.py

@@ -29,14 +29,27 @@ def Entrance():
     FFX_memory.closeMenu()
 
     #Now back into the water
-    FFXC.set_movement(0, 1)
-    time.sleep(1)
-    FFXC.set_movement(1, 1)
-    time.sleep(0.3)
-    FFXC.set_movement(0, 1)
-    print("Mark 1")
-    time.sleep(35)
-    print("Mark 2")
+    checkpoint = 0
+    while not FFX_memory.battleActive():
+        if FFX_memory.userControl():
+            print("Baaj movement: ", checkpoint)
+            if checkpoint == 6:
+                FFX_memory.clickToEventTemple(0)
+                checkpoint += 1
+            
+            #General pathing
+            elif FFX_targetPathing.setMovement(FFX_targetPathing.baajRamp(checkpoint)) == True:
+                checkpoint += 1
+                print("Checkpoint reached: ", checkpoint)
+    
+    #FFXC.set_movement(0, 1)
+    #time.sleep(1)
+    #FFXC.set_movement(1, 1)
+    #time.sleep(0.3)
+    #FFXC.set_movement(0, 1)
+    #print("Mark 1")
+    #time.sleep(35)
+    #print("Mark 2")
     FFXC.set_neutral()
 
     #Battles
@@ -149,12 +162,27 @@ def ABboat1() :
     FFXC.set_value('BtnA', 1)
     FFX_memory.clickToControl()
 
-    time.sleep(12)
-    FFXC.set_neutral()
+    time.sleep(2)
 
 def ABswimming1() :
     complete = 0
 
+    print("Swimming down from the boat")
+    while FFX_memory.getMap() != 288:
+        if FFX_memory.userControl():
+            FFX_targetPathing.setMovement([-300,-300])
+            FFXC.set_value('BtnA', 1)
+        else:
+            FFXC.set_neutral()
+            if FFX_Screen.BattleScreen() :
+                print("Battle Start (Al Bhed swimming section)")
+                FFX_Battle.stealAndAttack()
+                print("Battle End (Al Bhed swimming section)")
+            elif FFX_memory.menuOpen():
+                print("Battle Complete screen")
+                FFX_Xbox.menuB()
+    
+    FFXC.set_neutral()
     print("Swimming towards airship")
     while FFX_memory.getMap() != 64 :
         pos = FFX_memory.getCoords()

Diff for: FFX_Gagazet.py

@@ -281,7 +281,7 @@ def cave():
                 FFXC.set_neutral()
 
                 print("Now the trial has started.")
-                FFX_Xbox.SkipDialog(4)
+                FFX_Xbox.SkipDialog(2.8)
                 FFX_Screen.awaitPixel(1184,226,(255,255,255))
                 time.sleep(1.2)
                 FFX_Xbox.menuB() #Attempting for first shot

Diff for: FFX_Reset.py

@@ -9,13 +9,17 @@
 #FFXC = FFX_Xbox.FFXC
 
 def resetToMainMenu():
+    FFXC.set_neutral()
     if FFX_memory.battleActive():
         print("Battle is active. Forcing battle to end so we can soft reset.")
         FFX_memory.resetBattleEnd()
         FFX_memory.clickToControl()
     print("Resetting - 2 seconds")
     time.sleep(2)
     while not FFX_memory.getMap() in [23,348,349]:
+        print("----------Attempting reset")
+        print("FFX map: ", FFX_memory.getMap())
+        print("----------")
         FFX_memory.setMapReset()
         time.sleep(0.1)
         FFX_memory.forceMapLoad()

Diff for: FFX_memory.py

@@ -318,9 +318,9 @@ def getMovementVectors():
 def getCamera():
     global baseValue
     angle = baseValue + 0x008A86B8
-    z = baseValue + 0x008A86F0
     x = baseValue + 0x008A86F8
     y = baseValue + 0x008A8700
+    z = baseValue + 0x008A86FC
     angle2 = baseValue + 0x008A86C0
 
     key = process.get_pointer(angle)