From c2275017f8bcc5a02a5f84fc87f75285095115e1 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Wed, 22 Feb 2023 20:38:37 +0100 Subject: [PATCH] fix: fix item macro creating via drag & drop --- src/macros/roll-item.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/macros/roll-item.js b/src/macros/roll-item.js index 9f7b0dc2..c9517240 100644 --- a/src/macros/roll-item.js +++ b/src/macros/roll-item.js @@ -29,18 +29,18 @@ export async function createRollItemMacro(data, slot) { ); } - const macro = await getOrCreateRollItemMacro(itemData); + const macro = await getOrCreateRollItemMacro(item); await getGame().user?.assignHotbarMacro(macro ?? null, slot); } /** - * @param {object} itemData The item data + * @param {object} item The item * @returns {Promise} A promise that resolves to the created macro */ -async function getOrCreateRollItemMacro(itemData) { - const command = `game.ds4.macros.rollItem("${itemData._id}");`; +async function getOrCreateRollItemMacro(item) { + const command = `game.ds4.macros.rollItem("${item.id}");`; - const existingMacro = getGame().macros?.find((m) => m.name === itemData.name && m.data.command === command); + const existingMacro = getGame().macros?.find((m) => m.name === item.name && m.command === command); if (existingMacro) { return existingMacro; } @@ -48,9 +48,9 @@ async function getOrCreateRollItemMacro(itemData) { return Macro.create( { command, - name: itemData.name, + name: item.name, type: "script", - img: itemData.img, + img: item.img, flags: { "ds4.itemMacro": true }, }, { renderSheet: false },