Merged in DR v1.0.0.2

2022-03-27 14:56:16 -05:00
parent 6914562cdc 1ebb49fa59
commit fd7d9f7121
35 changed files with 2376 additions and 693 deletions
--- a/resources/app/gui/randomize/entrando/widgets.json
+++ b/resources/app/gui/randomize/entrando/widgets.json
@@ -3,6 +3,17 @@
    "openpyramid":      { "type": "checkbox" },
    "shuffleganon":     { "type": "checkbox" },
    "shufflelinks":     { "type": "checkbox" },
+    "overworld_map": {
+      "type": "selectbox",
+      "options": [
+        "default",
+        "compass",
+        "map"
+      ],
+      "config": {
+        "width": 45
+      }
+    },
    "entranceshuffle":  {
      "type": "selectbox",
      "options": [
--- a/resources/app/gui/randomize/item/widgets.json
+++ b/resources/app/gui/randomize/item/widgets.json
@@ -117,13 +117,21 @@
      "type": "selectbox",
      "default": "balanced",
      "options": [
-        "freshness",
-        "flood",
-        "vt21",
-        "vt22",
-        "vt25",
-        "vt26",
-        "balanced"
+        "balanced",
+        "equitable",
+        "vanilla_fill",
+        "major_only",
+        "dungeon_only",
+        "district"
+      ]
+    },
+    "restrict_boss_items": {
+      "type": "selectbox",
+      "default": "none",
+      "options": [
+        "none",
+        "mapcompass",
+        "dungeon"
      ]
    }
  }