Fixed some enemizer mystery settings

Added an easy way to turn off unkillable thieves

BaseClasses.py

@@ -2269,7 +2269,7 @@ access_mode = {"items": 0, "locations": 1, "none": 2}
 
 # byte 6: BSMC BBEE (big, small, maps, compass, bosses, enemies)
 boss_mode = {"none": 0, "simple": 1, "full": 2, "random": 3, "chaos": 3}
-enemy_mode = {"none": 0, "shuffled": 1, "random": 2, "chaos": 2}
+enemy_mode = {"none": 0, "shuffled": 1, "random": 2, "chaos": 2, "legacy": 3}
 
 # byte 7: HHHD DP?? (enemy_health, enemy_dmg, potshuffle, ?)
 e_health = {"default": 0, "easy": 1, "normal": 2, "hard": 3, "expert": 4}

Mystery.py

@@ -195,15 +195,17 @@ def roll_settings(weights):
         boss_choice = old_style_bosses[boss_choice]
     ret.shufflebosses = boss_choice
 
-    ret.shuffleenemies = {'none': 'none',
+    enemy_choice = get_choice('enemy_shuffle')
-                          'shuffled': 'shuffled',
+    if enemy_choice == 'chaos':
-                          'random': 'chaos'
+        enemy_choice = 'random'
-                          }[get_choice('enemy_shuffle')]
+    ret.shuffleenemies = enemy_choice
 
-    ret.enemy_damage = {'default': 'default',
+    old_style_damage = {'none': 'default',
-                        'shuffled': 'shuffled',
+                        'chaos': 'random'}
-                        'random': 'chaos'
+    damage_choice = get_choice('enemy_damage')
-                        }[get_choice('enemy_damage')]
+    if damage_choice in old_style_damage:
+        damage_choice = old_style_damage[damage_choice]
+    ret.enemy_damage = damage_choice
 
     ret.enemy_health = get_choice('enemy_health')
 

RELEASENOTES.md

@@ -17,6 +17,8 @@ Thanks to qadan, cheuer, & compiling
 * 0.4.0.8
 	* Ganon jokes added for when silvers aren't available
 	* Some text updated (Blind jokes, uncle text)
+	* Fixed some enemizer Mystery settings
+	* Added a setting that's random enemy shuffle without Unkillable Thieves possible
 * 0.4.0.7
 	* Reduce flashing option added
 	* Sprite author credit added

Rom.py

@@ -201,7 +201,7 @@ def patch_enemizer(world, player, rom, baserom_path, enemizercli, random_sprite_
     options = {
         'RandomizeEnemies': world.enemy_shuffle[player] != 'none',
         'RandomizeEnemiesType': 3,
-        'RandomizeBushEnemyChance': world.enemy_shuffle[player] == 'random',
+        'RandomizeBushEnemyChance': world.enemy_shuffle[player] in ['random', 'legacy'],
         'RandomizeEnemyHealthRange': world.enemy_health[player] != 'default',
         'RandomizeEnemyHealthType': {'default': 0, 'easy': 0, 'normal': 1, 'hard': 2, 'expert': 3}[world.enemy_health[player]],
         'OHKO': False,
@@ -247,9 +247,9 @@ def patch_enemizer(world, player, rom, baserom_path, enemizercli, random_sprite_
         'SwordGraphics': "sword_gfx/normal.gfx",
         'BeeMizer': False,
         'BeesLevel': 0,
-        'RandomizeTileTrapPattern': world.enemy_shuffle[player] == 'random',
+        'RandomizeTileTrapPattern': world.enemy_shuffle[player] in ['random', 'legacy'],
         'RandomizeTileTrapFloorTile': False,
-        'AllowKillableThief': bool(random.randint(0, 1)) if world.enemy_shuffle[player] == 'random' else world.enemy_shuffle[player] != 'none',
+        'AllowKillableThief': bool(random.randint(0, 1)) if world.enemy_shuffle[player] == 'legacy' else world.enemy_shuffle[player] != 'none',
         'RandomizeSpriteOnHit': random_sprite_on_hit,
         'DebugMode': False,
         'DebugForceEnemy': False,

resources/app/cli/args.json

@@ -340,7 +340,8 @@
     "choices": [
       "none",
       "shuffled",
-      "random"
+      "random",
+      "legacy"
     ]
   },
   "enemy_health": {

resources/app/gui/lang/en.json

@@ -87,6 +87,7 @@
     "randomizer.enemizer.enemyshuffle.none": "None",
     "randomizer.enemizer.enemyshuffle.shuffled": "Shuffled",
     "randomizer.enemizer.enemyshuffle.random": "Random",
+    "randomizer.enemizer.enemyshuffle.legacy": "Random (including Thieves)",
 
     "randomizer.enemizer.bossshuffle": "Boss Shuffle",
     "randomizer.enemizer.bossshuffle.none": "None",

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

@@ -5,7 +5,8 @@
       "options": [
         "none",
         "shuffled",
-        "random"
+        "random",
+        "legacy"
       ]
     },
     "bossshuffle": {