diff --git a/gui/bottom.py b/gui/bottom.py index ddc77ce1..6ee29761 100644 --- a/gui/bottom.py +++ b/gui/bottom.py @@ -105,7 +105,7 @@ def create_guiargs(parent): guiargs.progressive = parent.pages["randomizer"].pages["item"].widgets["progressives"].storageVar.get() 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"].entrandoWidgets["entranceshuffle"].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.heartbeep = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["heartbeep"].storageVar.get() @@ -114,7 +114,7 @@ def create_guiargs(parent): guiargs.create_spoiler = bool(parent.pages["randomizer"].pages["generation"].generationWidgets["spoiler"].storageVar.get()) 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"].entrandoWidgets["openpyramid"].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()) @@ -124,7 +124,7 @@ def create_guiargs(parent): guiargs.disablemusic = bool(parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["nobgm"].storageVar.get()) guiargs.ow_palettes = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["owpalettes"].storageVar.get() guiargs.uw_palettes = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["uwpalettes"].storageVar.get() - guiargs.shuffleganon = bool(parent.pages["randomizer"].pages["entrance"].entrandoWidgets["shuffleganon"].storageVar.get()) + guiargs.shuffleganon = bool(parent.pages["randomizer"].pages["entrance"].widgets["shuffleganon"].storageVar.get()) guiargs.hints = bool(parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["hints"].storageVar.get()) guiargs.enemizercli = parent.pages["randomizer"].pages["enemizer"].enemizerCLIpathVar.get() guiargs.shufflebosses = parent.pages["randomizer"].pages["enemizer"].enemizerWidgets["bossshuffle"].storageVar.get() diff --git a/gui/loadcliargs.py b/gui/loadcliargs.py index 3abaf5c9..260de0c6 100644 --- a/gui/loadcliargs.py +++ b/gui/loadcliargs.py @@ -16,7 +16,7 @@ def loadcliargs(gui, args): 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["item"].widgets["retro"].storageVar.set(args.retro) - gui.pages["randomizer"].pages["entrance"].entrandoWidgets["openpyramid"].storageVar.set(args.openpyramid) + gui.pages["randomizer"].pages["entrance"].widgets["openpyramid"].storageVar.set(args.openpyramid) gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["quickswap"].storageVar.set(int(args.quickswap)) gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["nobgm"].storageVar.set(int(args.disablemusic)) if args.multi: @@ -36,7 +36,7 @@ def loadcliargs(gui, args): gui.pages["randomizer"].pages["item"].widgets["crystals_gt"].storageVar.set(args.crystals_gt) 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"].entrandoWidgets["entranceshuffle"].storageVar.set(args.shuffle) + 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["gameoptions"].gameOptionsWidgets["heartcolor"].storageVar.set(args.heartcolor) @@ -44,7 +44,7 @@ def loadcliargs(gui, args): gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["menuspeed"].storageVar.set(args.fastmenu) gui.pages["randomizer"].pages["item"].widgets["logiclevel"].storageVar.set(args.logic) gui.pages["randomizer"].pages["generation"].romVar.set(args.rom) - gui.pages["randomizer"].pages["entrance"].entrandoWidgets["shuffleganon"].storageVar.set(args.shuffleganon) + gui.pages["randomizer"].pages["entrance"].widgets["shuffleganon"].storageVar.set(args.shuffleganon) gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["hints"].storageVar.set(args.hints) gui.pages["randomizer"].pages["enemizer"].enemizerCLIpathVar.set(args.enemizercli) gui.pages["randomizer"].pages["enemizer"].enemizerWidgets["potshuffle"].storageVar.set(args.shufflepots) diff --git a/gui/randomize/entrando.py b/gui/randomize/entrando.py index 1302d5a9..ab081bb9 100644 --- a/gui/randomize/entrando.py +++ b/gui/randomize/entrando.py @@ -6,33 +6,33 @@ def entrando_page(parent): self = ttk.Frame(parent) # Entrance Randomizer options - self.entrandoWidgets = {} + self.widgets = {} ## Pyramid pre-opened key = "openpyramid" - self.entrandoWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "checkbox", self, "Pre-open Pyramid Hole", None ) - self.entrandoWidgets[key].pack(anchor=W) + self.widgets[key].pack(anchor=W) ## Shuffle Ganon key = "shuffleganon" - self.entrandoWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "checkbox", self, "Include Ganon's Tower and Pyramid Hole in shuffle pool", None ) - self.entrandoWidgets[key].pack(anchor=W) + self.widgets[key].pack(anchor=W) ## Entrance Shuffle key = "entranceshuffle" - self.entrandoWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", self, @@ -54,6 +54,6 @@ def entrando_page(parent): "Dungeons + Simple": "dungeonssimple" } ) - self.entrandoWidgets[key].pack(anchor=W) + self.widgets[key].pack(anchor=W) return self