@rpg-engine/long-bow 0.8.119 → 0.8.121

package/dist/components/CraftBook/CraftingRecipe.d.ts

@@ -1,4 +1,4 @@
-import { ICraftableItem, IEquipmentSet, IItemContainer, ISkill } from '@rpg-engine/shared';
+import { ICraftableItem, IEquipmentSet, ISkill } from '@rpg-engine/shared';
 import React from 'react';
 interface ICraftingRecipeProps {
     atlasJSON: any;
@@ -8,7 +8,6 @@ interface ICraftingRecipeProps {
     scale?: number;
     handleRecipeSelect: () => void;
     selectedCraftItemKey?: string;
-    inventory?: IItemContainer | null;
     skills?: ISkill | null;
 }
 export declare const CraftingRecipe: React.FC<ICraftingRecipeProps>;

package/dist/components/CraftBook/CraftingTooltip.d.ts

@@ -1,10 +1,9 @@
-import { ICraftableItem, IItemContainer, ISkill } from '@rpg-engine/shared';
+import { ICraftableItem, ISkill } from '@rpg-engine/shared';
 import React from 'react';
 interface ICraftingTooltipProps {
     x: number;
     y: number;
     recipe: ICraftableItem;
-    inventory?: IItemContainer | null;
     skills?: ISkill | null;
     atlasIMG: any;
     atlasJSON: any;

package/dist/long-bow.cjs.development.js

@@ -28852,23 +28852,6 @@ var ItemInfoWrapper = function ItemInfoWrapper(_ref) {
   }));
 };
 
-var countItemFromInventory = function countItemFromInventory(itemKey, inventory) {
-  var itemsFromInventory = [];
-  if (inventory) {
-    Object.keys(inventory.slots).forEach(function (i) {
-      var _inventory$slots$inde;
-      var index = parseInt(i);
-      if (((_inventory$slots$inde = inventory.slots[index]) == null ? void 0 : _inventory$slots$inde.key) === itemKey) {
-        itemsFromInventory.push(inventory.slots[index]);
-      }
-    });
-  }
-  var totalQty = itemsFromInventory.reduce(function (acc, item) {
-    return acc + ((item == null ? void 0 : item.stackQty) || 1);
-  }, 0);
-  return totalQty;
-};
-
 var modifyString = function modifyString(str) {
   var parts = str.split('/');
   var fileName = parts[parts.length - 1];
@@ -28917,7 +28900,6 @@ var CraftingTooltip = function CraftingTooltip(_ref3) {
   var x = _ref3.x,
     y = _ref3.y,
     recipe = _ref3.recipe,
-    inventory = _ref3.inventory,
     skills = _ref3.skills,
     atlasIMG = _ref3.atlasIMG,
     atlasJSON = _ref3.atlasJSON;
@@ -28965,8 +28947,7 @@ var CraftingTooltip = function CraftingTooltip(_ref3) {
   }, React__default.createElement(TooltipTitle, null, "Skill Requirements"), React__default.createElement(MinCraftingRequirementsText, {
     levelIsOk: levelIsOk
   }, modifyString("" + ((_recipe$minCraftingRe3 = recipe == null ? void 0 : (_recipe$minCraftingRe4 = recipe.minCraftingRequirements) == null ? void 0 : _recipe$minCraftingRe4[0]) != null ? _recipe$minCraftingRe3 : '')), " lvl", ' ', (_recipe$minCraftingRe5 = recipe == null ? void 0 : (_recipe$minCraftingRe6 = recipe.minCraftingRequirements) == null ? void 0 : _recipe$minCraftingRe6[1]) != null ? _recipe$minCraftingRe5 : 0, " (", levelInSkill, ")"), React__default.createElement(TooltipTitle, null, "Ingredients"), recipe.ingredients.map(function (ingredient, index) {
-    var itemQtyInInventory = !inventory ? 0 : countItemFromInventory(ingredient.key, inventory);
-    var isQuantityOk = ingredient.qty <= itemQtyInInventory;
+    var isQuantityOk = ingredient.qty <= ingredient.qtyInInventory;
     return React__default.createElement(Recipe, {
       key: index
     }, React__default.createElement(SpriteFromAtlas, {
@@ -28976,7 +28957,7 @@ var CraftingTooltip = function CraftingTooltip(_ref3) {
       imgScale: 1.2
     }), React__default.createElement(Ingredient, {
       isQuantityOk: isQuantityOk
-    }, modifyString(ingredient.key), " x", ingredient.qty, " (", itemQtyInInventory, ")"));
+    }, modifyString(ingredient.key), " x", ingredient.qty, " (", ingredient.qtyInInventory, ")"));
   }));
 };
 
