morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 12:11:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

[Jak and Daxter] Auto Detect Install Path after Game Launcher Update #5152

Browse Source
This commit is contained in:
massimilianodelliubaldini
2025-07-07 13:15:37 -04:00
committed by GitHub
parent 95e09c8e2a
commit d4ebace99f
1 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
worlds/jakanddaxter/client.py
View File

@@ -367,7 +367,7 @@ def find_root_directory(ctx: JakAndDaxterContext):
f" Close all launchers, games, clients, and console windows, then restart Archipelago.") f" Close all launchers, games, clients, and console windows, then restart Archipelago.")
if not os.path.exists(settings_path): if not os.path.exists(settings_path):
msg = (f"{err_title}: the OpenGOAL settings file does not exist.\n" msg = (f"{err_title}: The OpenGOAL settings file does not exist.\n"
f"{alt_instructions}") f"{alt_instructions}")
ctx.on_log_error(logger, msg) ctx.on_log_error(logger, msg)
return return
@@ -375,14 +375,44 @@ def find_root_directory(ctx: JakAndDaxterContext):
with open(settings_path, "r") as f: with open(settings_path, "r") as f:
load = json.load(f) load = json.load(f)
jak1_installed = load["games"]["Jak 1"]["isInstalled"] # This settings file has changed format once before, and may do so again in the future.
# Guard against future incompatibilities by checking the file version first, and use that to determine
# what JSON keys to look for next.
try:
settings_version = load["version"]
logger.debug(f"OpenGOAL settings file version: {settings_version}")
except KeyError:
msg = (f"{err_title}: The OpenGOAL settings file has no version number!\n"
f"{alt_instructions}")
ctx.on_log_error(logger, msg)
return
try:
if settings_version == "2.0":
jak1_installed = load["games"]["Jak 1"]["isInstalled"]
mod_sources = load["games"]["Jak 1"]["modsInstalledVersion"]
elif settings_version == "3.0":
jak1_installed = load["games"]["jak1"]["isInstalled"]
mod_sources = load["games"]["jak1"]["mods"]
else:
msg = (f"{err_title}: The OpenGOAL settings file has an unknown version number ({settings_version}).\n"
f"{alt_instructions}")
ctx.on_log_error(logger, msg)
return
except KeyError as e:
msg = (f"{err_title}: The OpenGOAL settings file does not contain key entry {e}!\n"
f"{alt_instructions}")
ctx.on_log_error(logger, msg)
return
if not jak1_installed: if not jak1_installed:
msg = (f"{err_title}: The OpenGOAL Launcher is missing a normal install of Jak 1!\n" msg = (f"{err_title}: The OpenGOAL Launcher is missing a normal install of Jak 1!\n"
f"{alt_instructions}") f"{alt_instructions}")
ctx.on_log_error(logger, msg) ctx.on_log_error(logger, msg)
return return
mod_sources = load["games"]["Jak 1"]["modsInstalledVersion"]
if mod_sources is None: if mod_sources is None:
msg = (f"{err_title}: No mod sources have been configured in the OpenGOAL Launcher!\n" msg = (f"{err_title}: No mod sources have been configured in the OpenGOAL Launcher!\n"
f"{alt_instructions}") f"{alt_instructions}")