lang/en.json

@@ -2010,8 +2010,7 @@
             "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": {

module/data/action/baseAction.mjs

@@ -348,31 +348,29 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
             'system.bonuses.roll.spellcast.bonus'
         ];
 
-        const results = [];
+        return Array.from(await actor.allApplicableEffects({ noTransferArmor: true, noSelfArmor: true })).reduce(
-        const applicableEffects = await actor.allApplicableEffects({ noTransferArmor: true, noSelfArmor: true });
+            (acc, effect) => {
-        for (const effect of [...applicableEffects].filter(e => !e.isSuppressed)) {
+                const effectData = effect.toObject();
+                /* Effects on weapons only ever apply for the weapon itself, with a few defined exceptions */
                 if (effect.parent.type === 'weapon') {
-                // Effects on weapons only ever apply for the weapon itself (with a few exceptions)
+                    /* Unless they're secondary - then they apply only to other primary weapons */
-                const restricted =
+                    if (effect.parent.system.secondary) {
-                    effect.parent.system.secondary
+                        if (effectParent?.type !== 'weapon' || effectParent?.system.secondary) {
-                        // Secondary applies only to other primary weapons
+                            effectData.system.changes = 
-                        ? effectParent?.type !== 'weapon' || effectParent?.system.secondary
+                                effectData.system.changes.filter(x => weaponTransferredEffectKeys.includes(x.key));
-                        // Primary only applies to itself
-                        : effectParent?.id !== effect.parent.id;
-                if (restricted) {
-                    const sourceChanges = effect._source.system.changes;
-                    const changes = sourceChanges.filter(x => weaponTransferredEffectKeys.includes(x.key));
-                    if (changes.length) {
-                        results.push(effect.clone({ 'system.changes': changes }));
                         } 
-                    continue;
+                    } else if (effectParent?.id !== effect.parent.id) {
+                        effectData.system.changes = 
+                            effectData.system.changes.filter(x => weaponTransferredEffectKeys.includes(x.key));
                     }
                 }
 
-            results.push(effect);
+                if (!effect.isSuppressed) {
+                    acc.push(effectData);
                 }
 
-        return results;
+                return acc;
+            }, []);
     }
 
     /**

module/documents/activeEffect.mjs

@@ -224,13 +224,12 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
      * @returns {string[]} An array of localized tag strings.
      */
     _getTags() {
-        const tags = [];
+        const tags = [
-        const originActor = DhActiveEffect.#resolveParentDocument(fromUuidSync(this.origin), Actor);
+            `${game.i18n.localize(this.parent.system.metadata.label)}: ${this.parent.name}`,
-        if (originActor && originActor !== this.actor) {
+            game.i18n.localize(
-            tags.push(_loc('DAGGERHEART.EFFECTS.OriginTag', { name: originActor.name }));
+                this.isTemporary ? 'DAGGERHEART.EFFECTS.Duration.temporary' : 'DAGGERHEART.EFFECTS.Duration.passive'
-        } 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);

styles/less/global/prose-mirror.less

@@ -3,8 +3,6 @@
 
 .application.daggerheart {
     prose-mirror {
-        --menu-padding: 4px 0px;
-        --menu-height: calc(var(--menu-button-height) + 8px);
         height: 100% !important;
         width: 100%;