diff --git a/module/actor.js b/module/actor.js index ff80ba4a..8786df20 100644 --- a/module/actor.js +++ b/module/actor.js @@ -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 += "
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? diff --git a/module/rdd-resolution-table.js b/module/rdd-resolution-table.js index 7af9777c..e4ba1ca6 100644 --- a/module/rdd-resolution-table.js +++ b/module/rdd-resolution-table.js @@ -205,8 +205,8 @@ export class RdDResolutionTable { let table = $("") .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; } diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 2765b7cd..76906f3a 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -320,7 +320,7 @@ {{#each data.combat as |arme key|}}
  • - {{arme.name}} + {{arme.name}} {{arme.data.competence}} {{numberFormat arme.data.niveau decimals=0 sign=true}} {{numberFormat arme.data.dommages decimals=0 sign=true}}