Arrayify Item Rando

Gui.py

@@ -56,14 +56,14 @@ def guiMain(args=None):
     # get saved settings
     self.settings = get_settings()
 
-    notebook = ttk.Notebook(self)
+    self.notebook = ttk.Notebook(self)
-    self.pages["randomizer"] = ttk.Frame(notebook)
+    self.pages["randomizer"] = ttk.Frame(self.notebook)
-    self.pages["adjust"] = ttk.Frame(notebook)
+    self.pages["adjust"] = ttk.Frame(self.notebook)
-    self.pages["custom"] = ttk.Frame(notebook)
+    self.pages["custom"] = ttk.Frame(self.notebook)
-    notebook.add(self.pages["randomizer"], text='Randomize')
+    self.notebook.add(self.pages["randomizer"], text='Randomize')
-    notebook.add(self.pages["adjust"], text='Adjust')
+    self.notebook.add(self.pages["adjust"], text='Adjust')
-    notebook.add(self.pages["custom"], text='Custom')
+    self.notebook.add(self.pages["custom"], text='Custom')
-    notebook.pack()
+    self.notebook.pack()
 
     # randomizer controls
 
@@ -76,38 +76,38 @@ def guiMain(args=None):
     #   Multiworld:       Multiworld settings
     #   Game Options:     Cosmetic settings that don't affect logic/placement
     #   Generation Setup: Primarily one&done settings
-    self.randomizerNotebook = ttk.Notebook(self.pages["randomizer"])
+    self.pages["randomizer"].notebook = ttk.Notebook(self.pages["randomizer"])
 
     # Item Randomizer
-    self.itemWindow = item_page(self.randomizerNotebook)
+    self.pages["randomizer"].pages["item"] = item_page(self.pages["randomizer"].notebook)
-    self.randomizerNotebook.add(self.itemWindow, text="Items")
+    self.pages["randomizer"].notebook.add(self.pages["randomizer"].pages["item"], text="Items")
 
     # Entrance Randomizer
-    self.entrandoWindow = entrando_page(self.randomizerNotebook)
+    self.pages["randomizer"].pages["entrance"] = entrando_page(self.pages["randomizer"].notebook)
-    self.randomizerNotebook.add(self.entrandoWindow, text="Entrances")
+    self.pages["randomizer"].notebook.add(self.pages["randomizer"].pages["entrance"], text="Entrances")
 
     # Enemizer
-    self.enemizerWindow,self.settings = enemizer_page(self.randomizerNotebook,self.settings)
+    self.pages["randomizer"].pages["enemizer"],self.settings = enemizer_page(self.pages["randomizer"].notebook,self.settings)
-    self.randomizerNotebook.add(self.enemizerWindow, text="Enemizer")
+    self.pages["randomizer"].notebook.add(self.pages["randomizer"].pages["enemizer"], text="Enemizer")
 
     # Dungeon Shuffle
-    self.dungeonRandoWindow = dungeon_page(self.randomizerNotebook)
+    self.pages["randomizer"].pages["dungeon"] = dungeon_page(self.pages["randomizer"].notebook)
-    self.randomizerNotebook.add(self.dungeonRandoWindow, text="Dungeon Shuffle")
+    self.pages["randomizer"].notebook.add(self.pages["randomizer"].pages["dungeon"], text="Dungeon Shuffle")
 
     # Multiworld
-    self.multiworldWindow,self.settings = multiworld_page(self.randomizerNotebook,self.settings)
+    self.pages["randomizer"].pages["multiworld"],self.settings = multiworld_page(self.pages["randomizer"].notebook,self.settings)
-    self.randomizerNotebook.add(self.multiworldWindow, text="Multiworld")
+    self.pages["randomizer"].notebook.add(self.pages["randomizer"].pages["multiworld"], text="Multiworld")
 
     # Game Options
-    self.gameOptionsWindow = gameoptions_page(self, self.randomizerNotebook)
+    self.pages["randomizer"].pages["gameoptions"] = gameoptions_page(self, self.pages["randomizer"].notebook)
-    self.randomizerNotebook.add(self.gameOptionsWindow, text="Game Options")
+    self.pages["randomizer"].notebook.add(self.pages["randomizer"].pages["gameoptions"], text="Game Options")
 
     # Generation Setup
-    self.generationSetupWindow,self.settings = generation_page(self.randomizerNotebook,self.settings)
+    self.pages["randomizer"].pages["generation"],self.settings = generation_page(self.pages["randomizer"].notebook,self.settings)
-    self.randomizerNotebook.add(self.generationSetupWindow, text="Generation Setup")
+    self.pages["randomizer"].notebook.add(self.pages["randomizer"].pages["generation"], text="Generation Setup")
 
     # add randomizer notebook to main window
-    self.randomizerNotebook.pack()
+    self.pages["randomizer"].notebook.pack()
 
     # bottom of window: Open Output Directory, Open Documentation (if exists)
     self.frames["bottom"] = bottom_frame(self, self, None)

gui/bottom.py

@@ -92,19 +92,19 @@ def create_guiargs(parent):
     guiargs.names = parent.multiworldWindow.namesVar.get()
     guiargs.seed = int(parent.frames["bottom"].seedVar.get()) if parent.frames["bottom"].seedVar.get() else None
     guiargs.count = int(parent.frames["bottom"].bottomWidgets["generationcount"].storageVar.get()) if parent.frames["bottom"].bottomWidgets["generationcount"].storageVar.get() != '1' else None
-    guiargs.mode = parent.itemWindow.itemWidgets["worldstate"].storageVar.get()
+    guiargs.mode = parent.pages["randomizer"]["item"].itemWidgets["worldstate"].storageVar.get()
-    guiargs.logic = parent.itemWindow.itemWidgets["logiclevel"].storageVar.get()
+    guiargs.logic = parent.pages["randomizer"]["item"].itemWidgets["logiclevel"].storageVar.get()
 
-    guiargs.goal = parent.itemWindow.itemWidgets["goal"].storageVar.get()
+    guiargs.goal = parent.pages["randomizer"]["item"].itemWidgets["goal"].storageVar.get()
-    guiargs.crystals_gt = parent.itemWindow.itemWidgets["crystals_gt"].storageVar.get()
+    guiargs.crystals_gt = parent.pages["randomizer"]["item"].itemWidgets["crystals_gt"].storageVar.get()
-    guiargs.crystals_ganon = parent.itemWindow.itemWidgets["crystals_ganon"].storageVar.get()
+    guiargs.crystals_ganon = parent.pages["randomizer"]["item"].itemWidgets["crystals_ganon"].storageVar.get()
-    guiargs.swords = parent.itemWindow.itemWidgets["weapons"].storageVar.get()
+    guiargs.swords = parent.pages["randomizer"]["item"].itemWidgets["weapons"].storageVar.get()
-    guiargs.difficulty = parent.itemWindow.itemWidgets["itempool"].storageVar.get()
+    guiargs.difficulty = parent.pages["randomizer"]["item"].itemWidgets["itempool"].storageVar.get()
-    guiargs.item_functionality = parent.itemWindow.itemWidgets["itemfunction"].storageVar.get()
+    guiargs.item_functionality = parent.pages["randomizer"]["item"].itemWidgets["itemfunction"].storageVar.get()
-    guiargs.timer = parent.itemWindow.itemWidgets["timer"].storageVar.get()
+    guiargs.timer = parent.pages["randomizer"]["item"].itemWidgets["timer"].storageVar.get()
-    guiargs.progressive = parent.itemWindow.itemWidgets["progressives"].storageVar.get()
+    guiargs.progressive = parent.pages["randomizer"]["item"].itemWidgets["progressives"].storageVar.get()
-    guiargs.accessibility = parent.itemWindow.itemWidgets["accessibility"].storageVar.get()
+    guiargs.accessibility = parent.pages["randomizer"]["item"].itemWidgets["accessibility"].storageVar.get()
-    guiargs.algorithm = parent.itemWindow.itemWidgets["sortingalgo"].storageVar.get()
+    guiargs.algorithm = parent.pages["randomizer"]["item"].itemWidgets["sortingalgo"].storageVar.get()
     guiargs.shuffle = parent.entrandoWindow.entrandoWidgets["entranceshuffle"].storageVar.get()
     guiargs.door_shuffle = parent.dungeonRandoWindow.dungeonWidgets["dungeondoorshuffle"].storageVar.get()
     guiargs.experimental = parent.dungeonRandoWindow.dungeonWidgets["experimental"].storageVar.get()
@@ -119,7 +119,7 @@ def create_guiargs(parent):
     guiargs.compassshuffle = bool(parent.dungeonRandoWindow.dungeonWidgets["compassshuffle"].storageVar.get())
     guiargs.keyshuffle = bool(parent.dungeonRandoWindow.dungeonWidgets["smallkeyshuffle"].storageVar.get())
     guiargs.bigkeyshuffle = bool(parent.dungeonRandoWindow.dungeonWidgets["bigkeyshuffle"].storageVar.get())
-    guiargs.retro = bool(parent.itemWindow.itemWidgets["retro"].storageVar.get())
+    guiargs.retro = bool(parent.pages["randomizer"]["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()

gui/loadcliargs.py

@@ -15,7 +15,7 @@ def loadcliargs(gui, args):
         gui.dungeonRandoWindow.dungeonWidgets["compassshuffle"].storageVar.set(args.compassshuffle)
         gui.dungeonRandoWindow.dungeonWidgets["smallkeyshuffle"].storageVar.set(args.keyshuffle)
         gui.dungeonRandoWindow.dungeonWidgets["bigkeyshuffle"].storageVar.set(args.bigkeyshuffle)
-        gui.itemWindow.itemWidgets["retro"].storageVar.set(args.retro)
+        gui.pages["randomizer"]["item"].itemWidgets["retro"].storageVar.set(args.retro)
         gui.entrandoWindow.entrandoWidgets["openpyramid"].storageVar.set(args.openpyramid)
         gui.gameOptionsWindow.gameOptionsWidgets["quickswap"].storageVar.set(int(args.quickswap))
         gui.gameOptionsWindow.gameOptionsWidgets["nobgm"].storageVar.set(int(args.disablemusic))
@@ -25,24 +25,24 @@ def loadcliargs(gui, args):
             gui.frames["bottom"].bottomWidgets["generationcount"].storageVar.set(str(args.count))
         if args.seed:
             gui.frames["bottom"].seedVar.set(str(args.seed))
-        gui.itemWindow.itemWidgets["worldstate"].storageVar.set(args.mode)
+        gui.pages["randomizer"]["item"].itemWidgets["worldstate"].storageVar.set(args.mode)
-        gui.itemWindow.itemWidgets["weapons"].storageVar.set(args.swords)
+        gui.pages["randomizer"]["item"].itemWidgets["weapons"].storageVar.set(args.swords)
-        gui.itemWindow.itemWidgets["itempool"].storageVar.set(args.difficulty)
+        gui.pages["randomizer"]["item"].itemWidgets["itempool"].storageVar.set(args.difficulty)
-        gui.itemWindow.itemWidgets["itemfunction"].storageVar.set(args.item_functionality)
+        gui.pages["randomizer"]["item"].itemWidgets["itemfunction"].storageVar.set(args.item_functionality)
-        gui.itemWindow.itemWidgets["timer"].storageVar.set(args.timer)
+        gui.pages["randomizer"]["item"].itemWidgets["timer"].storageVar.set(args.timer)
-        gui.itemWindow.itemWidgets["progressives"].storageVar.set(args.progressive)
+        gui.pages["randomizer"]["item"].itemWidgets["progressives"].storageVar.set(args.progressive)
-        gui.itemWindow.itemWidgets["accessibility"].storageVar.set(args.accessibility)
+        gui.pages["randomizer"]["item"].itemWidgets["accessibility"].storageVar.set(args.accessibility)
-        gui.itemWindow.itemWidgets["goal"].storageVar.set(args.goal)
+        gui.pages["randomizer"]["item"].itemWidgets["goal"].storageVar.set(args.goal)
-        gui.itemWindow.itemWidgets["crystals_gt"].storageVar.set(args.crystals_gt)
+        gui.pages["randomizer"]["item"].itemWidgets["crystals_gt"].storageVar.set(args.crystals_gt)
-        gui.itemWindow.itemWidgets["crystals_ganon"].storageVar.set(args.crystals_ganon)
+        gui.pages["randomizer"]["item"].itemWidgets["crystals_ganon"].storageVar.set(args.crystals_ganon)
-        gui.itemWindow.itemWidgets["sortingalgo"].storageVar.set(args.algorithm)
+        gui.pages["randomizer"]["item"].itemWidgets["sortingalgo"].storageVar.set(args.algorithm)
         gui.entrandoWindow.entrandoWidgets["entranceshuffle"].storageVar.set(args.shuffle)
         gui.dungeonRandoWindow.dungeonWidgets["dungeondoorshuffle"].storageVar.set(args.door_shuffle)
         gui.dungeonRandoWindow.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.itemWindow.itemWidgets["logiclevel"].storageVar.set(args.logic)
+        gui.pages["randomizer"]["item"].itemWidgets["logiclevel"].storageVar.set(args.logic)
         gui.generationSetupWindow.romVar.set(args.rom)
         gui.entrandoWindow.entrandoWidgets["shuffleganon"].storageVar.set(args.shuffleganon)
         gui.gameOptionsWindow.gameOptionsWidgets["hints"].storageVar.set(args.hints)