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

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

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

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

@@ -1,11 +1,20 @@
 {
   "widgets": {
+    "smallkeyshuffle": {
+      "type": "selectbox",
+      "options": [
+        "none",
+        "wild",
+        "universal"
+      ]
+    },
     "dungeondoorshuffle": {
       "type": "selectbox",
       "default": "vanilla",
       "options": [
         "vanilla",
         "basic",
+        "partitioned",
         "crossed"
       ]
     },
@@ -22,6 +31,42 @@
         "width": 45
       }
     },
+    "door_type_mode": {
+      "type": "selectbox",
+      "default": "original",
+      "options": [
+        "original",
+        "big",
+        "all",
+        "chaos"
+      ],
+      "config": {
+        "width": 45
+      }
+    },
+    "trap_door_mode": {
+      "type": "selectbox",
+      "default": "optional",
+      "options": [
+        "vanilla",
+        "optional",
+        "boss",
+        "oneway"
+      ],
+      "config": {
+        "width": 30
+      }
+    },
+    "key_logic_algorithm": {
+      "type": "selectbox",
+      "default": "default",
+      "options": [
+        "default",
+        "partial",
+        "strict"
+      ]
+    },
+    "decoupledoors": { "type": "checkbox" },
     "keydropshuffle": { "type": "checkbox" },
     "pottery": {
       "type": "selectbox",

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

@@ -11,8 +11,17 @@
         "width": 10
       }
     },
+    "take_any":  {
+      "type": "selectbox",
+      "options": [
+        "none",
+        "random",
+        "fixed"
+      ]
+    },
     "shuffleganon":     { "type": "checkbox" },
     "shufflelinks":     { "type": "checkbox" },
+    "shuffletavern":     { "type": "checkbox" },
     "overworld_map": {
       "type": "selectbox",
       "options": [

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

@@ -4,7 +4,9 @@
     "bps":                { "type": "checkbox" },
     "createspoiler":      { "type": "checkbox" },
     "calcplaythrough":    { "type": "checkbox" },
+    "print_custom_yaml":  { "type": "checkbox" },
     "usestartinventory":  { "type": "checkbox" },
-    "usecustompool":      { "type": "checkbox" }
+    "usecustompool":      { "type": "checkbox" },
+    "race":               { "type": "checkbox" }
   }
 }

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

@@ -36,7 +36,9 @@
         "dungeons",
         "triforcehunt",
         "trinity",
-        "crystals"
+        "crystals",
+        "ganonhunt",
+        "completionist"
       ]
     },
     "crystals_gt": {
@@ -102,6 +104,22 @@
         "expert"
       ]
     },
+    "flute_mode": {
+      "type": "selectbox",
+      "options": [
+        "normal",
+        "active"
+      ]
+    },
+    "bow_mode": {
+      "type": "selectbox",
+      "options": [
+        "progressive",
+        "silvers",
+        "retro",
+        "retro_silvers"
+      ]
+    },
     "timer": {
       "type": "selectbox",
       "options": [
@@ -113,14 +131,6 @@
         "timed-countdown"
       ]
     },
-    "progressives": {
-      "type": "selectbox",
-      "options": [
-        "on",
-        "off",
-        "random"
-      ]
-    },
     "accessibility": {
       "type": "selectbox",
       "options": [