Merge pull request #12 from Andrewgdewar/AddingExternalSpawns

Adding external spawns

config/PresetWeightings.json

@@ -2,11 +2,12 @@
   "live-like": 25,
   "more-scavs": 8,
   "more-pmcs": 8,
+  "quiet-raids": 5,
   "more-scavs-and-pmcs": 5,
   "main-boss-roaming": 5,
   "sniper-buddies": 4,
   "boss-invasion": 2,
   "rogue-invasion": 0,
   "raider-invasion": 0,
   "insanity": 0
-}
+}

config/Presets.json

@@ -1,5 +1,15 @@
 {
   "live-like": {},
+  "quiet-raids": {
+    "randomSpawns": true,
+    "scavGroupChance": 0.1,
+    "scavMaxGroupSize": 2,
+    "pmcGroupChance": 0.1,
+    "pmcMaxGroupSize": 2,
+    "scavWaveQuantity": 0.7,
+    "pmcWaveQuantity": 0.6,
+    "mainBossChanceBuff": 0
+  },
   "more-scavs": {
     "scavGroupChance": 0.5,
     "scavMaxGroupSize": 5,
@@ -11,13 +21,12 @@
     "pmcWaveQuantity": 1.2
   },
   "more-scavs-and-pmcs": {
-    "scavGroupChance": 0.7,
+    "scavGroupChance": 0.5,
     "scavMaxGroupSize": 5,
-    "pmcGroupChance": 0.8,
+    "pmcGroupChance": 0.5,
     "pmcMaxGroupSize": 5,
-    "scavWaveQuantity": 1.2,
-    "pmcWaveQuantity": 1.2,
-    "mainBossChanceBuff": 25
+    "scavWaveQuantity": 1.1,
+    "pmcWaveQuantity": 1.2
   },
   "boss-invasion": {
     "bossOpenZones": true,
@@ -28,11 +37,11 @@
   },
   "rogue-invasion": {
     "randomRaiderGroup": true,
-    "randomRaiderGroupChance": 50
+    "randomRaiderGroupChance": 100
   },
   "raider-invasion": {
     "randomRaiderGroup": true,
-    "randomRaiderGroupChance": 50
+    "randomRaiderGroupChance": 100
   },
   "insanity": {
     "scavWaveQuantity": 1.3,
@@ -41,7 +50,7 @@
     "pmcGroupChance": 0.8,
     "pmcMaxGroupSize": 6,
     "scavMaxGroupSize": 6,
-    "sniperGroupChance": 1,
+    "sniperGroupChance": 0.5,
     "bossOpenZones": true,
     "randomRaiderGroup": true,
     "randomRaiderGroupChance": 50,
@@ -53,10 +62,10 @@
   },
   "main-boss-roaming": {
     "bossOpenZones": true,
-    "mainBossChanceBuff": 35
+    "mainBossChanceBuff": 50
   },
   "sniper-buddies": {
-    "sniperMaxGroupSize": 2.5,
+    "sniperMaxGroupSize": 2,
     "sniperGroupChance": 1
   }
 }

config/advancedConfig.json

@@ -0,0 +1,3 @@
+{
+    "ActivateSpawnCullingOnServerStart": false
+}

config/bossConfig.json

