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

Merge pull request #547 from sp-tarkov/fix-pmc-loot-filtering

Browse Source 
Fix pmc loot filtering removing valid loot items from pool
This commit is contained in:
Chomp
2025-08-13 11:45:14 +00:00
committed by GitHub
parent 726e4fccd5 2d780eb791
commit 965d503021
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Assets/SPT_Data/configs/pmc.json
+6 -6
View File
@@ -339,15 +339,15 @@
"max": 64,
"backpack": {
"min": 5000,
"max": 0
"max": -1
},
"pocket": {
"min": 5000,
"max": 0
"max": -1
},
"vest": {
"min": 5000,
"max": 0
"max": -1
}
},
{
@@ -355,15 +355,15 @@
"max": 100,
"backpack": {
"min": 10000,
"max": 0
"max": -1
},
"pocket": {
"min": 10000,
"max": 0
"max": -1
},
"vest": {
"min": 10000,
"max": 0
"max": -1
}
}
],
Libraries/SPTarkov.Server.Core/Services/BotLootCacheService.cs
+12 -15
View File
@@ -1,5 +1,6 @@
using System.Collections.Concurrent;
using SPTarkov.DI.Annotations;
using SPTarkov.Server.Core.Extensions;
using SPTarkov.Server.Core.Generators;
using SPTarkov.Server.Core.Helpers;
using SPTarkov.Server.Core.Models.Common;
@@ -133,30 +134,26 @@ public class BotLootCacheService(
if (itemPriceMinMax is null)
{
// No filtering requested, exit
// No filtering requested, return all results
return cloner.Clone(result);
}
// Filter the loot pool prior to returning
// Filter the loot pool by item value prior to returning
var filteredResult = result.Where(i =>
{
var itemPrice = itemHelper.GetItemPrice(i.Key);
if (itemPriceMinMax?.Min is not null && itemPriceMinMax?.Max is not null)
var priceLimitMin = itemPriceMinMax.Min;
var priceLimitMax = itemPriceMinMax.Max;
// Treat -1 as no limit
if (priceLimitMax.Approx(-1))
{
return itemPrice >= itemPriceMinMax?.Min && itemPrice <= itemPriceMinMax?.Max;
// only check min limit value
return itemPrice >= priceLimitMin;
}
if (itemPriceMinMax?.Min is not null && itemPriceMinMax?.Max is null)
{
return itemPrice >= itemPriceMinMax?.Min;
}
if (itemPriceMinMax?.Min is null && itemPriceMinMax?.Max is not null)
{
return itemPrice <= itemPriceMinMax?.Max;
}
return false;
return itemPrice >= priceLimitMin && itemPrice <= priceLimitMax;
});
return cloner.Clone(filteredResult.ToDictionary(pair => pair.Key, pair => pair.Value));