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/gui/randomize/item/widgets.json
+++ b/resources/app/gui/randomize/item/widgets.json
@@ -124,6 +124,15 @@
        "vt26",
        "balanced"
      ]
+    },
+    "restrict_boss_items": {
+      "type": "selectbox",
+      "default": "none",
+      "options": [
+        "none",
+        "mapcompass",
+        "dungeon"
+      ]
    }
  }
 }