From 15d67e72a314586126a2173506436c57ac3b6b5c Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 18 Dec 2020 23:48:41 +0100 Subject: [PATCH] =?UTF-8?q?Explications=20des=20difficult=C3=A9s=20de=20je?= =?UTF-8?q?ts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/actor.js | 12 ++++-------- module/rdd-combat.js | 18 ++++++------------ module/rdd-resolution-table.js | 16 +++++++++++----- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/module/actor.js b/module/actor.js index 71beea7e..88b2e4ef 100644 --- a/module/actor.js +++ b/module/actor.js @@ -1271,8 +1271,7 @@ export class RdDActor extends Actor { // Final chat message let chatOptions = { content: "Test : " + rollData.selectedCarac.label + " / " + rollData.selectedDraconic.name + " / " + rollData.selectedSort.name + "" - + "
Difficultés libre : " + rollData.diffLibre + " / conditions : " + Misc.toSignedString(rollData.diffConditions) +" / état : " + rollData.etat - + RdDResolutionTable.explain(rolled) + + RdDResolutionTable.explainRollData(rollData) + explications } @@ -1310,8 +1309,7 @@ export class RdDActor extends Actor { // Final chat message let chatOptions = { content: "Test : " + rollData.selectedCarac.label + " / " + resumeCompetence + "" - + "
Difficultés libre : " + rollData.diffLibre + " / conditions : " + Misc.toSignedString(rollData.diffConditions) +" / état : " + rollData.etat - + RdDResolutionTable.explain(rolled) + + RdDResolutionTable.explainRollData(rollData) + explications } @@ -1410,8 +1408,7 @@ export class RdDActor extends Actor { // Message de résultat ChatUtility.chatWithRollMode({ content: "Test de Tache : " + rollData.tache.name + " - " + rollData.selectedCarac.label + " / " + rollData.competence.name + "" - + "
Difficultés libre : " + rollData.diffLibre + " / conditions : " + Misc.toSignedString(rollData.diffConditions) +" / état : " + rollData.etat - + "
" + RdDResolutionTable.explain(rollData.rolled) + + RdDResolutionTable.explainRollData(rollData) + "
Points de taches : " + rollData.rolled.ptTache + ", ajustement qualité: " + rollData.rolled.ptQualite }, this.name); // Message spécifique de la tâche @@ -1432,8 +1429,7 @@ export class RdDActor extends Actor { _competenceResult(rollData) { ChatUtility.chatWithRollMode({ content: "Test : " + rollData.selectedCarac.label + " / " + rollData.competence.name + "" - + "
Difficultés libre : " + rollData.diffLibre + " / conditions : " + Misc.toSignedString(rollData.diffConditions) +" / état : " + rollData.etat - + RdDResolutionTable.explain(rollData.rolled) + + RdDResolutionTable.explainRollData(rollData) + "
Points de taches : " + rollData.rolled.ptTache + ", ajustement qualité: " + rollData.rolled.ptQualite }, this.name); } diff --git a/module/rdd-combat.js b/module/rdd-combat.js index 1abff7a6..f9d3dae6 100644 --- a/module/rdd-combat.js +++ b/module/rdd-combat.js @@ -262,8 +262,7 @@ export class RdDCombat { // Final chat message let chatOptions = { content: "Test : " + rollData.selectedCarac.label + " / " + rollData.competence.name + "" - + "
Difficultés libre : " + rollData.diffLibre + " / conditions : " + Misc.toSignedString(rollData.diffConditions) + " / état : " + rollData.etat - + RdDResolutionTable.explain(rollData.rolled) + + RdDResolutionTable.explainRollData(rollData) + explications } ChatUtility.chatWithRollMode(chatOptions, this.attacker.name) @@ -345,8 +344,7 @@ export class RdDCombat { console.log("RdDCombat.onAttaqueEchec >>>", rollData); let chatOptions = { content: "Test : " + rollData.selectedCarac.label + " / " + rollData.competence.name + "" - + "
Difficultés libre : " + rollData.diffLibre + " / conditions : " + Misc.toSignedString(rollData.diffConditions) + " / état : " + rollData.etat - + RdDResolutionTable.explain(rollData.rolled) + + RdDResolutionTable.explainRollData(rollData) + (this.target ? "
Cible : " + this.defender.data.name : "") } ChatUtility.chatWithRollMode(chatOptions, this.attacker.name) @@ -456,8 +454,7 @@ export class RdDCombat { let chatOptions = { content: "Test : " + rollData.selectedCarac.label + " / " + rollData.competence.name + "" - + "
Difficultés libre : " + rollData.diffLibre + " / conditions : " + Misc.toSignedString(rollData.diffConditions) + " / état : " + rollData.etat - + RdDResolutionTable.explain(rollData.rolled) + + RdDResolutionTable.explainRollData(rollData) + "
Attaque parée!" } ChatUtility.chatWithRollMode(chatOptions, this.defender.name) @@ -487,8 +484,7 @@ export class RdDCombat { let chatOptions = { content: "Test : " + rollData.selectedCarac.label + " / " + rollData.competence.name + "" - + "
Difficultés libre : " + rollData.diffLibre + " / conditions : " + Misc.toSignedString(rollData.diffConditions) + " / état : " + rollData.etat - + RdDResolutionTable.explain(rollData.rolled) + + RdDResolutionTable.explainRollData(rollData) + explications } @@ -557,8 +553,7 @@ export class RdDCombat { console.log("RdDCombat._onEsquiveNormal >>>", rollData); let chatOptions = { content: "Test : " + rollData.selectedCarac.label + " / " + rollData.competence.name + "" - + "
Difficultés libre : " + rollData.diffLibre + " / conditions : " + Misc.toSignedString(rollData.diffConditions) + " / état : " + rollData.etat - + RdDResolutionTable.explain(rollData.rolled) + + RdDResolutionTable.explainRollData(rollData) + "
Attaque esquivée!" } ChatUtility.chatWithRollMode(chatOptions, this.defender.name) @@ -585,8 +580,7 @@ export class RdDCombat { let chatOptions = { content: "Test : " + rollData.selectedCarac.label + " / " + rollData.competence.name + "" - + "
Difficultés libre : " + rollData.diffLibre + " / conditions : " + Misc.toSignedString(rollData.diffConditions) + " / état : " + rollData.etat - + RdDResolutionTable.explain(rollData.rolled) + + RdDResolutionTable.explainRollData(rollData) + explications } diff --git a/module/rdd-resolution-table.js b/module/rdd-resolution-table.js index e1a9686b..67439ad5 100644 --- a/module/rdd-resolution-table.js +++ b/module/rdd-resolution-table.js @@ -86,7 +86,13 @@ export class RdDResolutionTable { } message += '' + rolled.quality + '' return message; + } + static explainRollData(rollData) { + let message = "
Difficultés libre: " + rollData.diffLibre + " / conditions: " + Misc.toSignedString(rollData.diffConditions) + + " / état: " + rollData.etat; + message += RdDResolutionTable.explain(rollData.rolled) + return message; } /* -------------------------------------------- */ @@ -163,7 +169,7 @@ export class RdDResolutionTable { } return rollData.rolled.isETotal; } - + /* -------------------------------------------- */ static isParticuliere(rollData) { if (rollData.arme && rollData.surprise) { @@ -240,11 +246,11 @@ export class RdDResolutionTable { } /* -------------------------------------------- */ - static buildHTMLResults( caracValue, levelValue) { - let cell = this.computeChances( caracValue, levelValue); + static buildHTMLResults(caracValue, levelValue) { + let cell = this.computeChances(caracValue, levelValue); let descr = $(''); - descr.append("Particulière : " + cell.part+ " - Significative : " + cell.sign + " - Réussite : "+cell.score); - descr.append("
Echec Particulier : " + cell.epart + " - Echec Total : " + cell.etotal ); + descr.append("Particulière : " + cell.part + " - Significative : " + cell.sign + " - Réussite : " + cell.score); + descr.append("
Echec Particulier : " + cell.epart + " - Echec Total : " + cell.etotal); descr.append(""); return descr; }