From 527ef356498ba81c3662548a8b698c4a5f6794af Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Wed, 25 Nov 2020 23:17:13 +0100 Subject: [PATCH 1/3] =?UTF-8?q?fix=20case=20s=C3=A9lectionn=C3=A9e=20dans?= =?UTF-8?q?=20table=20de=20r=C3=A9solution?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/rdd-resolution-table.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } From fd8f5cfcf11765ddc05216f50a345491905dd691 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Wed, 25 Nov 2020 23:17:37 +0100 Subject: [PATCH 2/3] =?UTF-8?q?fix=20double=20fen=C3=AAtre=20pour=20armes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/actor-sheet.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}} From aee7a43901791fc552b305ad30f5b3416df1d4d3 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Wed, 25 Nov 2020 23:41:08 +0100 Subject: [PATCH 3/3] await pour appliquerReveDeDragon --- module/actor.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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?