From 060fdc9d8d6fba4867e6c2461c13b00da3ae5fc3 Mon Sep 17 00:00:00 2001
From: VforValens <jtdurant88@gmail.com>
Date: Tue, 6 Sep 2022 16:45:53 -0400
Subject: [PATCH] Bugfix for scav customWhitelists not working. v1.2.1

---
 config/pmc.json  | 125 ++++-------------------------------------------
 config/scav.json | 124 ++++------------------------------------------
 src/scavs.ts     |   9 ++--
 3 files changed, 24 insertions(+), 234 deletions(-)

diff --git a/config/pmc.json b/config/pmc.json
index 27fb560..859e692 100644
--- a/config/pmc.json
+++ b/config/pmc.json
@@ -10,32 +10,11 @@
         },
         "equipment": 
         {
-            "FirstPrimaryWeapon": [],
-            "Holster": [],
-            "Backpack": [],
-            "TacticalVest": [],
-            "Earpiece": [],
-            "Headwear": [],
-            "ArmorVest": [],
-            "Eyewear": [],
-            "ArmBand": [],
-            "FaceCover": []
+            "FirstPrimaryWeapon": []
         },
         "cartridge": 
         {
-            "Caliber762x54R": [],
-            "Caliber762x51": [],
-            "Caliber762x39": [],
-            "Caliber762x25TT": [],
-            "Caliber366TKM": [],
-            "Caliber556x45NATO": [],
-            "Caliber545x39": [],
-            "Caliber46x30": [],
-            "Caliber1143x23ACP": [],
-            "Caliber9x19PARA": [],
-            "Caliber9x18PM": [],
-            "Caliber12g": [],
-            "Caliber20g": []
+            "Caliber762x54R": []
         }       
     },
 
@@ -50,32 +29,11 @@
         },
         "equipment": 
         {
-            "FirstPrimaryWeapon": [],
-            "Holster": [],
-            "Backpack": [],
-            "TacticalVest": [],
-            "Earpiece": [],
-            "Headwear": [],
-            "ArmorVest": [],
-            "Eyewear": [],
-            "ArmBand": [],
-            "FaceCover": []
+            "FirstPrimaryWeapon": []
         },
         "cartridge": 
         {
-            "Caliber762x54R": [],
-            "Caliber762x51": [],
-            "Caliber762x39": [],
-            "Caliber762x25TT": [],
-            "Caliber366TKM": [],
-            "Caliber556x45NATO": [],
-            "Caliber545x39": [],
-            "Caliber46x30": [],
-            "Caliber1143x23ACP": [],
-            "Caliber9x19PARA": [],
-            "Caliber9x18PM": [],
-            "Caliber12g": [],
-            "Caliber20g": []
+            "Caliber762x54R": []
         }     
     },
 
@@ -90,32 +48,11 @@
         },
         "equipment": 
         {
-            "FirstPrimaryWeapon": [],
-            "Holster": [],
-            "Backpack": [],
-            "TacticalVest": [],
-            "Earpiece": [],
-            "Headwear": [],
-            "ArmorVest": [],
-            "Eyewear": [],
-            "ArmBand": [],
-            "FaceCover": []
+            "FirstPrimaryWeapon": []
         },
         "cartridge": 
         {
-            "Caliber762x54R": [],
-            "Caliber762x51": [],
-            "Caliber762x39": [],
-            "Caliber762x25TT": [],
-            "Caliber366TKM": [],
-            "Caliber556x45NATO": [],
-            "Caliber545x39": [],
-            "Caliber46x30": [],
-            "Caliber1143x23ACP": [],
-            "Caliber9x19PARA": [],
-            "Caliber9x18PM": [],
-            "Caliber12g": [],
-            "Caliber20g": []
+            "Caliber762x54R": []
         }     
     },
 
