Merge remote-tracking branch 'origin/OverworldShuffle' into OverworldShuffle

resources/app/cli/args.json

@@ -13,6 +13,11 @@
   "suppress_spoiler": {
     "action": "store_true"
   },
+  "mystery": {
+    "action": "store_true",
+    "type": "bool",
+    "help": "suppress"
+  },
   "logic": {
     "choices": [
       "noglitches",
@@ -49,8 +54,8 @@
       "pedestal",
       "dungeons",
       "triforcehunt",
-      "crystals",
-      "trinity"
+      "trinity",
+      "crystals"
     ]
   },
   "difficulty": {
@@ -75,7 +80,32 @@
     "action": "store_true",
     "type": "bool"
   },
-  "mixed_travel": {
+  "dropshuffle" : {
+    "action": "store_true",
+    "type": "bool"
+  },
+  "pottery" : {
+    "choices" : [
+      "none",
+      "keys",
+      "dungeon",
+      "cave",
+      "cavekeys",
+      "reduced",
+      "clustered",
+      "nonempty",
+      "lottery"
+    ]
+  },
+  "colorizepots" : {
+    "action": "store_true",
+    "type": "bool"
+  },
+  "shufflepots": {
+    "action": "store_true",
+    "type": "bool"
+  },
+  "mixed_travel" : {
     "choices": [
       "prevent",
       "allow",
@@ -108,12 +138,10 @@
   "algorithm": {
     "choices": [
       "balanced",
-      "freshness",
-      "flood",
-      "vt21",
-      "vt22",
-      "vt25",
-      "vt26"
+      "vanilla_fill",
+      "major_only",
+      "dungeon_only",
+      "district"
     ]
   },
   "ow_shuffle": {
@@ -126,7 +154,6 @@
   "ow_crossed": {
     "choices": [
       "none",
-      "allowed",
       "polar",
       "grouped",
       "limited",
@@ -145,6 +172,10 @@
     "action": "store_true",
     "type": "bool"
   },
+  "bonk_drops": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "ow_fluteshuffle": {
     "choices": [
       "vanilla",
@@ -245,8 +276,11 @@
     ]
   },
   "openpyramid": {
-    "action": "store_true",
-    "type": "bool"
+    "choices": [
+      "auto",
+      "yes",
+      "no"
+    ]
   },
   "rom": {},
   "loglevel": {
@@ -283,6 +317,14 @@
     "action": "store_true",
     "type": "bool"
   },
+  "msu_resume": {
+    "action": "store_true",
+    "type": "bool"
+  },
+  "collection_rate": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "mapshuffle": {
     "action": "store_true",
     "type": "bool"
@@ -334,6 +376,13 @@
       "none"
     ]
   },
+  "restrict_boss_items": {
+    "choices": [
+      "none",
+      "mapcompass",
+      "dungeon"
+    ]
+  },
   "hints": {
     "action": "store_true",
     "type": "bool"
@@ -385,6 +434,10 @@
     "dest": "create_rom",
     "help": "suppress"
   },
+  "suppress_meta": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "shuffleganon": {
     "action": "store_true",
     "type": "bool",
@@ -398,6 +451,13 @@
     "action": "store_true",
     "type": "bool"
   },
+  "overworld_map": {
+    "choices": [
+      "default",
+      "compass",
+      "map"
+    ]
+  },
   "pseudoboots": {
     "action": "store_true",
     "type": "bool"
@@ -417,6 +477,9 @@
   "jsonout": {
     "action": "store_true"
   },
+  "bps": {
+    "action": "store_true"
+  },
   "enemizercli": {
     "setting": "enemizercli"
   },
@@ -424,6 +487,7 @@
     "choices": [
       "none",
       "simple",
+      "unique",
       "full",
       "random"
     ]
@@ -452,10 +516,6 @@
       "random"
     ]
   },
-  "shufflepots": {
-    "action": "store_true",
-    "type": "bool"
-  },
   "remote_items": {
     "action": "store_true",
     "type": "bool"