Merge branch 'main' into rework/chat-message-damage

daggerheart.mjs

@@ -270,6 +270,10 @@ Hooks.on('i18nInit', () => {
 });
 
 Hooks.on('setup', () => {
+    if (game.user.isGM) {
+        document.body.dataset.gm = true;
+    }
+
     CONFIG.statusEffects = [
         ...CONFIG.statusEffects.filter(x => !['dead', 'unconscious'].includes(x.id)),
         ...Object.values(SYSTEM.GENERAL.conditions()).map(x => ({

lang/en.json

@@ -2245,7 +2245,7 @@
                         "hint": "A used armor slot normally reduces damage by one step. This value increases the number of steps damage is reduced by."
                     },
                     "magical": {
-                        "label": "Daamge Reduction: Only Magical",
+                        "label": "Damage Reduction: Only Magical",
                         "hint": "Armor can only be used to reduce magical damage"
                     },
                     "maxArmorMarkedBonus": "Max Armor Used",
@@ -2550,6 +2550,9 @@
                 },
                 "identifier": {
                     "label": "Identifier"
+                },
+                "gmNotes": {
+                    "label": "GM Notes"
                 }
             },
             "Ancestry": {
@@ -2565,6 +2568,9 @@
                     "severe": "Severe Threshold"
                 }
             },
+            "Base": {
+                "addGMNote": "Add GM Note"
+            },
             "Beastform": {
                 "FIELDS": {
                     "beastformType": { "label": "Beastform Type" },

module/applications/dialogs/deathMove.mjs

@@ -185,8 +185,6 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
 
         if (result === undefined) return;
 
-        const autoExpandDescription = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance)
-            .expandRollMessage?.desc;
         const cls = getDocumentClass('ChatMessage');
 
         const msg = {
@@ -202,7 +200,6 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
                     img: this.selectedMove.img,
                     description: game.i18n.localize(this.selectedMove.description),
                     result: result,
-                    open: autoExpandDescription ? 'open' : '',
                     showRiskItAllButton: this.showRiskItAllButton,
                     riskItAllButtonLabel: this.riskItAllButtonLabel,
                     riskItAllHope: this.riskItAllHope

module/applications/dialogs/downtime.mjs

@@ -196,9 +196,6 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
             .filter(x => x.testUserPermission(game.user, 'LIMITED'))
             .filter(x => x.uuid !== this.actor.uuid);
 
-        const autoExpandDescription = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance)
-            .expandRollMessage?.desc;
-
         const cls = getDocumentClass('ChatMessage');
         const msg = {
             user: game.user.id,
@@ -219,8 +216,7 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
                     actor: { name: this.actor.name, img: this.actor.img },
                     moves: moves,
                     characters: characters,
-                    selfId: this.actor.uuid,
-                    open: autoExpandDescription ? 'open' : ''
+                    selfId: this.actor.uuid
                 }
             ),
             flags: {

module/applications/sheets/api/base-item.mjs

@@ -30,7 +30,8 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
             addFeature: DHBaseItemSheet.#addFeature,
             deleteFeature: DHBaseItemSheet.#deleteFeature,
             addResource: DHBaseItemSheet.#addResource,
-            removeResource: DHBaseItemSheet.#removeResource
+            removeResource: DHBaseItemSheet.#removeResource,
+            editGMNote: DHBaseItemSheet.#onEditGMNote
         },
         dragDrop: [
             { dragSelector: null, dropSelector: '.drop-section' },
@@ -76,10 +77,16 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
     /**@inheritdoc */
     async _preparePartContext(partId, context, options) {
         await super._preparePartContext(partId, context, options);
+        const TextEditor = foundry.applications.ux.TextEditor.implementation;
 
         switch (partId) {
             case 'description':
-                context.enrichedDescription = await this.document.system.getEnrichedDescription();
+                context.enrichedDescription = await this.document.system.getEnrichedDescription({ gmNotes: false });
+                context.enrichedGMNotes = await TextEditor.implementation.enrichHTML(this.item.system.gmNotes, {
+                    relativeTo: this.item,
+                    rollData: this.item.getRollData(),
+                    secrets: this.item.isOwner
+                })
                 break;
             case 'effects':
                 await this._prepareEffectsContext(context, options);
@@ -331,4 +338,45 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
             }
         }
     }
+
+    /** 
+     * Handles the Add GM Note button being pressed. This is only used when an item has no GM notes.
+     * Later edits to a GM note instead go through the normal editor toggle workflow.
+     * @this DHBaseItemSheet
+     */
+    static #onEditGMNote() {
+        // Open the editor, which might be hidden. We remove the css class to hide temporarily
+        // so that menu auto resizing functions properly.
+        const editor = this.element.querySelector('prose-mirror[name="system.gmNotes"]');
+        const wasHidden = editor.classList.contains('hide-if-inactive');
+        editor.classList.remove('hide-if-inactive');
+        editor.open = true;
+        window.setTimeout(() => {
+            if (wasHidden) editor.classList.add('hide-if-inactive');
+        }, 0);
+    }
+
+    /** @inheritdoc */
+    async _onRender(context, options) {
+        await super._onRender(context, options);
+
+        // Render an add gmnotes button if there are no set GM notes.
+        // We need to re-render on close since its possible to prosemirror to close *without* triggering a full re-render
+        if (game.user.isGM && !this.item.system.gmNotes) {
+            const description = this.element.querySelector('[name="system.description"]');
+            const addButton = () => {
+                if (description.querySelector('[data-action=editGMNote]')) return;
+
+                const button = document.createElement('button');
+                button.type = 'button';
+                button.classList.add('icon', 'toggle', 'fa-regular', 'fa-note-medical');
+                button.dataset.action = 'editGMNote';
+                button.dataset.tooltip = 'DAGGERHEART.ITEMS.Base.addGMNote';
+                description.appendChild(button);
+            }
+            
+            addButton();
+            description.addEventListener('close', () => addButton());
+        }
+    }
 }

module/data/action/baseAction.mjs

@@ -256,7 +256,8 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
 
         if (Hooks.call(`${CONFIG.DH.id}.postUseAction`, this, config) === false) return;
 
-        if (this.chatDisplay && !config.skips.createMessage && !config.actionChatMessageHandled) await this.toChat();
+        if (this.chatDisplay && !config.skips.createMessage && !config.actionChatMessageHandled) 
+            await this.toChat(null, config);
 
         return config;
     }

module/data/fields/action/damageField.mjs

@@ -276,10 +276,18 @@ export class DHActionDiceData extends foundry.abstract.DataModel {
         };
     }
 
+    /**
+     * @returns {string} the formula associated with this damage field
+     */
     getFormula() {
-        const multiplier = this.multiplier === 'flat' ? this.flatMultiplier : `@${this.multiplier}`,
-            bonus = this.bonus ? (this.bonus < 0 ? ` - ${Math.abs(this.bonus)}` : ` + ${this.bonus}`) : '';
-        return this.custom.enabled ? this.custom.formula : `${multiplier ?? 1}${this.dice}${bonus}`;
+        if (this.custom.enabled) return this.custom.formula;
+
+        const multiplier = this.multiplier === 'flat' ? this.flatMultiplier : `@${this.multiplier}`;
+        if (!multiplier) return String(this.bonus || 0);
+
+        const dice = `${multiplier ?? 1}${this.dice}`;
+        const sign = this.bonus < 0 ? ' - ' : ' + ';
+        return this.bonus ? `${dice} ${sign} ${Math.abs(this.bonus)}` : dice;
     }
 }
 

module/data/fields/action/summonField.mjs

@@ -23,7 +23,7 @@ export default class DHSummonField extends fields.ArrayField {
         super(summonFields, options, context);
     }
 
-    static async execute() {
+    static async execute(config) {
         if (!canvas.scene) {
             ui.notifications.warn(game.i18n.localize('DAGGERHEART.ACTIONS.TYPES.summon.error'));
             return;
@@ -36,6 +36,7 @@ export default class DHSummonField extends fields.ArrayField {
 
         const rolls = [];
         const summonData = [];
+        const chatMessageData = [];
         for (const summon of this.summon) {
             const roll = new Roll(itemAbleRollParse(summon.count, this.actor, this.item));
             await roll.evaluate();
@@ -54,17 +55,18 @@ export default class DHSummonField extends fields.ArrayField {
                     tokenPreviewName: `${actor.prototypeToken.name}${remaining > 1 ? ` (${remaining}x)` : ''}`
                 });
             }
+
+            chatMessageData.push({
+                data: actor,
+                quantity: countNumber
+            });
         }
 
         if (rolls.length) await triggerChatRollFx(rolls);
 
         this.actor.sheet?.minimize();
-        DHSummonField.handleSummon(summonData, this.actor);
-    }
-
-    static async handleSummon(summonData, actionActor) {
-        await CONFIG.ux.TokenManager.createTokensWithPreview(summonData, { elevation: actionActor.token?.elevation });
-
-        return actionActor.sheet?.maximize();
+        await CONFIG.ux.TokenManager.createTokensWithPreview(summonData, { elevation: this.actor.token?.elevation });
+        this.actor.sheet?.maximize();
+        config.summonData = chatMessageData;
     }
 }