@@ -130,32 +67,11 @@
         },
         "equipment": 
         {
-            "FirstPrimaryWeapon": [],
-            "Holster": [],
-            "Backpack": [],
-            "TacticalVest": [],
-            "Earpiece": [],
-            "Headwear": [],
-            "ArmorVest": [],
-            "Eyewear": [],
-            "ArmBand": [],
-            "FaceCover": []
+            "FirstPrimaryWeapon": []
         },
         "cartridge": 
         {
-            "Caliber762x54R": [],
-            "Caliber762x51": [],
-            "Caliber762x39": [],
-            "Caliber762x25TT": [],
-            "Caliber366TKM": [],
-            "Caliber556x45NATO": [],
-            "Caliber545x39": [],
-            "Caliber46x30": [],
-            "Caliber1143x23ACP": [],
-            "Caliber9x19PARA": [],
-            "Caliber9x18PM": [],
-            "Caliber12g": [],
-            "Caliber20g": []
+            "Caliber762x54R": []
         }     
     },
 
@@ -170,32 +86,11 @@
         },
         "equipment": 
         {
-            "FirstPrimaryWeapon": [],
-            "Holster": [],
-            "Backpack": [],
-            "TacticalVest": [],
-            "Earpiece": [],
-            "Headwear": [],
-            "ArmorVest": [],
-            "Eyewear": [],
-            "ArmBand": [],
-            "FaceCover": []
+            "FirstPrimaryWeapon": []
         },
         "cartridge": 
         {
-            "Caliber762x54R": [],
-            "Caliber762x51": [],
-            "Caliber762x39": [],
-            "Caliber762x25TT": [],
-            "Caliber366TKM": [],
-            "Caliber556x45NATO": [],
-            "Caliber545x39": [],
-            "Caliber46x30": [],
-            "Caliber1143x23ACP": [],
-            "Caliber9x19PARA": [],
-            "Caliber9x18PM": [],
-            "Caliber12g": [],
-            "Caliber20g": []
+            "Caliber762x54R": []
         }     
     }
 }
\ No newline at end of file
diff --git a/config/scav.json b/config/scav.json
index 0c8baa0..bb2e974 100644
--- a/config/scav.json
+++ b/config/scav.json
@@ -19,31 +19,11 @@
         },
             "equipment": 
         {
-            "FirstPrimaryWeapon": [],
-            "Holster": [],
-            "Backpack": [],
-            "TacticalVest": [],
-            "Earpiece": [],
-            "Headwear": [],
-            "ArmorVest": [],
-            "Eyewear": [],
-            "FaceCover": []
+            "FirstPrimaryWeapon": []
         },
             "cartridge": 
         {
-            "Caliber762x54R": [],
-            "Caliber762x51": [],
-            "Caliber762x39": [],
-            "Caliber762x25TT": [],
-            "Caliber366TKM": [],
-            "Caliber556x45NATO": [],
-            "Caliber545x39": [],
-            "Caliber1143x23ACP": [],
-            "Caliber9x39": [],
-            "Caliber9x19PARA": [],
-            "Caliber9x18PM": [],   
-            "Caliber12g": [],
-            "Caliber20g": []
+            "Caliber762x54R": []
         }}]
     },
 
@@ -55,32 +35,11 @@
         },
         "equipment": 
         {
-            "FirstPrimaryWeapon": [],
-            "Holster": [],
-            "Backpack": [],
-            "TacticalVest": [],
-            "Earpiece": [],
-            "Headwear": [],
-            "ArmorVest": [],
-            "Eyewear": [],
-            "ArmBand": [],
-            "FaceCover": []
+            "FirstPrimaryWeapon": []
         },
         "cartridge": 
         {
-            "Caliber762x54R": [],
-            "Caliber762x51": [],
-            "Caliber762x39": [],
-            "Caliber762x25TT": [],
-            "Caliber366TKM": [],
-            "Caliber556x45NATO": [],
-            "Caliber545x39": [],
-            "Caliber46x30": [],
-            "Caliber1143x23ACP": [],
-            "Caliber9x19PARA": [],
-            "Caliber9x18PM": [],
-            "Caliber12g": [],
-            "Caliber20g": []
+            "Caliber762x54R": []
         }
     },
 
