From 4dd8bfa67f8b153ba70587ada06e2671fa3317e3 Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Sat, 15 Feb 2020 02:21:01 -0800 Subject: [PATCH] Dungeon Rando Widgets --- gui/bottom.py | 12 ++++++------ gui/loadcliargs.py | 12 ++++++------ gui/randomize/dungeon.py | 26 +++++++++++++------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gui/bottom.py b/gui/bottom.py index 6dbf3d13..68f9f739 100644 --- a/gui/bottom.py +++ b/gui/bottom.py @@ -106,8 +106,8 @@ def create_guiargs(parent): guiargs.accessibility = parent.pages["randomizer"].pages["item"].widgets["accessibility"].storageVar.get() guiargs.algorithm = parent.pages["randomizer"].pages["item"].widgets["sortingalgo"].storageVar.get() guiargs.shuffle = parent.pages["randomizer"].pages["entrance"].widgets["entranceshuffle"].storageVar.get() - guiargs.door_shuffle = parent.pages["randomizer"].pages["dungeon"].dungeonWidgets["dungeondoorshuffle"].storageVar.get() - guiargs.experimental = parent.pages["randomizer"].pages["dungeon"].dungeonWidgets["experimental"].storageVar.get() + guiargs.door_shuffle = parent.pages["randomizer"].pages["dungeon"].widgets["dungeondoorshuffle"].storageVar.get() + guiargs.experimental = parent.pages["randomizer"].pages["dungeon"].widgets["experimental"].storageVar.get() guiargs.heartbeep = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["heartbeep"].storageVar.get() guiargs.heartcolor = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["heartcolor"].storageVar.get() guiargs.fastmenu = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["menuspeed"].storageVar.get() @@ -115,10 +115,10 @@ def create_guiargs(parent): guiargs.skip_playthrough = not bool(parent.pages["randomizer"].pages["generation"].generationWidgets["spoiler"].storageVar.get()) guiargs.suppress_rom = bool(parent.pages["randomizer"].pages["generation"].generationWidgets["suppressrom"].storageVar.get()) guiargs.openpyramid = bool(parent.pages["randomizer"].pages["entrance"].widgets["openpyramid"].storageVar.get()) - guiargs.mapshuffle = bool(parent.pages["randomizer"].pages["dungeon"].dungeonWidgets["mapshuffle"].storageVar.get()) - guiargs.compassshuffle = bool(parent.pages["randomizer"].pages["dungeon"].dungeonWidgets["compassshuffle"].storageVar.get()) - guiargs.keyshuffle = bool(parent.pages["randomizer"].pages["dungeon"].dungeonWidgets["smallkeyshuffle"].storageVar.get()) - guiargs.bigkeyshuffle = bool(parent.pages["randomizer"].pages["dungeon"].dungeonWidgets["bigkeyshuffle"].storageVar.get()) + guiargs.mapshuffle = bool(parent.pages["randomizer"].pages["dungeon"].widgets["mapshuffle"].storageVar.get()) + guiargs.compassshuffle = bool(parent.pages["randomizer"].pages["dungeon"].widgets["compassshuffle"].storageVar.get()) + guiargs.keyshuffle = bool(parent.pages["randomizer"].pages["dungeon"].widgets["smallkeyshuffle"].storageVar.get()) + guiargs.bigkeyshuffle = bool(parent.pages["randomizer"].pages["dungeon"].widgets["bigkeyshuffle"].storageVar.get()) guiargs.retro = bool(parent.pages["randomizer"].pages["item"].widgets["retro"].storageVar.get()) guiargs.quickswap = bool(parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["quickswap"].storageVar.get()) guiargs.disablemusic = bool(parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["nobgm"].storageVar.get()) diff --git a/gui/loadcliargs.py b/gui/loadcliargs.py index 1f545dc9..7b4376de 100644 --- a/gui/loadcliargs.py +++ b/gui/loadcliargs.py @@ -11,10 +11,10 @@ def loadcliargs(gui, args): # load values from commandline args gui.pages["randomizer"].pages["generation"].generationWidgets["spoiler"].storageVar.set(int(args.create_spoiler)) gui.pages["randomizer"].pages["generation"].generationWidgets["suppressrom"].storageVar.set(int(args.suppress_rom)) - gui.pages["randomizer"].pages["dungeon"].dungeonWidgets["mapshuffle"].storageVar.set(args.mapshuffle) - gui.pages["randomizer"].pages["dungeon"].dungeonWidgets["compassshuffle"].storageVar.set(args.compassshuffle) - gui.pages["randomizer"].pages["dungeon"].dungeonWidgets["smallkeyshuffle"].storageVar.set(args.keyshuffle) - gui.pages["randomizer"].pages["dungeon"].dungeonWidgets["bigkeyshuffle"].storageVar.set(args.bigkeyshuffle) + gui.pages["randomizer"].pages["dungeon"].widgets["mapshuffle"].storageVar.set(args.mapshuffle) + gui.pages["randomizer"].pages["dungeon"].widgets["compassshuffle"].storageVar.set(args.compassshuffle) + gui.pages["randomizer"].pages["dungeon"].widgets["smallkeyshuffle"].storageVar.set(args.keyshuffle) + gui.pages["randomizer"].pages["dungeon"].widgets["bigkeyshuffle"].storageVar.set(args.bigkeyshuffle) gui.pages["randomizer"].pages["item"].widgets["retro"].storageVar.set(args.retro) gui.pages["randomizer"].pages["entrance"].widgets["openpyramid"].storageVar.set(args.openpyramid) gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["quickswap"].storageVar.set(int(args.quickswap)) @@ -37,8 +37,8 @@ def loadcliargs(gui, args): gui.pages["randomizer"].pages["item"].widgets["crystals_ganon"].storageVar.set(args.crystals_ganon) gui.pages["randomizer"].pages["item"].widgets["sortingalgo"].storageVar.set(args.algorithm) gui.pages["randomizer"].pages["entrance"].widgets["entranceshuffle"].storageVar.set(args.shuffle) - gui.pages["randomizer"].pages["dungeon"].dungeonWidgets["dungeondoorshuffle"].storageVar.set(args.door_shuffle) - gui.pages["randomizer"].pages["dungeon"].dungeonWidgets["experimental"].storageVar.set(args.experimental) + gui.pages["randomizer"].pages["dungeon"].widgets["dungeondoorshuffle"].storageVar.set(args.door_shuffle) + gui.pages["randomizer"].pages["dungeon"].widgets["experimental"].storageVar.set(args.experimental) gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["heartcolor"].storageVar.set(args.heartcolor) gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["heartbeep"].storageVar.set(args.heartbeep) gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["menuspeed"].storageVar.set(args.fastmenu) diff --git a/gui/randomize/dungeon.py b/gui/randomize/dungeon.py index ad372ead..973e4830 100644 --- a/gui/randomize/dungeon.py +++ b/gui/randomize/dungeon.py @@ -6,7 +6,7 @@ def dungeon_page(parent): self = ttk.Frame(parent) # Dungeon Shuffle options - self.dungeonWidgets = {} + self.widgets = {} ## Dungeon Item Shuffle mcsbshuffleFrame = Frame(self) @@ -16,51 +16,51 @@ def dungeon_page(parent): ## Map Shuffle key = "mapshuffle" - self.dungeonWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "checkbox", mcsbshuffleFrame, "Maps", None ) - self.dungeonWidgets[key].pack(side=LEFT) + self.widgets[key].pack(side=LEFT) ## Compass Shuffle key = "compassshuffle" - self.dungeonWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "checkbox", mcsbshuffleFrame, "Compasses", None ) - self.dungeonWidgets[key].pack(side=LEFT) + self.widgets[key].pack(side=LEFT) ## Small Key Shuffle key = "smallkeyshuffle" - self.dungeonWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "checkbox", mcsbshuffleFrame, "Small Keys", None ) - self.dungeonWidgets[key].pack(side=LEFT) + self.widgets[key].pack(side=LEFT) ## Big Key Shuffle key = "bigkeyshuffle" - self.dungeonWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "checkbox", mcsbshuffleFrame, "Big Keys", None ) - self.dungeonWidgets[key].pack(side=LEFT) + self.widgets[key].pack(side=LEFT) ## Dungeon Door Shuffle key = "dungeondoorshuffle" - self.dungeonWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", self, @@ -73,17 +73,17 @@ def dungeon_page(parent): "Crossed": "crossed" } ) - self.dungeonWidgets[key].pack(anchor=W) + self.widgets[key].pack(anchor=W) # Experimental features key = "experimental" - self.dungeonWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "checkbox", self, "Enable Experimental Features", None ) - self.dungeonWidgets[key].pack(anchor=W) + self.widgets[key].pack(anchor=W) return self