diff --git a/daggerheart.mjs b/daggerheart.mjs index 4729aa9f..a6676f19 100644 --- a/daggerheart.mjs +++ b/daggerheart.mjs @@ -211,7 +211,7 @@ Hooks.on('chatMessage', (_, message) => { } const title = traitValue - ? game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilitychecktitle', { + ? game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', { ability: game.i18n.localize(SYSTEM.ACTOR.abilities[traitValue].label) }) : game.i18n.localize('DAGGERHEART.GENERAL.duality'); @@ -265,4 +265,4 @@ Hooks.on('renderJournalDirectory', async (tab, html, _, options) => { new NarrativeCountdowns().open(); }; } -}); \ No newline at end of file +}); diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs index 95bbbec1..5a5120a6 100644 --- a/module/applications/sheets/actors/character.mjs +++ b/module/applications/sheets/actors/character.mjs @@ -494,7 +494,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) { const config = { event: event, title: `${game.i18n.localize('DAGGERHEART.GENERAL.dualityRoll')}: ${this.actor.name}`, - headerTitle: game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilitychecktitle', { + headerTitle: game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', { ability: abilityLabel }), roll: { @@ -605,7 +605,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) { const abilityLabel = game.i18n.localize(abilities[button.dataset.attribute].label); const config = { event: event, - title: game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilitychecktitle', { ability: abilityLabel }), + title: game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', { ability: abilityLabel }), roll: { trait: button.dataset.attribute } diff --git a/module/applications/ui/countdowns.mjs b/module/applications/ui/countdowns.mjs index 895ab908..c229cda1 100644 --- a/module/applications/ui/countdowns.mjs +++ b/module/applications/ui/countdowns.mjs @@ -13,7 +13,7 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) { } get title() { - return game.i18n.format('DAGGERHEART.APPLICATIONS.Countdown.Title', { + return game.i18n.format('DAGGERHEART.APPLICATIONS.Countdown.title', { type: game.i18n.localize(`DAGGERHEART.APPLICATIONS.Countdown.types.${this.basePath}`) }); } diff --git a/module/data/settings/Automation.mjs b/module/data/settings/Automation.mjs index d3cc1a40..4e375919 100644 --- a/module/data/settings/Automation.mjs +++ b/module/data/settings/Automation.mjs @@ -4,9 +4,21 @@ export default class DhAutomation extends foundry.abstract.DataModel { static defineSchema() { const fields = foundry.data.fields; return { - hope: new fields.BooleanField({ required: true, initial: false, label: "DAGGERHEART.Settings.Automation.FIELDS.hope.label" }), // Label need to be updated into something like "Duality Roll Auto Gain" + a hint - actionPoints: new fields.BooleanField({ required: true, initial: false, label: "DAGGERHEART.Settings.Automation.FIELDS.actionPoints.label" }), - countdowns: new fields.BooleanField({ requireD: true, initial: false, label: "DAGGERHEART.Settings.Automation.FIELDS.countdowns.label" }) + hope: new fields.BooleanField({ + required: true, + initial: false, + label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.hope.label' + }), // Label need to be updated into something like "Duality Roll Auto Gain" + a hint + actionPoints: new fields.BooleanField({ + required: true, + initial: false, + label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.actionPoints.label' + }), + countdowns: new fields.BooleanField({ + requireD: true, + initial: false, + label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.countdowns.label' + }) }; } } diff --git a/styles/daggerheart.css b/styles/daggerheart.css index 8fd6142e..f15583d2 100755 --- a/styles/daggerheart.css +++ b/styles/daggerheart.css @@ -4069,10 +4069,11 @@ body.theme-light.application.daggerheart .character-sidebar-sheet .experience-va .application.sheet.daggerheart.actor.dh-style.character .window-content { display: grid; grid-template-columns: 275px 1fr; - grid-template-rows: 283px 1fr; + grid-template-rows: auto 1fr; gap: 15px 0; height: 100%; width: 100%; + overflow: auto; } .application.sheet.daggerheart.actor.dh-style.character .window-content .character-sidebar-sheet { grid-row: 1 / span 2; @@ -4313,7 +4314,7 @@ body.theme-light.application.daggerheart .character-sidebar-sheet .experience-va .application.sheet.daggerheart.actor.dh-style.adversary .window-content { display: grid; grid-template-columns: 275px 1fr; - grid-template-rows: 283px 1fr; + grid-template-rows: auto 1fr; gap: 15px 0; height: 100%; width: 100%; diff --git a/templates/ui/combatTracker/combatTracker.hbs b/templates/ui/combatTracker/combatTracker.hbs index 0ae59ceb..8ad4f7d5 100644 --- a/templates/ui/combatTracker/combatTracker.hbs +++ b/templates/ui/combatTracker/combatTracker.hbs @@ -1,8 +1,8 @@