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

Refactored caching inside BotEquipmentModPoolService

Browse Source 
Made use of primary constructor
Made `GetModsForWeaponSlot` access dictionary via`TryGet`
Made `GetCompatibleModsForWeaponSlot` access dictionary via`TryGet`
This commit is contained in:
Chomp
2025-06-18 15:36:50 +01:00
parent 26048524f1
commit 96e12d80e4
1 changed files with 50 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Services/BotEquipmentModPoolService.cs
+50 -67
View File
@@ -8,58 +8,47 @@ using SPTarkov.Server.Core.Models.Utils;
namespace SPTarkov.Server.Core.Services;
[Injectable(InjectionType.Singleton)]
public class BotEquipmentModPoolService
public class BotEquipmentModPoolService(
ISptLogger<BotEquipmentModPoolService> logger,
ItemHelper itemHelper,
DatabaseService databaseService,
LocalisationService localisationService)
{
private readonly Lock _lockObject = new();
protected DatabaseService _databaseService;
protected ConcurrentDictionary<string, ConcurrentDictionary<string, HashSet<string>>> _gearModPool;
protected ItemHelper _itemHelper;
protected LocalisationService _localisationService;
protected ISptLogger<BotEquipmentModPoolService> _logger;
protected ConcurrentDictionary<string, ConcurrentDictionary<string, HashSet<string>>> _weaponModPool;
protected bool _weaponPoolGenerated;
protected bool _armorPoolGenerated;
public BotEquipmentModPoolService(
ISptLogger<BotEquipmentModPoolService> logger,
ItemHelper itemHelper,
DatabaseService databaseService,
LocalisationService localisationService
)
private ConcurrentDictionary<string, ConcurrentDictionary<string, HashSet<string>>>? _gearModPool;
protected ConcurrentDictionary<string, ConcurrentDictionary<string, HashSet<string>>> GearModPool
{
_logger = logger;
_itemHelper = itemHelper;
_databaseService = databaseService;
_localisationService = localisationService;
get { return _gearModPool ??= GenerateGearPool(); }
}
_weaponModPool = new ConcurrentDictionary<string, ConcurrentDictionary<string, HashSet<string>>>();
_gearModPool = new ConcurrentDictionary<string, ConcurrentDictionary<string, HashSet<string>>>();
private ConcurrentDictionary<string, ConcurrentDictionary<string, HashSet<string>>>? _weaponModPool;
protected ConcurrentDictionary<string, ConcurrentDictionary<string, HashSet<string>>> WeaponModPool
{
get { return _weaponModPool ??= GenerateWeaponPool(); }
}
/// <summary>
/// Store dictionary of mods for each item passed in
/// Get dictionary of mods for each item passed in
/// </summary>
/// <param name="items"> Items to find related mods and store in modPool </param>
/// <param name="inputItems"> Items to find related mods and store in modPool </param>
/// <param name="poolType"> Mod pool to choose from e.g. "weapon" for weaponModPool </param>
protected void GeneratePool(IEnumerable<TemplateItem>? items, string poolType)
protected ConcurrentDictionary<string, ConcurrentDictionary<string, HashSet<string>>> GeneratePool(IEnumerable<TemplateItem>? inputItems, string poolType)
{
if (items is null)
if (inputItems is null || !inputItems.Any())
{
_logger.Error(_localisationService.GetText("bot-unable_to_generate_item_pool_no_items", poolType));
logger.Error(localisationService.GetText("bot-unable_to_generate_item_pool_no_items", poolType));
return;
return [];
}
// Get weapon or gear pool
var pool = poolType == "weapon" ? _weaponModPool : _gearModPool;
foreach (var item in items)
var pool = new ConcurrentDictionary<string, ConcurrentDictionary<string, HashSet<string>>>();
foreach (var item in inputItems)
{
if (item.Properties is null)
{
_logger.Error(
_localisationService.GetText(
logger.Error(
localisationService.GetText(
"bot-item_missing_props_property",
new
{
@@ -102,7 +91,7 @@ public class BotEquipmentModPoolService
AddTplToSet(itemModPool[slot.Name], itemToAddTpl);
}
var subItemDetails = _itemHelper.GetItem(itemToAddTpl).Value;
var subItemDetails = itemHelper.GetItem(itemToAddTpl).Value;
var hasSubItemsToAdd = (subItemDetails?.Properties?.Slots?.Count ?? 0) > 0;
if (hasSubItemsToAdd && !pool.ContainsKey(subItemDetails.Id))
// Recursive call
@@ -112,6 +101,8 @@ public class BotEquipmentModPoolService
}
}
}
return pool;
}
private bool SetContainsTpl(HashSet<string> itemSet, string tpl)
@@ -141,9 +132,9 @@ public class BotEquipmentModPoolService
/// <summary>
/// Empty the mod pool
/// </summary>
public void ResetPool()
public void ResetWeaponPool()
{
_weaponModPool.Clear();
WeaponModPool.Clear();
}
/// <summary>
@@ -154,13 +145,16 @@ public class BotEquipmentModPoolService
/// <returns> Hashset of tpls that fit the slot </returns>
public HashSet<string> GetCompatibleModsForWeaponSlot(string itemTpl, string slotName)
{
if (!_weaponPoolGenerated)
// Get every weapon in db and generate mod pool
if(WeaponModPool.TryGetValue(itemTpl, out var value))
{
GenerateWeaponPool();
if (value.TryGetValue(slotName, out var tplsForSlotHashSet))
{
return tplsForSlotHashSet;
}
}
logger.Warning($"Slot: {slotName} not found for item: {itemTpl} in cache");
return _weaponModPool[itemTpl][slotName];
return [];
}
/// <summary>
@@ -170,12 +164,7 @@ public class BotEquipmentModPoolService
/// <returns> Dictionary of mods (keys are mod slot names) with array of compatible mod tpls as value </returns>
public ConcurrentDictionary<string, HashSet<string>> GetModsForGearSlot(string itemTpl)
{
if (!_armorPoolGenerated)
{
GenerateGearPool();
}
return _gearModPool.TryGetValue(itemTpl, out var value)
return GearModPool.TryGetValue(itemTpl, out var value)
? value
: [];
}
@@ -187,12 +176,9 @@ public class BotEquipmentModPoolService
/// <returns> Dictionary of mods (keys are mod slot names) with array of compatible mod tpls as value </returns>
public ConcurrentDictionary<string, HashSet<string>> GetModsForWeaponSlot(string itemTpl)
{
if (!_weaponPoolGenerated)
{
GenerateWeaponPool();
}
return _weaponModPool[itemTpl];
return WeaponModPool.TryGetValue(itemTpl, out var value)
? value
: [];
}
/// <summary>
@@ -205,14 +191,14 @@ public class BotEquipmentModPoolService
var result = new Dictionary<string, HashSet<string>>();
// Get item from db
var itemDb = _itemHelper.GetItem(itemTpl).Value;
var itemDb = itemHelper.GetItem(itemTpl).Value;
if (itemDb.Properties.Slots is not null)
// Loop over slots flagged as 'required'
{
foreach (var slot in itemDb.Properties.Slots.Where(slot => slot.Required.GetValueOrDefault(false)))
{
// Create dict entry for mod slot
result.Add(slot.Name, []);
result.TryAdd(slot.Name, []);
// Add compatible tpls to dicts hashset
foreach (var compatibleItemTpl in slot.Props.Filters.FirstOrDefault().Filter)
@@ -228,25 +214,24 @@ public class BotEquipmentModPoolService
/// <summary>
/// Create weapon mod pool and set generated flag to true
/// </summary>
protected void GenerateWeaponPool()
protected ConcurrentDictionary<string, ConcurrentDictionary<string, HashSet<string>>> GenerateWeaponPool()
{
var weapons = _databaseService.GetItems()
.Values.Where(item => string.Equals(item.Type, "Item", StringComparison.OrdinalIgnoreCase) && _itemHelper.IsOfBaseclass(item.Id, BaseClasses.WEAPON)
var weapons = databaseService.GetItems()
.Values.Where(item => string.Equals(item.Type, "Item", StringComparison.OrdinalIgnoreCase) &&
itemHelper.IsOfBaseclass(item.Id, BaseClasses.WEAPON)
);
GeneratePool(weapons, "weapon");
// Flag pool as being complete
_weaponPoolGenerated = true;
return GeneratePool(weapons, "weapon");
}
/// <summary>
/// Create gear mod pool and set generated flag to true
/// </summary>
protected void GenerateGearPool()
protected ConcurrentDictionary<string, ConcurrentDictionary<string, HashSet<string>>> GenerateGearPool()
{
var gear = _databaseService.GetItems()
var gear = databaseService.GetItems()
.Values.Where(item => string.Equals(item.Type, "Item", StringComparison.OrdinalIgnoreCase) &&
_itemHelper.IsOfBaseclasses(
itemHelper.IsOfBaseclasses(
item.Id,
[
BaseClasses.ARMORED_EQUIPMENT,
@@ -256,9 +241,7 @@ public class BotEquipmentModPoolService
]
)
);
GeneratePool(gear, "gear");
// Flag pool as being complete
_armorPoolGenerated = true;
return GeneratePool(gear, "gear");
}
}