Merge branch 'small-fixes' into 'master'

Small fixes

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!38
This commit is contained in:
Leratier Bretonnien 2020-11-26 07:14:38 +00:00
commit e87a2083f1
3 changed files with 7 additions and 7 deletions

View File

@ -528,16 +528,16 @@ export class RdDActor extends Actor {
let rolled = await RdDResolutionTable.roll(reveActuel, difficulte);
// TODO: xp particulière
console.log("combattreReveDeDragon", rolled );
return this.appliquerReveDeDragon(rolled, force);
return await this.appliquerReveDeDragon(rolled, force);
}
/* -------------------------------------------- */
appliquerReveDeDragon(roll, force) {
async appliquerReveDeDragon(roll, force) {
let message = "";
if (roll.isSuccess) {
message += "<br>Vous gagnez " + force + " points de Rêve";
this.updatePointDeSeuil();
this.reveActuelIncDec(force);
await this.updatePointDeSeuil();
await this.reveActuelIncDec(force);
}
if (roll.isPart) {
// TODO: Dialog pour choix entre HR opu général?

View File

@ -205,8 +205,8 @@ export class RdDResolutionTable {
let table = $("<table class='table-resolution'/>")
.append(this._buildHTMLHeader(this.resolutionTable[0], minLevel, maxLevel));
for (var caracValue = minCarac; caracValue <= maxCarac; caracValue++) {
table.append(this._buildHTMLRow(this.resolutionTable[caracValue], caracValue, caracValue, levelValue, minLevel, maxLevel));
for (var rowIndex = minCarac; rowIndex <= maxCarac; rowIndex++) {
table.append(this._buildHTMLRow(this.resolutionTable[rowIndex], rowIndex, caracValue, levelValue, minLevel, maxLevel));
}
return table;
}

View File

@ -320,7 +320,7 @@
</li>
{{#each data.combat as |arme key|}}
<li class="item flexrow list-item" data-item-id="{{arme._id}}">
<span class="arme-label competence-label" name="data.armes[{{key}}].name"><a data-competence-name="{{arme.data.competence}}">{{arme.name}}</a></span>
<span class="arme-label" name="data.armes[{{key}}].name"><a data-competence-name="{{arme.data.competence}}">{{arme.name}}</a></span>
<span class="competence-label" name="data.armes[{{key}}].data.competence">{{arme.data.competence}}</span>
<span class="competence-value" name="data.armes[{{key}}].data.niveau">{{numberFormat arme.data.niveau decimals=0 sign=true}}</span>
<span class="competence-value" name="data.armes[{{key}}].data.dommages">{{numberFormat arme.data.dommages decimals=0 sign=true}}</span>