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

Merge branch 'development' into feature/death-moves

Browse source
This commit is contained in:
WBHarry 2026-01-13 21:00:46 +01:00
commit ee28fb3b9c
4 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
module/dice/d20Roll.mjs
View file

@ -35,7 +35,9 @@ export default class D20Roll extends DHRoll {
get isCritical() {
if (!this.d20._evaluated) return;
return this.d20.total >= this.data.system.criticalThreshold;
const criticalThreshold = this.options.actionType === 'reaction' ? 20 : this.data.system.criticalThreshold;
return this.d20.total >= criticalThreshold;
}
get hasAdvantage() {

10
module/dice/dualityRoll.mjs
View file

@ -133,11 +133,13 @@ export default class DualityRoll extends D20Roll {
return;
}
const { defaultHopeDice, defaultFearDice } = this.data.rules.dualityRoll;
this.terms[0] = new foundry.dice.terms.Die({ faces: defaultHopeDice });
this.terms[0] = new foundry.dice.terms.Die({
faces: this.data.rules.dualityRoll?.defaultHopeDice ?? 12
});
this.terms[1] = new foundry.dice.terms.OperatorTerm({ operator: '+' });
this.terms[2] = new foundry.dice.terms.Die({ faces: defaultFearDice });
this.terms[2] = new foundry.dice.terms.Die({
faces: this.data.rules.dualityRoll?.defaultFearDice ?? 12
});
}
applyAdvantage() {