chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Converted GetWeaponsDefaultMagazineTpl into extension method

Browse Source
This commit is contained in:
Chomp
2025-06-28 15:49:27 +01:00
parent 770d187061
commit 11c52b81da
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Extensions/TemplateItemExtensions.cs
+10
View File
@@ -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;
}
}
}
Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs
+3 -4
View File
@@ -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(
Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
+2 -1
View File
@@ -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(
Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs
+1 -11
View File
@@ -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;
}
}