diff --git a/daggerheart.mjs b/daggerheart.mjs
index 23f153dd..77e9831e 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -298,13 +298,15 @@ Hooks.on('chatMessage', (_, message) => {
? CONFIG.DH.ACTIONS.advantageState.disadvantage.value
: undefined;
const difficulty = rollCommand.difficulty;
+ const grantResources = Boolean(rollCommand.grantResources);
const target = getCommandTarget({ allowNull: true });
- const title = flavor ??
- traitValue ? game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
- ability: game.i18n.localize(SYSTEM.ACTOR.abilities[traitValue].label)
- })
- : game.i18n.localize('DAGGERHEART.GENERAL.duality');
+ const title =
+ (flavor ?? traitValue)
+ ? game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
+ ability: game.i18n.localize(SYSTEM.ACTOR.abilities[traitValue].label)
+ })
+ : game.i18n.localize('DAGGERHEART.GENERAL.duality');
enrichedDualityRoll({
reaction,
@@ -314,7 +316,8 @@ Hooks.on('chatMessage', (_, message) => {
title,
label: game.i18n.localize('DAGGERHEART.GENERAL.dualityRoll'),
actionType: null,
- advantage
+ advantage,
+ grantResources
});
return false;
}
diff --git a/module/applications/dialogs/deathMove.mjs b/module/applications/dialogs/deathMove.mjs
index d1b9379b..3eadede6 100644
--- a/module/applications/dialogs/deathMove.mjs
+++ b/module/applications/dialogs/deathMove.mjs
@@ -85,6 +85,7 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
label: game.i18n.localize('DAGGERHEART.GENERAL.dualityDice'),
actionType: null,
advantage: null,
+ grantResources: false,
customConfig: { skips: { resources: true, reaction: true } }
});
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 0edbe5ad..e65d0ff5 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -274,7 +274,7 @@ export default class DualityRoll extends D20Roll {
}
static async handleTriggers(roll, config) {
- if (!config.source?.actor) return;
+ if (!config.source?.actor || config.skips?.triggers) return;
const updates = [];
const dualityUpdates = await game.system.registeredTriggers.runTrigger(
diff --git a/module/enrichers/DualityRollEnricher.mjs b/module/enrichers/DualityRollEnricher.mjs
index f6f022f9..91149fd8 100644
--- a/module/enrichers/DualityRollEnricher.mjs
+++ b/module/enrichers/DualityRollEnricher.mjs
@@ -47,6 +47,7 @@ function getDualityMessage(roll, flavor) {
${roll?.trait && abilities[roll.trait] ? `data-trait="${roll.trait}"` : ''}
${roll?.advantage ? 'data-advantage="true"' : ''}
${roll?.disadvantage ? 'data-disadvantage="true"' : ''}
+ ${roll?.grantResources ? 'data-grant-resources="true"' : ''}
>
${roll?.reaction ? '' : ''}
${label}
@@ -63,7 +64,8 @@ export const renderDualityButton = async event => {
traitValue = button.dataset.trait?.toLowerCase(),
target = getCommandTarget({ allowNull: true }),
difficulty = button.dataset.difficulty,
- advantage = button.dataset.advantage ? Number(button.dataset.advantage) : undefined;
+ advantage = button.dataset.advantage ? Number(button.dataset.advantage) : undefined,
+ grantResources = Boolean(button.dataset?.grantResources);
await enrichedDualityRoll(
{
@@ -73,14 +75,15 @@ export const renderDualityButton = async event => {
difficulty,
title: button.dataset.title,
label: button.dataset.label,
- advantage
+ advantage,
+ grantResources
},
event
);
};
export const enrichedDualityRoll = async (
- { reaction, traitValue, target, difficulty, title, label, advantage, customConfig },
+ { reaction, traitValue, target, difficulty, title, label, advantage, grantResources, customConfig },
event
) => {
const config = {
@@ -93,13 +96,18 @@ export const enrichedDualityRoll = async (
advantage,
type: reaction ? 'reaction' : null
},
+ skips: {
+ resources: !grantResources,
+ triggers: !grantResources
+ },
type: 'trait',
hasRoll: true,
...(customConfig ?? {})
};
if (target) {
- await target.diceRoll(config);
+ const result = await target.diceRoll(config);
+ result.resourceUpdates.updateResources();
} else {
// For no target, call DualityRoll directly with basic data
config.data = { experiences: {}, traits: {}, rules: {} };