diff --git a/gui/bottom.py b/gui/bottom.py index 4120242a..ddc77ce1 100644 --- a/gui/bottom.py +++ b/gui/bottom.py @@ -92,19 +92,19 @@ def create_guiargs(parent): guiargs.names = parent.pages["randomizer"].pages["multiworld"].namesVar.get() guiargs.seed = int(parent.frames["bottom"].seedVar.get()) if parent.frames["bottom"].seedVar.get() else None guiargs.count = int(parent.frames["bottom"].widgets["generationcount"].storageVar.get()) if parent.frames["bottom"].widgets["generationcount"].storageVar.get() != '1' else None - guiargs.mode = parent.pages["randomizer"].pages["item"].itemWidgets["worldstate"].storageVar.get() - guiargs.logic = parent.pages["randomizer"].pages["item"].itemWidgets["logiclevel"].storageVar.get() + guiargs.mode = parent.pages["randomizer"].pages["item"].widgets["worldstate"].storageVar.get() + guiargs.logic = parent.pages["randomizer"].pages["item"].widgets["logiclevel"].storageVar.get() - guiargs.goal = parent.pages["randomizer"].pages["item"].itemWidgets["goal"].storageVar.get() - guiargs.crystals_gt = parent.pages["randomizer"].pages["item"].itemWidgets["crystals_gt"].storageVar.get() - guiargs.crystals_ganon = parent.pages["randomizer"].pages["item"].itemWidgets["crystals_ganon"].storageVar.get() - guiargs.swords = parent.pages["randomizer"].pages["item"].itemWidgets["weapons"].storageVar.get() - guiargs.difficulty = parent.pages["randomizer"].pages["item"].itemWidgets["itempool"].storageVar.get() - guiargs.item_functionality = parent.pages["randomizer"].pages["item"].itemWidgets["itemfunction"].storageVar.get() - guiargs.timer = parent.pages["randomizer"].pages["item"].itemWidgets["timer"].storageVar.get() - guiargs.progressive = parent.pages["randomizer"].pages["item"].itemWidgets["progressives"].storageVar.get() - guiargs.accessibility = parent.pages["randomizer"].pages["item"].itemWidgets["accessibility"].storageVar.get() - guiargs.algorithm = parent.pages["randomizer"].pages["item"].itemWidgets["sortingalgo"].storageVar.get() + guiargs.goal = parent.pages["randomizer"].pages["item"].widgets["goal"].storageVar.get() + guiargs.crystals_gt = parent.pages["randomizer"].pages["item"].widgets["crystals_gt"].storageVar.get() + guiargs.crystals_ganon = parent.pages["randomizer"].pages["item"].widgets["crystals_ganon"].storageVar.get() + guiargs.swords = parent.pages["randomizer"].pages["item"].widgets["weapons"].storageVar.get() + guiargs.difficulty = parent.pages["randomizer"].pages["item"].widgets["itempool"].storageVar.get() + guiargs.item_functionality = parent.pages["randomizer"].pages["item"].widgets["itemfunction"].storageVar.get() + guiargs.timer = parent.pages["randomizer"].pages["item"].widgets["timer"].storageVar.get() + 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.door_shuffle = parent.pages["randomizer"].pages["dungeon"].dungeonWidgets["dungeondoorshuffle"].storageVar.get() guiargs.experimental = parent.pages["randomizer"].pages["dungeon"].dungeonWidgets["experimental"].storageVar.get() @@ -119,7 +119,7 @@ def create_guiargs(parent): 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.retro = bool(parent.pages["randomizer"].pages["item"].itemWidgets["retro"].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()) guiargs.ow_palettes = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["owpalettes"].storageVar.get() diff --git a/gui/loadcliargs.py b/gui/loadcliargs.py index 04027c72..3abaf5c9 100644 --- a/gui/loadcliargs.py +++ b/gui/loadcliargs.py @@ -15,7 +15,7 @@ def loadcliargs(gui, args): 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["item"].itemWidgets["retro"].storageVar.set(args.retro) + 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["gameoptions"].gameOptionsWidgets["quickswap"].storageVar.set(int(args.quickswap)) gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["nobgm"].storageVar.set(int(args.disablemusic)) @@ -25,24 +25,24 @@ def loadcliargs(gui, args): gui.frames["bottom"].widgets["generationcount"].storageVar.set(str(args.count)) if args.seed: gui.frames["bottom"].seedVar.set(str(args.seed)) - gui.pages["randomizer"].pages["item"].itemWidgets["worldstate"].storageVar.set(args.mode) - gui.pages["randomizer"].pages["item"].itemWidgets["weapons"].storageVar.set(args.swords) - gui.pages["randomizer"].pages["item"].itemWidgets["itempool"].storageVar.set(args.difficulty) - gui.pages["randomizer"].pages["item"].itemWidgets["itemfunction"].storageVar.set(args.item_functionality) - gui.pages["randomizer"].pages["item"].itemWidgets["timer"].storageVar.set(args.timer) - gui.pages["randomizer"].pages["item"].itemWidgets["progressives"].storageVar.set(args.progressive) - gui.pages["randomizer"].pages["item"].itemWidgets["accessibility"].storageVar.set(args.accessibility) - gui.pages["randomizer"].pages["item"].itemWidgets["goal"].storageVar.set(args.goal) - gui.pages["randomizer"].pages["item"].itemWidgets["crystals_gt"].storageVar.set(args.crystals_gt) - gui.pages["randomizer"].pages["item"].itemWidgets["crystals_ganon"].storageVar.set(args.crystals_ganon) - gui.pages["randomizer"].pages["item"].itemWidgets["sortingalgo"].storageVar.set(args.algorithm) + gui.pages["randomizer"].pages["item"].widgets["worldstate"].storageVar.set(args.mode) + gui.pages["randomizer"].pages["item"].widgets["weapons"].storageVar.set(args.swords) + gui.pages["randomizer"].pages["item"].widgets["itempool"].storageVar.set(args.difficulty) + gui.pages["randomizer"].pages["item"].widgets["itemfunction"].storageVar.set(args.item_functionality) + gui.pages["randomizer"].pages["item"].widgets["timer"].storageVar.set(args.timer) + gui.pages["randomizer"].pages["item"].widgets["progressives"].storageVar.set(args.progressive) + gui.pages["randomizer"].pages["item"].widgets["accessibility"].storageVar.set(args.accessibility) + gui.pages["randomizer"].pages["item"].widgets["goal"].storageVar.set(args.goal) + 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["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) gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["heartbeep"].storageVar.set(args.heartbeep) gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["menuspeed"].storageVar.set(args.fastmenu) - gui.pages["randomizer"].pages["item"].itemWidgets["logiclevel"].storageVar.set(args.logic) + 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["gameoptions"].gameOptionsWidgets["hints"].storageVar.set(args.hints) diff --git a/gui/randomize/item.py b/gui/randomize/item.py index b1803f44..671e6749 100644 --- a/gui/randomize/item.py +++ b/gui/randomize/item.py @@ -6,18 +6,18 @@ def item_page(parent): self = ttk.Frame(parent) # Item Randomizer options - self.itemWidgets = {} + self.widgets = {} ## Retro (eventually needs to become a World State) key = "retro" - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "checkbox", self, "Retro mode (universal keys)", None ) - self.itemWidgets[key].pack(anchor=W) + self.widgets[key].pack(anchor=W) leftItemFrame = Frame(self) rightItemFrame = Frame(self) @@ -26,7 +26,7 @@ def item_page(parent): ## World State key = "worldstate" - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", leftItemFrame, @@ -39,11 +39,11 @@ def item_page(parent): "Inverted": "inverted" } ) - self.itemWidgets[key].pack(anchor=E) + self.widgets[key].pack(anchor=E) ## Logic Level key = "logiclevel" - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", leftItemFrame, @@ -56,11 +56,11 @@ def item_page(parent): "No Logic": "nologic" } ) - self.itemWidgets[key].pack(anchor=E) + self.widgets[key].pack(anchor=E) ## Goal key = "goal" - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", leftItemFrame, @@ -75,14 +75,14 @@ def item_page(parent): "Crystals": "crystals" } ) - self.itemWidgets[key].pack(anchor=E) + self.widgets[key].pack(anchor=E) ## Number of crystals to open GT key = "crystals_gt" keys = [*map(str,range(0,7+1)),"Random"] vals = [*map(str,range(0,7+1)),"random"] options = {keys[i]: vals[i] for i in range(len(keys))} - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", leftItemFrame, @@ -91,14 +91,14 @@ def item_page(parent): {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}}, options ) - self.itemWidgets[key].pack(anchor=E) + self.widgets[key].pack(anchor=E) ## Number of crystals to damage Ganon key = "crystals_ganon" keys = [*map(str,range(0,7+1)),"Random"] vals = [*map(str,range(0,7+1)),"random"] options = {keys[i]: vals[i] for i in range(len(keys))} - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", leftItemFrame, @@ -107,11 +107,11 @@ def item_page(parent): {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}}, options ) - self.itemWidgets[key].pack(anchor=E) + self.widgets[key].pack(anchor=E) ## Weapons key = "weapons" - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", leftItemFrame, @@ -125,11 +125,11 @@ def item_page(parent): "Vanilla": "vanilla" } ) - self.itemWidgets[key].pack(anchor=E) + self.widgets[key].pack(anchor=E) ## Item Pool key = "itempool" - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", rightItemFrame, @@ -142,11 +142,11 @@ def item_page(parent): "Expert": "expert" } ) - self.itemWidgets[key].pack(anchor=E) + self.widgets[key].pack(anchor=E) ## Item Functionality key = "itemfunction" - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", rightItemFrame, @@ -159,11 +159,11 @@ def item_page(parent): "Expert": "expert" } ) - self.itemWidgets[key].pack(anchor=E) + self.widgets[key].pack(anchor=E) ## Timer setting key = "timer" - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", rightItemFrame, @@ -179,11 +179,11 @@ def item_page(parent): "Timed Countdown": "timed-countdown" } ) - self.itemWidgets[key].pack(anchor=E) + self.widgets[key].pack(anchor=E) ## Progressives: On/Off key = "progressives" - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", rightItemFrame, @@ -196,11 +196,11 @@ def item_page(parent): "Random": "random" } ) - self.itemWidgets[key].pack(anchor=E) + self.widgets[key].pack(anchor=E) ## Accessibilty key = "accessibility" - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", rightItemFrame, @@ -213,11 +213,11 @@ def item_page(parent): "Beatable": "none" } ) - self.itemWidgets[key].pack(anchor=E) + self.widgets[key].pack(anchor=E) ## Item Sorting Algorithm key = "sortingalgo" - self.itemWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "selectbox", rightItemFrame, @@ -234,6 +234,6 @@ def item_page(parent): "Balanced": "balanced" } ) - self.itemWidgets[key].pack(anchor=E) + self.widgets[key].pack(anchor=E) return self