whitespace and code formatting cleanup

Author: shenef

Showcase/chocoEater.py

@@ -1,12 +1,10 @@
-import time
-
 import memory.main
-import screen
 import targetPathing
 import xbox
 
 FFXC = xbox.controllerHandle()
 
+
 def engage():
     checkpoint = 0
     input("Confirm that CSR is running!!!")
@@ -35,6 +33,7 @@ def engage():
             if memory.main.diagSkipPossible():
                 xbox.tapB()
 
+
 def battle():
     memory.main.waitFrames(10)
     chocoIndex = memory.main.actorIndex(actorNum=4200)
@@ -49,4 +48,4 @@ def battle():
     xbox.tapB()
     xbox.tapB()
     xbox.tapB()
-    exit()
+    exit()

area/besaid.py

@@ -52,7 +52,7 @@ def Beach():
             checkpoint = 29
         elif checkpoint == 36 and memory.main.getMap() == 17:
             checkpoint = 37
-        
+
         # Events
         elif memory.main.userControl():
             if checkpoint == 34:  # Into the temple for the first time

area/guadosalam.py

@@ -55,7 +55,7 @@ def arrival():
             xbox.tapB()
         FFXC.set_neutral()
         memory.main.clickToControl3()
-        
+
         while not targetPathing.setMovement([4, -114]):
             pass
         print("Mark1")
@@ -64,7 +64,7 @@ def arrival():
             xbox.tapB()
         FFXC.set_neutral()
         memory.main.clickToControl3()
-    
+
     else:
         while not targetPathing.setMovement([4, -114]):
             pass
@@ -92,11 +92,11 @@ def arrival():
             xbox.tapB()
         FFXC.set_neutral()
         memory.main.clickToControl3()
-    
+
     # Line up for Rikku/Yuna
     while not targetPathing.setMovement([15, -52]):
         pass
-    
+
     while not targetPathing.setMovement([22, -25]):
         pass
     print("Mark5")
@@ -114,7 +114,7 @@ def arrival():
         xbox.tapB()
     FFXC.set_neutral()
     memory.main.clickToControl3()
-    
+
     if not gameVars.csr():
         while not memory.main.cutsceneSkipPossible():
             xbox.tapB()

area/kilika.py

@@ -262,35 +262,37 @@ def trials():
             elif checkpoint < 53 and memory.main.getMap() == 45:  # Inner sanctum
                 checkpoint = 53
 
+
 def trialsEnd():
     # Talking to Wakka
     while memory.main.getStoryProgress() < 346:
         if memory.main.userControl():
             if memory.main.getCoords()[0] < -28:
-                targetPathing.setMovement([-10,-23])
+                targetPathing.setMovement([-10, -23])
             else:
-                targetPathing.setMovement([-20,1])
+                targetPathing.setMovement([-20, 1])
                 xbox.tapB()
         else:
             FFXC.set_neutral()
             if memory.main.diagSkipPossible():
                 xbox.tapB()
-    
+
     #Leave the chamber, then name Ifrit.
     memory.main.clickToControl3()
     while memory.main.userControl():
-        FFXC.set_movement(0,-1)
+        FFXC.set_movement(0, -1)
     FFXC.set_neutral()
     xbox.nameAeon("Ifrit")  # Set Ifrit name
-    
+
     while memory.main.getMap() != 18:
         if memory.main.userControl():
-            FFXC.set_movement(0,-1)
+            FFXC.set_movement(0, -1)
         else:
             FFXC.set_neutral()
             if memory.main.diagSkipPossible():
                 xbox.tapB()
 
+
 def forest3():
     # First, re-order the party
     memory.main.fullPartyFormat('kilika')

area/miihen.py

@@ -10,11 +10,12 @@
 
 FFXC = xbox.controllerHandle()
 
-def post_battle_logic(forceCharge = False):
+
+def post_battle_logic(forceCharge=False):
     if memory.main.overdriveState2()[1] < 43 or (forceCharge and memory.main.overdriveState2()[1] != 100):
         memory.main.fullPartyFormat('kilikawoods1', fullMenuClose=False)
     else:
-        if gameVars.selfDestructGet(): 
+        if gameVars.selfDestructGet():
             memory.main.fullPartyFormat('miihen', fullMenuClose=False)
         else:
             memory.main.fullPartyFormat('djose', fullMenuClose=False)
@@ -26,6 +27,7 @@ def post_battle_logic(forceCharge = False):
         print("No need to heal up. Moving onward.")
     memory.main.closeMenu()
 
+
 def arrival():
     print("Waiting for Yuna/Tidus to stop laughing.")
     FFXC.set_movement(0, 1)

area/neArmor.py

@@ -11,10 +11,11 @@
 
 FFXC = xbox.controllerHandle()
 
+
 def toHiddenCave():
     #Force manip NEA
     if gameVars.marathonSafety():
-        if rngTrack.neaTrack()[1] in [0,1]:
+        if rngTrack.neaTrack()[1] in [0, 1]:
             pass
         else:
             FFXC.set_neutral()
