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

resources/app/gui/randomize/dungeon/keysanity.json

@@ -3,7 +3,6 @@
     "mapshuffle":       { "type": "checkbox" },
     "compassshuffle":   { "type": "checkbox" },
     "smallkeyshuffle":  { "type": "checkbox" },
-    "bigkeyshuffle":    { "type": "checkbox" },
-    "keydropshuffle":   { "type": "checkbox" }
+    "bigkeyshuffle":    { "type": "checkbox" }
   }
 }

resources/app/gui/randomize/dungeon/widgets.json

@@ -22,6 +22,27 @@
         "width": 45
       }
     },
+    "keydropshuffle": { "type": "checkbox" },
+    "pottery": {
+      "type": "selectbox",
+      "default": "none",
+      "options": [
+        "none",
+        "keys",
+        "cave",
+        "cavekeys",
+        "reduced",
+        "clustered",
+        "nonempty",
+        "dungeon",
+        "lottery"
+      ],
+      "config": {
+        "width": 35
+      }
+    },
+    "colorizepots": { "type": "checkbox" },
+    "dropshuffle": { "type": "checkbox" },
     "potshuffle": { "type": "checkbox" },
     "experimental": { "type": "checkbox" },
     "dungeon_counters": {

resources/app/gui/randomize/enemizer/widgets.json

@@ -15,6 +15,7 @@
         "none",
         "simple",
         "full",
+        "unique",
         "random"
       ]
     }

resources/app/gui/randomize/entrando/widgets.json

@@ -1,8 +1,29 @@
 {
   "widgets": {
-    "openpyramid":      { "type": "checkbox" },
+    "openpyramid": { 
+      "type": "selectbox",
+      "options": [
+        "auto",
+        "yes",
+        "no"
+      ],
+      "config": {
+        "width": 10
+      }
+    },
     "shuffleganon":     { "type": "checkbox" },
     "shufflelinks":     { "type": "checkbox" },
+    "overworld_map": {
+      "type": "selectbox",
+      "options": [
+        "default",
+        "compass",
+        "map"
+      ],
+      "config": {
+        "width": 45
+      }
+    },
     "entranceshuffle":  {
       "type": "selectbox",
       "options": [

resources/app/gui/randomize/gameoptions/widgets.json

@@ -1,6 +1,8 @@
 {
   "checkboxes":   {
     "nobgm":      { "type": "checkbox" },
+    "msu_resume": { "type": "checkbox" },
+    "collection_rate": {"type":  "checkbox"},
     "quickswap":  { "type": "checkbox" },
     "reduce_flashing": { "type": "checkbox" },
     "shuffle_sfx": { "type": "checkbox" }

resources/app/gui/randomize/generation/checkboxes.json

@@ -1,7 +1,8 @@
 {
   "checkboxes": {
-    "createspoiler":      { "type": "checkbox" },
     "createrom":          { "type": "checkbox" },
+    "bps":                { "type": "checkbox" },
+    "createspoiler":      { "type": "checkbox" },
     "calcplaythrough":    { "type": "checkbox" },
     "usestartinventory":  { "type": "checkbox" },
     "usecustompool":      { "type": "checkbox" }

resources/app/gui/randomize/item/widgets.json

@@ -133,13 +133,20 @@
       "type": "selectbox",
       "default": "balanced",
       "options": [
-        "freshness",
-        "flood",
-        "vt21",
-        "vt22",
-        "vt25",
-        "vt26",
-        "balanced"
+        "balanced",
+        "vanilla_fill",
+        "major_only",
+        "dungeon_only",
+        "district"
+      ]
+    },
+    "restrict_boss_items": {
+      "type": "selectbox",
+      "default": "none",
+      "options": [
+        "none",
+        "mapcompass",
+        "dungeon"
       ]
     },
     "beemizer": {

resources/app/gui/randomize/overworld/widgets.json

@@ -1,4 +1,10 @@
 {
+  "topOverworldFrame": {
+    "bonk_drops": {
+      "type": "checkbox",
+      "default": false
+    }
+  },
   "leftOverworldFrame": {
     "overworldshuffle": {
       "type": "selectbox",
@@ -14,7 +20,6 @@
       "default": "vanilla",
       "options": [
         "none",
-        "allowed",
         "polar",
         "grouped",
         "limited",