Merge branch 'DoorDevVolatile' into Customizer

# Conflicts: # BaseClasses.py # ItemList.py # Main.py
2022-04-21 11:14:40 -06:00
parent b3c9f1cf03 31aeb8a776
commit 7dd5cc0e36
23 changed files with 1087 additions and 546 deletions
--- a/resources/app/cli/args.json
+++ b/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",
@@ -79,9 +84,17 @@
      "keys",
      "dungeon",
      "cave",
+      "cavekeys",
+      "reduced",
+      "clustered",
+      "nonempty",
      "lottery"
    ]
  },
+  "colorizepots" : {
+    "action": "store_true",
+    "type": "bool"
+  },
  "shufflepots": {
    "action": "store_true",
    "type": "bool"