@@ -38,8 +39,7 @@ def toHiddenCave():
                 advanceCount += 1
                 memory.main.advanceRNG13()
                 nextItem, preAdvance13 = rngTrack.itemToBeDropped(enemy='ghost')
-            
-            
+
             if memory.main.nextChanceRNG10() > 10:
                 print("Advance 10 - ", advanceCount)
                 advanceCount += 1
@@ -55,7 +55,7 @@ def toHiddenCave():
             memory.main.waitFrames(9)
             print("===============")
             memory.main.waitFrames(9)
-    
+
     #Regular logic
     memory.main.fullPartyFormat('rikku')
     rngTrack.printManipInfo()
@@ -116,6 +116,7 @@ def toHiddenCave():
     logs.writeStats("NEA extra manip battles:")
     logs.writeStats(prepBattles)
 
+
 def nextGreen():
     nextGreen = memory.main.nextChanceRNG01(version='green')[0][0]
     nextWhite = memory.main.nextChanceRNG01()[0][0]
@@ -126,6 +127,7 @@ def nextGreen():
         if nextGreen >= 2:
             goGreen = True
 
+
 def dropHunt():
     print("Now in the cave. Ready to try to get the NE armor.")
     memory.main.fullPartyFormat('rikku')
@@ -162,7 +164,7 @@ def dropHunt():
                     battle.main.healUp(fullMenuClose=False)
                     memory.main.fullPartyFormat('rikku')
                     memory.main.closeMenu()
-                    
+
                     if nextGreen() and not goGreen:
                         goGreen = True
                     preGhostBattles += 1

battle/main.py

@@ -1,5 +1,3 @@
-import random
-
 import logs
 import memory.main
 import rngTrack
@@ -165,7 +163,7 @@ def useSkill(position: int = 0, target: int = 20):
     _navigate_to_position(position)
     while memory.main.otherBattleMenu():
         xbox.tapB()
-    if target != 20 and memory.main.getEnemyCurrentHP()[target-20] != 0:
+    if target != 20 and memory.main.getEnemyCurrentHP()[target - 20] != 0:
         direction = 'l'
         while memory.main.battleTargetId() != target:
             if direction == 'l':
@@ -776,7 +774,7 @@ def Echuilles():
                     print("Tidus attack")
                     attack('none')
             elif screen.turnWakka():
-                if tidusCounter == 1: #and memory.main.rngSeed() != 160:
+                if tidusCounter == 1:  # and memory.main.rngSeed() != 160:
                     print("Dark Attack")
                     useSkill(0)  # Dark Attack
                 #elif memory.main.getEnemyCurrentHP()[0] <= 558:
@@ -1452,9 +1450,9 @@ def chocoEater():
             if screen.faintCheck() >= 2:
                 print("Attempting revive")
                 if screen.turnKimahri():
-                    if not 0 in memory.main.getActiveBattleFormation():
+                    if 0 not in memory.main.getActiveBattleFormation():
                         buddySwapTidus()
-                    elif not 4 in memory.main.getActiveBattleFormation():
+                    elif 4 not in memory.main.getActiveBattleFormation():
                         buddySwapWakka()
                     else:
                         buddySwapAuron()
@@ -2352,6 +2350,7 @@ def thunderPlains(section):
     memory.main.closeMenu()
     print("Ready to continue onward.")
 
+
 def mWoods(woodsVars):
     print("Logic depends on completion of specific goals. In Order:")
     print("Rikku charged, stolen Fish Scale, stolen Arctic Wind")
@@ -2408,7 +2407,7 @@ def mWoods(woodsVars):
             elif not woodsVars[0]:
                 if turnchar == 6:
                     if memory.main.nextStealRare(preAdvance=2):
-                        #Manip for crit 
+                        # Manip for crit
                         _steal()
                     else:
                         attackByNum(num=6)
@@ -2524,8 +2523,8 @@ def spherimorph():
                     logs.writeRNGTrack("RNG11 before Spherimorph")
                     logs.writeRNGTrack(memory.main.rngArrayFromIndex(index=11, arrayLen=30))
                     #if memory.main.nextStealRare(preAdvance=6):
-                        # One each for Spherimorph, Negator, Crawler, and guados.
-                        # Except we haven't learned Steal yet. That's no good.
+                    # One each for Spherimorph, Negator, Crawler, and guados.
+                    # Except we haven't learned Steal yet. That's no good.
                     #    _steal()
                     #else:
                     defend()
@@ -2604,6 +2603,7 @@ def spherimorph():
     if not gameVars.csr():
         xbox.SkipDialog(5)
 
+
 def negator_with_steal():
     tidusturns = 0
     rikkuturns = 0
@@ -2629,7 +2629,7 @@ def negator_with_steal():
                     xbox.weapSwap(0)
                 elif kimahriturns == 2:
                     _steal()
-                elif not 0 in memory.main.getActiveBattleFormation():
+                elif 0 not in memory.main.getActiveBattleFormation():
                     buddySwapTidus()
                 else:
                     defend()
