From a0ddc3f9b5a1cbf952ac4455e4267188ead03cca Mon Sep 17 00:00:00 2001
From: lahm86 <33758420+lahm86@users.noreply.github.com>
Date: Sun, 1 Dec 2024 19:00:34 +0000
Subject: [PATCH] Fix TR2R HSH pickup allocation

This adds more tiles for spreading shotgun ammo around in TR2R HSH. The maximum possible per tile is now 13 based on the most difficult enemy rating, and this doesn't crash the game.
---
 CHANGELOG.md                                                   | 3 ++-
 .../Randomizers/TR2/Remastered/TR2REnemyRandomizer.cs          | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05ae730a..d934bc54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
-## [Unreleased](https://github.com/LostArtefacts/TR-Rando/compare/V1.9.3...master) - xxxx-xx-xx
+## [Unreleased](https://github.com/LostArtefacts/TR-Rando/compare/V1.10.0...master) - xxxx-xx-xx
+- fixed too many pickups on the same tile in TR2R patch 4 causing a crash (#793)
 
 ## [V1.10.0](https://github.com/LostArtefacts/TR-Rando/compare/V1.9.3...V1.10.0) - 2024-11-05
 - added (experimental) support for Linux (#143)
diff --git a/TRRandomizerCore/Randomizers/TR2/Remastered/TR2REnemyRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Remastered/TR2REnemyRandomizer.cs
index 6d276bb9..19df065f 100644
--- a/TRRandomizerCore/Randomizers/TR2/Remastered/TR2REnemyRandomizer.cs
+++ b/TRRandomizerCore/Randomizers/TR2/Remastered/TR2REnemyRandomizer.cs
@@ -30,6 +30,9 @@ public class TR2REnemyRandomizer : BaseTR2RRandomizer
         new() { X = 31232, Y = 256, Z = 66048, Room = 57 },
         new() { X = 31232, Y = 256, Z = 65024, Room = 57 },
         new() { X = 31232, Y = 256, Z = 64000, Room = 52 },
+        new() { X = 31232, Y = 256, Z = 62976, Room = 52 },
+        new() { X = 31232, Y = 256, Z = 61952, Room = 52 },
+        new() { X = 31232, Y = 256, Z = 60928, Room = 52 },
     };
 
     private Dictionary<string, List<Location>> _pistolLocations;