Fix double effet créatures

module/actor-creature-sheet.js

@@ -12,14 +12,14 @@ import { RdDActorSheet } from "./actor-sheet.js";
 export class RdDActorCreatureSheet extends RdDActorSheet {
 
   /** @override */
-	static get defaultOptions() {
+  static get defaultOptions() {
-	  return mergeObject(super.defaultOptions, {
+    return mergeObject(super.defaultOptions, {
-  	  classes: ["rdd", "sheet", "actor"],
+      classes: ["rdd", "sheet", "actor"],
-  	  template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html",
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html",
       width: 640,
       height: 720,
-      tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac"}],
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
-      dragDrop: [{dragSelector: ".item-list .item", dropSelector: null}]
+      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }]
     });
   }
 
@@ -41,7 +41,7 @@ export class RdDActorCreatureSheet extends RdDActorSheet {
 
     // Compute current carac sum
     let sum = 0;
-    Object.values(data.data.carac).forEach(carac => { if (!carac.derivee) { sum += parseInt(carac.value) } } );
+    Object.values(data.data.carac).forEach(carac => { if (!carac.derivee) { sum += parseInt(carac.value) } });
     data.data.caracSum = sum;
 
     data.data.carac.taille.isTaille = true; // To avoid button link;
@@ -52,19 +52,19 @@ export class RdDActorCreatureSheet extends RdDActorSheet {
     data.data.competencecreature = data.itemsByType["competencecreature"];
 
     this.actor.computeEncombrementTotalEtMalusArmure();
-    RdDUtility.filterItemsPerTypeForSheet(data );
+    RdDUtility.filterItemsPerTypeForSheet(data);
-    RdDUtility.buildArbreDeConteneur( this, data );
+    RdDUtility.buildArbreDeConteneur(this, data);
     data.data.encTotal = this.actor.encTotal;
     data.data.isGM = game.user.isGM;
 
-    console.log("Creature : ", this.objetVersConteneur , data);
+    console.log("Creature : ", this.objetVersConteneur, data);
 
     return data;
   }
 
   /* -------------------------------------------- */
   /** @override */
-	activateListeners(html) {
+  activateListeners(html) {
     super.activateListeners(html);
 
     HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM);
@@ -72,101 +72,25 @@ export class RdDActorCreatureSheet extends RdDActorSheet {
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
 
-    // Update Inventory Item
-    html.find('.item-edit').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      const item = this.actor.getOwnedItem(li.data("itemId"));
-      item.sheet.render(true);
-    });
-
-    // Delete Inventory Item
-    html.find('.item-delete').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      this.actor.deleteOwnedItem(li.data("itemId"));
-      li.slideUp(200, () => this.render(false));
-    });
-
-    // Blessure control
-    html.find('.blessure-control').click(ev => {
-      const li   = $(ev.currentTarget).parents(".item");
-      let btype  = li.data("blessure-type");
-      let index  = li.data('blessure-index');
-      let active = $(ev.currentTarget).data('blessure-active');
-      //console.log(btype, index, active);
-      this.actor.manageBlessureFromSheet(btype, index, active).then( this.render(true) );
-    });
-
-    // Blessure data
-    html.find('.blessures-soins').change(ev => {
-      const li   = $(ev.currentTarget).parents(".item");
-      let btype  = li.data('blessure-type');
-      let index  = li.data('blessure-index');
-      let psoins    = li.find('input[name=premiers_soins]').val();
-      let pcomplets = li.find('input[name=soins_complets]').val();
-      let jours     = li.find('input[name=jours]').val();
-      let loc       = li.find('input[name=localisation]').val();
-      //console.log(btype, index, psoins, pcomplets, jours, loc);
-      this.actor.setDataBlessureFromSheet(btype, index, psoins, pcomplets, jours, loc).then( this.render(true) );
-    });
-
-    // Roll Carac
-    html.find('.carac-label a').click((event) => {
-      let caracName = event.currentTarget.attributes.name.value;
-      this.actor.rollCarac( caracName.toLowerCase() );
-    });
-    
     // On competence change
     html.find('.creature-carac').change((event) => {
-        let compName = event.currentTarget.attributes.compname.value;
+      let compName = event.currentTarget.attributes.compname.value;
-        this.actor.updateCreatureCompetence( compName, "carac_value", parseInt(event.target.value) );
+      this.actor.updateCreatureCompetence(compName, "carac_value", parseInt(event.target.value));
-      } );    
+    });
     html.find('.creature-niveau').change((event) => {
-        let compName = event.currentTarget.attributes.compname.value;
+      let compName = event.currentTarget.attributes.compname.value;
-        this.actor.updateCreatureCompetence( compName, "niveau", parseInt(event.target.value) );
+      this.actor.updateCreatureCompetence(compName, "niveau", parseInt(event.target.value));
-      } );    
-      html.find('.creature-dommages').change((event) => {
-        let compName = event.currentTarget.attributes.compname.value;
-        this.actor.updateCreatureCompetence( compName, "dommages", parseInt(event.target.value) );
-      } );    
-  
-    // Roll Skill
-    html.find('.competence-label a').click((event) => {
-      let compName = event.currentTarget.text;
-      this.actor.rollCompetenceCreature( compName );
     });
