Merge pull request #223 from coderwilson/fix_4x_speed_at_wendigo

Fix 4x speed at wendigo

Author: MrTyton

battle/main.py

@@ -2271,7 +2271,6 @@ def fullheal(target: int, direction: str):
 
 
 # Process written by CrimsonInferno
-@battle.utils.speedup_decorator
 def wendigo_res_heal(turn_char: int, use_power_break: int, tidus_max_hp: int):
     print("Wendigo Res/Heal function")
     party_hp = memory.main.get_battle_hp()

battle/utils.py

@@ -15,19 +15,20 @@ def _monitor_battle():
         while not memory.main.battle_active():
             pass
         fast = False
+        old_game_speed = memory.main.get_game_speed()
         while memory.main.battle_active():
             if fast and memory.main.auditory_dialog_playing():
                 memory.main.set_game_speed(0)
                 fast = False
             elif not fast:
                 memory.main.set_game_speed(2)
                 fast = True
-        memory.main.set_game_speed(0)
+        memory.main.set_game_speed(old_game_speed)
 
     def wrapper(*args, **kwargs):
         if game_vars.get_battle_speedup():
             logger.debug(f"Speeding battle up: {func.__name__}")
-            monitor = threading.Thread(target=_monitor_battle)
+            monitor = threading.Thread(target=_monitor_battle, daemon=True)
             monitor.start()
             ret_val = func(*args, **kwargs)
             monitor.join()

memory/main.py

@@ -2295,6 +2295,10 @@ def set_encounter_rate(set_val):
     process.write_bytes(key, set_val, 1)
 
 
+def get_game_speed():
+    return read_val(0x008E82A4)
+
+
 def set_game_speed(set_val):
     global base_value
 

nemesis/arenaPrep.py

@@ -490,23 +490,23 @@ def advanced_battle_logic():
                             # Double Gemini, two different locations
                             if memory.main.get_use_items_slot(42) < 100:
                                 battle.main.use_item(
-                                    memory.main.get_use_items_slot(42), rikku_flee=False
+                                    memory.main.get_use_items_slot(42), rikku_flee=True
                                 )
                             else:
                                 battle.main.defend()
                         elif encounter_id == 386:
                             # Armor bomber guys
                             if memory.main.get_use_items_slot(41) < 100:
                                 battle.main.use_item(
-                                    memory.main.get_use_items_slot(41), rikku_flee=False
+                                    memory.main.get_use_items_slot(41), rikku_flee=True
                                 )
                             else:
                                 battle.main.defend()
                         elif encounter_id in [430]:
                             # Demonolith
                             if memory.main.get_use_items_slot(41) < 100:
                                 battle.main.use_item(
-                                    memory.main.get_use_items_slot(41), rikku_flee=False
+                                    memory.main.get_use_items_slot(41), rikku_flee=True
                                 )
                             else:
                                 battle.main.defend()
@@ -517,7 +517,7 @@ def advanced_battle_logic():
                             )
                             if memory.main.get_use_items_slot(41) < 100:
                                 battle.main.use_item(
-                                    memory.main.get_use_items_slot(41), rikku_flee=False
+                                    memory.main.get_use_items_slot(41), rikku_flee=True
                                 )
                             else:
                                 battle.main.defend()
@@ -533,13 +533,13 @@ def advanced_battle_logic():
                             # Varuna, use purifying salt to remove haste
                             # Safety potions are fun.
                             battle.main.use_item(
-                                memory.main.get_use_items_slot(63), rikku_flee=False
+                                memory.main.get_use_items_slot(63), rikku_flee=True
                             )
                         elif encounter_id == 426:
                             # Master Tonberry
                             if not sleepPowder:
                                 battle.main.use_item(
-                                    memory.main.get_use_items_slot(37), rikku_flee=False
+                                    memory.main.get_use_items_slot(37), rikku_flee=True
                                 )
                             else:
                                 if memory.main.get_use_items_slot(41) < 100:
@@ -556,7 +556,7 @@ def advanced_battle_logic():
                         ):
                             if not sleepPowder:
                                 battle.main.use_item(
-                                    memory.main.get_use_items_slot(37), rikku_flee=False
+                                    memory.main.get_use_items_slot(37), rikku_flee=True
                                 )
                             else:
                                 if memory.main.get_use_items_slot(41) < 100: