Add extra pickups option to TR2X

Resolves LostArtefacts#832.

Author: lahm86

CHANGELOG.md

@@ -2,6 +2,7 @@
 - added support for TR1X 4.14 (now the minimum version supported) (#803)
 - added support TR2X (#821)
 - added Spanish translations for TR1 (#800)
+- added an option to include extra pickups in certain levels in TR2X (#832)
 - added pickup items to Lara's Home for item randomization in TR2X (#832)
 - fixed a crash at the end of Diving Area in TR2R (#814)
 - 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)

TRRandomizerCore/Editors/TR2RemasteredEditor.cs

@@ -19,6 +19,7 @@ protected override void ApplyConfig(Config config)
         Settings.AllowReturnPathLocations = false;
         Settings.AddReturnPaths = false;
         Settings.FixOGBugs = false;
+        Settings.IncludeExtraPickups = false;
         Settings.ReplaceRequiredEnemies = false;
         Settings.SwapEnemyAppearance = false;
     }

TRRandomizerCore/Randomizers/TR2/Shared/TR2ItemAllocator.cs

@@ -8,6 +8,22 @@ namespace TRRandomizerCore.Randomizers;
 
 public class TR2ItemAllocator : ItemAllocator<TR2Type, TR2Entity>
 {
+    private static readonly Dictionary<string, int> _extraItemCounts = new()
+    {
+        [TR2LevelNames.GW]
+            = 13, // Default = 5
+        [TR2LevelNames.VENICE]
+            = 4,  // Default = 20
+        [TR2LevelNames.BARTOLI]
+            = 4, // Default = 20
+        [TR2LevelNames.RIG]
+            = 2,  // Default = 22
+        [TR2LevelNames.FATHOMS]
+            = 13, // Default = 7
+        [TR2LevelNames.LQ]
+            = 10, // Default = 8
+    };
+
     public short DefaultItemShade { get; set; }
 
     public TR2ItemAllocator()
@@ -45,6 +61,7 @@ public void RandomizeItems(string levelName, TR2Level level, AbstractTRScriptedL
         }
 
         InitialisePicker(levelName, level, Settings.ItemMode == ItemMode.Default ? LocationMode.Default : LocationMode.ExistingItems);
+        AddExtraPickups(levelName, level.Entities);
 
         if (Settings.ItemMode == ItemMode.Default)
         {
@@ -131,4 +148,19 @@ private List<Location> GetItemLocationPool(string levelName, TR2Level level, boo
         TR2LocationGenerator generator = new();
         return generator.Generate(level, exclusions, keyItemMode);
     }
+
+    private void AddExtraPickups(string levelName, List<TR2Entity> allItems)
+    {
+        if (!Settings.IncludeExtraPickups || !_extraItemCounts.TryGetValue(levelName, out var count))
+        {
+            return;
+        }
+
+        var types = TR2TypeUtilities.GetAmmoTypes();
+        for (int i = 0; i < count; i++)
+        {
+            var item = ItemFactory.CreateItem(levelName, allItems, _picker.GetRandomLocation());
+            item.TypeID = types.RandomItem(Generator);
+        }
+    }
 }

TRRandomizerCore/TRVersionSupport.cs

@@ -99,6 +99,7 @@ internal class TRVersionSupport
         TRRandomizerType.DynamicTextures,
         TRRandomizerType.Enemy,
         TRRandomizerType.Environment,
+        TRRandomizerType.ExtraPickups,
         TRRandomizerType.GeneralBugFixes,
         TRRandomizerType.GlitchedSecrets,
         TRRandomizerType.HardSecrets,

TRRandomizerView/Model/ControllerOptions.cs

@@ -2708,7 +2708,7 @@ public ControllerOptions()
         };
         ItemBoolItemControls = new()
         {
-            _randomizeItemTypes, _randomizeItemLocations, _includeKeyItems, _allowReturnPathLocations, _allowEnemyKeyDrops, _randomizeVehicles, _oneItemDifficulty, _maintainKeyContinuity, _includeExtraPickups
+            _randomizeItemTypes, _randomizeItemLocations, _includeKeyItems, _allowReturnPathLocations, _allowEnemyKeyDrops, _randomizeVehicles, _oneItemDifficulty, _includeExtraPickups, _maintainKeyContinuity
         };
         EnemyBoolItemControls = new()
         {