module/data/fields/actionField.mjs

@@ -269,10 +269,7 @@ export function ActionMixin(Base) {
             return this.delete();
         }
 
-        async toChat(origin) {
-            const autoExpandDescription = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance)
-                .expandRollMessage?.desc;
-
+        async toChat(origin, config) {
             const cls = getDocumentClass('ChatMessage');
             const systemData = {
                 title: game.i18n.localize('DAGGERHEART.CONFIG.FeatureForm.action'),
@@ -282,7 +279,7 @@ export function ActionMixin(Base) {
                     img: this.baseAction ? this.parent.parent.img : this.img,
                     tags: this.tags ? this.tags : ['Spell', 'Arcana', 'Lv 10'],
                     areas: this.areas,
-                    summon: this.summon
+                    summon: config?.summonData
                 },
                 source: {
                     actor: this.actor.uuid,
@@ -307,7 +304,7 @@ export function ActionMixin(Base) {
                 system: systemData,
                 content: await foundry.applications.handlebars.renderTemplate(
                     'systems/daggerheart/templates/ui/chat/action.hbs',
-                    { ...systemData, open: autoExpandDescription ? 'open' : '' }
+                    systemData
                 ),
                 flags: {
                     daggerheart: {

module/data/item/base.mjs

@@ -49,7 +49,10 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
             })
         };
 
-        if (this.metadata.hasDescription) schema.description = new fields.HTMLField({ required: true, nullable: true });
+        if (this.metadata.hasDescription) {
+            schema.description = new fields.HTMLField({ required: true, nullable: true });
+            schema.gmNotes = new fields.HTMLField({ required: true, nullable: true });
+        }
 
         if (this.metadata.hasResource) {
             schema.resource = new fields.SchemaField(
@@ -134,7 +137,7 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
     /**
      * Augments the description for the item with type specific info to display. Implemented in applicable item subtypes.
      * @param {object} [options] - Options that modify the styling of the rendered template. { headerStyle: undefined|'none'|'large' }
-     * @returns {string}
+     * @returns {Promise<{ prefix: string | null; value: string | null; suffix: string | null }>}
      */
     async getDescriptionData(_options) {
         return { prefix: null, value: this.description, suffix: null };
@@ -143,16 +146,26 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
     /**
      * Gets the enriched and augmented description for the item.
      * @param {object} [options] - Options that modify the styling of the rendered template. { headerStyle: undefined|'none'|'large' }
-     * @returns {string}
+     * @returns {Promise<string>}
      */
-    async getEnrichedDescription() {
+    async getEnrichedDescription({ gmNotes = true } = {}) {
         if (!this.metadata.hasDescription) return '';
 
         const { prefix, value, suffix } = await this.getDescriptionData();
-        const fullDescription = [prefix, value, suffix].filter(p => !!p).join('\n<hr>\n');
+        let fullDescription = [prefix, value, suffix].filter(p => !!p).join('\n<hr>\n');
+        if (this.gmNotes && gmNotes) {
+            const gmNotesElement = document.createElement('section');
+            gmNotesElement.classList.add('gm-notes-section');
+            gmNotesElement.dataset.visibility = 'gm';
+            const header = document.createElement('header');
+            header.classList.add('gm-notes');
+            header.textContent = _loc('DAGGERHEART.ITEMS.FIELDS.gmNotes.label');
+            gmNotesElement.innerHTML = header.outerHTML + this.gmNotes;
+            fullDescription += gmNotesElement.outerHTML;
+        }
 
         return await foundry.applications.ux.TextEditor.implementation.enrichHTML(fullDescription, {
-            relativeTo: this,
+            relativeTo: this.parent,
             rollData: this.getRollData(),
             secrets: this.parent.isOwner
         });

module/documents/chatMessage.mjs

@@ -3,6 +3,13 @@ import { emitGMUpdate, emitGMCreate, GMUpdateEvent } from '../systemRegistration
 export default class DhpChatMessage extends foundry.documents.ChatMessage {
     targetHook = null;
 
+    static #EXPAND_SECTIONS = [
+        { selector: 'roll-section [data-action="expandRoll"]', key: 'roll' },
+        { selector: 'damage-section', key: 'damage' },
+        { selector: 'target-section', key: 'target' },
+        { selector: 'description-section', key: 'desc' }
+    ];
+
     async renderHTML() {
         const actor = game.actors.get(this.speaker.actor);
         const actorData =
@@ -89,23 +96,26 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
                 }
             }
 
+            // Check registered selectors and the main item section for expanding
+            // Preserving during re-render is handled by core foundry on anything with [data-action=expandRoll]
             const autoExpandRoll = game.settings.get(
-                    CONFIG.DH.id,
-                    CONFIG.DH.SETTINGS.gameSettings.appearance
-                ).expandRollMessage,
-                rollSections = html.querySelectorAll('.roll-part'),
-                itemDesc = html.querySelector('.domain-card-move');
-            rollSections.forEach(s => {
-                if (s.classList.contains('roll-section')) {
-                    const toExpand = s.querySelector('[data-action="expandRoll"]');
-                    toExpand.classList.toggle('expanded', autoExpandRoll.roll);
-                } else if (s.classList.contains('damage-section'))
-                    s.classList.toggle('expanded', autoExpandRoll.damage);
-                else if (s.classList.contains('target-section')) s.classList.toggle('expanded', autoExpandRoll.target);
-                else if (s.classList.contains('description-section'))
-                    s.classList.toggle('expanded', autoExpandRoll.desc);
-            });
-            if (itemDesc && autoExpandRoll.desc) itemDesc.setAttribute('open', '');
+                CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance
+            ).expandRollMessage;
+            for (const { selector, key } of DhpChatMessage.#EXPAND_SECTIONS) {
+                const elements = html.querySelectorAll(selector);
+                for (const element of elements) {
+                    element.classList.toggle('expanded', autoExpandRoll[key]);
+                }
+            }
+
+            // Auto expand the item description. These are not preserved by foundry during re-renders
+            const itemDesc = html.querySelector('details');
+            if (itemDesc) {
+                const existing = document.querySelector(`.chat-message[data-message-id="${this.id}"] details`);
+                if (existing?.hasAttribute('open') ?? autoExpandRoll.desc) {
+                    itemDesc.setAttribute('open', '');
+                }
+            }
         }
 
         if (!this.isAuthor && !this.speakerActor?.isOwner) {

module/documents/item.mjs

@@ -208,10 +208,7 @@ export default class DHItem extends foundry.documents.Item {
                 tags: this._getTags()
             },
             actions: item.system.actionsList,
-            description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.system.description, {
-                relativeTo: this.parent,
-                rollData: this.parent?.getRollData() ?? {}
-            })
+            description: await this.system.getEnrichedDescription()
         };
 
         const msg = {

module/documents/tokenManager.mjs

@@ -19,10 +19,10 @@ export default class DhTokenManager {
             }
         }
 
-        return await canvas.tokens.placeTokens(
+        const placedData = await canvas.tokens.placeTokens(
             [
                 {
-                    ...actor.prototypeToken.toObject(),
+                    ...(await actor.getTokenDocument()).toObject(),
                     actorId: actor.id,
                     displayName: 50,
                     ...tokenData
@@ -30,6 +30,8 @@ export default class DhTokenManager {
             ],
             { create: false }
         );
+
+        return placedData?.[0] ?? null;
     }
 
     /**
@@ -46,22 +48,24 @@ export default class DhTokenManager {
 
         const createElevation = elevation ?? level.elevation.bottom;
         for (const tokenData of tokensData) {
-            const previewTokens = await this.createPreview(tokenData.actor, {
+            const previewToken = await this.createPreview(tokenData.actor, {
                 name: tokenData.tokenPreviewName,
                 level: game.user.viewedLevel,
                 elevation: createElevation,
                 flags: { daggerheart: { createPlacement: true } }
             });
-            if (!previewTokens?.length) return null;
+            if (!previewToken) return null;
+
+            const finalTokenData = {
+                ...previewToken.toObject(),
+                name: tokenData.actor.prototypeToken.name,
+                displayName: tokenData.actor.prototypeToken.displayName,
+                flags: tokenData.actor.prototypeToken.flags
+            };
 
             await canvas.scene.createEmbeddedDocuments(
                 'Token',
-                previewTokens.map(x => ({
-                    ...x.toObject(),
-                    name: tokenData.actor.prototypeToken.name,
-                    displayName: tokenData.actor.prototypeToken.displayName,
-                    flags: tokenData.actor.prototypeToken.flags
-                })),
+                [finalTokenData],
                 { controlObject: true, parent: canvas.scene }
             );
         }

module/documents/tooltipManager.mjs

@@ -4,199 +4,234 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
     #wide = false;
     #bordered = false;
 
+    /** @inheritdoc */
     async activate(element, options = {}) {
-        const { TextEditor } = foundry.applications.ux;
+        this.#wide = false;
+        this.#bordered = false;
 
-        let html = options.html;
-        if (element.dataset.tooltip?.startsWith('#battlepoints#')) {
-            this.#wide = true;
-            this.#bordered = true;
-
-            html = await this.getBattlepointHTML(element.dataset.combatId);
-            options.direction = this._determineItemTooltipDirection(element);
-            super.activate(element, { ...options, html: html });
-
-            const lockedTooltip = this.lockTooltip();
-            lockedTooltip.querySelectorAll('.battlepoint-toggle-container input').forEach(element => {
-                element.addEventListener('input', this.toggleModifier.bind(this));
-            });
-            return;
-        } else {
-            this.#wide = false;
-            this.#bordered = false;
+        const isMacro = document.getElementById('action-bar').contains(element);
+        const macro = isMacro ? game.macros.get(game.user.hotbar[Number(element.dataset.slot)] ?? null) : null;
+        const macroItemUuid = macro?.type === 'script' ? macro.command.match(/await game\.system\.api\.applications\.ui\.DhHotbar\.useItem\("([^"]+)"\);/)?.[1] : null;
+        if (macroItemUuid && await fromUuid(macroItemUuid, { strict: false })) {
+            element.dataset.tooltip = `#item#${macroItemUuid}`;
+            options.direction = this.constructor.TOOLTIP_DIRECTIONS.UP;
         }
 
-        if (element.dataset.tooltip === '#effect-display#') {
-            this.#bordered = true;
-            let effect = {};
-            if (element.dataset.uuid) {
-                const effectItem = await foundry.utils.fromUuid(element.dataset.uuid);
-                const effectData = effectItem.toObject();
+        let html = options.html;
+        const key = element.dataset.tooltip?.match(/^#([\w-]+)#/)?.[1];
+        switch (key) {
+            case 'battlepoints':
+                return this.#activateBattlepoints(element, options);
+            case 'effect-display':
+                html = await this.#activateEffectDisplay(element, options);
+                break;
+            case 'item':
+                html = await this.#activateItem(element, options);
+                break;
+            case 'attack':
+                html = await this.#activateAttack(element, options);
+                break;
+            case 'shortRest':
+            case 'longRest':
+                html = await this.#activateRest(element, options);
+                break;
+            case 'advantage':
+            case 'disadvantage':
+                html = await this.#activateAdvantageDisadvantage(element, options);
+                break;
+            case 'deathMove':
+                html = await this.#activateDeathMove(element, options);
+                break;
+        }
 
-                effect = {
-                    ...effectData,
-                    name: game.i18n.localize(effectData.name)
+        this.noOffset = options.noOffset;
+        super.activate(element, { ...options, html });
+    }
+
+    async #activateBattlepoints(element, options) {
+        this.#wide = true;
+        this.#bordered = true;
+
+        const html = await this.getBattlepointHTML(element.dataset.combatId);
+        options.direction = this._determineItemTooltipDirection(element);
+        super.activate(element, { ...options, html: html });
+
+        const lockedTooltip = this.lockTooltip();
+        lockedTooltip.querySelectorAll('.battlepoint-toggle-container input').forEach(element => {
+            element.addEventListener('input', this.toggleModifier.bind(this));
+        });
+    }
+
+    async #activateEffectDisplay(element, options) {
+        this.#bordered = true;
+        let effect = {};
+        if (element.dataset.uuid) {
+            const effectItem = await foundry.utils.fromUuid(element.dataset.uuid);
+            const effectData = effectItem.toObject();
+
+            effect = {
+                ...effectData,
+                name: game.i18n.localize(effectData.name)
+            };
+
+            if (effectData.type === 'beastform') {
+                const beastformData = {
+                    features: [],
+                    advantageOn: effectData.system.advantageOn,
+                    beastformAttackData: game.system.api.data.items.DHBeastform.getBeastformAttackData(effectItem)
                 };
 
-                if (effectData.type === 'beastform') {
-                    const beastformData = {
-                        features: [],
-                        advantageOn: effectData.system.advantageOn,
-                        beastformAttackData: game.system.api.data.items.DHBeastform.getBeastformAttackData(effectItem)
-                    };
-
-                    const features = effectItem.parent.items.filter(x => effectItem.system.featureIds.includes(x.id));
-                    for (const feature of features) {
-                        const featureData = feature.toObject();
-                        featureData.enrichedDescription = await feature.system.getEnrichedDescription();
-                        beastformData.features.push(featureData);
-                    }
-
-                    effect.description = await foundry.applications.handlebars.renderTemplate(
-                        'systems/daggerheart/templates/ui/tooltip/parts/beastformData.hbs',
-                        {
-                            item: { system: beastformData }
-                        }
-                    );
-                } else {
-                    effect.description = game.i18n.localize(
-                        effectData.description ?? effectData.parent.system.description
-                    );
+                const features = effectItem.parent.items.filter(x => effectItem.system.featureIds.includes(x.id));
+                for (const feature of features) {
+                    const featureData = feature.toObject();
+                    featureData.enrichedDescription = await feature.system.getEnrichedDescription();
+                    beastformData.features.push(featureData);
                 }
-            } else {
-                const conditions = CONFIG.DH.GENERAL.conditions();
-                const condition = conditions[element.dataset.condition];
-                effect = {
-                    ...condition,
-                    name: game.i18n.localize(condition.name),
-                    description: game.i18n.localize(condition.description),
-                    appliedBy: element.dataset.appliedBy,
-                    isLockedCondition: true
-                };
-            }
 
-            html = await foundry.applications.handlebars.renderTemplate(
-                `systems/daggerheart/templates/ui/tooltip/effect-display.hbs`,
+                effect.description = await foundry.applications.handlebars.renderTemplate(
+                    'systems/daggerheart/templates/ui/tooltip/parts/beastformData.hbs',
+                    {
+                        item: { system: beastformData }
+                    }
+                );
+            } else {
+                effect.description = game.i18n.localize(
+                    effectData.description ?? effectData.parent.system.description
+                );
+            }
+        } else {
+            const conditions = CONFIG.DH.GENERAL.conditions();
+            const condition = conditions[element.dataset.condition];
+            effect = {
+                ...condition,
+                name: game.i18n.localize(condition.name),
+                description: game.i18n.localize(condition.description),
+                appliedBy: element.dataset.appliedBy,
+                isLockedCondition: true
+            };
+        }
+
+        const html = await foundry.applications.handlebars.renderTemplate(
+            `systems/daggerheart/templates/ui/tooltip/effect-display.hbs`,
+            {
+                effect
+            }
+        );
+
+        this.tooltip.innerHTML = html;
+        options.direction = this._determineItemTooltipDirection(element);
+
+        return html;
+    }
+
+    async #activateItem(element, options) {
+        const itemUuid = element.dataset.tooltip.slice(6);
+        const item = await foundry.utils.fromUuid(itemUuid);
+        if (item) {
+            const isAction = item instanceof game.system.api.models.actions.actionsTypes.base;
+            const isEffect = item instanceof ActiveEffect;
+            await this.enrichText(item);
+
+            const type = isAction ? 'action' : isEffect ? 'effect' : item.type;
+            const html = await foundry.applications.handlebars.renderTemplate(
+                `systems/daggerheart/templates/ui/tooltip/${type}.hbs`,
                 {
-                    effect
+                    item: item,
+                    description: item.system?.enrichedDescription ?? item.enrichedDescription,
+                    config: CONFIG.DH,
+                    allDomains: CONFIG.DH.DOMAIN.allDomains()
                 }
             );
 
             this.tooltip.innerHTML = html;
-            options.direction = this._determineItemTooltipDirection(element);
-        } else {
-            this.#bordered = false;
+            options.direction ??= this._determineItemTooltipDirection(element);
+            return html;
         }
 
-        if (element.dataset.tooltip?.startsWith('#item#')) {
-            const itemUuid = element.dataset.tooltip.slice(6);
-            const item = await foundry.utils.fromUuid(itemUuid);
-            if (item) {
-                const isAction = item instanceof game.system.api.models.actions.actionsTypes.base;
-                const isEffect = item instanceof ActiveEffect;
-                await this.enrichText(item);
+        return null;
+    }
 
-                const type = isAction ? 'action' : isEffect ? 'effect' : item.type;
-                html = await foundry.applications.handlebars.renderTemplate(
-                    `systems/daggerheart/templates/ui/tooltip/${type}.hbs`,
-                    {
-                        item: item,
-                        description: item.system?.enrichedDescription ?? item.enrichedDescription,
-                        config: CONFIG.DH,
-                        allDomains: CONFIG.DH.DOMAIN.allDomains()
-                    }
-                );
+    async #activateAttack(element, options) {
+        const actorUuid = element.dataset.tooltip.slice(8);
+        const actor = await foundry.utils.fromUuid(actorUuid);
+        const attack = actor.system.attack;
 
-                this.tooltip.innerHTML = html;
-                options.direction = this._determineItemTooltipDirection(element);
+        const description = await foundry.applications.ux.TextEditor.enrichHTML(attack.description);
+        const html = await foundry.applications.handlebars.renderTemplate(
+            `systems/daggerheart/templates/ui/tooltip/attack.hbs`,
+            {
+                attack: attack,
+                description: description,
+                parent: actor,
+                config: CONFIG.DH
             }
-        } else {
-            const attack = element.dataset.tooltip?.startsWith('#attack#');
-            if (attack) {
-                const actorUuid = element.dataset.tooltip.slice(8);
-                const actor = await foundry.utils.fromUuid(actorUuid);
-                const attack = actor.system.attack;
+        );
 
-                const description = await TextEditor.enrichHTML(attack.description);
-                html = await foundry.applications.handlebars.renderTemplate(
-                    `systems/daggerheart/templates/ui/tooltip/attack.hbs`,
-                    {
-                        attack: attack,
-                        description: description,
-                        parent: actor,
-                        config: CONFIG.DH
-                    }
-                );
+        this.tooltip.innerHTML = html;
+        return html;
+    }
 
-                this.tooltip.innerHTML = html;
-            }
+    async #activateAdvantageDisadvantage(element, options) {
+        const isAdvantage = element.dataset.tooltip?.startsWith('#advantage#');
+        const actorUuid = element.dataset.tooltip.slice(isAdvantage ? 11 : 14);
+        const actor = await foundry.utils.fromUuid(actorUuid);
 
-            const shortRest = element.dataset.tooltip?.startsWith('#shortRest#');
-            const longRest = element.dataset.tooltip?.startsWith('#longRest#');
-            if (shortRest || longRest) {
-                const key = element.dataset.tooltip.slice(shortRest ? 11 : 10);
-
-                const moves = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).restMoves[
-                    element.dataset.restType
-                ].moves;
-                const move = moves[key];
-                const description = await TextEditor.enrichHTML(move.description);
-                html = await foundry.applications.handlebars.renderTemplate(
-                    `systems/daggerheart/templates/ui/tooltip/downtime.hbs`,
-                    {
-                        move: move,
-                        description: description
-                    }
-                );
-
-                this.tooltip.innerHTML = html;
-                options.direction = this._determineItemTooltipDirection(
-                    element,
-                    this.constructor.TOOLTIP_DIRECTIONS.RIGHT
-                );
-            }
-
-            const isAdvantage = element.dataset.tooltip?.startsWith('#advantage#');
-            const isDisadvantage = element.dataset.tooltip?.startsWith('#disadvantage#');
-            if (isAdvantage || isDisadvantage) {
-                const actorUuid = element.dataset.tooltip.slice(isAdvantage ? 11 : 14);
-                const actor = await foundry.utils.fromUuid(actorUuid);
-
-                if (actor) {
-                    html = await foundry.applications.handlebars.renderTemplate(
-                        `systems/daggerheart/templates/ui/tooltip/advantage.hbs`,
-                        {
-                            sources: isAdvantage ? actor.system.advantageSources : actor.system.disadvantageSources
-                        }
-                    );
-
-                    this.tooltip.innerHTML = html;
+        if (actor) {
+            const html = await foundry.applications.handlebars.renderTemplate(
+                `systems/daggerheart/templates/ui/tooltip/advantage.hbs`,
+                {
+                    sources: isAdvantage ? actor.system.advantageSources : actor.system.disadvantageSources
                 }
-            }
+            );
 
-            const deathMove = element.dataset.tooltip?.startsWith('#deathMove#');
-            if (deathMove) {
-                const name = element.dataset.deathName;
-                const img = element.dataset.deathImg;
-                const description = element.dataset.deathDescription;
-
-                html = await foundry.applications.handlebars.renderTemplate(
-                    `systems/daggerheart/templates/ui/tooltip/death-move.hbs`,
-                    {
-                        move: { name: name, img: img, description: description }
-                    }
-                );
-
-                this.tooltip.innerHTML = html;
-                options.direction = this._determineItemTooltipDirection(
-                    element,
-                    this.constructor.TOOLTIP_DIRECTIONS.RIGHT
-                );
-            }
+            this.tooltip.innerHTML = html;
+            return html;
         }
+        return null;
+    }
 
-        this.noOffset = options.noOffset;
-        super.activate(element, { ...options, html: html });
+    async #activateDeathMove(element, options) {
+        const name = element.dataset.deathName;
+        const img = element.dataset.deathImg;
+        const description = element.dataset.deathDescription;
+
+        const html = await foundry.applications.handlebars.renderTemplate(
+            `systems/daggerheart/templates/ui/tooltip/death-move.hbs`,
+            {
+                move: { name: name, img: img, description: description }
+            }
+        );
+
+        this.tooltip.innerHTML = html;
+        options.direction = this._determineItemTooltipDirection(
+            element,
+            this.constructor.TOOLTIP_DIRECTIONS.RIGHT
+        );
+        return html;
+    }
+
+    async #activateRest(element, options) {
+        const isShortRest = element.dataset.tooltip?.startsWith('#shortRest#');
+        const key = element.dataset.tooltip.slice(isShortRest ? 11 : 10);
+        const moves = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).restMoves[
+            element.dataset.restType
+        ].moves;
+        const move = moves[key];
+        const description = await foundry.applications.ux.TextEditor.enrichHTML(move.description);
+        const html = await foundry.applications.handlebars.renderTemplate(
+            `systems/daggerheart/templates/ui/tooltip/downtime.hbs`,
+            {
+                move: move,
+                description: description
+            }
+        );
+
+        this.tooltip.innerHTML = html;
+        options.direction = this._determineItemTooltipDirection(
+            element,
+            this.constructor.TOOLTIP_DIRECTIONS.RIGHT
+        );
+        return html;
     }
 
     _setAnchor(direction) {

module/systemRegistration/migration-handlers/2_5_2.mjs

@@ -15,7 +15,7 @@ export class Migration_2_5_2 extends MigrationHandlerBase {
             const srdEffect = srdItem?.effects.find(x => x.name === effectSource.name);
             if (change.type === 'custom') {
                 const srdChange = srdEffect ? srdEffect.system.changes[i] : null;
-                if (
+                if (srdChange &&
                     change.key === srdChange.key && 
                     change.value === srdChange.value && 
                     change.type !== srdChange.type

src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json

@@ -391,7 +391,7 @@
             "type": "effect",
             "_id": "p6V4k4yMwJ1UPZMz",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to summon a @UUID[Compendium.daggerheart.adversaries.Actor.sRn4bqerfARvhgSV]{Minor Chaos Elemental} drawn to the echoes of violence and discord. They appear within Far range of a chosen PC and immediately take the spotlight.</p><section id=\"secret-iCbXJnMeqDXXOc8n\" class=\"secret\"><p><em>What color does the grass turn as the elemental appears? How does the chaos warp insects and small wildlife within the grove?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],

src/packs/environments/environment_Ambushers_uXZpebPR77YQ1oXI.json

@@ -35,12 +35,9 @@
       "src": "systems/daggerheart/assets/icons/documents/actors/forest.svg",
       "anchorX": 0.5,
       "anchorY": 0.5,
-      "offsetX": 0,
-      "offsetY": 0,
       "fit": "contain",
       "scaleX": 1,
       "scaleY": 1,
-      "rotation": 0,
       "tint": "#ffffff",
       "alphaThreshold": 0.75
     },
@@ -91,7 +88,7 @@
       "saturation": 0,
       "contrast": 0
     },
-    "detectionModes": [],
+    "detectionModes": {},
     "occludable": {
       "radius": 0
     },
@@ -117,7 +114,8 @@
     "flags": {},
     "randomImg": false,
     "appendNumber": false,
-    "prependAdjective": false
+    "prependAdjective": false,
+    "depth": 1
   },
   "items": [
     {
@@ -156,7 +154,7 @@
             "type": "effect",
             "_id": "6DKa1Pm605HpChPd",
             "systemPath": "actions",
-            "description": "<p>When a PC starts the ambush on unsuspecting adversaries, you lose 2 Fear and the first attack roll a PC makes has advantage.</p><section class=\"secret\" id=\"secret-WV3oLdq2IoLoSZqe\"><p><em>What are the adversaries in the middle of doing when the ambush starts? How does this impact their approach to the fight?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [

src/packs/environments/environment_Castle_Siege_1eZ32Esq7rfZOjlu.json

@@ -330,7 +330,7 @@
             "type": "attack",
             "_id": "r5JN5oFYL5DC6Qqw",
             "systemPath": "actions",
-            "description": "<p>When an adversary is defeated, you can <strong>spend a Fear</strong> to have a stray attack from a siege weapon hit a point on the battlefield. All targets within Very Close range of that point must make an Agility Reaction Roll.</p><ul><li><p>Targets who fail take <strong>3d8+3</strong> physical or magic damage and must mark a Stress.</p></li><li><p>Targets who succeed must mark a Stress.</p></li></ul><section id=\"secret-qe1DM7HUSefRAplk\" class=\"secret\"><p><em>What debris is scattered by the attack? What is broken by the strike that can’t be easily mended?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],

src/packs/environments/environment_Cliffside_Ascent_LPpfdlNKqiZIl04w.json

@@ -45,12 +45,9 @@
       "src": "systems/daggerheart/assets/icons/documents/actors/forest.svg",
       "anchorX": 0.5,
       "anchorY": 0.5,
-      "offsetX": 0,
-      "offsetY": 0,
       "fit": "contain",
       "scaleX": 1,
       "scaleY": 1,
-      "rotation": 0,
       "tint": "#ffffff",
       "alphaThreshold": 0.75
     },
@@ -101,7 +98,7 @@
       "saturation": 0,
       "contrast": 0
     },
-    "detectionModes": [],
+    "detectionModes": {},
     "occludable": {
       "radius": 0
     },
@@ -127,7 +124,8 @@
     "flags": {},
     "randomImg": false,
     "appendNumber": false,
-    "prependAdjective": false
+    "prependAdjective": false,
+    "depth": 1
   },
   "items": [
     {
@@ -204,7 +202,7 @@
             "type": "damage",
             "_id": "p1UiGEiGyl6r7PrA",
             "systemPath": "actions",
-            "description": "<p>Previous climbers left behind large metal rods that climbers can use to aid their ascent. If a PC using the pitons fails an action roll to climb, they can <strong>mark a Stress</strong> instead of ticking the countdown up.</p><section class=\"secret\" id=\"secret-fWHkzBQAxCLDmV6H\"><p><em>What do the shape and material of these pitons tell you about the previous climbers? How far apart are they from one another?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -435,7 +433,7 @@
             "type": "effect",
             "_id": "M8MfD2qBfYCwNKvH",
             "systemPath": "actions",
-            "description": "<p>Spend a Fear to have a PC’s handhold fail, plummeting them toward the ground. If they aren’t saved on the next action, they hit the ground and tick up the countdown by 2. The PC takes <strong>1d12</strong> physical damage if the countdown is between 8 and 12, <strong>2d12</strong> between 4 and 7, and <strong>3d12</strong> at 3 or lower.</p><section class=\"secret\" id=\"secret-ufZ6ifPWxU4MkKow\"><p><em>How can you tell many others have fallen here before? What lives in these walls that might try to scare adventurers into falling for an easy meal?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [

src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json

@@ -45,12 +45,9 @@
       "src": "systems/daggerheart/assets/icons/documents/actors/forest.svg",
       "anchorX": 0.5,
       "anchorY": 0.5,
-      "offsetX": 0,
-      "offsetY": 0,
       "fit": "contain",
       "scaleX": 1,
       "scaleY": 1,
-      "rotation": 0,
       "tint": "#ffffff",
       "alphaThreshold": 0.75
     },
@@ -101,7 +98,7 @@
       "saturation": 0,
       "contrast": 0
     },
-    "detectionModes": [],
+    "detectionModes": {},
     "occludable": {
       "radius": 0
     },
@@ -127,7 +124,8 @@
     "flags": {},
     "randomImg": false,
     "appendNumber": false,
-    "prependAdjective": false
+    "prependAdjective": false,
+    "depth": 1
   },
   "items": [
     {
@@ -236,7 +234,7 @@
             "type": "effect",
             "_id": "EATw4ZkcuGeDfgLZ",
             "systemPath": "actions",
-            "description": "<p>A portion of the ritual’s power is diverted into a cult member to fight off interlopers. Choose one adversary to become Imbued with terrible magic until the scene ends or they’re defeated. An Imbued adversary immediately takes the spotlight and gains one of the following benefits, or all three if you <strong>spend a Fear</strong>:</p><ul><li><p>They gain advantage on all attacks.</p></li><li><p>They deal an extra <strong>1d10</strong> damage on a successful attack.</p></li><li><p>They gain the following feature: <strong>Relentless (2) - Passive</strong>. This adversary can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p></li></ul><section class=\"secret\" id=\"secret-5wFIFufzFAPrIDaq\"><p><em>How does the enemy change in appearance? What fears do their blows bring to the surface?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -283,13 +281,10 @@
           },
           "disabled": false,
           "duration": {
-            "startTime": null,
-            "combat": null,
-            "seconds": null,
-            "rounds": null,
-            "turns": null,
-            "startRound": null,
-            "startTurn": null
+            "value": null,
+            "units": "seconds",
+            "expiry": null,
+            "expired": false
           },
           "description": "<p>An Imbued adversary immediately takes the spotlight and gains one of the following benefits, or all three if you <strong>spend a Fear</strong>:</p><ul><li><p>They gain advantage on all attacks.</p></li><li><p>They deal an extra <strong>1d10</strong> damage on a successful attack.</p></li><li><p>They gain the following feature: <strong>Relentless (2) - Passive</strong>. This adversary can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p></li></ul><section class=\"secret\" id=\"secret-YOHA68Na64uXDAxu\"><p><em>How does the enemy change in appearance? What fears do their blows bring to the surface?</em></p></section>",
           "tint": "#ffffff",
@@ -299,6 +294,9 @@
           "_stats": {
             "compendiumSource": null
           },
+          "start": null,
+          "showIcon": 1,
+          "folder": null,
           "_key": "!actors.items.effects!QAXXiOKBDmCTauHD.0Rgqw1kUPeJ11ldd.dYQBQq1xIysM0qLo"
         },
         {
@@ -326,13 +324,10 @@
           },
           "disabled": true,
           "duration": {
-            "startTime": null,
-            "combat": null,
-            "seconds": null,
-            "rounds": null,
-            "turns": null,
-            "startRound": null,
-            "startTurn": null
+            "value": null,
+            "units": "seconds",
+            "expiry": null,
+            "expired": false
           },
           "description": "",
           "tint": "#ffffff",
@@ -342,6 +337,9 @@
           "_stats": {
             "compendiumSource": null
           },
+          "start": null,
+          "showIcon": 1,
+          "folder": null,
           "_key": "!actors.items.effects!QAXXiOKBDmCTauHD.0Rgqw1kUPeJ11ldd.Hxw5lXE77bGzuaOu"
         }
       ],

src/packs/environments/environment_Hallowed_Temple_dsA6j69AnaJhUyqH.json

@@ -44,12 +44,9 @@
       "src": "systems/daggerheart/assets/icons/documents/actors/forest.svg",
       "anchorX": 0.5,
       "anchorY": 0.5,
-      "offsetX": 0,
-      "offsetY": 0,
       "fit": "contain",
       "scaleX": 1,
       "scaleY": 1,
-      "rotation": 0,
       "tint": "#ffffff",
       "alphaThreshold": 0.75
     },
@@ -100,7 +97,7 @@
       "saturation": 0,
       "contrast": 0
     },
-    "detectionModes": [],
+    "detectionModes": {},
     "occludable": {
       "radius": 0
     },
@@ -126,7 +123,8 @@
     "flags": {},
     "randomImg": false,
     "appendNumber": false,
-    "prependAdjective": false
+    "prependAdjective": false,
+    "depth": 1
   },
   "items": [
     {
@@ -140,7 +138,7 @@
             "type": "healing",
             "_id": "uLCoTKa7Jn2HaRqR",
             "systemPath": "actions",
-            "description": "<p>A PC who takes a rest in the Hallowed Temple automatically clears all HP.</p><section class=\"secret\" id=\"secret-vN4UFTYIQW8nd2mC\"><p><em>What does the incense smell like? What kinds of songs do the acolytes sing?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -337,7 +335,7 @@
             "type": "effect",
             "_id": "pJVipg7CbA9CB0Um",
             "systemPath": "actions",
-            "description": "<p>When the PCs have trespassed, blasphemed, or offended the clergy, you can <strong>spend a Fear</strong> to summon a @UUID[Compendium.daggerheart.adversaries.Actor.r1mbfSSwKWdcFdAU]{High Seraph} and [[/r 1d4]] @UUID[Compendium.daggerheart.adversaries.Actor.B4LZcGuBAHzyVdzy]{Bladed Guard} within Close range of the senior priest to reinforce their will.</p><section class=\"secret\" id=\"secret-tG902NbtYpyK0NFi\"><p><em>What symbols or icons do they bear that signal they are anointed agents of the divinity? Who leads the group and what led them to this calling?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [

src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json

@@ -44,12 +44,9 @@
       "src": "systems/daggerheart/assets/icons/documents/actors/forest.svg",
       "anchorX": 0.5,
       "anchorY": 0.5,
-      "offsetX": 0,
-      "offsetY": 0,
       "fit": "contain",
       "scaleX": 1,
       "scaleY": 1,
-      "rotation": 0,
       "tint": "#ffffff",
       "alphaThreshold": 0.75
     },
@@ -100,7 +97,7 @@
       "saturation": 0,
       "contrast": 0
     },
-    "detectionModes": [],
+    "detectionModes": {},
     "occludable": {
       "radius": 0
     },
@@ -126,7 +123,8 @@
     "flags": {},
     "randomImg": false,
     "appendNumber": false,
-    "prependAdjective": false
+    "prependAdjective": false,
+    "depth": 1
   },
   "items": [
     {
@@ -282,7 +280,7 @@
             "type": "countdown",
             "_id": "VhqZKDA4032i8zY3",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to manifest the echo of a past disaster that ravaged the city. Activate a <em>Progress Countdown (5)</em> as the disaster replays around the PCs. To complete the countdown and escape the catastrophe, the PCs must overcome threats such as rampaging fires, stampeding civilians, collapsing buildings, or crumbling streets, while recalling history and finding clues to escape the inevitable.</p><section class=\"secret\" id=\"secret-2Ou4kbqfCwCgsG5X\"><p><em>Is this the disaster that led the city to be abandoned? What is known about this disaster and how could that help the PCs escape?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"

src/packs/environments/environment_Imperial_Court_jr1xAoXzVwVblzxI.json

@@ -46,12 +46,9 @@
       "src": "systems/daggerheart/assets/icons/documents/actors/forest.svg",
       "anchorX": 0.5,
       "anchorY": 0.5,
-      "offsetX": 0,
-      "offsetY": 0,
       "fit": "contain",
       "scaleX": 1,
       "scaleY": 1,
-      "rotation": 0,
       "tint": "#ffffff",
       "alphaThreshold": 0.75
     },
@@ -102,7 +99,7 @@
       "saturation": 0,
       "contrast": 0
     },
