diff --git a/config/Presets.json b/config/Presets.json index e817a6d..cbd6aa3 100644 --- a/config/Presets.json +++ b/config/Presets.json @@ -1,7 +1,7 @@ { "live-like": {}, "quiet-raids": { - "disableCascadingSpawns": true, + "randomSpawns": true, "scavGroupChance": 0.1, "scavMaxGroupSize": 2, "pmcGroupChance": 0.1, diff --git a/config/config.json b/config/config.json index f872a24..e7f03bd 100644 --- a/config/config.json +++ b/config/config.json @@ -12,7 +12,7 @@ "pmcWaveDistribution": 0.6, "pmcWaveQuantity": 1, - "disableCascadingSpawns": false, + "randomSpawns": false, "zombiesEnabled": false, "zombieWaveDistribution": 0.8, diff --git a/config/mapConfig.json b/config/mapConfig.json index af20446..bc89ffa 100644 --- a/config/mapConfig.json +++ b/config/mapConfig.json @@ -17,7 +17,7 @@ ] }, "factoryDay": { - "sniperQuantity": 3, + "sniperQuantity": 0, "initialSpawnDelay": 10, "smoothingDistribution": 0.6, "mapCullingNearPointValuePlayer": 2, @@ -30,7 +30,7 @@ "zombieWaveCount": 6 }, "factoryNight": { - "sniperQuantity": 3, + "sniperQuantity": 0, "initialSpawnDelay": 10, "smoothingDistribution": 0.6, "mapCullingNearPointValuePlayer": 2, @@ -43,7 +43,7 @@ "zombieWaveCount": 6 }, "interchange": { - "sniperQuantity": 3, + "sniperQuantity": 0, "initialSpawnDelay": 20, "smoothingDistribution": 0.9, "mapCullingNearPointValuePlayer": 3, @@ -84,7 +84,7 @@ ] }, "rezervbase": { - "sniperQuantity": 3, + "sniperQuantity": 0, "initialSpawnDelay": 20, "smoothingDistribution": 0.9, "mapCullingNearPointValuePlayer": 3, @@ -129,7 +129,7 @@ "zombieWaveCount": 13 }, "woods": { - "sniperQuantity": 20, + "sniperQuantity": 2, "initialSpawnDelay": 3, "smoothingDistribution": 0.9, "mapCullingNearPointValuePlayer": 6, diff --git a/src/Spawning/Spawning.ts b/src/Spawning/Spawning.ts index c9df352..f92f145 100644 --- a/src/Spawning/Spawning.ts +++ b/src/Spawning/Spawning.ts @@ -133,13 +133,13 @@ export const buildWaves = (container: DependencyContainer) => { if ( config.startingPmcs && - (!config.disableCascadingSpawns || config.spawnSmoothing) + (!config.randomSpawns || config.spawnSmoothing) ) { Logger.warning( `[MOAR] Starting pmcs turned on, turning off cascade system and smoothing.\n` ); config.spawnSmoothing = false; - config.disableCascadingSpawns = true; + config.randomSpawns = true; } updateSpawnLocations(locationList); diff --git a/src/Spawning/buildPmcs.ts b/src/Spawning/buildPmcs.ts index 262db6b..e9cd7d9 100644 --- a/src/Spawning/buildPmcs.ts +++ b/src/Spawning/buildPmcs.ts @@ -50,7 +50,7 @@ export default function buildPmcs( pmcZones = new Array(10).fill(pmcZones).flat(1); } - if (config.disableCascadingSpawns) pmcZones = shuffle(pmcZones); + if (config.randomSpawns) pmcZones = shuffle(pmcZones); const escapeTimeLimitRatio = Math.round( locationList[index].base.EscapeTimeLimit / defaultEscapeTimes[map] @@ -108,7 +108,7 @@ export default function buildPmcs( const pmcBEAR = buildBotWaves( half, - config.startingPmcs ? Math.round(0.2 * timeLimit) : timeLimit, + config.startingPmcs ? Math.round(0.1 * timeLimit) : timeLimit, config.pmcMaxGroupSize - 1, config.pmcGroupChance, bearSpawns, @@ -120,7 +120,7 @@ export default function buildPmcs( ); const pmcs = [...pmcUSEC, ...pmcBEAR]; - + // console.log(pmcs.map(({ Time }) => Time)); if (pmcs.length) { // Add hotzones if exist pmcHotZones.forEach((hotzone) => { diff --git a/src/Spawning/buildScavMarksmanWaves.ts b/src/Spawning/buildScavMarksmanWaves.ts index 408a419..192e01b 100644 --- a/src/Spawning/buildScavMarksmanWaves.ts +++ b/src/Spawning/buildScavMarksmanWaves.ts @@ -184,8 +184,8 @@ export default function buildScavMarksmanWaves( const timeLimit = locationList[index].base.EscapeTimeLimit * 60; - if (config.disableCascadingSpawns) - sniperLocations = shuffle(sniperLocations); + // if (config.randomSpawns) + // sniperLocations = shuffle(sniperLocations); // console.log(map); const snipers = buildBotWaves( Math.min(sniperQuantity, sniperLocations.length), @@ -193,14 +193,14 @@ export default function buildScavMarksmanWaves( sniperMaxGroupSize, sniperGroupChance, sniperLocations, - 0.7, + 1.7, WildSpawnType.MARKSMAN, true, 0.3, sniperDelay ); - if (config.disableCascadingSpawns) scavZones = shuffle(scavZones); + if (config.randomSpawns) scavZones = shuffle(scavZones); const scavWaves = buildBotWaves( scavTotalWaveCount, timeLimit, diff --git a/src/Spawning/constants.ts b/src/Spawning/constants.ts index 6698732..7b0da5d 100644 --- a/src/Spawning/constants.ts +++ b/src/Spawning/constants.ts @@ -35,7 +35,6 @@ export const defaultHostility = [ "bossKolontay", "followerKolontayAssault", "followerKolontaySecurity", - "shooterBTR", "bossPartisan", "spiritWinter", "spiritSpring", @@ -60,7 +59,7 @@ export const defaultHostility = [ BearPlayerBehaviour: "AlwaysEnemies", BotRole: "pmcBEAR", ChancedEnemies: [], - Neutral: [], + Neutral: ["shooterBTR"], SavagePlayerBehaviour: "AlwaysEnemies", UsecEnemyChance: 100, UsecPlayerBehaviour: "AlwaysEnemies", @@ -102,7 +101,6 @@ export const defaultHostility = [ "bossKolontay", "followerKolontayAssault", "followerKolontaySecurity", - "shooterBTR", "bossPartisan", "spiritWinter", "spiritSpring", @@ -127,7 +125,7 @@ export const defaultHostility = [ BearPlayerBehaviour: "AlwaysEnemies", BotRole: "pmcUSEC", ChancedEnemies: [], - Neutral: [], + Neutral: ["shooterBTR"], SavagePlayerBehaviour: "AlwaysEnemies", UsecEnemyChance: 100, UsecPlayerBehaviour: "AlwaysEnemies", diff --git a/src/Spawns/botSpawns.json b/src/Spawns/botSpawns.json index a64aa15..0c7828e 100644 --- a/src/Spawns/botSpawns.json +++ b/src/Spawns/botSpawns.json @@ -1161,11 +1161,6 @@ "y": 26.2474461, "z": -154.487122 }, - { - "x": -416.074036, - "y": 30.8520775, - "z": -170.099075 - }, { "x": -375.345367, "y": 26.5590916, @@ -1256,11 +1251,6 @@ "y": 55.1406975, "z": -319.1492 }, - { - "x": 88.2232, - "y": 14.2387409, - "z": -143.665421 - }, { "x": -136.267685, "y": 34.8288536, @@ -1346,11 +1336,6 @@ "y": 3.44120073, "z": -187.104324 }, - { - "x": 195.597519, - "y": 7.940307619999999, - "z": -161.77626 - }, { "x": -393.2641, "y": 13.4295111, @@ -1361,11 +1346,6 @@ "y": 15.1067963, "z": -460.3208 }, - { - "x": 317.635834, - "y": -3.7734720000000004, - "z": 268.1204 - }, { "x": 150.440338, "y": 11.39805, diff --git a/src/Spawns/playerSpawns.json b/src/Spawns/playerSpawns.json index 12c96a2..bdb899f 100644 --- a/src/Spawns/playerSpawns.json +++ b/src/Spawns/playerSpawns.json @@ -66,7 +66,33 @@ } ], "tarkovstreets": [], - "woods": [], + "woods": [ + { + "x": 104.282555, + "y": 17.1939659, + "z": -842.5501 + }, + { + "x": -253.314621, + "y": 18.64557, + "z": -656.4694 + }, + { + "x": -645.2799, + "y": 10.5486507, + "z": -271.707245 + }, + { + "x": -525.376465, + "y": 7.752978, + "z": 146.6656 + }, + { + "x": 261.598236, + "y": -9.6038618, + "z": 323.6364 + } + ], "sandbox": [ { "x": -16.5156174, diff --git a/src/Spawns/sniperSpawns.json b/src/Spawns/sniperSpawns.json index 9c6aeb0..c569f12 100644 --- a/src/Spawns/sniperSpawns.json +++ b/src/Spawns/sniperSpawns.json @@ -78,29 +78,14 @@ "tarkovstreets": [], "woods": [ { - "x": 107.892273, - "y": -0.4766239, - "z": 114.376709 + "x": -526.0752, + "y": 20.1364822, + "z": -134.8717 }, { - "x": 347.58255, - "y": 8.07130527, - "z": -81.14405 - }, - { - "x": 256.352234, - "y": 29.62652, - "z": -443.1618 - }, - { - "x": -588.0022, - "y": 32.740387, - "z": -149.905914 - }, - { - "x": 83.43207, - "y": 16.8122787, - "z": -148.1193 + "x": 44.6502228, + "y": 4.92170954, + "z": 7.110855 } ], "sandbox": [],