From fcde1e9cdcde05f8d560966f5022af6ab288a90d Mon Sep 17 00:00:00 2001
From: Bonta-kun <40473493+Bonta0@users.noreply.github.com>
Date: Mon, 16 Dec 2019 01:35:10 +0100
Subject: [PATCH] Added more enemy shuffle options to be consistent with what's
 on the website

---
 EntranceRandomizer.py | 2 +-
 Gui.py                | 2 +-
 Main.py               | 2 +-
 Rom.py                | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/EntranceRandomizer.py b/EntranceRandomizer.py
index 1d147b5f..c6a5d15a 100755
--- a/EntranceRandomizer.py
+++ b/EntranceRandomizer.py
@@ -249,7 +249,7 @@ def parse_arguments(argv, no_defaults=False):
     parser.add_argument('--skip_playthrough', action='store_true', default=defval(False))
     parser.add_argument('--enemizercli', default=defval(''))
     parser.add_argument('--shufflebosses', default=defval('none'), choices=['none', 'basic', 'normal', 'chaos'])
-    parser.add_argument('--shuffleenemies', default=defval(False), action='store_true')
+    parser.add_argument('--shuffleenemies', default=defval('none'), choices=['none', 'shuffled', 'chaos'])
     parser.add_argument('--enemy_health', default=defval('default'), choices=['default', 'easy', 'normal', 'hard', 'expert'])
     parser.add_argument('--enemy_damage', default=defval('default'), choices=['default', 'shuffled', 'chaos'])
     parser.add_argument('--shufflepalette', default=defval(False), action='store_true')
diff --git a/Gui.py b/Gui.py
index 2dcdbd85..749f072b 100755
--- a/Gui.py
+++ b/Gui.py
@@ -407,7 +407,7 @@ def guiMain(args=None):
         guiargs.hints = bool(hintsVar.get())
         guiargs.enemizercli = enemizerCLIpathVar.get()
         guiargs.shufflebosses = enemizerBossVar.get()
-        guiargs.shuffleenemies = bool(enemyShuffleVar.get())
+        guiargs.shuffleenemies = 'chaos' if bool(enemyShuffleVar.get()) else 'none'
         guiargs.enemy_health = enemizerHealthVar.get()
         guiargs.enemy_damage = enemizerDamageVar.get()
         guiargs.shufflepalette = bool(paletteShuffleVar.get())
diff --git a/Main.py b/Main.py
index 25d96641..8468740d 100644
--- a/Main.py
+++ b/Main.py
@@ -146,7 +146,7 @@ def main(args, seed=None):
                                                           "-nohints" if not world.hints else "")) if not args.outputname else ''
     outfilebase = outfileprefix + outfilesuffix
 
-    use_enemizer = args.enemizercli and (args.shufflebosses != 'none' or args.shuffleenemies or args.enemy_health != 'default' or args.enemy_health != 'default' or args.enemy_damage or args.shufflepalette or args.shufflepots)
+    use_enemizer = args.enemizercli and (args.shufflebosses != 'none' or args.shuffleenemies != 'none' or args.enemy_health != 'default' or args.enemy_health != 'default' or args.enemy_damage or args.shufflepalette or args.shufflepots)
 
     jsonout = {}
     if not args.suppress_rom:
diff --git a/Rom.py b/Rom.py
index dface499..c66fa741 100644
--- a/Rom.py
+++ b/Rom.py
@@ -170,9 +170,9 @@ def get_enemizer_patch(world, player, rom, baserom_path, enemizercli, shuffleene
 
     # write options file for enemizer
     options = {
-        'RandomizeEnemies': shuffleenemies,
+        'RandomizeEnemies': shuffleenemies != 'none',
         'RandomizeEnemiesType': 3,
-        'RandomizeBushEnemyChance': True,
+        'RandomizeBushEnemyChance': shuffleenemies == 'chaos',
         'RandomizeEnemyHealthRange': enemy_health != 'default',
         'RandomizeEnemyHealthType': {'default': 0, 'easy': 0, 'normal': 1, 'hard': 2, 'expert': 3}[enemy_health],
         'OHKO': False,
@@ -218,9 +218,9 @@ def get_enemizer_patch(world, player, rom, baserom_path, enemizercli, shuffleene
         'SwordGraphics': "sword_gfx/normal.gfx",
         'BeeMizer': False,
         'BeesLevel': 0,
-        'RandomizeTileTrapPattern': True,
+        'RandomizeTileTrapPattern': shuffleenemies == 'chaos',
         'RandomizeTileTrapFloorTile': False,
-        'AllowKillableThief': shuffleenemies,
+        'AllowKillableThief': bool(random.randint(0,1)) if shuffleenemies == 'chaos' else shuffleenemies != 'none',
         'RandomizeSpriteOnHit': False,
         'DebugMode': False,
         'DebugForceEnemy': False,