Merge branch 'main' into dev/logging

Author: orkaboy

Diff for: area/mac_woods.py

@@ -1,6 +1,8 @@
+import logging
+from typing import List
+
 import battle.boss
 import battle.main
-import logging
 import logs
 import memory.main
 import menu
@@ -10,45 +12,69 @@
 import vars
 import xbox
 
+logger = logging.getLogger(__name__)
+
 logger = logging.getLogger(__name__)
 game_vars = vars.vars_handle()
 
 FFXC = xbox.controller_handle()
 
 
+def wait_for_rng2_weakness(valid_weakness: List[int]):
+    while True:
+        current_weakness = memory.main.get_next_rng2() % 4
+        logger.debug(
+            f"Valid Weakness: {valid_weakness}, Current Weakness: {current_weakness}"
+        )
+        if current_weakness in valid_weakness:
+            logger.info("Weakness has lined up.")
+            return
+
+
+def calculate_possible_weaknesses() -> List[int]:
+    items_contained = []
+    for i, item_val in enumerate([27, 24, 30, 32]):
+        if memory.main.get_use_items_slot(item_val) != 255:
+            items_contained.append(i)
+    return items_contained
+
+
 def arrival(rikku_charged):
     logger.info("Arriving at Macalania Woods")
     memory.main.click_to_control()
     memory.main.full_party_format("mwoodsneedcharge")
     memory.main.close_menu()
 
-    # Rikkus charge, Fish Scales, and Arctic Winds
-    woods_vars = [False, False, False]
-    woods_vars[0] = rikku_charged
-
     last_gil = 0  # for first chest
     checkpoint = 0
-    total_battles = 0
     while memory.main.get_map() != 221:  # All the way to O'aka
         if memory.main.user_control():
             # Events
             if checkpoint == 14:  # First chest
                 if last_gil != memory.main.get_gil_value():
                     if last_gil == memory.main.get_gil_value() - 2000:
                         checkpoint += 1
-                        logger.debug(f"Chest obtained. Updating checkpoint: {checkpoint}")
+                        logger.debug(
+                            f"Chest obtained. Updating checkpoint: {checkpoint}"
+                        )
                     else:
                         last_gil = memory.main.get_gil_value()
                 else:
                     FFXC.set_movement(1, 1)
                     xbox.tap_b()
             elif checkpoint == 59:
-                if not woods_vars[0]:
-                    checkpoint -= 2
-                elif not woods_vars[1] and not woods_vars[2]:
+                logger.debug(f"Rikku Charge: {rikku_charged}")
+                if not rikku_charged:
                     checkpoint -= 2
                 else:  # All good to proceed
                     checkpoint += 1
+            elif checkpoint == 60:
+                logger.info("Waiting for RNG2 to sync up for Sphermiroph Weakness.")
+                items_contained = calculate_possible_weaknesses()
+                logger.info(f"We currently can do: {items_contained}")
+                FFXC.set_neutral()
+                wait_for_rng2_weakness(items_contained)
+                checkpoint += 1
 
             # Map changes
             elif checkpoint < 18 and memory.main.get_map() == 241:
@@ -63,19 +89,28 @@ def arrival(rikku_charged):
         else:
             FFXC.set_neutral()
             if screen.battle_screen():
-                logger.debug(f"variable check 1: {woods_vars}")
-                woods_vars = battle.main.m_woods(woods_vars)
-                logger.debug(f"variable check 2: {woods_vars}")
-                if memory.main.overdrive_state()[6] == 100:
+                battle.main.m_woods()
+                rikku_charged = memory.main.overdrive_state()[6] == 100
+                logger.info(
+                    "Rikku charged" if rikku_charged else "Rikku is not charged."
+                )
+                party_hp = memory.main.get_hp()
+                if (
+                    party_hp[0] < 450
+                    or (party_hp[6] < 180 and not rikku_charged)
+                    or party_hp[2] + party_hp[4] < 500
+                ):
+                    battle.main.heal_up(full_menu_close=False)
+                if rikku_charged:
                     memory.main.full_party_format("mwoodsgotcharge")
                 else:
                     memory.main.full_party_format("mwoodsneedcharge")
-                total_battles += 1
+                memory.main.close_menu()
+                if checkpoint == 61:
+                    checkpoint = 60
             elif not memory.main.battle_active() and memory.main.diag_skip_possible():
                 xbox.tap_b()
 
-    # logs.write_stats("Mac Woods battles:")
-    # logs.write_stats(total_battles)
     # Save sphere
     FFXC.set_movement(-1, 1)
     memory.main.wait_frames(2)

Diff for: battle/boss.py

@@ -828,46 +828,35 @@ def spherimorph():
                 else:
                     battle.main.defend()
             elif turnchar == 6:
