Merge 0f334232d8 into 876e496d24

lang/en.json

@@ -138,7 +138,8 @@
             "Config": {
                 "rangeDependence": {
                     "title": "Range Dependence"
-                }
+                },
+                "stacking": { "title": "Stacking" }
             },
             "RangeDependance": {
                 "hint": "Settings for an optional distance at which this effect should activate",
@@ -2884,6 +2885,8 @@
             },
             "EffectsDisplay": {
                 "removeThing": "[Right Click] Remove {thing}",
+                "increaseStacks": "[Left Click] Increment Stacks",
+                "decreaseStacks": "[Right Click] Decrement Stacks",
                 "appliedBy": "Applied By: {by}"
             },
             "ItemBrowser": {

module/applications/ui/effectsDisplay.mjs

@@ -52,7 +52,8 @@ export default class DhEffectsDisplay extends HandlebarsApplicationMixin(Applica
 
         if (this.element) {
             this.element.querySelectorAll('.effect-container a').forEach(element => {
-                element.addEventListener('contextmenu', this.removeEffect.bind(this));
+                element.addEventListener('click', this.effectLeftclick.bind(this));
+                element.addEventListener('contextmenu', this.effectRightclick.bind(this));
             });
         }
     }
@@ -87,11 +88,31 @@ export default class DhEffectsDisplay extends HandlebarsApplicationMixin(Applica
         this.render();
     }
 
-    async removeEffect(event) {
+    async effectLeftclick(event) {
         const element = event.target.closest('.effect-container');
         const effects = DhEffectsDisplay.getTokenEffects();
         const effect = effects.find(x => x.id === element.dataset.effectId);
-        await effect.delete();
+
+        if (!effect.system.stacking?.enabled) return;
+
+        const incrementedValue = effect.system.stacking.value + 1;
+        const newValue = effect.system.stacking.max
+            ? Math.min(incrementedValue, effect.system.stacking.max)
+            : incrementedValue;
+        await effect.update({ 'system.stacking.value': newValue });
+        this.render();
+    }
+
+    async effectRightclick(event) {
+        const element = event.target.closest('.effect-container');
+        const effects = DhEffectsDisplay.getTokenEffects();
+        const effect = effects.find(x => x.id === element.dataset.effectId);
+        if (effect.system.stacking?.enabled && effect.system.stacking.value > 1) {
+            await effect.update({ 'system.stacking.value': effect.system.stacking.value - 1 });
+        } else {
+            await effect.delete();
+        }
+
         this.render();
     }
 

module/applications/ux/contextMenu.mjs

@@ -1,97 +1,4 @@
-/**
- * @typedef ContextMenuEntry
- * @property {string} name                              The context menu label. Can be localized.
- * @property {string} [icon]                            A string containing an HTML icon element for the menu item.
- * @property {string} [classes]                         Additional CSS classes to apply to this menu item.
- * @property {string} [group]                           An identifier for a group this entry belongs to.
- * @property {ContextMenuJQueryCallback} callback       The function to call when the menu item is clicked.
- * @property {ContextMenuCondition|boolean} [condition] A function to call or boolean value to determine if this entry
- *                                                      appears in the menu.
- */
-
-/**
- * @callback ContextMenuCondition
- * @param {jQuery|HTMLElement} html                     The element of the context menu entry.
- * @returns {boolean}                                   Whether the entry should be rendered in the context menu.
- */
-
-/**
- * @callback ContextMenuCallback
- * @param {HTMLElement} target                          The element that the context menu has been triggered for.
- * @returns {unknown}
- */
-
-/**
- * @callback ContextMenuJQueryCallback
- * @param {HTMLElement|jQuery} target                   The element that the context menu has been triggered for. Will
- *                                                      either be a jQuery object or an HTMLElement instance, depending
- *                                                      on how the ContextMenu was configured.
- * @returns {unknown}
- */
-
-/**
- * @typedef ContextMenuOptions
- * @property {string} [eventName="contextmenu"] Optionally override the triggering event which can spawn the menu. If
- *                                              the menu is using fixed positioning, this event must be a MouseEvent.
- * @property {ContextMenuCallback} [onOpen]     A function to call when the context menu is opened.
- * @property {ContextMenuCallback} [onClose]    A function to call when the context menu is closed.
- * @property {boolean} [fixed=false]            If true, the context menu is given a fixed position rather than being
- *                                              injected into the target.
- * @property {boolean} [jQuery=true]            If true, callbacks will be passed jQuery objects instead of HTMLElement
- *                                              instances.
- */
-
-/**
- * @typedef ContextMenuRenderOptions
- * @property {Event} [event]           The event that triggered the context menu opening.
- * @property {boolean} [animate=true]  Animate the context menu opening.
- */
-
-/**
- * A subclass of ContextMenu.
- * @extends {foundry.applications.ux.ContextMenu}
- */
 export default class DHContextMenu extends foundry.applications.ux.ContextMenu {
-    /**
-     * @param {HTMLElement|jQuery} container - The HTML element that contains the context menu targets.
-     * @param {string} selector - A CSS selector which activates the context menu.
-     * @param {ContextMenuEntry[]} menuItems - An Array of entries to display in the menu
-     * @param {ContextMenuOptions} [options] - Additional options to configure the context menu.
-     */
-    constructor(container, selector, menuItems, options) {
-        super(container, selector, menuItems, options);
-
-        /** @deprecated since v13 until v15 */
-        this.#jQuery = options.jQuery;
-    }
-
-    /**
-     * Whether to pass jQuery objects or HTMLElement instances to callback.
-     * @type {boolean}
-     */
-    #jQuery;
-
-    /**@inheritdoc */
-    activateListeners(menu) {
-        menu.addEventListener('click', this.#onClickItem.bind(this));
-    }
-
-    /**
-     * Handle click events on context menu items.
-     * @param {PointerEvent} event      The click event
-     */
-    #onClickItem(event) {
-        event.preventDefault();
-        event.stopPropagation();
-        const element = event.target.closest('.context-item');
-        if (!element) return;
-        const item = this.menuItems.find(i => i.element === element);
-        item?.callback(this.#jQuery ? $(this.target) : this.target, event);
-        this.close();
-    }
-
-    /* -------------------------------------------- */
-
     /**
      * Trigger a context menu event in response to a normal click on a additional options button.
      * @param {PointerEvent} event

module/canvas/placeables/token.mjs

@@ -30,8 +30,8 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
             if (!effect.img) continue;
             const promise =
                 effect === overlayEffect
-                    ? this._drawOverlay(effect.img, effect.tint)
+                    ? this._drawOverlay(effect.img, effect.tint, effect)
-                    : this._drawEffect(effect.img, effect.tint);
+                    : this._drawEffect(effect.img, effect.tint, effect);
             promises.push(
                 promise.then(e => {
                     if (e) e.zIndex = i;
@@ -45,6 +45,39 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
         this.renderFlags.set({ refreshEffects: true });
     }
 
+    /**@inheritdoc */
+    async _drawEffect(src, tint, effect) {
+        if (!src) return;
+        const tex = await foundry.canvas.loadTexture(src, { fallback: 'icons/svg/hazard.svg' });
+        const icon = new PIXI.Sprite(tex);
+        icon.tint = tint ?? 0xffffff;
+
+        if (effect?.system?.stacking?.enabled && effect.system.stacking.value > 1) {
+            const stackOverlay = new PIXI.Text(effect.system.stacking.value, {
+                fill: '#f3c267',
+                stroke: '#000000',
+                fontSize: 96,
+                strokeThickness: 4
+            });
+            const nrDigits = Math.floor(Math.log10(effect.system.stacking.value)) + 1;
+            stackOverlay.y = -8;
+            /* This does not account for 1:s being much less wide than other digits. I don't think it's desired however as it makes it look jumpy */
+            stackOverlay.x = icon.width - 8 - nrDigits * 56;
+            stackOverlay.anchor.set(0, 0);
+
+            icon.addChild(stackOverlay);
+        }
+
+        return this.effects.addChild(icon);
+    }
+
+    async _drawOverlay(src, tint, effect) {
+        const icon = await this._drawEffect(src, tint, effect);
+        if (icon) icon.alpha = 0.8;
+        this.effects.overlay = icon ?? null;
+        return icon;
+    }
+
     /**
      * Returns the distance from this token to another token object.
      * This value is corrected to handle alternate token sizes and other grid types

module/data/activeEffect/baseEffect.mjs

@@ -65,6 +65,17 @@ export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel {
                     initial: CONFIG.DH.GENERAL.range.melee.id,
                     label: 'DAGGERHEART.GENERAL.range'
                 })
+            }),
+            stacking: new fields.SchemaField({
+                enabled: new fields.BooleanField({ initial: false, label: 'DAGGERHEART.GENERAL.enabled' }),
+                value: new fields.NumberField({
+                    initial: 1,
+                    min: 1,
+                    integer: true,
+                    nullable: false,
+                    label: 'DAGGERHEART.GENERAL.value'
+                }),
+                max: new fields.NumberField({ integer: true, label: 'DAGGERHEART.GENERAL.max' })
             })
         };
     }

module/data/fields/action/effectsField.mjs

@@ -106,22 +106,11 @@ export default class EffectsField extends fields.ArrayField {
     }
 
     /**
-     * Apply an Effect to a target or enable it if already on it
+     * Apply an Effect to a target
      * @param {object} effect   Effect object containing ActiveEffect UUID
      * @param {object} actor    Actor Document
      */
     static async applyEffect(effect, actor) {
-        const existingEffect = actor.effects.find(e => e.origin === effect.uuid);
-        if (existingEffect) {
-            return effect.update(
-                foundry.utils.mergeObject({
-                    ...effect.constructor.getInitialDuration(),
-                    disabled: false
-                })
-            );
-        }
-
-        // Otherwise, create a new effect on the target
         const effectData = foundry.utils.mergeObject({
             ...(effect.toObject?.() ?? effect),
             disabled: false,

module/documents/activeEffect.mjs

@@ -1,5 +1,5 @@
 import { itemAbleRollParse } from '../helpers/utils.mjs';
-import { RefreshType, socketEvent } from '../systemRegistration/socket.mjs';
+import { RefreshType } from '../systemRegistration/socket.mjs';
 
 export default class DhActiveEffect extends foundry.documents.ActiveEffect {
     /* -------------------------------------------- */
@@ -106,6 +106,20 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
             update.img = 'icons/magic/life/heart-cross-blue.webp';
         }
 
+        const existingEffect = this.actor.effects.find(x => x.origin === data.origin);
+        const stacks = data.system?.stacking?.enabled;
+        if (existingEffect && !stacks) return false;
+
+        if (existingEffect && stacks) {
+            const incrementedValue = existingEffect.system.stacking.value + 1;
+            await existingEffect.update({
+                'system.stacking.value': existingEffect.system.stacking.max
+                    ? Math.min(incrementedValue, existingEffect.system.stacking.max)
+                    : incrementedValue
+            });
+            return false;
+        }
+
         const statuses = Object.keys(data.statuses ?? {});
         const immuneStatuses =
             statuses.filter(
@@ -182,10 +196,17 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
             } catch (_) {}
         }
 
-        const evalValue = this.effectSafeEval(itemAbleRollParse(key, parseModel, effect.parent));
+        const evalValue = this.effectSafeEval(this.effectRollParse(key, parseModel, effect.parent, effect));
         return evalValue ?? key;
     }
 
+    static effectRollParse(value, actor, item, effect) {
+        const stackingParsedValue = effect.system.stacking?.enabled
+            ? Roll.replaceFormulaData(value, { stacks: effect.system.stacking.value })
+            : value;
+        return itemAbleRollParse(stackingParsedValue, actor, item);
+    }
+
     /**
      * Altered Foundry safeEval to allow non-numeric return
      * @param {string} expression

src/packs/classes/feature_No_Mercy_njj2C3tMDeCHHOoh.json

@@ -71,13 +71,18 @@
         "changes": [
           {
             "key": "system.bonuses.roll.attack.bonus",
-            "value": 1,
+            "type": "add",
+            "value": "@stacks",
             "priority": null,
-            "type": "add"
+            "phase": "initial"
           }
         ],
         "duration": {
           "type": "shortRest"
+        },
+        "stacking": {
+          "enabled": true,
+          "max": null
         }
       },
       "disabled": false,

src/packs/classes/feature_Rogue_s_Dodge_hVaaPIjxoextIgSL.json

@@ -69,14 +69,19 @@
         "changes": [
           {
             "key": "system.evasion",
-            "value": 2,
+            "type": "add",
+            "value": "2 * @stacks",
             "priority": null,
-            "type": "add"
+            "phase": "initial"
           }
         ],
         "duration": {
           "type": "temporary",
           "description": "<p><span style=\"color: rgb(239, 230, 216); font-family: Montserrat, sans-serif; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; white-space: normal; background-color: rgba(24, 22, 46, 0.565); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; display: inline !important; float: none;\">Until the next time an attack succeeds against you.</span></p>"
+        },
+        "stacking": {
+          "enabled": true,
+          "max": null
         }
       },
       "disabled": false,

src/packs/domains/domainCard_Corrosive_Projectile_qJaSNTuDfbPVr8Lb.json

@@ -127,7 +127,7 @@
   "sort": 3400000,
   "effects": [
     {
-      "name": "Corroded (1 stack)",
+      "name": "Corroded",
       "img": "icons/magic/acid/dissolve-bone-white.webp",
       "origin": "Compendium.daggerheart.domains.Item.qJaSNTuDfbPVr8Lb",
       "transfer": false,
@@ -139,27 +139,32 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
+        },
+        "changes": [
+          {
+            "key": "system.difficulty",
+            "type": "add",
+            "value": "-@stack",
+            "priority": null,
+            "phase": "initial"
+          }
+        ],
+        "stacking": {
+          "enabled": true,
+          "max": null
+        },
+        "duration": {
+          "type": ""
         }
       },
-      "changes": [
-        {
-          "key": "system.difficulty",
-          "mode": 2,
-          "value": "-1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
-        "startTime": null,
+        "value": null,
-        "combat": null,
+        "units": "seconds",
-        "seconds": null,
+        "expiry": null,
-        "rounds": null,
+        "expired": false
-        "turns": null,
-        "startRound": null,
-        "startTurn": null
       },
-      "description": "<p><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">While a target is </span><span style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Corroded</span><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">, they gain a −1 penalty to their </span><span class=\"tooltip-convert\" style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Difficulty</span><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> for every 2 Stress you spent. This </span><span class=\"tooltip-convert\" style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">condition</span><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> can stack.</p>",
+      "description": "<p><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">While a target is </span><span style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Corroded</span><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">, they gain a −1 penalty to their </span><span style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\" class=\"tooltip-convert\">Difficulty</span><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> for every 2 Stress you spent. This </span><span style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\" class=\"tooltip-convert\">condition</span><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> can stack.</span></p>",
       "tint": "#ffffff",
       "statuses": [
         "corrode"
@@ -169,6 +174,16 @@
       "_stats": {
         "compendiumSource": null
       },
+      "start": {
+        "time": 0,
+        "combat": null,
+        "combatant": null,
+        "initiative": null,
+        "round": null,
+        "turn": null
+      },
+      "showIcon": 1,
+      "folder": null,
       "_key": "!items.effects!qJaSNTuDfbPVr8Lb.zB95bjSSdVlApQnR"
     }
   ],

src/packs/domains/domainCard_Rage_Up_GRL0cvs96vrTDckZ.json

@@ -42,44 +42,8 @@
           "type": "self",
           "amount": null
         },
-        "name": "Mark 1 Stress",
+        "name": "Mark Stress",
-        "img": "icons/magic/control/silhouette-aura-energy.webp",
+        "img": "icons/skills/wounds/injury-face-impact-orange.webp",
-        "range": "self"
-      },
-      "fKY9NcYBwCFwMsgV": {
-        "type": "effect",
-        "_id": "fKY9NcYBwCFwMsgV",
-        "systemPath": "actions",
-        "description": "<p>You can <strong>mark a Stress</strong> to gain a bonus to your damage roll equal to twice your Strength.</p>",
-        "chatDisplay": true,
-        "actionType": "action",
-        "cost": [
-          {
-            "scalable": false,
-            "key": "stress",
-            "value": 2,
-            "step": null,
-            "consumeOnSuccess": false
-          }
-        ],
-        "uses": {
-          "value": null,
-          "max": "",
-          "recovery": null,
-          "consumeOnSuccess": false
-        },
-        "effects": [
-          {
-            "_id": "t6SIjQxB6UBUJ98f",
-            "onSave": false
-          }
-        ],
-        "target": {
-          "type": "self",
-          "amount": null
-        },
-        "name": "Mark 2 Stress",
-        "img": "icons/magic/control/silhouette-aura-energy.webp",
         "range": "self"
       }
     },
@@ -94,8 +58,8 @@
   "sort": 3400000,
   "effects": [
     {
-      "name": "Rage Up (1)",
+      "name": "Rage Up",
-      "img": "systems/daggerheart/assets/icons/domains/domain-card/blade.png",
+      "img": "icons/skills/wounds/injury-face-impact-orange.webp",
       "origin": "Compendium.daggerheart.domains.Item.GRL0cvs96vrTDckZ",
       "transfer": false,
       "_id": "bq1MhcmoP6Wo5CXF",
@@ -106,33 +70,39 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
+        },
+        "changes": [
+          {
+            "key": "system.bonuses.damage.magical.bonus",
+            "type": "add",
+            "value": "2*@system.traits.strength.value*@stacks",
+            "priority": 21,
+            "phase": "initial"
+          },
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "type": "add",
+            "value": "2*@system.traits.strength.value*@stacks",
+            "priority": 21,
+            "phase": "initial"
+          }
+        ],
+        "stacking": {
+          "enabled": true,
+          "max": 2
+        },
+        "duration": {
+          "type": ""
         }
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "2*@system.traits.strength.value",
-          "priority": 21
-        },
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "2*@system.traits.strength.value",
-          "priority": 21
-        }
-      ],
       "disabled": false,
       "duration": {
-        "startTime": null,
+        "value": null,
-        "combat": null,
+        "units": "seconds",
-        "seconds": null,
+        "expiry": null,
-        "rounds": null,
+        "expired": false
-        "turns": null,
-        "startRound": null,
-        "startTurn": null
       },
-      "description": "",
+      "description": "<p>For your next attack you have a bonus to your damage roll equal to twice your Strength.</p>",
       "tint": "#ffffff",
       "statuses": [],
       "sort": 0,
@@ -140,6 +110,16 @@
       "_stats": {
         "compendiumSource": null
       },
+      "start": {
+        "time": 0,
+        "combat": null,
+        "combatant": null,
+        "initiative": null,
+        "round": null,
+        "turn": null
+      },
+      "showIcon": 1,
+      "folder": null,
       "_key": "!items.effects!GRL0cvs96vrTDckZ.bq1MhcmoP6Wo5CXF"
     },
     {
@@ -155,31 +135,28 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        }
-      },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "4*@system.traits.strength.value",
-          "priority": 21
         },
-        {
+        "changes": [
-          "key": "system.bonuses.damage.physical.bonus",
+          {
-          "mode": 2,
+            "key": "system.bonuses.damage.magical.bonus",
-          "value": "4*@system.traits.strength.value",
+            "value": "4*@system.traits.strength.value",
-          "priority": 21
+            "priority": 21,
-        }
+            "type": "add"
-      ],
+          },
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "value": "4*@system.traits.strength.value",
+            "priority": 21,
+            "type": "add"
+          }
+        ]
+      },
       "disabled": false,
       "duration": {
-        "startTime": null,
+        "value": null,
-        "combat": null,
+        "units": "seconds",
-        "seconds": null,
+        "expiry": null,
-        "rounds": null,
+        "expired": false
-        "turns": null,
-        "startRound": null,
-        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -189,6 +166,9 @@
       "_stats": {
         "compendiumSource": null
       },
+      "start": null,
+      "showIcon": 1,
+      "folder": null,
       "_key": "!items.effects!GRL0cvs96vrTDckZ.t6SIjQxB6UBUJ98f"
     }
   ],

styles/less/global/elements.less

@@ -460,6 +460,10 @@
         &.even {
             grid-template-columns: 1fr 1fr;
         }
+
+        &.full-width {
+            width: 100%;
+        }
     }
 
     .three-columns {

styles/less/ui/effects-display/sheet.less

@@ -35,6 +35,19 @@
                 color: @golden;
                 filter: drop-shadow(0 0 3px black);
             }
+
+            .stacking-value {
+                position: absolute;
+                top: 4px;
+                right: 4px;
+                font-size: 16px;
+                font-weight: bold;
+                color: @golden;
+                background: black;
+                padding: 1px;
+                border-radius: 6px;
+                border: 1px solid @golden;
+            }
         }
     }
 }

styles/less/ux/tooltip/bordered-tooltip.less

@@ -6,6 +6,7 @@
     .daggerheart.dh-style.tooltip {
         display: flex;
         flex-direction: column;
+        align-items: start;
         text-align: start;
         width: 100%;
         gap: 5px;
@@ -13,6 +14,7 @@
         border-radius: 3px;
 
         .tooltip-header {
+            width: 100%;
             display: flex;
             flex-direction: column;
             align-items: center;
@@ -35,12 +37,48 @@
             }
         }
 
-        .close-hint {
+        .effect-stacks-outer-container {
-            border-radius: 3px;
+            display: flex;
-            padding: 3px;
+            flex-direction: column;
-            background: @rustic-brown-80;
+            gap: 4px;
-            color: @golden;
+            width: 100%;
-            font-size: 12px;
+
+            .effect-stacks-title {
+                font-size: var(--font-size-20);
+                font-weight: bold;
+                text-align: center;
+            }
+
+            .effect-stacks-container {
+                display: flex;
+                justify-content: space-between;
+
+                .effect-stacks-inner-container {
+                    display: flex;
+                    flex-direction: column;
+                    gap: 2px;
+
+                    .effect-stack-title {
+                        font-weight: bold;
+                    }
+                }
+            }
+        }
+
+        .close-hints {
+            margin-top: 0.5rem;
+            display: flex;
+            flex-direction: column;
+            gap: 4px;
+
+            .close-hint {
+                border-radius: 3px;
+                padding: 3px;
+                background: @rustic-brown-80;
+                color: @golden;
+                font-size: 12px;
+                margin: 0;
+            }
         }
 
         .duration-container {

templates/sheets/activeEffect/settings.hbs

@@ -1,4 +1,15 @@
 <section class="tab{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
+    <fieldset class="one-column">
+        <legend>{{localize "DAGGERHEART.ACTIVEEFFECT.Config.stacking.title"}}</legend>
+
+        {{formGroup systemFields.stacking.fields.enabled value=source.system.stacking.enabled localize=true }}
+
+        <div class="two-columns even full-width">
+            {{formGroup systemFields.stacking.fields.value value=source.system.stacking.value localize=true }}
+            {{formGroup systemFields.stacking.fields.max value=source.system.stacking.max localize=true }}
+        </div>
+    </fieldset>
+
     <fieldset class="one-column">
         <legend>{{localize "DAGGERHEART.ACTIVEEFFECT.Config.rangeDependence.title"}}</legend>
 

templates/ui/effects-display.hbs

@@ -8,6 +8,9 @@
                 <a {{#if effect.condition}}disabled{{/if}}>
                     <img src="{{effect.img}}" />
                 </a>
+                {{#if (and effect.system.stacking.enabled (gt effect.system.stacking.value 1))}}
+                    <span class="stacking-value">{{effect.system.stacking.value}}</span>
+                {{/if}}
                 {{#if effect.condition}}<i class="effect-locked fa-solid fa-lock"></i>{{/if}}
             </span>
         {{/each}}

templates/ui/tooltip/effect-display.hbs

@@ -17,7 +17,6 @@
     {{/if}}
 
     {{#if effect.system.duration.type}}
-
         <div class="duration-container">
             <div class="duration-inner-container">
                 <span>{{localize "EFFECT.DURATION.Label"}}:</span>
@@ -26,9 +25,42 @@
         </div>
     {{/if}}
 
+    {{#if (and effect.system.stacking.enabled effect.system.stacking.max)}}
+        <div class="effect-stacks-outer-container">
+            <div class="effect-stacks-title">{{localize "Stacks"}}</div>
+            <div class="effect-stacks-container">
+                <div class="effect-stacks-inner-container">
+                    <span class="effect-stack-title">{{localize "Current"}}</span>
+                    <span>{{effect.system.stacking.value}}</span>
+                </div>
+                <div class="effect-stacks-inner-container">
+                    <span class="effect-stack-title">{{localize "Max"}}</span>
+                    <span>{{effect.system.stacking.max}}</span>
+                </div>
+            </div>
+        </div>
+    {{/if}}
+
     {{#unless effect.isLockedCondition}}
-        <p class="close-hint">
+        <div class="close-hints">
-            <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.EffectsDisplay.removeThing" thing=(localize "DAGGERHEART.GENERAL.Effect.single")}}
+            {{#if effect.system.stacking.enabled}}
-        </p>
+                <p class="close-hint">
+                    <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.EffectsDisplay.increaseStacks"}}
+                </p>
+                {{#if (gt effect.system.stacking.value 1)}}
+                    <p class="close-hint">
+                        <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.EffectsDisplay.decreaseStacks"}}
+                    </p>
+                {{else}}
+                    <p class="close-hint">
+                        <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.EffectsDisplay.removeThing" thing=(localize "DAGGERHEART.GENERAL.Effect.single")}}
+                    </p>
+                {{/if}}
+            {{else}}
+                <p class="close-hint">
+                    <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.EffectsDisplay.removeThing" thing=(localize "DAGGERHEART.GENERAL.Effect.single")}}
+                </p>
+            {{/if}}
+        </div>
     {{/unless}}
 </div>