@rpg-engine/long-bow 0.8.119 → 0.8.121

package/package.json

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

package/src/components/CraftBook/CraftBook.tsx

@@ -208,7 +208,6 @@ export const CraftBook: React.FC<IItemCraftSelectorProps> = ({
                     scale={scale}
                     handleRecipeSelect={setCraftItemKey.bind(null, item.key)}
                     selectedCraftItemKey={craftItemKey}
-                    inventory={inventory}
                     skills={skills}
                   />
                 </CraftingRecipeWrapper>

package/src/components/CraftBook/CraftingRecipe.tsx

@@ -1,7 +1,6 @@
 import {
   ICraftableItem,
   IEquipmentSet,
-  IItemContainer,
   ISkill,
 } from '@rpg-engine/shared';
 import React, { useEffect, useRef, useState } from 'react';
@@ -20,7 +19,6 @@ interface ICraftingRecipeProps {
   scale?: number;
   handleRecipeSelect: () => void;
   selectedCraftItemKey?: string;
-  inventory?: IItemContainer | null;
   skills?: ISkill | null;
 }
 
@@ -71,7 +69,6 @@ export const CraftingRecipe: React.FC<ICraftingRecipeProps> = ({
   scale,
   handleRecipeSelect,
   selectedCraftItemKey,
-  inventory,
   skills,
 }) => {
   const [showTooltip, setShowTooltip] = useState(false);
@@ -150,7 +147,6 @@ export const CraftingRecipe: React.FC<ICraftingRecipeProps> = ({
             x={tooltipPosition.x}
             y={tooltipPosition.y}
             recipe={recipe}
-            inventory={inventory}
             skills={skills}
             atlasIMG={atlasIMG}
             atlasJSON={atlasJSON}

package/src/components/CraftBook/CraftingTooltip.tsx

@@ -1,8 +1,7 @@
-import { ICraftableItem, IItemContainer, ISkill } from '@rpg-engine/shared';
+import { ICraftableItem, ISkill } from '@rpg-engine/shared';
 import React, { useEffect, useRef } from 'react';
 import styled from 'styled-components';
 import { uiColors } from '../../constants/uiColors';
-import { countItemFromInventory } from '../../libs/itemCounter';
 import { SpriteFromAtlas } from '../shared/SpriteFromAtlas';
 import { modifyString } from './utils/modifyString';
 
@@ -10,7 +9,6 @@ interface ICraftingTooltipProps {
   x: number;
   y: number;
   recipe: ICraftableItem;
-  inventory?: IItemContainer | null;
   skills?: ISkill | null;
   atlasIMG: any;
   atlasJSON: any;
@@ -85,7 +83,6 @@ export const CraftingTooltip: React.FC<ICraftingTooltipProps> = ({
   x,
   y,
   recipe,
-  inventory,
   skills,
   atlasIMG,
   atlasJSON,
@@ -144,10 +141,7 @@ export const CraftingTooltip: React.FC<ICraftingTooltipProps> = ({
 
       <TooltipTitle>Ingredients</TooltipTitle>
       {recipe.ingredients.map((ingredient, index) => {
-        const itemQtyInInventory = !inventory
-          ? 0
-          : countItemFromInventory(ingredient.key, inventory);
-        const isQuantityOk = ingredient.qty <= itemQtyInInventory;
+        const isQuantityOk = ingredient.qty <= ingredient.qtyInInventory;
 
         return (
           <Recipe key={index}>
@@ -159,7 +153,7 @@ export const CraftingTooltip: React.FC<ICraftingTooltipProps> = ({
             />
             <Ingredient isQuantityOk={isQuantityOk}>
               {modifyString(ingredient.key)} x{ingredient.qty} (
-              {itemQtyInInventory})
+              {ingredient.qtyInInventory})
             </Ingredient>
           </Recipe>
         );

package/src/components/CraftBook/MockItems.ts

@@ -11,18 +11,21 @@ export const craftableItems: ICraftableItem[] = [
         name: 'leather',
         qty: 5,
         texturePath: 'crafting-resources/leather.png',
+        qtyInInventory: 10,
       },
       {
         key: 'leather1',
         name: 'leather',
         qty: 10,
         texturePath: 'crafting-resources/leather.png',
+        qtyInInventory: 5,
       },
       {
         key: 'leather2',
         name: 'leather',
         qty: 100,
         texturePath: 'crafting-resources/leather.png',
+        qtyInInventory: 0,
       },
     ],
     minCraftingRequirements: ['blacksmithing', 4],
@@ -37,6 +40,7 @@ export const craftableItems: ICraftableItem[] = [
         name: 'leather',
         qty: 10,
         texturePath: 'crafting-resources/leather.png',
+        qtyInInventory: 15,
       },
     ],
     minCraftingRequirements: ['blacksmithing', 4],
@@ -51,6 +55,7 @@ export const craftableItems: ICraftableItem[] = [
         name: 'leather',
         qty: 10,
         texturePath: 'crafting-resources/leather.png',
+        qtyInInventory: 15,
       },
     ],
     minCraftingRequirements: ['blacksmithing', 4],
@@ -65,6 +70,7 @@ export const craftableItems: ICraftableItem[] = [
         name: 'leather',
         qty: 10,
         texturePath: 'crafting-resources/leather.png',
+        qtyInInventory: 15,
       },
     ],
     minCraftingRequirements: ['blacksmithing', 4],
@@ -79,6 +85,7 @@ export const craftableItems: ICraftableItem[] = [
         name: 'leather',
         qty: 10,
         texturePath: 'crafting-resources/leather.png',
+        qtyInInventory: 15,
       },
     ],
     minCraftingRequirements: ['blacksmithing', 1],
@@ -93,6 +100,7 @@ export const craftableItems: ICraftableItem[] = [
         name: 'leather',
         qty: 10,
         texturePath: 'crafting-resources/leather.png',
+        qtyInInventory: 15,
       },
     ],
     minCraftingRequirements: ['blacksmithing', 4],

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;
 };