Merge remote-tracking branch 'upstream/main'

Author: shenef

Diff for: battle/boss.py

@@ -13,6 +13,7 @@
 logger = logging.getLogger(__name__)
 
 
+@battle.utils.speedup_decorator
 def ammes():
     battle_complete = 0
     count_attacks = 0
@@ -36,6 +37,7 @@ def ammes():
             logger.info("Ammes battle complete")
 
 
+@battle.utils.speedup_decorator
 def tanker():
     logger.info("Fight start: Tanker")
     count_attacks = 0
@@ -63,6 +65,7 @@ def tanker():
             xbox.tap_b()
 
 
+@battle.utils.speedup_decorator
 def klikk():
     logger.info("Fight start: Klikk")
     klikk_attacks = 0
@@ -125,6 +128,7 @@ def klikk():
     memory.main.wait_frames(1)
 
 
+@battle.utils.speedup_decorator
 def tros():
     logs.open_rng_track()
     logger.info("Fight start: Tros")
@@ -215,6 +219,7 @@ def tros():
     memory.main.click_to_control()
 
 
+@battle.utils.speedup_decorator
 def sin_fin():
     logger.info("Fight start: Sin's Fin")
     screen.await_turn()
@@ -266,6 +271,7 @@ def sin_fin():
     xbox.click_to_battle()
 
 
+@battle.utils.speedup_decorator
 def echuilles():
     logger.info("Fight start: Sinspawn Echuilles")
     screen.await_turn()
@@ -316,6 +322,7 @@ def echuilles():
     logs.write_rng_track(memory.main.rng_10_array(array_len=1))
 
 
+@battle.utils.speedup_decorator
 def geneaux():
     logger.info("Fight start: Sinspawn Geneaux")
     xbox.click_to_battle()
@@ -347,6 +354,7 @@ def geneaux():
     memory.main.click_to_control()
 
 
+@battle.utils.speedup_decorator
 def oblitzerator(early_haste):
     logger.info("Fight start: Oblitzerator")
     xbox.click_to_battle()
@@ -393,6 +401,7 @@ def oblitzerator(early_haste):
     # logs.write_stats(memory.s32(memory.rng02()))
 
 
+@battle.utils.speedup_decorator
 def chocobo_eater():
     logger.info("Fight start: Chocobo Eater")
     rng44Last = memory.main.rng_from_index(44)
@@ -493,6 +502,7 @@ def chocobo_eater():
     logger.info("Chocobo Eater battle complete.")
 
 
+@battle.utils.speedup_decorator
 def gui():
     logger.info("Fight start: Sinspawn Gui")
     xbox.click_to_battle()
@@ -661,6 +671,7 @@ def gui():
             xbox.tap_b()
 
 
+@battle.utils.speedup_decorator
 def extractor():
     logger.info("Fight start: Extractor")
     FFXC.set_neutral()
@@ -719,6 +730,7 @@ def extractor():
 
 
 # Process written by CrimsonInferno
+@battle.utils.speedup_decorator
 def spherimorph():
     logger.info("Fight start: Spherimorph")
     xbox.click_to_battle()
@@ -861,6 +873,7 @@ def spherimorph():
         xbox.skip_dialog(5)
 
 
+@battle.utils.speedup_decorator
 def crawler():
     logger.info("Starting battle with Crawler")
     xbox.click_to_battle()
@@ -924,6 +937,7 @@ def crawler():
     memory.main.click_to_control()
 
 
+@battle.utils.speedup_decorator
 def wendigo():
     logger.info("Starting battle with Wendigo")
 
@@ -1118,6 +1132,7 @@ def wendigo():
 
 
 # Process written by CrimsonInferno
+@battle.utils.speedup_decorator
 def evrae():
     logger.info("Starting battle: Evrae")
     tidus_prep = 0
@@ -1270,6 +1285,7 @@ def evrae():
         xbox.skip_scene_spec()
 
 
+@battle.utils.speedup_decorator
 def isaaru():
     xbox.click_to_battle()
     if memory.main.get_encounter_id() < 258:
@@ -1292,6 +1308,7 @@ def isaaru():
     FFXC.set_value("btn_b", 0)
 
 
+@battle.utils.speedup_decorator
 def evrae_altana():
     xbox.click_to_battle()
     if memory.main.get_encounter_id() != 266:
@@ -1320,6 +1337,7 @@ def evrae_altana():
     memory.main.click_to_control()
 
 
+@battle.utils.speedup_decorator
 def seymour_natus():
     aeon_summoned = False
     while not memory.main.user_control():
@@ -1396,6 +1414,7 @@ def seymour_natus():
     return 0
 
 
+@battle.utils.speedup_decorator
 def biran_yenke():
     logger.info("Starting battle with Biran & Yenke")
     xbox.click_to_battle()
@@ -1437,6 +1456,7 @@ def biran_yenke():
     game_vars.end_game_version_set(end_game_version)
 
 
+@battle.utils.speedup_decorator
 def seymour_flux():
     stage = 1
     logger.info("Start: Seymour Flux battle")
@@ -1524,6 +1544,7 @@ def s_keeper_bahamut_crit() -> int:
     return bahamut_crit
 
 
+@battle.utils.speedup_decorator
 def s_keeper():
     xbox.click_to_battle()
     logger.info("Start of Sanctuary Keeper fight")
@@ -1570,6 +1591,7 @@ def s_keeper():
     memory.main.click_to_control()
 
 
+@battle.utils.speedup_decorator
 def omnis():
     logger.info("Fight start: Seymour Omnis")
     xbox.click_to_battle()
@@ -1615,6 +1637,7 @@ def omnis():
     memory.main.click_to_control()
 
 
+@battle.utils.speedup_decorator
 def bfa():
     if memory.main.get_gil_value() < 150000:
         swag_mode = True
@@ -1689,6 +1712,7 @@ def bfa():
             xbox.tap_b()
 
 
+@battle.utils.speedup_decorator
 def yu_yevon():
     logger.info("Ready for Yu Yevon.")
     screen.await_turn()  # No need for skipping dialog