Pretty Item Rando options

This commit is contained in:
Mike A. Trethewey
2020-02-08 23:59:58 -08:00
parent cc8ce4a623
commit 18e0008a99
4 changed files with 286 additions and 126 deletions

View File

@@ -35,19 +35,19 @@ def bottom_frame(self,parent,args=None):
guiargs.names = parent.multiworldWindow.namesVar.get()
guiargs.seed = int(parent.farBottomFrame.seedVar.get()) if parent.farBottomFrame.seedVar.get() else None
guiargs.count = int(parent.farBottomFrame.countVar.get()) if parent.farBottomFrame.countVar.get() != '1' else None
guiargs.mode = parent.itemWindow.modeVar.get()
guiargs.logic = parent.itemWindow.logicVar.get()
guiargs.mode = parent.itemWindow.itemWidgets["worldState"].storageVar.get()
guiargs.logic = parent.itemWindow.itemWidgets["logicLevel"].storageVar.get()
guiargs.goal = parent.itemWindow.goalVar.get()
guiargs.crystals_gt = parent.itemWindow.crystalsGTVar.get()
guiargs.crystals_ganon = parent.itemWindow.crystalsGanonVar.get()
guiargs.swords = parent.itemWindow.swordVar.get()
guiargs.difficulty = parent.itemWindow.difficultyVar.get()
guiargs.item_functionality = parent.itemWindow.itemfunctionVar.get()
guiargs.timer = parent.itemWindow.timerVar.get()
guiargs.progressive = parent.itemWindow.progressiveVar.get()
guiargs.accessibility = parent.itemWindow.accessibilityVar.get()
guiargs.algorithm = parent.itemWindow.algorithmVar.get()
guiargs.goal = parent.itemWindow.itemWidgets["goal"].storageVar.get()
guiargs.crystals_gt = parent.itemWindow.itemWidgets["crystals_gt"].storageVar.get()
guiargs.crystals_ganon = parent.itemWindow.itemWidgets["crystals_ganon"].storageVar.get()
guiargs.swords = parent.itemWindow.itemWidgets["weapons"].storageVar.get()
guiargs.difficulty = parent.itemWindow.itemWidgets["itempool"].storageVar.get()
guiargs.item_functionality = parent.itemWindow.itemWidgets["itemfunction"].storageVar.get()
guiargs.timer = parent.itemWindow.itemWidgets["timer"].storageVar.get()
guiargs.progressive = parent.itemWindow.itemWidgets["progressives"].storageVar.get()
guiargs.accessibility = parent.itemWindow.itemWidgets["accessibility"].storageVar.get()
guiargs.algorithm = parent.itemWindow.itemWidgets["sortingalgo"].storageVar.get()
guiargs.shuffle = parent.entrandoWindow.shuffleVar.get()
guiargs.door_shuffle = parent.dungeonRandoWindow.doorShuffleVar.get()
guiargs.heartbeep = parent.gameOptionsWindow.heartbeepVar.get()
@@ -61,7 +61,7 @@ def bottom_frame(self,parent,args=None):
guiargs.compassshuffle = bool(parent.dungeonRandoWindow.compassshuffleVar.get())
guiargs.keyshuffle = bool(parent.dungeonRandoWindow.keyshuffleVar.get())
guiargs.bigkeyshuffle = bool(parent.dungeonRandoWindow.bigkeyshuffleVar.get())
guiargs.retro = bool(parent.itemWindow.retroVar.get())
guiargs.retro = bool(parent.itemWindow.itemWidgets["retro"].storageVar.get())
guiargs.quickswap = bool(parent.gameOptionsWindow.quickSwapVar.get())
guiargs.disablemusic = bool(parent.gameOptionsWindow.disableMusicVar.get())
guiargs.ow_palettes = parent.gameOptionsWindow.owPalettesVar.get()