Enemizer Widgets

This commit is contained in:
Mike A. Trethewey
2020-02-15 02:20:05 -08:00
parent 5488c288af
commit 947778bc55
3 changed files with 21 additions and 21 deletions

View File

@@ -127,11 +127,11 @@ def create_guiargs(parent):
guiargs.shuffleganon = bool(parent.pages["randomizer"].pages["entrance"].widgets["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.hints = bool(parent.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["hints"].storageVar.get())
guiargs.enemizercli = parent.pages["randomizer"].pages["enemizer"].enemizerCLIpathVar.get() guiargs.enemizercli = parent.pages["randomizer"].pages["enemizer"].enemizerCLIpathVar.get()
guiargs.shufflebosses = parent.pages["randomizer"].pages["enemizer"].enemizerWidgets["bossshuffle"].storageVar.get() guiargs.shufflebosses = parent.pages["randomizer"].pages["enemizer"].widgets["bossshuffle"].storageVar.get()
guiargs.shuffleenemies = parent.pages["randomizer"].pages["enemizer"].enemizerWidgets["enemyshuffle"].storageVar.get() guiargs.shuffleenemies = parent.pages["randomizer"].pages["enemizer"].widgets["enemyshuffle"].storageVar.get()
guiargs.enemy_health = parent.pages["randomizer"].pages["enemizer"].enemizerWidgets["enemyhealth"].storageVar.get() guiargs.enemy_health = parent.pages["randomizer"].pages["enemizer"].widgets["enemyhealth"].storageVar.get()
guiargs.enemy_damage = parent.pages["randomizer"].pages["enemizer"].enemizerWidgets["enemydamage"].storageVar.get() guiargs.enemy_damage = parent.pages["randomizer"].pages["enemizer"].widgets["enemydamage"].storageVar.get()
guiargs.shufflepots = bool(parent.pages["randomizer"].pages["enemizer"].enemizerWidgets["potshuffle"].storageVar.get()) guiargs.shufflepots = bool(parent.pages["randomizer"].pages["enemizer"].widgets["potshuffle"].storageVar.get())
guiargs.custom = bool(parent.pages["randomizer"].pages["generation"].generationWidgets["usecustompool"].storageVar.get()) guiargs.custom = bool(parent.pages["randomizer"].pages["generation"].generationWidgets["usecustompool"].storageVar.get())
guiargs.customitemarray = [int(parent.pages["custom"].content.customWidgets["bow"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["silversupgrade"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["boomerang"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["redmerang"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["hookshot"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["mushroom"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["powder"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["firerod"].storageVar.get()), guiargs.customitemarray = [int(parent.pages["custom"].content.customWidgets["bow"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["silversupgrade"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["boomerang"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["redmerang"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["hookshot"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["mushroom"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["powder"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["firerod"].storageVar.get()),
int(parent.pages["custom"].content.customWidgets["icerod"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["bombos"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["ether"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["quake"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["lamp"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["hammer"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["shovel"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["flute"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["bugnet"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["icerod"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["bombos"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["ether"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["quake"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["lamp"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["hammer"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["shovel"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["flute"].storageVar.get()), int(parent.pages["custom"].content.customWidgets["bugnet"].storageVar.get()),

View File

@@ -47,11 +47,11 @@ def loadcliargs(gui, args):
gui.pages["randomizer"].pages["entrance"].widgets["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["gameoptions"].gameOptionsWidgets["hints"].storageVar.set(args.hints)
gui.pages["randomizer"].pages["enemizer"].enemizerCLIpathVar.set(args.enemizercli) 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"].widgets["potshuffle"].storageVar.set(args.shufflepots)
gui.pages["randomizer"].pages["enemizer"].enemizerWidgets["enemyshuffle"].storageVar.set(args.shuffleenemies) gui.pages["randomizer"].pages["enemizer"].widgets["enemyshuffle"].storageVar.set(args.shuffleenemies)
gui.pages["randomizer"].pages["enemizer"].enemizerWidgets["bossshuffle"].storageVar.set(args.shufflebosses) gui.pages["randomizer"].pages["enemizer"].widgets["bossshuffle"].storageVar.set(args.shufflebosses)
gui.pages["randomizer"].pages["enemizer"].enemizerWidgets["enemydamage"].storageVar.set(args.enemy_damage) gui.pages["randomizer"].pages["enemizer"].widgets["enemydamage"].storageVar.set(args.enemy_damage)
gui.pages["randomizer"].pages["enemizer"].enemizerWidgets["enemyhealth"].storageVar.set(args.enemy_health) 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"].gameOptionsWidgets["owpalettes"].storageVar.set(args.ow_palettes)
gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["uwpalettes"].storageVar.set(args.uw_palettes) gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["uwpalettes"].storageVar.set(args.uw_palettes)
gui.outputPath.set(args.outputpath) gui.outputPath.set(args.outputpath)

View File

@@ -7,18 +7,18 @@ def enemizer_page(parent,settings):
self = ttk.Frame(parent) self = ttk.Frame(parent)
# Enemizer options # Enemizer options
self.enemizerWidgets = {} self.widgets = {}
# Pot Shuffle # Pot Shuffle
key = "potshuffle" key = "potshuffle"
self.enemizerWidgets[key] = widgets.make_widget( self.widgets[key] = widgets.make_widget(
self, self,
"checkbox", "checkbox",
self, self,
"Pot Shuffle", "Pot Shuffle",
None None
) )
self.enemizerWidgets[key].pack(anchor=W) self.widgets[key].pack(anchor=W)
## Enemizer CLI Path ## Enemizer CLI Path
enemizerPathFrame = Frame(self) enemizerPathFrame = Frame(self)
@@ -46,7 +46,7 @@ def enemizer_page(parent,settings):
## Randomize Enemies ## Randomize Enemies
key = "enemyshuffle" key = "enemyshuffle"
self.enemizerWidgets[key] = widgets.make_widget( self.widgets[key] = widgets.make_widget(
self, self,
"selectbox", "selectbox",
leftEnemizerFrame, leftEnemizerFrame,
@@ -59,11 +59,11 @@ def enemizer_page(parent,settings):
"Chaos": "chaos" "Chaos": "chaos"
} }
) )
self.enemizerWidgets[key].pack(anchor=E) self.widgets[key].pack(anchor=E)
## Randomize Bosses ## Randomize Bosses
key = "bossshuffle" key = "bossshuffle"
self.enemizerWidgets[key] = widgets.make_widget( self.widgets[key] = widgets.make_widget(
self, self,
"selectbox", "selectbox",
leftEnemizerFrame, leftEnemizerFrame,
@@ -77,11 +77,11 @@ def enemizer_page(parent,settings):
"Chaos": "chaos" "Chaos": "chaos"
} }
) )
self.enemizerWidgets[key].pack(anchor=E) self.widgets[key].pack(anchor=E)
## Enemy Damage ## Enemy Damage
key = "enemydamage" key = "enemydamage"
self.enemizerWidgets[key] = widgets.make_widget( self.widgets[key] = widgets.make_widget(
self, self,
"selectbox", "selectbox",
rightEnemizerFrame, rightEnemizerFrame,
@@ -94,11 +94,11 @@ def enemizer_page(parent,settings):
"Chaos": "chaos" "Chaos": "chaos"
} }
) )
self.enemizerWidgets[key].pack(anchor=E) self.widgets[key].pack(anchor=E)
## Enemy Health ## Enemy Health
key = "enemyhealth" key = "enemyhealth"
self.enemizerWidgets[key] = widgets.make_widget( self.widgets[key] = widgets.make_widget(
self, self,
"selectbox", "selectbox",
rightEnemizerFrame, rightEnemizerFrame,
@@ -113,6 +113,6 @@ def enemizer_page(parent,settings):
"Expert": "expert" "Expert": "expert"
} }
) )
self.enemizerWidgets[key].pack(anchor=E) self.widgets[key].pack(anchor=E)
return self,settings return self,settings