@@ -29004,7 +28985,6 @@ var CraftingRecipe = function CraftingRecipe(_ref) {
     scale = _ref.scale,
     handleRecipeSelect = _ref.handleRecipeSelect,
     selectedCraftItemKey = _ref.selectedCraftItemKey,
-    inventory = _ref.inventory,
     skills = _ref.skills;
   var _useState = React.useState(false),
     showTooltip = _useState[0],
@@ -29067,7 +29047,6 @@ var CraftingRecipe = function CraftingRecipe(_ref) {
     x: tooltipPosition.x,
     y: tooltipPosition.y,
     recipe: recipe,
-    inventory: inventory,
     skills: skills,
     atlasIMG: atlasIMG,
     atlasJSON: atlasJSON
@@ -29109,20 +29088,40 @@ var useResponsiveSize = function useResponsiveSize(scale) {
   return size;
 };
 
+var _countItemFromInventory = function countItemFromInventory(itemKey, inventory) {
+  var totalQty = 0;
+  if (!inventory) {
+    return totalQty;
+  }
+  Object.keys(inventory.slots).forEach(function (i) {
+    var index = parseInt(i);
+    var 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;
+};
+
 function calculateMaxCraftable(recipe, inventory) {
   var _recipe$ingredients$r;
   if (!inventory || !(recipe != null && recipe.ingredients)) {
     return 0;
   }
   return (_recipe$ingredients$r = recipe.ingredients.reduce(function (maxPossible, ingredient) {
-    var _inventoryItem$stackQ;
-    var inventoryItem = Object.values(inventory.slots).find(function (item) {
-      return (item == null ? void 0 : item.key) === ingredient.key;
-    });
-    if (!inventoryItem) {
+    var totalQty = _countItemFromInventory(ingredient.key, inventory);
+    if (totalQty === 0) {
       return 0;
     }
-    var possibleWithThisIngredient = Math.floor(((_inventoryItem$stackQ = inventoryItem.stackQty) != null ? _inventoryItem$stackQ : 0) / ingredient.qty);
+    var possibleWithThisIngredient = Math.floor(totalQty / ingredient.qty);
     return maxPossible === undefined ? possibleWithThisIngredient : Math.min(maxPossible, possibleWithThisIngredient);
   }, undefined)) != null ? _recipe$ingredients$r : 0;
 }
@@ -29268,7 +29267,6 @@ var CraftBook = function CraftBook(_ref) {
       scale: scale,
       handleRecipeSelect: setCraftItemKey.bind(null, item.key),
       selectedCraftItemKey: craftItemKey,
-      inventory: inventory,
       skills: skills
     }));
   })) : React__default.createElement(EmptyState, null, React__default.createElement(fa.FaBoxOpen, {
@@ -36425,7 +36423,7 @@ var Shortcuts = function Shortcuts(_ref) {
           }
         });
       }
-      var totalQty = _payload && inventory ? countItemFromInventory(_payload.key, inventory) : 0;
+      var totalQty = _payload && inventory ? _countItemFromInventory(_payload.key, inventory) : 0;
       return React__default.createElement(StyledShortcut$1, {
         key: i,
         onPointerDown: handleShortcutCast.bind(null, i),