Make intitialSpawnDelay configurable

Andrewgdewar · Jan 25, 2025 · 453cb74 · 453cb74
1 parent 103e0b1
commit 453cb74
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 14 deletions.
diff --git a/config/mapConfig.json b/config/mapConfig.json
@@ -1,5 +1,6 @@
 {
   "customs": {
+    "initialSpawnDelay": 15,
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValue": 10,
     "spawnMinDistance": 30,
@@ -14,6 +15,7 @@
     ]
   },
   "factoryDay": {
+    "initialSpawnDelay": 10,
     "smoothingDistribution": 0.4,
     "mapCullingNearPointValue": 3,
     "spawnMinDistance": 15,
@@ -24,6 +26,7 @@
     "zombieWaveCount": 6
   },
   "factoryNight": {
+    "initialSpawnDelay": 10,
     "smoothingDistribution": 0.4,
     "mapCullingNearPointValue": 3,
     "spawnMinDistance": 15,
@@ -34,6 +37,7 @@
     "zombieWaveCount": 6
   },
   "interchange": {
+    "initialSpawnDelay": 20,
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValue": 8,
     "spawnMinDistance": 40,
@@ -46,6 +50,7 @@
     ]
   },
   "laboratory": {
+    "initialSpawnDelay": 15,
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValue": 3,
     "spawnMinDistance": 20,
@@ -54,6 +59,7 @@
     "zombieWaveCount": 12
   },
   "lighthouse": {
+    "initialSpawnDelay": 20,
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValue": 10,
     "spawnMinDistance": 40,
@@ -66,6 +72,7 @@
     ]
   },
   "rezervbase": {
+    "initialSpawnDelay": 20,
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValue": 10,
     "spawnMinDistance": 40,
@@ -80,6 +87,7 @@
     ]
   },
   "shoreline": {
+    "initialSpawnDelay": 20,
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValue": 10,
     "spawnMinDistance": 40,
@@ -94,6 +102,7 @@
     ]
   },
   "tarkovstreets": {
+    "initialSpawnDelay": 20,
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValue": 10,
     "spawnMinDistance": 40,
@@ -102,6 +111,7 @@
     "zombieWaveCount": 13
   },
   "woods": {
+    "initialSpawnDelay": 20,
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValue": 10,
     "spawnMinDistance": 40,
@@ -116,6 +126,7 @@
     ]
   },
   "gzLow": {
+    "initialSpawnDelay": 10,
     "smoothingDistribution": 1,
     "mapCullingNearPointValue": 7,
     "spawnMinDistance": 30,
@@ -124,6 +135,7 @@
     "zombieWaveCount": 9
   },
   "gzHigh": {
+    "initialSpawnDelay": 10,
     "smoothingDistribution": 1,
     "mapCullingNearPointValue": 7,
     "spawnMinDistance": 30,

diff --git a/dist/DewardianDev-MOAR-2.7.0.zip b/dist/DewardianDev-MOAR-2.7.0.zip
diff --git a/src/Spawning/buildPmcs.ts b/src/Spawning/buildPmcs.ts
@@ -20,14 +20,14 @@ export default function buildPmcs(
     locationList[index].base.BotLocationModifier.AdditionalHostilitySettings =
       defaultHostility;
 
-    const { pmcHotZones = [], pmcWaveCount } =
+    const { pmcHotZones = [], pmcWaveCount, initialSpawnDelay } =
       (mapConfig?.[map] as MapSettings) || {};
 
     const {
       Position: { x, z },
     } =
       locationList[index].base.SpawnPointParams[
-        locationList[index].base.SpawnPointParams.length - 1
+      locationList[index].base.SpawnPointParams.length - 1
       ];
 
     // console.log(map);
@@ -99,7 +99,7 @@ export default function buildPmcs(
       "pmcUSEC",
       false,
       config.pmcWaveDistribution,
-      15 + Math.round(10 * Math.random())
+      initialSpawnDelay + Math.round(10 * Math.random())
     );
 
     const pmcBEAR = buildBotWaves(
@@ -112,7 +112,7 @@ export default function buildPmcs(
       "pmcBEAR",
       false,
       config.pmcWaveDistribution,
-      15 + Math.round(10 * Math.random())
+      initialSpawnDelay + Math.round(10 * Math.random())
     );
 
     const pmcs = [...pmcUSEC, ...pmcBEAR];

diff --git a/src/Spawning/buildScavMarksmanWaves.ts b/src/Spawning/buildScavMarksmanWaves.ts
@@ -2,12 +2,10 @@ import { ILocation } from "@spt/models/eft/common/ILocation";
 import _config from "../../config/config.json";
 import mapConfig from "../../config/mapConfig.json";
 import {
-  configLocations,
   defaultEscapeTimes,
-  defaultHostility,
   originalMapList,
 } from "./constants";
-import { buildBotWaves, MapSettings, shuffle, waveBuilder } from "./utils";
+import { buildBotWaves, MapSettings, shuffle } from "./utils";
 import { WildSpawnType } from "@spt/models/eft/common/ILocationBase";
 import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
 import { saveToFile } from "../utils";
@@ -64,6 +62,8 @@ export default function buildScavMarksmanWaves(
       maxBotCapOverride,
       EscapeTimeLimit,
       scavHotZones = [],
+      scavWaveCount,
+      initialSpawnDelay
     } = (mapConfig?.[map] as MapSettings) || {};
 
     // Set per map EscapeTimeLimit
@@ -104,7 +104,7 @@ export default function buildScavMarksmanWaves(
       Position: { x, z },
     } =
       locationList[index].base.SpawnPointParams[
-        locationList[index].base.SpawnPointParams.length - 1
+      locationList[index].base.SpawnPointParams.length - 1
       ];
 
     let sniperLocations = getSortedSpawnPointList(
@@ -129,7 +129,6 @@ export default function buildScavMarksmanWaves(
       ];
     }
 
-    const { scavWaveCount } = mapConfig[map];
 
     let scavZones = getSortedSpawnPointList(
       locationList[index].base.SpawnPointParams.filter(
@@ -198,7 +197,7 @@ export default function buildScavMarksmanWaves(
       WildSpawnType.ASSAULT,
       false,
       scavWaveDistribution,
-      15
+      initialSpawnDelay + Math.round(10 * Math.random())
     );
 
     // Add hotzones if exist

diff --git a/src/Spawning/utils.ts b/src/Spawning/utils.ts
@@ -244,9 +244,9 @@ export const buildBotWaves = (
       BossPlayer: false,
       BossZone:
         bossZones[
-          isMarksman
-            ? totalCountThusFar
-            : Math.floor(totalCountThusFar * botToZoneTotal)
+        isMarksman
+          ? totalCountThusFar
+          : Math.floor(totalCountThusFar * botToZoneTotal)
         ] || "",
       Delay: 0,
       DependKarma: false,
@@ -341,6 +341,7 @@ export const buildZombie = (
 };
 
 export interface MapSettings {
+  initialSpawnDelay: number;
   smoothingDistribution: number;
   mapCullingNearPointValue: number;
   spawnMinDistance: number;
@@ -419,7 +420,7 @@ export const setEscapeTimeOverrides = (
     if (
       !override &&
       locationList[index].base.EscapeTimeLimit / defaultEscapeTimes[map] >
-        hardcodedEscapeLimitMax
+      hardcodedEscapeLimitMax
     ) {
       const maxLimit = defaultEscapeTimes[map] * hardcodedEscapeLimitMax;
       logger.warning(