@rpg-engine/long-bow 0.1.96 → 0.1.99

package/dist/components/Equipment/EquipmentSet.d.ts

@@ -1,15 +1,15 @@
-import { IEquipmentSet, IItem } from '@rpg-engine/shared';
+import { IEquipmentSet, IItem, ItemContainerType, ItemType } from '@rpg-engine/shared';
 import React from 'react';
-import { SlotContainerType } from '../Item/Inventory/ItemContainerTypes';
 export interface IEquipmentSetProps {
     equipmentSet: IEquipmentSet;
     onClose?: () => void;
-    onItemClick?: (item: IItem, slotContainerType: SlotContainerType | null) => void;
+    onItemClick?: (ItemType: ItemType, item: IItem, itemContainerType: ItemContainerType | null) => void;
     onMouseOver?: (e: any, slotIndex: number, item: IItem | null) => void;
     onSelected?: (optionId: string) => void;
     initialPosition?: {
         x: number;
         y: number;
     };
+    ContainerTypes: ItemContainerType | null;
 }
 export declare const EquipmentSet: React.FC<IEquipmentSetProps>;

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

@@ -1,11 +1,11 @@
-import { IItem, IItemContainer } from '@rpg-engine/shared';
+import { IItem, IItemContainer, ItemContainerType } from '@rpg-engine/shared';
 import React from 'react';
-import { SlotContainerType } from './ItemContainerTypes';
 export interface IItemContainerProps {
     itemContainer: IItemContainer;
     onClose?: () => void;
-    onItemClick?: (item: IItem, slotContainerType: SlotContainerType | null) => void;
+    onItemClick?: (item: IItem, ItemType: IItem['type'], itemContainerType: ItemContainerType | null) => void;
     onMouseOver?: (e: any, slotIndex: number, item: IItem | null) => void;
     onSelected?: (optionId: string, item: IItem) => void;
+    ContainerType: ItemContainerType;
 }
 export declare const ItemContainer: React.FC<IItemContainerProps>;

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

@@ -1,4 +1,6 @@
 export declare enum SlotContainerType {
     INVENTORY = "Inventory",
-    EQUIPMENT_SET = "EquipmentSet"
+    EQUIPMENT_SET = "EquipmentSet",
+    LOOT = "Loot",
+    MAP_CONTAINER = "Map-Container"
 }

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

@@ -1,16 +1,15 @@
-import { IItem, IItemContainer, ItemSlotType } from '@rpg-engine/shared';
+import { IItem, IItemContainer, ItemContainerType, ItemSlotType, ItemType } from '@rpg-engine/shared';
 import React from 'react';
-import { SlotContainerType } from './ItemContainerTypes';
 interface IProps {
     slotIndex: number;
     item: IItem | null;
     itemContainer?: IItemContainer | null;
-    slotContainerType: SlotContainerType | null;
+    itemContainerType: ItemContainerType | null;
     slotSpriteMask?: ItemSlotType | null;
     onSelected: (selectedOption: string, item: IItem) => void;
     onMouseOver: (event: any, slotIndex: number, item: IItem | null, x: number, y: number) => void;
     onMouseOut?: () => void;
-    onClick: (item: IItem, slotContainerType: SlotContainerType | null) => void;
+    onClick: (ItemType: ItemType, itemContainerType: ItemContainerType | null, item: IItem) => void;
 }
 export declare const ItemSlot: React.FC<IProps>;
 export {};

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

@@ -1,12 +1,9 @@
-import { ItemType } from '@rpg-engine/shared';
+import { ItemContainerType, ItemType } from '@rpg-engine/shared';
 import { SlotContainerType } from './ItemContainerTypes';
 export interface IContextMenuItem {
     id: string;
     text: string;
 }
-export declare enum ContainerType {
-    INVENTORY = "Inventory",
-    EQUIPMENT_SET = "EquipmentSet"
-}
+export declare const handleNewContextMenu: (itemType: ItemType, itemContainerType: ItemContainerType | null) => IContextMenuItem[];
 export declare const handleContextMenuList: (itemType: ItemType, slotContainerType: SlotContainerType | null) => IContextMenuItem[];
 export declare const handleEquipmentContextMenuList: (itemType: ItemType) => IContextMenuItem[];

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

@@ -457,13 +457,6 @@ var Dropdown = function Dropdown(_ref) {
   }));
 };
 
