Arrayify Dungeon Rando

Fix item rando references
2020-02-15 01:56:43 -08:00
parent a3e80b9481
commit 19534a6e2a
2 changed files with 38 additions and 38 deletions
--- a/gui/bottom.py
+++ b/gui/bottom.py
@@ -92,22 +92,22 @@ 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.pages["randomizer"]["item"].itemWidgets["worldstate"].storageVar.get()
-    guiargs.logic = parent.pages["randomizer"]["item"].itemWidgets["logiclevel"].storageVar.get()
+    guiargs.mode = parent.pages["randomizer"].pages["item"].itemWidgets["worldstate"].storageVar.get()
+    guiargs.logic = parent.pages["randomizer"].pages["item"].itemWidgets["logiclevel"].storageVar.get()

-    guiargs.goal = parent.pages["randomizer"]["item"].itemWidgets["goal"].storageVar.get()
-    guiargs.crystals_gt = parent.pages["randomizer"]["item"].itemWidgets["crystals_gt"].storageVar.get()
-    guiargs.crystals_ganon = parent.pages["randomizer"]["item"].itemWidgets["crystals_ganon"].storageVar.get()
-    guiargs.swords = parent.pages["randomizer"]["item"].itemWidgets["weapons"].storageVar.get()
-    guiargs.difficulty = parent.pages["randomizer"]["item"].itemWidgets["itempool"].storageVar.get()
-    guiargs.item_functionality = parent.pages["randomizer"]["item"].itemWidgets["itemfunction"].storageVar.get()
-    guiargs.timer = parent.pages["randomizer"]["item"].itemWidgets["timer"].storageVar.get()
-    guiargs.progressive = parent.pages["randomizer"]["item"].itemWidgets["progressives"].storageVar.get()
-    guiargs.accessibility = parent.pages["randomizer"]["item"].itemWidgets["accessibility"].storageVar.get()
-    guiargs.algorithm = parent.pages["randomizer"]["item"].itemWidgets["sortingalgo"].storageVar.get()
+    guiargs.goal = parent.pages["randomizer"].pages["item"].itemWidgets["goal"].storageVar.get()
+    guiargs.crystals_gt = parent.pages["randomizer"].pages["item"].itemWidgets["crystals_gt"].storageVar.get()
+    guiargs.crystals_ganon = parent.pages["randomizer"].pages["item"].itemWidgets["crystals_ganon"].storageVar.get()
+    guiargs.swords = parent.pages["randomizer"].pages["item"].itemWidgets["weapons"].storageVar.get()
+    guiargs.difficulty = parent.pages["randomizer"].pages["item"].itemWidgets["itempool"].storageVar.get()
+    guiargs.item_functionality = parent.pages["randomizer"].pages["item"].itemWidgets["itemfunction"].storageVar.get()
+    guiargs.timer = parent.pages["randomizer"].pages["item"].itemWidgets["timer"].storageVar.get()
+    guiargs.progressive = parent.pages["randomizer"].pages["item"].itemWidgets["progressives"].storageVar.get()
+    guiargs.accessibility = parent.pages["randomizer"].pages["item"].itemWidgets["accessibility"].storageVar.get()
+    guiargs.algorithm = parent.pages["randomizer"].pages["item"].itemWidgets["sortingalgo"].storageVar.get()
    guiargs.shuffle = parent.pages["randomizer"].pages["entrance"].entrandoWidgets["entranceshuffle"].storageVar.get()
-    guiargs.door_shuffle = parent.dungeonRandoWindow.dungeonWidgets["dungeondoorshuffle"].storageVar.get()
-    guiargs.experimental = parent.dungeonRandoWindow.dungeonWidgets["experimental"].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()
@@ -115,11 +115,11 @@ def create_guiargs(parent):
    guiargs.skip_playthrough = not bool(parent.generationSetupWindow.generationWidgets["spoiler"].storageVar.get())
    guiargs.suppress_rom = bool(parent.generationSetupWindow.generationWidgets["suppressrom"].storageVar.get())
    guiargs.openpyramid = bool(parent.pages["randomizer"].pages["entrance"].entrandoWidgets["openpyramid"].storageVar.get())
