Empoignade V2

assets/actions/surenc.svg

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 448 434"
-   version="1.1"
-   id="svg6"
-   sodipodi:docname="surenc.svg"
-   width="448"
-   height="434"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="3840"
-     inkscape:window-height="2054"
-     id="namedview8"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="224"
-     inkscape:cy="210"
-     inkscape:window-x="-11"
-     inkscape:window-y="-11"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg6" />
-  <g
-     class=""
-     id="g4"
-     transform="translate(-32,-46)">
-    <path
-       d="m 256,46 c -45.074,0 -82,36.926 -82,82 0,25.812 12.123,48.936 30.938,64 H 128 L 32,480 H 480 L 384,192 H 307.062 C 325.877,176.936 338,153.812 338,128 338,82.926 301.074,46 256,46 Z m 0,36 c 25.618,0 46,20.382 46,46 0,25.618 -20.382,46 -46,46 -25.618,0 -46,-20.382 -46,-46 0,-25.618 20.382,-46 46,-46 z m -82.215,202.95 h 23.5 v 33.263 l 33.873,-33.264 h 27.283 l -43.883,43.15 48.4,47.974 H 233.54 l -36.255,-35.888 v 35.888 h -23.5 z m 119.934,21.24 c 4.76,0 8.952,0.934 12.573,2.806 3.62,1.872 6.938,4.82 9.95,8.85 v -10.13 h 21.972 v 61.462 c 0,10.986 -3.48,19.368 -10.438,25.146 -6.917,5.82 -16.968,8.727 -30.152,8.727 -4.272,0 -8.4,-0.325 -12.39,-0.976 a 77.367,77.367 0 0 1 -12.024,-2.99 v -17.03 c 3.826,2.198 7.57,3.826 11.23,4.884 3.664,1.098 7.347,1.648 11.05,1.648 7.162,0 12.41,-1.566 15.746,-4.7 3.337,-3.132 5.006,-8.035 5.006,-14.708 v -4.7 c -3.01,3.986 -6.328,6.916 -9.95,8.788 -3.62,1.87 -7.813,2.808 -12.573,2.808 -8.343,0 -15.238,-3.275 -20.69,-9.826 -5.453,-6.592 -8.18,-14.974 -8.18,-25.146 0,-10.214 2.727,-18.576 8.18,-25.086 5.452,-6.55 12.347,-9.827 20.69,-9.827 z m 8.118,15.746 c -4.517,0 -8.038,1.67 -10.56,5.005 -2.523,3.338 -3.784,8.058 -3.784,14.162 0,6.266 1.22,11.026 3.662,14.28 2.442,3.215 6.003,4.823 10.682,4.823 4.557,0 8.096,-1.67 10.62,-5.006 2.522,-3.337 3.784,-8.036 3.784,-14.098 0,-6.104 -1.262,-10.824 -3.785,-14.16 -2.523,-3.337 -6.062,-5.006 -10.62,-5.006 z"
-       fill="#ffffff"
-       fill-opacity="1"
-       id="path2" />
-  </g>
-</svg>

changelog.md

@@ -3,9 +3,6 @@
 
 - Les réussites particulières en demi-surprise sont de simples réussites
 - Les images des scènes par défaut sont corrigées
-- Ajout d'une image de status "sur-encombré"
-- Correction V13
-  - couleur lisible dans les sommaires des journaux et des compendiums
 - Amélioration des entités:
   - l'attaquant ne sait plus que c'est une entité de cauchemar (surprise!)
   - l'encaissement indique une blessure dans le tchat... même si ce n'est que de l'endurance
@@ -17,9 +14,8 @@
   - empoignade
     - l'empoignade est possible avec une initiative d'empoignade, ou en cours d'empoignade
     - seule la dague, le pugilat et la dague sont possibles en cours d'empoignade
