Merge branch 'develop' into #48-draggable-items

This commit is contained in:
Byroks 2024-02-25 14:29:58 +01:00
commit d1c26a7c55
2 changed files with 1 additions and 2 deletions

View File

@ -227,7 +227,6 @@ Hooks.once("ready", () => {
}); });
async function applyDamage(roll, direction) { async function applyDamage(roll, direction) {
console.log(roll, direction);
const damageValue = Array.from(roll.find(".apply") as HTMLElement[]) const damageValue = Array.from(roll.find(".apply") as HTMLElement[])
.map((x) => Math.max(0, Number(x.innerText))) .map((x) => Math.max(0, Number(x.innerText)))
.reduce((prev, curr) => prev + curr, 0); .reduce((prev, curr) => prev + curr, 0);

View File

@ -82,7 +82,7 @@
<tr class="roll-row {{roll.css}}"> <tr class="roll-row {{roll.css}}">
<td>{{roll.label}}</td> <td>{{roll.label}}</td>
<td class="roll-result"> <td class="roll-result">
<span class="roll-total {{#if (contains roll.label "Schaden")}} damage{{/if}}{{#if (contains roll.label "Heilung")}} heal{{/if}}">{{roll.totalStr}}</span> <span class="roll-total {{#if (contains roll.label "Schaden")}}apply damage{{/if}}{{#if (contains roll.label "Heilung")}}apply heal{{/if}}">{{roll.totalStr}}</span>
<span class="roll-detail">{{roll.result}}</span> <span class="roll-detail">{{roll.result}}</span>
</td> </td>
</tr> </tr>