From d3836fbeebeb89ba3049f27a527fe8431201c661 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 19 Jul 2025 22:19:55 +0200
Subject: [PATCH] Added effect enricher

---
 daggerheart.mjs                          | 38 +++---------------------
 lang/en.json                             |  3 +-
 module/enrichers/DamageEnricher.mjs      |  6 ++--
 module/enrichers/DualityRollEnricher.mjs |  2 +-
 module/enrichers/EffectEnricher.mjs      | 19 ++++++++++++
 module/enrichers/_module.mjs             | 31 ++++++++++++++++---
 styles/less/ui/chat/chat.less            |  1 +
 styles/less/ui/chat/sheet.less           | 21 +++++++++++++
 8 files changed, 77 insertions(+), 44 deletions(-)
 create mode 100644 module/enrichers/EffectEnricher.mjs

diff --git a/daggerheart.mjs b/daggerheart.mjs
index 5bb0b016..a3bf35ca 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -3,7 +3,7 @@ import * as applications from './module/applications/_module.mjs';
 import * as models from './module/data/_module.mjs';
 import * as documents from './module/documents/_module.mjs';
 import RegisterHandlebarsHelpers from './module/helpers/handlebarsHelper.mjs';
-import { enricherConfig } from './module/enrichers/_module.mjs';
+import { enricherConfig, enricherRenderSetup } from './module/enrichers/_module.mjs';
 import { getCommandTarget, rollCommandToJSON } from './module/helpers/utils.mjs';
 import { NarrativeCountdowns } from './module/applications/ui/countdowns.mjs';
 import { DualityRollColor } from './module/data/settings/Appearance.mjs';
