mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-07-21 18:09:54 +02:00
Fixed so that dice css uses specific results.denomation if available
This commit is contained in:
parent
de0d4ef9b4
commit
e25cf0c4cd
3 changed files with 26 additions and 2 deletions
|
|
@ -30,4 +30,23 @@ export default class BaseDie extends foundry.dice.terms.Die {
|
||||||
|
|
||||||
return this.continueCombo();
|
return this.continueCombo();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @override */
|
||||||
|
getResultCSS(result) {
|
||||||
|
const hasSuccess = result.success !== undefined;
|
||||||
|
const hasFailure = result.failure !== undefined;
|
||||||
|
const isMax = result.result === this.faces;
|
||||||
|
const isMin = result.result === 1;
|
||||||
|
return [
|
||||||
|
this.constructor.name.toLowerCase(),
|
||||||
|
result.denomination ?? this.denomination, // Accomodating ComboDie as a result can have a different denomination than the die as a whole
|
||||||
|
result.success ? 'success' : null,
|
||||||
|
result.failure ? 'failure' : null,
|
||||||
|
result.rerolled ? 'rerolled' : null,
|
||||||
|
result.exploded ? 'exploded' : null,
|
||||||
|
result.discarded ? 'discarded' : null,
|
||||||
|
!(hasSuccess || hasFailure) && isMin ? 'min' : null,
|
||||||
|
!(hasSuccess || hasFailure) && isMax ? 'max' : null
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -39,7 +39,7 @@
|
||||||
{{#unless discarded}}
|
{{#unless discarded}}
|
||||||
<div class="roll-die{{#unless @../first}} has-plus{{/unless}}">
|
<div class="roll-die{{#unless @../first}} has-plus{{/unless}}">
|
||||||
<div
|
<div
|
||||||
class="dice reroll-button {{../dice}}"
|
class="dice reroll-button {{ifThen denomination denomination ../dice}}"
|
||||||
data-die-index="0" data-type="damage" data-damage-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
|
data-die-index="0" data-type="damage" data-damage-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
|
||||||
>
|
>
|
||||||
{{#if hasRerolls}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "DAGGERHEART.GENERAL.rerolled"}}"></i>{{/if}}
|
{{#if hasRerolls}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "DAGGERHEART.GENERAL.rerolled"}}"></i>{{/if}}
|
||||||
|
|
|
||||||
|
|
@ -84,8 +84,13 @@
|
||||||
{{else}}
|
{{else}}
|
||||||
{{#each roll.dice}}
|
{{#each roll.dice}}
|
||||||
{{#each results}}
|
{{#each results}}
|
||||||
|
{{debug this}}
|
||||||
<div class="roll-die {{#unless (or @../first discarded)}} has-plus{{/unless}}">
|
<div class="roll-die {{#unless (or @../first discarded)}} has-plus{{/unless}}">
|
||||||
<div class="dice {{../denomination}}{{#if discarded}} discarded{{else}}{{#if (and @../first ../../roll.advantage.type)}}{{#if (eq ../../roll.advantage.type 1)}} color-adv{{else}} color-dis{{/if}}{{/if}}{{#if success}} color-adv{{/if}}{{/if}}">
|
<div class="
|
||||||
|
dice
|
||||||
|
{{ifThen denomination denomination ../denomination}}
|
||||||
|
{{#if discarded}} discarded{{else}}{{#if (and @../first ../../roll.advantage.type)}}{{#if (eq ../../roll.advantage.type 1)}} color-adv{{else}} color-dis{{/if}}{{/if}}{{#if success}} color-adv{{/if}}{{/if}}
|
||||||
|
">
|
||||||
{{result}}
|
{{result}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue