From ed77ed36f8aa91ac3de808800551ffcff5135410 Mon Sep 17 00:00:00 2001 From: sp-tarkov-bot Date: Mon, 17 Nov 2025 14:29:45 +0000 Subject: [PATCH 01/10] Format Style Fixes --- .../SPTarkov.Server.Core/Callbacks/AchievementCallbacks.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/AchievementCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/AchievementCallbacks.cs index 10f2e995..92775532 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/AchievementCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/AchievementCallbacks.cs @@ -20,7 +20,7 @@ public class AchievementCallbacks(AchievementController achievementController, H } /// - /// Handle client/achievement/statistic + /// Handle client/achievement/statistic /// /// public ValueTask Statistic(string url, EmptyRequestData _, MongoId sessionID) From cd6c98a1d7650c975268c61295571b586b1fcc8b Mon Sep 17 00:00:00 2001 From: Chomp Date: Mon, 17 Nov 2025 16:23:21 +0000 Subject: [PATCH 02/10] Fixed `AdjustUnreasonablePrice` not correctly adjusting prices --- .../SPTarkov.Server.Core/Services/RagfairPriceService.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Services/RagfairPriceService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairPriceService.cs index 494fd6c3..f379c948 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RagfairPriceService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RagfairPriceService.cs @@ -389,10 +389,6 @@ public class RagfairPriceService( protected double AdjustUnreasonablePrice(UnreasonableModPrices unreasonableItemChange, MongoId itemTpl, double price) { var itemHandbookPrice = handbookHelper.GetTemplatePrice(itemTpl); - if (itemHandbookPrice > 0) - { - return price; - } // Flea price is over handbook price if (price > itemHandbookPrice * unreasonableItemChange.HandbookPriceOverMultiplier) From 6c9653993344127912352918fc7e967cd3ed039b Mon Sep 17 00:00:00 2001 From: Chomp Date: Tue, 18 Nov 2025 16:46:21 +0000 Subject: [PATCH 03/10] Updated CMS uses to 3 --- .../SPT_Data/database/templates/items.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json index 11d2dd92..7c5b4508 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5312d5454b1702f8ad1495d7635e07cec2b70941d46e819f236c5eb084bbe5aa +oid sha256:966bf9ae3fe4a447838b9cbb0620b5611265f472e7d8add3fdbbd08643e9a13e size 19115860 From 5b9347099b415665b92ae235980bf6124753f993 Mon Sep 17 00:00:00 2001 From: Chomp Date: Tue, 18 Nov 2025 17:09:54 +0000 Subject: [PATCH 04/10] Fixed preset builder showing items from locked traders --- .../Extensions/ProfileExtensions.cs | 12 ++++++++++++ .../Helpers/RagfairOfferHelper.cs | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/Libraries/SPTarkov.Server.Core/Extensions/ProfileExtensions.cs b/Libraries/SPTarkov.Server.Core/Extensions/ProfileExtensions.cs index 46b265e2..021094c5 100644 --- a/Libraries/SPTarkov.Server.Core/Extensions/ProfileExtensions.cs +++ b/Libraries/SPTarkov.Server.Core/Extensions/ProfileExtensions.cs @@ -324,4 +324,16 @@ public static class ProfileExtensions // No trader data on player profile, fail check return false; } + + /// + /// Get Ids of traders with an unlocked status of "false" + /// + /// Player profile + /// Hashset of Trader ids + public static HashSet GetLockedTraderIds(this PmcData pmcData) + { + return pmcData.TradersInfo? + .Where(trader => trader.Value.Unlocked == false) + .Select(t => t.Key).ToHashSet() ?? []; + } } diff --git a/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs index 25104012..8e9afc30 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs @@ -237,6 +237,7 @@ public class RagfairOfferHelper( ? cloner.Clone(searchRequest.BuildItems.Keys.ToDictionary(key => key, ragfairOfferService.GetOffersOfType)) : searchRequest.BuildItems.Keys.ToDictionary(key => key, ragfairOfferService.GetOffersOfType); + var lockedTraders = pmcData.GetLockedTraderIds(); foreach (var (desiredItemTpl, matchingOffers) in buildItems) { if (matchingOffers is null) @@ -266,6 +267,12 @@ public class RagfairOfferHelper( if (offer.IsTraderOffer()) { + // Player hasn't unlocked trader selling this offer, skip + if (lockedTraders.Contains(offer.User.Id)) + { + continue; + } + if (TraderBuyRestrictionReached(offer)) { continue; From 9d6a57045938b8bb343622b06c988f1ffcd6d667 Mon Sep 17 00:00:00 2001 From: sp-tarkov-bot Date: Tue, 18 Nov 2025 17:10:44 +0000 Subject: [PATCH 05/10] Format Style Fixes --- .../SPTarkov.Server.Core/Extensions/ProfileExtensions.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Extensions/ProfileExtensions.cs b/Libraries/SPTarkov.Server.Core/Extensions/ProfileExtensions.cs index 021094c5..97dfaec9 100644 --- a/Libraries/SPTarkov.Server.Core/Extensions/ProfileExtensions.cs +++ b/Libraries/SPTarkov.Server.Core/Extensions/ProfileExtensions.cs @@ -332,8 +332,6 @@ public static class ProfileExtensions /// Hashset of Trader ids public static HashSet GetLockedTraderIds(this PmcData pmcData) { - return pmcData.TradersInfo? - .Where(trader => trader.Value.Unlocked == false) - .Select(t => t.Key).ToHashSet() ?? []; + return pmcData.TradersInfo?.Where(trader => trader.Value.Unlocked == false).Select(t => t.Key).ToHashSet() ?? []; } } From da26c38f58debfd894dfc8339594754965b1fbb4 Mon Sep 17 00:00:00 2001 From: Chomp Date: Tue, 18 Nov 2025 17:28:02 +0000 Subject: [PATCH 06/10] CMS can be placed in special slot SURV12 can be placed in special slot SURV12 has 9 max uses --- .../SPT_Data/database/templates/items.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json index 7c5b4508..38a2dfd6 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:966bf9ae3fe4a447838b9cbb0620b5611265f472e7d8add3fdbbd08643e9a13e -size 19115860 +oid sha256:39ed6deccea04c1b2129f738cd38658d25702aca9158bf5b2adfe2ebb2330a82 +size 19116141 From 4bce86a9796bb941ead21992efab400ad2a0cd6a Mon Sep 17 00:00:00 2001 From: Chomp Date: Tue, 18 Nov 2025 17:37:17 +0000 Subject: [PATCH 07/10] Add previous changes to normal + unheard pockets --- .../SPT_Data/database/templates/items.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json index 38a2dfd6..e9a6b3fc 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39ed6deccea04c1b2129f738cd38658d25702aca9158bf5b2adfe2ebb2330a82 -size 19116141 +oid sha256:65a81d6ab40e3fedf22fd642bb95b0349a8ec0c9832a404ca93ef571d4db0bb7 +size 19116423 From e72d0bd39b5b483f74e942657bacc14bf8141fca Mon Sep 17 00:00:00 2001 From: Chomp Date: Tue, 18 Nov 2025 17:37:43 +0000 Subject: [PATCH 08/10] Add name to PMC list --- .../SPT_Data/database/bots/types/bear.json | 3 ++- .../SPT_Data/database/bots/types/usec.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/bear.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/bear.json index ef45a895..10622676 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/bear.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/bear.json @@ -2978,7 +2978,8 @@ "chrispawl89", "hulkhan", "LycorisOni", - "Quik" + "Quik", + "Badger" ], "generation": { "items": { diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/usec.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/usec.json index d3bf68d3..f1b833ba 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/usec.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/usec.json @@ -2969,7 +2969,8 @@ "chrispawl89", "hulkhan", "LycorisOni", - "Quik" + "Quik", + "Badger" ], "generation": { "items": { From cfef113d56763d2e389ced802dd2378e1211cb54 Mon Sep 17 00:00:00 2001 From: sp-tarkov-bot Date: Tue, 18 Nov 2025 17:38:37 +0000 Subject: [PATCH 09/10] Format Style Fixes --- .../SPT_Data/database/bots/types/bear.json | 2 +- .../SPT_Data/database/bots/types/usec.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/bear.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/bear.json index 10622676..b66bfc3d 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/bear.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/bear.json @@ -2979,7 +2979,7 @@ "hulkhan", "LycorisOni", "Quik", - "Badger" + "Badger" ], "generation": { "items": { diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/usec.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/usec.json index f1b833ba..8052449f 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/usec.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/usec.json @@ -2970,7 +2970,7 @@ "hulkhan", "LycorisOni", "Quik", - "Badger" + "Badger" ], "generation": { "items": { From 54ebc7fc17dd04e42dfa342b256f3356065ed2c6 Mon Sep 17 00:00:00 2001 From: Chomp Date: Tue, 18 Nov 2025 17:42:55 +0000 Subject: [PATCH 10/10] Adjusted medical uses to match live --- .../SPT_Data/database/templates/items.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json index e9a6b3fc..df4bb233 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65a81d6ab40e3fedf22fd642bb95b0349a8ec0c9832a404ca93ef571d4db0bb7 -size 19116423 +oid sha256:3f35bd85bc19c6c224e0dcc0a05120b7cba412ec885c4f73613c615092a2fe96 +size 19116421