From 46d48c7531bc7f2d9443ea587f37bf08a2c54f49 Mon Sep 17 00:00:00 2001
From: Dev <dev@dev.sp-tarkov.com>
Date: Tue, 9 Apr 2024 10:29:12 +0100
Subject: [PATCH] Added system to filter out ammos from fence by its
 penetration value

Removed redundant hard-coded ammos from blacklist
---
 project/assets/configs/trader.json            |  7 +--
 .../generators/FenceBaseAssortGenerator.ts    | 48 ++++++++++++++++++-
 .../src/models/spt/config/ITraderConfig.ts    |  2 +
 3 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/project/assets/configs/trader.json b/project/assets/configs/trader.json
index 116cfc0e..7a2e57ec 100644
--- a/project/assets/configs/trader.json
+++ b/project/assets/configs/trader.json
@@ -319,6 +319,7 @@
             "left_side_plate": 75,
             "right_side_plate": 75
         },
+        "ammoMaxPenLimit": 20,
         "blacklistSeasonalItems": true,
         "blacklist": [
             "5c164d2286f774194c5e69fa",
@@ -343,12 +344,6 @@
             "5422acb9af1c889c16000029",
             "64d0b40fbe2eed70e254e2d4",
             "5fc22d7c187fea44d52eda44",
-            "65702577cfc010a0f5006a2c",
-            "65702591c5d7d4cb4d07857c",
-            "6570240ecfc010a0f50069f2",
-            "65702606cfc010a0f5006a3e",
-            "65702640cfc010a0f5006a4d",
-            "657024011419851aef03e6f4",
             "646372518610c40fc20204e8"
         ],
         "coopExtractGift": {
diff --git a/project/src/generators/FenceBaseAssortGenerator.ts b/project/src/generators/FenceBaseAssortGenerator.ts
index 1ad5fb76..fdf186ba 100644
--- a/project/src/generators/FenceBaseAssortGenerator.ts
+++ b/project/src/generators/FenceBaseAssortGenerator.ts
@@ -74,7 +74,7 @@ export class FenceBaseAssortGenerator
                 }
             }
 
-            // Only allow  rigs with no slots (carrier rigs)
+            // Only allow rigs with no slots (carrier rigs)
             if (this.itemHelper.isOfBaseclass(rootItemDb._id, BaseClasses.VEST) && rootItemDb._props.Slots.length > 0)
             {
                 continue;
@@ -95,6 +95,15 @@ export class FenceBaseAssortGenerator
                 upd: { StackObjectsCount: 9999999 },
             }];
 
+            // Ensure ammo is not above penetration limit value
+            if (this.itemHelper.isOfBaseclasses(rootItemDb._id, [BaseClasses.AMMO_BOX, BaseClasses.AMMO]))
+            {
+                if (this.isAmmoAbovePenetrationLimit(rootItemDb))
+                {
+                    continue;
+                }
+            }
+
             if (this.itemHelper.isOfBaseclass(rootItemDb._id, BaseClasses.AMMO_BOX))
             {
                 this.itemHelper.addCartridgesToAmmoBox(itemWithChildrenToAdd, rootItemDb);
@@ -175,6 +184,43 @@ export class FenceBaseAssortGenerator
         }
     }
 
+    /**
+     * Check ammo in boxes + loose ammos has a penetration value above the configured value in trader.json / ammoMaxPenLimit
+     * @param rootItemDb Item to check penetration value of
+     * @returns True if penetration value is above limit set in config
+     */
+    protected isAmmoAbovePenetrationLimit(rootItemDb: ITemplateItem): boolean
+    {
+        if (this.itemHelper.isOfBaseclass(rootItemDb._id, BaseClasses.AMMO_BOX))
+        {
+            // Get ammo inside box
+            const ammoTplInBox = rootItemDb._props.StackSlots[0]._props.filters[0].Filter[0];
+            const ammoItemDb = this.itemHelper.getItem(ammoTplInBox);
+            if (!ammoItemDb[0])
+            {
+                this.logger.warning(`Ammo: ${ammoTplInBox} not an item, skipping`);
+
+                return true;
+            }
+
+            // Check if above limit
+            if (ammoItemDb[1]._props.PenetrationPower > this.traderConfig.fence.ammoMaxPenLimit)
+            {
+                return true;
+            }
+        }
+        else if (this.itemHelper.isOfBaseclass(rootItemDb._id, BaseClasses.AMMO))
+        {
+            // Just a normal ammo, check if above limit
+            if (rootItemDb._props.PenetrationPower > this.traderConfig.fence.ammoMaxPenLimit)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     protected getItemPrice(itemTpl: string, items: Item[]): number
     {
         return this.itemHelper.isOfBaseclass(itemTpl, BaseClasses.AMMO_BOX)
diff --git a/project/src/models/spt/config/ITraderConfig.ts b/project/src/models/spt/config/ITraderConfig.ts
index 1e972fbe..a4e98cb2 100644
--- a/project/src/models/spt/config/ITraderConfig.ts
+++ b/project/src/models/spt/config/ITraderConfig.ts
@@ -46,6 +46,8 @@ export interface FenceConfig
     presetSlotsToRemoveChancePercent: Record<string, number>;
     /** Block seasonal items from appearing when season is inactive */
     blacklistSeasonalItems: boolean;
+    /** Max pen value allowed to be listed on flea - affects ammo + ammo boxes */
+    ammoMaxPenLimit: number;
     blacklist: string[];
     coopExtractGift: CoopExtractReward;
     btrDeliveryExpireHours: number;