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

Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0

Browse Source
This commit is contained in:
Dev 2023-11-09 14:49:41 +00:00
commit 171d39d5cf
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
project/assets/configs/location.json
View File

@ -716,7 +716,8 @@
"64e73909cd54ef0580746af3", "64e73909cd54ef0580746af3",
"64e74a2fc2b4f829615ec332", "64e74a2fc2b4f829615ec332",
"64e74a274d49d23b2c39d317", "64e74a274d49d23b2c39d317",
"64f09c02b63b74469b6c149f" "64f09c02b63b74469b6c149f",
"64f07f7726cfa02c506f8ac0"
], ],
"laboratory": [ "laboratory": [
"6398a4cfb5992f573c6562b3", "6398a4cfb5992f573c6562b3",

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

@ -292,7 +292,9 @@ export class HideoutHelper
// Increment progress by time passed // Increment progress by time passed
const production = pmcData.Hideout.Production[prodId]; const production = pmcData.Hideout.Production[prodId];
production.Progress += production.needFuelForAllProductionTime ? 0 : timeElapsed; // Some items NEED power to craft (e.g. DSP) production.Progress += (production.needFuelForAllProductionTime && !hideoutProperties.isGeneratorOn)
? 0
: timeElapsed; // Some items NEED power to craft (e.g. DSP)
// Limit progress to total production time if progress is over (dont run for continious crafts)) // Limit progress to total production time if progress is over (dont run for continious crafts))
if (!recipe.continuous) if (!recipe.continuous)