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

fix additional dr options

Browse source
This commit is contained in:
IrkTheImp 2025-07-02 08:11:14 -05:00
parent e9abdbc523
commit 1908e74b3e
3 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
daggerheart.mjs
View file

@ -219,11 +219,21 @@ Hooks.on('chatMessage', (_, message) => {
const config = { const config = {
title: title, title: title,
roll: { formula }, roll: {
targets: target, formula,
trait: traitValue
},
data: {
traits: {
[traitValue]: trait
}
},
source: target,
hasSave: false, hasSave: false,
dialog: { configure: false }, dialog: { configure: false },
evaluate: true evaluate: true,
advantage: rollCommand.advantage == true,
disadvantage: rollCommand.disadvantage == true
}; };
await CONFIG.Dice.daggerheart['DualityRoll'].build(config); await CONFIG.Dice.daggerheart['DualityRoll'].build(config);

7
module/applications/roll.mjs
View file

@ -395,7 +395,12 @@ export class DualityRoll extends D20Roll {
static async buildEvaluate(roll, config = {}, message = {}) { static async buildEvaluate(roll, config = {}, message = {}) {
if (config.evaluate !== false) await roll.evaluate(); if (config.evaluate !== false) await roll.evaluate();
const advantageState = this.hasAdvantage ? true : this.hasDisadvantage ? false : null; const advantageState =
config.advantage == this.ADV_MODE.ADVANTAGE
? true
: config.advantage == this.ADV_MODE.DISADVANTAGE
? false
: null;
setDiceSoNiceForDualityRoll(roll, advantageState); setDiceSoNiceForDualityRoll(roll, advantageState);
this.postEvaluate(roll, config); this.postEvaluate(roll, config);
} }

4
module/helpers/utils.mjs
View file

@ -128,9 +128,9 @@ export const setDiceSoNiceForDualityRoll = (rollResult, advantageState) => {
rollResult.dice[1].options = { appearance: diceSoNicePresets.fear }; //diceSoNicePresets.fear; rollResult.dice[1].options = { appearance: diceSoNicePresets.fear }; //diceSoNicePresets.fear;
if (rollResult.dice[2]) { if (rollResult.dice[2]) {
if (advantageState === true) { if (advantageState === true) {
rollResult.dice[2].options.appearance = diceSoNicePresets.advantage; rollResult.dice[2].options = { appearance: diceSoNicePresets.advantage };
} else if (advantageState === false) { } else if (advantageState === false) {
rollResult.dice[2].options.appearance = diceSoNicePresets.disadvantage; rollResult.dice[2].options = { appearance: diceSoNicePresets.disadvantage };
} }
} }
}; };