@rpg-engine/long-bow 0.1.99 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpg-engine/long-bow",
-  "version": "0.1.99",
+  "version": "0.2.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -83,7 +83,7 @@
   },
   "dependencies": {
     "@rollup/plugin-image": "^2.1.1",
-    "@rpg-engine/shared": "^0.4.6",
+    "@rpg-engine/shared": "^0.4.8",
     "dayjs": "^1.11.2",
     "fs-extra": "^10.1.0",
     "lodash": "^4.17.21",

package/src/components/Item/Inventory/ItemSlot.tsx

@@ -14,7 +14,7 @@ import atlasIMG from '../../../mocks/atlas/items/items.png';
 import { RelativeListMenu } from '../../RelativeListMenu';
 import { SpriteFromAtlas } from '../../shared/SpriteFromAtlas';
 import { ItemTooltip } from '../Cards/ItemTooltip';
-import { handleNewContextMenu, IContextMenuItem } from './itemContainerHelper';
+import { generateContextMenu, IContextMenuItem } from './itemContainerHelper';
 
 const EquipmentSlotSpriteByType: any = {
   Neck: 'accessories/corruption-necklace.png',
@@ -72,7 +72,7 @@ export const ItemSlot: React.FC<IProps> = observer(
 
     useEffect(() => {
       if (item) {
-        setContextActions(handleNewContextMenu(item.type, containerType));
+        setContextActions(generateContextMenu(item.type, containerType));
       }
     }, [item]);
 

package/src/components/Item/Inventory/itemContainerHelper.ts

@@ -1,5 +1,4 @@
 import {
-  ActionsByItemType,
   ActionsForEquipmentSet,
   ActionsForInventory,
   ActionsForLoot,
@@ -8,15 +7,13 @@ import {
   ItemSocketEventsDisplayLabels,
   ItemType,
 } from '@rpg-engine/shared';
-import { SlotContainerType } from './ItemContainerTypes';
 
 export interface IContextMenuItem {
   id: string;
   text: string;
 }
 
-// TODO: Refactor this file
-const generateContextList = (actionsByTypeList: any) => {
+const generateContextMenuListOptions = (actionsByTypeList: any) => {
   const contextMenu: IContextMenuItem[] = actionsByTypeList.map(
     (action: string) => {
       return { id: action, text: ItemSocketEventsDisplayLabels[action] };
@@ -24,7 +21,8 @@ const generateContextList = (actionsByTypeList: any) => {
   );
   return contextMenu;
 };
-export const handleNewContextMenu = (
+
+export const generateContextMenu = (
   itemType: ItemType,
   itemContainerType: ItemContainerType | null
 ) => {
@@ -37,36 +35,37 @@ export const handleNewContextMenu = (
       case ItemType.Accessory:
       case ItemType.Jewelry:
       case ItemType.Container:
-        contextActionMenu = generateContextList(ActionsForInventory.Equipment);
+        contextActionMenu = generateContextMenuListOptions(
+          ActionsForInventory.Equipment
+        );
         break;
       case ItemType.Consumable:
-        contextActionMenu = generateContextList(ActionsForInventory.Consumable);
+        contextActionMenu = generateContextMenuListOptions(
+          ActionsForInventory.Consumable
+        );
         break;
       case ItemType.CraftMaterial:
-        contextActionMenu = generateContextList(
+        contextActionMenu = generateContextMenuListOptions(
           ActionsForInventory.CraftMaterial
         );
         break;
       case ItemType.Tool:
-        contextActionMenu = generateContextList(ActionsForInventory.Tool);
+        contextActionMenu = generateContextMenuListOptions(
+          ActionsForInventory.Tool
+        );
         break;
-      case ItemType.Other:
-        contextActionMenu = generateContextList(ActionsForInventory.Other);
+
+      default:
+        contextActionMenu = generateContextMenuListOptions(
+          ActionsForInventory.Other
+        );
         break;
     }
   }
   if (itemContainerType === ItemContainerType.Equipment) {
-    switch (itemType) {
-      case ItemType.Weapon:
-      case ItemType.Armor:
-      case ItemType.Accessory:
-      case ItemType.Jewelry:
-      case ItemType.Container:
-        contextActionMenu = generateContextList(
-          ActionsForEquipmentSet.Equipment
-        );
-        break;
-    }
+    contextActionMenu = generateContextMenuListOptions(
+      ActionsForEquipmentSet.Equipment
+    );
   }
   if (itemContainerType === ItemContainerType.Loot) {
     switch (itemType) {
@@ -74,19 +73,27 @@ export const handleNewContextMenu = (
       case ItemType.Armor:
       case ItemType.Accessory:
       case ItemType.Jewelry:
-        contextActionMenu = generateContextList(ActionsForLoot.Equipment);
+        contextActionMenu = generateContextMenuListOptions(
+          ActionsForLoot.Equipment
+        );
         break;
       case ItemType.Consumable:
-        contextActionMenu = generateContextList(ActionsForLoot.Consumable);
+        contextActionMenu = generateContextMenuListOptions(
+          ActionsForLoot.Consumable
+        );
         break;
       case ItemType.CraftMaterial:
-        contextActionMenu = generateContextList(ActionsForLoot.CraftMaterial);
+        contextActionMenu = generateContextMenuListOptions(
+          ActionsForLoot.CraftMaterial
+        );
         break;
       case ItemType.Tool:
-        contextActionMenu = generateContextList(ActionsForLoot.Tool);
+        contextActionMenu = generateContextMenuListOptions(ActionsForLoot.Tool);
         break;
-      case ItemType.Other:
-        contextActionMenu = generateContextList(ActionsForLoot.Other);
+      default:
+        contextActionMenu = generateContextMenuListOptions(
+          ActionsForLoot.Other
+        );
         break;
     }
   }
@@ -96,92 +103,31 @@ export const handleNewContextMenu = (
       case ItemType.Armor:
       case ItemType.Accessory:
       case ItemType.Jewelry:
-        contextActionMenu = generateContextList(
+        contextActionMenu = generateContextMenuListOptions(
           ActionsForMapContainer.Equipment
         );
         break;
       case ItemType.Consumable:
-        contextActionMenu = generateContextList(
+        contextActionMenu = generateContextMenuListOptions(
           ActionsForMapContainer.Consumable
         );
         break;
       case ItemType.CraftMaterial:
-        contextActionMenu = generateContextList(
+        contextActionMenu = generateContextMenuListOptions(
           ActionsForMapContainer.CraftMaterial
         );
         break;
       case ItemType.Tool:
-        contextActionMenu = generateContextList(ActionsForMapContainer.Tool);
+        contextActionMenu = generateContextMenuListOptions(
+          ActionsForMapContainer.Tool
+        );
         break;
-      case ItemType.Other:
-        contextActionMenu = generateContextList(ActionsForMapContainer.Other);
+      default:
+        contextActionMenu = generateContextMenuListOptions(
+          ActionsForMapContainer.Other
+        );
         break;
     }
   }
   return contextActionMenu;
 };
-
-export const handleContextMenuList = (
-  itemType: ItemType,
-  slotContainerType: SlotContainerType | null
-) => {
-  let contextActionMenu: IContextMenuItem[] = [];
-
-  switch (itemType) {
-    case ItemType.Weapon:
-    case ItemType.Armor:
-    case ItemType.Accessory:
-    case ItemType.Jewelry:
-    case ItemType.Tool:
-      if (slotContainerType === SlotContainerType.EQUIPMENT_SET) {
-        contextActionMenu = generateContextList(
-          ActionsByItemType.EquipmentSetItems
-        );
-      } else {
-        contextActionMenu = generateContextList(ActionsByItemType.Equipment);
-      }
-      break;
-    case ItemType.Consumable:
-      contextActionMenu = generateContextList(ActionsByItemType.Consumable);
-      break;
-    case ItemType.CraftMaterial:
-      contextActionMenu = generateContextList(ActionsByItemType.CraftMaterial);
-      break;
-    case ItemType.Other:
-    case ItemType.Information:
-    case ItemType.Quest:
-    case ItemType.Container:
-      contextActionMenu = generateContextList(ActionsByItemType.Other);
-      break;
-    default:
-      contextActionMenu = generateContextList(ActionsByItemType.Other);
-      break;
-  }
-  return contextActionMenu;
-};
-
-export const handleEquipmentContextMenuList = (itemType: ItemType) => {
-  let contextActionMenu: IContextMenuItem[] = [];
-  switch (itemType) {
-    case ItemType.Weapon:
-    case ItemType.Armor:
-    case ItemType.Accessory:
-    case ItemType.Jewelry:
-    case ItemType.Tool:
-      contextActionMenu = generateContextList(
-        ActionsByItemType.EquipmentSetItems
-      );
-      break;
-    case ItemType.Container:
-      contextActionMenu = generateContextList(
-        ActionsByItemType.EquipmentSetContainer
-      );
-      break;
-    default:
-      contextActionMenu = generateContextList(
-        ActionsByItemType.EquipmentSetItems
-      );
-      break;
-  }
-  return contextActionMenu;
-};

package/src/components/NPCDialog/QuestionDialog/QuestionDialog.tsx

@@ -70,8 +70,6 @@ export const QuestionDialog: React.FC<IProps> = ({
 
         const nextAnswerID = currentQuestion.answerIds![nextAnswerIndex];
 
-        // console.log(nextAnswerIndex);
-
         const nextAnswer = onGetAnswers(currentQuestion.answerIds!).find(
           answer => answer?.id === nextAnswerID
         );