From 1fdd1967e986bb883e3bdb1a235a7bb08a3a35ce Mon Sep 17 00:00:00 2001 From: DanW Date: Sat, 2 Dec 2023 19:41:27 +0000 Subject: [PATCH] Change name of trainArrivalDelaySeconds to clarify its meaning (!171) Changed the name of the new `trainArrivalDelaySeconds` setting to `trainArrivalDelayObservedSeconds` so it's more obvious that it doesn't actually control the train arrival time. `trainArrivalDelayObservedSeconds` is my first choice for naming this setting, and `trainArrivalDelayThatYouDefinitelyShouldNotChangeSoDoNotEvenThinkAboutItSeconds` is my second choice. Co-authored-by: dwesterwick Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/171 Co-authored-by: DanW Co-committed-by: DanW --- project/assets/configs/location.json | 2 +- project/src/models/spt/config/ILocationConfig.ts | 2 +- project/src/services/RaidTimeAdjustmentService.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/assets/configs/location.json b/project/assets/configs/location.json index 049a211f..8f672c80 100644 --- a/project/assets/configs/location.json +++ b/project/assets/configs/location.json @@ -842,7 +842,7 @@ "looseLootBlacklist": {}, "scavRaidTimeSettings": { "settings": { - "trainArrivalDelaySeconds": 90 + "trainArrivalDelayObservedSeconds": 90 }, "maps": { "bigmap": { diff --git a/project/src/models/spt/config/ILocationConfig.ts b/project/src/models/spt/config/ILocationConfig.ts index 292388f4..e59469d0 100644 --- a/project/src/models/spt/config/ILocationConfig.ts +++ b/project/src/models/spt/config/ILocationConfig.ts @@ -115,7 +115,7 @@ export interface IScavRaidTimeSettings export interface IScavRaidTimeConfigSettings { - trainArrivalDelaySeconds: number + trainArrivalDelayObservedSeconds: number } export interface IScavRaidTimeLocationSettings diff --git a/project/src/services/RaidTimeAdjustmentService.ts b/project/src/services/RaidTimeAdjustmentService.ts index a5b7fc68..fbcad8b2 100644 --- a/project/src/services/RaidTimeAdjustmentService.ts +++ b/project/src/services/RaidTimeAdjustmentService.ts @@ -226,7 +226,7 @@ export class RaidTimeAdjustmentService // // I added 2 seconds just to be safe... // - const trainArrivalDelaySeconds = this.locationConfig.scavRaidTimeSettings.settings.trainArrivalDelaySeconds; + const trainArrivalDelaySeconds = this.locationConfig.scavRaidTimeSettings.settings.trainArrivalDelayObservedSeconds; // Determine the earliest possible time in the raid when the train would leave const earliestPossibleDepartureMinutes = (exit.MinTime + exit.Count + exit.ExfiltrationTime + trainArrivalDelaySeconds) / 60;