Game Options Widgets

Eventually split from Adjust

gui/adjust/overview.py

@@ -20,7 +20,7 @@ def adjust_page(top, parent, settings):
       "checkbox",
       self,
       "Disable Music & MSU-1",
-      top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["nobgm"].storageVar
+      top.pages["randomizer"].pages["gameoptions"].widgets["nobgm"].storageVar
     )
     self.adjustWidgets[key].pack(anchor=W)
 
@@ -31,7 +31,7 @@ def adjust_page(top, parent, settings):
       "checkbox",
       self,
       "L/R Quickswapping",
-      top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["quickswap"].storageVar
+      top.pages["randomizer"].pages["gameoptions"].widgets["quickswap"].storageVar
     )
     self.adjustWidgets[key].pack(anchor=W)
 
@@ -51,7 +51,7 @@ def adjust_page(top, parent, settings):
       "selectbox",
       leftAdjustFrame,
       "Heart Color",
-      top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["heartcolor"].storageVar,
+      top.pages["randomizer"].pages["gameoptions"].widgets["heartcolor"].storageVar,
       {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
       {
         "Red": "red",
@@ -70,7 +70,7 @@ def adjust_page(top, parent, settings):
       "selectbox",
       leftAdjustFrame,
       "Heart Beep sound rate",
-      top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["heartbeep"].storageVar,
+      top.pages["randomizer"].pages["gameoptions"].widgets["heartbeep"].storageVar,
       {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}, "default": "Normal"},
       {
         "Double": "double",
@@ -115,7 +115,7 @@ def adjust_page(top, parent, settings):
       "selectbox",
       rightAdjustFrame,
       "Menu Speed",
-      top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["menuspeed"].storageVar,
+      top.pages["randomizer"].pages["gameoptions"].widgets["menuspeed"].storageVar,
       {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}, "default": "Normal"},
       {
         "Instant": "instant",
@@ -135,7 +135,7 @@ def adjust_page(top, parent, settings):
       "selectbox",
       rightAdjustFrame,
       "Overworld Palettes",
-      top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["owpalettes"].storageVar,
+      top.pages["randomizer"].pages["gameoptions"].widgets["owpalettes"].storageVar,
       {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
       {
         "Default": "default",
@@ -152,7 +152,7 @@ def adjust_page(top, parent, settings):
       "selectbox",
       rightAdjustFrame,
       "Underworld Palettes",
-      top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["uwpalettes"].storageVar,
+      top.pages["randomizer"].pages["gameoptions"].widgets["uwpalettes"].storageVar,
       {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
       {
         "Default": "default",

gui/bottom.py

@@ -108,9 +108,9 @@ def create_guiargs(parent):
     guiargs.shuffle = parent.pages["randomizer"].pages["entrance"].widgets["entranceshuffle"].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.heartbeep = parent.pages["randomizer"].pages["gameoptions"].widgets["heartbeep"].storageVar.get()
-    guiargs.heartcolor = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["heartcolor"].storageVar.get()
+    guiargs.heartcolor = parent.pages["randomizer"].pages["gameoptions"].widgets["heartcolor"].storageVar.get()
-    guiargs.fastmenu = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["menuspeed"].storageVar.get()
+    guiargs.fastmenu = parent.pages["randomizer"].pages["gameoptions"].widgets["menuspeed"].storageVar.get()
     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())
@@ -120,12 +120,12 @@ def create_guiargs(parent):
     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.quickswap = bool(parent.pages["randomizer"].pages["gameoptions"].widgets["quickswap"].storageVar.get())
-    guiargs.disablemusic = bool(parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["nobgm"].storageVar.get())
+    guiargs.disablemusic = bool(parent.pages["randomizer"].pages["gameoptions"].widgets["nobgm"].storageVar.get())
-    guiargs.ow_palettes = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["owpalettes"].storageVar.get()
+    guiargs.ow_palettes = parent.pages["randomizer"].pages["gameoptions"].widgets["owpalettes"].storageVar.get()
-    guiargs.uw_palettes = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["uwpalettes"].storageVar.get()
+    guiargs.uw_palettes = parent.pages["randomizer"].pages["gameoptions"].widgets["uwpalettes"].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.hints = bool(parent.pages["randomizer"].pages["gameoptions"].widgets["hints"].storageVar.get())
     guiargs.enemizercli = parent.pages["randomizer"].pages["enemizer"].enemizerCLIpathVar.get()
     guiargs.shufflebosses = parent.pages["randomizer"].pages["enemizer"].widgets["bossshuffle"].storageVar.get()
     guiargs.shuffleenemies = parent.pages["randomizer"].pages["enemizer"].widgets["enemyshuffle"].storageVar.get()
@@ -143,7 +143,7 @@ def create_guiargs(parent):
                                int(parent.pages["custom"].content.customWidgets["rupee300"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["rupoor"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["blueclock"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["greenclock"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["redclock"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["progressivebow"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["bomb10"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["triforcepieces"].storageVar.get()),int(parent.pages["custom"].content.customWidgets["triforcepiecesgoal"].storageVar.get()),
                                int(parent.pages["custom"].content.customWidgets["triforce"].storageVar.get()),int(parent.pages["custom"].content.customWidgets["rupoorcost"].storageVar.get()),int(parent.pages["custom"].content.customWidgets["generickeys"].storageVar.get())]
     guiargs.rom = parent.pages["randomizer"].pages["generation"].romVar.get()
-    guiargs.sprite = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["sprite"]["spriteObject"]
+    guiargs.sprite = parent.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteObject"]
     guiargs.randomSprite = parent.randomSprite.get()
     guiargs.outputpath = parent.outputPath.get()
     return guiargs

gui/loadcliargs.py

@@ -17,8 +17,8 @@ def loadcliargs(gui, args):
         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))
+        gui.pages["randomizer"].pages["gameoptions"].widgets["quickswap"].storageVar.set(int(args.quickswap))
-        gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["nobgm"].storageVar.set(int(args.disablemusic))
+        gui.pages["randomizer"].pages["gameoptions"].widgets["nobgm"].storageVar.set(int(args.disablemusic))
         if args.multi:
             gui.pages["randomizer"].pages["multiworld"].widgets["worlds"].storageVar.set(str(args.multi))
         if args.count:
@@ -39,30 +39,30 @@ def loadcliargs(gui, args):
         gui.pages["randomizer"].pages["entrance"].widgets["entranceshuffle"].storageVar.set(args.shuffle)
         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"].widgets["heartcolor"].storageVar.set(args.heartcolor)
-        gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["heartbeep"].storageVar.set(args.heartbeep)
+        gui.pages["randomizer"].pages["gameoptions"].widgets["heartbeep"].storageVar.set(args.heartbeep)
-        gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["menuspeed"].storageVar.set(args.fastmenu)
+        gui.pages["randomizer"].pages["gameoptions"].widgets["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"].widgets["shuffleganon"].storageVar.set(args.shuffleganon)
-        gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["hints"].storageVar.set(args.hints)
+        gui.pages["randomizer"].pages["gameoptions"].widgets["hints"].storageVar.set(args.hints)
         gui.pages["randomizer"].pages["enemizer"].enemizerCLIpathVar.set(args.enemizercli)
         gui.pages["randomizer"].pages["enemizer"].widgets["potshuffle"].storageVar.set(args.shufflepots)
         gui.pages["randomizer"].pages["enemizer"].widgets["enemyshuffle"].storageVar.set(args.shuffleenemies)
         gui.pages["randomizer"].pages["enemizer"].widgets["bossshuffle"].storageVar.set(args.shufflebosses)
         gui.pages["randomizer"].pages["enemizer"].widgets["enemydamage"].storageVar.set(args.enemy_damage)
         gui.pages["randomizer"].pages["enemizer"].widgets["enemyhealth"].storageVar.set(args.enemy_health)
-        gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["owpalettes"].storageVar.set(args.ow_palettes)
+        gui.pages["randomizer"].pages["gameoptions"].widgets["owpalettes"].storageVar.set(args.ow_palettes)
-        gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["uwpalettes"].storageVar.set(args.uw_palettes)
+        gui.pages["randomizer"].pages["gameoptions"].widgets["uwpalettes"].storageVar.set(args.uw_palettes)
         gui.outputPath.set(args.outputpath)
 
         def sprite_setter(spriteObject):
-            gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["sprite"]["spriteObject"] = spriteObject
+            gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteObject"] = spriteObject
         if args.sprite is not None:
             sprite_obj = args.sprite if isinstance(args.sprite, Sprite) else Sprite(args.sprite)
             r_sprite_flag = args.randomSprite if hasattr(args, 'randomSprite') else False
             set_sprite(sprite_obj, r_sprite_flag, spriteSetter=sprite_setter,
-                       spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["sprite"]["spriteNameVar"],
+                       spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteNameVar"],
                        randomSpriteVar=gui.randomSprite)
 
         gui.pages["adjust"].content.adjustWidgets["nobgm"].storageVar.set(int(args.disablemusic))

gui/randomize/gameoptions.py

@@ -9,40 +9,40 @@ def gameoptions_page(top, parent):
     self = ttk.Frame(parent)
 
     # Game Options options
-    self.gameOptionsWidgets = {}
+    self.widgets = {}
 
     ## Hints: Useful/Not useful
     key = "hints"
-    self.gameOptionsWidgets[key] = widgets.make_widget(
+    self.widgets[key] = widgets.make_widget(
       self,
       "checkbox",
       self,
       "Include Helpful Hints",
       None
     )
-    self.gameOptionsWidgets[key].pack(anchor=W)
+    self.widgets[key].pack(anchor=W)
 
     ## Disable BGM
     key = "nobgm"
-    self.gameOptionsWidgets[key] = widgets.make_widget(
+    self.widgets[key] = widgets.make_widget(
       self,
       "checkbox",
       self,
       "Disable Music & MSU-1",
       None
     )
-    self.gameOptionsWidgets[key].pack(anchor=W)
+    self.widgets[key].pack(anchor=W)
 
     ## L/R Quickswap
     key = "quickswap"
-    self.gameOptionsWidgets[key] = widgets.make_widget(
+    self.widgets[key] = widgets.make_widget(
       self,
       "checkbox",
       self,
       "L/R Quickswapping",
       None
     )
-    self.gameOptionsWidgets[key].pack(anchor=W)
+    self.widgets[key].pack(anchor=W)
 
     leftRomOptionsFrame = Frame(self)
     rightRomOptionsFrame = Frame(self)
@@ -51,7 +51,7 @@ def gameoptions_page(top, parent):
 
     ## Heart Color
     key = "heartcolor"
-    self.gameOptionsWidgets[key] = widgets.make_widget(
+    self.widgets[key] = widgets.make_widget(
       self,
       "selectbox",
       leftRomOptionsFrame,
@@ -66,11 +66,11 @@ def gameoptions_page(top, parent):
         "Random": "random"
       }
     )
-    self.gameOptionsWidgets[key].pack(anchor=E)
+    self.widgets[key].pack(anchor=E)
 
     ## Heart Beep Speed
     key = "heartbeep"
-    self.gameOptionsWidgets[key] = widgets.make_widget(
+    self.widgets[key] = widgets.make_widget(
       self,
       "selectbox",
       leftRomOptionsFrame,
@@ -85,25 +85,25 @@ def gameoptions_page(top, parent):
         "Off": "off"
       }
     )
-    self.gameOptionsWidgets[key].pack(anchor=W)
+    self.widgets[key].pack(anchor=W)
 
     ## Sprite selection
     spriteDialogFrame = Frame(leftRomOptionsFrame)
     baseSpriteLabel = Label(spriteDialogFrame, text='Sprite:')
 
-    self.gameOptionsWidgets["sprite"] = {}
+    self.widgets["sprite"] = {}
-    self.gameOptionsWidgets["sprite"]["spriteObject"] = None
+    self.widgets["sprite"]["spriteObject"] = None
-    self.gameOptionsWidgets["sprite"]["spriteNameVar"] = StringVar()
+    self.widgets["sprite"]["spriteNameVar"] = StringVar()
 
-    self.gameOptionsWidgets["sprite"]["spriteNameVar"].set('(unchanged)')
+    self.widgets["sprite"]["spriteNameVar"].set('(unchanged)')
-    spriteEntry = Label(spriteDialogFrame, textvariable=self.gameOptionsWidgets["sprite"]["spriteNameVar"])
+    spriteEntry = Label(spriteDialogFrame, textvariable=self.widgets["sprite"]["spriteNameVar"])
 
     def sprite_setter(spriteObject):
-        self.gameOptionsWidgets["sprite"]["spriteObject"] = spriteObject
+        self.widgets["sprite"]["spriteObject"] = spriteObject
 
     def sprite_select():
         spriteSelector.SpriteSelector(parent, partial(set_sprite, spriteSetter=sprite_setter,
-                                                      spriteNameVar=self.gameOptionsWidgets["sprite"]["spriteNameVar"],
+                                                      spriteNameVar=self.widgets["sprite"]["spriteNameVar"],
                                                       randomSpriteVar=top.randomSprite))
 
     spriteSelectButton = Button(spriteDialogFrame, text='...', command=sprite_select)
@@ -115,7 +115,7 @@ def gameoptions_page(top, parent):
 
     ## Menu Speed
     key = "menuspeed"
-    self.gameOptionsWidgets[key] = widgets.make_widget(
+    self.widgets[key] = widgets.make_widget(
       self,
       "selectbox",
       rightRomOptionsFrame,
@@ -131,11 +131,11 @@ def gameoptions_page(top, parent):
         "Half": "half"
       }
     )
-    self.gameOptionsWidgets[key].pack(anchor=E)
+    self.widgets[key].pack(anchor=E)
 
     ## Overworld Palettes (not Enemizer)
     key = "owpalettes"
-    self.gameOptionsWidgets[key] = widgets.make_widget(
+    self.widgets[key] = widgets.make_widget(
       self,
       "selectbox",
       rightRomOptionsFrame,
@@ -148,11 +148,11 @@ def gameoptions_page(top, parent):
         "Blackout": "blackout"
       }
     )
-    self.gameOptionsWidgets[key].pack(anchor=E)
+    self.widgets[key].pack(anchor=E)
 
     ## Underworld Palettes (not Enemizer)
     key = "uwpalettes"
-    self.gameOptionsWidgets[key] = widgets.make_widget(
+    self.widgets[key] = widgets.make_widget(
       self,
       "selectbox",
       rightRomOptionsFrame,
@@ -165,7 +165,7 @@ def gameoptions_page(top, parent):
         "Blackout": "blackout"
       }
     )
-    self.gameOptionsWidgets[key].pack(anchor=E)
+    self.widgets[key].pack(anchor=E)
 
     return self