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

Minor bot equipment code changes

Browse Source 
Assume player is level 1, not 0
Nullcheck bot equipment config prior to using it
This commit is contained in:
Chomp
2025-05-30 12:35:23 +01:00
parent 1aa9bc3f2f
commit 866a5fd24c
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs
+10 -7
View File
@@ -51,11 +51,14 @@ public class BotEquipmentFilterService
var botWeightingAdjustments = GetBotWeightingAdjustments(botRole, botLevel);
var botWeightingAdjustmentsByPlayerLevel = GetBotWeightingAdjustmentsByPlayerLevel(
botRole,
pmcProfile?.Info?.Level ?? 0
pmcProfile?.Info?.Level ?? 1
);
_botEquipmentConfig.TryGetValue(botRole.ToLower(), out var botEquipConfig);
var randomisationDetails = _botHelper.GetBotRandomizationDetails(botLevel, botEquipConfig);
RandomisationDetails? randomisationDetails = null;
if (_botEquipmentConfig.TryGetValue(botRole.ToLower(), out var botEquipmentConfig))
{
randomisationDetails = _botHelper.GetBotRandomizationDetails(botLevel, botEquipmentConfig);
}
if (botEquipmentBlacklist is not null || botEquipmentWhitelist is not null)
{
@@ -67,7 +70,7 @@ public class BotEquipmentFilterService
{
AdjustWeighting(botWeightingAdjustments.Equipment, baseBotNode.BotInventory.Equipment);
AdjustWeighting(botWeightingAdjustments.Ammo, baseBotNode.BotInventory.Ammo);
// Dont warn when edited item not found, we're editing usec/bear clothing and they dont have each others clothing
// Don't warn when edited item not found, we're editing usec/bear clothing and they dont have each others clothing
AdjustWeighting(botWeightingAdjustments?.Clothing, baseBotNode.BotAppearance, false);
}
@@ -202,14 +205,14 @@ public class BotEquipmentFilterService
/// Retrieve item weighting adjustments from bot.json config based on player level
/// </summary>
/// <param name="botRole">Bot type to get adjustments for</param>
/// <param name="playerlevel">Level of bot</param>
/// <param name="playerLevel">Level of bot</param>
/// <returns>Weighting adjustments for bot items</returns>
protected WeightingAdjustmentDetails? GetBotWeightingAdjustmentsByPlayerLevel(string botRole, int playerlevel)
protected WeightingAdjustmentDetails? GetBotWeightingAdjustmentsByPlayerLevel(string botRole, int playerLevel)
{
var weightingDetailsForBot = _botEquipmentConfig.GetValueOrDefault(botRole, null);
return (weightingDetailsForBot?.WeightingAdjustmentsByBotLevel ?? []).FirstOrDefault(x =>
playerlevel >= x.LevelRange.Min && playerlevel <= x.LevelRange.Max
playerLevel >= x.LevelRange.Min && playerLevel <= x.LevelRange.Max
);
}