-    - jet de Dextérité/Dague pour utiliser la dague en cours d'empoignade (p136)
-    - attaquer avec une arme un empoigneur donne un +4 si pas d'empoignade (p134)
-    - la différence de taille donne un bonus/malus en cours d'empoignade (p135)
+    - jet de Dextérité/Dague pour utiliser la dague en cours d'empoignade
+    - attaquer avec une arme un empoigneur donne un +4 si pas d'empoignade
     - les dommages de l'empoignade ajoutent/enlèvent un point d'empoignade
     - le statut d'empoignade est affiché sur les tokens
     - les défenses contre une empoignade sont corrigées

css/foundryvtt-reve-de-dragon.css

@@ -648,7 +648,8 @@ select,
 .system-foundryvtt-reve-de-dragon .roll-dialog roll-conditions roll-section[name="coeur"] select[name="coeur"] {
   max-width: 4rem;
 }
-.system-foundryvtt-reve-de-dragon .roll-dialog roll-conditions roll-section img {
+.system-foundryvtt-reve-de-dragon .roll-dialog roll-conditions roll-section[name="empoignade"] img {
+  /* image de d100 */
   max-width: 1rem;
   max-height: 1rem;
   gap: 0;
@@ -660,6 +661,10 @@ select,
   /* image de d100 */
   max-width: 2.5rem;
   max-height: 2.5rem;
+  gap: 0;
+  margin: 0;
+  padding: 0;
+  filter: invert(0.8);
 }
 .system-foundryvtt-reve-de-dragon .roll-dialog roll-buttons {
   display: flex;
@@ -1569,12 +1574,6 @@ select,
 .system-foundryvtt-reve-de-dragon .type-compendium {
   font-size: 0.6rem;
 }
-.system-foundryvtt-reve-de-dragon .sheet.journal-entry .journal-sidebar {
-  color: var(--color-text-dark-primary);
-}
-.system-foundryvtt-reve-de-dragon .sheet.journal-entry .journal-sidebar button {
-  color: var(--color-text-dark-primary);
-}
 .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-header {
   background: #011d33 url(../assets/ui/bg_header.webp) no-repeat left top;
   color: #ffffff;

lang/fr.json

@@ -67,7 +67,6 @@
     "StatusComma": "Comma",
     "StatusDead": "Mort",
     "StatusDemiReve": "Demi-rêve",
-    "StatusSurEnc": "Sur-encombrement",
     "StatusForceWeak": "Force insuffisante"
   }
 }

less/foundryvtt-reve-de-dragon.less

@@ -865,12 +865,6 @@
   .type-compendium {
     font-size: 0.6rem;
   }
-  .sheet.journal-entry .journal-sidebar {
-    color: var(--color-text-dark-primary);
-    button {
-      color: var(--color-text-dark-primary);
-    }
-  }
 
   /* ======================================== */
   /* Sheet  */

less/roll-dialog.less

@@ -224,7 +224,8 @@
     max-width: 4rem;
   }
 
-  roll-conditions roll-section img {
+  roll-conditions roll-section[name="empoignade"] img {
+    /* image de d100 */
     max-width: 1rem;
     max-height: 1rem;
     gap: 0;
@@ -236,6 +237,10 @@
     /* image de d100 */
     max-width: 2.5rem;
     max-height: 2.5rem;
+    gap: 0;
+    margin: 0;
+    padding: 0;
+    filter: invert(0.8);
   }
 
   roll-buttons { 

module/actor-sheet.js

@@ -375,6 +375,14 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
     return position;
   }
 
+
+  /* -------------------------------------------- */
+  /** @override */
+  _updateObject(event, formData) {
+    // Update the Actor
+    return this.actor.update(formData);
+  }
+
   async splitItem(item) {
     const dialog = await DialogSplitItem.create(item, (item, split) => this._onSplitItem(item, split));
     dialog.render(true);

module/actor.js

@@ -228,7 +228,7 @@ export class RdDActor extends RdDBaseActorSang {
         if (arme.system.lancer && arme.system.resistance > 0) { addAttaque(arme, ATTAQUE_TYPE.LANCER) }
         if (arme.system.tir) { addAttaque(arme, ATTAQUE_TYPE.TIR) }
       })
-    addAttaque(RdDItemArme.pugilat(this), ATTAQUE_TYPE.CORPS_A_CORPS)
+      addAttaque(RdDItemArme.pugilat(this), ATTAQUE_TYPE.CORPS_A_CORPS)
 
     return actions
   }
@@ -755,18 +755,20 @@ export class RdDActor extends RdDBaseActorSang {
     let updates = {};
     if (caracName == LIST_CARAC_PERSONNAGE.reve.code) {
       if (to > Misc.toInt(this.system.reve.seuil.value)) {
-        updates[`system.reve.seuil.value`] = to
+        updates[`system.reve.seuil.value`] = to; // SFA : Direct and packed changes
+        //this.setPointsDeSeuil(to);
       }
     }
     if (caracName == LIST_CARAC_PERSONNAGE.chance.code) {
       if (to > Misc.toInt(this.system.compteurs.chance.value)) {
-        updates[`system.compteurs.chance.value`] = to
+        updates[`system.compteurs.chance.value`] = to; // SFA : Direct and packed changes
+        //this.setPointsDeChance(to);
       }
     }
     let selectedCarac = this.findCaracByName(caracName);
     const from = selectedCarac.value
     updates[`system.carac.${caracName}.value`] = to;
-    await this.update(updates, { noHook: true });
+    await this.update(updates);
     await ExperienceLog.add(this, XP_TOPIC.CARAC, from, to, caracName);
   }
 
@@ -1751,7 +1753,7 @@ export class RdDActor extends RdDBaseActorSang {
           this.tmrApp?.close();
           this.tmrApp = undefined;
         }
-      }],
+      } ],
       onRollDone: RollDialog.onRollDoneClose,
       onClose: () => {
         this.tmrApp?.restoreTMRAfterAction();
@@ -2605,7 +2607,7 @@ export class RdDActor extends RdDBaseActorSang {
     if (item?.isEquipable()) {
       const isEquipe = !item.system.equipe;
       await item.update({ "system.equipe": isEquipe });
-      this.computeEncTotal()
+      this.computeEncTotal();
       if (isEquipe)
         this.verifierForceMin(item);
     }
@@ -2996,7 +2998,6 @@ export class RdDActor extends RdDBaseActorSang {
     if (updatedEndurance && options.diff) {
       await this.setEffect(STATUSES.StatusUnconscious, updatedEndurance.value == 0)
     }
-    await super.onUpdateActor(update, options, actorId)
   }
 
   /* -------------------------------------------- */
@@ -3038,13 +3039,12 @@ export class RdDActor extends RdDBaseActorSang {
         await this.onDeleteOwnedCaseTmr(item, options, id)
         break
       case ITEM_TYPES.empoignade:
-        await RdDEmpoignade.deleteLinkedEmpoignade(this.id, item)
-        // TODO: check remaining emp.
         await this.setEffect(STATUSES.StatusGrappled, false)
         await this.setEffect(STATUSES.StatusGrappling, false)
+        await RdDEmpoignade.deleteLinkedEmpoignade(this.id, item)
         break
     }
-    await super.onDeleteItem(item, options, id)
+    super.onDeleteItem(item, options, id)
   }
 
   /* -------------------------------------------- */

module/actor/base-actor-reve-sheet.js

@@ -56,15 +56,13 @@ export class RdDBaseActorReveSheet extends RdDBaseActorSheet {
     if (this.options.vueDetaillee) {
       // On carac change
       this.html.find('.carac-value').change(async event => {
-        if (event.currentTarget.name.includes("carac.")) {
-          let caracName = event.currentTarget.name.replace("carac.", "")
-          await this.actor.updateCarac(caracName, parseInt(event.currentTarget.value))
-        }
-      })
+        let caracName = event.currentTarget.name.replace(".value", "").replace("system.carac.", "")
+        await this.actor.updateCarac(caracName, parseInt(event.target.value))
+      });
       // On competence change
       this.html.find('.competence-value').change(async event => {
         let compName = event.currentTarget.attributes.compname.value
-        await this.actor.updateCompetence(compName, parseInt(event.currentTarget.value))
+        await this.actor.updateCompetence(compName, parseInt(event.target.value))
       });
     }
   }

module/actor/base-actor-reve.js

@@ -89,6 +89,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   getSConst() { return 0 }
 
   /* -------------------------------------------- */
+  isSurenc() { return false }
   computeMalusSurEncombrement() { return 0 }
 
   ajustementAstrologique() { return 0 }
@@ -125,7 +126,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   async remiseANeuf() { }
   async appliquerAjoutExperience(rollData, hideChatMessage = 'show') { }
 
-  computeResumeBlessure() { }
+  computeResumeBlessure() {}
   countBlessures(filter = it => !it.isContusion()) { return 0 }
   async santeIncDec(name, inc, isCritique = false) { }
 
@@ -229,9 +230,49 @@ export class RdDBaseActorReve extends RdDBaseActor {
     }
   }
 
+  /* -------------------------------------------- */
+  isEffectAllowed(effectId) { return false }
+
+  getEffects(filter = e => true, forceRequise = undefined) {
+    const effects = this.getEmbeddedCollection("ActiveEffect")
+    const selected = effects.filter(filter)
+    if (forceRequise && this.isForceInsuffisante(forceRequise)) {
+      selected.push(StatusEffects.prepareActiveEffect(STATUSES.StatusForceWeak))
+    }
+    return selected
+  }
+
+  getEffectByStatus(statusId) {
+    return this.getEffects().find(it => it.statuses.has(statusId));
+  }
+
+  async setEffect(statusId, status) {
+    if (this.isEffectAllowed(statusId)) {
+      const effect = this.getEffectByStatus(statusId)
+      if (!status && effect) {
+        await this.deleteEmbeddedDocuments('ActiveEffect', [effect.id], { render: true })
+      }
+      if (status && !effect) {
+        await this.createEmbeddedDocuments("ActiveEffect", [StatusEffects.prepareActiveEffect(statusId)], { render: true })
+      }
+    }
+  }
+
+  async removeEffect(id) {
+    this.removeEffects(it => it.id == id)
+  }
+
+  async removeEffects(filter = e => true) {
+    if (game.user.isGM) {
+      const effectsToRemove = this.getEffects(filter);
+      const ids = effectsToRemove.map(it => it.id);
+      await this.deleteEmbeddedDocuments('ActiveEffect', ids);
+    }
+  }
+
   /* -------------------------------------------- */
   isDemiReve() {
-    return this.getEffectsByStatus(STATUSES.StatusDemiReve).length > 0
+    return this.getEffectByStatus(STATUSES.StatusDemiReve) != undefined
   }
 
   getSurprise(isCombat = undefined, forceRequise = undefined) {

module/actor/base-actor-sang.js

@@ -186,7 +186,6 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
         await this.changeBleedingState()
         break
     }
-    await super.onCreateItem(item, options, id)
   }
 
   async onUpdateItem(item, options, id) {
@@ -195,7 +194,6 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
         await this.changeBleedingState()
         break
     }
-    await super.onUpdateItem(item, options, id)
   }
 
   async changeBleedingState() {
@@ -315,7 +313,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
   }
 
   isSonne() {
-    return this.getEffectsByStatus(STATUSES.StatusStunned).length > 0
+    return this.getEffectByStatus(STATUSES.StatusStunned)
   }
 
   isEffectAllowed(effectId) { return true }

module/actor/base-actor-sheet.js

@@ -49,7 +49,7 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
     formData.calc = {
       fortune: Monnaie.toSolsDeniers(this.actor.getFortune()),
       prixTotalEquipement: this.actor.computePrixTotalEquipement(),
-      encTotal: this.actor.getEncTotal(),
+      encTotal: await this.actor.computeEncTotal(),
     }
 
     this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.inventaires);
@@ -229,6 +229,14 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
     return position;
   }
 
