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

Refactored Bot Generation #1113

Merged
merged 12 commits into from
Feb 17, 2025
Merged

Refactored Bot Generation #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c5246d1
Refactor bot generation to be done more like live, to allow the clien…
DrakiaXYZ Feb 16, 2025
2a54cbe
Remove Existing PMC waves on server start, disabled via config
Feb 16, 2025
a358e3b
First pass at custom pmc wave service - basic waves for factory day only
Feb 16, 2025
8bbfe7b
Run pmc wave code on server start - any changes made to boss waves af…
Feb 16, 2025
c661d0d
Added pmc waves to customs
Feb 16, 2025
169a39b
Added additional pmc waves
Feb 16, 2025
1324565
lint
Feb 16, 2025
5e4119f
Refactor RaidTimeAdjustment to work as server authoritative
DrakiaXYZ Feb 17, 2025
17958d9
Formatting
DrakiaXYZ Feb 17, 2025
7d0aab6
Refactor RaidTimeAdjustment to work as server authoritative (#1112)
chompDev Feb 17, 2025
2c0bd0f
Updated version number in package.json
Feb 17, 2025
206b922
Merge branch '3.11.0-dev' into feat-botgen-refactor
chompDev Feb 17, 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
25 changes: 3 additions & 22 deletions project/assets/configs/bot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@
"bossBoar",
"bossBoarSniper",
"bossKolontay",
"bossPartisan"
"bossPartisan",
"followerBigPipe",
"followerBirdEye"
],
"durability": {
"default": {
Expand Down Expand Up @@ -2954,27 +2956,6 @@
"55d4af3a4bdc2d972f8b456f"
],
"disableLootOnBotTypes": [],
"assaultToBossConversion": {
"bossConvertEnabled": false,
"bossesToConvertToWeights": {
"bossKilla": 1,
"bossSanitar": 1,
"bossTagilla": 1,
"bossBully": 1,
"bossGluhar": 1,
"bossKojaniy": 1,
"bossKolontay": 1,
"bossKnight": 1,
"followerBigPipe": 1,
"followerBirdEye": 1
},
"bossConvertMinMax": {
"assault": {
"min": 100,
"max": 100
}
}
},
"botNameLengthLimit": 19,
"botRolesThatMustHaveUniqueName": ["assault", "pmcusec", "pmcbear"]
}
141 changes: 1 addition & 140 deletions project/assets/configs/location.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,146 +40,7 @@
"town": 1
},
"customWaves": {
"boss": {
"bigmap": [
{
"sptId": "usecbigmap",
"BossChance": 50,
"BossDifficult": "normal",
"BossEscortAmount": "0,0,2,2,2,1,1,1,1,1,0,2,3",
"BossEscortDifficult": "normal",
"BossEscortType": "pmcUSEC",
"BossName": "pmcUSEC",
"BossPlayer": false,
"BossZone": "",
"Delay": 0,
"DependKarma": false,
"DependKarmaPVE": false,
"ForceSpawn": false,
"IgnoreMaxBots": true,
"RandomTimeSpawn": false,
"SpawnMode": ["pve"],
"Supports": null,
"Time": -1,
"TriggerId": "",
"TriggerName": ""
},
{
"sptId": "bearbigmap",
"BossChance": 50,
"BossDifficult": "normal",
"BossEscortAmount": "0,0,2,2,2,1,1,1,1,1,0,2,3",
"BossEscortDifficult": "normal",
"BossEscortType": "pmcBEAR",
"BossName": "pmcBEAR",
"BossPlayer": false,
"BossZone": "",
"Delay": 0,
"DependKarma": false,
"DependKarmaPVE": false,
"ForceSpawn": false,
"IgnoreMaxBots": true,
"RandomTimeSpawn": false,
"SpawnMode": ["pve"],
"Supports": null,
"Time": -1,
"TriggerId": "",
"TriggerName": ""
}
],
"woods": [
{
"sptId": "usecbigmap",
"BossChance": 50,
"BossDifficult": "normal",
"BossEscortAmount": "0,0,2,2,2,1,1,1,1,1,1,2,3",
"BossEscortDifficult": "normal",
"BossEscortType": "pmcUSEC",
"BossName": "pmcUSEC",
"BossPlayer": false,
"BossZone": "",
"Delay": 0,
"DependKarma": false,
"DependKarmaPVE": false,
"ForceSpawn": false,
"IgnoreMaxBots": true,
"RandomTimeSpawn": false,
"SpawnMode": ["pve"],
"Supports": null,
"Time": -1,
"TriggerId": "",
"TriggerName": ""
},
{
"sptId": "bearbigmap",
"BossChance": 50,
"BossDifficult": "normal",
"BossEscortAmount": "0,0,2,2,2,1,1,1,1,1,1,2,3",
"BossEscortDifficult": "normal",
"BossEscortType": "pmcBEAR",
"BossName": "pmcBEAR",
"BossPlayer": false,
"BossZone": "",
"Delay": 0,
"DependKarma": false,
"DependKarmaPVE": false,
"ForceSpawn": false,
"IgnoreMaxBots": true,
"RandomTimeSpawn": false,
"SpawnMode": ["pve"],
"Supports": null,
"Time": -1,
"TriggerId": "",
"TriggerName": ""
}
],
"sandbox_high": [
{
"sptId": "usecbigmap",
"BossChance": 50,
"BossDifficult": "normal",
"BossEscortAmount": "0,0,2,2,2,1,1,1,1,1,0,2,3",
"BossEscortDifficult": "normal",
"BossEscortType": "pmcUSEC",
"BossName": "pmcUSEC",
"BossPlayer": false,
"BossZone": "",
"Delay": 0,
"DependKarma": false,
"DependKarmaPVE": false,
"ForceSpawn": false,
"IgnoreMaxBots": true,
"RandomTimeSpawn": false,
"SpawnMode": ["pve"],
"Supports": null,
"Time": -1,
"TriggerId": "",
"TriggerName": ""
},
{
"sptId": "bearbigmap",
"BossChance": 50,
"BossDifficult": "normal",
"BossEscortAmount": "0,0,2,2,2,1,1,1,1,1,0,2,3",
"BossEscortDifficult": "normal",
"BossEscortType": "pmcBEAR",
"BossName": "pmcBEAR",
"BossPlayer": false,
"BossZone": "",
"Delay": 0,
"DependKarma": false,
"DependKarmaPVE": false,
"ForceSpawn": false,
"IgnoreMaxBots": true,
"RandomTimeSpawn": false,
"SpawnMode": ["pve"],
"Supports": null,
"Time": -1,
"TriggerId": "",
"TriggerName": ""
}
]
},
"boss": {},
"normal": {}
},
"openZones": {},
Expand Down
Loading
Loading