From 9b6c3199c5fdcbe9d23fc50b1651a13ea6beee97 Mon Sep 17 00:00:00 2001 From: Russell Larkin Date: Thu, 29 Dec 2022 00:53:27 +0000 Subject: [PATCH] Remove itemMacro setting --- languages/br.json | 4 ---- languages/cn.json | 32 ++++++++++++++------------------ languages/de.json | 4 ---- languages/en.json | 4 ---- languages/es.json | 4 ---- languages/fr.json | 4 ---- languages/it.json | 4 ---- languages/ja.json | 4 ---- languages/ko.json | 32 ++++++++++++++------------------ languages/pl.json | 4 ---- scripts/item-macro-options.js | 5 ----- scripts/settings.js | 25 ------------------------- 12 files changed, 28 insertions(+), 98 deletions(-) delete mode 100644 scripts/item-macro-options.js diff --git a/languages/br.json b/languages/br.json index d3f4de2..4f5b951 100644 --- a/languages/br.json +++ b/languages/br.json @@ -23,10 +23,6 @@ "hint": "As informações do componente de magia, a concentração e o estatus ritual serão anotados ao lado do nome do feitiço.", "name": "Exibir informação de magias" }, - "itemMacroReplace": { - "hint": "Select which of the items will be shown in the inventory.", - "name": "Item-Macro: item macro, original item, or both" - }, "showItemsWithoutActivationCosts": { "hint": "If enabled, Items that have no activation information will be added to the Inventory list", "name": "Show Items without Activation costs" diff --git a/languages/cn.json b/languages/cn.json index 912662d..e509055 100644 --- a/languages/cn.json +++ b/languages/cn.json @@ -15,40 +15,36 @@ "skills": "技能", "settings": { "abbreviateSkills": { - "name": "缩写技能和属性名", - "hint": "启用后，技能和属性都会用其三字母缩写。" + "hint": "启用后，技能和属性都会用其三字母缩写。", + "name": "缩写技能和属性名" }, "displaySpellInfo": { - "name": "显示法术信息", - "hint": "启用后，法术构材信息、专注、仪式状态会在法术名旁标记出来。" - }, - "itemMacroReplace": { - "name": "物品宏：覆盖原有物品", - "hint": "启用后，有宏的物品的物品宏将会覆盖原本的物品，否则两个都会显示。" + "hint": "启用后，法术构材信息、专注、仪式状态会在法术名旁标记出来。", + "name": "显示法术信息" }, "showItemsWithoutActivationCosts": { "hint": "If enabled, Items that have no activation information will be added to the Inventory list", "name": "Show Items without Activation costs" }, "showPassiveFeats": { - "name": "顯示被動功能", - "hint": "顯示被動功能" + "hint": "顯示被動功能", + "name": "顯示被動功能" }, "showSlowActions": { - "name": "顯示緩慢的動作", - "hint": "顯示超過一輪的動作" + "hint": "顯示超過一輪的動作", + "name": "顯示緩慢的動作" }, "showUnchargedItems": { - "name": "显示空物品（包含物品和法术）", - "hint": "启用后，HUD上会显示没有剩余充能的物品。" + "hint": "启用后，HUD上会显示没有剩余充能的物品。", + "name": "显示空物品（包含物品和法术）" }, "showUnequippedItems": { - "name": "显示所有NPC物品", - "hint": "启用后，NPC的所有物品都会显示，而不仅仅是已装备的物品。" + "hint": "启用后，NPC的所有物品都会显示，而不仅仅是已装备的物品。", + "name": "显示所有NPC物品" }, "showUnpreparedSpells": { - "name": "显示所有未准备法术", - "hint": "禁用后，戏法、天生、契约和随意使用的法术需要在法术详情页设置为‘准备’状态才能显示在HUD上。" + "hint": "禁用后，戏法、天生、契约和随意使用的法术需要在法术详情页设置为‘准备’状态才能显示在HUD上。", + "name": "显示所有未准备法术" } } } diff --git a/languages/de.json b/languages/de.json index fd1b99e..890cc20 100644 --- a/languages/de.json +++ b/languages/de.json @@ -22,10 +22,6 @@ "hint": "If enabled, spell component information, concentration, and ritual status will be noted next to the spell name.", "name": "Display spell information" }, - "itemMacroReplace": { - "hint": "Select which of the items will be shown in the inventory.", - "name": "Item-Macro: item macro, original item, or both" - }, "showItemsWithoutActivationCosts": { "hint": "If enabled, Items that have no activation information will be added to the Inventory list", "name": "Show Items without Activation costs" diff --git a/languages/en.json b/languages/en.json index 9cfaee9..3a036ed 100644 --- a/languages/en.json +++ b/languages/en.json @@ -22,10 +22,6 @@ "hint": "Display spell component information, concentration, and ritual status next to the spell's name", "name": "Display Spell Information" }, - "itemMacroReplace": { - "hint": "Select which of the items will be shown in the inventory", - "name": "Item-Macro: item macro, original item, or both" - }, "showItemsWithoutActivationCosts": { "hint": "Show items without an activation cost", "name": "Show Items without Activation Costs" diff --git a/languages/es.json b/languages/es.json index 7063cb3..064a27a 100644 --- a/languages/es.json +++ b/languages/es.json @@ -23,10 +23,6 @@ "hint": "Si se activa, la información de los componentes del conjuro, la concentración y el estado del ritual se indicarán junto al nombre del conjuro.", "name": "Mostrar información del conjuro" }, - "itemMacroReplace": { - "hint": "Selecciona qué elementos se mostrarán en el inventario.", - "name": "Objeto-Macro: macro del objeto, objeto original, o ambos" - }, "showItemsWithoutActivationCosts": { "hint": "If enabled, Items that have no activation information will be added to the Inventory list", "name": "Show Items without Activation costs" diff --git a/languages/fr.json b/languages/fr.json index 1b3a227..227dd1a 100644 --- a/languages/fr.json +++ b/languages/fr.json @@ -22,10 +22,6 @@ "hint": "Si activée, les informations sur les composantes de sort, la concentration et les rituels seront affichées à côté du nom du sort.", "name": "Afficher les informations des sorts" }, - "itemMacroReplace": { - "hint": "Sélectionne quels objets seront montrés dans l'inventaire.", - "name": "Item-Macro: macro d'objet, objet original, ou les deux" - }, "showItemsWithoutActivationCosts": { "hint": "If enabled, Items that have no activation information will be added to the Inventory list", "name": "Show Items without Activation costs" diff --git a/languages/it.json b/languages/it.json index 635a60d..055b45b 100644 --- a/languages/it.json +++ b/languages/it.json @@ -22,10 +22,6 @@ "hint": "If enabled, spell component information, concentration, and ritual status will be noted next to the spell name.", "name": "Display spell information" }, - "itemMacroReplace": { - "hint": "Select which of the items will be shown in the inventory.", - "name": "Item-Macro: item macro, original item, or both" - }, "showItemsWithoutActivationCosts": { "hint": "If enabled, Items that have no activation information will be added to the Inventory list", "name": "Show Items without Activation costs" diff --git a/languages/ja.json b/languages/ja.json index a89d003..aa4c395 100644 --- a/languages/ja.json +++ b/languages/ja.json @@ -22,10 +22,6 @@ "hint": "呪文の構成要素、集中、儀式などの追加の情報が名前の隣に表示されます。", "name": "呪文の情報を表示する。" }, - "itemMacroReplace": { - "hint": "アイテムマクロを含むマクロはオリジナルを上書きします。それ以外では両方が表示されます。", - "name": "アイテムマクロ：オリジナルを上書き" - }, "showItemsWithoutActivationCosts": { "hint": "有効にすると、有効化の情報がないアイテムを所持品リストに追加します。", "name": "有効化コストのないアイテムの表示" diff --git a/languages/ko.json b/languages/ko.json index 0decb58..ea1b0e7 100644 --- a/languages/ko.json +++ b/languages/ko.json @@ -15,40 +15,36 @@ "skills": "기술", "settings": { "abbreviateSkills": { - "name": "기술 및 능력치 이름을 줄임", - "hint": "활성화할 경우 기술 및 능력치는 3 글자 약어로 표시된다." + "hint": "활성화할 경우 기술 및 능력치는 3 글자 약어로 표시된다.", + "name": "기술 및 능력치 이름을 줄임" }, "displaySpellInfo": { - "name": "주문 정보 표시", - "hint": "활성화할 경우 주문 구성요소 정보, 집중, 의식 상태가 주문 이름 옆에 표시된다." - }, - "itemMacroReplace": { - "name": "아이템 매크로: 원항목 덮어쓰기", - "hint": "활성화될 경우 아이템 매크로가 있는 아이템은 원래 아이템을 덮어쓰게 되며 그렇지 않을 경우 두 옵션이 모두 표시된다." + "hint": "활성화할 경우 주문 구성요소 정보, 집중, 의식 상태가 주문 이름 옆에 표시된다.", + "name": "주문 정보 표시" }, "showItemsWithoutActivationCosts": { "hint": "Show items without an activation cost", "name": "Show Items without Activation Costs" }, "showPassiveFeats": { - "name": "패시브 투수 표시", - "hint": "패시브 투수 표시" + "hint": "패시브 투수 표시", + "name": "패시브 투수 표시" }, "showSlowActions": { - "name": "느린 동작 표시", - "hint": "한 라운드보다 오래 걸리는 작업 표시" + "hint": "한 라운드보다 오래 걸리는 작업 표시", + "name": "느린 동작 표시" }, "showUnchargedItems": { - "name": "빈 항목 표시 (아이템과 주문 포함)", - "hint": "활성화할 경우 남은 충전량이 없더라도 HUD에 항목이 표시된다." + "hint": "활성화할 경우 남은 충전량이 없더라도 HUD에 항목이 표시된다.", + "name": "빈 항목 표시 (아이템과 주문 포함)" }, "showUnequippedItems": { - "name": "모든 NPC 아이템 표시", - "hint": "활성화할 경우 NPC가 장비한 아이템 뿐만이 아닌, 모든 아이템이 표시된다." + "hint": "활성화할 경우 NPC가 장비한 아이템 뿐만이 아닌, 모든 아이템이 표시된다.", + "name": "모든 NPC 아이템 표시" }, "showUnpreparedSpells": { - "name": "모든 준비 불가능한 주문들 표시", - "hint": "비활성화할 경우 캔트립(소마법), 선천적, 계약, 의지(At-will) 주문들은 주문 상세 정보에서 '준비'하여야 HUD에 표시된다." + "hint": "비활성화할 경우 캔트립(소마법), 선천적, 계약, 의지(At-will) 주문들은 주문 상세 정보에서 '준비'하여야 HUD에 표시된다.", + "name": "모든 준비 불가능한 주문들 표시" } } } diff --git a/languages/pl.json b/languages/pl.json index ed2a7ab..f2139d6 100644 --- a/languages/pl.json +++ b/languages/pl.json @@ -22,10 +22,6 @@ "hint": "If enabled, spell component information, concentration, and ritual status will be noted next to the spell name.", "name": "Display spell information" }, - "itemMacroReplace": { - "hint": "If enabled, items with an item macro will overwrite their original, otherwise both options will be shown.", - "name": "Item-Macro: overwrite original item" - }, "showItemsWithoutActivationCosts": { "hint": "Show items without an activation cost", "name": "Show Items without Activation Costs" diff --git a/scripts/item-macro-options.js b/scripts/item-macro-options.js deleted file mode 100644 index b985a78..0000000 --- a/scripts/item-macro-options.js +++ /dev/null @@ -1,5 +0,0 @@ -export const ItemMacroOptions = { - SHOW_BOTH: 'tokenActionHud.settings.itemMacroReplace.showBoth', - SHOW_ITEM_MACRO: 'tokenActionHud.settings.itemMacroReplace.showItemMacro', - SHOW_ORIGINAL_ITEM: 'tokenActionHud.settings.itemMacroReplace.showOriginal' -} diff --git a/scripts/settings.js b/scripts/settings.js index b3ef300..4de1ed1 100644 --- a/scripts/settings.js +++ b/scripts/settings.js @@ -1,31 +1,6 @@ -import { ItemMacroOptions } from './item-macro-options.js' - export function register (updateFunc) { const appName = 'token-action-hud-dnd5e' - if (game.modules.get('itemacro')?.active) { - game.settings.register(appName, 'itemMacroReplace', { - name: game.i18n.localize( - 'tokenActionHud.dnd5e.settings.itemMacroReplace.name' - ), - hint: game.i18n.localize( - 'tokenActionHud.dnd5e.settings.itemMacroReplace.hint' - ), - scope: 'client', - config: 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) - } - }) - } - game.settings.register(appName, 'abbreviateSkills', { name: game.i18n.localize( 'tokenActionHud.dnd5e.settings.abbreviateSkills.name'