Merge pull request #290 from coderwilson/coder_nem_4

Attack soft-lock fix

Author: coderwilson

Diff for: area/kilika.py

@@ -92,6 +92,8 @@ def select_best_of_two(coming_battles):
 def forest_1():
     logger.info("Kilika forest 1")
     kilika_battles = 0
+    best_of_two = 99 # Used to find the best battle coming up.
+    advances = 2 # Used to find the best battle coming up.
     next_battle = []
     import rng_track
 
@@ -117,7 +119,6 @@ def forest_1():
                     checkpoint = 83
             if checkpoint == 83 and not valefor_charge:
                 checkpoint = 81
-                best_of_two = 99
             if checkpoint == 83 and memory.main.get_map() == 65:
                 checkpoint = 84
             if checkpoint == 37 and game_vars.skip_kilika_luck():
@@ -158,10 +159,15 @@ def forest_1():
             if memory.main.battle_active():
                 if checkpoint < 9:
                     battle.main.lancet_tutorial()
-                    next_two = rng_track.coming_battles(
-                        area="kilika_woods", battle_count=2
-                    )
-                    best_of_two = select_best_of_two(next_two)
+                    while best_of_two == 99:
+                        next_two = rng_track.coming_battles(
+                            area="kilika_woods", battle_count=advances
+                        )
+                        best_of_two = select_best_of_two(next_two)
+                        advances += 1
+                        if advances > 150:
+                            logger.error("No valid battles in the next 150.")
+                            break
                     next_battle = rng_track.coming_battles(
                         area="kilika_woods", battle_count=1
                     )[0]

Diff for: battle/boss.py

@@ -301,12 +301,15 @@ def sin_fin():
                 logger.debug("Tidus defend")
             elif Yuna.is_turn():
                 battle.main.buddy_swap(Lulu)  # Yuna out, Lulu in
-                CurrentPlayer().cast_black_magic_spell(1, target_id=23, direction="r")
             elif Kimahri.is_turn():
                 battle.main.lancet_target(target=23, direction="r")
                 kim_turn = True
             elif Lulu.is_turn():
                 CurrentPlayer().cast_black_magic_spell(1, target_id=23, direction="r")
+            elif not 5 in memory.main.get_active_battle_formation():
+                battle.main.buddy_swap(Lulu)
+            elif not 3 in memory.main.get_active_battle_formation():
+                battle.main.buddy_swap(Kimahri)
             else:
                 CurrentPlayer().defend()
         if fin_turns >= 3 and kim_turn:

Diff for: battle/main.py

@@ -420,9 +420,11 @@ def kilika_woods(valefor_charge=True, best_charge: int = 99, next_battle=[]):
                 elif screen.faint_check():
                     revive()
                 elif Kimahri.is_turn() or Lulu.is_turn():
-                    if memory.main.get_battle_char_slot(4) >= 3:
+                    if not 1 in memory.main.get_active_battle_formation():
+                        buddy_swap(Yuna)
+                    elif not 4 in memory.main.get_active_battle_formation():
                         buddy_swap(Wakka)
-                    elif memory.main.get_battle_char_slot(0) >= 3:
+                    elif not 0 in memory.main.get_active_battle_formation():
                         buddy_swap(Tidus)
                     else:
                         buddy_swap(Yuna)

Diff for: json_ai_files/save_load_details.json

@@ -65,7 +65,7 @@
                 "end_game_version_val": "0",
                 "nea_zone": "0",
                 "nem_ap_val": "1",
-                "special_movement": "none"
+                "special_movement": "Kilika_rng_manip"
             }
         }
     },

Diff for: load_game.py

@@ -34,6 +34,8 @@ def move_after_load(spec_move: str):
         load_miihen_start()
     elif spec_move == "MRR":
         load_mrr()
+    elif spec_move == "Kilika_rng_manip":
+        kilika_rng_manip()
 
 
 def load_into_game(gamestate: str, step_counter: str):
@@ -547,6 +549,28 @@ def load_baaj():
     FFXC.set_neutral()
     memory.main.wait_frames(30 * 0.04)
 
+def kilika_rng_manip():
+    # Kilika start, RNG01
+    # 1904657448
+    logger.warning("==== Hard setting value for testing")
+    rng_value = 1904657448
+    memory.main.set_rng_by_index(value=rng_value, index=1)
+    
+    #Basically, hunt until we don't find a good battle in 'advances'
+    advances = 5
+    import rng_track
+    import area.kilika
+    next_two = rng_track.coming_battles(
+        area="kilika_woods", battle_count=advances, extra_advances=1
+    )
+    while area.kilika.select_best_of_two(next_two) != 99:
+        rng_value += 1
+        memory.main.set_rng_by_index(value=rng_value, index=1)
+        next_two = rng_track.coming_battles(
+            area="kilika_woods", battle_count=advances, extra_advances=1
+        )
+    logger.warning(f"==== Chosen Value: {rng_value}")
+    
 
 def besaid_trials():
     # Exit Tent

Diff for: memory/main.py

@@ -2406,6 +2406,12 @@ def reset_battle_end():
     process.write_bytes(key, 1, 1)
 
 
+def set_rng_by_index(value:int=0, index:int=1):
+    global base_value
+    global process
+    key = base_value + 0x00D35ED8 + (index * 0x4)
+    process.write_bytes(key, value, 4)
+
 def set_rng_2():
     global base_value
     global process

Diff for: players/base.py

@@ -144,8 +144,16 @@ def _target_specific_id(self, target_id: int, direction: str = "l"):
     def attack(
         self, target_id: Optional[int] = None, direction_hint: Optional[str] = "u"
     ):
+        skip_direction = False
         if target_id is None:
-            logger.debug("Attack")
+            logger.debug("Attack enemy, first targetted.")
+        elif target_id in range(7):
+            logger.debug(f"Attack player character {target_id}")
+        elif memory.main.get_enemy_current_hp()[target_id-20] == 0:
+            logger.debug(
+                f"Enemy {target_id} is not attack-able. Resorting to basic attack."
+            )
+            skip_direction = True
         else:
             logger.debug(
                 f"Attacking a specific target with id {target_id}, direction hint is {direction_hint}"
@@ -159,7 +167,7 @@ def attack(
         self.navigate_to_battle_menu(attack_menu_id)
         while memory.main.main_battle_menu():
             xbox.tap_b()
-        if target_id is not None:
+        if target_id is not None and not skip_direction:
             self._target_specific_id(target_id, direction_hint)
         self._tap_targeting()
 
@@ -369,7 +377,9 @@ def escaped(self) -> bool:
 
     def is_defending(self) -> bool:
         defend_byte = self._read_char_battle_state_address(offset=PlayerMagicNumbers.DEFENDING)
-        return (defend_byte >> 3) == 1
+        result = (defend_byte >> 3) & 1 == 1
+        logger.warning(f"Character is defending: {result}")
+        return result
 
     def hp(self, combat=False) -> int:
         if not combat: