Gestion attaques v2 et initiative

module/item/arme.js

@@ -21,6 +21,7 @@ const nomCategorieParade = {
 export const ATTAQUE_TYPE = {
   UNE_MAIN: '(1 main)',
   DEUX_MAINS: '(2 mains)',
+  CORPS_A_CORPS: '(corps à corps)',
   COMPETENCE: 'competence',
   TIR: '(tir)',
   LANCER: '(lancer)'
@@ -244,7 +245,7 @@ export class RdDItemArme extends RdDItem {
   }
 
   isAttaque() {
-    return this.system.resistance > 0 || this.system.portee_courte > 0
+    return this.system.resistance > 0 || (this.system.tir != '' && this.system.portee_courte > 0)
   }
 
   static corpsACorps(actor) {
@@ -256,7 +257,7 @@ export class RdDItemArme extends RdDItem {
       type: ITEM_TYPES.arme,
       img: competence.img,
       system: {
-        initiative: RdDInitiative.calculInitiative(competence.system.niveau, melee),
+        initiative: RdDInitiative.getRollInitiative(melee, competence.system.niveau),
         equipe: true,
         rapide: true,
         force: 0,
@@ -273,10 +274,10 @@ export class RdDItemArme extends RdDItem {
     })
   }
 
-  static mainsNues(actor) {
-    const mainsNues = RdDItemArme.corpsACorps(actor)
-    mainsNues.name = 'Mains nues'
-    return mainsNues;
+  static pugilat(actor) {
+    const pugilat = RdDItemArme.corpsACorps(actor)
+    pugilat.name = 'Mains nues'
+    return pugilat;
   }
 
   static empoignade(actor) {

module/item/mapping-creature-arme.mjs

@@ -3,7 +3,6 @@ import { RdDInitiative } from "../initiative.mjs";
 
 export class MappingCreatureArme {
 
-
   /* -------------------------------------------- */
   static setRollDataCreature(rollData) {
     const code = Grammar.toLowerCaseNoAccentNoSpace(rollData.competence.name);
@@ -26,7 +25,7 @@ export class MappingCreatureArme {
           competence: item.name,
           cac: categorieAttaque == "naturelle" ? "naturelle" : "",
           niveau: item.system.niveau,
-          initiative: RdDInitiative.calculInitiative(item.system.niveau, item.system.carac_value),
+          initiative: RdDInitiative.getRollInitiative(item.system.carac_value, item.system.niveau),
           equipe: true,
           resistance: 100,
           dommagesReels: item.system.dommages,