Merge pull request #249 from shenef/main

import and formatting fixes

Author: shenef

Diff for: area/djose.py

@@ -359,9 +359,9 @@ def trials():
         memory.main.click_to_control()
         logger.info("Leaving the fayth room")
 
-        while not pathing.set_movement([-1,-61]):
+        while not pathing.set_movement([-1, -61]):
             pass
-        FFXC.set_movement(1,1)
+        FFXC.set_movement(1, 1)
         memory.main.await_event()
         FFXC.set_neutral()
 

Diff for: area/home.py

@@ -241,14 +241,15 @@ def desert():
                 logger.debug("-----------------------------Flag statuses (end)")
             elif memory.main.diag_skip_possible():
                 xbox.tap_b()
-    
+
     # Move to save sphere
     checkpoint = 0
     while checkpoint < 7:
         if pathing.set_movement(pathing.home(checkpoint)):
             checkpoint += 1
             logger.debug(f"Checkpoint reached: {checkpoint}")
 
+
 def find_summoners():
     logger.info("Desert complete. Starting Home section")
     menu.home_grid()

Diff for: area/mrr.py

@@ -224,14 +224,15 @@ def main_path():
     logger.info("End of MRR section. Status:")
     logger.info("[Yuna AP, Kim AP, Valefor OD steps, then other stuff]")
     logger.info(status)
-    
+
     # Get close to save sphere
     checkpoint = 0
     while checkpoint < 4:
         if pathing.set_movement(pathing.battle_site(checkpoint)):
             checkpoint += 1
             logger.debug(f"Checkpoint reached: {checkpoint}")
 
+
 def battle_site():
     memory.main.await_control()
     if game_vars.get_l_strike() >= 2:

Diff for: battle/main.py

@@ -910,6 +910,7 @@ def miihen_road(self_destruct=False):
     logger.debug(f"self_destruct flag: {game_vars.self_destruct_get()}")
 
 
+# move to battle.aeon
 def aeon_shield():
     logger.info("Aeon Shield function")
     screen.await_turn()
@@ -926,6 +927,7 @@ def aeon_shield():
     tap_targeting()
 
 
+# move to battle.aeon
 def aeon_boost():
     logger.info("Aeon Boost function")
     screen.await_turn()
@@ -944,6 +946,7 @@ def aeon_boost():
     tap_targeting()
 
 
+# move to battle.aeon
 def aeon_dismiss():
     logger.info("Aeon Dismiss function")
     screen.await_turn()
@@ -3836,6 +3839,7 @@ def thunder_target(target, direction):
     tap_targeting()
 
 
+# move to battle.aeon
 def aeon_summon(position):
     logger.debug(f"Summoning Aeon {position}")
     while not memory.main.main_battle_menu():
@@ -3870,14 +3874,17 @@ def aeon_summon(position):
                 pbar.update()
 
 
+# move to battle.aeon
 def aeon_spell(position):
     aeon_spell_direction(position, None)
 
 
+# move to battle.aeon
 def aeon_spell_2(position, direction):
     aeon_spell_direction(position, direction)
 
 
+# move to battle.aeon
 def aeon_spell_direction(position, direction):
     logger.debug(f"Aeon casting a spell. Special direction: {direction}")
     while memory.main.battle_menu_cursor() != 21:

Diff for: json_ai_files/oblitz_results.json

@@ -13,6 +13,28 @@
             "victory": true
         }
     },
