Minot fixes

module/actor/base-actor-reve.js

@@ -458,7 +458,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
     token = token ?? RdDUtility.getSelectedToken(this)
     const compToUse = RdDItemArme.getCompetenceArme(arme, categorieArme)
     if (!RdDItemArme.isUtilisable(arme)) {
-      ui.notifications.warn(`Arme inutilisable: ${arme.name} a une résistance de 0 ou moins`)
+      ui.notifications.warn(`Arme inutilisable: ${arme.name} non équipée ou avec une résistance de 0 ou moins`)
       return
     }
     if (!Targets.hasTargets()) {

module/actor/base-actor-sheet.js

@@ -7,6 +7,7 @@ import { ITEM_TYPES } from "../constants.js";
 import { RdDItem } from "../item.js";
 import { RdDTextEditor } from "../apps/rdd-text-roll-editor.js";
 import { ItemAction } from "../item/item-actions.js";
+import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
 
 /* -------------------------------------------- */
 /**
@@ -55,7 +56,10 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
     this._appliquerRechercheObjets(formData.conteneurs, formData.inventaires);
     formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
     formData.competences.filter(it => it.type == ITEM_TYPES.competencecreature)
-      .forEach(it => it.isdommages = it.isDommages())
+      .forEach(it => {
+        const competenceCreature = new RdDItemCompetenceCreature(it.toObject(), { parent: it.parent });
+        it.isdommages = competenceCreature.isDommages();
+      })
 
     return formData;
   }

templates/actor/combat.hbs

@@ -7,9 +7,7 @@
     <span class="initiative-value">Initiative</span>
   </li>
   {{#each combat as |action key|}}
-  <li class="item flexrow list-item"
+  <li class="item flexrow list-item" data-item-id="{{action._id}}" data-arme-name="{{action.arme.name}}"
-      data-item-id="{{action._id}}"
-      data-arme-name="{{action.arme.name}}"
     data-competence-name="{{action.comp.name}}"
     data-tooltip="{{action.name}}: niveau {{plusMoins action.comp.system.niveau}}">
     <span class="list-item-label flexrow">
@@ -26,8 +24,7 @@
     <span class="competence-value">{{plusMoins action.dommagesArme}}</span>
     <span class="competence-value"></span>
     <span class="initiative-value">
-      <a class="roll-init-arme" 
+      <a class="roll-init-arme" data-tooltip="{{action.name}}: initiative {{action.initiative}}">
-          data-tooltip="{{action.name}}: initiative {{action.initiative}}">
         {{action.initiative}}
       </a>
     </span>
@@ -57,8 +54,7 @@
     <span class="item-controls"></span>
   </li>
   {{#each empoignades as |emp key|}}
-  <li class="item flexrow list-item"
+  <li class="item flexrow list-item" data-item-id="{{emp._id}}" data-arme-name="{{emp.name}}"
-      data-item-id="{{emp._id}}" data-arme-name="{{emp.name}}"
     data-tooltip="{{emp.name}}: niveau {{plusMoins emp.system.pointsemp}}">
     <a class="flex-grow-3 action-empoignade">
       <img class="sheet-competence-img" src="{{emp.img}}" />