@rpg-engine/long-bow 0.2.43 → 0.2.44

package/dist/components/Item/Inventory/itemContainerHelper.d.ts

@@ -1,6 +1,6 @@
-import { ItemContainerType, ItemType } from '@rpg-engine/shared';
+import { IItem, ItemContainerType } from '@rpg-engine/shared';
 export interface IContextMenuItem {
     id: string;
     text: string;
 }
-export declare const generateContextMenu: (itemType: ItemType, itemContainerType: ItemContainerType | null) => IContextMenuItem[];
+export declare const generateContextMenu: (item: IItem, itemContainerType: ItemContainerType | null) => IContextMenuItem[];

package/dist/components/TradingMenu/TradingItemRow.d.ts

@@ -2,8 +2,9 @@ import { ITradeResponseItem } from '@rpg-engine/shared';
 import React from 'react';
 export interface ITradeComponentProps {
     traderItem: ITradeResponseItem;
-    updateChartTotals: (traderItem: ITradeResponseItem) => void;
+    onQuantityChange: (traderItem: ITradeResponseItem, selectedQty: number) => void;
     atlasJSON: any;
     atlasIMG: any;
+    selectedQty: number;
 }
 export declare const TradingItemRow: React.FC<ITradeComponentProps>;

package/dist/components/TradingMenu/TradingMenu.d.ts

@@ -3,7 +3,7 @@ import React from 'react';
 export interface ITrandingMenu {
     traderItems: ITradeResponseItem[];
     onClose: () => void;
-    onConfirm: () => void;
+    onConfirm: (items: ITradeResponseItem[]) => void;
     type: TradeTransactionType;
     atlasJSON: any;
     atlasIMG: any;

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

@@ -27925,10 +27925,10 @@ var generateContextMenuListOptions = function generateContextMenuListOptions(act
   });
   return contextMenu;
 };
