470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed configureZombies() not correctly handling factory or sandbox maps

Browse Source
This commit is contained in:
Dev 2024-11-19 19:15:25 +00:00
parent bf8cf20ec8
commit 59eb80f29b
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project/assets/configs/seasonalevents.json
View File

@ -7751,7 +7751,9 @@
"zombieSettings": {
"enabled": true,
"mapInfectionAmount": {
"laboratory": 100
"laboratory": 100,
"factory4": 0,
"Sandbox": 0
},
"disableBosses": [
"laboratory"

1
project/assets/database/locations/sandbox_high/base.json
View File

@ -389,6 +389,7 @@
"CrowdCooldownPerPlayerSec": 300,
"CrowdsLimit": 2,
"InfectedLookCoeff": 2,
"InfectionPercentage": 0,
"MaxCrowdAttackSpawnLimit": 20,
"MinInfectionPercentage": 0,
"MinSpawnDistToPlayer": 50,

34
project/src/services/SeasonalEventService.ts
View File

@ -483,11 +483,18 @@ export class SeasonalEventService {
infectionHalloween.DisplayUIEnabled = true;
infectionHalloween.Enabled = true;
for (const locationKey in zombieSettings.mapInfectionAmount) {
this.databaseService.getLocation(locationKey.toLowerCase()).base.Events.Halloween2024.InfectionPercentage =
zombieSettings.mapInfectionAmount[locationKey];
this.databaseService.getGlobals().LocationInfection[locationKey] =
zombieSettings.mapInfectionAmount[locationKey];
for (const infectedLocationKey in zombieSettings.mapInfectionAmount) {
const mappedLocations = this.getLocationFromInfectedLocation(infectedLocationKey.toLowerCase());
for (const locationKey of mappedLocations) {
this.databaseService.getLocation(
locationKey.toLowerCase(),
).base.Events.Halloween2024.InfectionPercentage =
zombieSettings.mapInfectionAmount[infectedLocationKey];
}
this.databaseService.getGlobals().LocationInfection[infectedLocationKey] =
zombieSettings.mapInfectionAmount[infectedLocationKey];
}
for (const locationId of zombieSettings.disableBosses) {
@ -504,6 +511,23 @@ export class SeasonalEventService {
this.addEventBossesToMaps("halloweenzombies", activeMaps);
}
/**
* BSG store the location ids differently inside `LocationInfection`, need to convert to matching location IDs
* @param infectedLocationKey Key to convert
* @returns Array of locations
*/
protected getLocationFromInfectedLocation(infectedLocationKey: string): string[] {
if (infectedLocationKey === "factory4") {
return ["factory4_day", "factory4_night"];
}
if (infectedLocationKey === "sandbox") {
return ["sandbox", "sandbox_high"];
}
return [infectedLocationKey];
}
protected addEventWavesToMaps(eventType: string): void {
const wavesToAddByMap = this.seasonalEventConfig.eventWaves[eventType.toLowerCase()];