diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs index f6ffe75f..4edf951e 100644 --- a/module/data/action/baseAction.mjs +++ b/module/data/action/baseAction.mjs @@ -241,12 +241,11 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel */ prepareBaseConfig(event) { const isActor = this.item instanceof CONFIG.Actor.documentClass; - const actionTitle = game.i18n.localize(this.name); - const itemTitle = isActor || this.item.name === actionTitle ? '' : `${this.item.name} - `; + const isItem = this.item instanceof CONFIG.Item.documentClass; const config = { event, - title: `${itemTitle}${actionTitle}`, + title: `${isActor || isItem ? '' : `${this.item.name}: `}${game.i18n.localize(this.name)}`, source: { item: this.item._id, originItem: this.originItem, diff --git a/module/data/settings/Appearance.mjs b/module/data/settings/Appearance.mjs index cd98d6f9..d7a638d7 100644 --- a/module/data/settings/Appearance.mjs +++ b/module/data/settings/Appearance.mjs @@ -37,7 +37,7 @@ export default class DhAppearance extends foundry.abstract.DataModel { extendEnvironmentDescriptions: new BooleanField(), extendItemDescriptions: new BooleanField(), expandRollMessage: new SchemaField({ - desc: new BooleanField({ initial: true }), + desc: new BooleanField(), roll: new BooleanField(), damage: new BooleanField(), target: new BooleanField() diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs index 668ad06b..c1803b14 100644 --- a/module/documents/chatMessage.mjs +++ b/module/documents/chatMessage.mjs @@ -101,7 +101,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage { CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance ).expandRollMessage, - rollSections = html.querySelectorAll('.roll-part'), + rollSections = html.querySelectorAll('.roll-part, .description-section'), itemDesc = html.querySelector('.domain-card-move'); rollSections.forEach(s => { if (s.classList.contains('roll-section')) { diff --git a/styles/less/ui/chat/chat.less b/styles/less/ui/chat/chat.less index 8728fbda..9647964b 100644 --- a/styles/less/ui/chat/chat.less +++ b/styles/less/ui/chat/chat.less @@ -228,15 +228,6 @@ font-size: var(--font-size-12); padding: 0 20px; - .roll-part-title { - text-align: center; - font-family: @font-subtitle; - font-size: var(--font-size-18); - font-weight: bold; - color: var(--text-color); - margin-bottom: -2px; - } - > .roll-part-header { font-size: var(--font-size-14); } @@ -584,25 +575,34 @@ } .chat-roll .description-section { - .roll-part-content { - .dice-tooltip { - .wrapper { - i { - margin: 0; + background: @dark-80; + border-radius: 6px; - :first-child { - margin-top: 0; - } + .description-header { + width: 100%; + display: flex; + flex-direction: column; + align-items: center; + gap: 2px; - :last-child { - margin-bottom: 0; - } - } + .description-header-title { + color: @golden; + font-size: var(--font-size-16); + } - > :first-child:not(.target-selector) { - margin: 0; - } - } + .description-header-subtitle { + font-size: var(--font-size-14); + padding-bottom: 2px; + } + } + + .roll-part-content .dice-tooltip .wrapper { + i { + margin: 0; + } + + > :first-child:not(.target-selector) { + margin: 0; } } } diff --git a/templates/ui/chat/parts/description-part.hbs b/templates/ui/chat/parts/description-part.hbs index 2e73a753..b9d9f7a4 100644 --- a/templates/ui/chat/parts/description-part.hbs +++ b/templates/ui/chat/parts/description-part.hbs @@ -1,5 +1,8 @@ -
-
{{localize "DAGGERHEART.GENERAL.description"}}
+
+
+
{{title}}
+
{{title}}
+
diff --git a/templates/ui/chat/roll.hbs b/templates/ui/chat/roll.hbs index c7b17b21..5ab55552 100644 --- a/templates/ui/chat/roll.hbs +++ b/templates/ui/chat/roll.hbs @@ -1,10 +1,7 @@
-
{{title}}
{{#if actionDescription}}{{> 'systems/daggerheart/templates/ui/chat/parts/description-part.hbs'}}{{/if}} - {{#if hasRoll}} -
{{localize "Result"}}
- {{> 'systems/daggerheart/templates/ui/chat/parts/roll-part.hbs'}} - {{/if}} +
{{title}}
+ {{#if hasRoll}}{{> 'systems/daggerheart/templates/ui/chat/parts/roll-part.hbs'}}{{/if}} {{#if (or hasDamage hasHealing)}}{{> 'systems/daggerheart/templates/ui/chat/parts/damage-part.hbs'}}{{/if}} {{#if hasTarget}}{{> 'systems/daggerheart/templates/ui/chat/parts/target-part.hbs'}}{{/if}}