From 2f78860d8cfc8d445de425a68dc159f80e9f197f Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Wed, 24 Apr 2024 06:24:44 +0200 Subject: [PATCH] Core/SNIClient/LttP/Factorio: switch to get_settings (#3208) --- MultiServer.py | 2 +- SNIClient.py | 4 ++-- Utils.py | 2 +- worlds/alttp/Rom.py | 4 ++-- worlds/factorio/Client.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MultiServer.py b/MultiServer.py index bfbed462..a92edf76 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -2198,7 +2198,7 @@ async def console(ctx: Context): def parse_args() -> argparse.Namespace: parser = argparse.ArgumentParser() - defaults = Utils.get_options()["server_options"].as_dict() + defaults = Utils.get_settings()["server_options"].as_dict() parser.add_argument('multidata', nargs="?", default=defaults["multidata"]) parser.add_argument('--host', default=defaults["host"]) parser.add_argument('--port', default=defaults["port"], type=int) diff --git a/SNIClient.py b/SNIClient.py index cf4ef758..9fdddc99 100644 --- a/SNIClient.py +++ b/SNIClient.py @@ -282,7 +282,7 @@ class SNESState(enum.IntEnum): def launch_sni() -> None: - sni_path = Utils.get_options()["sni_options"]["sni_path"] + sni_path = Utils.get_settings()["sni_options"]["sni_path"] if not os.path.isdir(sni_path): sni_path = Utils.local_path(sni_path) @@ -654,7 +654,7 @@ async def game_watcher(ctx: SNIContext) -> None: async def run_game(romfile: str) -> None: auto_start = typing.cast(typing.Union[bool, str], - Utils.get_options()["sni_options"].get("snes_rom_start", True)) + Utils.get_settings()["sni_options"].get("snes_rom_start", True)) if auto_start is True: import webbrowser webbrowser.open(romfile) diff --git a/Utils.py b/Utils.py index a35dbf08..141b1dc7 100644 --- a/Utils.py +++ b/Utils.py @@ -201,7 +201,7 @@ def cache_path(*path: str) -> str: def output_path(*path: str) -> str: if hasattr(output_path, 'cached_path'): return os.path.join(output_path.cached_path, *path) - output_path.cached_path = user_path(get_options()["general_options"]["output_path"]) + output_path.cached_path = user_path(get_settings()["general_options"]["output_path"]) path = os.path.join(output_path.cached_path, *path) os.makedirs(os.path.dirname(path), exist_ok=True) return path diff --git a/worlds/alttp/Rom.py b/worlds/alttp/Rom.py index 08597cea..7c3c8768 100644 --- a/worlds/alttp/Rom.py +++ b/worlds/alttp/Rom.py @@ -1859,7 +1859,7 @@ def apply_oof_sfx(rom, oof: str): rom.write_bytes(0x12803A, oof_bytes) rom.write_bytes(0x12803A + len(oof_bytes), [0xEB, 0xEB]) - #Enemizer patch: prevent Enemizer from overwriting $3188 in SPC memory with an unused sound effect ("WHAT") + # Enemizer patch: prevent Enemizer from overwriting $3188 in SPC memory with an unused sound effect ("WHAT") rom.write_bytes(0x13000D, [0x00, 0x00, 0x00, 0x08]) @@ -3021,7 +3021,7 @@ def get_base_rom_bytes(file_name: str = "") -> bytes: def get_base_rom_path(file_name: str = "") -> str: - options = Utils.get_options() + options = Utils.get_settings() if not file_name: file_name = options["lttp_options"]["rom_file"] if not os.path.exists(file_name): diff --git a/worlds/factorio/Client.py b/worlds/factorio/Client.py index f612605b..d245e1bb 100644 --- a/worlds/factorio/Client.py +++ b/worlds/factorio/Client.py @@ -521,7 +521,7 @@ rcon_port = args.rcon_port rcon_password = args.rcon_password if args.rcon_password else ''.join( random.choice(string.ascii_letters) for x in range(32)) factorio_server_logger = logging.getLogger("FactorioServer") -options = Utils.get_options() +options = Utils.get_settings() executable = options["factorio_options"]["executable"] server_settings = args.server_settings if args.server_settings \ else options["factorio_options"].get("server_settings", None)