Skip to content

Fix bot item gen #753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArchangelWTF merged 1 commit into from
May 4, 2026
Merged

Fix bot item gen #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ protected void FilterEquipment(BotType baseBotNode, EquipmentFilterDetails? blac
var botEquipment = baseBotNode.BotInventory.Equipment[equipmentSlotKvP.Key];

// Skip equipment slot if blacklist doesn't exist / is empty
if (blacklist.Equipment?.TryGetValue(equipmentSlotKvP.Key.ToString(), out var equipmentSlotBlacklist) is null)
if (blacklist.Equipment?.TryGetValue(equipmentSlotKvP.Key.ToString(), out var equipmentSlotBlacklist) is null or false)
{
continue;
}
Expand Down Expand Up @@ -302,7 +302,7 @@ protected void FilterCartridges(BotType baseBotNode, EquipmentFilterDetails? bla
{
// Skip cartridge slot if blacklist doesn't exist / is empty
if (
blacklist.Cartridge?.TryGetValue(caliber, out var cartridgeCaliberBlacklist) is null
blacklist.Cartridge?.TryGetValue(caliber, out var cartridgeCaliberBlacklist) is null or false
|| cartridgeCaliberBlacklist is null
|| cartridgeCaliberBlacklist.Count == 0
)
Expand Down Expand Up @@ -366,13 +366,14 @@ protected void AdjustWeighting(
}
else
{
if (showEditWarnings)
{
if (logger.IsLogEnabled(LogLevel.Debug))
{
logger.Debug($"Tried to edit a non-existent item for slot: {poolAdjustmentKvP} {itemToEditKvP}");
}
}
// Note: Logging disabled for now, because our configs are all kinds of wrong
//if (showEditWarnings)
//{
// if (logger.IsLogEnabled(LogLevel.Debug))
// {
// logger.Debug($"Tried to edit a non-existent item for slot: {poolAdjustmentKvP} {itemToEditKvP}");
// }
//}
}
}
}
Expand Down Expand Up @@ -417,19 +418,20 @@ protected void AdjustWeighting(
foreach (var itemToEditKvP in poolAdjustmentKvP.Value)
// Only make change if item exists as we're editing, not adding
{
if (locationToUpdate.ContainsKey(itemToEditKvP.Key) || locationToUpdate[itemToEditKvP.Key] == 0)
if (locationToUpdate.ContainsKey(itemToEditKvP.Key))
{
locationToUpdate[itemToEditKvP.Key] = itemToEditKvP.Value;
}
else
{
if (showEditWarnings)
{
if (logger.IsLogEnabled(LogLevel.Debug))
{
logger.Debug($"Tried to edit a non - existent item for slot: {poolAdjustmentKvP} {itemToEditKvP}");
}
}
// Note: Logging disabled for now, because our configs are all kinds of wrong
//if (showEditWarnings)
//{
// if (logger.IsLogEnabled(LogLevel.Debug))
// {
// logger.Debug($"Tried to edit a non - existent item for slot: {poolAdjustmentKvP} {itemToEditKvP}");
// }
//}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Libraries/SPTarkov.Server.Core/Services/BotInventoryContainerService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace SPTarkov.Server.Core.Services;
/// <summary>
/// Service for keeping track of items and their exact position inside a bots container
/// </summary>
[Injectable]
[Injectable(InjectionType.Singleton)]
public class BotInventoryContainerService(ISptLogger<BotGeneratorHelper> logger, ItemHelper itemHelper)
{
// botId/containerName
Expand Down
Loading