Fix var loading again

Update Deprecated Args
Parse CLI
Parse Settings
Fix defaults
Fix priority
Add Enemizer error
Fix Custom Item Array again
Make output more verbose
Fix double-negative options

source/classes/constants.py

@@ -102,7 +102,8 @@ SETTINGSTOPROCESS = {
     },
     "generation": {
       "spoiler": "create_spoiler",
-      "suppressrom": "suppress_rom",
+      "createrom": "create_rom",
+      "calcplaythrough": "calc_playthrough",
       "usestartinventory": "usestartinventory",
       "usecustompool": "custom",
       "saveonexit": "saveonexit"

source/gui/bottom.py

@@ -3,9 +3,10 @@ from argparse import Namespace
 import logging
 import os
 import random
-from CLI import parse_arguments
-from Main import main
-from Utils import local_path, output_path, open_file
+from CLI import parse_cli
+from Fill import FillError
+from Main import main, EnemizerError
+from Utils import local_path, output_path, open_file, update_deprecated_args
 import source.classes.constants as CONST
 from source.gui.randomize.multiworld import multiworld_page
 import source.gui.widgets as widgets
@@ -68,7 +69,7 @@ def bottom_frame(self, parent, args=None):
     def generateRom():
         guiargs = create_guiargs(parent)
         # get default values for missing parameters
-        for k,v in vars(parse_arguments(['--multi', str(guiargs.multi)])).items():
+        for k,v in vars(parse_cli(['--multi', str(guiargs.multi)])).items():
             if k not in vars(guiargs):
                 setattr(guiargs, k, v)
             elif type(v) is dict: # use same settings for every player
@@ -81,11 +82,18 @@ def bottom_frame(self, parent, args=None):
                     seed = random.randint(0, 999999999)
             else:
                 main(seed=guiargs.seed, args=guiargs, fish=parent.fish)
-        except Exception as e:
+        except (FillError, EnemizerError, Exception, RuntimeError) as e:
             logging.exception(e)
             messagebox.showerror(title="Error while creating seed", message=str(e))
         else:
-            messagebox.showinfo(title="Success", message="Rom patched successfully")
+            YES = parent.fish.translate("cli","cli","yes")
+            NO = parent.fish.translate("cli","cli","no")
+            successMsg = ""
+            successMsg += (parent.fish.translate("cli","cli","made.rom").strip() % (YES if (guiargs.create_rom) else NO)) + "\n"
+            successMsg += (parent.fish.translate("cli","cli","made.playthrough").strip() % (YES if (guiargs.calc_playthrough) else NO)) + "\n"
+            successMsg += (parent.fish.translate("cli","cli","made.spoiler").strip() % (YES if (not guiargs.jsonout and guiargs.create_spoiler) else NO))
+
+            messagebox.showinfo(title="Success", message=successMsg)
 
     ## Generate Button
     # widget ID
@@ -226,4 +234,7 @@ def create_guiargs(parent):
 
     # Get output path
     guiargs.outputpath = parent.outputPath.get()
+
+    guiargs = update_deprecated_args(guiargs)
+
     return guiargs

source/gui/loadcliargs.py

@@ -1,6 +1,7 @@
 from source.classes.SpriteSelector import SpriteSelector as spriteSelector
 from source.gui.randomize.gameoptions import set_sprite
 from Rom import Sprite, get_sprite_from_name
+from Utils import update_deprecated_args
 import source.classes.constants as CONST
 from source.classes.BabelFish import BabelFish
 from source.classes.Empty import Empty
@@ -8,10 +9,12 @@ from source.classes.Empty import Empty
 # Load args/settings for most tabs
 def loadcliargs(gui, args, settings=None):
     if args is not None:
+        args = update_deprecated_args(args)
+        args = vars(args)
         fish = BabelFish()
-#        for k, v in vars(args).items():
-#            if type(v) is dict:
-#                setattr(args, k, v[1])  # only get values for player 1 for now
+        for k, v in args.items():
+            if isinstance(v,dict) and 1 in v:
+                setattr(args, k, v[1])  # only get values for player 1 for now
         # load values from commandline args
 
         # set up options to get