Merge pull request #220 from shenef/main

fix spherimorph exception + formatting fixes

Author: shenef

Diff for: area/baaj.py

@@ -1,3 +1,5 @@
+import logging
+
 import battle.boss
 import battle.main
 import memory.main
@@ -7,7 +9,6 @@
 import screen
 import vars
 import xbox
-import logging
 
 logger = logging.getLogger(__name__)
 

Diff for: area/besaid.py

@@ -1,3 +1,5 @@
+import logging
+
 import battle.main
 import logs
 import memory.main
@@ -6,13 +8,13 @@
 import screen
 import vars
 import xbox
-import logging
 
 FFXC = xbox.controller_handle()
 game_vars = vars.vars_handle()
 
 logger = logging.getLogger(__name__)
 
+
 def beach():
     logger.info("Starting Besaid section. Beach")
     if game_vars.csr():
@@ -240,7 +242,7 @@ def leaving():
                 checkpoint += 1
             elif checkpoint == 24:  # Hilltop
                 memory.main.click_to_event_temple(2)
-                logger.debug(f"Ready for SS Liki menu - (var) {game_vars.early_tidus_grid()}")
+                logger.debug(f"Ready for SS Liki menu: {game_vars.early_tidus_grid()}")
                 if memory.main.get_tidus_slvl() >= 3:
                     menu.liki()
                     game_vars.early_tidus_grid_set_true()

Diff for: area/boats.py

@@ -1,6 +1,7 @@
+import logging
+
 import battle.boss
 import battle.main
-import logging
 import logs
 import memory.main
 import menu
@@ -28,7 +29,7 @@ def ss_liki():
                 checkpoint += 1
             elif checkpoint == 3:  # Talk to Wakka
                 memory.main.click_to_event_temple(3)
-                logger.info(f"Ready for SS Liki menu - (var) {game_vars.early_tidus_grid()}")
+                logger.info(f"Ready for SS Liki menu: {game_vars.early_tidus_grid()}")
                 if not game_vars.early_tidus_grid():
                     menu.liki()
                     memory.main.close_menu()

Diff for: area/djose.py

@@ -1,5 +1,6 @@
-import battle.main
 import logging
+
+import battle.main
 import logs
 import memory.main
 import menu

Diff for: area/dream_zan.py

@@ -1,3 +1,5 @@
+import logging
+
 import battle.boss
 import battle.main
 import battle.overdrive
@@ -9,14 +11,14 @@
 import tts
 import vars
 import xbox
-import logging
 
 game_vars = vars.vars_handle()
 
 FFXC = xbox.controller_handle()
 
 logger = logging.getLogger(__name__)
 
+
 def new_game(gamestate):
     logger.info("Starting the game")
     logger.debug(f"Gamestate: {gamestate}")
@@ -95,7 +97,7 @@ def listen_story():
         if memory.main.get_map() == 132:
             if memory.main.diag_progress_flag() == 1:
                 game_vars.set_csr(False)
-                logger.info("Skipping intro scene, we'll watch this properly in ~8 hours")
+                logger.info("Skipping intro scene, we'll watch this properly later")
                 memory.main.await_control()
             if not game_vars.accessibility_vars()[0]:
                 FFXC.set_value("btn_back", 1)

Diff for: area/gagazet.py

@@ -1,6 +1,7 @@
+import logging
+
 import battle.boss
 import battle.main
-import logging
 import logs
 import memory.main
 import menu
@@ -501,7 +502,9 @@ def wrap_up():
         memory.main.wait_frames(30 * sleep_time)
         logger.info("Talk about not having a life.")
         memory.main.wait_frames(30 * sleep_time)
-        logger.info("Ah well, still have some time. Might as well shout out a few people.")
+        logger.info(
+            "Ah well, still have some time. Might as well shout out a few people."
+        )
         memory.main.wait_frames(30 * sleep_time)
         logger.info(
             "First and most importantly, my wife for putting up with me for two years through this project.",
@@ -511,7 +514,9 @@ def wrap_up():
         memory.main.wait_frames(30 * sleep_time)
         logger.info("Next, DwangoAC. He encouraged me to write my own code to do this.")
         memory.main.wait_frames(30 * sleep_time)
-        logger.info("And he put together the TASbot community which has been hugely helpful.")
+        logger.info(
+            "And he put together the TASbot community which has been hugely helpful."
+        )
         memory.main.wait_frames(30 * sleep_time)
         logger.info("Shout out to DwangoAC and the TASbot Community. You guys rock!!!")
         memory.main.wait_frames(30 * sleep_time)
@@ -545,7 +550,9 @@ def wrap_up():
             "And last, Mr Tyton from the FFX speedrun community has re-written many pieces of my code."
         )
         memory.main.wait_frames(30 * sleep_time)
