Implemented District/Nearby Dungeon Item Shuffle

resources/app/cli/args.json

@@ -369,12 +369,18 @@
     "type": "bool"
   },
   "mapshuffle": {
-    "action": "store_true",
-    "type": "bool"
+    "choices": [
+      "none",
+      "district",
+      "wild"
+    ]
   },
   "compassshuffle": {
-    "action": "store_true",
-    "type": "bool"
+    "choices": [
+      "none",
+      "district",
+      "wild"
+    ]
   },
   "keyshuffle": {
     "choices": [
@@ -384,13 +390,17 @@
     ]
   },
   "bigkeyshuffle": {
-    "action": "store_true",
-    "type": "bool"
+    "choices": [
+      "none",
+      "district",
+      "wild"
+    ]
   },
   "prizeshuffle": {
     "choices": [
       "none",
       "dungeon",
+      "district",
       "wild"
     ]
   },

resources/app/gui/lang/en.json

@@ -53,15 +53,26 @@
 
     "randomizer.dungeon.keysanity": "Shuffle: ",
     "randomizer.dungeon.mapshuffle": "Maps",
+    "randomizer.dungeon.mapshuffle.none": "In Dungeon",
+    "randomizer.dungeon.mapshuffle.district": "Nearby",
+    "randomizer.dungeon.mapshuffle.wild": "Randomized",
     "randomizer.dungeon.compassshuffle": "Compasses",
+    "randomizer.dungeon.compassshuffle.none": "In Dungeon",
+    "randomizer.dungeon.compassshuffle.district": "Nearby",
+    "randomizer.dungeon.compassshuffle.wild": "Randomized",
     "randomizer.dungeon.smallkeyshuffle": "Small Keys",
     "randomizer.dungeon.smallkeyshuffle.none": "In Dungeon",
+    "randomizer.dungeon.smallkeyshuffle.district": "Nearby",
     "randomizer.dungeon.smallkeyshuffle.wild": "Randomized",
     "randomizer.dungeon.smallkeyshuffle.universal": "Universal",
     "randomizer.dungeon.bigkeyshuffle": "Big Keys",
+    "randomizer.dungeon.bigkeyshuffle.none": "In Dungeon",
+    "randomizer.dungeon.bigkeyshuffle.district": "Nearby",
+    "randomizer.dungeon.bigkeyshuffle.wild": "Randomized",
     "randomizer.dungeon.prizeshuffle": "Prizes",
     "randomizer.dungeon.prizeshuffle.none": "On Boss",
     "randomizer.dungeon.prizeshuffle.dungeon": "In Dungeon",
+    "randomizer.dungeon.prizeshuffle.district": "Nearby",
     "randomizer.dungeon.prizeshuffle.wild": "Randomized",
     "randomizer.dungeon.decoupledoors": "Decouple Doors",
     "randomizer.dungeon.door_self_loops": "Allow Self-Looping Spiral Stairs",

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

@@ -1,9 +1,32 @@
 {
   "keysanity": {
+    "mapshuffle":       {
+      "type": "selectbox",
+      "options": [
+        "none",
+        "district",
+        "wild"
+      ],
+      "config": {
+        "padx": [20,0]
+      }
+    },
+    "compassshuffle":   {
+      "type": "selectbox",
+      "options": [
+        "none",
+        "district",
+        "wild"
+      ],
+      "config": {
+        "padx": [20,0]
+      }
+    },
     "smallkeyshuffle": {
       "type": "selectbox",
       "options": [
         "none",
+        "district",
         "wild",
         "universal"
       ],
@@ -11,8 +34,16 @@
         "padx": [20,0]
       }
     },
-    "mapshuffle":       { "type": "checkbox" },
-    "compassshuffle":   { "type": "checkbox" },
-    "bigkeyshuffle":    { "type": "checkbox" }
+    "bigkeyshuffle":    {
+      "type": "selectbox",
+      "options": [
+        "none",
+        "district",
+        "wild"
+      ],
+      "config": {
+        "padx": [20,0]
+      }
+    }
   }
 }

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

@@ -6,6 +6,7 @@
       "options": [
         "none",
         "dungeon",
+        "district",
         "wild"
       ],
       "config": {