cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-03-07 14:36:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

.

Browse source
This commit is contained in:
WBHarry 2026-01-23 16:06:50 +01:00
parent c65294a7d3
commit f950460098
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
daggerheart.mjs
View file

@ -296,7 +296,7 @@ Hooks.on('chatMessage', (_, message) => {
? CONFIG.DH.ACTIONS.advantageState.disadvantage.value
: undefined;
const difficulty = rollCommand.difficulty;
const noResources = Boolean(rollCommand.noResources);
const grantResources = Boolean(rollCommand.grantResources);
const target = getCommandTarget({ allowNull: true });
const title = traitValue
@ -314,7 +314,7 @@ Hooks.on('chatMessage', (_, message) => {
label: game.i18n.localize('DAGGERHEART.GENERAL.dualityRoll'),
actionType: null,
advantage,
noResources
grantResources
});
return false;
}

14
module/enrichers/DualityRollEnricher.mjs
View file

@ -34,8 +34,6 @@ function getDualityMessage(roll, flavor) {
? 'Disadvantage'
: undefined;
const noResources = Boolean(roll?.noResources);
const dualityElement = document.createElement('span');
dualityElement.innerHTML = `
<button type="button" class="duality-roll-button${roll?.inline ? ' inline' : ''}"
@ -49,7 +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"' : ''}
data-no-resources="${noResources}"
${roll?.grantResources ? 'data-grant-resources="true"' : ''}
>
${roll?.reaction ? '<i class="fa-solid fa-reply"></i>' : '<i class="fa-solid fa-circle-half-stroke"></i>'}
${label}
@ -67,7 +65,7 @@ export const renderDualityButton = async event => {
target = getCommandTarget({ allowNull: true }),
difficulty = button.dataset.difficulty,
advantage = button.dataset.advantage ? Number(button.dataset.advantage) : undefined,
noResources = button.dataset.noResources === 'true';
grantResources = Boolean(button.dataset?.grantResources);
await enrichedDualityRoll(
{
@ -78,14 +76,14 @@ export const renderDualityButton = async event => {
title: button.dataset.title,
label: button.dataset.label,
advantage,
noResources
grantResources
},
event
);
};
export const enrichedDualityRoll = async (
{ reaction, traitValue, target, difficulty, title, label, advantage, noResources },
{ reaction, traitValue, target, difficulty, title, label, advantage, grantResources },
event
) => {
const config = {
@ -99,8 +97,8 @@ export const enrichedDualityRoll = async (
type: reaction ? 'reaction' : null
},
skips: {
resources: noResources,
triggers: noResources
resources: !grantResources,
triggers: !grantResources
},
type: 'trait',
hasRoll: true