diff --git a/module/applications/ui/combatTracker.mjs b/module/applications/ui/combatTracker.mjs index b3b011f9..25f3e06b 100644 --- a/module/applications/ui/combatTracker.mjs +++ b/module/applications/ui/combatTracker.mjs @@ -202,11 +202,11 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C const { updateCountdowns } = game.system.api.applications.ui.DhCountdowns; if (combatant.actor?.type === 'character') { await updateCountdowns( - { type: CONFIG.DH.GENERAL.countdownProgressionTypes.spotlight.id }, - { type: CONFIG.DH.GENERAL.countdownProgressionTypes.characterSpotlight.id } + CONFIG.DH.GENERAL.countdownProgressionTypes.spotlight.id, + CONFIG.DH.GENERAL.countdownProgressionTypes.characterSpotlight.id ); } else { - await updateCountdowns({ type: CONFIG.DH.GENERAL.countdownProgressionTypes.spotlight.id }); + await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.spotlight.id); } const autoPoints = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).actionPoints; diff --git a/module/applications/ui/countdowns.mjs b/module/applications/ui/countdowns.mjs index 2e669d4f..220f0e64 100644 --- a/module/applications/ui/countdowns.mjs +++ b/module/applications/ui/countdowns.mjs @@ -342,9 +342,10 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application * Sends updates of the countdowns to the GM player. Since this is asynchronous, be sure to * update all the countdowns at the same time. * - * @param {...{ type: , reverseDirection: boolean }} progressTypes Countdowns to be updated + * @param {...{ type: , undo: boolean }} progressTypes Countdowns to be updated */ static async updateCountdowns(...progressTypes) { + progressTypes = progressTypes.map(p => typeof p === 'string' ? { type: p } : p); const { countdownAutomation } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation); if (!countdownAutomation) return; @@ -353,7 +354,7 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application const countdown = countdownSetting.countdowns[key]; const progressData = progressTypes.find(x => x.type === countdown.progress.type); if (progressData && countdown.progress.current > 0) { - acc[key] = { value: progressData.reverseDirection ? 1 : -1 }; + acc[key] = { value: progressData.undo ? 1 : -1 }; } return acc; diff --git a/module/data/action/attackAction.mjs b/module/data/action/attackAction.mjs index f3537d93..1988b1d8 100644 --- a/module/data/action/attackAction.mjs +++ b/module/data/action/attackAction.mjs @@ -55,7 +55,7 @@ export default class DHAttackAction extends DHDamageAction { if (result?.message?.system.action?.roll?.type === 'attack') { const { updateCountdowns } = game.system.api.applications.ui.DhCountdowns; - await updateCountdowns({ type: CONFIG.DH.GENERAL.countdownProgressionTypes.characterAttack.id }); + await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.characterAttack.id); } return result; diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs index 884c6a18..e2d967a3 100644 --- a/module/dice/dualityRoll.mjs +++ b/module/dice/dualityRoll.mjs @@ -362,11 +362,11 @@ export default class DualityRoll extends D20Roll { if (config.roll.result.duality === -1) { await updateCountdowns( - { type: CONFIG.DH.GENERAL.countdownProgressionTypes.actionRoll.id }, - { type: CONFIG.DH.GENERAL.countdownProgressionTypes.fear.id } + CONFIG.DH.GENERAL.countdownProgressionTypes.actionRoll.id, + CONFIG.DH.GENERAL.countdownProgressionTypes.fear.id ); } else { - await updateCountdowns({ type: CONFIG.DH.GENERAL.countdownProgressionTypes.actionRoll.id }); + await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.actionRoll.id); } } diff --git a/module/dice/helpers.mjs b/module/dice/helpers.mjs index 327e7a45..0e732956 100644 --- a/module/dice/helpers.mjs +++ b/module/dice/helpers.mjs @@ -24,7 +24,7 @@ export function updateResourcesForDualityReroll(oldDuality, newDuality, actor) { if (fear !== 0) { updates.push({ type: CONFIG.DH.GENERAL.countdownProgressionTypes.fear.id, - reverseDirection: fear === 1 ? false : true + undo: fear === 1 ? false : true }); }