alpha 1

Andrewgdewar · Feb 1, 2025 · 7b05258 · 7b05258
1 parent 1be2d32
commit 7b05258
Show file tree

Hide file tree

Showing 19 changed files with 686 additions and 1,040 deletions.
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
@@ -24,6 +24,6 @@ jobs:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         automatic_release_tag: ${{ steps.versionstep.outputs.version }}
         title: "MOAR ${{ steps.versionstep.outputs.version }}"
-        prerelease: true
+        prerelease: false
         files: |
           ./dist/*.zip
diff --git a/config/PresetWeightings.json b/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
-}
+}
diff --git a/config/Presets.json b/config/Presets.json
@@ -1,5 +1,15 @@
 {
   "live-like": {},
+  "quiet-raids": {
+    "disableCascadingSpawns": 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,
@@ -28,11 +38,11 @@
   },
   "rogue-invasion": {
     "randomRaiderGroup": true,
-    "randomRaiderGroupChance": 50
+    "randomRaiderGroupChance": 100
   },
   "raider-invasion": {
     "randomRaiderGroup": true,
-    "randomRaiderGroupChance": 50
+    "randomRaiderGroupChance": 100
   },
   "insanity": {
     "scavWaveQuantity": 1.3,

diff --git a/config/bossConfig.json b/config/bossConfig.json
@@ -36,6 +36,7 @@
   },
   "laboratory": {},
   "lighthouse": {
+    "exUsec": 20,
     "bossKnight": 30,
     "bossPartisan": 30
   },

diff --git a/config/config.json b/config/config.json
@@ -19,7 +19,7 @@
   "zombieWaveQuantity": 1,
   "zombieHealth": 1,
 
-  "maxBotCap": 18,
+  "maxBotCap": 20,
   "maxBotPerZone": 6,
 
   "sniperGroupChance": 0.1,

diff --git a/config/mapConfig.json b/config/mapConfig.json
@@ -4,7 +4,7 @@
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValuePlayer": 8,
     "mapCullingNearPointValue": 15,
-    "spawnMinDistance": 60,
+    "spawnMinDistance": 50,
     "pmcWaveCount": 12,
     "scavWaveCount": 21,
     "zombieWaveCount": 9,
@@ -17,7 +17,7 @@
   },
   "factoryDay": {
     "initialSpawnDelay": 10,
-    "smoothingDistribution": 0.4,
+    "smoothingDistribution": 0.6,
     "mapCullingNearPointValuePlayer": 2,
     "mapCullingNearPointValue": 1.5,
     "spawnMinDistance": 15,
@@ -29,7 +29,7 @@
   },
   "factoryNight": {
     "initialSpawnDelay": 10,
-    "smoothingDistribution": 0.4,
+    "smoothingDistribution": 0.6,
     "mapCullingNearPointValuePlayer": 2,
     "mapCullingNearPointValue": 1.5,
     "spawnMinDistance": 15,
@@ -44,7 +44,7 @@
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValuePlayer": 3,
     "mapCullingNearPointValue": 3,
-    "spawnMinDistance": 60,
+    "spawnMinDistance": 50,
     "pmcWaveCount": 14,
     "scavWaveCount": 28,
     "zombieWaveCount": 12,
@@ -58,7 +58,7 @@
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValuePlayer": 4,
     "mapCullingNearPointValue": 0.9,
-    "spawnMinDistance": 20,
+    "spawnMinDistance": 30,
     "pmcWaveCount": 10,
     "scavWaveCount": 0,
     "zombieWaveCount": 12
@@ -68,7 +68,7 @@
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValuePlayer": 2.5,
     "mapCullingNearPointValue": 2.5,
-    "spawnMinDistance": 60,
+    "spawnMinDistance": 50,
     "pmcWaveCount": 12,
     "scavWaveCount": 20,
     "zombieWaveCount": 10,
@@ -82,7 +82,7 @@
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValuePlayer": 3,
     "mapCullingNearPointValue": 2.5,
-    "spawnMinDistance": 60,
+    "spawnMinDistance": 40,
     "pmcWaveCount": 11,
     "scavWaveCount": 24,
     "zombieWaveCount": 9,
@@ -98,7 +98,7 @@
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValuePlayer": 5,
     "mapCullingNearPointValue": 5,
-    "spawnMinDistance": 60,
+    "spawnMinDistance": 50,
     "pmcWaveCount": 14,
     "scavWaveCount": 28,
     "zombieWaveCount": 12,
@@ -114,7 +114,7 @@
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValuePlayer": 4,
     "mapCullingNearPointValue": 2,
-    "spawnMinDistance": 60,
+    "spawnMinDistance": 50,
     "pmcWaveCount": 14,
     "scavWaveCount": 26,
     "zombieWaveCount": 13
@@ -124,7 +124,7 @@
     "smoothingDistribution": 0.9,
     "mapCullingNearPointValuePlayer": 6,
     "mapCullingNearPointValue": 13,
-    "spawnMinDistance": 60,
+    "spawnMinDistance": 50,
     "pmcWaveCount": 14,
     "scavWaveCount": 28,
     "zombieWaveCount": 10,
@@ -137,20 +137,22 @@
   },
   "gzLow": {
     "initialSpawnDelay": 10,
-    "smoothingDistribution": 1,
+    "smoothingDistribution": 0.7,
     "mapCullingNearPointValuePlayer": 4,
     "mapCullingNearPointValue": 2,
-    "spawnMinDistance": 45,
+    "maxBotCapOverride": 15,
+    "spawnMinDistance": 30,
     "pmcWaveCount": 10,
     "scavWaveCount": 18,
     "zombieWaveCount": 9
   },
   "gzHigh": {
     "initialSpawnDelay": 10,
-    "smoothingDistribution": 1,
+    "smoothingDistribution": 0.7,
     "mapCullingNearPointValuePlayer": 4,
     "mapCullingNearPointValue": 2,
-    "spawnMinDistance": 45,
+    "maxBotCapOverride": 15,
+    "spawnMinDistance": 30,
     "pmcWaveCount": 12,
     "scavWaveCount": 18,
     "zombieWaveCount": 9

diff --git a/dist/DewardianDev-MOAR-3.0.0.zip b/dist/DewardianDev-MOAR-3.0.0.zip
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MOAR",
-  "version": "3.0.0",
+  "version": "3.0.0-alpha.1",
   "main": "src/mod.js",
   "license": "MIT",
   "author": "DewardianDev",

diff --git a/src/SpawnZoneChanges/setupSpawn.ts b/src/SpawnZoneChanges/setupSpawn.ts
@@ -9,7 +9,6 @@ import {
   AddCustomBotSpawnPoints,
   AddCustomPlayerSpawnPoints,
   cleanClosest,
-  getClosestZone,
   removeClosestSpawnsFromCustomBots,
 } from "../Spawning/spawnZoneUtils";
 import { shuffle } from "../Spawning/utils";
@@ -48,8 +47,9 @@ export const setupSpawns = (container: DependencyContainer) => {
           case point.Categories.includes("Boss"):
             bossSpawn.push(point);
             break;
+
           case point.BotZoneName?.toLowerCase().includes("snipe") ||
-            point.DelayToCanSpawnSec > 40:
+            (map !== "lighthouse" && point.DelayToCanSpawnSec > 40):
             sniperSpawnSpawnPoints.push(point);
             break;
 
@@ -70,7 +70,7 @@ export const setupSpawns = (container: DependencyContainer) => {
         .map((point) => point.BotZoneName)
         .filter((item) => !!item)
     );
-    // console.log(sniperZones)
+
     const zoneHash: Record<string, Ixyz> = {};
 
     [...coopSpawns, ...nonBossSpawns, ...bossSpawn].forEach((point) => {
@@ -130,18 +130,18 @@ export const setupSpawns = (container: DependencyContainer) => {
     }
 
     nonBossSpawns = cleanClosest(
-      AddCustomBotSpawnPoints(nonBossSpawns, map, mapIndex),
+      AddCustomBotSpawnPoints(nonBossSpawns, map),
       mapIndex
     ).map((point) => {
       if (point.ColliderParams?._props?.Radius < limit) {
         point.ColliderParams._props.Radius = limit;
       }
+
       return !!point.Categories.length
         ? {
             ...point,
-            BotZoneName: point?.BotZoneName,
+            BotZoneName: point?.BotZoneName || "",
             Categories: ["Bot"],
-            // Infiltration: "",
             Sides: ["Savage"],
             CorePointId: 1,
           }

diff --git a/src/Spawning/buildPmcs.ts b/src/Spawning/buildPmcs.ts
@@ -2,7 +2,7 @@ import { ILocation } from "@spt/models/eft/common/ILocation";
 import _config from "../../config/config.json";
 import mapConfig from "../../config/mapConfig.json";
 import { defaultEscapeTimes, defaultHostility } from "./constants";
-import { buildBotWaves, MapSettings, shuffle } from "./utils";
+import { buildBotWaves, looselyShuffle, MapSettings, shuffle } from "./utils";
 import { saveToFile } from "../utils";
 import getSortedSpawnPointList from "./spawnZoneUtils";
 
@@ -30,10 +30,9 @@ export default function buildPmcs(
       Position: { x, y, z },
     } =
       locationList[index].base.SpawnPointParams[
-      locationList[index].base.SpawnPointParams.length - 1
+        locationList[index].base.SpawnPointParams.length - 1
       ];
 
-    // console.log(map);
     let pmcZones = getSortedSpawnPointList(
       locationList[index].base.SpawnPointParams.filter(
         ({ Categories, DelayToCanSpawnSec, BotZoneName }, index) =>
@@ -50,8 +49,8 @@ export default function buildPmcs(
       z,
       0.1
     ).map(({ BotZoneName }) => BotZoneName);
+    looselyShuffle(pmcZones);
 
-    // console.log(map, pmcZones);
     if (map === "laboratory") {
       pmcZones = new Array(10).fill(pmcZones).flat(1);
     }

diff --git a/src/Spawning/buildScavMarksmanWaves.ts b/src/Spawning/buildScavMarksmanWaves.ts
@@ -2,7 +2,7 @@ import { ILocation } from "@spt/models/eft/common/ILocation";
 import _config from "../../config/config.json";
 import mapConfig from "../../config/mapConfig.json";
 import { defaultEscapeTimes, originalMapList } from "./constants";
-import { buildBotWaves, MapSettings, shuffle } from "./utils";
+import { buildBotWaves, looselyShuffle, MapSettings, shuffle } from "./utils";
 import { WildSpawnType } from "@spt/models/eft/common/ILocationBase";
 import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
 import { saveToFile } from "../utils";
@@ -118,6 +118,11 @@ export default function buildScavMarksmanWaves(
       z
     ).map(({ BotZoneName }) => BotZoneName);
 
+    // Prevent too many snipers on streets
+    if (map === "tarkovstreets") {
+      sniperLocations = sniperLocations.filter((_, index) => index % 2 === 0);
+    }
+
     if (sniperLocations.length) {
       locationList[index].base.MinMaxBots = [
         {
@@ -145,6 +150,8 @@ export default function buildScavMarksmanWaves(
       0.1
     ).map(({ BotZoneName }) => BotZoneName);
 
+    looselyShuffle(scavZones);
+
     const escapeTimeLimitRatio = Math.round(
       locationList[index].base.EscapeTimeLimit / defaultEscapeTimes[map]
     );