From 11c52b81dafdb9003bf7430d20dc671c06ae8f9f Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Sat, 28 Jun 2025 15:49:27 +0100
Subject: [PATCH] Converted `GetWeaponsDefaultMagazineTpl` into extension
 method

---
 .../Extensions/TemplateItemExtensions.cs             | 10 ++++++++++
 .../Generators/BotWeaponGenerator.cs                 |  7 +++----
 .../Implementations/ExternalInventoryMagGen.cs       |  3 ++-
 .../Helpers/BotWeaponGeneratorHelper.cs              | 12 +-----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Extensions/TemplateItemExtensions.cs b/Libraries/SPTarkov.Server.Core/Extensions/TemplateItemExtensions.cs
index a3c97a2f..f4e2c339 100644
--- a/Libraries/SPTarkov.Server.Core/Extensions/TemplateItemExtensions.cs
+++ b/Libraries/SPTarkov.Server.Core/Extensions/TemplateItemExtensions.cs
@@ -37,5 +37,15 @@ namespace SPTarkov.Server.Core.Extensions
 
             return false;
         }
+
+        /// <summary>
+        ///     Get a weapons default magazine template id
+        /// </summary>
+        /// <param name="weaponTemplate">Weapon to get default magazine for</param>
+        /// <returns>Tpl of magazine</returns>
+        public static string? GetWeaponsDefaultMagazineTpl(this TemplateItem weaponTemplate)
+        {
+            return weaponTemplate.Properties.DefMagType;
+        }
     }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs
index fca89967..99d5a8b3 100644
--- a/Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs
@@ -1,4 +1,5 @@
 using SPTarkov.DI.Annotations;
+using SPTarkov.Server.Core.Extensions;
 using SPTarkov.Server.Core.Generators.WeaponGen;
 using SPTarkov.Server.Core.Helpers;
 using SPTarkov.Server.Core.Models.Eft.Common;
@@ -619,7 +620,7 @@ public class BotWeaponGenerator(
             // return default mag tpl
             if (weaponTemplate.Properties.ReloadMode == ReloadMode.OnlyBarrel)
             {
-                return _botWeaponGeneratorHelper.GetWeaponsDefaultMagazineTpl(weaponTemplate);
+                return weaponTemplate.GetWeaponsDefaultMagazineTpl();
             }
 
             // log error if no magazine AND not a chamber loaded weapon (e.g. shotgun revolver)
@@ -634,9 +635,7 @@ public class BotWeaponGenerator(
                 );
             }
 
-            var defaultMagTplId = _botWeaponGeneratorHelper.GetWeaponsDefaultMagazineTpl(
-                weaponTemplate
-            );
+            var defaultMagTplId = weaponTemplate.GetWeaponsDefaultMagazineTpl();
             if (_logger.IsLogEnabled(LogLevel.Debug))
             {
                 _logger.Debug(
diff --git a/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
index 810859bd..3fe75bb5 100644
--- a/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
@@ -1,4 +1,5 @@
 using SPTarkov.DI.Annotations;
+using SPTarkov.Server.Core.Extensions;
 using SPTarkov.Server.Core.Helpers;
 using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 using SPTarkov.Server.Core.Models.Enums;
@@ -39,7 +40,7 @@ public class ExternalInventoryMagGen(
         var magazineTpl = magTemplate.Id;
         var weapon = inventoryMagGen.GetWeaponTemplate();
         List<string> attemptedMagBlacklist = [];
-        var defaultMagazineTpl = _botWeaponGeneratorHelper.GetWeaponsDefaultMagazineTpl(weapon);
+        var defaultMagazineTpl = weapon.GetWeaponsDefaultMagazineTpl();
         var isShotgun = _itemHelper.IsOfBaseclass(weapon.Id, BaseClasses.SHOTGUN);
 
         var randomizedMagazineCount = _botWeaponGeneratorHelper.GetRandomizedMagazineCount(
diff --git a/Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs
index 1c21199d..0544f192 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs
@@ -117,7 +117,7 @@ public class BotWeaponGeneratorHelper(
         string ammoTpl,
         int cartridgeCount,
         BotBaseInventory inventory,
-        HashSet<EquipmentSlots> equipmentSlotsToAddTo
+        HashSet<EquipmentSlots>? equipmentSlotsToAddTo = null
     )
     {
         if (equipmentSlotsToAddTo is null)
@@ -158,14 +158,4 @@ public class BotWeaponGeneratorHelper(
             }
         }
     }
-
-    /// <summary>
-    ///     Get a weapons default magazine template id
-    /// </summary>
-    /// <param name="weaponTemplate">Weapon to get default magazine for</param>
-    /// <returns>Tpl of magazine</returns>
-    public string? GetWeaponsDefaultMagazineTpl(TemplateItem weaponTemplate)
-    {
-        return weaponTemplate.Properties.DefMagType;
-    }
 }