+    "1": {
+        "78287081": {
+            "duration": 437,
+            "victory": true
+        },
+        "191289547": {
+            "duration": 534,
+            "victory": false
+        },
+        "596621567": {
+            "duration": 486,
+            "victory": false
+        },
+        "720440554": {
+            "duration": 548,
+            "victory": true
+        },
+        "1563227986": {
+            "duration": 473,
+            "victory": false
+        }
+    },
     "16": {
         "453439872": {
             "duration": 487,
@@ -47,8 +69,8 @@
             "victory": false
         },
         "314267917": {
-            "duration": 623,
-            "victory": false
+            "duration": 572,
+            "victory": true
         },
         "328977576": {
             "duration": 432,

Diff for: load_game.py

@@ -1,9 +1,9 @@
 # Libraries and Core Files
+import json
 import logging
 import os
 from pathlib import Path
 
-import json
 import area.dream_zan
 import logs
 import memory.main
@@ -13,7 +13,7 @@
 import xbox
 import zz_airship_path
 from gamestate import game
-import logging
+
 logger = logging.getLogger(__name__)
 
 # This file is intended to load the game to a saved file.
@@ -23,27 +23,28 @@
 FFXC = xbox.controller_handle()
 game_vars = vars.vars_handle()
 
-def move_after_load(spec_move:str):
+
+def move_after_load(spec_move: str):
     if spec_move == "miihen_laugh":
         load_miihen_start_laugh()
     elif spec_move == "miihen_no_laugh":
         load_miihen_start()
     elif spec_move == "MRR":
         load_mrr()
-    
 
-def load_into_game(gamestate:str, step_counter:str):
+
+def load_into_game(gamestate: str, step_counter: str):
     logger.debug(f"Loading game state {gamestate} | {step_counter}")
     # If wrong maps are loaded in, try to reset.
     if memory.main.get_map() not in [23, 348, 349]:
         reset.reset_to_main_menu()
     area.dream_zan.new_game(gamestate=gamestate)
-    
+
     # Now to get details for the load/save files
-    filepath = os.path.join('json_ai_files', 'save_load_details.json')
+    filepath = os.path.join("json_ai_files", "save_load_details.json")
     with open(filepath, "r") as fp:
         results = json.load(fp)
-    
+
     # Try to use new method, otherwise try old method.
     try:
         step_counter = str(step_counter)
@@ -52,7 +53,7 @@ def load_into_game(gamestate:str, step_counter:str):
             logger.debug("Failure 1")
             load_into_game_old(gamestate=gamestate, step_counter=step_counter)
             return
-        
+
         # Init variables so we don't crash later
         save_num_conf = 0
         nemesis_conf = "none"
@@ -61,11 +62,11 @@ def load_into_game(gamestate:str, step_counter:str):
         nea_zone = "none"
         nem_ap = "none"
         spec_move = "none"
-        
+
         print(results[gamestate][step_counter].keys())
         for key in results[gamestate][step_counter]:
             save_num = int(results[gamestate][step_counter][key]["save_num"])
-            
+
             nemesis = key
             if save_num > 200:
                 pass
@@ -82,36 +83,37 @@ def load_into_game(gamestate:str, step_counter:str):
                 logger.debug(f"End game version {end_ver}")
                 logger.debug(f"NEA zone {nea_zone}")
                 logger.debug(f"Nemesis checkpoint {nem_ap}")
-        
+
         if save_num_conf == 0:
             logger.debug("Failure 2")
             load_into_game_old(gamestate=gamestate, step_counter=step_counter)
             return
         else:
             # Perform the load
             load_save_num(int(save_num_conf))
-            game_vars.set_blitz_win(value=(blitz_win=="True"))
+            game_vars.set_blitz_win(value=(blitz_win == "True"))
             game_vars.end_game_version_set(value=int(end_ver))
             game_vars.set_nea_zone(value=int(nea_zone))
             game_vars.set_nem_checkpoint_ap(value=int(nem_ap))
-            
+
             if spec_move != "none":
                 logger.debug(f"Special movement needed: {spec_move}")
                 move_after_load(spec_move=spec_move)
             else:
                 logger.debug("No Special movement needed")
-        
+
             logger.debug(f"Blitz Win {game_vars.get_blitz_win()}")
             logger.debug(f"End game version {game_vars.end_game_version()}")
             logger.debug(f"NEA zone {game_vars.get_nea_zone()}")
             logger.debug(f"Nemesis checkpoint {game_vars.nem_checkpoint_ap()}")
             memory.main.check_nea_armor()
-        
+
     except Exception as err_msg:
         logger.debug(f"Error message: {err_msg}")
         logger.debug("Failure 3")
         load_into_game_old(gamestate=gamestate, step_counter=step_counter)
 
+
 def load_into_game_old(gamestate: str, step_counter: str):
     logger.debug(f"Loading game, old method: {gamestate} | {step_counter}")
     if not (gamestate == "Luca" and step_counter == 3):
@@ -699,18 +701,19 @@ def load_miihen_start():
 
 def load_mrr():
     memory.main.await_control()
-    while not pathing.set_movement([-49,166]):
+    while not pathing.set_movement([-49, 166]):
         pass
-    while not pathing.set_movement([-43,285]):
+    while not pathing.set_movement([-43, 285]):
         pass
-    while not pathing.set_movement([-39,354]):
+    while not pathing.set_movement([-39, 354]):
         pass
-    
+
     FFXC.set_movement(0, 1)
     memory.main.await_event()
     FFXC.set_neutral()
     memory.main.click_to_control()
 
+
 def load_mrr_2():
     FFXC.set_movement(0, 1)
     memory.main.wait_frames(30 * 0.3)