diff --git a/daggerheart.mjs b/daggerheart.mjs index 9cb64e81..747fd490 100644 --- a/daggerheart.mjs +++ b/daggerheart.mjs @@ -14,6 +14,7 @@ import { getCommandTarget, rollCommandToJSON, setDiceSoNiceForDualityRoll } from import { abilities } from './module/config/actorConfig.mjs'; import Resources from './module/applications/resources.mjs'; import DHDualityRoll from './module/data/chat-message/dualityRoll.mjs'; +import { DualityRollColor } from './module/data/settings/Appearance.mjs'; globalThis.SYSTEM = SYSTEM; @@ -106,6 +107,7 @@ Hooks.once('init', () => { Hooks.on('ready', () => { ui.resources = new CONFIG.ui.resources(); if(game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Resources.DisplayFear) !== 'hide') ui.resources.render({ force: true }); + document.body.classList.toggle('theme-colorful', game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance).dualityColorScheme === DualityRollColor.colorful.value); }); Hooks.once('dicesoniceready', () => {}); diff --git a/module/applications/chatMessage.mjs b/module/applications/chatMessage.mjs index a7f61cd8..4850a0d2 100644 --- a/module/applications/chatMessage.mjs +++ b/module/applications/chatMessage.mjs @@ -11,9 +11,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage { const html = await super.renderHTML(); if ( - this.type === 'dualityRoll' && - game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance).dualityColorScheme === - DualityRollColor.colorful.value + this.type === 'dualityRoll' ) { html.classList.add('duality'); const dualityResult = this.system.dualityResult; diff --git a/module/applications/settings/appearanceSettings.mjs b/module/applications/settings/appearanceSettings.mjs index fb395d6e..5797836b 100644 --- a/module/applications/settings/appearanceSettings.mjs +++ b/module/applications/settings/appearanceSettings.mjs @@ -1,4 +1,4 @@ -import DhAppearance from '../../data/settings/Appearance.mjs'; +import DhAppearance, { DualityRollColor } from '../../data/settings/Appearance.mjs'; const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; @@ -54,7 +54,7 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App static async save() { await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance, this.settings.toObject()); - const reload = await foundry.applications.api.DialogV2.confirm({ + /* const reload = await foundry.applications.api.DialogV2.confirm({ id: 'reload-world-confirm', modal: true, rejectClose: false, @@ -66,7 +66,8 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App if (reload) { await game.socket.emit('reload'); foundry.utils.debouncedReload(); - } + } */ + document.body.classList.toggle('theme-colorful', game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance).dualityColorScheme === DualityRollColor.colorful.value); this.close(); } diff --git a/module/data/action/action.mjs b/module/data/action/action.mjs index 5de1e341..0462980f 100644 --- a/module/data/action/action.mjs +++ b/module/data/action/action.mjs @@ -105,7 +105,10 @@ export class DHBaseAction extends foundry.abstract.DataModel { } get chatTemplate() { - return 'systems/daggerheart/templates/chat/attack-roll.hbs'; + return 'systems/daggerheart/templates/chat/duality-roll.hbs'; + } + get chatTitle() { + return this.item.name; } static getRollType() { @@ -132,7 +135,7 @@ export class DHBaseAction extends foundry.abstract.DataModel { const modifierValue = this.actor.system.traits[this.roll.trait].value; const config = { event: event, - title: this.item.name, + title: this.chatTitle, roll: { modifier: modifierValue, label: game.i18n.localize(abilities[this.roll.trait].label), @@ -199,6 +202,12 @@ export class DHAttackAction extends DHBaseAction { static getRollType() { return 'weapon'; } + + get chatTitle() { + return game.i18n.format('DAGGERHEART.Chat.AttackRoll.Title', { + attack: this.item.name + }); + } prepareData() { super.prepareData();