From 4125995bdd6bf96ab28accdecc3baa7723f4ed16 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Wed, 10 Jun 2020 21:25:14 +0200 Subject: [PATCH] Adjust output to "BM" (Berserker's Multiworld) to differentiate spoiler logs, roms and server data at a glance Rename _multidata to .multidata and embed .multidata as MultiServer-openable file into windows registry --- Main.py | 4 ++-- MultiMystery.py | 4 ++-- MultiServer.py | 2 +- inno_setup.iss | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Main.py b/Main.py index 8a633850..b9549fc5 100644 --- a/Main.py +++ b/Main.py @@ -152,7 +152,7 @@ def main(args, seed=None): logger.info('Patching ROM.') - outfilebase = 'ER_%s' % (args.outputname if args.outputname else world.seed) + outfilebase = 'BM_%s' % (args.outputname if args.outputname else world.seed) rom_names = [] jsonout = {} @@ -269,7 +269,7 @@ def main(args, seed=None): if args.jsonout: jsonout["multidata"] = list(multidata) else: - with open(output_path('%s_multidata' % outfilebase), 'wb') as f: + with open(output_path('%s.multidata' % outfilebase), 'wb') as f: f.write(multidata) if not args.skip_playthrough: diff --git a/MultiMystery.py b/MultiMystery.py index 227294db..72f5bf5a 100644 --- a/MultiMystery.py +++ b/MultiMystery.py @@ -118,8 +118,8 @@ if __name__ == "__main__": seedname = segment break - multidataname = f"ER_{seedname}_multidata" - spoilername = f"ER_{seedname}_Spoiler.txt" + multidataname = f"BM_{seedname}.multidata" + spoilername = f"BM_{seedname}_Spoiler.txt" romfilename = "" if player_name: diff --git a/MultiServer.py b/MultiServer.py index 45213f45..814525f4 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -1065,7 +1065,7 @@ async def main(args: argparse.Namespace): import tkinter.filedialog root = tkinter.Tk() root.withdraw() - data_filename = tkinter.filedialog.askopenfilename(filetypes=(("Multiworld data", "*multidata"),)) + data_filename = tkinter.filedialog.askopenfilename(filetypes=(("Multiworld data", "*.multidata"),)) ctx.load(data_filename) diff --git a/inno_setup.iss b/inno_setup.iss index f1a8c593..3d7f2eef 100644 --- a/inno_setup.iss +++ b/inno_setup.iss @@ -62,6 +62,11 @@ Root: HKCR; Subkey: "{#MyAppName}patch"; ValueData: "Berserk Root: HKCR; Subkey: "{#MyAppName}patch\DefaultIcon"; ValueData: "{app}\{#MyAppExeName},0"; ValueType: string; ValueName: "" Root: HKCR; Subkey: "{#MyAppName}patch\shell\open\command"; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; ValueType: string; ValueName: "" +Root: HKCR; Subkey: ".multidata"; ValueData: "{#MyAppName}multidata"; Flags: uninsdeletevalue; ValueType: string; ValueName: "" +Root: HKCR; Subkey: "{#MyAppName}multidata"; ValueData: "Berserker's Multiworld Server Data"; Flags: uninsdeletekey; ValueType: string; ValueName: "" +Root: HKCR; Subkey: "{#MyAppName}multidata\DefaultIcon"; ValueData: "{app}\BerserkerMultiServer.exe,0"; ValueType: string; ValueName: "" +Root: HKCR; Subkey: "{#MyAppName}multidata\shell\open\command"; ValueData: """{app}\BerserkerMultiServer.exe"" --multidata ""%1"""; ValueType: string; ValueName: "" + [Code]