From f7df6c0e6982dc798c9f41a9522691006d2ee239 Mon Sep 17 00:00:00 2001
From: "Mike A. Trethewey" <miketrethewey@gmail.com>
Date: Fri, 26 Feb 2021 02:13:11 -0800
Subject: [PATCH] Fixes

Change Spoiler default to True
Set base rom to actually do the thing
---
 .gitignore                         |  2 ++
 CLI.py                             |  4 ++--
 Utils.py                           | 10 +++++-----
 resources/app/cli/args.json        | 10 +++++-----
 source/gui/randomize/generation.py |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4dafb764..8e21a6d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@ weights/
 /Players/
 /QUsb2Snes/
 
+base2current.json
+
 resources/user/*
 !resources/user/.gitkeep
 
diff --git a/CLI.py b/CLI.py
index bab3e116..60ad0551 100644
--- a/CLI.py
+++ b/CLI.py
@@ -165,10 +165,10 @@ def parse_settings():
         "ow_palettes": "default",
         "uw_palettes": "default",
 
-        # Spoiler     defaults to FALSE
+        # Spoiler     defaults to TRUE
         # Playthrough defaults to TRUE
         # ROM         defaults to TRUE
-        "create_spoiler": False,
+        "create_spoiler": True,
         "calc_playthrough": True,
         "create_rom": True,
         "usestartinventory": False,
diff --git a/Utils.py b/Utils.py
index 3b8afbfd..44586dab 100644
--- a/Utils.py
+++ b/Utils.py
@@ -334,15 +334,15 @@ def update_deprecated_args(args):
             else:
                 args.no_hints = args.hints not in truthy  # dest = !src
 
-        # Spoiler defaults to FALSE
-        # Don't do: No
-        # Do:       Yes
-        if "create_spoiler" in argVars:
-            args.suppress_spoiler = not args.create_spoiler in truthy
+        # Spoiler defaults to TRUE
         # Don't do: Yes
         # Do:       No
         if "suppress_spoiler" in argVars:
             args.create_spoiler = not args.suppress_spoiler in truthy
+        # Don't do: No
+        # Do:       Yes
+        if "create_spoiler" in argVars:
+            args.suppress_spoiler = not args.create_spoiler in truthy
 
         # ROM defaults to TRUE
         # Don't do: Yes
diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json
index 7859a9e4..c112651c 100644
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -5,13 +5,13 @@
     "type": "bool"
   },
   "create_spoiler": {
-    "action": "store_true",
-    "type": "bool"
+    "action": "store_false",
+    "dest": "suppress_spoiler",
+    "type": "bool",
+    "help": "suppress"
   },
   "suppress_spoiler": {
-    "action": "store_false",
-    "dest": "create_spoiler",
-    "help": "suppress"
+    "action": "store_true"
   },
   "logic": {
     "choices": [
diff --git a/source/gui/randomize/generation.py b/source/gui/randomize/generation.py
index 4bcb868c..ea09767f 100644
--- a/source/gui/randomize/generation.py
+++ b/source/gui/randomize/generation.py
@@ -66,7 +66,7 @@ def generation_page(parent,settings):
     # FIXME: Translate these
     def RomSelect():
         rom = filedialog.askopenfilename(filetypes=[("Rom Files", (".sfc", ".smc")), ("All Files", "*")], initialdir=os.path.join("."))
-        self.widgets[widget].storageVar.set(rom)
+        self.widgets["rom"].storageVar.set(rom)
     # dialog button
     self.widgets[widget].pieces["button"] = Button(self.widgets[widget].pieces["frame"], text='Select Rom', command=RomSelect)