From 153776f7e99f0e61efd8ef714953ee91ae1859ec Mon Sep 17 00:00:00 2001
From: chomp <chomp@noreply.dev.sp-tarkov.com>
Date: Mon, 6 Mar 2023 09:13:07 +0000
Subject: [PATCH] Fix: workaround for broken wall (!24)

Co-authored-by: Dev <dev@noreply.dev.sp-tarkov.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/24
---
 project/assets/database/hideout/areas.json | 72 +++++++++++++++++++---
 project/src/helpers/HideoutHelper.ts       | 49 ++++-----------
 2 files changed, 74 insertions(+), 47 deletions(-)

diff --git a/project/assets/database/hideout/areas.json b/project/assets/database/hideout/areas.json
index 265598bc..14e0f603 100644
--- a/project/assets/database/hideout/areas.json
+++ b/project/assets/database/hideout/areas.json
@@ -3874,16 +3874,6 @@
         "improvements": []
       },
       "1": {
-        "requirements": [],
-        "bonuses": [],
-        "slots": 0,
-        "constructionTime": 0,
-        "description": "",
-        "autoUpgrade": true,
-        "displayInterface": true,
-        "improvements": []
-      },
-      "2": {
         "requirements": [],
         "bonuses": [
           {
@@ -3982,6 +3972,68 @@
           }
         ]
       },
+      "2": {
+        "requirements": [],
+        "bonuses": [],
+        "slots": 0,
+        "constructionTime": 43200,
+        "description": "",
+        "autoUpgrade": true,
+        "displayInterface": true,
+        "improvements": [
+          {
+            "id": "639199277a9178252d38c98f",
+            "requirements": [
+              {
+                "templateId": "5e2af47786f7746d404f3aaa",
+                "count": 1,
+                "isFunctional": false,
+                "isEncoded": false,
+                "type": "Item"
+              }
+            ],
+            "bonuses": [
+              {
+                "value": -2,
+                "passive": true,
+                "production": false,
+                "visible": true,
+                "type": "FuelConsumption"
+              },
+              {
+                "value": 2,
+                "passive": true,
+                "production": false,
+                "visible": true,
+                "type": "EnergyRegeneration"
+              },
+              {
+                "value": 2,
+                "passive": true,
+                "production": false,
+                "visible": true,
+                "type": "HealthRegeneration"
+              },
+              {
+                "value": 2,
+                "passive": true,
+                "production": false,
+                "visible": true,
+                "type": "ExperienceRate"
+              },
+              {
+                "value": 2,
+                "passive": true,
+                "production": false,
+                "visible": true,
+                "skillType": "Physical",
+                "type": "SkillGroupLevelingBoost"
+              }
+            ],
+            "improvementTime": 120
+          }
+        ]
+      },
       "3": {
         "requirements": [],
         "bonuses": [
diff --git a/project/src/helpers/HideoutHelper.ts b/project/src/helpers/HideoutHelper.ts
index 7f124b78..f1d232ea 100644
--- a/project/src/helpers/HideoutHelper.ts
+++ b/project/src/helpers/HideoutHelper.ts
@@ -914,53 +914,28 @@ export class HideoutHelper
                 return;
             }
 
-            // Not currently moppable, upgrade to moppable state
-            if (wall.level <= 1)
+            if (wall.level === 0)
             {
-                const newWallLevel = 2;
-                this.logger.debug(`${this.hideoutConfig.hideoutWallAppearTimeSeconds} seconds have passed since profile creation, upgrading hideout wall from level: ${wall.level} to ${newWallLevel}`);
-                wall.level = newWallLevel;
-                wall.constructing = false;
-                // 0 = no wall
-                // 1 = "wall may be a problem is future"
-                // 2 - Interactable wall
-                // 3 - Smashable wall
-                // 4 - Installable door
+                wall.level++;
 
                 return;
             }
 
-            // Moppable level, upgrade if mopping complete to smashable state
-            if (wall.level === 2)
+            if (wall.level === 1)
             {
                 if (this.hideoutImprovementIsComplete(pmcProfile.Hideout.Improvements["639199277a9178252d38c98f"]))
                 {
-                    this.logger.debug("Hideout wall stage 2 has completed improvement, upgrading to level 3");
+                    this.logger.debug("Improvement 639199277a9178252d38c98f found, upgrading hideout wall from level: 1 to 3");
+                    wall.level = 3;
                     wall.constructing = false;
-                    wall.level++;
-
-                    return;
+                    // 0 = no wall | Idle State
+                    // 1 - EATS EVERYTHING without areas.json change to include improvements
+                    // 2 - Should be Moppable wall / Interactable wall While Constructing = true Sledgehammer is Smashable 
+                    // 2 - While false UI is broken. While true mimics level 3 hideout
+                    // 3 - Smashable wall / Sledgehammer
+                    // 4 - Installable door
                 }
-            }
-
-            // Can be smashed
-            if (wall.level === 3)
-            {
-                // Second mopping, not used to allow upgrade to stage 4 (Improvement id = 639199277a9178252d38c990)
-                return;
-            }
-
-            // Can be repaired
-            if (wall.level === 4)
-            {
-                // Third mopping, not used to allow upgrade to stage 5 (improvement id = 639199277a9178252d38c991)
-                return;
-            }
-
-            // Tidy up
-            if (wall.level === 5)
-            {
-                // Fourth mopping possible, not used to allow upgrade to stage 6 (improvement id = 639199277a9178252d38c992)
+                
                 return;
             }
         }