diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs index 4edf951e..f6ffe75f 100644 --- a/module/data/action/baseAction.mjs +++ b/module/data/action/baseAction.mjs @@ -241,11 +241,12 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel */ prepareBaseConfig(event) { const isActor = this.item instanceof CONFIG.Actor.documentClass; - const isItem = this.item instanceof CONFIG.Item.documentClass; + const actionTitle = game.i18n.localize(this.name); + const itemTitle = isActor || this.item.name === actionTitle ? '' : `${this.item.name} - `; const config = { event, - title: `${isActor || isItem ? '' : `${this.item.name}: `}${game.i18n.localize(this.name)}`, + title: `${itemTitle}${actionTitle}`, source: { item: this.item._id, originItem: this.originItem, diff --git a/module/data/settings/Appearance.mjs b/module/data/settings/Appearance.mjs index d7a638d7..cd98d6f9 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(), + desc: new BooleanField({ initial: true }), roll: new BooleanField(), damage: new BooleanField(), target: new BooleanField() diff --git a/styles/less/ui/chat/chat.less b/styles/less/ui/chat/chat.less index 1a6c9427..8728fbda 100644 --- a/styles/less/ui/chat/chat.less +++ b/styles/less/ui/chat/chat.less @@ -228,6 +228,15 @@ 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); } @@ -574,6 +583,30 @@ } } + .chat-roll .description-section { + .roll-part-content { + .dice-tooltip { + .wrapper { + i { + margin: 0; + + :first-child { + margin-top: 0; + } + + :last-child { + margin-bottom: 0; + } + } + + > :first-child:not(.target-selector) { + margin: 0; + } + } + } + } + } + .roll-buttons { display: flex; gap: 5px; diff --git a/templates/ui/chat/roll.hbs b/templates/ui/chat/roll.hbs index 5ab55552..c7b17b21 100644 --- a/templates/ui/chat/roll.hbs +++ b/templates/ui/chat/roll.hbs @@ -1,7 +1,10 @@
+
{{title}}
{{#if actionDescription}}{{> 'systems/daggerheart/templates/ui/chat/parts/description-part.hbs'}}{{/if}} -
{{title}}
- {{#if hasRoll}}{{> 'systems/daggerheart/templates/ui/chat/parts/roll-part.hbs'}}{{/if}} + {{#if hasRoll}} +
{{localize "Result"}}
+ {{> '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}}