Merge branch 'develop'

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.10.35] 2020-02-18
+### Changed
+- Add new options for the Item Macro to choose between keeping the original item, only the item macro item, or showing both.
+
 ## [0.10.34] 2020-02-18
 ### Added
 - SW5e class features thanks to Therasin/Zasshem

lang/en.json

@@ -196,8 +196,8 @@
     "tokenactionhud.settings.dnd5e.showAllNpcItems.hint": "If enabled, all items are shown for NPCs, not just equipped items.",
     "tokenactionhud.settings.dnd5e.showEmptyItems.name": "Show empty items (includes items and spells)",
     "tokenactionhud.settings.dnd5e.showEmptyItems.hint": "If enabled, items are shown in the HUD even if they have no remaining charges.",
-    "tokenactionhud.settings.dnd5e.itemMacroReplace.name": "Item-Macro: overwrite original item",
-    "tokenactionhud.settings.dnd5e.itemMacroReplace.hint": "If enabled, items with an item macro will overwrite their original, otherwise both options will be shown.",
+    "tokenactionhud.settings.dnd5e.itemMacroReplace.name": "Item-Macro: item macro, original item, or both",
+    "tokenactionhud.settings.dnd5e.itemMacroReplace.hint": "Select which of the items will be shown in the inventory.",
     "tokenactionhud.settings.dnd5e.showConditionsCategory.name": "Show Conditions Category",
     "tokenactionhud.settings.dnd5e.showConditionsCategory.hint": "If enabled, the HUD will present a category showing the available token conditions and status effects normally available in the regular Token HUD.",
 
@@ -252,5 +252,9 @@
     "tokenactionhud.settings.swade.abbreviateAttributes.hint": "If enabled, skills and abilities will use a three-character abbreviation.",
 
     "tokenactionhud.d35e.grapple" : "Grapple",
-    "tokenactionhud.crewActions" : "Crew Actions"
+    "tokenactionhud.crewActions" : "Crew Actions",
+
+    "tokenactionhud.settings.itemMacroReplace.showBoth": "Show both original item and item macro item",
+    "tokenactionhud.settings.itemMacroReplace.showItemMacro": "Show the item macro item",
+    "tokenactionhud.settings.itemMacroReplace.showOriginal": "Show the original item"
   }

scripts/actions/itemMacroExtender.js

@@ -31,7 +31,12 @@ export class ItemMacroActionListExtender extends ActionListExtender {
         if (itemIds.length === 0)
             return;
 
-        let replace = settings.get('itemMacroReplace');
+        let itemMacroSetting = settings.get('itemMacroReplace');
+
+        if (itemMacroSetting === 'showOriginal')
+            return actionList;
+
+        let replace = itemMacroSetting === 'showItemMacro';
 
         actionList.categories.forEach(category => {
             category.subcategories.forEach(subcategory => {

scripts/settings.js

@@ -1,4 +1,5 @@
 import { Logger } from './logger.js';
+import { ItemMacroOptions } from './settings/dnd5e/itemMacroOptions.js';
 export { Logger } from './logger.js';
 
 const updateFunc = (value) => { Logger.debug('Settings updated. Refreshing HUD'); if (game.tokenActionHUD)game.tokenActionHUD.updateSettings(); }
@@ -96,8 +97,13 @@ export const registerSettings = function(app, systemManager, rollHandlers) {
             hint: game.i18n.localize('tokenactionhud.settings.dnd5e.itemMacroReplace.hint'),
             scope: "client",
             config: true,
-            type: Boolean,
-            default: true,
+            type: String,
+            choices: {
+                showBoth: game.i18n.localize(ItemMacroOptions.SHOW_BOTH),
+                showItemMacro: game.i18n.localize(ItemMacroOptions.SHOW_ITEM_MACRO),
+                showOriginal: game.i18n.localize(ItemMacroOptions.SHOW_ORIGINAL_ITEM)
+            },
+            default: 'showBoth',
             onChange: value => { updateFunc(value); }
         });
     }

scripts/settings/dnd5e/itemMacroOptions.js

@@ -0,0 +1,5 @@
+export const ItemMacroOptions = {
+    SHOW_BOTH: 'tokenactionhud.settings.itemMacroReplace.showBoth',
+    SHOW_ITEM_MACRO: 'tokenactionhud.settings.itemMacroReplace.showItemMacro',
+    SHOW_ORIGINAL_ITEM: 'tokenactionhud.settings.itemMacroReplace.showOriginal'
+}