Compare commits

..

No commits in common. "7fa03c58e08f085c773dc22c6c936c2ad09f87e7" and "2b8e4cb2faed49a41ef50c6db6198a8c65f96149" have entirely different histories.

4 changed files with 8 additions and 12 deletions

View file

@ -54,14 +54,11 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
} }
get roll() { get roll() {
switch (this.parent.type) { if (this.parent.type === 'dualityRoll')
case 'adversaryRoll': return this.parent.rolls.find(x => x instanceof game.system.api.dice.DualityRoll);
return this.parent.rolls.find(x => x instanceof game.system.api.dice.D20Roll);
case 'dualityRoll': if (this.parent.type === 'fateRoll')
return this.parent.rolls.find(x => x instanceof game.system.api.dice.DualityRoll); return this.parent.rolls.find(x => x instanceof game.system.api.dice.FateRoll);
case 'fateRoll':
return this.parent.rolls.find(x => x instanceof game.system.api.dice.FateRoll);
}
return null; return null;
} }

View file

@ -56,7 +56,7 @@ export default class DamageField extends fields.SchemaField {
...config, ...config,
roll: formulas, roll: formulas,
data: this.getRollData(), data: this.getRollData(),
isCritical: Boolean(message?.system.roll?.isCritical) isCritical: message?.system.roll.isCritical
}; };
delete damageConfig.evaluate; delete damageConfig.evaluate;

View file

@ -305,7 +305,6 @@
position: relative; position: relative;
width: 95px; width: 95px;
height: 30px; height: 30px;
white-space: nowrap;
.status-label { .status-label {
padding: 2px 2px; padding: 2px 2px;

View file

@ -4,8 +4,8 @@
"description": "An unofficial implementation of the Daggerheart system", "description": "An unofficial implementation of the Daggerheart system",
"version": "2.0.0", "version": "2.0.0",
"compatibility": { "compatibility": {
"minimum": "14.359", "minimum": "14.355",
"verified": "14.359", "verified": "14.358",
"maximum": "14" "maximum": "14"
}, },
"authors": [ "authors": [