Merge branch 'main' into v14

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,
+                    selfId: this.actor.uuid
-                    open: autoExpandDescription ? 'open' : ''
                 }
             ),
             flags: {

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/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);
+        await CONFIG.ux.TokenManager.createTokensWithPreview(summonData, { elevation: this.actor.token?.elevation });
-    }
+        this.actor.sheet?.maximize();
-
+        config.summonData = chatMessageData;
-    static async handleSummon(summonData, actionActor) {
-        await CONFIG.ux.TokenManager.createTokensWithPreview(summonData, { elevation: actionActor.token?.elevation });
-
-        return actionActor.sheet?.maximize();
     }
 }

module/data/fields/actionField.mjs

@@ -269,10 +269,7 @@ export function ActionMixin(Base) {
             return this.delete();
         }
 
-        async toChat(origin) {
+        async toChat(origin, config) {
-            const autoExpandDescription = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance)
-                .expandRollMessage?.desc;
-
             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/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.id, CONFIG.DH.SETTINGS.gameSettings.appearance
-                    CONFIG.DH.SETTINGS.gameSettings.appearance
+            ).expandRollMessage;
-                ).expandRollMessage,
+            for (const { selector, key } of DhpChatMessage.#EXPAND_SECTIONS) {
-                rollSections = html.querySelectorAll('.roll-part'),
+                const elements = html.querySelectorAll(selector);
-                itemDesc = html.querySelector('.domain-card-move');
+                for (const element of elements) {
-            rollSections.forEach(s => {
+                    element.classList.toggle('expanded', autoExpandRoll[key]);
-                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'))
+            // Auto expand the item description. These are not preserved by foundry during re-renders
-                    s.classList.toggle('expanded', autoExpandRoll.damage);
+            const itemDesc = html.querySelector('details');
-                else if (s.classList.contains('target-section')) s.classList.toggle('expanded', autoExpandRoll.target);
+            if (itemDesc) {
-                else if (s.classList.contains('description-section'))
+                const existing = document.querySelector(`.chat-message[data-message-id="${this.id}"] details`);
-                    s.classList.toggle('expanded', autoExpandRoll.desc);
+                if (existing?.hasAttribute('open') ?? autoExpandRoll.desc) {
-            });
+                    itemDesc.setAttribute('open', '');
-            if (itemDesc && autoExpandRoll.desc) itemDesc.setAttribute('open', '');
+                }
+            }
         }
 
         if (!this.isAuthor && !this.speakerActor?.isOwner) {

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 => ({
+                [finalTokenData],
-                    ...x.toObject(),
-                    name: tokenData.actor.prototypeToken.name,
-                    displayName: tokenData.actor.prototypeToken.displayName,
-                    flags: tokenData.actor.prototypeToken.flags
-                })),
                 { controlObject: true, parent: canvas.scene }
             );
         }

styles/less/global/elements.less

@@ -599,27 +599,23 @@
     }
 
     secret-block {
-        position: relative;
+        display: block;
-        section.secret {
+
-            background-color: @red-10;
+        /** A buffer to make the hover behavior work a bit better. The bottom in the button needs to compensate */
-            padding: 0;
+        @buffer: 8px;
-            margin-top: 0.375rem;
+        margin-top: -@buffer;
-            &.revealed {
+        padding-top: @buffer;
-                background-color: @green-10;
+
-            }
-            p {
-                margin: 0.5rem 0;
-            }
-        }
         button.reveal {
-            --button-size: 0.875rem;
+            --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 - 2px);
+            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);
@@ -627,6 +623,7 @@
             font-size: var(--font-size-10);
             user-select: none;
             text-transform: uppercase;
+            white-space: nowrap;
 
             visibility: hidden;
         }
@@ -635,6 +632,20 @@
             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;
+        }
+    }
 }
 
 .system-daggerheart {

system.json

@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "2.5.3",
+    "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.3/system.zip",
+    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.5.4/system.zip",
     "authors": [
         {
             "name": "WBHarry"

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}}" />
+                                <img src="{{this.data.img}}" />
-                                <label>{{this.actor.name}}</label>
+                                <label>{{this.data.name}}</label>
                             </div>
-                            <span># {{this.rolledCount}}</span>
+                            <span># {{this.quantity}}</span>
                         </div>
                     {{/each}}
                 </div>