-    guiargs.mapshuffle = bool(parent.dungeonRandoWindow.dungeonWidgets["mapshuffle"].storageVar.get())
-    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.pages["randomizer"]["item"].itemWidgets["retro"].storageVar.get())
+    guiargs.mapshuffle = bool(parent.pages["randomizer"].pages["dungeon"].dungeonWidgets["mapshuffle"].storageVar.get())
+    guiargs.compassshuffle = bool(parent.pages["randomizer"].pages["dungeon"].dungeonWidgets["compassshuffle"].storageVar.get())
+    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()
--- a/gui/loadcliargs.py
+++ b/gui/loadcliargs.py
@@ -11,11 +11,11 @@ def loadcliargs(gui, args):
        # load values from commandline args
        gui.generationSetupWindow.generationWidgets["spoiler"].storageVar.set(int(args.create_spoiler))
        gui.generationSetupWindow.generationWidgets["suppressrom"].storageVar.set(int(args.suppress_rom))
-        gui.dungeonRandoWindow.dungeonWidgets["mapshuffle"].storageVar.set(args.mapshuffle)
-        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.pages["randomizer"]["item"].itemWidgets["retro"].storageVar.set(args.retro)
+        gui.pages["randomizer"].pages["dungeon"].dungeonWidgets["mapshuffle"].storageVar.set(args.mapshuffle)
+        gui.pages["randomizer"].pages["dungeon"].dungeonWidgets["compassshuffle"].storageVar.set(args.compassshuffle)
+        gui.pages["randomizer"].pages["dungeon"].dungeonWidgets["smallkeyshuffle"].storageVar.set(args.keyshuffle)
+        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))
@@ -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.pages["randomizer"]["item"].itemWidgets["worldstate"].storageVar.set(args.mode)
-        gui.pages["randomizer"]["item"].itemWidgets["weapons"].storageVar.set(args.swords)
-        gui.pages["randomizer"]["item"].itemWidgets["itempool"].storageVar.set(args.difficulty)
-        gui.pages["randomizer"]["item"].itemWidgets["itemfunction"].storageVar.set(args.item_functionality)
-        gui.pages["randomizer"]["item"].itemWidgets["timer"].storageVar.set(args.timer)
-        gui.pages["randomizer"]["item"].itemWidgets["progressives"].storageVar.set(args.progressive)
-        gui.pages["randomizer"]["item"].itemWidgets["accessibility"].storageVar.set(args.accessibility)
-        gui.pages["randomizer"]["item"].itemWidgets["goal"].storageVar.set(args.goal)
-        gui.pages["randomizer"]["item"].itemWidgets["crystals_gt"].storageVar.set(args.crystals_gt)
-        gui.pages["randomizer"]["item"].itemWidgets["crystals_ganon"].storageVar.set(args.crystals_ganon)
-        gui.pages["randomizer"]["item"].itemWidgets["sortingalgo"].storageVar.set(args.algorithm)
+        gui.pages["randomizer"].pages["item"].itemWidgets["worldstate"].storageVar.set(args.mode)
+        gui.pages["randomizer"].pages["item"].itemWidgets["weapons"].storageVar.set(args.swords)
+        gui.pages["randomizer"].pages["item"].itemWidgets["itempool"].storageVar.set(args.difficulty)
+        gui.pages["randomizer"].pages["item"].itemWidgets["itemfunction"].storageVar.set(args.item_functionality)
+        gui.pages["randomizer"].pages["item"].itemWidgets["timer"].storageVar.set(args.timer)
+        gui.pages["randomizer"].pages["item"].itemWidgets["progressives"].storageVar.set(args.progressive)
+        gui.pages["randomizer"].pages["item"].itemWidgets["accessibility"].storageVar.set(args.accessibility)
+        gui.pages["randomizer"].pages["item"].itemWidgets["goal"].storageVar.set(args.goal)
+        gui.pages["randomizer"].pages["item"].itemWidgets["crystals_gt"].storageVar.set(args.crystals_gt)
+        gui.pages["randomizer"].pages["item"].itemWidgets["crystals_ganon"].storageVar.set(args.crystals_ganon)
+        gui.pages["randomizer"].pages["item"].itemWidgets["sortingalgo"].storageVar.set(args.algorithm)
        gui.pages["randomizer"].pages["entrance"].entrandoWidgets["entranceshuffle"].storageVar.set(args.shuffle)
-        gui.dungeonRandoWindow.dungeonWidgets["dungeondoorshuffle"].storageVar.set(args.door_shuffle)
-        gui.dungeonRandoWindow.dungeonWidgets["experimental"].storageVar.set(args.experimental)
+        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"]["item"].itemWidgets["logiclevel"].storageVar.set(args.logic)
+        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)