Implement prelim enums

2020-03-12 16:16:15 -07:00
parent d8ea5b0fd0
commit 4b0f30a85f
9 changed files with 160 additions and 40 deletions
--- a/resources/app/gui/randomize/dungeon/keysanity.json
+++ b/resources/app/gui/randomize/dungeon/keysanity.json
@@ -1,6 +1,8 @@
 {
-  "mapshuffle":       { "type": "checkbox" },
-  "compassshuffle":   { "type": "checkbox" },
-  "smallkeyshuffle":  { "type": "checkbox" },
-  "bigkeyshuffle":    { "type": "checkbox" }
+  "keysanity": {
+    "mapshuffle":       { "type": "checkbox" },
+    "compassshuffle":   { "type": "checkbox" },
+    "smallkeyshuffle":  { "type": "checkbox" },
+    "bigkeyshuffle":    { "type": "checkbox" }
+  }
 }
--- a/resources/app/gui/randomize/dungeon/widgets.json
+++ b/resources/app/gui/randomize/dungeon/widgets.json
@@ -1,22 +1,24 @@
 {
-  "dungeondoorshuffle": {
-    "type": "selectbox",
-    "default": "basic",
-    "options": [
-      "vanilla",
-      "basic",
-      "crossed"
-    ]
-  },
-  "experimental": { "type": "checkbox" },
-  "dungeon_counters": {
-    "type": "selectbox",
-    "default": "default",
-    "options": [
-      "default",
-      "off",
-      "on",
-      "pickup"
-    ]
+  "widgets": {
+    "dungeondoorshuffle": {
+      "type": "selectbox",
+      "default": "basic",
+      "options": [
+        "vanilla",
+        "basic",
+        "crossed"
+      ]
+    },
+    "experimental": { "type": "checkbox" },
+    "dungeon_counters": {
+      "type": "selectbox",
+      "default": "default",
+      "options": [
+        "default",
+        "off",
+        "on",
+        "pickup"
+      ]
+    }
  }
 }
--- a/resources/app/gui/randomize/generation/checkboxes.json
+++ b/resources/app/gui/randomize/generation/checkboxes.json
@@ -1,6 +1,8 @@
 {
-  "spoiler":            { "type": "checkbox" },
-  "suppressrom":        { "type": "checkbox" },
-  "usestartinventory":  { "type": "checkbox" },
-  "usecustompool":      { "type": "checkbox" }
+  "checkboxes": {
+    "spoiler":            { "type": "checkbox" },
+    "suppressrom":        { "type": "checkbox" },
+    "usestartinventory":  { "type": "checkbox" },
+    "usecustompool":      { "type": "checkbox" }
+  }
 }
--- a/resources/app/gui/randomize/generation/widgets.json
+++ b/resources/app/gui/randomize/generation/widgets.json
@@ -1,10 +1,12 @@
 {
-  "saveonexit": {
-    "type": "selectbox",
-    "options": [
-      "ask",
-      "always",
-      "never"
-    ]
+  "widgets": {
+    "saveonexit": {
+      "type": "selectbox",
+      "options": [
+        "ask",
+        "always",
+        "never"
+      ]
+    }
  }
 }
--- a/resources/app/gui/randomize/multiworld/widgets.json
+++ b/resources/app/gui/randomize/multiworld/widgets.json
@@ -1,3 +1,5 @@
 {
-  "worlds": { "type": "spinbox" }
+  "widgets": {
+    "worlds": { "type": "spinbox" }
+  }
 }