From 2aef6b438c3dc8de61d3316d531aa9c2426a98b9 Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Sat, 15 Feb 2020 01:58:58 -0800 Subject: [PATCH] Arrayify Game Options Eventually split from Adjust --- gui/adjust/overview.py | 14 +++++++------- gui/bottom.py | 18 +++++++++--------- gui/loadcliargs.py | 20 ++++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/gui/adjust/overview.py b/gui/adjust/overview.py index 18669b7c..230ffbcd 100644 --- a/gui/adjust/overview.py +++ b/gui/adjust/overview.py @@ -20,7 +20,7 @@ def adjust_page(top, parent, settings): "checkbox", self, "Disable Music & MSU-1", - top.gameOptionsWindow.gameOptionsWidgets["nobgm"].storageVar + top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["nobgm"].storageVar ) self.adjustWidgets[key].pack(anchor=W) @@ -31,7 +31,7 @@ def adjust_page(top, parent, settings): "checkbox", self, "L/R Quickswapping", - top.gameOptionsWindow.gameOptionsWidgets["quickswap"].storageVar + top.gameOptipages["randomizer"].pages["gameoptions"]onsWindow.gameOptionsWidgets["quickswap"].storageVar ) self.adjustWidgets[key].pack(anchor=W) @@ -51,7 +51,7 @@ def adjust_page(top, parent, settings): "selectbox", leftAdjustFrame, "Heart Color", - top.gameOptionsWindow.gameOptionsWidgets["heartcolor"].storageVar, + top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["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.gameOptionsWindow.gameOptionsWidgets["heartbeep"].storageVar, + top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["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.gameOptionsWindow.gameOptionsWidgets["menuspeed"].storageVar, + top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["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.gameOptionsWindow.gameOptionsWidgets["owpalettes"].storageVar, + top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["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.gameOptionsWindow.gameOptionsWidgets["uwpalettes"].storageVar, + top.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["uwpalettes"].storageVar, {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}}, { "Default": "default", diff --git a/gui/bottom.py b/gui/bottom.py index c3884dd9..eebb9d17 100644 --- a/gui/bottom.py +++ b/gui/bottom.py @@ -108,9 +108,9 @@ def create_guiargs(parent): 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() - guiargs.heartbeep = parent.gameOptionsWindow.gameOptionsWidgets["heartbeep"].storageVar.get() - guiargs.heartcolor = parent.gameOptionsWindow.gameOptionsWidgets["heartcolor"].storageVar.get() - guiargs.fastmenu = parent.gameOptionsWindow.gameOptionsWidgets["menuspeed"].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() guiargs.create_spoiler = bool(parent.generationSetupWindow.generationWidgets["spoiler"].storageVar.get()) guiargs.skip_playthrough = not bool(parent.generationSetupWindow.generationWidgets["spoiler"].storageVar.get()) guiargs.suppress_rom = bool(parent.generationSetupWindow.generationWidgets["suppressrom"].storageVar.get()) @@ -120,12 +120,12 @@ def create_guiargs(parent): 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.quickswap = bool(parent.gameOptionsWindow.gameOptionsWidgets["quickswap"].storageVar.get()) - guiargs.disablemusic = bool(parent.gameOptionsWindow.gameOptionsWidgets["nobgm"].storageVar.get()) - guiargs.ow_palettes = parent.gameOptionsWindow.gameOptionsWidgets["owpalettes"].storageVar.get() - guiargs.uw_palettes = parent.gameOptionsWindow.gameOptionsWidgets["uwpalettes"].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() + 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.hints = bool(parent.gameOptionsWindow.gameOptionsWidgets["hints"].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() guiargs.shuffleenemies = parent.pages["randomizer"].pages["enemizer"].enemizerWidgets["enemyshuffle"].storageVar.get() @@ -143,7 +143,7 @@ def create_guiargs(parent): int(parent.customContent.customWidgets["rupee300"].storageVar.get()), int(parent.customContent.customWidgets["rupoor"].storageVar.get()), int(parent.customContent.customWidgets["blueclock"].storageVar.get()), int(parent.customContent.customWidgets["greenclock"].storageVar.get()), int(parent.customContent.customWidgets["redclock"].storageVar.get()), int(parent.customContent.customWidgets["progressivebow"].storageVar.get()), int(parent.customContent.customWidgets["bomb10"].storageVar.get()), int(parent.customContent.customWidgets["triforcepieces"].storageVar.get()),int(parent.customContent.customWidgets["triforcepiecesgoal"].storageVar.get()), int(parent.customContent.customWidgets["triforce"].storageVar.get()),int(parent.customContent.customWidgets["rupoorcost"].storageVar.get()),int(parent.customContent.customWidgets["generickeys"].storageVar.get())] guiargs.rom = parent.generationSetupWindow.romVar.get() - guiargs.sprite = parent.gameOptionsWindow.gameOptionsWidgets["sprite"]["spriteObject"] + guiargs.sprite = parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["sprite"]["spriteObject"] guiargs.randomSprite = parent.randomSprite.get() guiargs.outputpath = parent.outputPath.get() return guiargs diff --git a/gui/loadcliargs.py b/gui/loadcliargs.py index 5d4dd508..c2f71702 100644 --- a/gui/loadcliargs.py +++ b/gui/loadcliargs.py @@ -17,8 +17,8 @@ def loadcliargs(gui, args): 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["entrance"].entrandoWidgets["openpyramid"].storageVar.set(args.openpyramid) - gui.gameOptionsWindow.gameOptionsWidgets["quickswap"].storageVar.set(int(args.quickswap)) - gui.gameOptionsWindow.gameOptionsWidgets["nobgm"].storageVar.set(int(args.disablemusic)) + 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: gui.pages["randomizer"].pages["multiworld"].multiworldWidgets["worlds"].storageVar.set(str(args.multi)) if args.count: @@ -39,30 +39,30 @@ def loadcliargs(gui, args): 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.gameOptionsWindow.gameOptionsWidgets["heartcolor"].storageVar.set(args.heartcolor) - gui.gameOptionsWindow.gameOptionsWidgets["heartbeep"].storageVar.set(args.heartbeep) - gui.gameOptionsWindow.gameOptionsWidgets["menuspeed"].storageVar.set(args.fastmenu) + 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.generationSetupWindow.romVar.set(args.rom) gui.pages["randomizer"].pages["entrance"].entrandoWidgets["shuffleganon"].storageVar.set(args.shuffleganon) - gui.gameOptionsWindow.gameOptionsWidgets["hints"].storageVar.set(args.hints) + 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) gui.pages["randomizer"].pages["enemizer"].enemizerWidgets["enemyshuffle"].storageVar.set(args.shuffleenemies) gui.pages["randomizer"].pages["enemizer"].enemizerWidgets["bossshuffle"].storageVar.set(args.shufflebosses) gui.pages["randomizer"].pages["enemizer"].enemizerWidgets["enemydamage"].storageVar.set(args.enemy_damage) gui.pages["randomizer"].pages["enemizer"].enemizerWidgets["enemyhealth"].storageVar.set(args.enemy_health) - gui.gameOptionsWindow.gameOptionsWidgets["owpalettes"].storageVar.set(args.ow_palettes) - gui.gameOptionsWindow.gameOptionsWidgets["uwpalettes"].storageVar.set(args.uw_palettes) + gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["owpalettes"].storageVar.set(args.ow_palettes) + gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["uwpalettes"].storageVar.set(args.uw_palettes) gui.outputPath.set(args.outputpath) def sprite_setter(spriteObject): - gui.gameOptionsWindow.gameOptionsWidgets["sprite"]["spriteObject"] = spriteObject + gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["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.gameOptionsWindow.gameOptionsWidgets["sprite"]["spriteNameVar"], + spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["sprite"]["spriteNameVar"], randomSpriteVar=gui.randomSprite) gui.adjustContent.adjustWidgets["nobgm"].storageVar.set(int(args.disablemusic))