From 28ab029ef3fa3e2c94d260933f0fe6bc033832ad Mon Sep 17 00:00:00 2001 From: Kaeno Date: Sun, 11 Feb 2024 17:31:52 +0000 Subject: [PATCH] Fixed ammo boxes again. location starts at highest count instead of lowest --- project/src/helpers/ItemHelper.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/project/src/helpers/ItemHelper.ts b/project/src/helpers/ItemHelper.ts index 5e9f9995..5aea667d 100644 --- a/project/src/helpers/ItemHelper.ts +++ b/project/src/helpers/ItemHelper.ts @@ -1047,11 +1047,10 @@ export class ItemHelper // Add new stack-size-correct items to ammo box let currentStoredCartridgeCount = 0; - // Location in ammoBox cartridges will be placed - let location = 0; const maxPerStack = Math.min(ammoBoxMaxCartridgeCount, cartridgeMaxStackSize); + // Find location based on Max ammo box size + let location = Math.ceil(ammoBoxMaxCartridgeCount / maxPerStack) - 1; - const ammoStacksToAdd: Item[] = []; while (currentStoredCartridgeCount < ammoBoxMaxCartridgeCount) { const remainingSpace = ammoBoxMaxCartridgeCount - currentStoredCartridgeCount; @@ -1072,15 +1071,11 @@ export class ItemHelper delete cartridgeItemToAdd.location; } - ammoStacksToAdd.push(cartridgeItemToAdd); + ammoBox.push(cartridgeItemToAdd); currentStoredCartridgeCount += cartridgeCountToAdd; - location++; + location--; } - - // Ammo must be reversed so location 2 goes first, then location 1 etc, prevents being unable to open ammo boxes in live in one click - ammoStacksToAdd.reverse(); - ammoBox.push(...ammoStacksToAdd); } /**