From 01a1190b5860deb265ccfd0d06e3c57695e429c3 Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Tue, 24 Mar 2020 01:26:14 -0700 Subject: [PATCH] Fix bugs --- Main.py | 4 ++-- source/gui/adjust/overview.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Main.py b/Main.py index b55b8918..dfdbd5e1 100644 --- a/Main.py +++ b/Main.py @@ -248,13 +248,13 @@ def main(args, seed=None, fish=None): "difficulty_adjustments": world.difficulty_adjustments[player], # 2 "mode": world.mode[player], # 3 "goal": world.goal[player], # 4 - "timer": str(world.timer[player]), # 5 + "timer": str(world.timer), # 5 "shuffle": world.shuffle[player], # 6 "doorShuffle": world.doorShuffle[player], # 7 "algorithm": world.algorithm, # 8 "mscb": mcsb_name, # 9 "retro": world.retro[player], # A - "progressive": world.progressive[player], # B + "progressive": world.progressive, # B "hints": str(world.hints[player]) # C } # 0 1 2 3 4 5 6 7 8 9 A B C diff --git a/source/gui/adjust/overview.py b/source/gui/adjust/overview.py index c524d02e..4f7fe543 100644 --- a/source/gui/adjust/overview.py +++ b/source/gui/adjust/overview.py @@ -104,7 +104,7 @@ def adjust_page(top, parent, settings): arg = options[option] setattr(guiargs, arg, self.widgets[option].storageVar.get()) guiargs.rom = self.romVar2.get() - guiargs.baserom = top.pages["randomizer"].pages["generation"].romVar.get() + guiargs.baserom = top.pages["randomizer"].pages["generation"].widgets["rom"].storageVar.get() guiargs.sprite = self.sprite try: adjust(args=guiargs)