From 86e81ebc33b4dcf051f89ec10206e39e47b36cbb Mon Sep 17 00:00:00 2001 From: andrewgdewar Date: Sat, 25 Jan 2025 11:50:31 -0700 Subject: [PATCH] RC5 --- dist/DewardianDev-MOAR-2.7.0.zip | Bin 42927 -> 42951 bytes src/Spawning/buildPmcs.ts | 4 ++-- src/Spawning/buildScavMarksmanWaves.ts | 2 +- src/Spawning/updateSpawnLocations.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/DewardianDev-MOAR-2.7.0.zip b/dist/DewardianDev-MOAR-2.7.0.zip index 1f00368942b9e6daef0b51f14b0cec973565e649..4a971f2e15bec27907d3d835bd17df550c0660ed 100644 GIT binary patch delta 4602 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 delta 4564 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 diff --git a/src/Spawning/buildPmcs.ts b/src/Spawning/buildPmcs.ts index dc8b841..c5a2e81 100644 --- a/src/Spawning/buildPmcs.ts +++ b/src/Spawning/buildPmcs.ts @@ -99,7 +99,7 @@ export default function buildPmcs( "pmcUSEC", false, config.pmcWaveDistribution, - 10 + Math.round(10 * Math.random()) + 15 + Math.round(10 * Math.random()) ); const pmcBEAR = buildBotWaves( @@ -112,7 +112,7 @@ export default function buildPmcs( "pmcBEAR", false, config.pmcWaveDistribution, - 10 + Math.round(10 * Math.random()) + 15 + Math.round(10 * Math.random()) ); const pmcs = [...pmcUSEC, ...pmcBEAR]; diff --git a/src/Spawning/buildScavMarksmanWaves.ts b/src/Spawning/buildScavMarksmanWaves.ts index 5ac5b3c..935a5c7 100644 --- a/src/Spawning/buildScavMarksmanWaves.ts +++ b/src/Spawning/buildScavMarksmanWaves.ts @@ -198,7 +198,7 @@ export default function buildScavMarksmanWaves( WildSpawnType.ASSAULT, false, scavWaveDistribution, - 11 + 12 ); // Add hotzones if exist diff --git a/src/Spawning/updateSpawnLocations.ts b/src/Spawning/updateSpawnLocations.ts index 00a8c00..7884138 100644 --- a/src/Spawning/updateSpawnLocations.ts +++ b/src/Spawning/updateSpawnLocations.ts @@ -24,7 +24,7 @@ export default function updateSpawnLocations(locationList: ILocation[]) { // console.log(playerSpawns.length); const playerSpawn: ISpawnPointParam = getRandomInArray(playerSpawns); // playerSpawns[playerSpawns.length - 1] - + playerSpawn.ColliderParams._props.Radius = 1 // console.log(map, playerSpawn.Position); const spawnsToAdd = playerSpawns @@ -32,7 +32,7 @@ export default function updateSpawnLocations(locationList: ILocation[]) { .map((point, index) => ({ ...point, Categories: ["Bot"], - Infiltration: "", + // Infiltration: "", Sides: ["Savage"], CorePointId: 1, }));