alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Minor bugfixes

Browse Source
This commit is contained in:
aerinon
2020-01-24 16:43:35 -07:00
parent 59e9fb82f5
commit bd50ad9d77
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gui.py
View File

@@ -318,24 +318,18 @@ def guiMain(args=None):
doorShuffleLabel.pack(side=LEFT) doorShuffleLabel.pack(side=LEFT)
heartbeepFrame = Frame(drowDownFrame) heartbeepFrame = Frame(drowDownFrame)
heartbeepVar = StringVar()
heartbeepVar.set('normal')
heartbeepOptionMenu = OptionMenu(heartbeepFrame, heartbeepVar, 'double', 'normal', 'half', 'quarter', 'off') heartbeepOptionMenu = OptionMenu(heartbeepFrame, heartbeepVar, 'double', 'normal', 'half', 'quarter', 'off')
heartbeepOptionMenu.pack(side=RIGHT) heartbeepOptionMenu.pack(side=RIGHT)
heartbeepLabel = Label(heartbeepFrame, text='Heartbeep sound rate') heartbeepLabel = Label(heartbeepFrame, text='Heartbeep sound rate')
heartbeepLabel.pack(side=LEFT) heartbeepLabel.pack(side=LEFT)
heartcolorFrame = Frame(drowDownFrame) heartcolorFrame = Frame(drowDownFrame)
heartcolorVar = StringVar()
heartcolorVar.set('red')
heartcolorOptionMenu = OptionMenu(heartcolorFrame, heartcolorVar, 'red', 'blue', 'green', 'yellow', 'random') heartcolorOptionMenu = OptionMenu(heartcolorFrame, heartcolorVar, 'red', 'blue', 'green', 'yellow', 'random')
heartcolorOptionMenu.pack(side=RIGHT) heartcolorOptionMenu.pack(side=RIGHT)
heartcolorLabel = Label(heartcolorFrame, text='Heart color') heartcolorLabel = Label(heartcolorFrame, text='Heart color')
heartcolorLabel.pack(side=LEFT) heartcolorLabel.pack(side=LEFT)
fastMenuFrame = Frame(drowDownFrame) fastMenuFrame = Frame(drowDownFrame)
fastMenuVar = StringVar()
fastMenuVar.set('normal')
fastMenuOptionMenu = OptionMenu(fastMenuFrame, fastMenuVar, 'normal', 'instant', 'double', 'triple', 'quadruple', 'half') fastMenuOptionMenu = OptionMenu(fastMenuFrame, fastMenuVar, 'normal', 'instant', 'double', 'triple', 'quadruple', 'half')
fastMenuOptionMenu.pack(side=RIGHT) fastMenuOptionMenu.pack(side=RIGHT)
fastMenuLabel = Label(fastMenuFrame, text='Menu speed') fastMenuLabel = Label(fastMenuFrame, text='Menu speed')

23
Main.py
View File

@@ -215,17 +215,18 @@ def main(args, seed=None):
"-nohints" if not world.hints[player] else "")) if not args.outputname else '' "-nohints" if not world.hints[player] else "")) if not args.outputname else ''
rom.write_to_file(output_path(f'{outfilebase}{outfilepname}{outfilesuffix}.sfc')) rom.write_to_file(output_path(f'{outfilebase}{outfilepname}{outfilesuffix}.sfc'))
multidata = zlib.compress(json.dumps({"names": parsed_names, if world.players > 1:
"roms": rom_names, multidata = zlib.compress(json.dumps({"names": parsed_names,
"remote_items": [player for player in range(1, world.players + 1) if world.remote_items[player]], "roms": rom_names,
"locations": [((location.address, location.player), (location.item.code, location.item.player)) "remote_items": [player for player in range(1, world.players + 1) if world.remote_items[player]],
for location in world.get_filled_locations() if type(location.address) is int] "locations": [((location.address, location.player), (location.item.code, location.item.player))
}).encode("utf-8")) for location in world.get_filled_locations() if type(location.address) is int]
if args.jsonout: }).encode("utf-8"))
jsonout["multidata"] = list(multidata) if args.jsonout:
else: jsonout["multidata"] = list(multidata)
with open(output_path('%s_multidata' % outfilebase), 'wb') as f: else:
f.write(multidata) with open(output_path('%s_multidata' % outfilebase), 'wb') as f:
f.write(multidata)
if args.create_spoiler and not args.jsonout: if args.create_spoiler and not args.jsonout:
world.spoiler.to_file(output_path('%s_Spoiler.txt' % outfilebase)) world.spoiler.to_file(output_path('%s_Spoiler.txt' % outfilebase))