@rpg-engine/long-bow 0.8.110 → 0.8.111

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

@@ -27779,19 +27779,30 @@ var generateContextMenu = function generateContextMenu(item, itemContainerType,
         contextActionMenu = generateContextMenuListOptions(shared.ActionsForLoot.Other);
         break;
     }
-    // Add "Use" for consumable items in nested containers (same as Inventory)
-    if (item.type === shared.ItemType.Consumable) {
-      contextActionMenu.unshift({
-        id: shared.ItemSocketEvents.Use,
-        text: shared.ItemSocketEventsDisplayLabels[shared.ItemSocketEvents.Use]
+    // Add "Use" for usable items in nested containers (same as Inventory)
+    // Check both item type and isUsable flag to handle all usable items
+    if (item.type === shared.ItemType.Consumable || item.isUsable) {
+      var hasUseAction = contextActionMenu.some(function (action) {
+        return action.id === shared.ItemSocketEvents.Use;
       });
+      if (!hasUseAction) {
+        contextActionMenu.unshift({
+          id: shared.ItemSocketEvents.Use,
+          text: shared.ItemSocketEventsDisplayLabels[shared.ItemSocketEvents.Use]
+        });
+      }
     }
     // Add "Use with..." for items that have hasUseWith property
     if (item.hasUseWith) {
-      contextActionMenu.push({
-        id: shared.ItemSocketEvents.UseWith,
-        text: shared.ItemSocketEvents.UseWith
+      var hasUseWithAction = contextActionMenu.some(function (action) {
+        return action.id === shared.ItemSocketEvents.UseWith;
       });
+      if (!hasUseWithAction) {
+        contextActionMenu.push({
+          id: shared.ItemSocketEvents.UseWith,
+          text: shared.ItemSocketEvents.UseWith
+        });
+      }
     }
   }
   if (itemContainerType === shared.ItemContainerType.MapContainer) {
@@ -27815,14 +27826,29 @@ var generateContextMenu = function generateContextMenu(item, itemContainerType,
         contextActionMenu = generateContextMenuListOptions(shared.ActionsForMapContainer.Other);
         break;
     }
-    var _contextActionMenuDontHaveUseWith = !contextActionMenu.find(function (action) {
-      return action.text.toLowerCase().includes('use with');
-    });
-    if (item.hasUseWith && _contextActionMenuDontHaveUseWith) {
-      contextActionMenu.push({
-        id: 'use-with',
-        text: 'Use with...'
+    // Add "Use" for usable items (same logic as Loot containers)
+    if (item.type === shared.ItemType.Consumable || item.isUsable) {
+      var _hasUseAction = contextActionMenu.some(function (action) {
+        return action.id === shared.ItemSocketEvents.Use;
+      });
+      if (!_hasUseAction) {
+        contextActionMenu.unshift({
+          id: shared.ItemSocketEvents.Use,
+          text: shared.ItemSocketEventsDisplayLabels[shared.ItemSocketEvents.Use]
+        });
+      }
+    }
+    // Add "Use with..." for items that have hasUseWith property
+    if (item.hasUseWith) {
+      var _hasUseWithAction = contextActionMenu.some(function (action) {
+        return action.id === shared.ItemSocketEvents.UseWith;
       });
+      if (!_hasUseWithAction) {
+        contextActionMenu.push({
+          id: shared.ItemSocketEvents.UseWith,
+          text: shared.ItemSocketEvents.UseWith
+        });
+      }
     }
   }
   if (itemContainerType === shared.ItemContainerType.Depot) {