Fix TR3R Madubu secret

Removes the death tile re-added in TR3R Madubu Gorge to allow the secret here to be collected like OG.

Resolves LostArtefacts#819.

Author: lahm86

CHANGELOG.md

@@ -5,6 +5,7 @@
 - fixed a potential key softlock in City of Khamoon if "large" range is selected and either return paths are disabled in classic, or playing remastered (#820)
 - fixed the raptor spawns in Crash Site when enemies are randomized to guarantee that some appear when using the turrent (#818)
 - fixed enemy 211 in Area 51 potentially being untriggerable, and hence a potential softlock if carrying a key item (#816)
+- fixed an unreachable secret in TR3R Madubu Gorge (#819)
 
 ## [V1.10.2](https://github.com/LostArtefacts/TR-Rando/compare/V1.10.1...V1.10.2) - 2024-12-06
 - added support for TR1X 4.6 (#796)

TRDataControl/Environment/Model/Types/Triggers/EMKillLaraFunction.cs

@@ -5,6 +5,7 @@ namespace TRDataControl.Environment;
 public class EMKillLaraFunction : BaseEMFunction
 {
     public List<EMLocation> Locations { get; set; }
+    public bool Remove { get; set; }
 
     public override void ApplyToLevel(TR1Level level)
     {
@@ -13,7 +14,7 @@ public override void ApplyToLevel(TR1Level level)
         foreach (EMLocation location in Locations)
         {
             TRRoomSector sector = level.GetRoomSector(data.ConvertLocation(location));
-            CreateTrigger(sector, level.FloorData);
+            AlterDeathTile(sector, level.FloorData);
         }
     }
 
@@ -24,7 +25,7 @@ public override void ApplyToLevel(TR2Level level)
         foreach (EMLocation location in Locations)
         {
             TRRoomSector sector = level.GetRoomSector(data.ConvertLocation(location));
-            CreateTrigger(sector, level.FloorData);
+            AlterDeathTile(sector, level.FloorData);
         }
     }
 
@@ -35,20 +36,32 @@ public override void ApplyToLevel(TR3Level level)
         foreach (EMLocation location in Locations)
         {
             TRRoomSector sector = level.GetRoomSector(data.ConvertLocation(location));
-            CreateTrigger(sector, level.FloorData);
+            AlterDeathTile(sector, level.FloorData);
         }
     }
 
-    private static void CreateTrigger(TRRoomSector sector, FDControl control)
+    private void AlterDeathTile(TRRoomSector sector, FDControl control)
     {
-        // If there is no floor data create the FD to begin with.
-        if (sector.FDIndex == 0)
+        if (sector.FDIndex == 0 && !Remove)
         {
             control.CreateFloorData(sector);
         }
 
-        List<FDEntry> entries = control[sector.FDIndex];
-        if (entries.FindIndex(e => e is FDKillLaraEntry) == -1)
+        if (sector.FDIndex == 0)
+        {
+            return;
+        }
+
+        var entries = control[sector.FDIndex];
+        var deathEntry = entries.FirstOrDefault(e => e is FDKillLaraEntry);
+        if (Remove)
+        {
+            if (deathEntry != null)
+            {
+                entries.Remove(deathEntry);
+            }
+        }
+        else if (deathEntry == null)
         {
             entries.Add(new FDKillLaraEntry());
         }

TRRandomizerCore/Resources/TR3/Environment/RAPIDS.TR2-Environment.json

@@ -4,7 +4,33 @@
   "AllWithin": [],
   "OneOf": [],
   "ConditionalAllWithin": [],
-  "ConditionalAll": [],
+  "ConditionalAll": [
+    {
+      "Condition": {
+        "ConditionType": 22,
+        "Location": {
+          "X": 68100,
+          "Y": -20736,
+          "Z": 39457,
+          "Room": 49
+        }
+      },
+      "OnTrue": [
+        {
+          "EMType": 70,
+          "Locations": [
+            {
+              "X": 68100,
+              "Y": -20736,
+              "Z": 39457,
+              "Room": 49
+            }
+          ],
+          "Remove": true
+        }
+      ]
+    }
+  ],
   "ConditionalOneOf": [],
   "Mirrored": []
 }