From 9f6ec573d642715cd8219f43c765e3d7fea60e2c Mon Sep 17 00:00:00 2001 From: Dev Date: Tue, 22 Oct 2024 16:38:32 +0100 Subject: [PATCH] Removed `fixEmptyBotWavesSettings` - Doesnt seem necessary for 3.10 Disabled `rogueLighthouseSpawnTimeSettings` Same as above --- project/assets/configs/location.json | 6 +--- .../src/models/spt/config/ILocationConfig.ts | 2 -- project/src/services/PostDbLoadService.ts | 35 ------------------- 3 files changed, 1 insertion(+), 42 deletions(-) diff --git a/project/assets/configs/location.json b/project/assets/configs/location.json index 2b2c48a5..2fec90f5 100644 --- a/project/assets/configs/location.json +++ b/project/assets/configs/location.json @@ -255,13 +255,9 @@ "waveSizeThreshold": 4 }, "rogueLighthouseSpawnTimeSettings": { - "enabled": true, + "enabled": false, "waitTimeSeconds": 120 }, - "fixEmptyBotWavesSettings": { - "enabled": true, - "ignoreMaps": ["base", "develop", "hideout", "privatearea", "suburbs", "terminal", "town"] - }, "fitLootIntoContainerAttempts": 3, "addOpenZonesToAllMaps": true, "addCustomBotWavesToMaps": true, diff --git a/project/src/models/spt/config/ILocationConfig.ts b/project/src/models/spt/config/ILocationConfig.ts index 6978980c..a43055c0 100644 --- a/project/src/models/spt/config/ILocationConfig.ts +++ b/project/src/models/spt/config/ILocationConfig.ts @@ -4,8 +4,6 @@ import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig"; export interface ILocationConfig extends IBaseConfig { kind: "spt-location"; - /** Waves with a min/max of the same value don't spawn any bots, bsg only spawn the difference between min and max */ - fixEmptyBotWavesSettings: IFixEmptyBotWavesSettings; /** Rogues are classified as bosses and spawn immediatly, this can result in no scavs spawning, delay rogues spawning to allow scavs to spawn first */ rogueLighthouseSpawnTimeSettings: IRogueLighthouseSpawnTimeSettings; /** When a map has hit max alive bots, any wave that should spawn will be reduced to 1 bot in size and placed in a spawn queue, this splits waves into smaller sizes to reduce the impact of this behaviour */ diff --git a/project/src/services/PostDbLoadService.ts b/project/src/services/PostDbLoadService.ts index fc7449f1..c30a3ce3 100644 --- a/project/src/services/PostDbLoadService.ts +++ b/project/src/services/PostDbLoadService.ts @@ -80,10 +80,6 @@ export class PostDbLoadService { this.adjustLocationBotValues(); - if (this.locationConfig.fixEmptyBotWavesSettings.enabled) { - this.fixBrokenOfflineMapWaves(); - } - if (this.locationConfig.rogueLighthouseSpawnTimeSettings.enabled) { this.fixRoguesSpawningInstantlyOnLighthouse(); } @@ -281,37 +277,6 @@ export class PostDbLoadService { } } - /** - * Waves with an identical min/max values spawn nothing, the number of bots that spawn is the difference between min and max - */ - protected fixBrokenOfflineMapWaves(): void { - const locations = this.databaseService.getLocations(); - for (const locationKey in locations) { - // Skip ignored maps - if (this.locationConfig.fixEmptyBotWavesSettings.ignoreMaps.includes(locationKey)) { - continue; - } - - // Loop over all of the locations waves and look for waves with identical min and max slots - const location: ILocation = locations[locationKey]; - if (!location.base) { - this.logger.warning( - this.localisationService.getText("location-unable_to_fix_broken_waves_missing_base", locationKey), - ); - continue; - } - - for (const wave of location.base.waves ?? []) { - if (wave.slots_max - wave.slots_min === 0) { - this.logger.debug( - `Fixed ${wave.WildSpawnType} Spawn: ${locationKey} wave: ${wave.number} of type: ${wave.WildSpawnType} in zone: ${wave.SpawnPoints} with Max Slots of ${wave.slots_max}`, - ); - wave.slots_max++; - } - } - } - } - /** * Make Rogues spawn later to allow for scavs to spawn first instead of rogues filling up all spawn positions */