mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-04-24 16:33:38 +02:00
Compare commits
3 commits
2b8e4cb2fa
...
7fa03c58e0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7fa03c58e0 | ||
|
|
1df248925e | ||
|
|
2a55e317fc |
4 changed files with 12 additions and 8 deletions
|
|
@ -54,11 +54,14 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
|
||||||
}
|
}
|
||||||
|
|
||||||
get roll() {
|
get roll() {
|
||||||
if (this.parent.type === 'dualityRoll')
|
switch (this.parent.type) {
|
||||||
return this.parent.rolls.find(x => x instanceof game.system.api.dice.DualityRoll);
|
case 'adversaryRoll':
|
||||||
|
return this.parent.rolls.find(x => x instanceof game.system.api.dice.D20Roll);
|
||||||
if (this.parent.type === 'fateRoll')
|
case 'dualityRoll':
|
||||||
return this.parent.rolls.find(x => x instanceof game.system.api.dice.FateRoll);
|
return this.parent.rolls.find(x => x instanceof game.system.api.dice.DualityRoll);
|
||||||
|
case 'fateRoll':
|
||||||
|
return this.parent.rolls.find(x => x instanceof game.system.api.dice.FateRoll);
|
||||||
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ export default class DamageField extends fields.SchemaField {
|
||||||
...config,
|
...config,
|
||||||
roll: formulas,
|
roll: formulas,
|
||||||
data: this.getRollData(),
|
data: this.getRollData(),
|
||||||
isCritical: message?.system.roll.isCritical
|
isCritical: Boolean(message?.system.roll?.isCritical)
|
||||||
};
|
};
|
||||||
delete damageConfig.evaluate;
|
delete damageConfig.evaluate;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -305,6 +305,7 @@
|
||||||
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;
|
||||||
|
|
|
||||||
|
|
@ -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.355",
|
"minimum": "14.359",
|
||||||
"verified": "14.358",
|
"verified": "14.359",
|
||||||
"maximum": "14"
|
"maximum": "14"
|
||||||
},
|
},
|
||||||
"authors": [
|
"authors": [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue