From 7efa7be1c076f07e2f6fcd7cc5d62055d6b7ee8d Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Mon, 5 Dec 2022 01:52:49 +0100 Subject: [PATCH] L'art ne s'encombre de rien MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ne pas appliquer le surencombrement (ou l'encombrement) aux oeuvres d'art: on considère que pour faire de l'art, on pose son sac. --- module/actor.js | 4 +--- module/rolldata-ajustements.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/module/actor.js b/module/actor.js index 1e7c51bc..c38d9124 100644 --- a/module/actor.js +++ b/module/actor.js @@ -2712,7 +2712,7 @@ export class RdDActor extends Actor { competence: duplicate(this.getCompetence(artData.compName ?? oeuvre.system.competence ?? artData.art)), diffLibre: - (oeuvre.system.niveau ?? 0), diffConditions: 0, - use: { libre: false, conditions: true }, + use: { libre: false, conditions: true, surenc: false }, selectedCarac: duplicate(this.system.carac[selected]) }, { overwrite: false }); @@ -2721,8 +2721,6 @@ export class RdDActor extends Actor { artData.forceCarac = {}; artData.forceCarac[selected] = duplicate(this.system.carac[selected]); } - console.log("rollArt !!!", artData); - const dialog = await RdDRoll.create(this, artData, { html: `systems/foundryvtt-reve-de-dragon/templates/dialog-roll-${oeuvre.type}.html` }, { diff --git a/module/rolldata-ajustements.js b/module/rolldata-ajustements.js index 690705a2..2baaa58f 100644 --- a/module/rolldata-ajustements.js +++ b/module/rolldata-ajustements.js @@ -63,7 +63,7 @@ export const referenceAjustements = { }, encTotal: { isVisible: (rollData, actor) => RdDCarac.isAgiliteOuDerivee(rollData.selectedCarac) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence), - isUsed: (rollData, actor) => RdDCarac.isAgiliteOuDerivee(rollData.selectedCarac) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence) && rollData.use.encTotal, + isUsed: (rollData, actor) => !rollData.oeuvre && RdDCarac.isAgiliteOuDerivee(rollData.selectedCarac) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence) && rollData.use.encTotal, getLabel: (rollData, actor) => 'Encombrement total', getValue: (rollData, actor) => -actor.getEncTotal() },