From 969e5f6b2d0b71b984ce4d09e178d5a04e8b8b8d Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 13 Jan 2023 01:48:00 +0100 Subject: [PATCH] Rename: isAgiliteOuDerobee MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plutôt que isAgiliteOuDerivee qui pourrait inclure la Mêlée --- module/rdd-carac.js | 3 ++- module/rdd-roll.js | 2 +- module/rolldata-ajustements.js | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/module/rdd-carac.js b/module/rdd-carac.js index e753a696..f5a905dc 100644 --- a/module/rdd-carac.js +++ b/module/rdd-carac.js @@ -39,9 +39,10 @@ const tableCaracDerivee = { export class RdDCarac { - static isAgiliteOuDerivee(selectedCarac) { + static isAgiliteOuDerobee(selectedCarac) { return selectedCarac?.label.match(/(Agilité|Dérobée)/); } + static isVolonte(selectedCarac) { return selectedCarac?.label == 'Volonté'; } diff --git a/module/rdd-roll.js b/module/rdd-roll.js index 22a8368f..4266e995 100644 --- a/module/rdd-roll.js +++ b/module/rdd-roll.js @@ -311,7 +311,7 @@ export class RdDRoll extends Dialog { const resolutionTable = await RdDResolutionTable.buildHTMLTable(RdDResolutionTable.subTable(rollData.caracValue, rollData.finalLevel)) const adjustements = await this.buildAjustements(rollData); - HtmlUtility.showControlWhen(this.html.find(".use-encTotal"), rollData.ajustements.encTotal.visible && RdDCarac.isAgiliteOuDerivee(rollData.selectedCarac)); + HtmlUtility.showControlWhen(this.html.find(".use-encTotal"), rollData.ajustements.encTotal.visible && RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac)); HtmlUtility.showControlWhen(this.html.find(".use-surenc"), rollData.ajustements.surenc.visible && RdDCarac.isActionPhysique(rollData.selectedCarac)); HtmlUtility.showControlWhen(this.html.find(".utilisation-moral"), rollData.use.appelAuMoral); HtmlUtility.showControlWhen(this.html.find(".diffMoral"), rollData.ajustements.moralTotal.used); diff --git a/module/rolldata-ajustements.js b/module/rolldata-ajustements.js index 2baaa58f..dd5d19e4 100644 --- a/module/rolldata-ajustements.js +++ b/module/rolldata-ajustements.js @@ -56,14 +56,14 @@ export const referenceAjustements = { getValue: (rollData, actor) => actor.getEtatGeneral({ ethylisme: rollData.forceAlcool != undefined }) }, malusArmure: { - isVisible: (rollData, actor) => RdDCarac.isAgiliteOuDerivee(rollData.selectedCarac), - isUsed: (rollData, actor) => RdDCarac.isAgiliteOuDerivee(rollData.selectedCarac), + isVisible: (rollData, actor) => RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac), + isUsed: (rollData, actor) => RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac), getLabel: (rollData, actor) => 'Malus armure', getValue: (rollData, actor) => actor.getMalusArmure() }, encTotal: { - isVisible: (rollData, actor) => RdDCarac.isAgiliteOuDerivee(rollData.selectedCarac) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence), - isUsed: (rollData, actor) => !rollData.oeuvre && RdDCarac.isAgiliteOuDerivee(rollData.selectedCarac) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence) && rollData.use.encTotal, + isVisible: (rollData, actor) => RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence), + isUsed: (rollData, actor) => !rollData.oeuvre && RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence) && rollData.use.encTotal, getLabel: (rollData, actor) => 'Encombrement total', getValue: (rollData, actor) => -actor.getEncTotal() },