From 958eaa310c2b33414527b68afbe6b4ecc64f02c3 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <CarlosFdez@users.noreply.github.com>
Date: Tue, 23 Jun 2026 06:22:03 -0400
Subject: [PATCH] Simplify ActiveEffect sheet tags (#2037)

* Simplify ActiveEffect sheet tags

* Show origin actor and exclude tag if it is a top level actor tag without origin
---
 lang/en.json                      |  3 ++-
 module/documents/activeEffect.mjs | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lang/en.json b/lang/en.json
index a4a5edf0..3f21f5eb 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -2010,7 +2010,8 @@
             "Attachments": {
                 "attachHint": "Drop items here to attach them",
                 "transferHint": "If checked, this effect will be applied to any actor that owns this Effect's parent Item. The effect is always applied if this Item is attached to another one."
-            }
+            },
+            "OriginTag": "Origin: {name}"
         },
         "GENERAL": {
             "Ability": {
diff --git a/module/documents/activeEffect.mjs b/module/documents/activeEffect.mjs
index 0e7f5d1e..083b3950 100644
--- a/module/documents/activeEffect.mjs
+++ b/module/documents/activeEffect.mjs
@@ -224,12 +224,13 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
      * @returns {string[]} An array of localized tag strings.
      */
     _getTags() {
-        const tags = [
-            `${game.i18n.localize(this.parent.system.metadata.label)}: ${this.parent.name}`,
-            game.i18n.localize(
-                this.isTemporary ? 'DAGGERHEART.EFFECTS.Duration.temporary' : 'DAGGERHEART.EFFECTS.Duration.passive'
-            )
-        ];
+        const tags = [];
+        const originActor = DhActiveEffect.#resolveParentDocument(fromUuidSync(this.origin), Actor);
+        if (originActor && originActor !== this.actor) {
+            tags.push(_loc('DAGGERHEART.EFFECTS.OriginTag', { name: originActor.name }));
+        } else if (!(this.parent instanceof Actor)) {
+            tags.push(`${_loc(this.parent.system.metadata.label)}: ${this.parent.name}`);
+        }
 
         for (const statusId of this.statuses) {
             const status = CONFIG.statusEffects.find(s => s.id === statusId);