From b4e78d14f2367eb1318a57cbcd104c8de3d885f8 Mon Sep 17 00:00:00 2001
From: Dev <dev@dev.sp-tarkov.com>
Date: Tue, 24 Sep 2024 10:09:58 +0100
Subject: [PATCH] Improved bot vest filtering to not filter down to 0 vests

---
 .../src/generators/BotInventoryGenerator.ts   | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/project/src/generators/BotInventoryGenerator.ts b/project/src/generators/BotInventoryGenerator.ts
index 395696f8..f7094a93 100644
--- a/project/src/generators/BotInventoryGenerator.ts
+++ b/project/src/generators/BotInventoryGenerator.ts
@@ -243,13 +243,13 @@ export class BotInventoryGenerator {
         // Bot has no armor vest and flagged to be forceed to wear armored rig in this event
         if (botEquipConfig.forceOnlyArmoredRigWhenNoArmor && !hasArmorVest) {
             // Filter rigs down to only those with armor
-            this.filterRigsToThoseWithProtection(templateInventory.equipment);
+            this.filterRigsToThoseWithProtection(templateInventory.equipment, botRole);
         }
 
         // Optimisation - Remove armored rigs from pool
         if (hasArmorVest) {
             // Filter rigs down to only those with armor
-            this.filterRigsToThoseWithoutProtection(templateInventory.equipment);
+            this.filterRigsToThoseWithoutProtection(templateInventory.equipment, botRole);
         }
 
         // Bot is flagged as always needing a vest
@@ -273,8 +273,9 @@ export class BotInventoryGenerator {
     /**
      * Remove non-armored rigs from parameter data
      * @param templateEquipment Equpiment to filter TacticalVest of
+     * @param botRole Role of bot vests are being filtered for
      */
-    protected filterRigsToThoseWithProtection(templateEquipment: Equipment): void {
+    protected filterRigsToThoseWithProtection(templateEquipment: Equipment, botRole: string): void {
         const tacVestsWithArmor = Object.entries(templateEquipment.TacticalVest).reduce(
             (newVestDictionary, [tplKey]) => {
                 if (this.itemHelper.itemHasSlots(tplKey)) {
@@ -285,14 +286,26 @@ export class BotInventoryGenerator {
             {},
         );
 
+        if (Object.keys(tacVestsWithArmor).length === 0) {
+            this.logger.debug(`Unable to filter to only armored rigs as bot: ${botRole} has none in pool`);
+
+            return;
+        }
+
         templateEquipment.TacticalVest = tacVestsWithArmor;
     }
 
     /**
      * Remove armored rigs from parameter data
      * @param templateEquipment Equpiment to filter TacticalVest of
+     * @param botRole Role of bot vests are being filtered for
+     * @param allowEmptyResult Should the function return all rigs when 0 unarmored are found
      */
-    protected filterRigsToThoseWithoutProtection(templateEquipment: Equipment): void {
+    protected filterRigsToThoseWithoutProtection(
+        templateEquipment: Equipment,
+        botRole: string,
+        allowEmptyResult = true,
+    ): void {
         const tacVestsWithoutArmor = Object.entries(templateEquipment.TacticalVest).reduce(
             (newVestDictionary, [tplKey]) => {
                 if (!this.itemHelper.itemHasSlots(tplKey)) {
@@ -303,6 +316,12 @@ export class BotInventoryGenerator {
             {},
         );
 
+        if (!allowEmptyResult && Object.keys(tacVestsWithoutArmor).length === 0) {
+            this.logger.debug(`Unable to filter to only unarmored rigs as bot: ${botRole} has none in pool`);
+
+            return;
+        }
+
         templateEquipment.TacticalVest = tacVestsWithoutArmor;
     }