Arrayify Dungeon Rando

Fix item rando references
This commit is contained in:
Mike A. Trethewey
2020-02-15 01:56:43 -08:00
parent a3e80b9481
commit 19534a6e2a
2 changed files with 38 additions and 38 deletions

View File

@@ -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()