-                if rikkuturns == 0:
-                    logger.debug("Throwing Grenade to check element")
+                mix_dmg_rolls = sum(memory.main.rikku_mix_damage())
+                logger.debug(f"Mix will do {mix_dmg_rolls} damage.")
+                if mix_dmg_rolls < memory.main.get_enemy_current_hp()[0]:
+                    logger.debug("Throwing Grenade because of damage rolls")
                     grenadeslotnum = memory.main.get_use_items_slot(35)
                     battle.main.use_item(grenadeslotnum, "none")
-                    if memory.main.get_char_weakness(20) == 1:
-                        spell_num = 4  # Ice
-                    elif memory.main.get_char_weakness(20) == 2:
-                        spell_num = 1  # Fire
-                    elif memory.main.get_char_weakness(20) == 4:
-                        spell_num = 3  # Water
-                    elif memory.main.get_char_weakness(20) == 8:
-                        spell_num = 2  # Thunder
-
-                    # spell_num = screen.spherimorph_spell()
                 elif not battle.main.spheri_spell_item_ready():
                     if 5 not in memory.main.get_active_battle_formation():
                         battle.main.buddy_swap_lulu()
                     else:
                         battle.main.defend()
-                else:
+                elif yunaTurn and kimTurn:
                     logger.debug("Starting Rikkus overdrive")
-                    # logs.write_stats("Spherimorph spell used:")
-                    if spell_num == 1:
-                        # ogs.write_stats("Fire")
+                    logger.debug("Full Damage Values:")
+                    logger.debug(memory.main.rikku_mix_damage())
+                    if spellNum == 1:
                         logger.debug("Creating Ice")
                         battle.main.rikku_full_od("spherimorph1")
-                    elif spell_num == 2:
-                        # logs.write_stats("Water")
+                    elif spellNum == 2:
                         logger.debug("Creating Water")
                         battle.main.rikku_full_od("spherimorph2")
-                    elif spell_num == 3:
-                        # logs.write_stats("Thunder")
+                    elif spellNum == 3:
                         logger.debug("Creating Thunder")
                         battle.main.rikku_full_od("spherimorph3")
-                    elif spell_num == 4:
-                        # logs.write_stats("Ice")
+                    elif spellNum == 4:
                         logger.debug("Creating Fire")
                         battle.main.rikku_full_od("spherimorph4")
-
-                rikkuturns += 1
+                else:
+                    battle.main.defend()
 
     if not game_vars.csr():
         xbox.skip_dialog(5)

Diff for: battle/main.py

@@ -1,17 +1,21 @@
 import battle.overdrive
 import battle.utils
 import logs
+import logging
 import memory.main
 import rng_track
 import screen
 import vars
 import xbox
 from memory.main import s32
 
+
 game_vars = vars.vars_handle()
 
 FFXC = xbox.controller_handle()
 
