From b1605b20feb008bd116cd7cb6f3493f2ee195d5c Mon Sep 17 00:00:00 2001
From: Dev <dev@noreply.dev.sp-tarkov.com>
Date: Sun, 23 Apr 2023 19:40:42 +0100
Subject: [PATCH] Centralise time elapsed code in hideouthelper into one
 function

---
 project/src/helpers/HideoutHelper.ts | 64 ++++++++++++----------------
 1 file changed, 28 insertions(+), 36 deletions(-)

diff --git a/project/src/helpers/HideoutHelper.ts b/project/src/helpers/HideoutHelper.ts
index d24e50c0..09c00455 100644
--- a/project/src/helpers/HideoutHelper.ts
+++ b/project/src/helpers/HideoutHelper.ts
@@ -41,7 +41,6 @@ export class HideoutHelper
     public static bitcoin = "59faff1d86f7746c51718c9c";
     public static expeditionaryFuelTank = "5d1b371186f774253763a656";
     public static maxSkillPoint = 5000;
-    private static generatorOffMultipler = 0.2;
 
     protected hideoutConfig: IHideoutConfig;
 
@@ -208,12 +207,7 @@ export class HideoutHelper
      */
     protected updateWaterCollectorProductionTimer(pmcData: IPmcData, productionId: string, hideoutProperties: { btcFarmCGs?: number; isGeneratorOn: boolean; waterCollectorHasFilter: boolean; }): void
     {
-        let timeElapsed = (this.timeUtil.getTimestamp() - pmcData.Hideout.sptUpdateLastRunTimestamp);
-        if (!hideoutProperties.isGeneratorOn)
-        {
-            timeElapsed = Math.floor(timeElapsed * HideoutHelper.generatorOffMultipler);
-        }
-
+        const timeElapsed = this.getTimeElapsedSinceLastServerTick(pmcData, hideoutProperties.isGeneratorOn);
         if (hideoutProperties.waterCollectorHasFilter)
         {
 
@@ -290,12 +284,7 @@ export class HideoutHelper
         }
 
         // Get seconds since last hideout update + now
-        let timeElapsed = this.timeUtil.getTimestamp() - pmcData.Hideout.sptUpdateLastRunTimestamp;
-        if (!hideoutProperties.isGeneratorOn)
-        {
-            // Adjust for running without fuel
-            timeElapsed *= this.databaseServer.getTables().hideout.settings.generatorSpeedWithoutFuel;
-        }
+        const timeElapsed = this.getTimeElapsedSinceLastServerTick(pmcData, hideoutProperties.isGeneratorOn);
 
         // Increment progress by time passed
         pmcData.Hideout.Production[prodId].Progress += timeElapsed;
@@ -572,24 +561,15 @@ export class HideoutHelper
         return waterFilterArea;
     }
 
+
+
     /**
-     * Get number of ticks that have passed since hideout areas were last processed, reduced when generator is off
-     * @param pmcData Player profile
-     * @param isGeneratorOn Is the generator on for the duration of elapsed time
-     * @returns Amount of time elapsed in seconds
+     * Create a upd object using passed in parameters
+     * @param stackCount 
+     * @param resourceValue 
+     * @param resourceUnitsConsumed 
+     * @returns Upd
      */
-    protected getTimeElapsedSinceLastServerTick(pmcData: IPmcData, isGeneratorOn: boolean): number
-    {
-        // Reduce time elapsed (and progress) when generator is off
-        let timeElapsed = this.timeUtil.getTimestamp() - pmcData.Hideout.sptUpdateLastRunTimestamp;
-        if (!isGeneratorOn)
-        {
-            timeElapsed = Math.floor(timeElapsed * HideoutHelper.generatorOffMultipler);
-        }
-
-        return timeElapsed;
-    }
-
     protected getAreaUpdObject(stackCount: number, resourceValue: number, resourceUnitsConsumed: number): Upd
     {
         return {
@@ -679,13 +659,7 @@ export class HideoutHelper
 
         if (this.isProduction(btcProd))
         {
-            let timeElapsedSeconds = this.timeUtil.getTimestamp() - pmcData.Hideout.sptUpdateLastRunTimestamp;
-            if (!isGeneratorOn)
-            {
-                // Generator off, reduce time elapsed
-                timeElapsedSeconds = Math.floor(timeElapsedSeconds * HideoutHelper.generatorOffMultipler);
-            }
-
+            const timeElapsedSeconds = this.getTimeElapsedSinceLastServerTick(pmcData, isGeneratorOn);
             btcProd.Progress += timeElapsedSeconds;
 
             // The wiki has a wrong formula!
@@ -753,6 +727,24 @@ export class HideoutHelper
         }
     }
 
+    /**
+     * Get number of ticks that have passed since hideout areas were last processed, reduced when generator is off
+     * @param pmcData Player profile
+     * @param isGeneratorOn Is the generator on for the duration of elapsed time
+     * @returns Amount of time elapsed in seconds
+     */
+    protected getTimeElapsedSinceLastServerTick(pmcData: IPmcData, isGeneratorOn: boolean): number
+    {
+        // Reduce time elapsed (and progress) when generator is off
+        let timeElapsed = this.timeUtil.getTimestamp() - pmcData.Hideout.sptUpdateLastRunTimestamp;
+        if (!isGeneratorOn)
+        {
+            timeElapsed *= this.databaseServer.getTables().hideout.settings.generatorSpeedWithoutFuel;
+        }
+
+        return timeElapsed;
+    }
+
     /**
      * Get a count of how many BTC can be gathered by the profile
      * @param pmcData Profile to look up