Merge branch 'Ambrosia' into DoorDevVolatile

# Conflicts: # BaseClasses.py # CLI.py # Main.py
2021-10-29 15:26:51 -06:00
parent d84a3832a6 9e04417072
commit e78f9218f5
15 changed files with 200 additions and 73 deletions
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -254,6 +254,13 @@
      "none"
    ]
  },
+  "restrict_boss_items": {
+    "choices": [
+      "none",
+      "mapcompass",
+      "dungeon"
+    ]
+  },
  "hints": {
    "action": "store_true",
    "type": "bool"