Fix RE 1 generation

IntelOrca · Jan 12, 2023 · fa64483 · fa64483
1 parent 85754d2
commit fa64483
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/IntelOrca.Biohazard.Tests/TestRandomizer.cs b/IntelOrca.Biohazard.Tests/TestRandomizer.cs
@@ -14,6 +14,12 @@ public class TestRE1Rando : TestBaseRandomizer
     public class TestRE2Rando : TestBaseRandomizer
     {
         public override byte Game => 2;
+
+        [Fact]
+        public void RandomizeEnemyPlacements()
+        {
+            RandomizeEnemyPlacementsInner();
+        }
     }
 
     public abstract class TestBaseRandomizer
@@ -28,6 +34,13 @@ public void RandomizeDoors()
             Randomize(config);
         }
 
+        protected void RandomizeEnemyPlacementsInner()
+        {
+            var config = GetBaseConfig();
+            config.RandomEnemyPlacement = true;
+            Randomize(config);
+        }
+
         [Fact]
         public void RandomizeItems_Shuffle()
         {
@@ -97,6 +110,7 @@ private RandoConfig GetBaseConfig()
             config.ShuffleItems = false;
 
             config.RandomEnemies = true;
+            config.RandomEnemyPlacement = false;
             config.EnemyDifficulty = 2;
 
             config.IncludeNPCRE1 = true;

diff --git a/IntelOrca.Biohazard/EnemyRandomiser.cs b/IntelOrca.Biohazard/EnemyRandomiser.cs
@@ -44,12 +44,15 @@ public EnemyRandomiser(BioVersion version, RandoLogger logger, RandoConfig confi
 
         private void ReadEnemyPlacements()
         {
-            var json = _dataManager.GetText(_version, "enemy.json");
-            _enemyPositions = JsonSerializer.Deserialize<EnemyPosition[]>(json, new JsonSerializerOptions()
+            if (_config.RandomEnemyPlacement)
             {
-                ReadCommentHandling = JsonCommentHandling.Skip,
-                PropertyNamingPolicy = JsonNamingPolicy.CamelCase
-            })!;
+                var json = _dataManager.GetText(_version, "enemy.json");
+                _enemyPositions = JsonSerializer.Deserialize<EnemyPosition[]>(json, new JsonSerializerOptions()
+                {
+                    ReadCommentHandling = JsonCommentHandling.Skip,
+                    PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+                })!;
+            }
         }
 
         private byte GetNextKillId()