@@ -95,32 +54,11 @@
         },
         "equipment": 
         {
-            "FirstPrimaryWeapon": [],
-            "Holster": [],
-            "Backpack": [],
-            "TacticalVest": [],
-            "Earpiece": [],
-            "Headwear": [],
-            "ArmorVest": [],
-            "Eyewear": [],
-            "ArmBand": [],
-            "FaceCover": []
+            "FirstPrimaryWeapon": []
         },
         "cartridge": 
         {
-            "Caliber762x54R": [],
-            "Caliber762x51": [],
-            "Caliber762x39": [],
-            "Caliber762x25TT": [],
-            "Caliber366TKM": [],
-            "Caliber556x45NATO": [],
-            "Caliber545x39": [],
-            "Caliber46x30": [],
-            "Caliber1143x23ACP": [],
-            "Caliber9x19PARA": [],
-            "Caliber9x18PM": [],
-            "Caliber12g": [],
-            "Caliber20g": []
+            "Caliber762x54R": []
         }
     },
 
@@ -135,32 +73,11 @@
         },
         "equipment": 
         {
-            "FirstPrimaryWeapon": [],
-            "Holster": [],
-            "Backpack": [],
-            "TacticalVest": [],
-            "Earpiece": [],
-            "Headwear": [],
-            "ArmorVest": [],
-            "Eyewear": [],
-            "ArmBand": [],
-            "FaceCover": []
+            "FirstPrimaryWeapon": []
         },
         "cartridge": 
         {
-            "Caliber762x54R": [],
-            "Caliber762x51": [],
-            "Caliber762x39": [],
-            "Caliber762x25TT": [],
-            "Caliber366TKM": [],
-            "Caliber556x45NATO": [],
-            "Caliber545x39": [],
-            "Caliber46x30": [],
-            "Caliber1143x23ACP": [],
-            "Caliber9x19PARA": [],
-            "Caliber9x18PM": [],
-            "Caliber12g": [],
-            "Caliber20g": []
+            "Caliber762x54R": []
         }
     },
 
@@ -175,32 +92,11 @@
         },
         "equipment": 
         {
-            "FirstPrimaryWeapon": [],
-            "Holster": [],
-            "Backpack": [],
-            "TacticalVest": [],
-            "Earpiece": [],
-            "Headwear": [],
-            "ArmorVest": [],
-            "Eyewear": [],
-            "ArmBand": [],
-            "FaceCover": []
+            "FirstPrimaryWeapon": []
         },
         "cartridge": 
         {
-            "Caliber762x54R": [],
-            "Caliber762x51": [],
-            "Caliber762x39": [],
-            "Caliber762x25TT": [],
-            "Caliber366TKM": [],
-            "Caliber556x45NATO": [],
-            "Caliber545x39": [],
-            "Caliber46x30": [],
-            "Caliber1143x23ACP": [],
-            "Caliber9x19PARA": [],
-            "Caliber9x18PM": [],
-            "Caliber12g": [],
-            "Caliber20g": []
+            "Caliber762x54R": []
         }
     }
 }
\ No newline at end of file
diff --git a/src/scavs.ts b/src/scavs.ts
index aa30e64..d5abd3e 100644
--- a/src/scavs.ts
+++ b/src/scavs.ts
@@ -23,7 +23,6 @@ export class Scavs
     public updateScavs(): void
     {
         const mod = this.modConfig;
-        const scavs = this.botConfig.equipment.assault;
 
         if (mod.scavProgression)
         {
@@ -33,10 +32,10 @@ export class Scavs
         else
         {        
             this.botConfig.equipment.assault = mod.customWhitelist1;
-            scavs.whitelist.push(mod.customWhitelist2);
-            scavs.whitelist.push(mod.customWhitelist3);
-            scavs.whitelist.push(mod.customWhitelist4);
-            scavs.whitelist.push(mod.customWhitelist5);
+            this.botConfig.equipment.assault.whitelist.push(mod.customWhitelist2);
+            this.botConfig.equipment.assault.whitelist.push(mod.customWhitelist3);
+            this.botConfig.equipment.assault.whitelist.push(mod.customWhitelist4);
+            this.botConfig.equipment.assault.whitelist.push(mod.customWhitelist5);
             this.logger.info("Custom Scav Progression Changes Applied");
         }
     }