+logger = logging.getLogger(__name__)
+
 
 def tap_targeting():
     print(
@@ -1566,24 +1570,26 @@ def thunder_plains(section):
         heal_up()
     memory.main.close_menu()
     print("Ready to continue onward.")
-
+    
 
 @battle.utils.speedup_decorator
-def m_woods(woods_vars):
+def m_woods():
     print("Logic depends on completion of specific goals. In Order:")
-    print("Rikku charged, stolen Fish Scale, stolen Arctic Wind")
-    print(woods_vars)
     encounter_id = memory.main.get_encounter_id()
     print("------------- Battle Start - Battle Number:", encounter_id)
+    need_arctic_wind, need_fish_scale = False, False
     while not memory.main.battle_complete():  # AKA end of battle screen
         if memory.main.turn_ready():
+            if memory.main.get_use_items_slot(24) == 255:
+                need_arctic_wind = True
+            if memory.main.get_use_items_slot(32) == 255:
+                need_fish_scale = True
             turnchar = memory.main.get_battle_char_turn()
-            if not woods_vars[1] or not woods_vars[2]:
-                if encounter_id in [171, 172, 175]:
-                    if encounter_id == 175 and memory.main.next_steal_rare():
-                        print("No steal on Chimera, it will be rare which is no good.")
-                        flee_all()
-                    elif (
+            rikku_charged = memory.main.get_overdrive_battle(6) == 100
+            logging.info(f"Rikku charge state: {rikku_charged}")
+            if not rikku_charged:
+                if need_arctic_wind or need_fish_scale and encounter_id in [171, 172, 175]:
+                    if (
                         check_petrify_tidus()
                         or 6 not in memory.main.get_battle_formation()
                     ):
@@ -1592,32 +1598,32 @@ def m_woods(woods_vars):
                     elif 6 not in memory.main.get_active_battle_formation():
                         if (
                             encounter_id == 175
-                            and memory.main.get_use_items_slot(24) == 255
+                            and need_arctic_wind
                         ):
                             buddy_swap_rikku()
                         elif (
                             encounter_id in [171, 172]
-                            and memory.main.get_use_items_slot(32) == 255
+                            and need_fish_scale
                         ):
                             buddy_swap_rikku()
                         else:
                             flee_all()
                     elif turnchar == 6:
                         if (
                             encounter_id == 175
-                            and memory.main.get_use_items_slot(24) == 255
+                            and need_arctic_wind
                         ):
                             print("Marker 2")
                             steal()
                         elif (
                             encounter_id == 172
-                            and memory.main.get_use_items_slot(32) == 255
+                            and need_fish_scale
                         ):
                             print("Marker 3")
                             steal_down()
                         elif (
                             encounter_id == 171
-                            and memory.main.get_use_items_slot(32) == 255
+                            and need_fish_scale
                         ):
                             print("Marker 4")
                             steal_right()
@@ -1627,36 +1633,18 @@ def m_woods(woods_vars):
                         else:
                             print("Escaping")
                             flee_all()
+                    elif memory.main.get_overdrive_battle(6) != 100:
+                        escape_one()
                     else:
-                        if woods_vars[0] or memory.main.get_overdrive_battle(6) == 100:
-                            if (
-                                encounter_id in [171, 172]
-                                and memory.main.get_use_items_slot(32) == 255
-                            ):
-                                escape_one()
-                            elif (
-                                encounter_id == 175
-                                and memory.main.get_use_items_slot(24) == 255
-                            ):
-                                escape_one()
-                            else:
-                                flee_all()
-                        else:
-                            escape_one()
-                else:
-                    print("Fleeing with ", turnchar)
-                    flee_all()
-            elif not woods_vars[0]:
-                if turnchar == 6:
+                        flee_all()
+                elif turnchar == 6:
                     if memory.main.next_steal_rare(pre_advance=2):
                         # Manip for crit
                         _steal()
                     else:
-                        attack_by_num(num=6)
+                        defend()
                 elif 6 not in memory.main.get_active_battle_formation():
                     buddy_swap_rikku()
-                elif memory.main.get_overdrive_battle(6) == 100:
-                    flee_all()
                 else:
                     escape_one()
             elif memory.main.next_steal_rare(pre_advance=2):
@@ -1670,27 +1658,9 @@ def m_woods(woods_vars):
                 print("##Looking ahead, no need to manip")
                 flee_all()
 
-    print("Battle complete, now to deal with the aftermath.")
+    logger.info("Battle complete, now to deal with the aftermath.")
     memory.main.click_to_control_3()
-    print("M.woods, back in control")
-    if memory.main.overdrive_state()[6] == 100:
-        woods_vars[0] = True
-    if memory.main.get_use_items_slot(32) != 255:
-        woods_vars[1] = True
-    if memory.main.get_use_items_slot(24) != 255:
-        woods_vars[2] = True
-    print("Checking battle formation.")
-    print("Party format is now good. Let's check health.")
-    # Heal logic
-    party_hp = memory.main.get_hp()
-    if party_hp[0] < 450 or party_hp[6] < 180 or party_hp[2] + party_hp[4] < 500:
-        heal_up()
-    memory.main.close_menu()
-    print("And last, we'll update variables.")
-    print("Rikku charged, stolen Fish Scale, stolen Arctic Wind")
-    print(woods_vars)
-    print("HP is good. Onward!")
-    return woods_vars
+    logger.debug("M.woods, back in control")
 
 
 def spheri_spell_item_ready():

Diff for: battle/utils.py

@@ -16,11 +16,7 @@ def _monitor_battle():
             pass
         fast = False
         while memory.main.battle_active():
-            if (
-                fast
-                and memory.main.auditory_dialog_playing()
-                or memory.main.diag_skip_possible()
-            ):
+            if fast and memory.main.auditory_dialog_playing():
                 memory.main.set_game_speed(0)
                 fast = False
             elif not fast:

Diff for: memory/main.py

@@ -4,6 +4,7 @@
 import os.path
 import struct
 import time
+from typing import List
 from collections import Counter
 from math import cos, sin
 
@@ -4159,6 +4160,13 @@ def next_crit(character: int, char_luck: int, enemy_luck: int) -> int:
                 return x
     return 255
 
+def rikku_mix_damage() -> List[int]:
+    initial_rng_vals = rng_array_from_index(index=26, array_len = 9)
+    dmg_rng = [(s32(x) & 31) + 0xf0 for x in initial_rng_vals[1:]]
+    base_dmg = 18 * 50
+    initial_damage = [(x * base_dmg) // 256 for x in dmg_rng]
+    weakness_damage = [int(x * 1.5) for x in initial_damage]
+    return weakness_damage
 
 def future_attack_will_crit(
     character: int, char_luck: int, enemy_luck: int, attack_index: int = 0
@@ -4557,6 +4565,8 @@ def rng_from_index(index: int = 20):
     global base_value
     return process.read(base_value + mem_target)
 
+def get_next_rng2():
+    return roll_next_rng(rng_from_index(2), 2) & 0x7FFFFFFF & 0xFFFF
 
 def rng_array_from_index(index: int = 20, array_len: int = 20):
     ret_val = [rng_from_index(index)]  # First value is the current value