Merge v1 #1

Merged
sladecraven merged 5 commits from master into master 2021-11-06 12:21:05 +01:00
2 changed files with 8 additions and 6 deletions
Showing only changes of commit 4820039325 - Show all commits

View File

@ -167,6 +167,7 @@ export class BoLUtility {
rollData.roll = myRoll; rollData.roll = myRoll;
rollData.formula = formula; rollData.formula = formula;
rollData.modifier = modifier; rollData.modifier = modifier;
rollData.nbDice = nbDice;
rollData.finalScore = myRoll.total; rollData.finalScore = myRoll.total;
let actor = game.actors.get(rollData.actorId); let actor = game.actors.get(rollData.actorId);

View File

@ -1,6 +1,13 @@
<form class="skill-roll-dialog"> <form class="skill-roll-dialog">
<h2 class="dialog-roll-title">{{title}}</h2> <h2 class="dialog-roll-title">{{title}}</h2>
<div class="property flexrow">
<label class="property-label">{{localize "Defender"}} : </label>
<label class="property-label">{{defender.name}}</label>
<label class="property-label">{{localize "Defense score"}}</label>
<label class="property-label">{{defender.data.aptitudes.def.value}}</label>
</div>
<div class="property flexrow"> <div class="property flexrow">
<label class="property-label">{{localize "attribut"}}</label> <label class="property-label">{{localize "attribut"}}</label>
<select id="rollAttribute" value="rollAttribute"> <select id="rollAttribute" value="rollAttribute">
@ -11,12 +18,6 @@
</select> </select>
</div> </div>
<div class="property flexrow">
<label class="property-label">{{localize "Defender"}} : </label>
<label class="property-label">{{defender.name}}</label>
<label class="property-label">{{localize "Defense score"}}</label>
<label class="property-label">{{defender.data.aptitudes.def.value}}</label>
</div>
<div class="property flexrow"> <div class="property flexrow">
<label class="property-label">{{localize "d6M"}}</label> <label class="property-label">{{localize "d6M"}}</label>