Merge branch 'chest-counters' of https://github.com/compiling/ALttPEntranceRandomizer into DoorDev

This commit is contained in:
aerinon
2020-02-18 13:35:02 -07:00
4 changed files with 9 additions and 1 deletions

4
Gui.py
View File

@@ -87,6 +87,8 @@ def guiMain(args=None):
experimentCheckbutton = Checkbutton(checkBoxFrame, text="Enable Experimental Features", variable=experimentVar)
customVar = IntVar()
customCheckbutton = Checkbutton(checkBoxFrame, text="Use custom item pool", variable=customVar)
dungeonCounterVar = IntVar()
dungeonCounterbutton = Checkbutton(checkBoxFrame, text="Enable dungeon chest counters", variable=dungeonCounterVar)
createSpoilerCheckbutton.pack(expand=True, anchor=W)
suppressRomCheckbutton.pack(expand=True, anchor=W)
@@ -102,6 +104,7 @@ def guiMain(args=None):
hintsCheckbutton.pack(expand=True, anchor=W)
experimentCheckbutton.pack(expand=True, anchor=W)
customCheckbutton.pack(expand=True, anchor=W)
dungeonCounterbutton.pack(expand=True, anchor=W)
romOptionsFrame = LabelFrame(rightHalfFrame, text="Rom options")
romOptionsFrame.columnconfigure(0, weight=1)
@@ -472,6 +475,7 @@ def guiMain(args=None):
int(arrow1Var.get()), int(arrow10Var.get()), int(bomb1Var.get()), int(bomb3Var.get()), int(rupee1Var.get()), int(rupee5Var.get()), int(rupee20Var.get()), int(rupee50Var.get()), int(rupee100Var.get()),
int(rupee300Var.get()), int(rupoorVar.get()), int(blueclockVar.get()), int(greenclockVar.get()), int(redclockVar.get()), int(progbowVar.get()), int(bomb10Var.get()), int(triforcepieceVar.get()),
int(triforcecountVar.get()), int(triforceVar.get()), int(rupoorcostVar.get()), int(universalkeyVar.get())]
guiargs.dungeon_counters = bool(dungeonCounterVar.get())
guiargs.rom = romVar.get()
guiargs.sprite = sprite
guiargs.outputpath = args.outputpath if args else None