-
+    html.find('.creature-dommages').change((event) => {
-    html.find('#vie-plus').click((event) => {
+      let compName = event.currentTarget.attributes.compname.value;
-      this.actor.santeIncDec("vie", 1);
+      this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
-      this.render(true);
-    });
-    html.find('#vie-moins').click((event) => {
-      this.actor.santeIncDec("vie", -1);
-      this.render(true);
-    });
-    html.find('#endurance-plus').click((event) => {
-      this.actor.santeIncDec("endurance", 1);
-      this.render(true);
-    });
-    html.find('#endurance-moins').click((event) => {
-      this.actor.santeIncDec("endurance", -1);
-      this.render(true);
-    });
-
-    html.find('#encaisser-direct').click(ev => {
-      this.actor.encaisser();
-    });
-
-    html.find('#remise-a-neuf').click(ev => {
-      if (game.user.isGM) {
-        this.actor.remiseANeuf();
-      }
     });
   }
 
   /* -------------------------------------------- */
 
   /** @override */
-  setPosition(options={}) {
+  setPosition(options = {}) {
     const position = super.setPosition(options);
     const sheetBody = this.element.find(".sheet-body");
     const bodyHeight = position.height - 192;

module/actor-entite-sheet.js

@@ -96,7 +96,7 @@ export class RdDActorEntiteSheet extends ActorSheet {
     // Roll Skill
     html.find('.competence-label a').click((event) => {
       let compName = event.currentTarget.text;
-      this.actor.rollCompetenceCreature( compName );
+      this.actor.rollCompetence( compName );
     });
 
     html.find('#endurance-plus').click((event) => {
@@ -112,7 +112,7 @@ export class RdDActorEntiteSheet extends ActorSheet {
       this.actor.encaisser();
     });
 
-    html.find('#remise-a-neuf').click(ev => {
+    html.find('.remise-a-neuf').click(ev => {
       if (game.user.isGM) {
         this.actor.remiseANeuf();
       }

module/actor-sheet.js

@@ -207,9 +207,10 @@ export class RdDActorSheet extends ActorSheet {
       this.actor.encaisser();
     });
 
-    html.find('#remise-a-neuf').click(ev => {
+    html.find('.remise-a-neuf').click(ev => {
       if (game.user.isGM) {
         this.actor.remiseANeuf();
+        ev.preventDefault();
       }
     });
     html.find('#creer-tache').click(ev => {

module/actor.js

@@ -1755,6 +1755,11 @@ export class RdDActor extends Actor {
     let rollData = { competence: this.getCompetence(name) }
     
     if (rollData.competence.type == 'competencecreature') {
+      if (rollData.competence.data.iscombat) {
+        const arme = RdDItemCompetenceCreature.toArme(competence);
+        RdDCombat.createUsingTarget(this).attaque(competence, arme);
+        return;
+      }
       // Fake competence pour créature
       RdDItemCompetenceCreature.setRollDataCreature(rollData);
     }
@@ -2125,19 +2130,6 @@ export class RdDActor extends Actor {
     this.currentTMR.render(true);
   }
 
-
-  /* -------------------------------------------- */
-  async rollCompetenceCreature(compName) {
-    const competence = this.getCompetence(compName);
-    if (competence.type == 'competencecreature' && competence.data.iscombat) {
-      const arme = RdDItemCompetenceCreature.toArme(competence);
-      RdDCombat.createUsingTarget(this).attaque(competence, arme);
-    }
-    else {
-      this.rollCompetence(competence.name);
-    }
-  }
-
   /* -------------------------------------------- */
   rollArme(compName, armeName = undefined) {
     let arme = armeName ? this.data.items.find(item => item.name == armeName && RdDItemArme.isArme(item)) : undefined;

templates/actor-creature-sheet.html

@@ -10,7 +10,7 @@
       <div class="flexrow flex-group-center flex-actions-bar">
         <div>
           <span id="encaisser-direct"><a title="Encaisser des dommages"><img class="button-img" src="icons/svg/bones.svg" alt="Encaisser des dommages"/></a></span>
-          <span id="remise-a-neuf" class="gm-only"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
+          <span class="gm-only remise-a-neuf"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
         </div>
       </div>
       <div class="flexrow">

templates/actor-entite-sheet.html

@@ -10,7 +10,7 @@
       <div class="flexrow flex-group-center flex-actions-bar">
         <div>
           <span id="encaisser-direct"><a title="Encaisser des dommages"><img class="button-img" src="icons/svg/bones.svg" alt="Encaisser des dommages"/></a></span>
-          <span id="remise-a-neuf" class="gm-only"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
+          <span class="gm-only remise-a-neuf"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
         </div>
       </div>
     </div>

templates/actor-humanoide-sheet.html

@@ -10,7 +10,7 @@
       <div class="flexrow flex-group-center  flex-actions-bar">
         <div>
           <span id="encaisser-direct"><a title="Encaisser des dommages"><img class="button-img" src="icons/svg/bones.svg" alt="Encaisser des dommages"/></a></span>
-          <span id="remise-a-neuf" class="gm-only"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
+          <span class="gm-only remise-a-neuf"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
         </div>
       </div>
       <div class="flexrow">

templates/actor-sheet.html

@@ -57,7 +57,7 @@
           <div class="flex-group-center  flex-actions-bar">
             <div>
               <span id="encaisser-direct"><a title="Encaisser des dommages"><img class="button-img" src="icons/svg/bones.svg" alt="Encaisser des dommages"/></a></span>
-              <span id="remise-a-neuf" class="gm-only"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
+              <span class="gm-only remise-a-neuf"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
               <span id="dormir-une-heure"><a title="Dormir une heure"><img class="button-img" src="icons/svg/sleep.svg" alt="Dormir une heure"/></a></span>
               <span id="dormir-chateau-dormant"><a title="Chateau Dormant"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/icons/heures/hd12.svg" alt="Chateau Dormant"/></a></span>
               <span id="monte-tmr"><a title="Montée dans les Terres M&eacute;dianes !"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-normal.svg" alt="Montée dans les Terres M&eacute;dianes !"/></a></span>