Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding external spawns #12

Merged
merged 28 commits into from
Feb 5, 2025
Merged

Adding external spawns #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0d8d1e3
Moar + Bagels Pre-release
Andrewgdewar Jan 25, 2025
510ed5a
Turn off shoreline
Andrewgdewar Jan 25, 2025
5836db1
Player marker placement working
Andrewgdewar Jan 26, 2025
bab5b76
Update zip
Andrewgdewar Jan 26, 2025
24763be
Functioning
Andrewgdewar Jan 27, 2025
46b2f4e
Shoreline updated
Andrewgdewar Jan 27, 2025
ed95a92
Update dist algorithm
Andrewgdewar Jan 28, 2025
effb89a
Add spawn culler, update player spawns, update customs
Andrewgdewar Jan 29, 2025
7be7354
Add spawn culler, update player spawns, update customs, fix floating …
Andrewgdewar Jan 30, 2025
a91de98
Updated bepinex
Andrewgdewar Jan 30, 2025
9b116b3
added working remove feature
Andrewgdewar Jan 30, 2025
3ef0896
Update woods
Andrewgdewar Jan 30, 2025
fc833f1
Update for weightings
Andrewgdewar Jan 30, 2025
1be2d32
rc5
Andrewgdewar Feb 1, 2025
7b05258
alpha 1
Andrewgdewar Feb 1, 2025
582e2a0
Snipers working
Andrewgdewar Feb 1, 2025
a46b26d
Sniper zones added.
Andrewgdewar Feb 2, 2025
8ba1651
Alpha 2
Andrewgdewar Feb 2, 2025
c004041
Update woods snipe quantity
Andrewgdewar Feb 2, 2025
699235c
RC3, bugfix
Andrewgdewar Feb 2, 2025
bf40c4a
Update marksman timelimit
Andrewgdewar Feb 2, 2025
305f2b4
Fix GZ, fix too many bots on final wave.
Andrewgdewar Feb 4, 2025
fd3ad4c
Alpha 4
Andrewgdewar Feb 4, 2025
c18052f
Set lighthouse back to normal
Andrewgdewar Feb 4, 2025
ee8a1dc
Update maps
Andrewgdewar Feb 4, 2025
890f73f
Add catch for starting PMCS
Andrewgdewar Feb 4, 2025
99cab6f
Update woods snipers
Andrewgdewar Feb 5, 2025
dc35a65
Alpha 5
Andrewgdewar Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/PresetWeightings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
29 changes: 19 additions & 10 deletions config/Presets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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,
Expand All @@ -28,11 +37,11 @@
},
"rogue-invasion": {
"randomRaiderGroup": true,
"randomRaiderGroupChance": 50
"randomRaiderGroupChance": 100
},
"raider-invasion": {
"randomRaiderGroup": true,
"randomRaiderGroupChance": 50
"randomRaiderGroupChance": 100
},
"insanity": {
"scavWaveQuantity": 1.3,
Expand All @@ -41,7 +50,7 @@
"pmcGroupChance": 0.8,
"pmcMaxGroupSize": 6,
"scavMaxGroupSize": 6,
"sniperGroupChance": 1,
"sniperGroupChance": 0.5,
"bossOpenZones": true,
"randomRaiderGroup": true,
"randomRaiderGroupChance": 50,
Expand All @@ -53,10 +62,10 @@
},
"main-boss-roaming": {
"bossOpenZones": true,
"mainBossChanceBuff": 35
"mainBossChanceBuff": 50
},
"sniper-buddies": {
"sniperMaxGroupSize": 2.5,
"sniperMaxGroupSize": 2,
"sniperGroupChance": 1
}
}
3 changes: 3 additions & 0 deletions config/advancedConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ActivateSpawnCullingOnServerStart": false
}
6 changes: 4 additions & 2 deletions config/bossConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@
},
"laboratory": {},
"lighthouse": {
"bossKnight": 30,
"bossPartisan": 30
"exUsec": 35,
"bossKnight": 20,
"bossPartisan": 20,
"bossZryachiy": 30
},
"rezervbase": {
"bossGluhar": 30
Expand Down
12 changes: 6 additions & 6 deletions config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down
80 changes: 53 additions & 27 deletions config/mapConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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
Expand Down
Binary file removed dist/DewardianDev-MOAR-2.7.0.zip
View file
Open in desktop
Binary file not shown.
Binary file added dist/DewardianDev-MOAR-3.0.0-alpha.5.zip
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MOAR",
"version": "2.7.0",
"version": "3.0.0-alpha.5",
"main": "src/mod.js",
"license": "MIT",
"author": "DewardianDev",
Expand Down
2 changes: 1 addition & 1 deletion src/GlobalValues.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions src/GlobalValues.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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[]> = {};
}
Loading
Loading