mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-07-21 18:09:54 +02:00
Fixed so that the forced critical toggle in the DamageDialog sets damageRoll.options.isCritical
This commit is contained in:
parent
c0fe127df4
commit
cfb6bc2479
3 changed files with 22 additions and 4 deletions
|
|
@ -33,7 +33,7 @@ export default class DamageRoll extends DHRoll {
|
|||
|
||||
const evaluateRoll = async roll => {
|
||||
await roll.roll.evaluate();
|
||||
roll.roll.options = { damageTypes: roll.damageTypes ? [...roll.damageTypes] : [] };
|
||||
roll.roll.options = { ...roll.roll.options, damageTypes: roll.damageTypes ? [...roll.damageTypes] : [] };
|
||||
return roll.roll;
|
||||
}
|
||||
|
||||
|
|
@ -41,8 +41,10 @@ export default class DamageRoll extends DHRoll {
|
|||
|
||||
if (config.damageFormula) {
|
||||
config.damage.main = await evaluateRoll(config.damageFormula);
|
||||
config.damage.main.options = { damageTypes:
|
||||
config.damageFormula.damageTypes ? [...config.damageFormula.damageTypes] : []
|
||||
config.damage.main.options = {
|
||||
...config.damage.main.options,
|
||||
damageTypes:
|
||||
config.damageFormula.damageTypes ? [...config.damageFormula.damageTypes] : []
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue