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

Fix: workaround for broken wall (!24)

Browse Source 
Co-authored-by: Dev <dev@noreply.dev.sp-tarkov.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/24
This commit is contained in:
chomp 2023-03-06 09:13:07 +00:00
parent bb6751fca7
commit 153776f7e9
2 changed files with 74 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
project/assets/database/hideout/areas.json
View File

@ -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": [

55
project/src/helpers/HideoutHelper.ts
View File

@ -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
return;
}
// Moppable level, upgrade if mopping complete to smashable state
if (wall.level === 2)
{
if (this.hideoutImprovementIsComplete(pmcProfile.Hideout.Improvements["639199277a9178252d38c98f"]))
{
this.logger.debug("Hideout wall stage 2 has completed improvement, upgrading to level 3");
wall.constructing = false;
wall.level++;
return;
}
if (wall.level === 1)
{
if (this.hideoutImprovementIsComplete(pmcProfile.Hideout.Improvements["639199277a9178252d38c98f"]))
{
this.logger.debug("Improvement 639199277a9178252d38c98f found, upgrading hideout wall from level: 1 to 3");
wall.level = 3;
wall.constructing = false;
// 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;
}
}