Kilika look ahead extends.

And also, other minor bug fixes for other bosses.

Author: coderwilson

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]

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:

battle/main.py

@@ -419,12 +419,12 @@ def kilika_woods(valefor_charge=True, best_charge: int = 99, next_battle=[]):
                     break
                 elif screen.faint_check():
                     revive()
-                elif not 1 in memory.main.get_active_battle_formation():
-                    buddy_swap(Yuna)
                 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)

load_game.py

@@ -553,7 +553,24 @@ def kilika_rng_manip():
     # Kilika start, RNG01
     # 1904657448
     logger.warning("==== Hard setting value for testing")
-    memory.main.set_rng_by_index(value=1904657448, index=1)
+    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

memory/main.py

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