@rpg-engine/long-bow 0.8.119 → 0.8.120

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpg-engine/long-bow",
-  "version": "0.8.119",
+  "version": "0.8.120",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/CraftBook/utils/calculateMaxCraftable.ts

@@ -1,4 +1,5 @@
-import { ICraftableItem, IItem, IItemContainer } from '@rpg-engine/shared';
+import { ICraftableItem, IItemContainer } from '@rpg-engine/shared';
+import { countItemFromInventory } from '../../../libs/itemCounter';
 
 export function calculateMaxCraftable(
   recipe: ICraftableItem | undefined,
@@ -10,17 +11,13 @@ export function calculateMaxCraftable(
 
   return (
     recipe.ingredients.reduce((maxPossible, ingredient) => {
-      const inventoryItem = Object.values(inventory.slots).find(
-        (item): item is IItem => item?.key === ingredient.key
-      );
+      const totalQty = countItemFromInventory(ingredient.key, inventory);
 
-      if (!inventoryItem) {
+      if (totalQty === 0) {
         return 0;
       }
 
-      const possibleWithThisIngredient = Math.floor(
-        (inventoryItem.stackQty ?? 0) / ingredient.qty
-      );
+      const possibleWithThisIngredient = Math.floor(totalQty / ingredient.qty);
 
       return maxPossible === undefined
         ? possibleWithThisIngredient

package/src/libs/itemCounter.ts

@@ -1,22 +1,30 @@
-import { IItem, IItemContainer } from "@rpg-engine/shared";
+import { IItemContainer } from "@rpg-engine/shared";
 
-export const countItemFromInventory = (itemKey: string, inventory: IItemContainer) => {
-  let itemsFromInventory: (IItem | undefined | null)[] = [];
+export const countItemFromInventory = (itemKey: string, inventory: IItemContainer): number => {
+  let totalQty = 0;
 
-  if (inventory) {
-    Object.keys(inventory.slots).forEach(i => {
-      const index = parseInt(i);
-
-      if (inventory.slots[index]?.key === itemKey) {
-        itemsFromInventory.push(inventory.slots[index]);
-      }
-    });
+  if (!inventory) {
+    return totalQty;
   }
 
-  const totalQty = itemsFromInventory.reduce(
-    (acc, item) => acc + (item?.stackQty || 1),
-    0
-  );
+  Object.keys(inventory.slots).forEach(i => {
+    const index = parseInt(i);
+    const item = inventory.slots[index];
+
+    if (!item) {
+      return;
+    }
+
+    // Count matching items
+    if (item.key === itemKey) {
+      totalQty += item.stackQty || 1;
+    }
+
+    // Recursively check nested containers
+    if (item.isItemContainer && item.itemContainer && typeof item.itemContainer !== "string") {
+      totalQty += countItemFromInventory(itemKey, item.itemContainer);
+    }
+  });
 
   return totalQty;
 };