Merge branch 'DoorDevVolatile' into Customizer

# Conflicts:
#	BaseClasses.py
#	ItemList.py
#	Main.py

resources/app/cli/args.json

@@ -13,6 +13,11 @@
   "suppress_spoiler": {
     "action": "store_true"
   },
+  "mystery": {
+    "action": "store_true",
+    "type": "bool",
+    "help": "suppress"
+  },
   "logic": {
     "choices": [
       "noglitches",
@@ -79,9 +84,17 @@
       "keys",
       "dungeon",
       "cave",
+      "cavekeys",
+      "reduced",
+      "clustered",
+      "nonempty",
       "lottery"
     ]
   },
+  "colorizepots" : {
+    "action": "store_true",
+    "type": "bool"
+  },
   "shufflepots": {
     "action": "store_true",
     "type": "bool"

resources/app/cli/lang/en.json

@@ -260,9 +260,15 @@
       "None:      No pots are changed",
       "Keys:      Key pots are included in the location pool and other items can take their place",
       "Cave:      Only pots in houses and caves are included in the location pool",
+      "CaveKeys:  Both pots in houses and caves and keys pots are included in the location pool",
+      "Reduced:   Same as KeyCaves + 25% of Pots in dungeons (dynamic mode)",
+      "Clustered: Same as KeyCaves + 50% of Pots in dungeons, chosen by logical group (dynamic mode)",
+      "NonEmpty:  All pots that are not originally empty are included in the location pool",
       "Dungeon:   Only pots in dungeons are included in the location pool",
       "Lottery:   All pots are part of the location pool"
     ],
+    "colorizepots": ["All pots chosen to be in location pool by the pottery setting are different.",
+                     "Forced on in dynamic modes. Forced off in lottery"],
     "shufflepots": [ "Pots and switches are shuffled on the supertile (legacy potshuffle) (default: %(default)s)"],
     "mixed_travel": [
       "How to handle potential traversal between dungeon in Crossed door shuffle",

resources/app/gui/lang/en.json

@@ -61,8 +61,13 @@
     "randomizer.dungeon.pottery.none": "None",
     "randomizer.dungeon.pottery.keys": "Key Pots",
     "randomizer.dungeon.pottery.cave": "Cave Pots",
+    "randomizer.dungeon.pottery.cavekeys": "Cave+Key Pots",
+    "randomizer.dungeon.pottery.reduced": "Reduced Dungeon Pots (Dynamic)",
+    "randomizer.dungeon.pottery.clustered": "Clustered Dungeon Pots (Dynamic)",
+    "randomizer.dungeon.pottery.nonempty": "Excludes Empty Pots",
     "randomizer.dungeon.pottery.dungeon": "Dungeon Pots",
     "randomizer.dungeon.pottery.lottery": "Lottery (All Pots and Large Blocks)",
+    "randomizer.dungeon.colorizepots": "Colorize Randomized Pots",
 
     "randomizer.dungeon.dungeondoorshuffle": "Dungeon Door Shuffle",
     "randomizer.dungeon.dungeondoorshuffle.vanilla": "Vanilla",

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" },