diff --git a/gui/bottom.py b/gui/bottom.py index 86b8b83c..766efa64 100644 --- a/gui/bottom.py +++ b/gui/bottom.py @@ -88,13 +88,9 @@ def bottom_frame(self, parent, args=None): def create_guiargs(parent): guiargs = Namespace() - guiargs.multi = int(parent.pages["randomizer"].pages["multiworld"].widgets["worlds"].storageVar.get()) - guiargs.names = parent.pages["randomizer"].pages["multiworld"].namesVar.get() - guiargs.seed = int(parent.frames["bottom"].seedVar.get()) if parent.frames["bottom"].seedVar.get() else None - guiargs.count = int(parent.frames["bottom"].widgets["generationcount"].storageVar.get()) if parent.frames["bottom"].widgets["generationcount"].storageVar.get() != '1' else None + guiargs.retro = bool(parent.pages["randomizer"].pages["item"].widgets["retro"].storageVar.get()) guiargs.mode = parent.pages["randomizer"].pages["item"].widgets["worldstate"].storageVar.get() guiargs.logic = parent.pages["randomizer"].pages["item"].widgets["logiclevel"].storageVar.get() - guiargs.goal = parent.pages["randomizer"].pages["item"].widgets["goal"].storageVar.get() guiargs.crystals_gt = parent.pages["randomizer"].pages["item"].widgets["crystals_gt"].storageVar.get() guiargs.crystals_ganon = parent.pages["randomizer"].pages["item"].widgets["crystals_ganon"].storageVar.get() @@ -105,6 +101,12 @@ def create_guiargs(parent): guiargs.progressive = parent.pages["randomizer"].pages["item"].widgets["progressives"].storageVar.get() guiargs.accessibility = parent.pages["randomizer"].pages["item"].widgets["accessibility"].storageVar.get() guiargs.algorithm = parent.pages["randomizer"].pages["item"].widgets["sortingalgo"].storageVar.get() + + guiargs.multi = int(parent.pages["randomizer"].pages["multiworld"].widgets["worlds"].storageVar.get()) + guiargs.names = parent.pages["randomizer"].pages["multiworld"].namesVar.get() + guiargs.seed = int(parent.frames["bottom"].seedVar.get()) if parent.frames["bottom"].seedVar.get() else None + guiargs.count = int(parent.frames["bottom"].widgets["generationcount"].storageVar.get()) if parent.frames["bottom"].widgets["generationcount"].storageVar.get() != '1' else None + guiargs.shuffle = parent.pages["randomizer"].pages["entrance"].widgets["entranceshuffle"].storageVar.get() guiargs.door_shuffle = parent.pages["randomizer"].pages["dungeon"].widgets["dungeondoorshuffle"].storageVar.get() guiargs.experimental = parent.pages["randomizer"].pages["dungeon"].widgets["experimental"].storageVar.get() @@ -119,7 +121,6 @@ def create_guiargs(parent): guiargs.compassshuffle = bool(parent.pages["randomizer"].pages["dungeon"].widgets["compassshuffle"].storageVar.get()) guiargs.keyshuffle = bool(parent.pages["randomizer"].pages["dungeon"].widgets["smallkeyshuffle"].storageVar.get()) guiargs.bigkeyshuffle = bool(parent.pages["randomizer"].pages["dungeon"].widgets["bigkeyshuffle"].storageVar.get()) - guiargs.retro = bool(parent.pages["randomizer"].pages["item"].widgets["retro"].storageVar.get()) guiargs.quickswap = bool(parent.pages["randomizer"].pages["gameoptions"].widgets["quickswap"].storageVar.get()) guiargs.disablemusic = bool(parent.pages["randomizer"].pages["gameoptions"].widgets["nobgm"].storageVar.get()) guiargs.ow_palettes = parent.pages["randomizer"].pages["gameoptions"].widgets["owpalettes"].storageVar.get() diff --git a/gui/loadcliargs.py b/gui/loadcliargs.py index 3379fb28..01d53079 100644 --- a/gui/loadcliargs.py +++ b/gui/loadcliargs.py @@ -9,13 +9,26 @@ def loadcliargs(gui, args): if type(v) is dict: setattr(args, k, v[1]) # only get values for player 1 for now # load values from commandline args + gui.pages["randomizer"].pages["item"].widgets["retro"].storageVar.set(args.retro) + gui.pages["randomizer"].pages["item"].widgets["worldstate"].storageVar.set(args.mode) + gui.pages["randomizer"].pages["item"].widgets["logiclevel"].storageVar.set(args.logic) + gui.pages["randomizer"].pages["item"].widgets["goal"].storageVar.set(args.goal) + gui.pages["randomizer"].pages["item"].widgets["crystals_gt"].storageVar.set(args.crystals_gt) + gui.pages["randomizer"].pages["item"].widgets["crystals_ganon"].storageVar.set(args.crystals_ganon) + gui.pages["randomizer"].pages["item"].widgets["weapons"].storageVar.set(args.swords) + gui.pages["randomizer"].pages["item"].widgets["itempool"].storageVar.set(args.difficulty) + gui.pages["randomizer"].pages["item"].widgets["itemfunction"].storageVar.set(args.item_functionality) + gui.pages["randomizer"].pages["item"].widgets["timer"].storageVar.set(args.timer) + gui.pages["randomizer"].pages["item"].widgets["progressives"].storageVar.set(args.progressive) + gui.pages["randomizer"].pages["item"].widgets["accessibility"].storageVar.set(args.accessibility) + gui.pages["randomizer"].pages["item"].widgets["sortingalgo"].storageVar.set(args.algorithm) + gui.pages["randomizer"].pages["generation"].widgets["spoiler"].storageVar.set(int(args.create_spoiler)) gui.pages["randomizer"].pages["generation"].widgets["suppressrom"].storageVar.set(int(args.suppress_rom)) gui.pages["randomizer"].pages["dungeon"].widgets["mapshuffle"].storageVar.set(args.mapshuffle) gui.pages["randomizer"].pages["dungeon"].widgets["compassshuffle"].storageVar.set(args.compassshuffle) gui.pages["randomizer"].pages["dungeon"].widgets["smallkeyshuffle"].storageVar.set(args.keyshuffle) gui.pages["randomizer"].pages["dungeon"].widgets["bigkeyshuffle"].storageVar.set(args.bigkeyshuffle) - gui.pages["randomizer"].pages["item"].widgets["retro"].storageVar.set(args.retro) gui.pages["randomizer"].pages["entrance"].widgets["openpyramid"].storageVar.set(args.openpyramid) gui.pages["randomizer"].pages["gameoptions"].widgets["quickswap"].storageVar.set(int(args.quickswap)) gui.pages["randomizer"].pages["gameoptions"].widgets["nobgm"].storageVar.set(int(args.disablemusic)) @@ -25,24 +38,12 @@ def loadcliargs(gui, args): gui.frames["bottom"].widgets["generationcount"].storageVar.set(str(args.count)) if args.seed: gui.frames["bottom"].seedVar.set(str(args.seed)) - gui.pages["randomizer"].pages["item"].widgets["worldstate"].storageVar.set(args.mode) - gui.pages["randomizer"].pages["item"].widgets["weapons"].storageVar.set(args.swords) - gui.pages["randomizer"].pages["item"].widgets["itempool"].storageVar.set(args.difficulty) - gui.pages["randomizer"].pages["item"].widgets["itemfunction"].storageVar.set(args.item_functionality) - gui.pages["randomizer"].pages["item"].widgets["timer"].storageVar.set(args.timer) - gui.pages["randomizer"].pages["item"].widgets["progressives"].storageVar.set(args.progressive) - gui.pages["randomizer"].pages["item"].widgets["accessibility"].storageVar.set(args.accessibility) - gui.pages["randomizer"].pages["item"].widgets["goal"].storageVar.set(args.goal) - gui.pages["randomizer"].pages["item"].widgets["crystals_gt"].storageVar.set(args.crystals_gt) - gui.pages["randomizer"].pages["item"].widgets["crystals_ganon"].storageVar.set(args.crystals_ganon) - gui.pages["randomizer"].pages["item"].widgets["sortingalgo"].storageVar.set(args.algorithm) gui.pages["randomizer"].pages["entrance"].widgets["entranceshuffle"].storageVar.set(args.shuffle) gui.pages["randomizer"].pages["dungeon"].widgets["dungeondoorshuffle"].storageVar.set(args.door_shuffle) gui.pages["randomizer"].pages["dungeon"].widgets["experimental"].storageVar.set(args.experimental) gui.pages["randomizer"].pages["gameoptions"].widgets["heartcolor"].storageVar.set(args.heartcolor) gui.pages["randomizer"].pages["gameoptions"].widgets["heartbeep"].storageVar.set(args.heartbeep) gui.pages["randomizer"].pages["gameoptions"].widgets["menuspeed"].storageVar.set(args.fastmenu) - gui.pages["randomizer"].pages["item"].widgets["logiclevel"].storageVar.set(args.logic) gui.pages["randomizer"].pages["generation"].romVar.set(args.rom) gui.pages["randomizer"].pages["entrance"].widgets["shuffleganon"].storageVar.set(args.shuffleganon) gui.pages["randomizer"].pages["gameoptions"].widgets["hints"].storageVar.set(args.hints)