mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-03-07 14:36:13 +01:00
fix additional dr options
This commit is contained in:
parent
e9abdbc523
commit
1908e74b3e
3 changed files with 21 additions and 6 deletions
|
|
@ -219,11 +219,21 @@ Hooks.on('chatMessage', (_, message) => {
|
|||
|
||||
const config = {
|
||||
title: title,
|
||||
roll: { formula },
|
||||
targets: target,
|
||||
roll: {
|
||||
formula,
|
||||
trait: traitValue
|
||||
},
|
||||
data: {
|
||||
traits: {
|
||||
[traitValue]: trait
|
||||
}
|
||||
},
|
||||
source: target,
|
||||
hasSave: false,
|
||||
dialog: { configure: false },
|
||||
evaluate: true
|
||||
evaluate: true,
|
||||
advantage: rollCommand.advantage == true,
|
||||
disadvantage: rollCommand.disadvantage == true
|
||||
};
|
||||
|
||||
await CONFIG.Dice.daggerheart['DualityRoll'].build(config);
|
||||
|
|
|
|||
|
|
@ -395,7 +395,12 @@ export class DualityRoll extends D20Roll {
|
|||
|
||||
static async buildEvaluate(roll, config = {}, message = {}) {
|
||||
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);
|
||||
this.postEvaluate(roll, config);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,9 +128,9 @@ export const setDiceSoNiceForDualityRoll = (rollResult, advantageState) => {
|
|||
rollResult.dice[1].options = { appearance: diceSoNicePresets.fear }; //diceSoNicePresets.fear;
|
||||
if (rollResult.dice[2]) {
|
||||
if (advantageState === true) {
|
||||
rollResult.dice[2].options.appearance = diceSoNicePresets.advantage;
|
||||
rollResult.dice[2].options = { appearance: diceSoNicePresets.advantage };
|
||||
} else if (advantageState === false) {
|
||||
rollResult.dice[2].options.appearance = diceSoNicePresets.disadvantage;
|
||||
rollResult.dice[2].options = { appearance: diceSoNicePresets.disadvantage };
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue