module/actor-sheet.js

@@ -57,6 +57,7 @@ export class RdDActorSheet extends RdDBaseActorSheet {
       resumeBlessures: this.actor.computeResumeBlessure(this.actor.system.blessures),
       caracTotal: RdDCarac.computeTotal(this.actor.system.carac, this.actor.system.beaute),
       surEncombrementMessage: this.actor.getMessageSurEncombrement(),
+      malusArmure: this.actor.getMalusArmure()
     })
 
     this.timerRecherche = undefined;

module/actor.js

@@ -95,7 +95,6 @@ export class RdDActor extends RdDBaseActor {
     this.computeIsHautRevant();
     await this.cleanupConteneurs();
     await this.computeEncTotal();
-    await this.computeMalusArmure();
   }
 
   /* -------------------------------------------- */
@@ -218,7 +217,12 @@ export class RdDActor extends RdDBaseActor {
 
   /* -------------------------------------------- */
   getMalusArmure() {
-    return Misc.toInt(this.system.attributs?.malusarmure?.value)
+    if (this.isPersonnage()) {
+      return this.itemTypes[TYPES.armure].filter(it => it.system.equipe)
+        .map(it => it.system.malus)
+        .reduce(Misc.sum(), 0);
+    }
+    return 0;
   }
 
   /* -------------------------------------------- */
@@ -1114,7 +1118,7 @@ export class RdDActor extends RdDBaseActor {
       case 'entite': case 'vehicule':
         return 0;
     }
-    return Math.min(0, this.getEncombrementMax() - Math.round(Number(this.getEncTotal())));
+    return Math.min(0, Math.floor(this.getEncombrementMax() - this.encTotal));
   }
 
   getMessageSurEncombrement() {
@@ -1142,20 +1146,6 @@ export class RdDActor extends RdDBaseActor {
     }
   }
 
-
-  /* -------------------------------------------- */
-  async computeMalusArmure() {
-    if (this.isPersonnage()) {
-      const malusArmure = this.filterItems(it => it.type == 'armure' && it.system.equipe)
-        .map(it => it.system.malus ?? 0)
-        .reduce(Misc.sum(), 0);
-      // Mise à jour éventuelle du malus armure
-      if (this.system.attributs?.malusarmure?.value != malusArmure) {
-        await this.updateAttributeValue("malusarmure", malusArmure);
-      }
-    }
-  }
-
   /* -------------------------------------------- */
   computeResumeBlessure() {
     const blessures = this.filterItems(it => it.system.gravite > 0, 'blessure')

module/rdd-roll-resolution-table.js

@@ -112,7 +112,7 @@ export class RdDRollResolutionTable extends Dialog {
   async updateRollResult() {
     let rollData = this.rollData;
     rollData.caracValue = parseInt(rollData.selectedCarac.value)
-    rollData.finalLevel = this._computeFinalLevel(rollData);
+    rollData.finalLevel = Misc.toInt(rollData.diffConditions) + Misc.toInt(rollData.diffLibre);
 
     const htmlTable = await RdDResolutionTable.buildHTMLTable({
       carac: rollData.caracValue,
@@ -129,12 +129,6 @@ export class RdDRollResolutionTable extends Dialog {
   }
 
   /* -------------------------------------------- */
-  _computeFinalLevel(rollData) {
-    const diffConditions = Misc.toInt(rollData.diffConditions);
-    const diffLibre = Misc.toInt(rollData.diffLibre);
-
-    return diffLibre + diffConditions;
-  }
 
   async close() {
     await super.close();

module/rdd-roll.js

@@ -305,7 +305,6 @@ export class RdDRoll extends Dialog {
     }
 
     RollDataAjustements.calcul(rollData, this.actor);
-    rollData.finalLevel = this._computeFinalLevel(rollData);
 
     const resolutionTable = await RdDResolutionTable.buildHTMLTable(RdDResolutionTable.subTable(rollData.caracValue, rollData.finalLevel))
     const adjustements = await this.buildAjustements(rollData);
@@ -330,30 +329,6 @@ export class RdDRoll extends Dialog {
     return await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/partial-roll-ajustements.html`, rollData);
   }
 
-  /* -------------------------------------------- */
-  _computeFinalLevel(rollData) {
-    return RollDataAjustements.sum(rollData.ajustements);
-  }
-  /* -------------------------------------------- */
-  _computeDiffCompetence(rollData) {
-    if (rollData.competence) {
-      return Misc.toInt(rollData.competence.system.niveau);
-    }
-    if (rollData.draconicList) {
-      return Misc.toInt(rollData.competence.system.niveau);
-    }
-    return 0;
-  }
-
-  /* -------------------------------------------- */
-  _computeMalusArmure(rollData) {
-    let malusArmureValue = 0;
-    if (rollData.malusArmureValue && (rollData.selectedCarac.label == "Agilité" || rollData.selectedCarac.label == "Dérobée")) {
-      malusArmureValue = rollData.malusArmureValue;
-    }
-    return malusArmureValue;
-  }
-
   /* -------------------------------------------- */
   _getTitle(rollData) {
     const carac = rollData.selectedCarac.label;

module/rolldata-ajustements.js

@@ -164,7 +164,7 @@ export class RollDataAjustements {
         descr: reference.getDescr && reference.getDescr(rollData, actor)
       }
     }
-    rollData.finalLevel = RollDataAjustements.sum(rollData.ajustements);
+    rollData.finalLevel = RollDataAjustements.sum(rollData.ajustements)
   }
 
   /* -------------------------------------------- */

template.json

@@ -393,12 +393,6 @@
             "label": "Encombrement",
             "derivee": true
           },
-          "malusarmure": {
-            "type": "number",
-            "value": 0,
-            "label": "Malus Armure",
-            "derivee": true
-          },
           "protection": {
             "type": "number",
             "value": 0,

templates/actor/carac-derivee.html

@@ -72,7 +72,7 @@
   </li>  
   <li class="caracteristique flexrow list-item" >
     <label class="carac-label">Malus armure</label>
-    <input class="derivee-value" type="number" disabled value="{{system.attributs.malusarmure.value}}" data-dtype="number"/>
+    <input class="derivee-value" type="number" disabled value="{{calc.malusArmure}}" data-dtype="number"/>
   </li>  
   <li class="caracteristique flexrow list-item">
     <label class="carac-label" for="system.attributs.protection.value" >Protection naturelle</label>