diff --git a/MultiMystery.py b/MultiMystery.py index 5600cf93..42662080 100644 --- a/MultiMystery.py +++ b/MultiMystery.py @@ -1,4 +1,4 @@ -__author__ = "Berserker55" # you can find me on the ALTTP Randomizer Discord +__author__ = "Berserker55" # you can find me on discord.gg/8Z65BR2 """ This script launches a Multiplayer "Multiworld" Mystery Game @@ -54,7 +54,7 @@ if __name__ == "__main__": zip_spoiler = multi_mystery_options["zip_spoiler"] 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 + # 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.get("weights_file_path", "weights.yaml") @@ -63,11 +63,11 @@ if __name__ == "__main__": host = options["server_options"]["host"] port = options["server_options"]["port"] - py_version = f"{sys.version_info.major}.{sys.version_info.minor}" if not os.path.exists(enemizer_path): - feedback(f"Enemizer not found at {enemizer_path}, please adjust the path in MultiMystery.py's config or put Enemizer in the default location.") + feedback( + f"Enemizer not found at {enemizer_path}, please adjust the path in MultiMystery.py's config or put Enemizer in the default location.") if not os.path.exists(rom_file): feedback(f"Base rom is expected as {rom_file} in the Multiworld root folder please place/rename it there.") player_files = [] @@ -82,22 +82,19 @@ if __name__ == "__main__": for i, file in enumerate(player_files, 1): player_string += f"--p{i} \"{os.path.join(player_files_path, file)}\" " - if os.path.exists("BerserkerMultiServer.exe"): - basemysterycommand = "BerserkerMystery.exe" #compiled windows + basemysterycommand = "BerserkerMystery.exe" # compiled windows elif os.path.exists("BerserkerMultiServer"): - basemysterycommand = "BerserkerMystery" # compiled linux + basemysterycommand = "BerserkerMystery" # compiled linux else: basemysterycommand = f"py -{py_version} Mystery.py" # source - weights_file_path = os.path.join(player_files_path, weights_file_path) if os.path.exists(weights_file_path): target_player_count = max(len(player_files), target_player_count) else: target_player_count = len(player_files) - if target_player_count == 0: feedback(f"No player files found. Please put them in a {player_files_path} folder.") else: @@ -148,9 +145,10 @@ if __name__ == "__main__": if any((zip_roms, zip_multidata, zip_spoiler, zip_diffs)): import zipfile - compression = {1 : zipfile.ZIP_DEFLATED, - 2 : zipfile.ZIP_LZMA, - 3 : zipfile.ZIP_BZIP2}[zip_format] + + compression = {1: zipfile.ZIP_DEFLATED, + 2: zipfile.ZIP_LZMA, + 3: zipfile.ZIP_BZIP2}[zip_format] typical_zip_ending = {1: "zip", 2: "7z", @@ -221,10 +219,11 @@ if __name__ == "__main__": baseservercommand = "BerserkerMultiServer" # compiled linux else: baseservercommand = f"py -{py_version} MultiServer.py" # source - #don't have a mac to test that. If you try to run compiled on mac, good luck. + # don't have a mac to test that. If you try to run compiled on mac, good luck. subprocess.call(f"{baseservercommand} --multidata {os.path.join(output_path, multidataname)}") except: import traceback + traceback.print_exc() input("Press enter to close")