@@ -2654,7 +2654,7 @@ def negator_with_steal():
                         pass
                     if memory.main.getEnemyCurrentHP()[1] != 0:
                         rikkuturns -= 1
-                elif rikkuturns in [1,2]:
+                elif rikkuturns in [1, 2]:
                     useItem(lightningmarbleslot)
                 elif tidusturns < 2:
                     xbox.weapSwap(0)
@@ -2663,10 +2663,11 @@ def negator_with_steal():
                     rikkuFullOD('crawler')
                 rikkuturns += 1
 
+
 def negator():  # AKA crawler
     print("Starting battle with Crawler")
     xbox.clickToBattle()
-    
+
     if memory.main.nextStealRare(preAdvance=5):
         # One each for two Negators, Crawler, and guados.
         negator_with_steal()
@@ -3418,7 +3419,7 @@ def wendigo():
                 if wendigoresheal(turnchar=turnchar, usepowerbreak=usepowerbreak, tidusmaxHP=tidusmaxHP) == 0:
                     xbox.weapSwap(0)
             else:
-                if usepowerbreak and not powerbreakused and not 2 in memory.main.getActiveBattleFormation():
+                if usepowerbreak and not powerbreakused and 2 not in memory.main.getActiveBattleFormation():
                     print("Swapping to Auron to Power Break")
                     buddySwapAuron()
                 #if memory.main.getEnemyCurrentHP()[1] < stopHealing and memory.main.getBattleHP()[tidusSlot] != 0:
@@ -3445,7 +3446,7 @@ def zu():
     memory.main.clickToControl()
 
 
-def bikanelBattleLogic(status, sandyFightComplete:bool=False):
+def bikanelBattleLogic(status, sandyFightComplete: bool = False):
     # status should be an array length 2
     # [rikkuCharged, speedNeeded, powerNeeded, itemsNeeded]
     encounterID = memory.main.getEncounterID()
@@ -4207,6 +4208,7 @@ def evraeAltana():
 
     memory.main.clickToControl()
 
+
 def evraeAltanaSteal():
     print("=======================================")
     print("Steal logic, we will get two gems")
@@ -4228,6 +4230,7 @@ def evraeAltanaSteal():
     print("=======================================")
     #memory.main.waitFrames(180)
 
+
 def attackHighbridge():
     if memory.main.getEncounterID() == 270:
         attackByNum(22, 'r')
@@ -6790,11 +6793,11 @@ def ghostAdvanceRNG10Silence(silenceSlot: int, owner1: int, owner2: int):
     while memory.main.nextChanceRNG10():
         if memory.main.turnReady():
             if not silenceUsed:
-                if not 6 in memory.main.getActiveBattleFormation():
+                if 6 not in memory.main.getActiveBattleFormation():
                     buddySwapRikku()
                     useItem(slot=silenceSlot)  # Throw silence grenade
                     silenceUsed = True
-                elif not 3 in memory.main.getActiveBattleFormation():
+                elif 3 not in memory.main.getActiveBattleFormation():
                     buddySwapKimahri()
                     useItem(slot=silenceSlot)  # Throw silence grenade
                     silenceUsed = True
@@ -6804,25 +6807,25 @@ def ghostAdvanceRNG10Silence(silenceSlot: int, owner1: int, owner2: int):
                 else:
                     defend()
             #Next, put in preferred team
-            elif owner2 in prefDrop or not owner1 in prefDrop:  # prefer aeon kill
+            elif owner2 in prefDrop or owner1 not in prefDrop:  # prefer aeon kill
                 if screen.turnRikku() or screen.turnKimahri():
                     Steal()
-                elif not 6 in memory.main.getActiveBattleFormation():
+                elif 6 not in memory.main.getActiveBattleFormation():
                     buddySwapRikku()
-                elif not 3 in memory.main.getActiveBattleFormation():
+                elif 3 not in memory.main.getActiveBattleFormation():
                     buddySwapKimahri()
-                elif not 0 in memory.main.getActiveBattleFormation():
+                elif 0 not in memory.main.getActiveBattleFormation():
                     buddySwapTidus()
                 else:
                     defend()
             else:  # Will need a non-Aeon kill
-                if not 6 in memory.main.getActiveBattleFormation():
+                if 6 not in memory.main.getActiveBattleFormation():
                     buddySwapRikku()
-                elif not 0 in memory.main.getActiveBattleFormation():
+                elif 0 not in memory.main.getActiveBattleFormation():
                     buddySwapTidus()
-                elif not 3 in memory.main.getActiveBattleFormation() and memory.main.nextChanceRNG10() > 3:
+                elif 3 not in memory.main.getActiveBattleFormation() and memory.main.nextChanceRNG10() > 3:
                     buddySwapKimahri()
-                elif not 1 in memory.main.getActiveBattleFormation() and memory.main.nextChanceRNG10() <= 3:
+                elif 1 not in memory.main.getActiveBattleFormation() and memory.main.nextChanceRNG10() <= 3:
                     buddySwapYuna()
                 elif screen.turnRikku() or screen.turnKimahri():
                     Steal()