Handle eel positions in Golden Mask

Assigns relocation points for eels in Golden Mask if player chooses to move awkward enemies.
Also removes duplicated locations between black and yellow moray eels, and instead assigns dynamically at runtime.

Author: lahm86

TRRandomizerCore/Randomizers/Shared/EnemyAllocator.cs

@@ -1,5 +1,4 @@
-using Newtonsoft.Json;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 using TRRandomizerCore.Editors;
 using TRRandomizerCore.Helpers;
 using TRRandomizerCore.Utilities;
@@ -22,10 +21,13 @@ public EnemyAllocator(TRGameVersion version)
     {
         string relocFile = $"Resources/{version}/Locations/enemy_relocations.json";
         _relocations = File.Exists(relocFile)
-            ? JsonConvert.DeserializeObject<Dictionary<string, List<Location>>>(File.ReadAllText(relocFile))
-            : new();
+            ? JsonUtils.ReadFile<Dictionary<string, List<Location>>>(relocFile)
+            : [];
+        RelocationsLoaded();
     }
 
+    protected virtual void RelocationsLoaded() { }
+
     public void Initialise()
     {
         _resultantEnemies = new();

TRRandomizerCore/Randomizers/TR2/Shared/TR2EnemyAllocator.cs

@@ -56,6 +56,26 @@ protected override Dictionary<TR2Type, List<int>> GetRestrictedRooms(string leve
     protected override bool IsOneShotType(TR2Type type)
         => type == TR2Type.MarcoBartoli;
 
+    protected override void RelocationsLoaded()
+    {
+        foreach (var locations in _relocations.Values)
+        {
+            var blackLocations = locations.FindAll(l => l.TargetType == (short)TR2Type.BlackMorayEel);
+            foreach (var blackEel in blackLocations)
+            {
+                var hasYellowEel = locations.Any(l => l.IsEquivalent(blackEel)
+                    && l.EntityIndex == blackEel.EntityIndex
+                    && l.TargetType == (short)TR2Type.YellowMorayEel);
+                if (!hasYellowEel)
+                {
+                    var yellowEel = blackEel.Clone();
+                    yellowEel.TargetType = (short)TR2Type.YellowMorayEel;
+                    locations.Add(yellowEel);
+                }
+            }
+        }
+    }
+
     public EnemyTransportCollection<TR2Type> SelectCrossLevelEnemies(string levelName, TR2Level level)
     {
         if (levelName == TR2LevelNames.ASSAULT)