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
This commit is contained in:
		
							parent
							
								
									9d067b6f00
								
							
						
					
					
						commit
						4125995bdd
					
				
							
								
								
									
										4
									
								
								Main.py
								
								
								
								
							
							
						
						
									
										4
									
								
								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:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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]
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue