alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Split Adjust vars

Browse Source 
Still populate with Game Options page
This commit is contained in:
Mike A. Trethewey
2020-02-15 03:17:46 -08:00
parent 8c07302e3b
commit 01fd3d418f
2 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
gui/adjust/overview.py
View File

@@ -11,29 +11,29 @@ def adjust_page(top, parent, settings):
self = ttk.Frame(parent) self = ttk.Frame(parent)
# Adjust options # Adjust options
self.adjustWidgets = {} self.widgets = {}
# Disable BGM # Disable BGM
key = "nobgm" key = "nobgm"
self.adjustWidgets[key] = widgets.make_widget( self.widgets[key] = widgets.make_widget(
self, self,
"checkbox", "checkbox",
self, self,
"Disable Music & MSU-1", "Disable Music & MSU-1",
top.pages["randomizer"].pages["gameoptions"].widgets["nobgm"].storageVar None
) )
self.adjustWidgets[key].pack(anchor=W) self.widgets[key].pack(anchor=W)
# L/R Quickswap # L/R Quickswap
key = "quickswap" key = "quickswap"
self.adjustWidgets[key] = widgets.make_widget( self.widgets[key] = widgets.make_widget(
self, self,
"checkbox", "checkbox",
self, self,
"L/R Quickswapping", "L/R Quickswapping",
top.pages["randomizer"].pages["gameoptions"].widgets["quickswap"].storageVar None
) )
self.adjustWidgets[key].pack(anchor=W) self.widgets[key].pack(anchor=W)
selectOptionsFrame = Frame(self) selectOptionsFrame = Frame(self)
leftAdjustFrame = Frame(selectOptionsFrame) leftAdjustFrame = Frame(selectOptionsFrame)
@@ -46,12 +46,12 @@ def adjust_page(top, parent, settings):
## Heart Color ## Heart Color
key = "heartcolor" key = "heartcolor"
self.adjustWidgets[key] = widgets.make_widget( self.widgets[key] = widgets.make_widget(
self, self,
"selectbox", "selectbox",
leftAdjustFrame, leftAdjustFrame,
"Heart Color", "Heart Color",
top.pages["randomizer"].pages["gameoptions"].widgets["heartcolor"].storageVar, None,
{"label": {"side": LEFT}, "selectbox": {"side": RIGHT}}, {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
{ {
"Red": "red", "Red": "red",
@@ -61,16 +61,16 @@ def adjust_page(top, parent, settings):
"Random": "random" "Random": "random"
} }
) )
self.adjustWidgets[key].pack(anchor=E) self.widgets[key].pack(anchor=E)
## Heart Beep Speed ## Heart Beep Speed
key = "heartbeep" key = "heartbeep"
self.adjustWidgets[key] = widgets.make_widget( self.widgets[key] = widgets.make_widget(
self, self,
"selectbox", "selectbox",
leftAdjustFrame, leftAdjustFrame,
"Heart Beep sound rate", "Heart Beep sound rate",
top.pages["randomizer"].pages["gameoptions"].widgets["heartbeep"].storageVar, None,
{"label": {"side": LEFT}, "selectbox": {"side": RIGHT}, "default": "Normal"}, {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}, "default": "Normal"},
{ {
"Double": "double", "Double": "double",
@@ -80,7 +80,7 @@ def adjust_page(top, parent, settings):
"Off": "off" "Off": "off"
} }
) )
self.adjustWidgets[key].pack(anchor=W) self.widgets[key].pack(anchor=W)
# Sprite Selection # Sprite Selection
self.spriteNameVar2 = StringVar() self.spriteNameVar2 = StringVar()
@@ -110,12 +110,12 @@ def adjust_page(top, parent, settings):
# Menu Speed # Menu Speed
key = "menuspeed" key = "menuspeed"
self.adjustWidgets[key] = widgets.make_widget( self.widgets[key] = widgets.make_widget(
self, self,
"selectbox", "selectbox",
rightAdjustFrame, rightAdjustFrame,
"Menu Speed", "Menu Speed",
top.pages["randomizer"].pages["gameoptions"].widgets["menuspeed"].storageVar, None,
{"label": {"side": LEFT}, "selectbox": {"side": RIGHT}, "default": "Normal"}, {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}, "default": "Normal"},
{ {
"Instant": "instant", "Instant": "instant",
@@ -126,16 +126,16 @@ def adjust_page(top, parent, settings):
"Half": "half" "Half": "half"
} }
) )
self.adjustWidgets[key].pack(anchor=E) self.widgets[key].pack(anchor=E)
# Overworld Palettes (not Enemizer) # Overworld Palettes (not Enemizer)
key = "owpalettes" key = "owpalettes"
self.adjustWidgets[key] = widgets.make_widget( self.widgets[key] = widgets.make_widget(
self, self,
"selectbox", "selectbox",
rightAdjustFrame, rightAdjustFrame,
"Overworld Palettes", "Overworld Palettes",
top.pages["randomizer"].pages["gameoptions"].widgets["owpalettes"].storageVar, None,
{"label": {"side": LEFT}, "selectbox": {"side": RIGHT}}, {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
{ {
"Default": "default", "Default": "default",
@@ -143,16 +143,16 @@ def adjust_page(top, parent, settings):
"Blackout": "blackout" "Blackout": "blackout"
} }
) )
self.adjustWidgets[key].pack(anchor=E) self.widgets[key].pack(anchor=E)
# Underworld Palettes (not Enemizer) # Underworld Palettes (not Enemizer)
key = "uwpalettes" key = "uwpalettes"
self.adjustWidgets[key] = widgets.make_widget( self.widgets[key] = widgets.make_widget(
self, self,
"selectbox", "selectbox",
rightAdjustFrame, rightAdjustFrame,
"Underworld Palettes", "Underworld Palettes",
top.pages["randomizer"].pages["gameoptions"].widgets["uwpalettes"].storageVar, None,
{"label": {"side": LEFT}, "selectbox": {"side": RIGHT}}, {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
{ {
"Default": "default", "Default": "default",
@@ -160,7 +160,7 @@ def adjust_page(top, parent, settings):
"Blackout": "blackout" "Blackout": "blackout"
} }
) )
self.adjustWidgets[key].pack(anchor=E) self.widgets[key].pack(anchor=E)
adjustRomFrame = Frame(bottomAdjustFrame) adjustRomFrame = Frame(bottomAdjustFrame)
adjustRomLabel = Label(adjustRomFrame, text='Rom to adjust: ') adjustRomLabel = Label(adjustRomFrame, text='Rom to adjust: ')
@@ -181,13 +181,13 @@ def adjust_page(top, parent, settings):
def adjustRom(): def adjustRom():
guiargs = Namespace() guiargs = Namespace()
guiargs.heartbeep = self.adjustWidgets["heartbeep"].storageVar.get() guiargs.heartbeep = self.widgets["heartbeep"].storageVar.get()
guiargs.heartcolor = self.adjustWidgets["heartcolor"].storageVar.get() guiargs.heartcolor = self.widgets["heartcolor"].storageVar.get()
guiargs.fastmenu = self.adjustWidgets["menuspeed"].storageVar.get() guiargs.fastmenu = self.widgets["menuspeed"].storageVar.get()
guiargs.ow_palettes = self.adjustWidgets["owpalettes"].storageVar.get() guiargs.ow_palettes = self.widgets["owpalettes"].storageVar.get()
guiargs.uw_palettes = self.adjustWidgets["uwpalettes"].storageVar.get() guiargs.uw_palettes = self.widgets["uwpalettes"].storageVar.get()
guiargs.quickswap = bool(self.adjustWidgets["quickswap"].storageVar.get()) guiargs.quickswap = bool(self.widgets["quickswap"].storageVar.get())
guiargs.disablemusic = bool(self.adjustWidgets["nobgm"].storageVar.get()) guiargs.disablemusic = bool(self.widgets["nobgm"].storageVar.get())
guiargs.rom = self.romVar2.get() guiargs.rom = self.romVar2.get()
guiargs.baserom = top.pages["randomizer"].pages["generation"].romVar.get() guiargs.baserom = top.pages["randomizer"].pages["generation"].romVar.get()
guiargs.sprite = self.sprite guiargs.sprite = self.sprite

10
gui/loadcliargs.py
View File

@@ -70,6 +70,8 @@ def loadcliargs(gui, args):
for widget in options[mainpage][subpage]: for widget in options[mainpage][subpage]:
arg = options[mainpage][subpage][widget] arg = options[mainpage][subpage][widget]
gui.pages[mainpage].pages[subpage].widgets[widget].storageVar.set(getattr(args, arg)) gui.pages[mainpage].pages[subpage].widgets[widget].storageVar.set(getattr(args, arg))
if subpage == "gameoptions" and not widget == "hints":
gui.pages["adjust"].content.widgets[widget].storageVar.set(getattr(args, arg))
gui.pages["randomizer"].pages["enemizer"].enemizerCLIpathVar.set(args.enemizercli) gui.pages["randomizer"].pages["enemizer"].enemizerCLIpathVar.set(args.enemizercli)
gui.pages["randomizer"].pages["generation"].romVar.set(args.rom) gui.pages["randomizer"].pages["generation"].romVar.set(args.rom)
@@ -91,14 +93,6 @@ def loadcliargs(gui, args):
spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteNameVar"], spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteNameVar"],
randomSpriteVar=gui.randomSprite) randomSpriteVar=gui.randomSprite)
gui.pages["adjust"].content.adjustWidgets["nobgm"].storageVar.set(int(args.disablemusic))
gui.pages["adjust"].content.adjustWidgets['quickswap'].storageVar.set(args.quickswap)
gui.pages["adjust"].content.adjustWidgets["heartcolor"].storageVar.set(args.heartcolor)
gui.pages["adjust"].content.adjustWidgets["heartbeep"].storageVar.set(args.heartbeep)
gui.pages["adjust"].content.adjustWidgets["menuspeed"].storageVar.set(args.fastmenu)
gui.pages["adjust"].content.adjustWidgets["owpalettes"].storageVar.set(args.ow_palettes)
gui.pages["adjust"].content.adjustWidgets["uwpalettes"].storageVar.set(args.uw_palettes)
def sprite_setter_adj(spriteObject): def sprite_setter_adj(spriteObject):
gui.pages["adjust"].content.sprite = spriteObject gui.pages["adjust"].content.sprite = spriteObject
if args.sprite is not None: if args.sprite is not None: