From 754e241df8f20ae9c9efe61771ddba2be109fa48 Mon Sep 17 00:00:00 2001
From: lahm86 <33758420+lahm86@users.noreply.github.com>
Date: Sun, 11 Aug 2024 11:15:25 +0100
Subject: [PATCH] Remove one shot enemy flags (#743)

Resolves #742.
---
 CHANGELOG.md                                           |  1 +
 .../Randomizers/TR3/Shared/TR3EnemyAllocator.cs        | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41ff0012..35315d21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - fixed the Jade secret appearing before the Stone in TR2R Floating Islands (#729)
 - fixed being unable to collect secret artefacts in TR3R High Security Compound (#737)
 - fixed (the lack of) prisoners in Area51 crashing the game when loading a save (#739)
+- fixed some enemies in TR3 causing triggers for other objects to break e.g. Crash Site room 72 (#742)
 - improved data integrity checks when opening a folder and prior to randomization (#719)
 
 ## [V1.9.1](https://github.com/LostArtefacts/TR-Rando/compare/V1.9.0...V1.9.1) - 2024-06-23
diff --git a/TRRandomizerCore/Randomizers/TR3/Shared/TR3EnemyAllocator.cs b/TRRandomizerCore/Randomizers/TR3/Shared/TR3EnemyAllocator.cs
index 069d9687..359816b4 100644
--- a/TRRandomizerCore/Randomizers/TR3/Shared/TR3EnemyAllocator.cs
+++ b/TRRandomizerCore/Randomizers/TR3/Shared/TR3EnemyAllocator.cs
@@ -11,14 +11,6 @@ public class TR3EnemyAllocator : EnemyAllocator<TR3Type>
 {
     private const int _willardSequence = 19;
 
-    private static readonly List<TR3Type> _oneShotEnemies = new()
-    {
-        TR3Type.Croc,
-        TR3Type.KillerWhale,
-        TR3Type.Raptor,
-        TR3Type.Rat,
-    };
-
     private readonly Dictionary<string, List<Location>> _pistolLocations;
 
     public ItemFactory<TR3Entity> ItemFactory { get; set; }
@@ -39,7 +31,7 @@ protected override Dictionary<TR3Type, List<int>> GetRestrictedRooms(string leve
         => TR3EnemyUtilities.GetRestrictedEnemyRooms(levelName, difficulty);
 
     protected override bool IsOneShotType(TR3Type type)
-        => _oneShotEnemies.Contains(type);
+        => false;
 
     public EnemyTransportCollection<TR3Type> SelectCrossLevelEnemies(string levelName, TR3Level level, int levelSequence, bool remastered)
     {