From c0632db4030034958c9d70c97f069103d93f3ea6 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sat, 5 Sep 2020 05:20:34 +0200 Subject: [PATCH] Set rom default options --- Gui.py | 2 +- Mystery.py | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Gui.py b/Gui.py index 2400ce83..b0d93bc7 100755 --- a/Gui.py +++ b/Gui.py @@ -157,7 +157,7 @@ def guiMain(args=None): spriteEntry.pack(side=LEFT) spriteSelectButton.pack(side=LEFT) - quickSwapVar = IntVar() + quickSwapVar = IntVar(value=1) quickSwapCheckbutton = Checkbutton(romOptionsFrame, text="L/R Quickswapping", variable=quickSwapVar) quickSwapCheckbutton.grid(row=1, column=0, sticky=E) diff --git a/Mystery.py b/Mystery.py index 595ddcc9..f6d810b2 100644 --- a/Mystery.py +++ b/Mystery.py @@ -434,15 +434,16 @@ def roll_settings(weights): if 'rom' in weights: romweights = weights['rom'] - ret.sprite = get_choice('sprite', romweights) - ret.disablemusic = get_choice('disablemusic', romweights) - ret.quickswap = get_choice('quickswap', romweights) - ret.fastmenu = get_choice('menuspeed', romweights) - ret.heartcolor = get_choice('heartcolor', romweights) - ret.heartbeep = convert_to_on_off(get_choice('heartbeep', romweights)) - ret.ow_palettes = get_choice('ow_palettes', romweights) - ret.uw_palettes = get_choice('uw_palettes', romweights) - + ret.sprite = get_choice('sprite', romweights, "Link") + ret.disablemusic = get_choice('disablemusic', romweights, False) + ret.quickswap = get_choice('quickswap', romweights, True) + ret.fastmenu = get_choice('menuspeed', romweights, "normal") + ret.heartcolor = get_choice('heartcolor', romweights, "red") + ret.heartbeep = convert_to_on_off(get_choice('heartbeep', romweights, "normal")) + ret.ow_palettes = get_choice('ow_palettes', romweights, "default") + ret.uw_palettes = get_choice('uw_palettes', romweights, "default") + else: + ret.quickswap = True return ret if __name__ == '__main__':