Merge pull request #152 from shenef/main

formatting and cleanup

Author: coderwilson

.gitignore

@@ -1,8 +1,4 @@
 __pycache__/
-memory.__pycache__/
-battle.__pycache__/
-area.__pycache__/
 *.py[cod]
 *.txt
 none
-*.pyc

Logs/.gitkeep

@@ -16,14 +16,14 @@ We strive to only include code that is not seed-specific which causes the codeba
 
 This project has been showcased on:  
 
-- Q4G HH2 in Nov 2021  
+- Q4G HH2 - Nov 2021  
 <https://www.twitch.tv/videos/1205160940>
 
-- TASgiving Nov 2021  
+- TASgiving - Nov 2021  
 <https://www.youtube.com/watch?v=Gvz-XdiNuKI>
 
-- RPG Limit Break 2022 on October 17th 2022  
-_pending | <https://horaro.org/rpglb/2022>_
+- RPG Limit Break 2022 - October 17th 2022  
+<https://www.youtube.com/watch?v=C598HEcfdgE>
 
 ## Setup
 

Logs/temp

@@ -12,11 +12,11 @@ def engage():
         if memory.main.userControl():
             pDownSlot = memory.main.getItemSlot(6)
             if memory.main.getMap() == 58:
-                memory.main.fullPartyFormat('tidkimwak')
+                memory.main.fullPartyFormat("tidkimwak")
                 FFXC.set_movement(0, 1)
                 memory.main.awaitEvent()
                 FFXC.set_neutral()
-            #elif checkpoint == 2 and memory.main.getItemCountSlot(pDownSlot) >= 10:
+            # elif checkpoint == 2 and memory.main.getItemCountSlot(pDownSlot) >= 10:
             #    checkpoint = 4
             elif checkpoint in [2, 3]:
                 checkpoint = 4

README.md

@@ -99,7 +99,7 @@ def mainPath():
         if memory.main.userControl():
             if checkpoint == 1:
                 memory.main.touchSaveSphere()
-                memory.main.fullPartyFormat('mrr1')
+                memory.main.fullPartyFormat("mrr1")
                 checkpoint += 1
             elif checkpoint == 4:
                 print("Up the first lift")
@@ -127,7 +127,9 @@ def mainPath():
             elif checkpoint >= 54 and checkpoint <= 56:  # 400 gil guy
                 if memory.main.rngSeed() in [160, 31]:
                     checkpoint = 57
-                elif memory.main.getGilvalue() != lastGilValue:  # check if we got the 400 from the guy
+                elif (
+                    memory.main.getGilvalue() != lastGilValue
+                ):  # check if we got the 400 from the guy
                     if memory.main.getGilvalue() == lastGilValue + 400:
                         print("We've procured the 400 gil from the guy.")
                         checkpoint = 57  # now to the actual lift
@@ -145,7 +147,10 @@ def mainPath():
             elif checkpoint == 66:
                 xbox.SkipDialog(1)
                 print("Up the final lift")
-                print("======== Next Kimahri crit:", memory.main.nextCrit(character=3, charLuck=18, enemyLuck=15))
+                print(
+                    "======== Next Kimahri crit:",
+                    memory.main.nextCrit(character=3, charLuck=18, enemyLuck=15),
+                )
                 checkpoint += 1
             elif checkpoint == 68:
                 FFXC.set_movement(0, -1)
@@ -157,10 +162,23 @@ def mainPath():
                 checkpoint = 71  # Into Battle Site zone (upper, cannon area)
             elif targetPathing.setMovement(targetPathing.mrrMain(checkpoint)):
                 if checkpoint == 61:
-                    if memory.main.nextCrit(character=3, charLuck=18, enemyLuck=15) in [2, 3, 4, 5, 6, 7, 9]:
+                    if memory.main.nextCrit(character=3, charLuck=18, enemyLuck=15) in [
+                        2,
+                        3,
+                        4,
+                        5,
+                        6,
+                        7,
+                        9,
+                    ]:
                         critManip = True
                         # Try to end on 1.
-                        print("+++++++++++ We can manip:", memory.main.nextCrit(character=3, charLuck=18, enemyLuck=15))
+                        print(
+                            "+++++++++++ We can manip:",
+                            memory.main.nextCrit(
+                                character=3, charLuck=18, enemyLuck=15
+                            ),
+                        )
                         checkpoint = 59
                     else:
                         checkpoint += 1
@@ -190,7 +208,10 @@ def mainPath():
                     menu.mrrGrid2()
                 memory.main.closeMenu()
                 print("MRR battle complete")
-                print("======== Next Kimahri crit:", memory.main.nextCrit(character=3, charLuck=18, enemyLuck=15))
+                print(
+                    "======== Next Kimahri crit:",
+                    memory.main.nextCrit(character=3, charLuck=18, enemyLuck=15),
+                )
                 battleCount += 1
             elif memory.main.menuOpen():
                 xbox.tapB()
