Merge branch 'OriginOverworldShuffle' into OverworldShuffle

resources/app/cli/args.json

@@ -23,6 +23,7 @@
       "noglitches",
       "minorglitches",
       "owglitches",
+      "hybridglitches",
       "nologic"
     ]
   },
@@ -184,8 +185,7 @@
       "none",
       "grouped",
       "polar",
-      "limited",
-      "chaos"
+      "unrestricted"
     ]
   },
   "ow_keepsimilar": {
@@ -219,6 +219,7 @@
       "full",
       "lite",
       "lean",
+      "district",
       "swapped",
       "crossed",
       "insanity",
@@ -378,6 +379,14 @@
     "action": "store_true",
     "type": "bool"
   },
+  "shuffle_sfxinstruments": {
+    "action": "store_true",
+    "type": "bool"
+  },
+  "shuffle_songinstruments": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "msu_resume": {
     "action": "store_true",
     "type": "bool"
@@ -603,11 +612,15 @@
     "action": "store_true",
     "type": "bool"
   },
-  "saveonexit": {
+  "aga_randomness": {
+    "action": "store_false",
+    "type": "bool"
+  },
+  "settingsonload": {
     "choices": [
-      "ask",
-      "always",
-      "never"
+      "default",
+      "saved",
+      "lastused"
     ]
   },
   "outputname": {},