-    "detectionModes": [],
+    "detectionModes": {},
     "occludable": {
       "radius": 0
     },
@@ -128,7 +125,8 @@
     "flags": {},
     "randomImg": false,
     "appendNumber": false,
-    "prependAdjective": false
+    "prependAdjective": false,
+    "depth": 1
   },
   "items": [
     {
@@ -297,7 +295,7 @@
             "type": "attack",
             "_id": "9ipckCFMz9DVw8ab",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to tick down a long-term countdown related to the empire’s agenda by [[/r 1d4]]. If this triggers the countdown, a proclamation related to the agenda is announced at court as the plan is executed.</p><section class=\"secret\" id=\"secret-ThoGDjazxfPoUvJS\"><p><em>What display of power or transfer of wealth was needed to expedite this plan? Whose lives were disrupted or upended to make this happen?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],

src/packs/environments/environment_Necromancer_s_Ossuary_h3KyRL7AshhLAmcH.json

@@ -137,7 +137,7 @@
             "type": "damage",
             "_id": "jVY198vniaTSlgsX",
             "systemPath": "actions",
-            "description": "<p>A feature or action that clears HP requires spending a Hope to use. If it already costs Hope, a PC must spend an additional Hope.</p><section class=\"secret\" id=\"secret-Ls4rMO6N9zzuR2Ib\"><p><em>What does it feel like to try to heal in a place so antithetical to life?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -240,7 +240,7 @@
             "type": "attack",
             "_id": "M1mOwi4Limw2hRwL",
             "systemPath": "actions",
-            "description": "<p>All targets within Close range of a point you choose in this environment must succeed on an Agility Reaction Roll or take <strong>4d8+8</strong> physical damage from skeletal shrapnel as part of the ossuary detonates around them.</p><section id=\"secret-xjKFOtdFFWAgx2Cv\" class=\"secret\"><p><em>What ancient skeletal architecture is destroyed? What bones stick in your armor?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -421,7 +421,7 @@
             "type": "effect",
             "_id": "hFeTdiHWeCYkb8Hg",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to summon [[/r 1d6]] @UUID[Compendium.daggerheart.adversaries.Actor.gP3fWTLzSFnpA8EJ]{Rotted Zombie}, two @UUID[Compendium.daggerheart.adversaries.Actor.CP6iRfHdyFWniTHY]{Perfected Zombie}, or a @UUID[Compendium.daggerheart.adversaries.Actor.YhJrP7rTBiRdX5Fp]{Zombie Legion}, who appear at Close range of a chosen PC.</p><section class=\"secret\" id=\"secret-Du2785Ih29RVrHpG\"><p><em>Who were these people before they became the necromancer’s pawns? What vestiges of those lives remain for the heroes to see?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [

src/packs/environments/environment_Pitched_Battle_EWD3ZsLoK6VMVOf7.json

@@ -199,7 +199,7 @@
             "type": "attack",
             "_id": "1giAFbu3tGqXwi8g",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> as a mage from one side uses large-scale destructive magic. Pick a point on the battlefield within Very Far range of the mage. All targets within Close range of that point must make an Agility Reaction Roll. Targets who fail take <strong>3d12+8</strong> magic damage and must mark a Stress.</p><section id=\"secret-jbI9lwrzP59CTRUt\" class=\"secret\"><p><em>What form does the attack take—fireball raining acid a storm of blades? What tactical objective is this attack meant to accomplish and what comes next?</em></p></section>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [

styles/less/global/chat.less

@@ -7,12 +7,12 @@
     .chat-log .chat-message {
         background-image: url('../assets/parchments/dh-parchment-light.png');
 
-        .message-header .message-header-metadata .message-metadata,
-        .message-header .message-header-main .message-sub-header-container {
+        .message-header .message-header-main .message-metadata,
+        .message-header .message-header-main .name {
             color: @dark;
         }
 
-        .message-header .message-header-main .message-sub-header-container h4 {
+        .message-header .message-header-main h4 {
             color: @dark-blue;
         }
 
@@ -42,27 +42,12 @@
 
             .message-header {
                 display: flex;
-                gap: 4px;
+                gap: 8px;
                 padding: 8px;
+                align-items: center;
 
-                .message-header-metadata {
-                    flex: none;
-                    display: flex;
-                    flex-direction: column;
-
-                    .message-metadata {
-                        font-family: @font-body;
-                        color: @beige;
-                    }
-                }
-
-                .message-header-main {
-                    display: flex;
-                    align-items: center;
-                    gap: 8px;
-                    flex: 1;
-                    overflow: hidden;
-
+                .portrait {
+                    flex: 0 0 auto;
                     .actor-img {
                         border-radius: 50%;
                         width: 40px;
@@ -70,20 +55,60 @@
                         object-fit: cover;
                         object-position: top center;
                     }
+                }
 
-                    .message-sub-header-container {
+                .message-header-main {
+                    display: flex;
+                    align-items: center;
+                    column-gap: 4px;
+                    row-gap: 2px;
+                    flex: 1;
+                    overflow: hidden;
+
+                    display: grid;
+                    grid-template:
+                        "title metadata"
+                        "subtitle subtitle";
+
+                    h4 {
+                        font-size: var(--font-size-16);
+                        font-weight: bold;
+                        margin-bottom: 0;
+                        font-family: @font-subtitle;
+                        color: @golden;
+                        white-space: nowrap;
+                        text-overflow: ellipsis;
+                        flex: 1;
+                        overflow: hidden;
+                        align-self: flex-end;
+                    }
+                    
+                    .message-metadata {
+                        font-family: @font-body;
+                        color: @beige;
+                        white-space: nowrap;
+                        align-items: baseline;
+                        .message-timestamp {
+                            font-size: var(--font-size-11);
+                        }
+                    }
+                    
+                    .subtitle {
+                        grid-area: subtitle;
                         flex: 1;
                         display: flex;
-                        flex-direction: column;
                         justify-content: space-between;
                         color: @beige;
-
-                        h4 {
-                            font-size: var(--font-size-16);
-                            font-weight: bold;
-                            margin-bottom: 0;
-                            font-family: @font-subtitle;
-                            color: @golden;
+                        gap: 4px;
+                        align-items: baseline;
+                        line-height: 1;
+                        .name {
+                            flex: 1;
+                        }
+                        .whisper-to {
+                            color: @color-text-subtle;
+                            flex: 0;
+                            white-space: nowrap;
                         }
                     }
                 }

styles/less/global/elements.less

@@ -595,7 +595,86 @@
         margin-top: 4px;
         color: light-dark(#14142599, #efe6d850);
         font-size: var(--font-size-12);
-        padding-left: 3px;
+        padding-left: 16px;
+    }
+
+    section.gm-notes-section {
+        padding-bottom: var(--spacer-4);
+        header.gm-notes + p {
+            margin-top: 0;
+        }
+    }
+
+    header.gm-notes {
+        position: relative;
+        display: flex;
+        gap: 6px;
+        align-items: center;
+        &::before,
+        &::after {
+            content: " ";
+            flex: 1;
+            border-bottom: 1px solid var(--color-dark-6);
+        }
+        &::before {
+            mask-image: linear-gradient(270deg, black 0%, black calc(100% - 10px), transparent 100%);
+        }
+        &::after {
+            mask-image: linear-gradient(270deg, transparent 0%, black 10px, black 100%);
+        }
+        margin-top: var(--spacer-8);
+        margin-bottom: var(--spacer-4);
+        font-size: var(--font-size-11);
+        text-transform: uppercase;
+    }
+
+    secret-block {
+        display: block;
+
+        /** A buffer to make the hover behavior work a bit better. The bottom in the button needs to compensate */
+        @buffer: 8px;
+        margin-top: -@buffer;
+        padding-top: @buffer;
+
+        button.reveal {
+            --button-size: 1rem;
+            height: var(--button-size);
+            position: absolute;
+            margin: auto;
+            left: 0;
+            right: 0;
+            width: min-content;
+            padding: 1px 8px 0 8px;
+            bottom: calc(100% - 0.4375rem - 1px);
+            
+            background-color: var(--dh-window-button-color-bg); // todo: find a better var name
+            border-color: var(--color-secret-border);
+            color: var(--dh-window-button-color-text);
+            font-size: var(--font-size-10);
+            user-select: none;
+            text-transform: uppercase;
+            white-space: nowrap;
+
+            visibility: hidden;
+        }
+
+        &:hover button.reveal {
+            visibility: visible;
+        }
+    }
+
+    /** 
+     * The element inside a secret-block. 
+     * This is separate since during prosemirror editing, the secret-block container does not exist.
+     */
+    section.secret {
+        --color-secret-bg: @red-10;
+        --color-revealed-bg: @green-10;
+        position: relative;
+        padding: 0;
+        p {
+            margin: 0.5rem 0;
+        }
     }
 }
 
@@ -817,4 +896,8 @@
             right: 2px;
         }
     }
+
+    .gm-notes {
+        font-style: italic;
+    }
 }

styles/less/global/feature-section.less

@@ -3,7 +3,7 @@
 
 .sheet.daggerheart.dh-style.item {
     .tab.features {
-        padding: 0 10px;
+        padding: 7px 10px;
         overflow-y: auto;
         .feature-list {
             display: flex;

styles/less/global/global.less

@@ -111,3 +111,7 @@ body.theme-light,
 .themed.theme-light {
     color-scheme: light;
 }
+
+body:not([data-gm=true]) [data-visibility="gm"] {
+    display: none;
+}

styles/less/global/inventory-item.less

@@ -163,37 +163,7 @@
                 }
                 .inventory-description {
                     overflow: hidden;
-
-                    h1 {
-                        font-size: var(--font-size-32);
-                    }
-                    h2 {
-                        font-size: var(--font-size-28);
-                        font-weight: 600;
-                    }
-                    h3 {
-                        font-size: var(--font-size-20);
-                        font-weight: 600;
-                    }
-                    h4 {
-                        font-size: var(--font-size-16);
-                        color: @beige;
-                        font-weight: 600;
-                    }
-
-                    ul,
-                    ol {
-                        margin: 1rem 0;
-                        padding: 0 0 0 1.25rem;
-
-                        li {
-                            margin-bottom: 0.25rem;
-                        }
-                    }
-
-                    ul {
-                        list-style: disc;
-                    }
+                    .typography();
                 }
             }
             .item-resources {

styles/less/global/item-header.less

@@ -12,12 +12,14 @@
 });
 
 .application.sheet.daggerheart.dh-style {
+    --portrait-size: 150px;
+
     .item-sheet-header {
         display: flex;
 
         .profile {
-            height: 150px;
-            width: 150px;
+            height: var(--portrait-size);
+            width: var(--portrait-size);
             object-fit: cover;
             border-right: 1px solid light-dark(@dark-blue, @golden);
             border-bottom: 1px solid light-dark(@dark-blue, @golden);
@@ -34,19 +36,24 @@
             text-align: center;
             width: 80%;
 
-            .item-name input[type='text'] {
-                font-size: var(--font-size-32);
-                height: 42px;
-                text-align: center;
-                width: 90%;
-                transition: all 0.3s ease;
-                outline: 2px solid transparent;
-                border: 1px solid transparent;
+            .item-name {
+                display: flex;
+                flex-direction: column;
+                margin: 10px 10px 0 10px;
+                input[type='text'] {
+                    font-size: var(--font-size-30);
+                    text-align: center;
+                    width: 100%;
+                    transition: all 0.3s ease;
+                    outline: 2px solid transparent;
+                    border: 1px solid transparent;
+                    text-overflow: ellipsis;
 
-                &:hover[type='text'],
-                &:focus[type='text'] {
-                    box-shadow: none;
-                    outline: 2px solid light-dark(@dark-blue, @golden);
+                    &:hover[type='text'],
+                    &:focus[type='text'] {
+                        box-shadow: none;
+                        outline: 2px solid light-dark(@dark-blue, @golden);
+                    }
                 }
             }
 

styles/less/global/prose-mirror.less

@@ -14,36 +14,7 @@
         }
         .editor-content {
             .with-scroll-shadows();
-            h1 {
-                font-size: var(--font-size-32);
-            }
-            h2 {
-                font-size: var(--font-size-28);
-                font-weight: 600;
-            }
-            h3 {
-                font-size: var(--font-size-20);
-                font-weight: 600;
-            }
-            h4 {
-                font-size: var(--font-size-16);
-                color: light-dark(@dark, @beige);
-                font-weight: 600;
-            }
-
-            ul,
-            ol {
-                margin: 1rem 0;
-                padding: 0 0 0 1.25rem;
-
-                li {
-                    margin-bottom: 0.25rem;
-                }
-            }
-
-            ul {
-                list-style: disc;
-            }
+            .typography();
         }
         // Fixes centering and makes it not render over scrollbar
         &:hover button.toggle:enabled {

styles/less/global/sheet.less

@@ -36,8 +36,8 @@ body.game:is(.performance-low, .noblur) {
         }
 
         button {
-            background: light-dark(#e8e6e3, @deep-black);
-            color: light-dark(@dark-blue, @beige);
+            background: var(--dh-window-button-color-bg);
+            color: var(--dh-window-button-color-text);
             border: 1px solid light-dark(@dark-blue, transparent);
             padding: 0;
 

styles/less/global/tab-description.less

@@ -6,11 +6,80 @@
         display: flex;
         flex-direction: column;
         flex: 1;
-        overflow-y: hidden !important;
-        padding-top: 10px;
+        overflow: hidden;
+        padding: 0;
+        margin: 0;
 
-        prose-mirror.active + .artist-attribution {
-            display: none;
+        .description-section {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            overflow: auto;
+            padding: 12px 16px 4px 16px;
+            .with-scroll-shadows();
+            prose-mirror {
+                button.toggle {
+                    top: 0px;
+                    right: 0;
+                }
+                button[data-action=editGMNote] {
+                    right: calc(var(--button-size) + 4px);
+                }
+                &.inactive {
+                    height: unset!important;
+                    overflow: unset;
+                    .editor-content {
+                        position: relative;
+                        overflow: unset;
+
+                        // Allows content links to peek out
+                        margin-top: -4px;
+                        padding: 4px 0 0 0;
+                    }
+                }
+                &.active {
+                    --min-height: 250px;
+                    padding: 8px 0 0 16px;
+                    button[data-action=editGMNote] {
+                        display: none;
+                    }
+                    .editor-content {
+                        padding-right: 16px;
+                        padding-bottom: 4px;
+                    }
+                }
+            }
+            /** Hide editors that are empty when inactive if we need them to be */
+            prose-mirror.inactive.hide-if-inactive {
+                display: none;
+            }
+            &:has(prose-mirror.active) {
+                padding: 0;
+            }
+            /** Description should fill available room (with overriden exceptions) */
+            prose-mirror[name="system.description"] {
+                flex: 1 0;
+            }
+            &:has(prose-mirror[name="system.gmNotes"]:not(.hide-if-inactive)) {
+                prose-mirror.inactive {
+                    --min-height: 3rem;
+                    &[name="system.description"] {
+                        flex: 0 0;
+                    }
+                    &[name="system.gmNotes"] {
+                        flex: 1 0;
+                    }
+                }
+            }
+        }
+
+        /** Hide other elements if an editor is open */
+        &:has(prose-mirror.active) {
+            prose-mirror.inactive,
+            header.gm-notes,
+            .artist-attribution {
+                display: none;
+            }
         }
     }
 }

styles/less/sheets/actors/actor-sheet-shared.less

@@ -93,10 +93,6 @@
                 padding: 8px 0 0 16px;
             }
         }
-
-        .artist-attribution {
-            padding-left: 16px;
-        }
     }
 
     .search-section {

styles/less/sheets/items/beastform.less

@@ -1,4 +1,6 @@
 .application.sheet.daggerheart.dh-style.beastform {
+    --portrait-size: 130px;
+
     .settings.tab {
         .advantage-on-section {
             display: flex;
@@ -9,4 +11,11 @@
             font-style: italic;
         }
     }
+    .tab.features.active {
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        padding: 8px calc(12px - var(--scrollbar-width)) 4px 12px;
+        .stable-scroll-container();
+    }
 }

styles/less/sheets/items/feature.less

@@ -2,17 +2,9 @@
 @import '../../utils/fonts.less';
 
 .application.sheet.daggerheart.dh-style.feature {
-    .item-sheet-header {
-        display: flex;
-
-        .profile {
-            height: 130px;
-            width: 130px;
-        }
-    }
+    --portrait-size: 130px;
 
     section.tab {
-        height: 400px;
         overflow-y: auto;
     }
 }

styles/less/sheets/items/index.less

@@ -1,6 +1,6 @@
+@import './item-sheet-shared.less';
 @import './beastform.less';
 @import './class.less';
 @import './domain-card.less';
 @import './feature.less';
-@import './heritage.less';
-@import './item-sheet-shared.less';
+@import './heritage.less';

styles/less/sheets/items/item-sheet-shared.less

@@ -1,4 +1,4 @@
-.application.sheet.daggerheart.dh-style.item {
+.item.daggerheart.dh-style:where(.application.sheet) {
     &.minimized {
         .attribution-header-label {
             display: none;
@@ -14,4 +14,22 @@
     button.plain.inline-control {
         flex: 0 0 auto;
     }
+
+    .tab-navigation {
+        margin-bottom: 0;
+    }
+
+    /** Default tab stylings */
+    .tab.active {
+        padding-top: 8px;
+        .with-scroll-shadows();
+
+        &.effects {
+            display: flex;
+            flex-direction: column;
+            gap: 10px;
+            padding: 8px calc(12px - var(--scrollbar-width)) 4px 12px;
+            .stable-scroll-container();
+        }
+    }
 }

styles/less/ui/chat/ability-use.less

@@ -117,7 +117,9 @@
         }
 
         .description {
-            padding: 8px;
+            padding: 0;
+            margin: 8px;
+            .typography();
         }
 
         .ability-card-footer {

styles/less/utils/colors.less

@@ -107,6 +107,8 @@
         --dh-input-color-text: @dark;
         --dh-trait-color-bg: #b1afb6;
         --dh-trait-color-border: #8e8d96;
+        --dh-window-button-color-bg: #e8e6e3;
+        --dh-window-button-color-text: @dark-blue;
     }
 }
 @scope (.theme-dark) to (.themed) {  
@@ -124,6 +126,8 @@
         --dh-input-color-text: @beige;
         --dh-trait-color-bg: #50433F;
         --dh-trait-color-border: #927952;
+        --dh-window-button-color-bg: @deep-black;
+        --dh-window-button-color-text: @beige;
     }
 }
 

styles/less/utils/mixin.less

@@ -203,4 +203,38 @@
     overflow-y: auto;
     scrollbar-gutter: stable;
     .with-scroll-shadows();
-}
+}
+
+/** Typography stylings for most longform text, usually item descriptions */
+.typography() {
+    h1 {
+        font-size: var(--font-size-32);
+    }
+    h2 {
+        font-size: var(--font-size-28);
+        font-weight: 600;
+    }
+    h3 {
+        font-size: var(--font-size-20);
+        font-weight: 600;
+    }
+    h4 {
+        font-size: var(--font-size-16);
+        color: light-dark(@dark, @beige);
+        font-weight: 600;
+    }
+
+    ul,
+    ol {
+        margin: 0.5rem 0;
+        padding: 0 0 0 1.25rem;
+
+        li {
+            margin-bottom: 0.25rem;
+        }
+    }
+
+    ul {
+        list-style: disc;
+    }
+}

system.json

@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "2.5.2",
+    "version": "2.5.4",
     "compatibility": {
         "minimum": "14.364",
         "verified": "14.364",
@@ -10,7 +10,7 @@
     },
     "url": "https://github.com/Foundryborne/daggerheart",
     "manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/v14/system.json",
-    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.5.2/system.zip",
+    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.5.4/system.zip",
     "authors": [
         {
             "name": "WBHarry"
@@ -256,34 +256,34 @@
         },
         "Item": {
             "ancestry": {
-                "htmlFields": ["description"]
+                "htmlFields": ["description", "gmNotes"]
             },
             "community": {
-                "htmlFields": ["description"]
+                "htmlFields": ["description", "gmNotes"]
             },
             "class": {
-                "htmlFields": ["description"]
+                "htmlFields": ["description", "gmNotes"]
             },
             "subclass": {
-                "htmlFields": ["description"]
+                "htmlFields": ["description", "gmNotes"]
             },
             "feature": {
-                "htmlFields": ["description"]
+                "htmlFields": ["description", "gmNotes"]
             },
             "domainCard": {
-                "htmlFields": ["description"]
+                "htmlFields": ["description", "gmNotes"]
             },
             "loot": {
-                "htmlFields": ["description"]
+                "htmlFields": ["description", "gmNotes"]
             },
             "consumable": {
-                "htmlFields": ["description"]
+                "htmlFields": ["description", "gmNotes"]
             },
             "weapon": {
-                "htmlFields": ["description"]
+                "htmlFields": ["description", "gmNotes"]
             },
             "armor": {
-                "htmlFields": ["description"]
+                "htmlFields": ["description", "gmNotes"]
             },
             "beastform": {}
         },

templates/sheets/global/tabs/tab-description.hbs

@@ -1,11 +1,25 @@
-<section
-    class='tab {{tabs.description.cssClass}} {{tabs.description.id}}'
-    data-tab='{{tabs.description.id}}'
-    data-group='{{tabs.description.group}}'
->
-    {{formInput systemFields.description value=document.system.description enriched=enrichedDescription toggled=true}}
-    
-    {{#if (and showAttribution document.system.attribution.artist)}}
-        <label class="artist-attribution">{{localize "DAGGERHEART.GENERAL.artistAttribution" artist=document.system.attribution.artist}}</label>
-    {{/if}}
+<section
+    class='tab {{tabs.description.cssClass}} {{tabs.description.id}}'
+    data-tab='{{tabs.description.id}}'
+    data-group='{{tabs.description.group}}'
+>
+    <div class="description-section">
+        {{formInput systemFields.description value=document.system.description enriched=enrichedDescription toggled=true}}
+        {{#if (and systemFields.gmNotes @root.user.isGM)}}
+            <section class="gm-notes-section">
+                {{#if enrichedGMNotes}}
+                    <header class="gm-notes">{{localize "DAGGERHEART.ITEMS.FIELDS.gmNotes.label"}}</header>
+                {{/if}}
+                <prose-mirror
+                    name="system.gmNotes"
+                    {{#unless enrichedGMNotes}}class="hide-if-inactive"{{/unless}}
+                    toggled="true"
+                    value="{{document.system.gmNotes}}"
+                >{{{enrichedGMNotes}}}</prose-mirror>
+            </section>
+        {{/if}}
+    </div>
+    {{#if (and showAttribution document.system.attribution.artist)}}
+        <label class="artist-attribution">{{localize "DAGGERHEART.GENERAL.artistAttribution" artist=document.system.attribution.artist}}</label>
+    {{/if}}
 </section>

templates/ui/chat/action.hbs

@@ -16,10 +16,10 @@
                     {{#each action.summon}}
                         <div class="summon-container">
                             <div class="summon-label-container">
-                                <img src="{{this.actor.img}}" />
-                                <label>{{this.actor.name}}</label>
+                                <img src="{{this.data.img}}" />
+                                <label>{{this.data.name}}</label>
                             </div>
-                            <span># {{this.rolledCount}}</span>
+                            <span># {{this.quantity}}</span>
                         </div>
                     {{/each}}
                 </div>

templates/ui/chat/chat-message.hbs

@@ -1,23 +1,18 @@
 <li class="chat-message message flexcol {{cssClass}}" data-message-id="{{message._id}}"
     {{#if borderColor}}style="border-color:{{borderColor}}"{{/if}}>
     <header class="message-header flexrow">
-        <div class="message-header-main">
+        <div class="portrait">
             <img class="actor-img" src="{{actor.img}}" />
-            <div class="message-sub-header-container">
-                {{#if message.title}}
-                    <h4>{{message.title}}</h4>
-                    <div>{{alias}} {{#if author.isGM}}(GM){{/if}}</div>
-                {{else}}
-                    {{#unless actor.name}}
-                        <h4>{{author.name}}</h4>
-                    {{else}}
-                        <h4>{{alias}}</h4>
-                        <div>{{author.name}}</div>
-                    {{/unless}}
-                {{/if}}
-            </div>
         </div>
-        <div class="message-header-metadata">
+        <div class="message-header-main">
+            {{#if message.title}}
+                <h4>{{message.title}}</h4>
+            {{else if (not actor.name)}}
+                <h4>{{author.name}}</h4>
+            {{else}}
+                <h4>{{alias}}</h4>
+            {{/if}}
+
             <span class="message-metadata">
                 <time class="message-timestamp">{{timeSince message.timestamp}}</time>
                 {{#if canDelete}}
@@ -32,9 +27,19 @@
                 {{/if}}
             </span>
 
-            {{#if isWhisper}}
-            <span class="whisper-to">{{localize 'CHAT.To'}}: {{whisperTo}}</span>
-            {{/if}}
+            <div class="subtitle">
+                <div class="name">
+                    {{#if message.title}}
+                        {{alias}} {{#if author.isGM}}(GM){{/if}}
+                    {{else if (not actor.name)}}
+                        {{author.name}}
+                    {{/if}}
+                </div>
+
+                {{#if isWhisper}}
+                    <span class="whisper-to">{{localize 'CHAT.To'}}: {{whisperTo}}</span>
+                {{/if}}
+            </div>
         </div>
     </header>
     <div class="message-content">