Merge pull request #9 from HannibalSnekter/main

Many Small Changes

Author: coderwilson

FFX_Auto_Main.py

@@ -9,7 +9,7 @@
 
 #Gamestate, "none" for new game, or set to a specific section to start from the first save.
 #See the if statement tree below to determine starting position for Gamestate.
-Gamestate = "ThunderPlains"
+Gamestate = "Moonflow"
 StepCounter = 3
 #Gamestate = "Zanarkand"
 #StepCounter = 4
@@ -438,21 +438,22 @@ def reportGamestate():
 if Gamestate == "ThunderPlains" and StepCounter == 1:
     status = [False,False,False]
     reportGamestate()
-    status = FFX_ThunderPlains.southPathing()
+    status = FFX_ThunderPlains.southPathing(blitzWin)
     StepCounter = 2
 
 if Gamestate == "ThunderPlains" and StepCounter == 2:
     FFX_ThunderPlains.agency()
     StepCounter = 3
 
 if Gamestate == "ThunderPlains" and StepCounter == 3:
-    FFX_ThunderPlains.northPathing(status)
+    status = FFX_ThunderPlains.northPathing(status)
+    rikkucharged = status[0]
     Gamestate = "Macalania"
     StepCounter = 1
 
 if Gamestate == "Macalania" and StepCounter == 1:
     reportGamestate()
-    FFX_mWoods.arrival()
+    FFX_mWoods.arrival(rikkucharged)
     StepCounter = 2
 
 if Gamestate == "Macalania" and StepCounter == 2:

FFX_Battle.py

@@ -111,7 +111,7 @@ def arrival():
             FFX_Battle.fleeAll()
             hpCheck = FFX_memory.getHP()
             print(hpCheck)
-            if hpCheck[0] != 520 or hpCheck[5] != 644 or hpCheck[4] != 1030:
+            if hpCheck[0] < 520 or hpCheck[3] < 644 or hpCheck[2] < 1030:
                 FFX_Battle.healUp(3)
             else:
                 print("No need to heal up. Moving onward.")

FFX_MRR.py

@@ -271,7 +271,7 @@ def northBank():
     FFXC.set_value('AxisLy', 0)
 
     FFX_Battle.mixTutorial()
-    FFX_memory.fullPartyFormat('kimahri')
+    FFX_memory.fullPartyFormat_New("postbunyip", 10)
 
     FFXC.set_value('AxisLx', 1)
     FFXC.set_value('AxisLy', 1)

FFX_Moonflow.py

@@ -888,7 +888,7 @@ def checkCharge(pos):
             FFX_Logs.writeLog("Character in position 2 is NOT charged.")
             return False
 
-def partySize():
+def partySize_Old():
     if PixelTest(1401,791,(199, 162, 255)):
         return 3
     elif PixelTest(1401,747,(199, 162, 255)):

FFX_Screen.py

@@ -7,15 +7,19 @@
 
 FFXC = FFX_Xbox.FFXC
 
-def southPathing():
+def southPathing(blitzwin):
 
     print("Start of the Thunder Plains section")
     checkpoint = 0
     stepCount = 0
     stepMax = 500
     complete = 0
-    status = [False,False,False] #Rikku charged, Light Curtain, Lunar Curtain
-    FFX_memory.fullPartyFormat('kimahri')
+    status = [False,False,False,False] #Rikku charged, Light Curtain, Lunar Curtain, Grenade Thrown
+    status[2] = blitzwin
+    speedcount = FFX_memory.getSpeed()
+    if speedcount >= 14:
+        status[3] = True
+    FFX_memory.fullPartyFormat_New('postbunyip', 11)
     while complete == 0:
         if FFX_Screen.dodgeLightning():
             print("Dodge")
@@ -224,7 +228,7 @@ def agency(blitzWin):
     FFX_Xbox.menuB()
     time.sleep(0.2)
     FFX_Xbox.menuRight()
-    speedNeeded = 15 - speedCount #15 plus two (Spherimorph, Flux), minus 1 because it starts on 1
+    speedNeeded = 14 - speedCount #15 plus two (Spherimorph, Flux), minus 1 because it starts on 1
     if speedNeeded > 1:
         speedNeeded = 1 #Limit so we don't over-spend and run out of money.
     if speedNeeded > 0:
@@ -473,4 +477,6 @@ def northPathing(status):
     FFXC.set_value('AxisLx', 1)
     FFX_Xbox.SkipDialog(6)
     FFXC.set_value('AxisLy', 0)
-    FFXC.set_value('AxisLx', 0) #Approaching the party
+    FFXC.set_value('AxisLx', 0) #Approaching the party
+
+    return status

FFX_ThunderPlains.py

@@ -30,7 +30,7 @@ def desert1():
             if turnchar == 0:
                 if tidusturns < 2:
                     FFX_Battle.attack("none")
-                elif len(FFX_memory.getBattleFormation()) > 2:
+                elif FFX_memory.partySize() > 2:
                     FFX_Battle.tidusFlee()
                 else:
                     FFX_Battle.defend()

FFX_home.py

@@ -7,9 +7,12 @@
 
 FFXC = FFX_Xbox.FFXC
 
-def arrival():
+def arrival(rikkucharged):
     FFX_Screen.clickToMap1()
-    FFX_memory.fullPartyFormat('kimahri')
+    if rikkucharged == True:
+        FFX_memory.fullPartyFormat_New("mwoodsgotcharge", 11)
+    else:
+        FFX_memory.fullPartyFormat_New("mwoodsneedcharge", 11)
     #Start by getting away from the save sphere
     FFXC.set_value('AxisLy', 1)
     FFXC.set_value('AxisLx', 1)
@@ -27,6 +30,7 @@ def arrival():
     lastCP = 0
     complete = 0
     woodsVars = [False, False, False] #Rikku's charge, Fish Scales, and Arctic Winds
+    woodsVars[0] = rikkucharged
     #As a side note, Rikku is always charged in thunder plains.
     while complete == 0:
         if lastCP != checkpoint: