From 5ab3ee722ecdfa848cf202b3ea4b152dd5072933 Mon Sep 17 00:00:00 2001 From: DrakiaXYZ Date: Wed, 20 Nov 2024 09:20:59 +0000 Subject: [PATCH 1/2] Fix issues caused when having NewSpawn enabled (!430) - When NewSpawn is active, clear spawn waves sent to the client - Copy `maxBotCap` to both BotMaxPvE and BotMax, as the client only reads BotMax These changes cause bots to abide by the NewSpawn parameters when NewSpawn is enabled, as previously it was combining bot waves and dynamic spawning resulting in bots instantly respawning Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com> Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/430 Co-authored-by: DrakiaXYZ Co-committed-by: DrakiaXYZ --- project/src/services/LocationLifecycleService.ts | 6 ++++++ project/src/services/PostDbLoadService.ts | 1 + 2 files changed, 7 insertions(+) diff --git a/project/src/services/LocationLifecycleService.ts b/project/src/services/LocationLifecycleService.ts index 1d5ce6f1..988a0ca0 100644 --- a/project/src/services/LocationLifecycleService.ts +++ b/project/src/services/LocationLifecycleService.ts @@ -270,6 +270,12 @@ export class LocationLifecycleService { return locationBaseClone; } + // If new spawn system is enabled, clear the spawn waves + if (locationBaseClone.NewSpawn) + { + locationBaseClone.waves = []; + } + // We only need the base data if (!generateLoot) { return locationBaseClone; diff --git a/project/src/services/PostDbLoadService.ts b/project/src/services/PostDbLoadService.ts index 0b81e4ca..15b5b038 100644 --- a/project/src/services/PostDbLoadService.ts +++ b/project/src/services/PostDbLoadService.ts @@ -296,6 +296,7 @@ export class PostDbLoadService { } map.base.BotMaxPvE = this.botConfig.maxBotCap[locationKey]; + map.base.BotMax = this.botConfig.maxBotCap[locationKey]; // make values no larger than 30 secs map.base.BotStart = Math.min(map.base.BotStart, 30); From b72bc87094b9f7a208ca7a24ac14a5047e869717 Mon Sep 17 00:00:00 2001 From: theStraxus Date: Wed, 20 Nov 2024 09:22:06 +0000 Subject: [PATCH 2/2] Update project/assets/configs/hideout.json (!431) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding missing cultist circle recipes from Live (checked against https://www.cultistcircle.com/recipes): USEC operative figurine for HighCom Trooper TFO body armor (MultiCam) Dundukk sport sunglasses for Axel parrot figurine Soap for Awl Zarya stun grenade for Light bulb ×2 LEDX Skin Transilluminator for TerraGroup "Blue Folders" materials Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/431 Co-authored-by: theStraxus Co-committed-by: theStraxus --- project/assets/configs/hideout.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/project/assets/configs/hideout.json b/project/assets/configs/hideout.json index 103f198f..3b320b01 100644 --- a/project/assets/configs/hideout.json +++ b/project/assets/configs/hideout.json @@ -68,7 +68,15 @@ "5e2aedd986f7746d404f3aa4" ], "craftTimeSeconds": 43260 - } + }, + "655c663a6689c676ce57af85": { "rewardTpls": ["5c0e655586f774045612eeb2"], "craftTimeSeconds": 3960 }, + "5aa2b986e5b5b00014028f4c": { "rewardTpls": ["62a091170b9d3c46de5b6cf2"], "craftTimeSeconds": 3960 }, + "5c13cd2486f774072c757944": { "rewardTpls": ["62a0a098de7ac8199358053b"], "craftTimeSeconds": 3960 }, + "5a0c27731526d80618476ac4": { + "rewardTpls": ["5d1b392c86f77425243e98fe", "5d1b392c86f77425243e98fe"], + "craftTimeSeconds": 3960 + }, + "5c0530ee86f774697952d952": { "rewardTpls": ["6389c8c5dbfd5e4b95197e6b"], "craftTimeSeconds": 39960 } }, "directRewardStackSize": { "exampleParentId": { "min": 1000, "max": 50000 }