diff --git a/CHANGELOG.md b/CHANGELOG.md index bd273919..eed52362 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## [Unreleased](https://github.com/LostArtefacts/TR-Rando/compare/V1.9.1...master) - xxxx-xx-xx - fixed docile bird monsters causing multiple Laras to spawn in remastered levels (#723) - fixed the incomplete skidoo model in TR2R when it appears anywhere other than Tibetan Foothills (#721) +- fixed secrets on triangle portals not triggering in TR3 (#727) - 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/Shared/SecretArtefactPlacer.cs b/TRRandomizerCore/Randomizers/Shared/SecretArtefactPlacer.cs index a45ef869..63844e82 100644 --- a/TRRandomizerCore/Randomizers/Shared/SecretArtefactPlacer.cs +++ b/TRRandomizerCore/Randomizers/Shared/SecretArtefactPlacer.cs @@ -235,6 +235,11 @@ private void CreateSecretTriggers(TRSecretPlacement secret, short room, TRRoo while (mainSector.RoomBelow != TRConsts.NoRoom) { // Ensure we go as far down as possible - for example, Atlantis room 47 sector 10,9 - but stay in the same room + // Don't traverse down if it's a TR3 triangle portal. This assumes the secret would never be mid-air over the portal. + if (mainSector.FDIndex != 0 && _floorData[mainSector.FDIndex].Any(e => e is FDTriangulationEntry t && t.IsFloorPortal)) + { + break; + } location.Y = (mainSector.Floor + 1) * TRConsts.Step1; location.Room = mainSector.RoomBelow; mainSector = _sectorGetter(location); diff --git a/TRRandomizerCore/Resources/TR3/Locations/locations.json b/TRRandomizerCore/Resources/TR3/Locations/locations.json index cdd1cd69..4b252a3c 100644 --- a/TRRandomizerCore/Resources/TR3/Locations/locations.json +++ b/TRRandomizerCore/Resources/TR3/Locations/locations.json @@ -2541,9 +2541,9 @@ "Room": 90 }, { - "X": 52486, - "Y": -5120, - "Z": 51462, + "X": 52895, + "Y": -4711, + "Z": 51965, "Room": 73, "Difficulty": "Hard" },