spt/server
spt/server
0
0
Fork 0
mirror of https://github.com/sp-tarkov/server.git synced 2025-02-13 09:50:43 -05:00
Code

Refactoring of small functions for better readability

Browse Source
This commit is contained in:
Dev 2024-06-12 19:33:55 +01:00
parent 9d79aa70eb
commit aac2142706
2 changed files with 64 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
project/src/controllers/GameController.ts
View File

@ -221,8 +221,8 @@ export class GameController
this.adjustLabsRaiderSpawnRate();
this.adjustHideoutCraftTimes();
this.adjustHideoutBuildTimes();
this.adjustHideoutCraftTimes(this.hideoutConfig.overrideCraftTimeSeconds);
this.adjustHideoutBuildTimes(this.hideoutConfig.overrideBuildTimeSeconds);
this.removePraporTestMessage();
@ -250,15 +250,14 @@ export class GameController
// Flea bsg blacklist is off
if (!this.ragfairConfig.dynamic.blacklist.enableBsgList)
{
this.flagAllItemsInDbAsSellableOnFlea();
this.setAllDbItemsAsSellableOnFlea();
}
}
}
protected adjustHideoutCraftTimes(): void
protected adjustHideoutCraftTimes(overrideSeconds: number): void
{
const craftTimeOverrideSeconds = this.hideoutConfig.overrideCraftTimeSeconds;
if (craftTimeOverrideSeconds === -1)
if (overrideSeconds === -1)
{
return;
}
@ -266,31 +265,26 @@ export class GameController
for (const craft of this.databaseService.getHideout().production)
{
// Only adjust crafts ABOVE the override
if (craft.productionTime > craftTimeOverrideSeconds)
{
craft.productionTime = craftTimeOverrideSeconds;
}
craft.productionTime = Math.min(craft.productionTime, overrideSeconds);
}
}
protected adjustHideoutBuildTimes(): void
/**
* Adjust all hideout craft times to be no higher than the override
*/
protected adjustHideoutBuildTimes(overrideSeconds: number): void
{
const craftTimeOverrideSeconds = this.hideoutConfig.overrideBuildTimeSeconds;
if (craftTimeOverrideSeconds === -1)
if (overrideSeconds === -1)
{
return;
}
for (const area of this.databaseService.getHideout().areas)
{
for (const stageKey of Object.keys(area.stages))
for (const stage of Object.values(area.stages))
{
const stage = area.stages[stageKey];
// Only adjust crafts ABOVE the override
if (stage.constructionTime > craftTimeOverrideSeconds)
{
stage.constructionTime = craftTimeOverrideSeconds;
}
stage.constructionTime = Math.min(stage.constructionTime, overrideSeconds);
}
}
}
@ -320,13 +314,14 @@ export class GameController
protected checkTraderRepairValuesExist(): void
{
const traders = this.databaseService.getTraders();
for (const traderKey in traders)
for (const trader of Object.values(traders))
{
const trader = traders[traderKey];
if (!trader?.base?.repair)
{
this.logger.warning(this.localisationService.getText("trader-missing_repair_property_using_default",
{ traderId: trader.base._id, nickname: trader.base.nickname }));
// use ragfair trader as a default
trader.base.repair = this.cloner.clone(traders.ragfair.base.repair);
return;
@ -336,6 +331,8 @@ export class GameController
{
this.logger.warning(this.localisationService.getText("trader-missing_repair_quality_property_using_default",
{ traderId: trader.base._id, nickname: trader.base.nickname }));
// use ragfair trader as a default
trader.base.repair.quality = this.cloner.clone(
traders.ragfair.base.repair.quality,
);
@ -347,7 +344,7 @@ export class GameController
protected addCustomLooseLootPositions(): void
{
const looseLootPositionsToAdd = this.lootConfig.looseLoot;
for (const mapId in looseLootPositionsToAdd)
for (const [mapId, positionsToAdd] of Object.entries(looseLootPositionsToAdd))
{
if (!mapId)
{
@ -364,7 +361,6 @@ export class GameController
continue;
}
const positionsToAdd = looseLootPositionsToAdd[mapId];
for (const positionToAdd of positionsToAdd)
{
// Exists already, add new items to existing positions pool
@ -389,7 +385,7 @@ export class GameController
protected adjustLooseLootSpawnProbabilities(): void
{
const adjustments = this.lootConfig.looseLootSpawnPointAdjustments;
for (const mapId in adjustments)
for (const [mapId, mapAdjustments] of Object.entries(adjustments))
{
const mapLooseLootData = this.databaseService.getLocation(mapId).looseLoot;
if (!mapLooseLootData)
@ -398,19 +394,20 @@ export class GameController
continue;
}
const mapLootAdjustmentsDict = adjustments[mapId];
for (const lootKey in mapLootAdjustmentsDict)
for (const [lootKey, newChanceValue] of Object.entries(mapAdjustments))
{
const lootPostionToAdjust = mapLooseLootData.spawnpoints
.find((spawnPoint) => spawnPoint.template.Id === lootKey);
if (!lootPostionToAdjust)
{
this.logger.warning(this.localisationService.getText("location-unable_to_adjust_loot_position_on_map", { lootKey: lootKey, mapId: mapId }));
this.logger.warning(this.localisationService.getText("location-unable_to_adjust_loot_position_on_map",
{ lootKey: lootKey, mapId: mapId }));
continue;
}
lootPostionToAdjust.probability = mapLootAdjustmentsDict[lootKey];
lootPostionToAdjust.probability = newChanceValue;
}
}
}
@ -580,7 +577,7 @@ export class GameController
}
}
protected flagAllItemsInDbAsSellableOnFlea(): void
protected setAllDbItemsAsSellableOnFlea(): void
{
const dbItems = Object.values(this.databaseService.getItems());
for (const item of dbItems)
@ -731,14 +728,20 @@ export class GameController
*/
protected fixRoguesSpawningInstantlyOnLighthouse(): void
{
const lighthouse = this.databaseService.getLocations().lighthouse!.base;
for (const wave of lighthouse.BossLocationSpawn)
const rogueSpawnDelaySeconds = this.locationConfig.rogueLighthouseSpawnTimeSettings.waitTimeSeconds;
const lighthouse = this.databaseService.getLocations().lighthouse?.base;
if (!lighthouse)
{
// Find Rogues that spawn instantly
if (wave.BossName === "exUsec" && wave.Time === -1)
{
wave.Time = this.locationConfig.rogueLighthouseSpawnTimeSettings.waitTimeSeconds;
}
return;
}
// Find Rogues that spawn instantly
const instantRogueBossSpawns = lighthouse.BossLocationSpawn
.filter((spawn) => spawn.BossName === "exUsec"
&& spawn.Time === -1);
for (const wave of instantRogueBossSpawns)
{
wave.Time = rogueSpawnDelaySeconds;
}
}
@ -858,10 +861,10 @@ export class GameController
const modDetails = activeMods[modKey];
if (
fullProfile.spt.mods.some(
(x) =>
x.author === modDetails.author
&& x.name === modDetails.name
&& x.version === modDetails.version,
(mod) =>
mod.author === modDetails.author
&& mod.name === modDetails.name
&& mod.version === modDetails.version,
)
)
{
@ -977,16 +980,16 @@ export class GameController
protected adjustLabsRaiderSpawnRate(): void
{
const labsBase = this.databaseService.getLocations().laboratory!.base;
const nonTriggerLabsBossSpawns = labsBase.BossLocationSpawn.filter(
(x) => x.TriggerId === "" && x.TriggerName === "",
);
if (nonTriggerLabsBossSpawns)
// Find spawns with empty string for triggerId/TriggerName
const nonTriggerLabsBossSpawns = labsBase.BossLocationSpawn
.filter((bossSpawn) => !bossSpawn.TriggerId
&& !bossSpawn.TriggerName);
for (const boss of nonTriggerLabsBossSpawns)
{
for (const boss of nonTriggerLabsBossSpawns)
{
boss.BossChance = 100;
boss.Time /= 10;
}
boss.BossChance = 100;
boss.Time /= 10;
}
}

30
project/src/generators/LootGenerator.ts
View File

@ -154,7 +154,7 @@ export class LootGenerator
this.itemHelper.armorItemCanHoldMods(preset._encyclopedia),
);
const levelFilteredArmorPresets = armorDefaultPresets.filter((armor) =>
this.armorIsDesiredProtectionLevel(armor, options),
this.isArmorOfDesiredProtectionLevel(armor, options),
);
// Add some armors to rewards
@ -187,27 +187,21 @@ export class LootGenerator
* @param options Loot request options - armor level etc
* @returns True if item has desired armor level
*/
protected armorIsDesiredProtectionLevel(armor: IPreset, options: LootRequest): boolean
protected isArmorOfDesiredProtectionLevel(armor: IPreset, options: LootRequest): boolean
{
const frontPlate = armor._items.find((mod) => mod?.slotId?.toLowerCase() === "front_plate");
if (frontPlate)
const relevantSlots = ["front_plate", "helmet_top", "soft_armor_front"];
for (const slotId of relevantSlots)
{
const plateDb = this.itemHelper.getItem(frontPlate._tpl);
return options.armorLevelWhitelist.includes(Number.parseInt(plateDb[1]._props.armorClass as any));
}
const armorItem = armor._items.find((item) => item?.slotId?.toLowerCase() === slotId);
if (!armorItem)
{
continue;
}
const helmetTop = armor._items.find((mod) => mod?.slotId?.toLowerCase() === "helmet_top");
if (helmetTop)
{
const plateDb = this.itemHelper.getItem(helmetTop._tpl);
return options.armorLevelWhitelist.includes(Number.parseInt(plateDb[1]._props.armorClass as any));
}
const armorDetails = this.itemHelper.getItem(armorItem._tpl);
const armorClass = Number.parseInt(armorDetails[1]._props.armorClass as any, 10);
const softArmorFront = armor._items.find((mod) => mod?.slotId?.toLowerCase() === "soft_armor_front");
if (softArmorFront)
{
const plateDb = this.itemHelper.getItem(softArmorFront._tpl);
return options.armorLevelWhitelist.includes(Number.parseInt(plateDb[1]._props.armorClass as any));
return options.armorLevelWhitelist.includes(armorClass);
}
return false;