From 1addf5dd1c3b5189cd1e0d218b468451820d2bdd Mon Sep 17 00:00:00 2001
From: lahm86 <33758420+lahm86@users.noreply.github.com>
Date: Sun, 11 Aug 2024 16:05:18 +0100
Subject: [PATCH] Remove quest types as secret pickup models (#745)

Resolves #744.
---
 CHANGELOG.md                                                   | 1 +
 .../Randomizers/TR3/Remastered/TR3RSecretRandomizer.cs         | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35315d21..83b53bba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - 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)
+- fixed secret models in TR3R Aldwych appearing offset from their actual location (#744)
 - 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/Remastered/TR3RSecretRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Remastered/TR3RSecretRandomizer.cs
index 320627e1..7bd53c78 100644
--- a/TRRandomizerCore/Randomizers/TR3/Remastered/TR3RSecretRandomizer.cs
+++ b/TRRandomizerCore/Randomizers/TR3/Remastered/TR3RSecretRandomizer.cs
@@ -241,6 +241,9 @@ protected override void StartImpl()
                 allocation.AvailablePickupModels.AddRange(_artefactReplacements.Keys
                     .Where(a => !level.Data.Models.ContainsKey(a)));
 
+                allocation.AvailablePickupModels.Remove(TR3Type.Quest1_P);
+                allocation.AvailablePickupModels.Remove(TR3Type.Quest2_P);
+
                 List<TR3Type> artefactTypes = _artefactPickups.Keys.ToList();
                 artefactTypes.RemoveAll(a => level.Data.Models.ContainsKey(a));