-var generateContextMenu = function generateContextMenu(itemType, itemContainerType) {
+var generateContextMenu = function generateContextMenu(item, itemContainerType) {
   var contextActionMenu = [];
   if (itemContainerType === shared.ItemContainerType.Inventory) {
-    switch (itemType) {
+    switch (item.type) {
       case shared.ItemType.Weapon:
       case shared.ItemType.Armor:
       case shared.ItemType.Accessory:
@@ -27953,7 +27953,7 @@ var generateContextMenu = function generateContextMenu(itemType, itemContainerTy
     }
   }
   if (itemContainerType === shared.ItemContainerType.Equipment) {
-    switch (itemType) {
+    switch (item.type) {
       case shared.ItemType.Container:
         contextActionMenu = generateContextMenuListOptions(shared.ActionsForEquipmentSet.Container);
         break;
@@ -27962,7 +27962,7 @@ var generateContextMenu = function generateContextMenu(itemType, itemContainerTy
     }
   }
   if (itemContainerType === shared.ItemContainerType.Loot) {
-    switch (itemType) {
+    switch (item.type) {
       case shared.ItemType.Weapon:
       case shared.ItemType.Armor:
       case shared.ItemType.Accessory:
@@ -27984,7 +27984,7 @@ var generateContextMenu = function generateContextMenu(itemType, itemContainerTy
     }
   }
   if (itemContainerType === shared.ItemContainerType.MapContainer) {
-    switch (itemType) {
+    switch (item.type) {
       case shared.ItemType.Weapon:
       case shared.ItemType.Armor:
       case shared.ItemType.Accessory:
@@ -28005,6 +28005,12 @@ var generateContextMenu = function generateContextMenu(itemType, itemContainerTy
         break;
     }
   }
+  if (item.hasUseWith) {
+    contextActionMenu.push({
+      id: 'use-with',
+      text: 'Use With...'
+    });
+  }
   return contextActionMenu;
 };
 
@@ -28042,7 +28048,7 @@ var ItemSlot = /*#__PURE__*/mobxReactLite.observer(function (_ref) {
     setContextActions = _useState3[1];
   React.useEffect(function () {
     if (item) {
-      setContextActions(generateContextMenu(item.type, containerType));
+      setContextActions(generateContextMenu(item, containerType));
     }
   }, [item]);
   var getLeftPositionValue = function getLeftPositionValue(quantity) {
@@ -29357,35 +29363,20 @@ var TextArea = function TextArea(_ref) {
 var TradingItemRow = function TradingItemRow(_ref) {
   var atlasIMG = _ref.atlasIMG,
     atlasJSON = _ref.atlasJSON,
-    updateChartTotals = _ref.updateChartTotals,
-    traderItem = _ref.traderItem;
-  var _useState = React.useState(0),
-    itemQuantity = _useState[0],
-    setItemQuantity = _useState[1];
+    onQuantityChange = _ref.onQuantityChange,
+    traderItem = _ref.traderItem,
+    selectedQty = _ref.selectedQty;
   var onLeftClick = function onLeftClick() {
-    if (itemQuantity > 0) {
-      var newQuantity = itemQuantity - 1;
-      setItemQuantity(newQuantity);
-      updateChartTotals({
-        key: traderItem.key,
-        qty: newQuantity,
-        price: traderItem.price,
-        texturePath: traderItem.texturePath,
-        name: traderItem.name
-      });
+    if (selectedQty > 0) {
+      var newQuantity = selectedQty - 1;
+      onQuantityChange(traderItem, newQuantity);
     }
   };
   var onRightClick = function onRightClick() {
-    if (itemQuantity < 999) {
-      var newQuantity = itemQuantity + 1;
-      setItemQuantity(newQuantity);
-      updateChartTotals({
-        key: traderItem.key,
-        qty: newQuantity,
-        price: traderItem.price,
-        texturePath: traderItem.texturePath,
-        name: traderItem.name
-      });
+    var _traderItem$qty;
+    if (selectedQty < ((_traderItem$qty = traderItem.qty) != null ? _traderItem$qty : 999)) {
+      var newQuantity = selectedQty + 1;
+      onQuantityChange(traderItem, newQuantity);
     }
   };
   return React__default.createElement(ItemWrapper, null, React__default.createElement(ItemIconContainer, null, React__default.createElement(SpriteContainer$1, null, React__default.createElement(SpriteFromAtlas, {
@@ -29402,7 +29393,7 @@ var TradingItemRow = function TradingItemRow(_ref) {
     direction: "left",
     onClick: onLeftClick,
     onTouchStart: onLeftClick
-  }), React__default.createElement(QuantityDisplay, null, React__default.createElement(TextOverlay$2, null, React__default.createElement(Item$1, null, itemQuantity))), React__default.createElement(SelectArrow, {
+  }), React__default.createElement(QuantityDisplay, null, React__default.createElement(TextOverlay$2, null, React__default.createElement(Item$1, null, selectedQty))), React__default.createElement(SelectArrow, {
     size: 32,
     className: "arrow-selector",
     direction: "right",
@@ -29458,20 +29449,49 @@ var TradingMenu = function TradingMenu(_ref) {
   var _useState = React.useState(0),
     sum = _useState[0],
     setSum = _useState[1];
-  var newSumArray = 0;
-  var updateChartTotals = function updateChartTotals(item) {
-    var itemIndex = traderItems.findIndex(function (itemArray) {
-      return itemArray.key === item.key;
-    });
-    traderItems[itemIndex] = item;
+  var _useState2 = React.useState(new Map()),
+    qtyMap = _useState2[0],
+    setQtyMap = _useState2[1];
+  var onQuantityChange = function onQuantityChange(item, selectedQty) {
+    setQtyMap(new Map(qtyMap.set(item.key, selectedQty)));
+    var newSum = 0;
     traderItems.forEach(function (item) {
-      if (item.qty) newSumArray += item.qty * item.price;
-      setSum(newSumArray);
+      var qty = qtyMap.get(item.key);
+      if (qty) newSum += qty * item.price;
+      setSum(newSum);
     });
   };
+  var isBuy = function isBuy() {
+    return type == 'buy';
+  };
+  var hasGoldForSale = function hasGoldForSale() {
+    if (isBuy()) {
+      return !(sum > characterAvailableGold);
+    }
+    return true;
+  };
+  var getFinalGold = function getFinalGold() {
+    if (isBuy()) {
+      return characterAvailableGold - sum;
+    } else {
+      return characterAvailableGold + sum;
+    }
+  };
   var Capitalize = function Capitalize(word) {
     return word[0].toUpperCase() + word.substring(1);
   };
+  var onConfirmClick = function onConfirmClick() {
+    var items = [];
+    traderItems.forEach(function (item) {
+      var qty = qtyMap.get(item.key);
+      if (qty) {
+        items.push(Object.assign({}, item, {
+          qty: qty
+        }));
+      }
+    });
+    onConfirm(items);
+  };
   return React__default.createElement(DraggableContainer, {
     type: exports.RPGUIContainerTypes.Framed,
     onCloseButton: function onCloseButton() {
@@ -29486,19 +29506,21 @@ var TradingMenu = function TradingMenu(_ref) {
   }, React__default.createElement(Title$3, null, Capitalize(type), " Menu"), React__default.createElement("hr", {
     className: "golden"
   })), React__default.createElement(TradingComponentScrollWrapper, null, traderItems.map(function (tradeItem, index) {
+    var _qtyMap$get;
     return React__default.createElement(ItemWrapper$1, {
       key: tradeItem.key + "_" + index
     }, React__default.createElement(TradingItemRow, {
       atlasIMG: atlasIMG,
       atlasJSON: atlasJSON,
-      updateChartTotals: updateChartTotals,
-      traderItem: tradeItem
+      onQuantityChange: onQuantityChange,
+      traderItem: tradeItem,
+      selectedQty: (_qtyMap$get = qtyMap.get(tradeItem.key)) != null ? _qtyMap$get : 0
     }));
-  })), React__default.createElement(GoldWrapper, null, React__default.createElement("p", null, "Available Gold:"), React__default.createElement("p", null, "$", characterAvailableGold)), React__default.createElement(TotalWrapper, null, React__default.createElement("p", null, "Total:"), React__default.createElement("p", null, "$", sum)), sum > characterAvailableGold ? React__default.createElement(AlertWrapper, null, React__default.createElement("p", null, " Sorry, not enough money.")) : React__default.createElement(GoldWrapper, null, React__default.createElement("p", null, "Final Gold:"), React__default.createElement("p", null, "$", characterAvailableGold - sum)), React__default.createElement(ButtonWrapper, null, React__default.createElement(Button, {
+  })), React__default.createElement(GoldWrapper, null, React__default.createElement("p", null, "Available Gold:"), React__default.createElement("p", null, "$", characterAvailableGold)), React__default.createElement(TotalWrapper, null, React__default.createElement("p", null, "Total:"), React__default.createElement("p", null, "$", sum)), !hasGoldForSale() ? React__default.createElement(AlertWrapper, null, React__default.createElement("p", null, " Sorry, not enough money.")) : React__default.createElement(GoldWrapper, null, React__default.createElement("p", null, "Final Gold:"), React__default.createElement("p", null, "$", getFinalGold())), React__default.createElement(ButtonWrapper, null, React__default.createElement(Button, {
     buttonType: exports.ButtonTypes.RPGUIButton,
-    disabled: sum > characterAvailableGold,
+    disabled: !hasGoldForSale(),
     onClick: function onClick() {
-      return onConfirm();
+      return onConfirmClick();
     }
   }, "Confirm"), React__default.createElement(Button, {
     buttonType: exports.ButtonTypes.RPGUIButton,