From a5924dbe0df0da22a7b988594008980ba4e479fb Mon Sep 17 00:00:00 2001 From: Dev Date: Fri, 12 Apr 2024 10:36:24 +0100 Subject: [PATCH] Fix incorrect calculation for normal fence assort count --- project/src/services/FenceService.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/project/src/services/FenceService.ts b/project/src/services/FenceService.ts index 79266ef0..72f422cb 100644 --- a/project/src/services/FenceService.ts +++ b/project/src/services/FenceService.ts @@ -330,9 +330,8 @@ export class FenceService */ protected getCountOfItemsToGenerate(): IFenceAssortGenerationValues { - const rootPresetItems = this.fenceAssort.items.filter((item) => - item.slotId === "hideout" && item.upd.sptPresetId - ); + const allRootItems = this.fenceAssort.items.filter((item) => item.slotId === "hideout"); + const rootPresetItems = allRootItems.filter((item) => item.upd.sptPresetId); // Get count of weapons const currentWeaponPresetCount = rootPresetItems.reduce((count, item) => @@ -347,8 +346,7 @@ export class FenceService }, 0); // Normal item count is total count minus weapon + armor count - const itemAssortCount = Object.keys(this.fenceAssort.loyal_level_items).length - - (currentWeaponPresetCount + currentEquipmentPresetCount); + const itemAssortCount = allRootItems.length - (currentWeaponPresetCount + currentEquipmentPresetCount); // Get counts of items to generate, never let values fall below 0 const itemCountToGenerate = Math.max(this.desiredAssortCounts.normal.item - itemAssortCount, 0);