From 5929e873e14d1303930da0fb68ebc08b847ad9f1 Mon Sep 17 00:00:00 2001 From: Dev Date: Wed, 8 Nov 2023 12:05:57 +0000 Subject: [PATCH 1/3] Force CPSU part 2 journal quest item as single spawn --- project/assets/configs/location.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/assets/configs/location.json b/project/assets/configs/location.json index b03508f1..6ed8df05 100644 --- a/project/assets/configs/location.json +++ b/project/assets/configs/location.json @@ -716,7 +716,8 @@ "64e73909cd54ef0580746af3", "64e74a2fc2b4f829615ec332", "64e74a274d49d23b2c39d317", - "64f09c02b63b74469b6c149f" + "64f09c02b63b74469b6c149f", + "64f07f7726cfa02c506f8ac0" ], "laboratory": [ "6398a4cfb5992f573c6562b3", From a2970be193cd1938c61980d7c0d8bfd2a03d86ae Mon Sep 17 00:00:00 2001 From: Dev Date: Wed, 8 Nov 2023 12:08:33 +0000 Subject: [PATCH 2/3] lint config --- project/assets/configs/location.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/assets/configs/location.json b/project/assets/configs/location.json index 6ed8df05..7d938606 100644 --- a/project/assets/configs/location.json +++ b/project/assets/configs/location.json @@ -717,7 +717,7 @@ "64e74a2fc2b4f829615ec332", "64e74a274d49d23b2c39d317", "64f09c02b63b74469b6c149f", - "64f07f7726cfa02c506f8ac0" + "64f07f7726cfa02c506f8ac0" ], "laboratory": [ "6398a4cfb5992f573c6562b3", From 4580c1cea803a55b4f089df1784716ddd13f6608 Mon Sep 17 00:00:00 2001 From: Dev Date: Wed, 8 Nov 2023 16:17:14 +0000 Subject: [PATCH 3/3] FIx hideout crafts flaged as `needFuelForAllProductionTime` not progressing --- project/src/helpers/HideoutHelper.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/project/src/helpers/HideoutHelper.ts b/project/src/helpers/HideoutHelper.ts index dba759df..3ceef96c 100644 --- a/project/src/helpers/HideoutHelper.ts +++ b/project/src/helpers/HideoutHelper.ts @@ -292,7 +292,9 @@ export class HideoutHelper // Increment progress by time passed 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)) if (!recipe.continuous)