Merge pull request #209 from coderwilson/coder_SS_and_nem_improvements

Coder ss and nem improvements

Author: coderwilson

Diff for: json_ai_files/save_sphere_details.json

@@ -103,6 +103,13 @@
                 "y": -123.12351989746094,
                 "diag": 19
             }
+        },
+        "3205": {
+            "1": {
+                "x": 195.7930450439453,
+                "y": -123.12351989746094,
+                "diag": 23
+            }
         }
     },
     "106": {
@@ -182,6 +189,13 @@
                 "y": 189.910888671875,
                 "diag": 39
             }
+        },
+        "3205": {
+            "8": {
+                "x": -309.834716796875,
+                "y": 189.910888671875,
+                "diag": 43
+            }
         }
     },
     "285": {
@@ -217,5 +231,86 @@
                 "diag": 26
             }
         }
+    },
+    "322": {
+        "3205": {
+            "7": {
+                "x": 222.18992614746094,
+                "y": -247.14520263671875,
+                "diag": 15
+            }
+        }
+    },
+    "263": {
+        "3205": {
+            "11": {
+                "x": -34.357666015625,
+                "y": -5.029695987701416,
+                "diag": 114
+            }
+        }
+    },
+    "307": {
+        "3205": {
+            "9": {
+                "x": 3.555485963821411,
+                "y": 5.817317962646484,
+                "diag": 166
+            }
+        }
+    },
+    "98": {
+        "3205": {
+            "9": {
+                "x": 46.96438217163086,
+                "y": -251.98614501953125,
+                "diag": 34
+            }
+        }
+    },
+    "19": {
+        "3205": {
+            "13": {
+                "x": -309.6885986328125,
+                "y": -476.92022705078125,
+                "diag": 55
+            }
+        }
+    },
+    "18": {
+        "3205": {
+            "14": {
+                "x": -62.44031524658203,
+                "y": -501.2289733886719,
+                "diag": 51
+            }
+        }
+    },
+    "128": {
+        "3205": {
+            "9": {
+                "x": 234.0980682373047,
+                "y": 141.98843383789062,
+                "diag": 68
+            }
+        }
+    },
+    "82": {
+        "3205": {
+            "10": {
+                "x": 102.513671875,
+                "y": -243.84413146972656,
+                "diag": 89
+            }
+        }
+    },
+    "137": {
+        "3205": {
+            "15": {
+                "x": -10.619672775268555,
+                "y": 241.5653533935547,
+                "diag": 31
+            }
+        }
     }
 }

Diff for: load_game.py

@@ -2,15 +2,15 @@
 import os
 from pathlib import Path
 
-import area.dream_zan
-import logs
 import memory.main
 import pathing
 import screen
 import vars
+from gamestate import game
 import xbox
 import zz_airship_path
-from gamestate import game
+import area.dream_zan
+import logs
 
 # This file is intended to load the game to a saved file.
 # This assumes that the save is the first non-auto-save in the list of saves.
@@ -19,7 +19,7 @@
 game_vars = vars.vars_handle()
 
 
-def load_into_game(gamestate: str, step_counter: str):
+def load_into_game(gamestate:str, step_counter:str):
     if not (gamestate == "Luca" and step_counter == 3):
         area.dream_zan.new_game(gamestate)
         game.start_time = logs.time_stamp()
@@ -198,8 +198,20 @@ def load_into_game(gamestate: str, step_counter: str):
     if gamestate == "Nem_Farm" and step_counter == 8:
         load_save_num(73)
     if gamestate == "Nem_Farm" and step_counter == 9:
-        load_save_num(75)
-        game_vars.set_nem_checkpoint_ap(3)  # See nemesis.menu
+        #Start of Nemesis farm
+        #import nemesis.menu
+        #import memory.main
+        load_save_num(19)
+        game_vars.set_nem_checkpoint_ap(27)  # See nemesis.menu
+        game_vars.end_game_version_set(4)
+        #memory.main.arena_array_nines()
+        #while not memory.main.get_tidus_slvl() >= 70:
+        #    nemesis.menu.perform_next_grid()
+        #    memory.main.set_tidus_slvl(memory.main.get_tidus_slvl()+1)
+    if gamestate == "Nem_Farm" and step_counter == 11:
+        load_save_num(20)
+        game_vars.set_nem_checkpoint_ap(27)  # See nemesis.menu
+        game_vars.end_game_version_set(4)
     if gamestate == "Nem_Farm" and step_counter == 13:
         load_save_num(17)
         game_vars.set_nem_checkpoint_ap(7)  # See nemesis.menu
@@ -241,7 +253,6 @@ def load_into_game(gamestate: str, step_counter: str):
         memory.main.check_nea_armor()
     memory.main.check_nea_armor()
 
