From 15bd79186ab55ccab91fc6869eb465342a629d47 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sun, 6 Jun 2021 18:12:19 +0200 Subject: [PATCH] remove player_name feature in MultiMystery MultiMystery is slated to be integrated into Mystery and the auto-launch feature is not maintainable for a growing games list --- MultiMystery.py | 12 +----------- Utils.py | 1 - host.yaml | 4 ---- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/MultiMystery.py b/MultiMystery.py index b399d775..b6c1d43e 100644 --- a/MultiMystery.py +++ b/MultiMystery.py @@ -45,7 +45,6 @@ if __name__ == "__main__": zip_multidata = multi_mystery_options["zip_multidata"] zip_format = multi_mystery_options["zip_format"] # zip_password = multi_mystery_options["zip_password"] not at this time - player_name = multi_mystery_options["player_name"] meta_file_path = multi_mystery_options["meta_file_path"] weights_file_path = multi_mystery_options["weights_file_path"] pre_roll = multi_mystery_options["pre_roll"] @@ -124,15 +123,6 @@ if __name__ == "__main__": spoilername = f"AP_{seed_name}_Spoiler.txt" romfilename = "" - if player_name: - for file in os.listdir(output_path): - if player_name in file: - import MultiClient - import asyncio - - asyncio.run(MultiClient.run_game(os.path.join(output_path, file))) - break - if any((zip_roms, zip_multidata, zip_spoiler, zip_diffs, zip_apmcs)): import zipfile @@ -167,7 +157,7 @@ if __name__ == "__main__": def _handle_sfc_file(file: str): if zip_roms: pack_file(file) - if zip_roms == 2 and player_name.lower() not in file.lower(): + if zip_roms == 2: remove_zipped_file(file) diff --git a/Utils.py b/Utils.py index 04fe8911..1e1e3341 100644 --- a/Utils.py +++ b/Utils.py @@ -203,7 +203,6 @@ def get_default_options() -> dict: "weights_file_path": "weights.yaml", "meta_file_path": "meta.yaml", "pre_roll": False, - "player_name": "", "create_spoiler": 1, "zip_roms": 0, "zip_diffs": 2, diff --git a/host.yaml b/host.yaml index 36e9e97b..6640e17e 100644 --- a/host.yaml +++ b/host.yaml @@ -63,10 +63,6 @@ multi_mystery_options: # If using a pre-rolled yaml fails with "Please fix your yaml.", please file a bug report including both the original yaml # as well as the generated pre-rolled yaml. pre_roll: false - # Automatically launches {player_name}.yaml's ROM file using the OS's default program once generation completes. (likely your emulator) - # Does nothing if the name is not found - # Example: player_name = "Berserker" - player_name: "" # The hosts name # Create a spoiler file # 0 -> None # 1 -> Full spoiler