-        logger.info("He has also done a lot of optimizations I just couldn't get back to.")
+        logger.info(
+            "He has also done a lot of optimizations I just couldn't get back to."
+        )
         memory.main.wait_frames(30 * sleep_time)
         logger.info(
             "Legitimately Tyton pushed this project from decent towards excellent when I was running out of steam."

Diff for: area/guadosalam.py

@@ -1,6 +1,6 @@
+import logging
 import time
 
-import logging
 import memory.main
 import pathing
 import vars
@@ -266,7 +266,7 @@ def guado_skip():
             while memory.main.get_camera()[0] < 0.6:
                 current_time = time.time()
                 if current_time > max_time:
-                    logger.warning("Skip failed for some reason. Moving on without skip.")
+                    logger.warning("Skip failed for some reason. Moving on without it.")
                     break
             memory.main.wait_frames(30 * 0.035)  # Guado potions good!
             xbox.tap_b()

Diff for: area/home.py

@@ -1,7 +1,7 @@
+import logging
 import math
 
 import battle.main
-import logging
 import memory.main
 import menu
 import pathing
@@ -237,7 +237,7 @@ def desert():
                 logger.debug(f"Rikku is charged up: {charge_state}")
                 logger.debug(f"Need more Speed spheres: {need_speed}")
                 logger.debug(f"Need more Power spheres: {need_power}")
-                logger.debug(f"Number of additional items needed before Home: {items_needed}")
+                logger.debug(f"Additional items needed before Home: {items_needed}")
                 logger.debug("-----------------------------Flag statuses (end)")
             elif memory.main.diag_skip_possible():
                 xbox.tap_b()

Diff for: area/kilika.py

@@ -1,6 +1,7 @@
+import logging
+
 import battle.boss
 import battle.main
-import logging
 import logs
 import memory.main
 import menu
@@ -165,8 +166,8 @@ def forest_1():
                 elif checkpoint > 86:
                     battle.boss.geneaux()
                 else:
-                    logger.debug(f"------------This should be battle number: {kilika_battles}")
-                    logger.debug(f"------------Reminder (north-bound only): {next_three}")
+                    logger.debug(f"---- This should be battle number: {kilika_battles}")
+                    logger.debug(f"---- Reminder (north-bound only): {next_three}")
                     valefor_charge = battle.main.kilika_woods(
                         valefor_charge, best_of_two, next_battle
                     )

Diff for: area/luca.py

@@ -1,6 +1,7 @@
+import logging
+
 import battle.boss
 import battle.main
-import logging
 import logs
 import memory.main
 import menu

Diff for: area/mac_temple.py

@@ -1,6 +1,7 @@
+import logging
+
 import battle.boss
 import battle.main
-import logging
 import memory.main
 import menu
 import pathing

Diff for: area/miihen.py

@@ -1,6 +1,7 @@
+import logging
+
 import battle.boss
 import battle.main
-import logging
 import logs
 import memory.main
 import pathing

Diff for: area/moonflow.py

@@ -1,6 +1,7 @@
+import logging
+
 import battle.boss
 import battle.main
-import logging
 import memory.main
 import menu
 import pathing
@@ -46,10 +47,10 @@ def arrival():
                 checkpoint = 49
             elif checkpoint < 54 and memory.main.get_story_progress() == 1045:
                 checkpoint = 54
-                logger.debug(f"Updating checkpoint based on story/map progress: {checkpoint}")
+                logger.debug(f"Updating checkpoint based on progress: {checkpoint}")
             elif checkpoint == 54 and memory.main.get_map() == 188:
                 checkpoint = 55
-                logger.debug(f"Updating checkpoint based on story/map progress: {checkpoint}")
+                logger.debug(f"Updating checkpoint based on progress: {checkpoint}")
 
             # General pathing
             elif pathing.set_movement(pathing.moonflow(checkpoint)):
@@ -63,7 +64,7 @@ def arrival():
                 xbox.tap_b()
             elif memory.main.diag_skip_possible():
                 xbox.tap_b()
-    logger.info("End of approaching section, should now be talking to Lucille/Elma/etc.")
+    logger.info("End of approach section, should now be talking to Lucille/Elma/etc.")
 
 
 def south_bank(checkpoint: int = 0):

Diff for: area/mrr.py

@@ -1,8 +1,8 @@
+import logging
 import time
 
 import battle.boss
 import battle.main
-import logging
 import logs
 import memory.main
 import menu
@@ -62,7 +62,7 @@ def arrival():
                 while memory.main.get_actor_coords(6)[0] < -50:
                     current_time = time.time()
                     if current_time > max_time:
-                        logger.warning("Skip failed for some reason. Moving on without skip.")
+                        logger.warning("Skip seemingly failed. Moving on without it.")
                         clasko_skip = False
                         break
                 memory.main.click_to_control()
@@ -84,10 +84,12 @@ def arrival():
     logger.info("Done with prelim MRR area, now for the real deal.")
     return clasko_skip
 
+
 def log_mrr_kimahri_crit_chance():
     crit_chance = memory.main.next_crit(character=3, char_luck=18, enemy_luck=15)
     logger.debug(f"======== Next Kimahri crit: {crit_chance}")
 
+
 def main_path():
     memory.main.await_control()
     crit_manip = False
@@ -170,7 +172,9 @@ def main_path():
                     ) in [2, 3, 4, 5, 6, 7, 9]:
                         crit_manip = True
                         # Try to end on 1.