-
 def get_saved_files():
     saveFilesFull = sorted(
         Path(game_vars.game_save_path()).iterdir(), key=os.path.getmtime

Diff for: memory/main.py

@@ -4464,7 +4464,6 @@ def arena_array():
         retArray.append(process.readBytes(key, 1))
     return retArray
 
-
 def arena_farm_check(
     zone: str = "besaid", end_goal: int = 10, report=False, return_array=False
 ):

Diff for: nemesis/arenaPrep.py

@@ -217,44 +217,14 @@ def return_to_airship():
         while not nemesis.targetPath.set_movement([-4, -3]):
             pass
 
-    if memory.main.get_map() == 263:  # Thunder plains
-        while not nemesis.targetPath.set_movement([-39, -18]):
-            pass
-
-    if memory.main.user_control():
-        while memory.main.user_control():
-            nemesis.targetPath.set_movement([ssDetails[0], ssDetails[1]])
-            xbox.tap_b()
-            memory.main.wait_frames(1)
-    try:
-        FFXC.set_neutral()
-    except:
-        FFXC = xbox.controller_handle()
-        FFXC.set_neutral()
+    save_sphere.approach_save_sphere()
     FFXC.set_neutral()
-
-    while not memory.main.get_map() in [194, 374]:
-        if memory.main.get_map() == 307 and memory.main.get_coords()[1] < -5:
-            while not nemesis.targetPath.set_movement([-4, -21]):
-                pass
-            while not nemesis.targetPath.set_movement([-2, -2]):
-                pass
-        else:
-            FFXC.set_neutral()
-            if memory.main.save_menu_open():
-                xbox.tap_a()
-            elif memory.main.diag_progress_flag() == ssDetails[2]:
-                # print("Cursor test:", memory.saveMenuCursor())
-                if memory.main.save_menu_cursor() != 1:
-                    xbox.menu_down()
-                else:
-                    xbox.menu_b()
-            elif memory.main.user_control():
-                nemesis.targetPath.set_movement([ssDetails[0], ssDetails[1]])
-                xbox.menu_b()
-            elif memory.main.diag_skip_possible():
-                xbox.menu_b()
-            memory.main.wait_frames(4)
+    while memory.main.save_menu_cursor() != 1:
+        FFXC.set_neutral()
+        xbox.menu_down()
+        memory.main.wait_frames(1)
+    xbox.menu_b()
+    memory.main.await_control()
     print("Return to Airship Complete.")
     memory.main.clear_save_menu_cursor()
     memory.main.clear_save_menu_cursor_2()
@@ -1541,12 +1511,14 @@ def kilika_farm(cap_num: int = 1):
                 and checkpoint < 14
             ):
                 checkpoint = 14
-            elif checkpoint == 14 and not memory.main.arena_farm_check(
-                zone="kilika", end_goal=cap_num, report=False
-            ):
-                checkpoint -= 2
-                print("Checkpoint reached: ", checkpoint)
-
+            elif checkpoint == 14:
+                if not memory.main.arena_farm_check(
+                    zone="kilika", end_goal=cap_num, report=False
+                ):
+                    checkpoint -= 2
+                    print("Checkpoint reached: ", checkpoint)
+                else:
+                    return_to_airship()
             elif checkpoint == 4:
                 memory.main.click_to_event_temple(7)
                 checkpoint += 1
@@ -1690,11 +1662,11 @@ def miihen_farm(cap_num: int = 1):
     checkpoint = 0
     last_cp = checkpoint
     while not memory.main.get_map() in [194, 374]:
+        # Checkpoint notify
+        if last_cp != checkpoint:
+            print("Checkpoint reached: ", checkpoint)
+            last_cp = checkpoint
         if memory.main.user_control():
-            # Checkpoint notify
-            if last_cp != checkpoint:
-                print("Checkpoint reached: ", checkpoint)
-                last_cp = checkpoint
             if checkpoint == 92:
                 FFXC.set_neutral()
                 while memory.main.user_control():
@@ -1784,6 +1756,13 @@ def miihen_farm(cap_num: int = 1):
             # Garuda late farming logic
             elif checkpoint in [61, 62, 63] and prefArea >= 5:
                 checkpoint = 100
+            elif checkpoint == 146 and prefArea == 5:
+                checkpoint -= 2
+                if neArmor:
+                    menu.remove_all_nea()
+                    miihen_next(end_goal=cap_num)
+                    print("Next area: ", prefArea)
+                    neArmor = False
             elif checkpoint in [104, 146, 158]:
                 FFXC.set_neutral()
                 memory.main.click_to_event()
@@ -1801,13 +1780,6 @@ def miihen_farm(cap_num: int = 1):
                 miihen_next(end_goal=cap_num)
                 print("Next area: ", prefArea)
                 neArmor = False
-            elif checkpoint == 145 and prefArea == 5:
-                checkpoint -= 2
-                if neArmor:
-                    menu.remove_all_nea()
-                    miihen_next(end_goal=cap_num)
-                    print("Next area: ", prefArea)
-                    neArmor = False
             elif checkpoint == 150 and prefArea == 6:
                 checkpoint -= 2
                 if neArmor:

Diff for: save_sphere.py

@@ -57,7 +57,6 @@ def approach_save_sphere():
     target_coords = memory.main.get_actor_coords(target_actor)
     target_details = get_save_sphere_settings(target_actor)
     print("Approaching actor: ", target_actor)
-    FFXC.set_neutral()
     while not (
         memory.main.diag_progress_flag() == target_details[2]
         and memory.main.diag_skip_possible()
@@ -87,11 +86,11 @@ def approach_save_sphere():
                 memory.main.wait_frames(2)
                 memory.main.clear_save_menu_cursor()
                 memory.main.clear_save_menu_cursor_2()
-                while memory.main.user_control():
-                    pathing.set_movement([target_coords[0], target_coords[1]])
-                    xbox.tap_b()
-                    memory.main.wait_frames(6)
-                memory.main.wait_frames(20)
+                # while memory.main.user_control():
+                #     pathing.set_movement([target_coords[0], target_coords[1]])
+                #     xbox.tap_b()
+                #     memory.main.wait_frames(6)
+                # memory.main.wait_frames(20)
                 target_details = get_save_sphere_settings(target_actor)
             else:
                 FFXC.set_neutral()
@@ -102,6 +101,8 @@ def approach_save_sphere():
                 elif memory.main.diag_skip_possible():
                     print("Mark 3", memory.main.diag_progress_flag())
                     xbox.tap_b()
+    FFXC.set_neutral()
+
 
 
 def disengage_save_sphere():