From 078ca3262d442a1b1afe633dc38c40fff53546f9 Mon Sep 17 00:00:00 2001 From: WBHarry Date: Mon, 28 Jul 2025 22:50:08 +0200 Subject: [PATCH] Added basic chat-message.hbs --- daggerheart.mjs | 1 + module/applications/ui/chatLog.mjs | 60 ++++++++++++---------- module/documents/chatMessage.mjs | 4 +- styles/less/global/chat.less | 82 +++++++++++++++++++++++------- templates/ui/chat/chat-message.hbs | 38 ++++++++++++++ 5 files changed, 140 insertions(+), 45 deletions(-) create mode 100644 templates/ui/chat/chat-message.hbs diff --git a/daggerheart.mjs b/daggerheart.mjs index 1bb9485e..6b2de662 100644 --- a/daggerheart.mjs +++ b/daggerheart.mjs @@ -129,6 +129,7 @@ Hooks.once('init', () => { CONFIG.ChatMessage.dataModels = models.chatMessages.config; CONFIG.ChatMessage.documentClass = documents.DhChatMessage; + CONFIG.ChatMessage.template = 'systems/daggerheart/templates/ui/chat/chat-message.hbs'; CONFIG.Canvas.rulerClass = placeables.DhRuler; CONFIG.Canvas.layers.templates.layerClass = placeables.DhTemplateLayer; diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs index 5e507a3b..47619120 100644 --- a/module/applications/ui/chatLog.mjs +++ b/module/applications/ui/chatLog.mjs @@ -1,4 +1,4 @@ -import { emitAsGM, GMUpdateEvent } from "../../systemRegistration/socket.mjs"; +import { emitAsGM, GMUpdateEvent } from '../../systemRegistration/socket.mjs'; export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLog { constructor(options) { @@ -15,6 +15,11 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo this.setupHooks(); } + /** @inheritDoc */ + static DEFAULT_OPTIONS = { + classes: ['daggerheart'] + }; + addChatListeners = async (app, html, data) => { html.querySelectorAll('.duality-action-damage').forEach(element => element.addEventListener('click', event => this.onRollDamage(event, data.message)) @@ -100,22 +105,24 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo if (message.system.source.item && message.system.source.action) { const action = this.getAction(actor, message.system.source.item, message.system.source.action); if (!action || !action?.hasSave) return; - action.rollSave(token.actor, event, message).then(result => emitAsGM( - GMUpdateEvent.UpdateSaveMessage, - action.updateSaveMessage.bind(action, result, message, token.id), - { - action: action.uuid, - message: message._id, - token: token.id, - result - } - )); + action.rollSave(token.actor, event, message).then(result => + emitAsGM( + GMUpdateEvent.UpdateSaveMessage, + action.updateSaveMessage.bind(action, result, message, token.id), + { + action: action.uuid, + message: message._id, + token: token.id, + result + } + ) + ); } } async onRollAllSave(event, message) { event.stopPropagation(); - if(!game.user.isGM) return; + if (!game.user.isGM) return; const targets = event.target.parentElement.querySelectorAll( '.target-section > [data-token] .target-save-container' ); @@ -124,16 +131,17 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo targets.forEach(async el => { const tokenId = el.closest('[data-token]')?.dataset.token, token = game.canvas.tokens.get(tokenId); - if(!token.actor) return; - if(game.user === token.actor.owner) - el.dispatchEvent(new PointerEvent('click', { shiftKey: true })); + if (!token.actor) return; + if (game.user === token.actor.owner) el.dispatchEvent(new PointerEvent('click', { shiftKey: true })); else { - token.actor.owner.query('reactionRoll', { - actionId: action.uuid, - actorId: token.actor.uuid, - event, - message - }).then(result => action.updateSaveMessage(result, message, token.id)); + token.actor.owner + .query('reactionRoll', { + actionId: action.uuid, + actorId: token.actor.uuid, + event, + message + }) + .then(result => action.updateSaveMessage(result, message, token.id)); } }); } @@ -172,7 +180,9 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo return { isHit, targets: isHit - ? message.system.targets.filter(t => t.hit === true).map(target => game.canvas.tokens.documentCollection.find(t => t.actor.uuid === target.actorId)) + ? message.system.targets + .filter(t => t.hit === true) + .map(target => game.canvas.tokens.documentCollection.find(t => t.actor.uuid === target.actorId)) : Array.from(game.user.targets) }; } @@ -234,10 +244,8 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo }); } - if(message.system.hasHealing) - target.actor.takeHealing(damages); - else - target.actor.takeDamage(damages); + if (message.system.hasHealing) target.actor.takeHealing(damages); + else target.actor.takeDamage(damages); } } diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs index 46f95633..82562bcf 100644 --- a/module/documents/chatMessage.mjs +++ b/module/documents/chatMessage.mjs @@ -6,8 +6,10 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage { _source: this.system._source }); + const actor = game.actors.get(this.speaker.actor); + const actorData = actor ?? { img: 'icons/svg/mystery-man.svg', name: '' }; /* We can change to fully implementing the renderHTML function if needed, instead of augmenting it. */ - const html = await super.renderHTML(); + const html = await super.renderHTML({ actor: actorData }); this.applyPermission(html); if (this.type === 'dualityRoll') { diff --git a/styles/less/global/chat.less b/styles/less/global/chat.less index 60e6b69b..7008855f 100644 --- a/styles/less/global/chat.less +++ b/styles/less/global/chat.less @@ -1,18 +1,64 @@ -@import '../utils/colors.less'; -@import '../utils/fonts.less'; -@import '../utils/mixin.less'; - -.dh-chat-message { - background-image: url('../assets/parchments/dh-parchment-dark.png'); - border: none !important; - padding: 8px 0; - - .message-header { - padding: 0 8px 8px; - color: @beige; - .message-sender, - .message-metadata { - font-family: @font-body; - } - } -} +@import '../utils/colors.less'; +@import '../utils/fonts.less'; +@import '../utils/mixin.less'; + +.theme-light { + .daggerheart.chat-sidebar .chat-log { + .chat-message { + background-image: url('../assets/parchments/dh-parchment-light.png'); + } + } +} + +.daggerheart.chat-sidebar { + .chat-log { + .chat-message { + border: none !important; + padding: 8px 0; + background-image: url('../assets/parchments/dh-parchment-dark.png'); + + .message-header { + padding: 0 8px 8px; + + .message-header-section { + width: 100%; + display: flex; + + .message-metadata { + font-family: @font-body; + } + } + + .message-sub-header { + width: 100%; + display: flex; + gap: 8px; + + .actor-img { + flex: none; + border-radius: 50%; + width: 60px; + height: 60px; + } + + .message-sub-header-container { + flex: 1; + display: flex; + flex-direction: column; + justify-content: space-between; + padding: 4px 0; + color: @beige; + + h4 { + font-size: 20px; + font-weight: bold; + margin-bottom: 0; + font-family: @font-body; + color: @golden; + } + } + } + } + } + } +} diff --git a/templates/ui/chat/chat-message.hbs b/templates/ui/chat/chat-message.hbs new file mode 100644 index 00000000..b2a6c7e9 --- /dev/null +++ b/templates/ui/chat/chat-message.hbs @@ -0,0 +1,38 @@ +
  • +
    +
    + +
    +

    {{ifThen message.title message.title alias}}

    +
    {{actor.name}}
    +
    +
    +
    + + + {{#if canDelete}} + + + + {{/if}} + {{#if canClose}} + + + + {{/if}} + + + {{#if isWhisper}} + {{localize 'CHAT.To'}}: {{whisperTo}} + {{/if}} + + {{#if message.flavor}} + {{{message.flavor}}} + {{/if}} +
    +
    +
    + {{{message.content}}} +
    +
    • \ No newline at end of file