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

Partially fixed bots having no loot - item limits dict allowed-value was being reset to 0

Browse Source 
Does not fix PMC loot
This commit is contained in:
Chomp
2025-01-28 11:26:45 +00:00
parent 73c48305a1
commit 1532826dba
1 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Core/Generators/BotLootGenerator.cs
+18 -23
View File
@@ -43,11 +43,21 @@ public class BotLootGenerator(
/// <exception cref="NotImplementedException"></exception>
private ItemSpawnLimitSettings GetItemSpawnLimitsForBot(string botRole)
{
// Init item limits
Dictionary<string, double> limitsForBotDict = new();
InitItemLimitArray(botRole, limitsForBotDict);
var limits = GetItemSpawnLimitsForBotType(botRole);
return new ItemSpawnLimitSettings { CurrentLimits = limitsForBotDict, GlobalLimits = GetItemSpawnLimitsForBotType(botRole) };
// Clone limits and set all values to 0 to use as a running total
var limitsForBotDict = _cloner.Clone(limits);
// Init current count of items we want to limit
foreach (var limit in limitsForBotDict)
{
limitsForBotDict[limit.Key] = 0;
}
return new ItemSpawnLimitSettings
{
CurrentLimits = limitsForBotDict,
GlobalLimits = GetItemSpawnLimitsForBotType(botRole)
};
}
/// <summary>
@@ -706,22 +716,6 @@ public class BotLootGenerator(
}
}
/// <summary>
/// Hydrate item limit array to contain items that have a limit for a specific bot type
/// All values are set to 0
/// </summary>
/// <param name="botRole">Role the bot has</param>
/// <param name="limitCount"></param>
public void InitItemLimitArray(string botRole, Dictionary<string, double> limitCount)
{
// Init current count of items we want to limit
var spawnLimits = GetItemSpawnLimitsForBotType(botRole);
foreach (var limit in spawnLimits)
{
spawnLimits[limit.Key] = 0;
}
}
/// <summary>
/// Check if an item has reached its bot-specific spawn limit
/// </summary>
@@ -762,10 +756,11 @@ public class BotLootGenerator(
// Check if over limit
var currentLimitCount = itemSpawnLimits.CurrentLimits[idToCheckFor];
if (itemSpawnLimits.CurrentLimits[idToCheckFor] > itemSpawnLimits.GlobalLimits[idToCheckFor])
{
// Prevent edge-case of small loot pools + code trying to add limited item over and over infinitely
if (itemSpawnLimits.CurrentLimits[idToCheckFor] > itemSpawnLimits.CurrentLimits[idToCheckFor] * 10)
if (currentLimitCount > currentLimitCount * 10)
{
if(_logger.IsLogEnabled(LogLevel.Debug))
_logger.Debug(
@@ -775,7 +770,7 @@ public class BotLootGenerator(
{
botRole = botRole,
itemName = itemTemplate.Name,
attempts = itemSpawnLimits.CurrentLimits[idToCheckFor]
attempts = currentLimitCount
}
)
);
@@ -837,7 +832,7 @@ public class BotLootGenerator(
return _botConfig.ItemSpawnLimits["pmc"];
}
if (_botConfig.ItemSpawnLimits[botRole.ToLower()] is not null)
if (_botConfig.ItemSpawnLimits.ContainsKey(botRole.ToLower()))
{
return _botConfig.ItemSpawnLimits[botRole.ToLower()];
}