+
+  /* -------------------------------------------- */
+  /** @override */
+  _updateObject(event, formData) {
+    // Update the Actor
+    return this.actor.update(formData);
+  }
+
   async splitItem(item) {
     const dialog = await DialogSplitItem.create(item, (item, split) => this._onSplitItem(item, split));
     dialog.render(true);

module/actor/base-actor.js

@@ -10,7 +10,7 @@ import { RdDConfirm } from "../rdd-confirm.js";
 import { RdDUtility } from "../rdd-utility.js";
 import { SystemCompendiums } from "../settings/system-compendiums.js";
 import { RdDItem } from "../item.js";
-import { StatusEffects, STATUSES } from "../settings/status-effects.js";
+import { STATUSES } from "../settings/status-effects.js";
 
 export class RdDBaseActor extends Actor {
 
@@ -243,68 +243,18 @@ export class RdDBaseActor extends Actor {
 
   getMonnaie(id) { return this.findItemLike(id, 'monnaie'); }
   getEncombrementMax() { return 0 }
-  isSurenc() { return false }
-
-  /* -------------------------------------------- */
-  isEffectAllowed(effectId) { return false }
-
-  getEffects(filter = e => true, forceRequise = undefined) {
-    const effects = this.getEmbeddedCollection("ActiveEffect")
-    const selected = effects.filter(filter)
-    if (forceRequise && this.isForceInsuffisante(forceRequise)) {
-      selected.push(StatusEffects.prepareActiveEffect(STATUSES.StatusForceWeak))
-    }
-    return selected
-  }
-
-  getEffectsByStatus(effectId) {
-    return this.getEffects().filter(it => it.statuses.has(effectId))
-  }
-
-  async setEffect(effectId, status) {
-    if (this.isEffectAllowed(effectId)) {
-      const effects = this.getEffectsByStatus(effectId)
-      if (!status && effects.length > 0) {
-        await this.deleteEmbeddedDocuments('ActiveEffect', effects.map(it => it.id), { render: true })
-      }
-      if (status && effects.length == 0) {
-        await this.createEmbeddedDocuments("ActiveEffect", [StatusEffects.prepareActiveEffect(effectId)], { render: true })
-      }
-    }
-  }
-
-  async removeEffect(id) {
-    this.removeEffects(it => it.id == id)
-  }
-
-  async removeEffects(filter = e => true) {
-    if (game.user.isGM) {
-      const effectsToRemove = this.getEffects(filter);
-      const ids = effectsToRemove.map(it => it.id);
-      await this.deleteEmbeddedDocuments('ActiveEffect', ids);
-    }
-  }
 
   /* -------------------------------------------- */
   async updateCarac(caracName, to) {
   }
-
-  async onUpdateActor(change, options, actorId) {
-    const updatedCarac = change?.system?.carac
-    if (updatedCarac && (updatedCarac.force || updatedCarac.reve || updatedCarac.taille)) {
-      console.log(' onUpdateActor', change, options, actorId)
-      await this.setEffect(STATUSES.StatusSurEnc, this.isSurenc())
-    }
-  }
-
   /* -------------------------------------------- */
   async onPreUpdateItem(item, change, options, id) { }
 
-  async onCreateItem(item, options, id) {
-  }
+  async onCreateItem(item, options, id) { }
 
-  async onUpdateItem(item, options, id) {
-  }
+  async onUpdateItem(item, options, id) { }
+
+  async onUpdateActor(update, options, actorId) { }
 
   async onDeleteItem(item, options, id) {
     if (item.isInventaire()) {
@@ -312,7 +262,6 @@ export class RdDBaseActor extends Actor {
     }
   }
 
-
   async _removeItemFromConteneur(item) {
     const updates = this.items.filter(it => it.isConteneur() && it.system.contenu.includes(item.id))
       .map(conteneur => {
@@ -561,22 +510,16 @@ export class RdDBaseActor extends Actor {
 
   /* -------------------------------------------- */
   async computeEncTotal() {
-    if (this.pack) {
-      this.encTotal = 0
-    }
-    else {
-      const wasSurenc = this.isSurenc()
+    if (!this.pack) {
       this.encTotal = this.items.filter(it => RdDItem.getItemTypesInventaire().includes(it.type))
         .map(it => it.getEncTotal()).reduce(Misc.sum(), 0)
-      const isSurenc = this.isSurenc()
-      if (isSurenc != wasSurenc) {
-        await this.setEffect(STATUSES.StatusSurEnc, isSurenc)
-      }
+      return this.encTotal;
     }
+    return 0;
   }
 
   getEncTotal() {
-    return Math.floor(this.encTotal ?? 0)
+    return Math.floor(this.encTotal ?? 0);
   }
 
   async createItem(type, name = undefined) {
@@ -627,7 +570,7 @@ export class RdDBaseActor extends Actor {
         }
       }
     }
-    await this.computeEncTotal()
+    await this.computeEncTotal();
     return result;
   }
 

module/actor/experience-log.js

@@ -29,7 +29,7 @@ export class ExperienceLog {
     };
     console.log('ExperienceLog.add', newXpLog)
     const newExperienceLog = (actor.system.experiencelog ?? []).concat([newXpLog]);
-    await actor.update({ [`system.experiencelog`]: newExperienceLog }, { noHook: true });
+    await actor.update({ [`system.experiencelog`]: newExperienceLog });
   }
 
   static labelTopic(topic) {

module/constants.js

@@ -62,7 +62,6 @@ export const RDD_CONFIG = {
     demiReve: 'systems/foundryvtt-reve-de-dragon/assets/actions/sort.svg',
     empoignade: 'systems/foundryvtt-reve-de-dragon/assets/actions/empoignade.svg',
     forceWeak: 'systems/foundryvtt-reve-de-dragon/assets/actions/weak.svg',
-    surenc: 'systems/foundryvtt-reve-de-dragon/assets/actions/surenc.svg',
   },
   encaissement: {
     mortel: 'mortel',

module/item-sheet.js

@@ -260,7 +260,7 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
 
   /* -------------------------------------------- */
   /** @override */
-  async _updateObject(event, formData) {
+  _updateObject(event, formData) {
     switch (this.item.type) {
       case ITEM_TYPES.sort:
         formData['system.bonuscase'] = RdDItemSort.bonuscasesToString(RdDItemSheetV1._listCaseTmr(
@@ -273,7 +273,8 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
         formData['system.niveau'] = formData['system.niveau'] ?? formData['system.base']
         break
     }
-    return await super._updateObject(event, formData)
+
+    return this.item.update(formData)
   }
 
   /* -------------------------------------------- */

module/roll/roll-dialog.mjs

@@ -45,7 +45,6 @@ import { RollPartCuisine } from "./roll-part-cuisine.mjs";
 import { OptionsAvancees, ROLL_DIALOG_V2_TEST } from "../settings/options-avancees.js";
 import { ActorImpacts } from "../technical/actor-impacts.mjs";
 import { RollPartEmpoignade } from "./roll-part-empoignade.mjs";
-import { RollPartEmpoignadeTaille } from "./roll-part-empoignade-taille.mjs";
 
 
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api
@@ -87,7 +86,6 @@ const ROLL_PARTS = [
   new RollPartConditions(),
   new RollPartEthylisme(),
   new RollPartMalusArmure(),
-  new RollPartEmpoignadeTaille(),
   new RollPartEmpoignade(),
   new RollPartEncTotal(),
   new RollPartSurEnc(),

module/roll/roll-part-empoignade-taille.mjs

@@ -1,40 +0,0 @@
-import { RDD_CONFIG } from "../constants.js"
-import { ATTAQUE_TYPE_MELEE } from "../item/arme.js"
-import { RdDEmpoignade } from "../rdd-empoignade.js"
-import { COMBAT_ROLL_TYPES } from "./roll-constants.mjs"
-import { PART_ATTAQUE } from "./roll-part-attaque.mjs"
-import { RollPartCheckbox } from "./roll-part-checkbox.mjs"
-
-const EMPOIGNADE_TAILLE = "empoignade-taille"
-
-export class RollPartEmpoignadeTaille extends RollPartCheckbox {
-
-  get code() { return EMPOIGNADE_TAILLE }
-
-  isValid(rollData) {
-    return RdDEmpoignade.isCombatantEmpoignade(rollData.ids.actorId, rollData.ids.actorTokenId)
-  }
-
-  visible(rollData) {
-    return COMBAT_ROLL_TYPES.includes(rollData.type.current) &&
-      RdDEmpoignade.isEmpoignadeEnCours(rollData.active.actor) &&
-      this.getTailleDiff(rollData) != 0
-  }
-
-  getTailleDiff(rollData) {
-    const taille = rollData.active.actor.getTaille()
-    const tailleOpponent = rollData.opponent.actor.getTaille()
-    const diff = taille - tailleOpponent
-    const diffTailleAbs = Math.max(0, Math.abs(diff) - 1)
-    const signDiff = Math.sign(diff)
-    return signDiff * diffTailleAbs
-  }
-
-  getCheckboxIcon(rollData) { return `<img src="${RDD_CONFIG.icons.empoignade}">` }
-  getCheckboxLabel(rollData) {
-    return `Taille ${rollData.active.actor.getTaille()} vs ${rollData.opponent.actor.getTaille()} `
-  }
-  getCheckboxValue(rollData) {
-    return this.getTailleDiff(rollData)
-  }
-}

module/roll/roll-part-empoignade.mjs

@@ -24,6 +24,7 @@ export class RollPartEmpoignade extends RollPartCheckbox {
       !RdDEmpoignade.isEmpoignadeEnCours(rollData.active.actor)
   }
   
+
   getCheckboxIcon(rollData) { return `<img src="${RDD_CONFIG.icons.empoignade}">` }
   getCheckboxLabel(rollData) { return "vs. empoigneur" }
   getCheckboxValue(rollData) { return 4 }

module/roll/roll-part-enctotal.mjs

@@ -1,4 +1,3 @@
-import { RDD_CONFIG } from "../constants.js"
 import { RdDItemCompetence } from "../item-competence.js"
 import { RdDCarac } from "../rdd-carac.js"
 import { RollPartCheckbox } from "./roll-part-checkbox.mjs"
@@ -26,7 +25,7 @@ export class RollPartEncTotal extends RollPartCheckbox {
     })
   }
 
-  getCheckboxIcon(rollData) { return `<img src="${RDD_CONFIG.icons.surenc}">` }
+  getCheckboxIcon(rollData) { return '<i class="fa-solid fa-weight-hanging"></i>' }
   getCheckboxLabel(rollData) { return "Enc. total" }
   getCheckboxValue(rollData) { return - rollData.active.actor.getEncTotal() }
 }

module/roll/roll-part-meditation.mjs

@@ -74,7 +74,7 @@ export class RollPartMeditation extends RollPartSelect {
 
   getAjustements(rollData) {
     const malus = this.getMalusEchecs(rollData)
-    const malusEchecs = malus == 0 ? [] : [{ label: "Méditation", value: malus }]
+    const malusEchecs = malusEchecs == 0 ? [] : [{ label: "Méditation", value: malus }]
     const malusConditions = { label: "Conditions", value: this.getMalusConditions(rollData) }
     return [malusConditions, ...malusEchecs]
   }

module/roll/roll-part-surenc.mjs

@@ -1,4 +1,3 @@
-import { RDD_CONFIG } from "../constants.js"
 import { RdDCarac } from "../rdd-carac.js"
 import { RollPartCheckbox } from "./roll-part-checkbox.mjs"
 
@@ -11,7 +10,7 @@ export class RollPartSurEnc extends RollPartCheckbox {
   visible(rollData) {
     return RdDCarac.isActionPhysique(rollData.current.carac.key) && rollData.active.actor.isSurenc()
   }
-  getCheckboxIcon(rollData) { return `<img src="${RDD_CONFIG.icons.surenc}">` }
+  getCheckboxIcon(rollData) { return '<i class="fa-solid fa-weight-hanging"></i>' }
   getCheckboxLabel(rollData) { return "Sur-enc." }
   getCheckboxValue(rollData) { return rollData.active.actor.computeMalusSurEncombrement() }
 }

module/settings/status-effects.js

@@ -14,14 +14,13 @@ export const STATUSES = {
   StatusBleeding: 'bleeding',
   StatusDead: 'dead',
   StatusDemiReve: 'demi-reve',
-  StatusSurEnc: 'sur-encombrement',
   StatusForceWeak: 'force insuffisante',
 }
 
 export const forceWeakStatusEffect = { rdd: true, id: STATUSES.StatusForceWeak, name: 'EFFECT.StatusForceWeak', img: RDD_CONFIG.icons.forceWeak };
-export const surEncEffect = { rdd: true, id: STATUSES.StatusSurEnc, name: 'EFFECT.StatusSurEnc', img: RDD_CONFIG.icons.surenc };
-export const demiReveStatusEffect = { rdd: true, id: STATUSES.StatusDemiReve, name: 'EFFECT.StatusDemiReve', img: RDD_CONFIG.icons.demiReve };
-
+export const demiReveStatusEffect = {
+  rdd: true, id: STATUSES.StatusDemiReve, name: 'EFFECT.StatusDemiReve', img: RDD_CONFIG.icons.demiReve
+};
 const rddStatusEffects = [
   { rdd: true, id: STATUSES.StatusGrappling, name: 'EFFECT.StatusGrappling', img: RDD_CONFIG.icons.empoignade },
   { rdd: true, id: STATUSES.StatusGrappled, tint: '#d5633d', name: 'EFFECT.StatusGrappled', img: RDD_CONFIG.icons.empoignade },
@@ -37,8 +36,7 @@ const rddStatusEffects = [
   { rdd: true, id: STATUSES.StatusBleeding, name: 'EFFECT.StatusBleeding', img: 'icons/svg/blood.svg' },
   { rdd: true, id: STATUSES.StatusDead, name: 'EFFECT.StatusDead', img: 'icons/svg/skull.svg' },
   demiReveStatusEffect,
-  forceWeakStatusEffect,
-  surEncEffect,
+  forceWeakStatusEffect
 ];
 
 const statusDemiSurprise = new Set([STATUSES.StatusStunned, STATUSES.StatusProne, STATUSES.StatusRestrained, STATUSES.StatusForceWeak])
@@ -138,7 +136,7 @@ export class StatusEffects extends FormApplication {
   }
 
   static prepareActiveEffect(effectId) {
-    let status = rddStatusEffects.find(it => it.statuses.has(effectId))
+    let status = rddStatusEffects.find(it => it.id == effectId)
     if (status) {
       status = foundry.utils.duplicate(status)
       status.statuses = new Set([effectId])

templates/actor/carac-main.hbs

@@ -4,7 +4,7 @@
   <li class="caracteristique flexrow list-item {{#if carac.isLevelUp}}xp-level-up{{/if}}" data-attribute="{{key}}">
     {{#if (eq key 'taille')}}
       <span class="carac-label" name="system.carac.{{key}}.label">{{carac.label}}</span>
-      <input class="carac-value" type="number" name="carac.{{key}}" value="{{carac.value}}" data-dtype="number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
+      <input class="carac-value" type="number" name="system.carac.{{key}}.value" value="{{carac.value}}" data-dtype="number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
       <label class="carac-xp"/>
     {{else}}
     {{#if (actor-default @root.type 'carac' key 'derivee')}}
@@ -23,7 +23,7 @@
       {{else}}
         <span class="carac-label" name="system.carac.{{key}}.label"><a class="roll-carac" data-carac-name={{key}}>{{carac.label}}</a></span>
       {{/if}}
-      <input class="carac-value" type="number" name="carac.{{key}}" value="{{carac.value}}" data-dtype="number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
+      <input class="carac-value" type="number" name="system.carac.{{key}}.value" value="{{carac.value}}" data-dtype="number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
       <span class="carac-xp">
         <input class="carac-xp" type="number" name="system.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number" 
           data-tooltip="Vous devez acquérir {{carac.xpNext}} points d'Experience pour augmenter votre {{carac.label}}"