Re-worked settings for pottery lottery

Fixed multiworld support for lottery

resources/app/cli/args.json

@@ -65,12 +65,24 @@
     "type": "bool"
   },
   "keydropshuffle" : {
-    "choices": [
+    "action": "store_true",
+    "type": "bool"
+  },
+  "dropshuffle" : {
+    "action": "store_true",
+    "type": "bool"
+  },
+  "pottery" : {
+    "choices" : [
       "none",
-      "keydrops",
-      "potsanity"
+      "keys",
+      "lottery"
     ]
   },
+  "shufflepots": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "mixed_travel" : {
     "choices": [
       "prevent",
@@ -388,10 +400,6 @@
       "random"
     ]
   },
-  "shufflepots": {
-    "action": "store_true",
-    "type": "bool"
-  },
   "remote_items": {
     "action": "store_true",
     "type": "bool"

resources/app/cli/lang/en.json

@@ -254,11 +254,13 @@
     "keyshuffle": [ "Small Keys are no longer restricted to their dungeons, but can be anywhere. (default: %(default)s)" ],
     "bigkeyshuffle": [ "Big Keys are no longer restricted to their dungeons, but can be anywhere. (default: %(default)s)" ],
     "shopsanity": ["Shop contents are shuffle in the main item pool and other items can take their place. (default: %(default)s)"],
-    "keydropshuffle": [ "Key Drops (Pots and Enemies) are shuffled and other items can take their place:",
-      "None:      No pots or enemies are included",
-      "Keydrops:  Only key drops are included",
-      "Potsanity: All key drops and all normal pots are included"
+    "dropshuffle": [ "Keys dropped by enemies are shuffled and other items can take their place. (default: %(default)s)"],
+    "pottery": [ "Controls how items under pots are shuffled and if other items can take their place:",
+      "None:      No pots are changed",
+      "Keys:      Key pots are included in the location pool and other items can take their place",
+      "Lottery:   All pots are part of the location pool"
     ],
+    "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",
       "Prevent:   Rails are placed to prevent bombs jump and hovering from changing dungeon except with glitched logic settings",

resources/app/gui/lang/en.json

@@ -53,10 +53,13 @@
     "randomizer.dungeon.compassshuffle": "Compasses",
     "randomizer.dungeon.smallkeyshuffle": "Small Keys",
     "randomizer.dungeon.bigkeyshuffle": "Big Keys",
-    "randomizer.dungeon.keydropshuffle": "Drops and Pots",
-    "randomizer.dungeon.keydropshuffle.none": "None",
-    "randomizer.dungeon.keydropshuffle.keydrops": "Only Key Drops",
-    "randomizer.dungeon.keydropshuffle.potsanity": "All Pots and Key Drops",
+    "randomizer.dungeon.keydropshuffle": "Drop and Pot Keys",
+    "randomizer.dungeon.dropshuffle": "Shuffle Key Drops",
+    "randomizer.dungeon.potshuffle": "Pot Shuffle (Legacy)",
+    "randomizer.dungeon.pottery": "Pottery",
+    "randomizer.dungeon.pottery.none": "None",
+    "randomizer.dungeon.pottery.keys": "Key Pots",
+    "randomizer.dungeon.pottery.lottery": "Lottery (All Pots and Large Blocks)",
 
     "randomizer.dungeon.dungeondoorshuffle": "Dungeon Door Shuffle",
     "randomizer.dungeon.dungeondoorshuffle.vanilla": "Vanilla",
@@ -69,7 +72,6 @@
     "randomizer.dungeon.dungeonintensity.3": "3: Dungeon Lobbies",
     "randomizer.dungeon.dungeonintensity.random": "Random",
 
-    "randomizer.dungeon.potshuffle": "Pot Shuffle",
     "randomizer.dungeon.experimental": "Enable Experimental Features",
 
     "randomizer.dungeon.dungeon_counters": "Dungeon Chest Counters",

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

@@ -22,15 +22,20 @@
         "width": 45
       }
     },
-    "keydropshuffle": {
+    "keydropshuffle": { "type": "checkbox" },
+    "pottery": {
       "type": "selectbox",
       "default": "none",
       "options": [
         "none",
-        "keydrops",
-        "potsanity"
-      ]
+        "keys",
+        "lottery"
+      ],
+      "config": {
+        "width": 35
+      }
     },
+    "dropshuffle": { "type": "checkbox" },
     "potshuffle": { "type": "checkbox" },
     "experimental": { "type": "checkbox" },
     "dungeon_counters": {