-var SlotContainerType;
-
-(function (SlotContainerType) {
-  SlotContainerType["INVENTORY"] = "Inventory";
-  SlotContainerType["EQUIPMENT_SET"] = "EquipmentSet";
-})(SlotContainerType || (SlotContainerType = {}));
-
 var frames = {
 	"helmets/brass-helmet.png": {
 		frame: {
@@ -5810,13 +5803,14 @@ var Container$5 = /*#__PURE__*/styled.div.withConfig({
   componentId: "sc-11d9r7x-0"
 })(["z-index:2;position:absolute;top:1rem;left:4rem;font-size:0.5rem;color:white;background-color:black;border-radius:5px;padding:0.5rem;min-width:20px;width:100%;text-align:center;opacity:0.75;"]);
 
-var ContainerType;
-
-(function (ContainerType) {
-  ContainerType["INVENTORY"] = "Inventory";
-  ContainerType["EQUIPMENT_SET"] = "EquipmentSet";
-})(ContainerType || (ContainerType = {})); // TODO: Refactor this file
+var SlotContainerType;
 
+(function (SlotContainerType) {
+  SlotContainerType["INVENTORY"] = "Inventory";
+  SlotContainerType["EQUIPMENT_SET"] = "EquipmentSet";
+  SlotContainerType["LOOT"] = "Loot";
+  SlotContainerType["MAP_CONTAINER"] = "Map-Container";
+})(SlotContainerType || (SlotContainerType = {}));
 
 var generateContextList = function generateContextList(actionsByTypeList) {
   var contextMenu = actionsByTypeList.map(function (action) {
@@ -5828,41 +5822,101 @@ var generateContextList = function generateContextList(actionsByTypeList) {
   return contextMenu;
 };
 
-var handleContextMenuList = function handleContextMenuList(itemType, slotContainerType) {
+var handleNewContextMenu = function handleNewContextMenu(itemType, itemContainerType) {
   var contextActionMenu = [];
 
-  switch (itemType) {
-    case shared.ItemType.Weapon:
-    case shared.ItemType.Armor:
-    case shared.ItemType.Accessory:
-    case shared.ItemType.Jewelry:
-    case shared.ItemType.Tool:
-      if (slotContainerType === SlotContainerType.EQUIPMENT_SET) {
-        contextActionMenu = generateContextList(shared.ActionsByItemType.EquipmentSetItems);
-      } else {
-        contextActionMenu = generateContextList(shared.ActionsByItemType.Equipment);
-      }
+  if (itemContainerType === shared.ItemContainerType.Inventory) {
+    switch (itemType) {
+      case shared.ItemType.Weapon:
+      case shared.ItemType.Armor:
+      case shared.ItemType.Accessory:
+      case shared.ItemType.Jewelry:
+      case shared.ItemType.Container:
+        contextActionMenu = generateContextList(shared.ActionsForInventory.Equipment);
+        break;
+
+      case shared.ItemType.Consumable:
+        contextActionMenu = generateContextList(shared.ActionsForInventory.Consumable);
+        break;
+
+      case shared.ItemType.CraftMaterial:
+        contextActionMenu = generateContextList(shared.ActionsForInventory.CraftMaterial);
+        break;
+
+      case shared.ItemType.Tool:
+        contextActionMenu = generateContextList(shared.ActionsForInventory.Tool);
+        break;
+
+      case shared.ItemType.Other:
+        contextActionMenu = generateContextList(shared.ActionsForInventory.Other);
+        break;
+    }
+  }
 
-      break;
+  if (itemContainerType === shared.ItemContainerType.Equipment) {
+    switch (itemType) {
+      case shared.ItemType.Weapon:
+      case shared.ItemType.Armor:
+      case shared.ItemType.Accessory:
+      case shared.ItemType.Jewelry:
+      case shared.ItemType.Container:
+        contextActionMenu = generateContextList(shared.ActionsForEquipmentSet.Equipment);
+        break;
+    }
+  }
+
+  if (itemContainerType === shared.ItemContainerType.Loot) {
+    switch (itemType) {
+      case shared.ItemType.Weapon:
+      case shared.ItemType.Armor:
+      case shared.ItemType.Accessory:
+      case shared.ItemType.Jewelry:
+        contextActionMenu = generateContextList(shared.ActionsForLoot.Equipment);
+        break;
+
+      case shared.ItemType.Consumable:
+        contextActionMenu = generateContextList(shared.ActionsForLoot.Consumable);
+        break;
+
+      case shared.ItemType.CraftMaterial:
+        contextActionMenu = generateContextList(shared.ActionsForLoot.CraftMaterial);
+        break;
+
+      case shared.ItemType.Tool:
+        contextActionMenu = generateContextList(shared.ActionsForLoot.Tool);
+        break;
+
+      case shared.ItemType.Other:
+        contextActionMenu = generateContextList(shared.ActionsForLoot.Other);
+        break;
+    }
+  }
 
-    case shared.ItemType.Consumable:
-      contextActionMenu = generateContextList(shared.ActionsByItemType.Consumable);
-      break;
+  if (itemContainerType === shared.ItemContainerType.MapContainer) {
+    switch (itemType) {
+      case shared.ItemType.Weapon:
+      case shared.ItemType.Armor:
+      case shared.ItemType.Accessory:
+      case shared.ItemType.Jewelry:
+        contextActionMenu = generateContextList(shared.ActionsForMapContainer.Equipment);
+        break;
 
-    case shared.ItemType.CraftMaterial:
-      contextActionMenu = generateContextList(shared.ActionsByItemType.CraftMaterial);
-      break;
+      case shared.ItemType.Consumable:
+        contextActionMenu = generateContextList(shared.ActionsForMapContainer.Consumable);
+        break;
 
-    case shared.ItemType.Other:
-    case shared.ItemType.Information:
-    case shared.ItemType.Quest:
-    case shared.ItemType.Container:
-      contextActionMenu = generateContextList(shared.ActionsByItemType.Other);
-      break;
+      case shared.ItemType.CraftMaterial:
+        contextActionMenu = generateContextList(shared.ActionsForMapContainer.CraftMaterial);
+        break;
+
+      case shared.ItemType.Tool:
+        contextActionMenu = generateContextList(shared.ActionsForMapContainer.Tool);
+        break;
 
-    default:
-      contextActionMenu = generateContextList(shared.ActionsByItemType.Other);
-      break;
+      case shared.ItemType.Other:
+        contextActionMenu = generateContextList(shared.ActionsForMapContainer.Other);
+        break;
+    }
   }
 
   return contextActionMenu;
@@ -5883,7 +5937,7 @@ var EquipmentSlotSpriteByType = {
 var ItemSlot = /*#__PURE__*/mobxReactLite.observer(function (_ref) {
   var slotIndex = _ref.slotIndex,
       item = _ref.item,
-      slotContainerType = _ref.slotContainerType,
+      containerType = _ref.itemContainerType,
       slotSpriteMask = _ref.slotSpriteMask,
       _onMouseOver = _ref.onMouseOver,
       _onMouseOut = _ref.onMouseOut,
@@ -5904,7 +5958,7 @@ var ItemSlot = /*#__PURE__*/mobxReactLite.observer(function (_ref) {
 
   React.useEffect(function () {
     if (item) {
-      setContextActions(handleContextMenuList(item.type, slotContainerType));
+      setContextActions(handleNewContextMenu(item.type, containerType));
     }
   }, [item]);
 
@@ -5960,8 +6014,16 @@ var ItemSlot = /*#__PURE__*/mobxReactLite.observer(function (_ref) {
   };
 
   var onRenderSlot = function onRenderSlot(itemToRender) {
-    if (slotContainerType === SlotContainerType.EQUIPMENT_SET) return renderEquipment(itemToRender);
-    return renderItem(itemToRender);
+    switch (containerType) {
+      case shared.ItemContainerType.Equipment:
+        return renderEquipment(itemToRender);
+
+      case shared.ItemContainerType.Inventory:
+        return renderItem(itemToRender);
+
+      default:
+        return renderItem(itemToRender);
+    }
   };
 
   return React__default.createElement(Container$6, {
@@ -5984,7 +6046,7 @@ var ItemSlot = /*#__PURE__*/mobxReactLite.observer(function (_ref) {
       if (item) {
         setIsContextMenuVisible(!isContextMenuVisible);
 
-        _onClick(item, slotContainerType);
+        _onClick(item.type, containerType, item);
       }
     }
   }, isContextMenuVisible && contextActions && React__default.createElement(RelativeListMenu, {
@@ -6046,13 +6108,13 @@ var EquipmentSet = function EquipmentSet(_ref) {
         slotIndex: i,
         item: item,
         itemContainer: itemContainer,
-        slotContainerType: SlotContainerType.EQUIPMENT_SET,
+        itemContainerType: shared.ItemContainerType.Equipment,
         slotSpriteMask: slotMaksRange[i],
         onMouseOver: function onMouseOver(event, slotIndex, item) {
           if (_onMouseOver) _onMouseOver(event, slotIndex, item);
         },
-        onClick: function onClick(item, slotContainerType) {
-          if (onItemClick) onItemClick(item, slotContainerType);
+        onClick: function onClick(itemType, ContainerType) {
+          if (onItemClick) onItemClick(itemType, item, ContainerType);
         },
         onSelected: function onSelected(optionId) {
           if (_onSelected) _onSelected(optionId);
@@ -6118,7 +6180,8 @@ var ItemContainer = function ItemContainer(_ref) {
       onClose = _ref.onClose,
       _onMouseOver = _ref.onMouseOver,
       _onSelected = _ref.onSelected,
-      onItemClick = _ref.onItemClick;
+      onItemClick = _ref.onItemClick,
+      ContainerType = _ref.ContainerType;
 
   var onRenderSlots = function onRenderSlots() {
     var slots = [];
@@ -6130,12 +6193,12 @@ var ItemContainer = function ItemContainer(_ref) {
         key: i,
         slotIndex: i,
         item: ((_itemContainer$slots = itemContainer.slots) == null ? void 0 : _itemContainer$slots[i]) || null,
-        slotContainerType: SlotContainerType.INVENTORY,
+        itemContainerType: ContainerType,
         onMouseOver: function onMouseOver(event, slotIndex, item) {
           if (_onMouseOver) _onMouseOver(event, slotIndex, item);
         },
-        onClick: function onClick(item, slotContainerType) {
-          if (onItemClick) onItemClick(item, slotContainerType);
+        onClick: function onClick(ItemType, ContainerType, item) {
+          if (onItemClick) onItemClick(item, ItemType, ContainerType);
         },
         onSelected: function onSelected(optionId, item) {
           if (_onSelected) _onSelected(optionId, item);