Merged in DR v1.4.1.6

resources/app/gui/lang/en.json

@@ -134,8 +134,10 @@
     "randomizer.enemizer.enemyhealth.hard": "Hard",
     "randomizer.enemizer.enemyhealth.expert": "Expert",
 
-    "randomizer.enemizer.enemizercli": "EnemizerCLI path: ",
-    "randomizer.enemizer.enemizercli.online": "(get online)",
+    "randomizer.enemizer.enemylogic": "Enemy Logic",
+    "randomizer.enemizer.enemylogic.none": "Forbid special enemies",
+    "randomizer.enemizer.enemylogic.allow_drops": "Item drops may have special enemies",
+    "randomizer.enemizer.enemylogic.allow_all": "Allow special enemies anywhere",
 
 
     "randomizer.overworld.overworldshuffle": "Layout Shuffle",
@@ -355,7 +357,10 @@
     "randomizer.item.colorizepots": "Colorize Randomized Pots",
     "randomizer.item.potshuffle": "Pot Shuffle (Legacy)",
 
-    "randomizer.item.dropshuffle": "Shuffle Enemy Key Drops",
+    "randomizer.item.dropshuffle": "Enemy Drops",
+    "randomizer.item.dropshuffle.none": "None",
+    "randomizer.item.dropshuffle.keys": "Small Key Enemies",
+    "randomizer.item.dropshuffle.underworld": "Underworld Enemies",
     "randomizer.item.keydropshuffle": "Enable Key Drop Shuffle (Legacy)",
 
     "randomizer.item.take_any": "Take Any Caves",

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

@@ -4,9 +4,7 @@
       "type": "selectbox",
       "options": [
         "none",
-        "shuffled",
-        "random",
-        "legacy"
+        "shuffled"
       ]
     },
     "bossshuffle": {
@@ -39,5 +37,19 @@
         "expert"
       ]
     }
+  },
+  "bottomEnemizerFrame": {
+    "enemylogic": {
+      "type": "selectbox",
+      "default": "allow_all",
+      "options": [
+        "none",
+        "allow_drops",
+        "allow_all"
+      ],
+      "config": {
+        "width": 32
+      }
+    }
   }
 }

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

@@ -158,12 +158,17 @@
       }
     },
     "dropshuffle": {
-      "type": "checkbox"
-    }
+      "type": "selectbox",
+      "default": "none",
+      "options": [
+        "none",
+        "keys",
+        "underworld"
+    ]}
   },
   "leftPoolFrame2": {
     "keydropshuffle": {
-      "type": "button",
+      "type": "checkbox",
       "config": {
         "command": "keydropshuffle"
       }