@@ -168,45 +168,15 @@ Hooks.on('ready', () => {
 Hooks.once('dicesoniceready', () => {});
 
 Hooks.on('renderChatMessageHTML', (_, element) => {
-    element
-        .querySelectorAll('.enriched-damage-button')
-        .forEach(element => element.addEventListener('click', renderDamageButton));
-
-    element
-        .querySelectorAll('.duality-roll-button')
-        .forEach(element => element.addEventListener('click', renderDualityButton));
-
-    element
-        .querySelectorAll('.measured-template-button')
-        .forEach(element => element.addEventListener('click', renderMeasuredTemplate));
+    enricherRenderSetup(element);
 });
 
 Hooks.on('renderJournalEntryPageProseMirrorSheet', (_, element) => {
-    element
-        .querySelectorAll('.enriched-damage-button')
-        .forEach(element => element.addEventListener('click', renderDamageButton));
-
-    element
-        .querySelectorAll('.duality-roll-button')
-        .forEach(element => element.addEventListener('click', renderDualityButton));
-
-    element
-        .querySelectorAll('.measured-template-button')
-        .forEach(element => element.addEventListener('click', renderMeasuredTemplate));
+    enricherRenderSetup(element);
 });
 
 Hooks.on('renderHandlebarsApplication', (_, element) => {
-    element
-        .querySelectorAll('.enriched-damage-button')
-        .forEach(element => element.addEventListener('click', renderDamageButton));
-
-    element
-        .querySelectorAll('.duality-roll-button')
-        .forEach(element => element.addEventListener('click', renderDualityButton));
-
-    element
-        .querySelectorAll('.measured-template-button')
-        .forEach(element => element.addEventListener('click', renderMeasuredTemplate));
+    enricherRenderSetup(element);
 });
 
 Hooks.on('chatMessage', (_, message) => {
diff --git a/lang/en.json b/lang/en.json
index 9f929c77..8a170bd6 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -1590,7 +1590,8 @@
                 "sendToVault": "Send to Vault",
                 "sendToLoadout": "Send to Loadout",
                 "makeDeathMove": "Make a Death Move",
-                "rangeAndTarget": "Range & Target"
+                "rangeAndTarget": "Range & Target",
+                "dragApplyEffect": "Drag effect to apply it to an actor"
             }
         }
     }
diff --git a/module/enrichers/DamageEnricher.mjs b/module/enrichers/DamageEnricher.mjs
index 5c277b81..918edc39 100644
--- a/module/enrichers/DamageEnricher.mjs
+++ b/module/enrichers/DamageEnricher.mjs
@@ -1,5 +1,3 @@
-import { rollCommandToJSON } from '../helpers/utils.mjs';
-
 export default function DhDamageEnricher(match, _options) {
     const parts = match[1].split('|').map(x => x.trim());
 
@@ -25,8 +23,7 @@ export default function DhDamageEnricher(match, _options) {
     return getDamageMessage(value, type, match[0]);
 }
 
-export function getDamageMessage(damage, type, defaultElement) {
-    const dualityElement = document.createElement('span');
+function getDamageMessage(damage, type, defaultElement) {
     const typeIcons = type
         .replace('[', '')
         .replace(']', '')
@@ -41,6 +38,7 @@ export function getDamageMessage(damage, type, defaultElement) {
 
     const iconNodes = typeIcons.map(x => `<i class="fa-solid ${x}"></i>`).join('');
 
+    const dualityElement = document.createElement('span');
     dualityElement.innerHTML = `
         <button class="enriched-damage-button" 
             data-value="${damage}"
diff --git a/module/enrichers/DualityRollEnricher.mjs b/module/enrichers/DualityRollEnricher.mjs
index 094a6948..a2da2805 100644
--- a/module/enrichers/DualityRollEnricher.mjs
+++ b/module/enrichers/DualityRollEnricher.mjs
@@ -8,7 +8,7 @@ export default function DhDualityRollEnricher(match, _options) {
     return getDualityMessage(roll);
 }
 
-export function getDualityMessage(roll) {
+function getDualityMessage(roll) {
     const traitLabel =
         roll.trait && abilities[roll.trait]
             ? game.i18n.format('DAGGERHEART.GENERAL.check', {
diff --git a/module/enrichers/EffectEnricher.mjs b/module/enrichers/EffectEnricher.mjs
new file mode 100644
index 00000000..69b89ef2
--- /dev/null
+++ b/module/enrichers/EffectEnricher.mjs
@@ -0,0 +1,19 @@
+export default async function DhEffectEnricher(match, _options) {
+    const effect = await foundry.utils.fromUuid(match[1]);
+    if (!effect) return match[0];
+
+    const dualityElement = document.createElement('span');
+    dualityElement.innerHTML = `
+        <a class="flexrow enriched-effect" 
+            data-link
+            draggable="true"
+            data-uuid="${match[1]}"
+            data-tooltip="${game.i18n.localize('DAGGERHEART.UI.Tooltip.dragApplyEffect')}"
+        >
+            <img src="icons/svg/aura.svg" style="width: 24px;" />
+            <span>${effect.name}</span>
+        </a>
+    `;
+
+    return dualityElement;
+}
diff --git a/module/enrichers/_module.mjs b/module/enrichers/_module.mjs
index ed825f03..abfd8158 100644
--- a/module/enrichers/_module.mjs
+++ b/module/enrichers/_module.mjs
@@ -1,8 +1,9 @@
-import { default as DhDamageEnricher } from './DamageEnricher.mjs';
-import { default as DhDualityRollEnricher } from './DualityRollEnricher.mjs';
-import { default as DhTemplateEnricher } from './TemplateEnricher.mjs';
+import { default as DhDamageEnricher, renderDamageButton } from './DamageEnricher.mjs';
+import { default as DhDualityRollEnricher, renderDualityButton } from './DualityRollEnricher.mjs';
+import { default as DhEffectEnricher } from './EffectEnricher.mjs';
+import { default as DhTemplateEnricher, renderMeasuredTemplate } from './TemplateEnricher.mjs';
 
-export { DhDamageEnricher, DhDualityRollEnricher, DhTemplateEnricher };
+export { DhDamageEnricher, DhDualityRollEnricher, DhEffectEnricher, DhTemplateEnricher };
 
 export const enricherConfig = [
     {
@@ -13,8 +14,30 @@ export const enricherConfig = [
         pattern: /\[\[\/dr\s?(.*?)\]\]/g,
         enricher: DhDualityRollEnricher
     },
+    {
+        pattern: /^@Effect\[(.*)\]$/g,
+        enricher: DhEffectEnricher
+    },
     {
         pattern: /^@Template\[(.*)\]$/g,
         enricher: DhTemplateEnricher
     }
 ];
+
+export const enricherRenderSetup = element => {
+    element
+        .querySelectorAll('.enriched-damage-button')
+        .forEach(element => element.addEventListener('click', renderDamageButton));
+
+    element
+        .querySelectorAll('.duality-roll-button')
+        .forEach(element => element.addEventListener('click', renderDualityButton));
+
+    element
+        .querySelectorAll('.measured-template-button')
+        .forEach(element => element.addEventListener('click', renderMeasuredTemplate));
+
+    // element
+    //     .querySelectorAll('.enriched-effect')
+    //     .forEach(element => element.addEventListener('dragstart', dragEnrichedEffect));
+};
diff --git a/styles/less/ui/chat/chat.less b/styles/less/ui/chat/chat.less
index 6b5db1b9..c08384e6 100644
--- a/styles/less/ui/chat/chat.less
+++ b/styles/less/ui/chat/chat.less
@@ -365,6 +365,7 @@
             width: 80px;
         }
     }
+
     button {
         &.inner-button {
             --button-size: 1.25rem;
diff --git a/styles/less/ui/chat/sheet.less b/styles/less/ui/chat/sheet.less
index 58281690..1c41f97e 100644
--- a/styles/less/ui/chat/sheet.less
+++ b/styles/less/ui/chat/sheet.less
@@ -4,6 +4,27 @@
     .dice-title {
         display: none;
     }
+
+    .message-content {
+        .enriched-effect {
+            display: flex;
+            align-items: center;
+            border: 1px solid black;
+            width: fit-content;
+            padding: 0 2px 0 0;
+            border-radius: 6px;
+            color: @dark;
+            background-image: url(../assets/parchments/dh-parchment-light.png);
+
+            &:hover {
+                text-shadow: none;
+            }
+
+            span {
+                white-space: nowrap;
+            }
+        }
+    }
 }
 
 fieldset.daggerheart.chat {