Merge branch 'DoorDevVolatile' into Customizer

# Conflicts: # BaseClasses.py # ItemList.py # Main.py
2022-04-21 11:14:40 -06:00
parent b3c9f1cf03 31aeb8a776
commit 7dd5cc0e36
23 changed files with 1087 additions and 546 deletions
--- a/resources/app/gui/randomize/dungeon/widgets.json
+++ b/resources/app/gui/randomize/dungeon/widgets.json
@@ -30,6 +30,10 @@
        "none",
        "keys",
        "cave",
+        "cavekeys",
+        "reduced",
+        "clustered",
+        "nonempty",
        "dungeon",
        "lottery"
      ],
@@ -37,6 +41,7 @@
        "width": 35
      }
    },
+    "colorizepots": { "type": "checkbox" },
    "dropshuffle": { "type": "checkbox" },
    "potshuffle": { "type": "checkbox" },
    "experimental": { "type": "checkbox" },