From 4b40dfd7bec2395aedb4a614493d2e8d99ae122e Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Tue, 15 Jul 2025 23:51:38 +0200
Subject: [PATCH] Fixed so UseItem macros get the img set

---
 module/applications/sheets/api/base-actor.mjs | 1 +
 module/applications/ui/hotbar.mjs             | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/applications/sheets/api/base-actor.mjs b/module/applications/sheets/api/base-actor.mjs
index da1467a1..78df0aac 100644
--- a/module/applications/sheets/api/base-actor.mjs
+++ b/module/applications/sheets/api/base-actor.mjs
@@ -65,6 +65,7 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
             const attackData = {
                 type: 'Attack',
                 actorUuid: this.document.uuid,
+                img: this.document.system.attack.img,
                 fromInternal: true
             };
             event.dataTransfer.setData('text/plain', JSON.stringify(attackData));
diff --git a/module/applications/ui/hotbar.mjs b/module/applications/ui/hotbar.mjs
index 636465c4..b4ebc05c 100644
--- a/module/applications/ui/hotbar.mjs
+++ b/module/applications/ui/hotbar.mjs
@@ -70,7 +70,7 @@ export default class DhHotbar extends foundry.applications.ui.Hotbar {
                     case 'subclass':
                         return true;
                     default:
-                        this.createItemMacro(data, slot);
+                        this.createItemMacro(item, slot);
                         return false;
                 }
             } else if (data.type === 'Action') {
@@ -101,7 +101,7 @@ export default class DhHotbar extends foundry.applications.ui.Hotbar {
         const macro = await Macro.implementation.create({
             name: `${game.i18n.localize('Display')} ${name}`,
             type: CONST.MACRO_TYPES.SCRIPT,
-            img: 'icons/svg/book.svg',
+            img: data.img,
             command: `await game.system.api.applications.ui.DhHotbar.useItem("${data.uuid}");`
         });
         await game.user.assignHotbarMacro(macro, slot);
@@ -111,7 +111,7 @@ export default class DhHotbar extends foundry.applications.ui.Hotbar {
         const macro = await Macro.implementation.create({
             name: `${game.i18n.localize('Display')} ${name}`,
             type: CONST.MACRO_TYPES.SCRIPT,
-            img: 'icons/svg/book.svg',
+            img: data.data.img,
             command: `await game.system.api.applications.ui.DhHotbar.useAction("${data.data.itemUuid}", "${data.data.id}");`
         });
         await game.user.assignHotbarMacro(macro, slot);
@@ -121,7 +121,7 @@ export default class DhHotbar extends foundry.applications.ui.Hotbar {
         const macro = await Macro.implementation.create({
             name: `${game.i18n.localize('Display')} ${name}`,
             type: CONST.MACRO_TYPES.SCRIPT,
-            img: 'icons/svg/book.svg',
+            img: data.img,
             command: `await game.system.api.applications.ui.DhHotbar.useAttack("${data.actorUuid}");`
         });
         await game.user.assignHotbarMacro(macro, slot);