@@ -229,11 +250,17 @@ def battleSite():
                 FFXC.set_neutral()
                 menu.battleSiteOaka1()
                 menu.battleSiteOaka2()
-                print("======== Next Kimahri crit:", memory.main.nextCrit(character=3, charLuck=18, enemyLuck=15))
+                print(
+                    "======== Next Kimahri crit:",
+                    memory.main.nextCrit(character=3, charLuck=18, enemyLuck=15),
+                )
                 checkpoint += 1
             elif checkpoint == 8:
                 memory.main.touchSaveSphere()
-                print("======== Next Kimahri crit:", memory.main.nextCrit(character=3, charLuck=18, enemyLuck=15))
+                print(
+                    "======== Next Kimahri crit:",
+                    memory.main.nextCrit(character=3, charLuck=18, enemyLuck=15),
+                )
                 checkpoint += 1
             elif checkpoint == 12:
                 FFXC.set_movement(1, 0)
@@ -279,7 +306,9 @@ def guiAndAftermath():
                 FFXC.set_movement(0, 1)
                 memory.main.awaitEvent()
                 checkpoint += 1
-            elif targetPathing.setMovement(targetPathing.battleSiteAftermath(checkpoint)):
+            elif targetPathing.setMovement(
+                targetPathing.battleSiteAftermath(checkpoint)
+            ):
                 checkpoint += 1
                 print("Checkpoint reached:", checkpoint)
         else:

Showcase/chocoEater.py

@@ -38,7 +38,7 @@ def Entrance():
     while memory.main.getStoryProgress() < 48:
         if screen.BattleScreen():
             if memory.main.getEncounterID() == 2:
-                battle.main.attack('none')
+                battle.main.attack("none")
             else:
                 battle.main.defend()
         elif memory.main.diagSkipPossible():
@@ -113,7 +113,7 @@ def Klikk_fight():
         xbox.tapB()
 
     xbox.clickToBattle()
-    battle.main.useItem(0, 'none')  # Tidus self-potion
+    battle.main.useItem(0, "none")  # Tidus self-potion
     screen.awaitTurn()
     battle.boss.klikk()
 
@@ -122,7 +122,7 @@ def distance(n1, n2):
     try:
         player1 = memory.main.getActorCoords(actorNumber=n1)
         player2 = memory.main.getActorCoords(actorNumber=n2)
-        return (abs(player1[1] - player2[1]) + abs(player1[0] - player2[0]))
+        return abs(player1[1] - player2[1]) + abs(player1[0] - player2[0])
     except Exception as x:
         print("Exception:", x)
         return 999
@@ -142,18 +142,18 @@ def ABboat1():
             xbox.menuA()
             xbox.menuB()
     print("In the water!")
-    FFXC.set_value('BtnA', 1)
+    FFXC.set_value("BtnA", 1)
     while not memory.main.userControl():
-        FFXC.set_value('BtnB', 1)
+        FFXC.set_value("BtnB", 1)
         memory.main.waitFrames(1)
-        FFXC.set_value('BtnB', 0)
+        FFXC.set_value("BtnB", 0)
         memory.main.waitFrames(1)
-    FFXC.set_value('BtnA', 1)
+    FFXC.set_value("BtnA", 1)
     FFXC.set_movement(-1, -1)
     memory.main.waitFrames(20)
 
     while memory.main.getMap() != 288:
-        FFXC.set_value('BtnA', 1)
+        FFXC.set_value("BtnA", 1)
         FFXC.set_movement(0, -1)
         if memory.main.battleActive():
             FFXC.set_neutral()
@@ -170,7 +170,7 @@ def ABswimming1():
     while memory.main.getMap() != 288:
         if memory.main.userControl():
             targetPathing.setMovement([-300, -300])
-            FFXC.set_value('BtnA', 1)
+            FFXC.set_value("BtnA", 1)
         else:
             FFXC.set_neutral()
             if screen.BattleScreen():
@@ -188,9 +188,9 @@ def ABswimming1():
         if memory.main.userControl():
             if memory.main.getMap() == 71:
                 FFXC.set_movement(0, -1)
-                FFXC.set_value('BtnA', 1)
+                FFXC.set_value("BtnA", 1)
             else:
-                FFXC.set_value('BtnA', 0)
+                FFXC.set_value("BtnA", 0)
                 if pos[1] > -230:
                     targetPathing.setMovement([-343, -284])
                 elif pos[1] > -410:
@@ -212,7 +212,7 @@ def ABswimming2():
     # Quick heal-up to make sure we're full HP on Rikku
     memory.main.awaitControl()
     FFXC.set_movement(1, -1)
