Remove Existing PMC waves on server start, disabled via config

sp-tarkov · Feb 16, 2025 · 2a54cbe · 2a54cbe
1 parent c5246d1
commit 2a54cbe
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/project/assets/configs/pmc.json b/project/assets/configs/pmc.json
@@ -864,5 +864,6 @@
             "max": 100
         }
     },
-    "addSecureContainerLootFromBotConfig": false
+    "addSecureContainerLootFromBotConfig": false,
+	"removeExistingPmcWaves": true
 }
diff --git a/project/src/models/spt/config/IPmcConfig.ts b/project/src/models/spt/config/IPmcConfig.ts
@@ -1,5 +1,5 @@
 import { MinMax } from "@spt/models/common/MinMax";
-import { IChancedEnemy } from "@spt/models/eft/common/ILocationBase";
+import { IBossLocationSpawn, IChancedEnemy } from "@spt/models/eft/common/ILocationBase";
 import { MemberCategory } from "@spt/models/enums/MemberCategory";
 import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 
@@ -49,6 +49,9 @@ export interface IPmcConfig extends IBaseConfig {
     locationSpecificPmcLevelOverride: Record<string, MinMax>;
     /** Should secure container loot from usec.json/bear.json be added to pmc bots secure */
     addSecureContainerLootFromBotConfig: boolean;
+    /** key = mapid */
+    removeExistingPmcWaves: boolean;
+    customPmcWaves: Record<string, IBossLocationSpawn[]>;
 }
 
 export interface IHostilitySettings {

diff --git a/project/src/services/PostDbLoadService.ts b/project/src/services/PostDbLoadService.ts
@@ -83,8 +83,12 @@ export class PostDbLoadService {
             this.openZoneService.applyZoneChangesToAllMaps();
         }
 
+        if (this.pmcConfig.removeExistingPmcWaves) {
+            this.removeExistingPmcWaves();
+        }
+
         if (this.locationConfig.addCustomBotWavesToMaps) {
-            this.customLocationWaveService.applyWaveChangesToAllMaps();
+            //this.customLocationWaveService.applyWaveChangesToAllMaps();
         }
 
         if (this.locationConfig.enableBotTypeLimits) {
@@ -134,6 +138,20 @@ export class PostDbLoadService {
         this.addCustomItemPresetsToGlobals();
     }
 
+    protected removeExistingPmcWaves() {
+        const locations: ILocation[] = Object.values(this.databaseService.getLocations());
+
+        for (const location of locations) {
+            if (!location || !location?.base?.BossLocationSpawn) {
+                continue;
+            }
+
+            location.base.BossLocationSpawn = location.base.BossLocationSpawn.filter(
+                (x) => !["pmcUSEC", "pmcBEAR"].includes(x.BossName),
+            );
+        }
+    }
+
     protected removeNewBeginningRequirementFromPrestige() {
         const newBeginningQuestIds = ["6761f28a022f60bb320f3e95", "6761ff17cdc36bd66102e9d0"];
         const prestigeDb = this.databaseService.getTemplates().prestige;