diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs index be935d4b..a6944a56 100644 --- a/module/dice/dualityRoll.mjs +++ b/module/dice/dualityRoll.mjs @@ -67,6 +67,11 @@ export default class DualityRoll extends D20Roll { this._advantageNumber = Number(value); } + get extraDice() { + const { DualityDie, AdvantageDie, DisadvantageDie } = game.system.api.dice.diceTypes; + return this.dice.filter(x => ![DualityDie, AdvantageDie, DisadvantageDie].some(die => x instanceof die)); + } + /* This isn't fullproof, but trying to cover parathetical situations is ridiculously complex */ get modifierTotal() { let modifierTotal = 0; diff --git a/templates/ui/chat/parts/roll-part.hbs b/templates/ui/chat/parts/roll-part.hbs index 33884161..6cab38df 100644 --- a/templates/ui/chat/parts/roll-part.hbs +++ b/templates/ui/chat/parts/roll-part.hbs @@ -79,15 +79,11 @@
{{roll.rally.value}}
{{/if}} - {{#each roll.extra}} - {{#each results}} - {{#unless discarded}} -
- -
{{result}}
-
- {{/unless}} - {{/each}} + {{#each roll.extraDice}} +
+ +
{{this.total}}
+
{{/each}} {{else}} {{#each roll.dice}}