diff --git a/lang/en.json b/lang/en.json index c9d21944..c3c0f79a 100755 --- a/lang/en.json +++ b/lang/en.json @@ -2565,6 +2565,7 @@ "label": "Countdown Automation", "hint": "Automatically progress countdowns based on their progression settings" }, + "hideHitMissForPlayers": { "label": "Hide Hit/Miss On Adversaries In Chat For Players" }, "levelupAuto": { "label": "Levelup Automation", "hint": "When you've made your choices and finish levelup, the numerical changes are automatically applied to your character." diff --git a/module/data/settings/Appearance.mjs b/module/data/settings/Appearance.mjs index 321b203a..cd98d6f9 100644 --- a/module/data/settings/Appearance.mjs +++ b/module/data/settings/Appearance.mjs @@ -25,7 +25,6 @@ export default class DhAppearance extends foundry.abstract.DataModel { choices: CONFIG.DH.GENERAL.fearDisplay, initial: CONFIG.DH.GENERAL.fearDisplay.token.value }), - hideHitMissForPlayers: new BooleanField({ initial: false }), displayCountdownUI: new BooleanField({ initial: true }), diceSoNice: new SchemaField({ hope: diceStyle({ fg: '#ffffff', bg: '#ffe760', outline: '#000000', edge: '#ffffff' }), diff --git a/module/data/settings/Automation.mjs b/module/data/settings/Automation.mjs index 20fe0baf..09e68ff6 100644 --- a/module/data/settings/Automation.mjs +++ b/module/data/settings/Automation.mjs @@ -27,6 +27,10 @@ export default class DhAutomation extends foundry.abstract.DataModel { initial: true, label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.countdownAutomation.label' }), + hideHitMissForPlayers: new fields.BooleanField({ + initial: false, + label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.hideHitMissForPlayers.label' + }), levelupAuto: new fields.BooleanField({ required: true, initial: true, diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs index 26dd92c7..4a587bd7 100644 --- a/module/dice/dhRoll.mjs +++ b/module/dice/dhRoll.mjs @@ -141,9 +141,9 @@ export default class DHRoll extends Roll { async render({ flavor, template = this.constructor.CHAT_TEMPLATE, isPrivate = false, ...options } = {}) { if (!this._evaluated) return; - const appearanceSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance); + const automationSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation); const chatData = await this._prepareChatRenderContext({ flavor, isPrivate, ...options }); - return foundry.applications.handlebars.renderTemplate(template, { ...chatData, appearanceSettings }); + return foundry.applications.handlebars.renderTemplate(template, { ...chatData, automationSettings }); } /** @inheritDoc */ diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs index 3b9efc5a..690aa4b7 100644 --- a/module/documents/chatMessage.mjs +++ b/module/documents/chatMessage.mjs @@ -70,7 +70,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage { e.setAttribute('data-use-perm', document.testUserPermission(game.user, 'OWNER')); - const settings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance); + const settings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation); if (settings.hideHitMissForPlayers) e.setAttribute('data-view-perm', document.testUserPermission(game.user, 'OBSERVER')); }); diff --git a/templates/settings/appearance-settings/main.hbs b/templates/settings/appearance-settings/main.hbs index 73bc5678..32dd9e63 100644 --- a/templates/settings/appearance-settings/main.hbs +++ b/templates/settings/appearance-settings/main.hbs @@ -8,10 +8,6 @@ value=setting.displayFear localize=true}} {{formGroup - fields.hideHitMissForPlayers - value=setting.hideHitMissForPlayers - localize=true}} - {{formGroup fields.displayCountdownUI value=setting.displayCountdownUI localize=true}} diff --git a/templates/settings/automation-settings/general.hbs b/templates/settings/automation-settings/general.hbs index 65bafab8..dcb26da4 100644 --- a/templates/settings/automation-settings/general.hbs +++ b/templates/settings/automation-settings/general.hbs @@ -16,6 +16,7 @@ {{formGroup settingFields.schema.fields.vulnerableAutomation value=settingFields._source.vulnerableAutomation localize=true}} {{formGroup settingFields.schema.fields.countdownAutomation value=settingFields._source.countdownAutomation localize=true}} + {{formGroup settingFields.schema.fields.hideHitMissForPlayers value=settingFields._source.hideHitMissForPlayers localize=true}} {{formGroup settingFields.schema.fields.actionPoints value=settingFields._source.actionPoints localize=true}} {{formGroup settingFields.schema.fields.hordeDamage value=settingFields._source.hordeDamage localize=true}} {{formGroup settingFields.schema.fields.effects.fields.rangeDependent value=settingFields._source.effects.rangeDependent localize=true}} diff --git a/templates/ui/chat/parts/target-part.hbs b/templates/ui/chat/parts/target-part.hbs index c6e958d9..aa7dab1e 100644 --- a/templates/ui/chat/parts/target-part.hbs +++ b/templates/ui/chat/parts/target-part.hbs @@ -1,6 +1,6 @@
{{pluralize currentTargets.length "DAGGERHEART.GENERAL.Target"}}
- {{#if (or isGM (not appearanceSettings.hideHitMissForPlayers))}} + {{#if (or isGM (not automationSettings.hideHitMissForPlayers))}}
{{#if (or (gt targetShort.hit 0) (gt targetShort.miss 0))}}