-    FFXC.set_value('BtnA', 1)
+    FFXC.set_value("BtnA", 1)
     memory.main.touchSaveSphere()
 
     memory.main.clearSaveMenuCursor2()

area/MRR.py

@@ -82,7 +82,9 @@ def Beach():
                 battle.main.piranhas()
                 besaidBattles += 1
                 encounterID = memory.main.getEncounterID()
-                if encounterID == 11 or (encounterID == 12 and memory.main.battleType() == 1):
+                if encounterID == 11 or (
+                    encounterID == 12 and memory.main.battleType() == 1
+                ):
                     goodBattles += 1
             elif memory.main.diagSkipPossible() or memory.main.menuOpen():
                 xbox.tapB()
@@ -229,15 +231,14 @@ def leaving():
                     FFXC.set_movement(1, 0)
                 FFXC.set_neutral()
                 xbox.clickToBattle()
-                battle.main.attack('none')
+                battle.main.attack("none")
                 xbox.clickToBattle()
-                battle.main.thunder('none')
+                battle.main.thunder("none")
                 memory.main.clickToControl()
                 checkpoint += 1
             elif checkpoint == 24:  # Hilltop
                 memory.main.clickToEventTemple(2)
-                print("Ready for SS Liki menu - (var)",
-                      gameVars.earlyTidusGrid())
+                print("Ready for SS Liki menu - (var)", gameVars.earlyTidusGrid())
                 if memory.main.getTidusSlvl() >= 3:
                     menu.Liki()
                     gameVars.earlyTidusGridSetTrue()
@@ -265,28 +266,36 @@ def leaving():
                 xbox.tapB()
             elif memory.main.cutsceneSkipPossible():
                 xbox.skipScene(fast_mode=True)
-            elif checkpoint > 25 and checkpoint < 30 and screen.BattleScreen():  # Kimahri fight
+            elif (
+                checkpoint > 25 and checkpoint < 30 and screen.BattleScreen()
+            ):  # Kimahri fight
                 FFXC.set_neutral()
                 healCount = 0
                 while memory.main.battleActive():
                     if screen.BattleScreen():
                         battleHP = memory.main.getBattleHP()
                         enemyHP = memory.main.getEnemyCurrentHP()
-                        if not gameVars.earlyTidusGrid() and battleHP[0] < 120 and enemyHP[0] > 119:
+                        if (
+                            not gameVars.earlyTidusGrid()
+                            and battleHP[0] < 120
+                            and enemyHP[0] > 119
+                        ):
                             if memory.main.rngSeed() == 31:
-                                battle.main.attack('none')
+                                battle.main.attack("none")
                             else:
-                                battle.main.usePotionCharacter(0, 'l')
+                                battle.main.usePotionCharacter(0, "l")
                                 healCount += 1
                         else:
-                            battle.main.attack('none')
+                            battle.main.attack("none")
                     elif memory.main.diagSkipPossible():
                         xbox.tapB()
                 # logs.writeStats("Kimahri heal count:")
                 # logs.writeStats(healCount)
                 memory.main.clickToControl()
             # Valefor summon tutorial
-            elif checkpoint in [31, 32, 33, 34, 35, 36, 37, 38] and screen.BattleScreen():
+            elif (
+                checkpoint in [31, 32, 33, 34, 35, 36, 37, 38] and screen.BattleScreen()
+            ):
                 xbox.clickToBattle()
                 while not screen.turnAeon():
                     if memory.main.turnReady():
@@ -303,18 +312,22 @@ def leaving():
                         battle.main.aeonSpell(1)
                 print("Now to open the menu")
                 memory.main.clickToControl()
-                memory.main.fullPartyFormat('Besaid')
+                memory.main.fullPartyFormat("Besaid")
                 checkpoint += 1
             elif checkpoint == 39 and screen.BattleScreen():  # Dark Attack tutorial
                 battle.main.escapeAll()
                 memory.main.clickToControl()
-                memory.main.fullPartyFormat('Besaid2')
+                memory.main.fullPartyFormat("Besaid2")
                 checkpoint += 1
-            elif checkpoint > 39 and screen.BattleScreen():  # One forced battle on the way out of Besaid
+            elif (
+                checkpoint > 39 and screen.BattleScreen()
+            ):  # One forced battle on the way out of Besaid
                 battle.main.besaid()
 
             # Map changes
-            elif checkpoint > 10 and checkpoint < 24 and memory.main.getMap() == 67:  # Hilltop
+            elif (
+                checkpoint > 10 and checkpoint < 24 and memory.main.getMap() == 67
+            ):  # Hilltop
                 checkpoint = 24
             elif checkpoint < 27 and memory.main.getMap() == 21:  # Kimahri map
                 checkpoint = 27