@@ -36,8 +36,10 @@
   },
   "laboratory": {},
   "lighthouse": {
-    "bossKnight": 30,
-    "bossPartisan": 30
+    "exUsec": 35,
+    "bossKnight": 20,
+    "bossPartisan": 20,
+    "bossZryachiy": 30
   },
   "rezervbase": {
     "bossGluhar": 30

config/config.json

@@ -5,30 +5,30 @@
   "pmcDifficulty": 0.6,
   "scavDifficulty": 0.4,
 
-  "scavWaveDistribution": 0.8,
+  "scavWaveDistribution": 1,
   "scavWaveQuantity": 1,
 
   "startingPmcs": false,
   "pmcWaveDistribution": 0.6,
   "pmcWaveQuantity": 1,
 
-  "disableCascadingSpawns": false,
+  "randomSpawns": false,
 
   "zombiesEnabled": false,
   "zombieWaveDistribution": 0.8,
   "zombieWaveQuantity": 1,
   "zombieHealth": 1,
 
-  "maxBotCap": 25,
-  "maxBotPerZone": 7,
+  "maxBotCap": 20,
+  "maxBotPerZone": 6,
 
   "sniperGroupChance": 0.1,
   "scavGroupChance": 0.2,
   "pmcGroupChance": 0.2,
 
   "pmcMaxGroupSize": 4,
-  "scavMaxGroupSize": 4,
-  "sniperMaxGroupSize": 1.7,
+  "scavMaxGroupSize": 3,
+  "sniperMaxGroupSize": 1,
 
   "bossOpenZones": false,
 

config/mapConfig.json

@@ -1,9 +1,11 @@
 {
   "customs": {
+    "sniperQuantity": 3,
     "initialSpawnDelay": 15,
     "smoothingDistribution": 0.9,
-    "mapCullingNearPointValue": 10,
-    "spawnMinDistance": 30,
+    "mapCullingNearPointValuePlayer": 8,
+    "mapCullingNearPointValue": 15,
+    "spawnMinDistance": 60,
     "pmcWaveCount": 12,
     "scavWaveCount": 21,
     "zombieWaveCount": 9,
@@ -15,9 +17,11 @@
     ]
   },
   "factoryDay": {
+    "sniperQuantity": 0,
     "initialSpawnDelay": 10,
-    "smoothingDistribution": 0.4,
-    "mapCullingNearPointValue": 3,
+    "smoothingDistribution": 0.6,
+    "mapCullingNearPointValuePlayer": 2,
+    "mapCullingNearPointValue": 1.5,
     "spawnMinDistance": 15,
     "maxBotCapOverride": 12,
     "maxBotPerZoneOverride": 12,
@@ -26,9 +30,11 @@
     "zombieWaveCount": 6
   },
   "factoryNight": {
+    "sniperQuantity": 0,
     "initialSpawnDelay": 10,
-    "smoothingDistribution": 0.4,
-    "mapCullingNearPointValue": 3,
+    "smoothingDistribution": 0.6,
+    "mapCullingNearPointValuePlayer": 2,
+    "mapCullingNearPointValue": 1.5,
     "spawnMinDistance": 15,
     "maxBotCapOverride": 12,
     "maxBotPerZoneOverride": 12,
@@ -37,10 +43,12 @@
     "zombieWaveCount": 6
   },
   "interchange": {
+    "sniperQuantity": 0,
     "initialSpawnDelay": 20,
     "smoothingDistribution": 0.9,
-    "mapCullingNearPointValue": 8,
-    "spawnMinDistance": 40,
+    "mapCullingNearPointValuePlayer": 3,
+    "mapCullingNearPointValue": 3,
+    "spawnMinDistance": 70,
     "pmcWaveCount": 14,
     "scavWaveCount": 28,
     "zombieWaveCount": 12,
@@ -50,19 +58,23 @@
     ]
   },
   "laboratory": {
+    "sniperQuantity": 0,
     "initialSpawnDelay": 15,
     "smoothingDistribution": 0.9,
-    "mapCullingNearPointValue": 3,
-    "spawnMinDistance": 20,
+    "mapCullingNearPointValuePlayer": 4,
+    "mapCullingNearPointValue": 0.9,
+    "spawnMinDistance": 30,
     "pmcWaveCount": 10,
     "scavWaveCount": 0,
     "zombieWaveCount": 12
   },
   "lighthouse": {
+    "sniperQuantity": 3,
     "initialSpawnDelay": 20,
     "smoothingDistribution": 0.9,
-    "mapCullingNearPointValue": 10,
-    "spawnMinDistance": 40,
+    "mapCullingNearPointValuePlayer": 2.5,
+    "mapCullingNearPointValue": 2.5,
+    "spawnMinDistance": 50,
     "pmcWaveCount": 12,
     "scavWaveCount": 20,
     "zombieWaveCount": 10,
@@ -72,10 +84,12 @@
     ]
   },
   "rezervbase": {
+    "sniperQuantity": 0,
     "initialSpawnDelay": 20,
     "smoothingDistribution": 0.9,
-    "mapCullingNearPointValue": 10,
-    "spawnMinDistance": 40,
+    "mapCullingNearPointValuePlayer": 3,
+    "mapCullingNearPointValue": 2.5,
+    "spawnMinDistance": 50,
     "pmcWaveCount": 11,
     "scavWaveCount": 24,
     "zombieWaveCount": 9,
@@ -87,10 +101,12 @@
     ]
   },
   "shoreline": {
+    "sniperQuantity": 4,
     "initialSpawnDelay": 20,
     "smoothingDistribution": 0.9,
-    "mapCullingNearPointValue": 10,
-    "spawnMinDistance": 40,
+    "mapCullingNearPointValuePlayer": 5,
+    "mapCullingNearPointValue": 5,
+    "spawnMinDistance": 70,
     "pmcWaveCount": 14,
     "scavWaveCount": 28,
     "zombieWaveCount": 12,
@@ -102,19 +118,23 @@
     ]
   },
   "tarkovstreets": {
+    "sniperQuantity": 5,
     "initialSpawnDelay": 20,
     "smoothingDistribution": 0.9,
-    "mapCullingNearPointValue": 10,
-    "spawnMinDistance": 40,
+    "mapCullingNearPointValuePlayer": 4,
+    "mapCullingNearPointValue": 2,
+    "spawnMinDistance": 70,
     "pmcWaveCount": 14,
     "scavWaveCount": 26,
     "zombieWaveCount": 13
   },
   "woods": {
-    "initialSpawnDelay": 20,
+    "sniperQuantity": 2,
+    "initialSpawnDelay": 3,
     "smoothingDistribution": 0.9,
-    "mapCullingNearPointValue": 10,
-    "spawnMinDistance": 40,
+    "mapCullingNearPointValuePlayer": 6,
+    "mapCullingNearPointValue": 13,
+    "spawnMinDistance": 70,
     "pmcWaveCount": 14,
     "scavWaveCount": 28,
     "zombieWaveCount": 10,
@@ -126,19 +146,25 @@
     ]
   },
   "gzLow": {
+    "sniperQuantity": 3,
     "initialSpawnDelay": 10,
-    "smoothingDistribution": 1,
-    "mapCullingNearPointValue": 7,
-    "spawnMinDistance": 30,
+    "smoothingDistribution": 0.7,
+    "mapCullingNearPointValuePlayer": 4,
+    "mapCullingNearPointValue": 2,
+    "maxBotCapOverride": 15,
+    "spawnMinDistance": 50,
     "pmcWaveCount": 10,
     "scavWaveCount": 18,
     "zombieWaveCount": 9
   },
   "gzHigh": {
+    "sniperQuantity": 3,
     "initialSpawnDelay": 10,
-    "smoothingDistribution": 1,
-    "mapCullingNearPointValue": 7,
-    "spawnMinDistance": 30,
+    "smoothingDistribution": 0.7,
+    "mapCullingNearPointValuePlayer": 4,
+    "mapCullingNearPointValue": 2,
+    "maxBotCapOverride": 15,
+    "spawnMinDistance": 50,
     "pmcWaveCount": 12,
     "scavWaveCount": 18,
     "zombieWaveCount": 9

package.json

@@ -1,6 +1,6 @@
 {
   "name": "MOAR",
-  "version": "2.7.0",
+  "version": "3.0.0-alpha.5",
   "main": "src/mod.js",
   "license": "MIT",
   "author": "DewardianDev",

src/GlobalValues.ts

@@ -1,12 +1,16 @@
+import { Ixyz } from "@spt/models/eft/common/Ixyz";
 import config from "../config/config.json";
-import { ILocationBase, ISpawnPointParam } from "@spt/models/eft/common/ILocationBase";
+import {
+  ILocationBase,
+  ISpawnPointParam,
+} from "@spt/models/eft/common/ILocationBase";
 
 export class globalValues {
   public static baseConfig: typeof config = undefined;
   public static overrideConfig: Partial<typeof config> = undefined;
   public static locationsBase: ILocationBase[] = undefined;
   public static currentPreset: string = "";
   public static forcedPreset: string = "random";
-  public static addedMapZones: Record<string, string[]> = {};
-  public static indexedMapSpawns: Record<number, ISpawnPointParam[]> = {}
+  public static addedMapZones: Record<number, string[]> = {};
+  public static indexedMapSpawns: Record<number, ISpawnPointParam[]> = {};
 }