-                        logger.debug(f"+++++++++++ We can manip: {memory.main.next_crit(character=3, char_luck=18, enemy_luck=15)}")
+                        logger.debug(
+                            f"+++++++++++ We can manip: {memory.main.next_crit(character=3, char_luck=18, enemy_luck=15)}"
+                        )
                         checkpoint = 59
                     else:
                         checkpoint += 1

Diff for: area/ne_armor.py

@@ -1,5 +1,6 @@
-import battle.main
 import logging
+
+import battle.main
 import logs
 import memory.main
 import menu
@@ -62,7 +63,7 @@ def to_hidden_cave():
                 and memory.main.next_chance_rng_10()
             ):
                 if not last_report:
-                    logger.info("Need more advances before cave enter | no silence grenade")
+                    logger.info("No silence grenade | Advancing further before cave")
                     last_report = True
                 checkpoint -= 2
             elif checkpoint == 9:

Diff for: area/rescue_yuna.py

@@ -1,6 +1,7 @@
+import logging
+
 import battle.boss
 import battle.main
-import logging
 import memory.main
 import menu
 import pathing

Diff for: area/sin.py

@@ -1,6 +1,7 @@
+import logging
+
 import battle.boss
 import battle.main
-import logging
 import memory.main
 import menu
 import pathing

Diff for: area/thunder_plains.py

@@ -1,5 +1,6 @@
-import battle.main
 import logging
+
+import battle.main
 import memory.main
 import menu
 import pathing
@@ -304,7 +305,7 @@ def north_pathing():
 
     FFXC.set_neutral()
     memory.main.await_control()
-    logger.info("Thunder Plains North complete. Moving up to the Macalania save sphere.")
+    logger.info("Thunder Plains North complete. Moving to the Macalania save sphere.")
     if not game_vars.csr():
         FFXC.set_movement(0, 1)
         xbox.skip_dialog(6)

Diff for: area/zanarkand.py

@@ -1,5 +1,6 @@
-import battle.main
 import logging
+
+import battle.main
 import logs
 import memory.get
 import memory.main
@@ -359,6 +360,7 @@ def s_keeper_print_bahamut_crit_chance():
     crit_chance = memory.main.next_crit(character=7, char_luck=17, enemy_luck=15)
     logger.debug(f"Next Aeon Crit: {crit_chance}")
 
+
 def sanctuary_keeper():
     ver = game_vars.end_game_version()
     logger.info("Now prepping for Sanctuary Keeper fight")