Ajout des mutations

Fix calcul defense
2024-02-24 15:55:29 +01:00 · 2024-02-24 15:54:47 +01:00 · 2024-02-15 11:47:15 +01:00 · 2024-02-08 12:51:41 +01:00 · 2023-12-28 18:40:46 +01:00 · 2023-12-21 21:02:11 +01:00
35 changed files with 2271 additions and 1549 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,14 @@
+.vscode/settings.json
+.idea
+.history
+todo.md
+/.vscode
+/ignored/
+/node_modules/
+/jsconfig.json
+/package.json
+/package-lock.json
+/packs/*/
+/packs/*/CURRENT
+/packs/*/LOG
+/packs/*/LOCK
--- a/_deprecated/aides-de-jeu.SAVED
+++ b/_deprecated/aides-de-jeu.SAVED
--- a/_deprecated/armes.db
+++ b/_deprecated/armes.db
--- a/_deprecated/artefacts.db
+++ b/_deprecated/artefacts.db
--- a/_deprecated/competences-creatures.db
+++ b/_deprecated/competences-creatures.db
@@ -0,0 +1,8 @@
+{"name":"Mêlée","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">M&ecirc;l&eacute;e repr&eacute;sente la ma&icirc;trise martiale et l&rsquo;habilet&eacute; au combat rapproch&eacute;, avec ou sans arme. Plus cette Comp&eacute;tence est &eacute;lev&eacute;e, plus le personnage est &agrave; m&ecirc;me de passer la garde de ses adversaires en combat au corps-&agrave;-corps.</p>","niveau":0,"attribut1":"pui","attribut2":"none","attribut3":"none","doublebonus":false,"predilections":[{"name":"Armes à une main (Puissance)","used":false,"description":"Pour utiliser des armes comme l’épée courte, la hache, une arme improvisée à une main, etc.\n\n"},{"name":"Armes à deux mains (Puissance)","used":false,"description":"Pour utiliser des armes comme la hache nordaine ou l’épée arthurienne, une arme improvisée à deux mains, etc."},{"name":"Mains nues (Puissance)","used":false,"description":"Pour se battre à mains nues, qu’il s’agisse d’une bagarre ou d’un pugilat codifié."}],"predilections[0]":["Nouvelle prédilection",""]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.VM3TSQYxseYdCFjv"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620807186,"modifiedTime":1671645643952,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"0nhTxujlIUB63Aqt"}
+{"name":"Discrétion","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Discr&eacute;tion repr&eacute;sente la capacit&eacute; &agrave; ne pas se faire remarquer, qu&rsquo;il s&rsquo;agisse de se fondre dans la foule, de prendre l'apparence de quelqu&rsquo;un d&rsquo;autre, de se cacher dans l&rsquo;ombre ou encore de se d&eacute;placer en silence. Plus cette Comp&eacute;tence est &eacute;lev&eacute;e, plus le personnage est apte &agrave; passer<br>physiquement inaper&ccedil;u.</p>","niveau":0,"attribut1":"adr","attribut2":"tre","attribut3":"none","doublebonus":false,"predilections":[{"name":"Cacher et se cacher (Trempe)","used":false,"description":"Pour se fondre dans le décor. Le personnage adopte un comportement décontracté qui le fait passer inaperçu, il trouve une cachette, etc. Permet également de dissimuler un objet sur soi (qu’il s’agisse d’une bourse, d’une arme, d’un tatouage, etc.).\n\n"},{"name":"Déguisement (Trempe)","used":false,"description":"Pour dissimuler son identité, altérer ses traits ou prendre ceux d'une personne spécifique."},{"name":"Déplacement silencieux (Adresse)","used":false,"description":"Pour se déplacer sans éveiller l’attention lorsqu’on ne peut être vu (dans l’obscurité ou à couvert, lorsqu’un garde est derrière une porte ou un angle\nde mur, etc.)."}]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.gBmAdYl4rhbY89ee"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620807186,"modifiedTime":1671645638028,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"J4x6SP6l6njOrZn3"}
+{"name":"Armes à distance","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Repr&eacute;sente l&rsquo;habilet&eacute; au lancer ou avec une arme &agrave; distance. Plus cette Comp&eacute;tence est &eacute;lev&eacute;e, plus les tirs du personnage sont pr&eacute;cis.&nbsp;</p>\n<p style=\"text-align: justify;\">&nbsp;</p>\n<p style=\"text-align: justify;\">&nbsp;</p>\n<p style=\"text-align: justify;\">&nbsp;</p>","niveau":0,"attribut1":"adr","attribut2":"none","attribut3":"none","doublebonus":false,"predilections":[{"name":"Armes à feu (Adresse)  ","used":false,"description":"Pour des armes comme le lance-feu. "},{"name":"Armes à projectile (Adresse)","used":false,"description":"Pour des armes comme l'arc, la fronde, l'arbalète, etc."},{"name":"Armes de jet (Adresse)","used":false,"description":"Pour des armes comme la dague de lancer, la bombe à mèche, le javelot, les projectiles improvisés, etc. "}],"predilections[0]":["Nouvelle prédilection",""],"predilections[1]":["Nouvelle prédilection",""],"predilections[2]":["Nouvelle prédilection",""]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.MLMlscPBb1ZCPTRl"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666619959067,"modifiedTime":1671645649970,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"UfVYwmPFwy2T7jZM"}
+{"name":"Survie","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Survie repr&eacute;sente la capacit&eacute; &agrave; trouver de quoi subsister dans la nature, &agrave; &eacute;tablir un campement, &agrave; faire du feu avec les moyens du bord, &agrave; se rep&eacute;rer. Avec Clairvoyance, cette Comp&eacute;tence permet de trouver des baies comestibles, de poser tous les types de pi&egrave;ges, de pister, de trouver le meilleur emplacement pour un campement. Avec Adresse, elle permet de chasser, de p&ecirc;cher, de faire du feu dans des conditions difficiles et de confectionner les pi&egrave;ges les plus simples (collets, fosses, etc.).</p>\n<p style=\"text-align: justify;\">Les Pr&eacute;dilections repr&eacute;sentent quant &agrave; elles les diff&eacute;rents milieux ou climats.</p>","niveau":0,"attribut1":"adr","attribut2":"cla","attribut3":"none","doublebonus":false,"predilections":[{"name":"Fleuve, Forêt, Hiver, Mer, Montagne, Souterrains, etc. (Adresse ou Clairvoyance)","used":false,"description":"En fonction de chaque milieu, la Prédilection permet d’y évoluer de la façon la plus adaptée."}],"predilections[0]":["Nouvelle prédilection",""],"predilections[1]":["Nouvelle prédilection",""],"predilections[2]":["Nouvelle prédilection",""],"predilections[3]":["Nouvelle prédilection",""],"predilections[4]":["Nouvelle prédilection",""],"predilections[5]":["Nouvelle prédilection",""],"predilections[6]":["Nouvelle prédilection",""],"predilections[7]":["Nouvelle prédilection",""],"predilections[8]":["Nouvelle prédilection",""],"predilections[9]":["Nouvelle prédilection",""],"predilections[10]":["Nouvelle prédilection",""],"predilections[11]":["Nouvelle prédilection",""]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.yI1zY5k8mAdx9wHK"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620807186,"modifiedTime":1671645647913,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"Vpth0atT9qS6VqUB"}
+{"name":"Perception","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Perception repr&eacute;sente &agrave; la fois la conscience de son environnement, la capacit&eacute; &agrave; remarquer les d&eacute;tails incongrus, et l&rsquo;aptitude &agrave; lire le langage corporel. Plus cette Comp&eacute;tence est &eacute;lev&eacute;e, plus les sens du personnage sont aff&ucirc;t&eacute;s.</p>","niveau":0,"attribut1":"cla","attribut2":"none","attribut3":"none","doublebonus":false,"predilections":[{"name":"Empathie (Clairvoyance)","used":false,"description":"Pour déchiffrer, par son attitude ou ses gestes, l’opinion ou la sincérité d’un interlocuteur, pour deviner les choses exprimées à mots couverts, pour comprendre quelqu’un qui s’exprime par signes."},{"name":"Recherche (Clairvoyance)","used":false,"description":"Pour remarquer les détails les plus infimes, pour trouver un objet ou un passage dissimulés."},{"name":"Vigilance (Clairvoyance) ","used":false,"description":"Pour détecter un personnage ou un animal qui se cache, pour remarquer une menace potentielle (piège, terrain dangereux, tireur embusqué), pour rester attentif lors d’un tour de garde."}],"predilections[0]":["Nouvelle prédilection",""],"predilections[1]":["Nouvelle prédilection",""],"predilections[2]":["Nouvelle prédilection",""],"predilections[3]":["Nouvelle prédilection",""],"predilections[4]":["Nouvelle prédilection",""],"predilections[5]":["Nouvelle prédilection",""]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.7p2MTjttE4fllp9e"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620807186,"modifiedTime":1671645646434,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"cunjmZoXNhSX5qdV"}
+{"name":"Coercition","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Coercition repr&eacute;sente la capacit&eacute; de forcer quelqu&rsquo;un &agrave; agir contre son gr&eacute;, &agrave; r&eacute;v&eacute;ler des secrets ou &agrave; ob&eacute;ir aveugl&eacute;ment. Plus cette Comp&eacute;tence est &eacute;lev&eacute;e, plus le personnage sait se montrer intimidant et jouer sur l&rsquo;autorit&eacute; qu&rsquo;il inspire pour briser la volont&eacute; de ses interlocuteurs.</p>","niveau":0,"attribut1":"pre","attribut2":"none","attribut3":"none","doublebonus":false,"predilections":[{"name":"Commandement (Présence) ","used":false,"description":"Pour donner des ordres auxquels on obéira sans poser de question. "},{"name":"Interrogatoire (Présence)","used":false,"description":"Pour forcer quelqu'un à révéler des informations, que ce soit par la torture ou à l'aide de techniques de manipulation plus subtiles. "},{"name":"Intimidation (Présence)","used":false,"description":"Pour faire peur, pour convaincre quelqu'un de renoncer à se battre, pour donner l'impression d'être dangereux. "}]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.15IDGG6JoZnRCQtY"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620317429,"modifiedTime":1671645635525,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"lchi2ulzWdm8j1l7"}
+{"name":"Nage","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Nage repr&eacute;sente la vitesse (Adresse), mais aussi l&rsquo;endurance du nageur (Puissance). La natation est une Comp&eacute;tence assez rare dans le monde de Hawkmoon. Un personnage qui n&rsquo;a plus pied et ne sait pas nager commence &agrave; se noyer au bout d&rsquo;un tour de jeu (soit six secondes). Reportez-vous &agrave; la r&egrave;gle de noyade p. 214.</p>\n<p style=\"text-align: justify;\">&nbsp;</p>\n<h3 style=\"text-align: justify;\"><strong>Pr&eacute;dilections/Ma&icirc;trises</strong></h3>\n<ul>\n<li style=\"text-align: justify;\"><strong>Au choix du joueur et du MJ.</strong></li>\n</ul>","niveau":0,"attribut1":"adr","attribut2":"pui","attribut3":"none","doublebonus":false,"predilections":[],"predilections[0]":["Nouvelle prédilection",""],"predilections[1]":["Nouvelle prédilection",""],"predilections[2]":["Nouvelle prédilection",""],"predilections[3]":["Nouvelle prédilection",""]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.Dw7q0dGCoaBy1Smu"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620807186,"modifiedTime":1671645639961,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"pyeEZFo46NTnV8WK"}
+{"name":"Mouvements","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Mouvements indique la capacit&eacute; du personnage &agrave; se d&eacute;placer rapidement et longtemps. Cette Comp&eacute;tence repr&eacute;sente aussi bien la souplesse et la vivacit&eacute; des gestes que l&rsquo;endurance physique et la r&eacute;sistance &agrave; l&rsquo;effort. Plus cette Comp&eacute;tence est &eacute;lev&eacute;e, plus le personnage est en forme et peut courir, grimper ou sauter longtemps et rapidement sans se fatiguer.</p>","niveau":0,"attribut1":"adr","attribut2":"pui","attribut3":"none","doublebonus":false,"predilections":[{"name":"Acrobaties (Adresse)","used":true,"description":"Pour faire des figures acrobatiques, sauter en hauteur ou en longueur, jongler, ou encore pour rattraper un objet fragile sans l’abîmer (ou un ustensile dangereux sans se blesser).\n\n"},{"name":"Course (Puissance)","used":false,"description":"Pour sprinter ou pour tenir la distance dans une course d’endurance."},{"name":"Escalade (Puissance) ","used":false,"description":"Pour escalader murs, arbres, etc. Sert également à avancer en étant suspendu à une corde horizontale."}],"predilections[0]":["Nouvelle prédilection",""],"predilections[1]":["Nouvelle prédilection",""],"predilections[2]":["Nouvelle prédilection",""]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.bP7pPSCekexUEf7m"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620807186,"modifiedTime":1671645642114,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"tFU5yISK6spdNWco"}
--- a/_deprecated/competences.db
+++ b/_deprecated/competences.db
--- a/_deprecated/equipement.db
+++ b/_deprecated/equipement.db
--- a/_deprecated/historiques.db
+++ b/_deprecated/historiques.db
--- a/_deprecated/profils.db
+++ b/_deprecated/profils.db
--- a/_deprecated/protections.db
+++ b/_deprecated/protections.db
--- a/_deprecated/tables.db
+++ b/_deprecated/tables.db
--- a/_deprecated/talents-cellule.db
+++ b/_deprecated/talents-cellule.db
--- a/_deprecated/talents.db
+++ b/_deprecated/talents.db
--- a/assets/icons/mutation.webp
+++ b/assets/icons/mutation.webp
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -1,25 +1,25 @@
 {
-  "ACTOR": {
-    "TypePersonnage": "Personnage",
-    "TypeCellule": "Cellule",
-    "TypeCreature": "Créature"
+  "TYPES": {
+    "Actor": {
+      "personnage": "Personnage",
+      "cellule": "Cellule",
+      "creature": "Créature"
+    },
+    "Item": {
+      "artefact": "Artefact",
+      "arme": "Arme",
+      "talent": "Talent",
+      "historique": "Historique",
+      "profil": "Profil",
+      "competence": "Compétence",
+      "protection": "Protection",
+      "monnaie": "Monnaie",
+      "equipement": "Equipement",
+      "ressource": "Ressource",
+      "contact": "Contact",
+      "mutation": "Mutation"    
+    }
  },
-
-  "ITEM": {
-    "TypeArtefact": "Artefact",
-    "TypeArme": "Arme",
-    "TypeTalent": "Talent",
-    "TypeHistorique": "Historique",
-    "TypeProfil": "Profil",
-    "TypeCompetence": "Compétence",
-    "TypeProtection": "Protection",
-    "TypeMonnaie": "Monnaie",
-    "TypeEquipement": "Equipement",
-    "TypeRessource": "Ressource", 
-    "TypeContact": "Contact"
-
-  },
-
  "HAWKMOON": {
    "ui": {
      "editContact": "Modifier le contact",
--- a/modules/hawkmoon-actor-sheet.js
+++ b/modules/hawkmoon-actor-sheet.js
@@ -44,14 +44,17 @@ export class HawkmoonActorSheet extends ActorSheet {
      protections: duplicate(this.actor.getArmors()),
      historiques: duplicate(this.actor.getHistoriques() || []),
      talents: duplicate(this.actor.getTalents() || []),
+      mutations: duplicate(this.actor.getMutations() || []),
      talentsCell: this.getCelluleTalents(),
      profils: duplicate(this.actor.getProfils()  || []),
      combat: this.actor.getCombatValues(),      
      equipements: duplicate(this.actor.getEquipments()),
      artefacts: duplicate(this.actor.getArtefacts()),
-      monnaies: duplicate(this.actor.getMonnaies()),
      richesse: this.actor.computeRichesse(),
+      coupDevastateur: this.actor.items.find(it => it.type =="talent" && it.name.toLowerCase() == "coup devastateur" && !it.system.used),
      valeurEquipement: this.actor.computeValeurEquipement(),
+      nbCombativite: this.actor.system.sante.nbcombativite,
+      combativiteList: HawkmoonUtility.getCombativiteList(this.actor.system.sante.nbcombativite),
      initiative: this.actor.getFlag("world", "last-initiative") || -1,
      description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),
      habitat: await TextEditor.enrichHTML(this.object.system.biodata.habitat, {async: true}),
@@ -124,7 +127,7 @@ export class HawkmoonActorSheet extends ActorSheet {
    })

    html.find('.roll-initiative').click((event) => {
-      this.actor.rollAttribut("pre", true)
+      this.actor.rollAttribut("adr", true)
    })
    
    html.find('.roll-attribut').click((event) => {
--- a/modules/hawkmoon-actor.js
+++ b/modules/hawkmoon-actor.js
@@ -41,7 +41,11 @@ export class HawkmoonActor extends Actor {
      const skills = await HawkmoonUtility.loadCompendium("fvtt-hawkmoon-cyd.skills")
      data.items = skills.map(i => i.toObject())
    }
-    if (data.type == 'pnj') {
+    if (data.type == 'creature') {
+      const skills = await HawkmoonUtility.loadCompendium("fvtt-hawkmoon-cyd.skills-creatures")
+      data.items = skills.map(i => i.toObject())
+      data.items.push({ name: "Arme naturelle 1", type: 'arme', img: "systems/fvtt-hawkmoon-cyd/assets/icons/melee.webp", system: { typearme: "contact", bonusmaniementoff: 0, seuildefense: 0, degats: "0" } })
+      data.items.push({ name: "Arme naturelle 2", type: 'arme', img: "systems/fvtt-hawkmoon-cyd/assets/icons/melee.webp", system: { typearme: "contact", bonusmaniementoff: 0, seuildefense: 0, degats: "0" } })
    }

    return super.create(data, options);
@@ -72,13 +76,18 @@ export class HawkmoonActor extends Actor {
      arme.system.totalDegats = arme.system.degats + "+" + combat.bonusDegatsTotal
      arme.system.totalOffensif = this.system.attributs.pui.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff
      arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense + bonusDefense
+      console.log("Arme", arme.system.totalDefensif, combat, arme.system.competence.system.niveau, arme.system.seuildefense, bonusDefense)
      arme.system.isdefense = true
+      arme.system.isMelee = true
+      arme.system.isDistance = false
    }
    if (arme.system.typearme == "jet" || arme.system.typearme == "tir") {
      arme.system.competence = duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "armes à distance"))
      arme.system.attrKey = "adr"
      arme.system.totalOffensif = this.system.attributs.adr.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff
      arme.system.totalDegats = arme.system.degats
+      arme.system.isMelee = false
+      arme.system.isDistance = true
      if (arme.system.isdefense) {
        arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense
      }
@@ -87,6 +96,11 @@ export class HawkmoonActor extends Actor {
  }

  /* -------------------------------------------- */
+  getItemSorted(types) {
+    let items = this.items.filter(item => types.includes(item.type)) || []
+    HawkmoonUtility.sortArrayObjectsByName(items)
+    return items
+  }
  getWeapons() {
    let armes = []
    for (let arme of this.items) {
@@ -94,55 +108,40 @@ export class HawkmoonActor extends Actor {
        armes.push(this.prepareArme(arme))
      }
    }
+    HawkmoonUtility.sortArrayObjectsByName(armes)
    return armes
  }
-  /* -------------------------------------------- */
  getMonnaies() {
-    return this.items.filter( it => it.type == "monnaie")
+    return this.getItemSorted(["monnaie"])
  }
-
-  /* -----------------------  --------------------- */
-  addMember( actorId) {
-    let members = duplicate(this.system.members)
-    members.push( {id: actorId} )
-    this.update ({'system.members': members})
-  }
-  async removeMember(actorId) {    
-    let members = this.system.members.filter(it => it.id != actorId )
-    this.update ({'system.members': members})
-  }
-
-  /* -----------------------  --------------------- */
  getEquipments() {
-    return this.items.filter(item => item.type == "equipement")
+    return this.getItemSorted(["equipement"])
  }
-  /* -----------------------  --------------------- */
  getArtefacts() {
-    return this.items.filter(item => item.type == "artefact")
+    return this.getItemSorted(["artefact"])
  }
-  /* -----------------------  --------------------- */
-  getMonnaies() {
-    return this.items.filter(item => item.type == "monnaie")
-  }
-  /* -------------------------------------------- */
  getArmors() {
-    return this.items.filter(item => item.type == "protection")
+    return this.getItemSorted(["protection"])
  }
  getHistoriques() {
-    return this.items.filter(item => item.type == "historique")
+    return this.getItemSorted(["historique"])
  }
  getProfils() {
-    return this.items.filter(item => item.type == "profil")
+    return this.getItemSorted(["profil"])
  }
  getTalents() {
-    return this.items.filter(item => item.type == "talent")
+    return this.getItemSorted(["talent"])
  }
  getRessources() {
-    return this.items.filter(item => item.type == "ressource")
+    return this.getItemSorted(["ressource"])
  }
  getContacts() {
-    return this.items.filter(item => item.type == "contact")
+    return this.getItemSorted(["contact"])
  }
+  getMutations() {
+    return this.getItemSorted(["mutation"])
+  }
+
  /* -------------------------------------------- */
  getSkills() {
    let comp = []
@@ -163,22 +162,24 @@ export class HawkmoonActor extends Actor {
        comp.push(item)
      }
    }
-    return comp.sort(function (a, b) {
-      let fa = a.name.toLowerCase(),
-        fb = b.name.toLowerCase();
-      if (fa < fb) {
-        return -1;
-      }
-      if (fa > fb) {
-        return 1;
-      }
-      return 0;
-    })
+    HawkmoonUtility.sortArrayObjectsByName(comp)
+    return comp
+  }
+
+  /* -----------------------  --------------------- */
+  addMember(actorId) {
+    let members = duplicate(this.system.members)
+    members.push({ id: actorId })
+    this.update({ 'system.members': members })
+  }
+  async removeMember(actorId) {
+    let members = this.system.members.filter(it => it.id != actorId)
+    this.update({ 'system.members': members })
  }

  /* -------------------------------------------- */
  getDefenseBase() {
-    return Math.max(this.system.attributs.tre.value, this.system.attributs.pui.value)
+    return Math.max(this.system.attributs.tre.value, this.system.attributs.adr.value)
  }

  /* -------------------------------------------- */
@@ -188,7 +189,7 @@ export class HawkmoonActor extends Actor {
  /* -------------------------------------------- */
  getProtection() {
    let equipProtection = 0
-    for(let armor in this.items) {
+    for (let armor of this.items) {
      if (armor.type == "protection" && armor.system.equipped) {
        equipProtection += Number(armor.system.protection)
      }
@@ -209,7 +210,7 @@ export class HawkmoonActor extends Actor {
      vitesseBase: this.getVitesseBase(),
      vitesseTotal: this.getVitesseBase() + this.system.combat.vitessebonus,
      defenseBase: this.getDefenseBase(),
-      protection : this.getProtection(),
+      protection: this.getProtection(),
      defenseTotal: this.getDefenseBase() + this.system.combat.defensebonus + this.getProtection() - this.getTotalAdversite()
    }
    return combat
@@ -229,7 +230,7 @@ export class HawkmoonActor extends Actor {

    if (this.type == 'personnage') {
      let talentBonus = this.getVigueurBonus()
-      let vigueur = Math.floor((this.system.attributs.pui.value + this.system.attributs.tre.value) / 2) + talentBonus
+      let vigueur = Math.floor((this.system.attributs.pui.value + this.system.attributs.tre.value) / 2) + talentBonus + this.system.sante.vigueurmodifier
      if (vigueur != this.system.sante.vigueur) {
        this.update({ 'system.sante.vigueur': vigueur })
      }
@@ -385,10 +386,33 @@ export class HawkmoonActor extends Actor {
    return 0;
  }

+  /* -------------------------------------------- */
+  changeEtatCombativite(value) {
+    let sante = duplicate(this.system.sante)
+    sante.etat += Number(value)
+    sante.etat = Math.max(sante.etat, 0)
+    sante.etat = Math.min(sante.etat, 5)
+    this.update({ 'system.sante': sante })
+    if (sante.etat == this.system.sante.nbcombativite) {
+      ChatMessage.create({ content: `<strong>${this.name} est vaincu !</strong>` })
+    }
+    // Gestion des états affaibli et très affaibli
+    if (sante.etat == this.system.sante.nbcombativite-2 || sante.etat == this.system.sante.nbcombativite-1) {
+      if (sante.etat == this.system.sante.nbcombativite-2 && this.items.find(item => item.type == "talent" && item.name.toLowerCase() == "encaissement")) {
+        ChatMessage.create({ content: `<strong>${this.name} ne subit pas les 2 adversités rouge grâce à Encaissement. Pensez à les ajouter à la fin de la scène !</strong>` })
+      } else if (sante.etat == this.system.sante.nbcombativite-1 && this.items.find(item => item.type == "talent" && item.name.toLowerCase().includes("vaillant"))) {
+        ChatMessage.create({ content: `<strong>${this.name} ne subit pas les 2 adversités rouge grâce à Vaillant. Pensez à les ajouter à la fin de la scène !</strong>` })
+      } else {
+        ChatMessage.create({ content: `<strong>${this.name} subit 2 adversités rouge !</strong>` })
+        this.incDecAdversite("rouge", 2)
+      }
+    }
+  }
+
  /* -------------------------------------------- */
  async equipGear(equipmentId) {
    let item = this.items.find(item => item.id == equipmentId);
-    if (item && item.system.data) {
+    if (item?.system?.data) {
      let update = { _id: item.id, "system.equipped": !item.system.equipped };
      await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
    }
@@ -437,32 +461,32 @@ export class HawkmoonActor extends Actor {
    if (objetQ) {
      let newQ = objetQ.system.quantite + incDec
      newQ = Math.max(newQ, 0)
-      const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantite': newQ }]); // pdates one EmbeddedEntity
+      await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantite': newQ }]); // pdates one EmbeddedEntity
    }
  }

  /* -------------------------------------------- */
  computeRichesse() {
    let valueSC = 0
-    for(let monnaie of this.items) {
+    for (let monnaie of this.items) {
      if (monnaie.type == "monnaie") {
        valueSC += Number(monnaie.system.prixsc) * Number(monnaie.system.quantite)
      }
    }
-    return HawkmoonUtility.computeMonnaieDetails( valueSC)
+    return HawkmoonUtility.computeMonnaieDetails(valueSC)
  }

  /* -------------------------------------------- */
  computeValeurEquipement() {
    let valueSC = 0
-    for(let equip of this.items) {
+    for (let equip of this.items) {
      if (equip.type == "equipement" || equip.type == "arme" || equip.type == "protection") {
        valueSC += Number(equip.system.prixsc) * Number(equip.system.quantite ?? 1)
        valueSC += (Number(equip.system.prixca) * Number(equip.system.quantite ?? 1)) * 20
        valueSC += (Number(equip.system.prixpo) * Number(equip.system.quantite ?? 1)) * 400
      }
    }
-    return HawkmoonUtility.computeMonnaieDetails( valueSC)
+    return HawkmoonUtility.computeMonnaieDetails(valueSC)
  }

  /* -------------------------------------------- */
@@ -490,7 +514,7 @@ export class HawkmoonActor extends Actor {
    let maxDef = 0
    let bestArme
    for (let arme of defenseList) {
-      if (arme.type == "arme" ) {
+      if (arme.type == "arme") {
        arme = this.prepareArme(arme)
      }
      if (arme.system.totalDefensif > maxDef) {
@@ -541,6 +565,8 @@ export class HawkmoonActor extends Actor {
    rollData.nbBA = this.system.bonneaventure.actuelle
    rollData.nbAdversites = this.getTotalAdversite()
    rollData.talents = []
+    rollData.attrKey2 = "none"
+    rollData.coupDevastateur = this.items.find(it => it.type =="talent" && it.name.toLowerCase() == "coup dévastateur" && !it.system.used)

    if (attrKey) {
      rollData.attrKey = attrKey
@@ -565,7 +591,7 @@ export class HawkmoonActor extends Actor {
  /* -------------------------------------------- */
  async rollAttribut(attrKey, isInit = false) {
    let rollData = this.getCommonRollData(attrKey)
-    rollData.multiplier = (isInit)? 1 : 2
+    rollData.multiplier = (isInit) ? 1 : 2
    rollData.isInit = isInit
    let rollDialog = await HawkmoonRollDialog.create(this, rollData)
    rollDialog.render(true)
@@ -595,24 +621,47 @@ export class HawkmoonActor extends Actor {
  }

  /* -------------------------------------------- */
-  async rollArmeDegats(armeId, targetVigueur = undefined) {
+  async rollArmeDegats(armeId, targetVigueur = undefined, rollDataInput = undefined) {
    let arme = this.items.get(armeId)
    if (arme.type == "arme") {
      arme = this.prepareArme(arme)
    }
-    console.log("DEGATS", arme)
-    let roll = new Roll( "1d10+"+arme.system.totalDegats).roll({ async: false })
+    console.log("DEGATS", arme, targetVigueur, rollDataInput)
+    let roll
+    let bonus = 0
+    let bonus2 = 0
+
+    if (rollDataInput?.applyCoupDevastateur) {
+      bonus2 = Math.floor(this.system.attributs.pui.value / 2)
+      let talent = this.items.find(item => item.type == "talent" && item.name.toLowerCase() == "coup dévastateur")
+      this.updateEmbeddedDocuments('Item', [{ _id: talent.id, 'system.used': true }]) 
+    }
+
+    if (rollDataInput?.isHeroique) {
+      if (rollDataInput?.attaqueCharge) {
+        bonus = 5
+      }
+      roll = new Roll("2d10rr10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll({ async: false })
+    } else {
+      if (rollDataInput?.attaqueCharge) {
+        bonus = 3
+      }
+      roll = new Roll("1d10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll({ async: false })
+    }
    await HawkmoonUtility.showDiceSoNice(roll, game.settings.get("core", "rollMode"));
    let nbEtatPerdus = 0
    if (targetVigueur) {
      nbEtatPerdus = Math.floor(roll.total / targetVigueur)
    }
+    console.log(roll)
    let rollData = {
      arme: arme,
      finalResult: roll.total,
+      formula: roll.formula,
      alias: this.name,
      actorImg: this.img,
      actorId: this.id,
+      defenderTokenId: rollDataInput?.defenderTokenId,
      actionImg: arme.img,
      targetVigueur: targetVigueur,
      nbEtatPerdus: nbEtatPerdus
@@ -621,5 +670,9 @@ export class HawkmoonActor extends Actor {
      content: await renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-degats-result.html`, rollData)
    })

+    if (rollDataInput?.defenderTokenId && nbEtatPerdus) {
+      HawkmoonUtility.applyCombativite(rollDataInput, nbEtatPerdus)
+    }
+
  }
 }
--- a/modules/hawkmoon-combat.js
+++ b/modules/hawkmoon-combat.js
@@ -6,7 +6,7 @@ export class HawkmoonCombat extends Combat {
  /* -------------------------------------------- */
  async rollInitiative(ids, formula = undefined, messageOptions = {} ) {
    ids = typeof ids === "string" ? [ids] : ids;
-    for (let cId = 0; cId < ids.length; cId++) {
+    for (let cId of ids) {
      const c = this.combatants.get(ids[cId]);
      //console.log("Init for combattant", c )
      let id = c._id || c.id
@@ -21,5 +21,4 @@ export class HawkmoonCombat extends Combat {
  _onUpdate(changed, options, userId) {
  }

-
 }
--- a/modules/hawkmoon-item-sheet.js
+++ b/modules/hawkmoon-item-sheet.js
@@ -185,7 +185,7 @@ export class HawkmoonItemSheet extends ItemSheet {

    html.find('#add-automation').click(ev => {
      let autom = duplicate(this.object.system.automations)
-      autom.push( { eventtype: "on-drop", name: "Automatisation 1", competence: "", minLevel: 0, id: randomID(16) }) 
+      autom.push( { eventtype: "on-drop", name: "Automatisation 1", bonusname: "vigueur", bonus: 0, competence: "", minLevel: 0, baCost: 0, id: randomID(16) }) 
      this.object.update( { 'system.automations': autom })
    })
    html.find('.delete-automation').click(ev => {
--- a/modules/hawkmoon-item.js
+++ b/modules/hawkmoon-item.js
@@ -13,6 +13,7 @@ export const defaultItemImg = {
    artefact: "systems/fvtt-hawkmoon-cyd/assets/icons/artefact.webp",  
    contact: "systems/fvtt-hawkmoon-cyd/assets/icons/contacts.webp",  
    ressource: "systems/fvtt-hawkmoon-cyd/assets/icons/ressources.webp",  
+    mutation: "systems/fvtt-hawkmoon-cyd/assets/icons/mutation.webp",  
 }

 /**
--- a/modules/hawkmoon-main.js
+++ b/modules/hawkmoon-main.js
@@ -82,32 +82,6 @@ function welcomeMessage() {
    ` });
 }

-/* -------------------------------------------- */
-// Register world usage statistics
-function registerUsageCount(registerKey) {
-  if (game.user.isGM) {
-    game.settings.register(registerKey, "world-key", {
-      name: "Unique world key",
-      scope: "world",
-      config: false,
-      default: "",
-      type: String
-    });
-
-    let worldKey = game.settings.get(registerKey, "world-key")
-    if (worldKey == undefined || worldKey == "") {
-      worldKey = randomID(32)
-      game.settings.set(registerKey, "world-key", worldKey)
-    }
-    // Simple API counter
-    let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
-    //$.ajaxSetup({
-    //headers: { 'Access-Control-Allow-Origin': '*' }
-    //})
-    $.ajax(regURL)
-  }
-}
-
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
 /* -------------------------------------------- */
@@ -124,14 +98,15 @@ Hooks.once("ready", function () {
    });
  }

-  registerUsageCount('fvtt-hawkmoon-cyd')
+  import("https://www.uberwald.me/fvtt_appcount/count-class-ready.js").then(moduleCounter=>{
+    console.log("ClassCounter loaded", moduleCounter)
+    moduleCounter.ClassCounter.registerUsageCount()
+  }).catch(err=>
+    console.log("No stats available, giving up.")
+  )
+
  welcomeMessage()

-  // CSS patch for v9
-  if (game.version) {
-    let sidebar = document.getElementById("sidebar");
-    sidebar.style.width = "min-content";
-  }
 });

 /* -------------------------------------------- */
--- a/modules/hawkmoon-roll-dialog.js
+++ b/modules/hawkmoon-roll-dialog.js
@@ -66,15 +66,52 @@ export class HawkmoonRollDialog extends Dialog {
    html.find('#attrKey').change(async (event) =>  {
      this.rollData.attrKey = String(event.currentTarget.value)
    })    
+    html.find('#attrKey2').change(async (event) =>  {
+      this.rollData.attrKey2 = String(event.currentTarget.value)
+    })    
    html.find('#select-maitrise').change(async (event) =>  {
      this.rollData.maitriseId = String(event.currentTarget.value)
    })
    html.find('#competence-talents').change((event) => {
      this.rollData.selectedTalents = $('#competence-talents').val()      
    })
+    html.find('#taille-cible').change((event) => {
+      this.rollData.tailleCible = String(event.currentTarget.value)      
+    })
+    html.find('#tireur-deplacement').change((event) => {
+      this.rollData.tireurDeplacement = String(event.currentTarget.value)      
+    })
+    html.find('#cible-couvert').change((event) => {
+      this.rollData.cibleCouvert = String(event.currentTarget.value)      
+    })
+    html.find('#distance-tir').change((event) => {
+      this.rollData.distanceTir = String(event.currentTarget.value)      
+    })
    html.find('#bonus-malus-context').change((event) => {
      this.rollData.bonusMalusContext = Number(event.currentTarget.value)      
    })
+    html.find('#defenseur-au-sol').change((event) => {
+      this.rollData.defenseurAuSol = event.currentTarget.checked      
+    })
+    html.find('#defenseur-aveugle').change((event) => {
+      this.rollData.defenseurAveugle = event.currentTarget.checked      
+    })
+    html.find('#defenseur-de-dos').change((event) => {
+      this.rollData.defenseurDeDos = event.currentTarget.checked      
+    })
+    html.find('#defenseur-restreint').change((event) => {
+      this.rollData.defenseurRestreint = event.currentTarget.checked      
+    })
+    html.find('#defenseur-immobilise').change((event) => {
+      this.rollData.defenseurImmobilise = event.currentTarget.checked      
+    })
+    html.find('#attaque-charge').change((event) => {
+      this.rollData.attaqueCharge = event.currentTarget.checked      
+    })
+    html.find('#attaque-desarme').change((event) => {
+      this.rollData.attaqueDesarme = event.currentTarget.checked      
+    })
+    

  }
 }
--- a/modules/hawkmoon-utility.js
+++ b/modules/hawkmoon-utility.js
@@ -2,6 +2,12 @@
 import { HawkmoonCombat } from "./hawkmoon-combat.js";
 import { HawkmoonCommands } from "./hawkmoon-commands.js";

+/* -------------------------------------------- */
+const __distanceDifficulte = { "porteecourte": 5, "porteemoyenne": 9, "porteelongue": 14}
+const __tireurDeplacement = { immobile: 0, lent: 3, rapide: 5}
+const __cibleCouvert = { aucun: 0, leger: 5, complet: 10}
+const __tailleCible = { normal: 0, main: 10, enfant: 3, maison: -10}
+
 /* -------------------------------------------- */
 export class HawkmoonUtility {

@@ -61,6 +67,13 @@ export class HawkmoonUtility {

  }

+  /* -------------------------------------------- */
+  static sortArrayObjectsByName(myArray) {
+    myArray.sort((a, b) => {
+      return a.name.localeCompare(b.name);
+    })
+  }
+
  /* -------------------------------------------- */
  static getModificateurOptions() {
    let opt = []
@@ -138,8 +151,17 @@ export class HawkmoonUtility {
      let message = game.messages.get(messageId)
      let rollData = message.getFlag("world", "hawkmoon-roll")
      let actor = this.getActorFromRollData(rollData)
-      actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur)
+      actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
    })
+    html.on("click", '.roll-chat-degat-devastateur', async event => {
+      let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
+      let message = game.messages.get(messageId)
+      let rollData = message.getFlag("world", "hawkmoon-roll")
+      let actor = this.getActorFromRollData(rollData)
+      rollData.applyCoupDevastateur = true
+      actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
+    })
+    
  }

  /* -------------------------------------------- */
@@ -151,6 +173,7 @@ export class HawkmoonUtility {
      'systems/fvtt-hawkmoon-cyd/templates/partial-item-description.html',
      'systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html',
      'systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html',
+      'systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau-creature.html',
      'systems/fvtt-hawkmoon-cyd/templates/partial-item-prix.html',
      'systems/fvtt-hawkmoon-cyd/templates/partial-sante-etat.html',
      'systems/fvtt-hawkmoon-cyd/templates/partial-automation.html',
@@ -236,27 +259,12 @@ export class HawkmoonUtility {
    let newRollData = mergeObject(oldRollData, rollData);
    this.rollDataStore[id] = newRollData;
  }
-  /* -------------------------------------------- */
-  static saveRollData(rollData) {
-    game.socket.emit("system.fvtt-hawkmoon-cyd", {
-      name: "msg_update_roll", data: rollData
-    }); // Notify all other clients of the roll    
-    this.updateRollData(rollData);
-  }
-
-  /* -------------------------------------------- */
-  static getRollData(id) {
-    return this.rollDataStore[id];
-  }

  /* -------------------------------------------- */
  static onSocketMesssage(msg) {
-    //console.log("SOCKET MESSAGE", msg.name, game.user.character.id, msg.data.defenderId);
-    if (msg.name == "msg_update_defense_state") {
-      this.updateDefenseState(msg.data.defenderId, msg.data.rollId);
-    }
-    if (msg.name == "msg_update_roll") {
-      this.updateRollData(msg.data);
+    if (msg.name == "msg_apply_combativite") {
+      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      defender.changeEtatCombativite(msg.data.value)
    }
  }

@@ -308,10 +316,10 @@ export class HawkmoonUtility {
  /* -------------------------------------------- */
  static computeMonnaieDetails(valueSC) {
    let po = Math.floor(valueSC / 400)
-    let pa = Math.floor((valueSC - (po*400)) / 20)
-    let sc = valueSC - (po*400) - (pa*20)
+    let pa = Math.floor((valueSC - (po * 400)) / 20)
+    let sc = valueSC - (po * 400) - (pa * 20)
    return {
-      po: po, pa: pa, sc: sc, valueSC: valueSC 
+      po, pa, sc, valueSC
    }
  }

@@ -338,7 +346,15 @@ export class HawkmoonUtility {
    }

  }
-
+  /* -------------------------------------------- */
+  static applyCombativite(rollData, value) {
+    if (game.user.isGM) {     
+      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      defender.changeEtatCombativite(value)
+    } else {
+      game.socket.emit("system.fvtt-hawkmoon-cyd", { msg: "msg_apply_combativite", data: { defenderTokenId: rollData.defenderTokenId, value } });
+    }
+  }
  /* -------------------------------------------- */
  static async rollHawkmoon(rollData) {

@@ -350,6 +366,9 @@ export class HawkmoonUtility {
      rollData.actionImg = "systems/fvtt-hawkmoon-cyd/assets/icons/" + actor.system.attributs[rollData.attrKey].labelnorm + ".webp"
      rollData.attr = duplicate(actor.system.attributs[rollData.attrKey])
    }
+    if (rollData.attrKey2 != "none") {
+      rollData.attr2 = duplicate(actor.system.attributs[rollData.attrKey2])
+    }

    if (rollData.maitriseId != "none") {
      rollData.selectedMaitrise = rollData.maitrises.find(p => p.id == rollData.maitriseId)
@@ -360,7 +379,7 @@ export class HawkmoonUtility {

    //console.log("BEFORE COMP", rollData)
    if (rollData.competence) {
-      rollData.predilections = duplicate(rollData.competence.system.predilections.filter(pred => pred.acquise && !pred.maitrise && !pred.used) || [])
+      rollData.predilections = duplicate(rollData.competence.system.predilections || [])
      let compmod = (rollData.competence.system.niveau == 0) ? -3 : 0
      rollData.diceFormula += `+${rollData.attr.value}+${rollData.competence.system.niveau}+${rollData.modificateur}+${compmod}`
      
@@ -382,10 +401,44 @@ export class HawkmoonUtility {
        }
      }
      rollData.diceFormula += `+${rollData.bonusMalusContext}`
+    } else if (rollData.attr2) {
+      rollData.diceFormula += `+${rollData.attr.value}+${rollData.attr2.value}+${rollData.modificateur}+${rollData.bonusMalusContext}`
    } else {
      rollData.diceFormula += `+${rollData.attr.value}*${rollData.multiplier}+${rollData.modificateur}+${rollData.bonusMalusContext}`
    }
    
+    // Bonus arme naturelle en défense
+    if (rollData.bonusArmeNaturelle) {
+      rollData.diceFormula += `+${rollData.bonusArmeNaturelle}`
+    }
+    if (rollData.defenseurAuSol) {
+      rollData.diceFormula += `+3`
+    }
+    if (rollData.defenseurAveugle) {
+      rollData.diceFormula += `+10`
+    }
+    if (rollData.defenseurDeDos) {
+      rollData.diceFormula += `+5`
+    }
+    if (rollData.defenseurRestreint) {
+      rollData.diceFormula += `+3`
+    }
+    if (rollData.defenseurImmobilise) {
+      rollData.diceFormula += `+5`
+    }
+    
+    if (rollData.arme?.system.isDistance) {
+      rollData.difficulte = __distanceDifficulte[rollData.distanceTir]
+      rollData.difficulte += __tireurDeplacement[rollData.tireurDeplacement]
+      rollData.difficulte += __cibleCouvert[rollData.cibleCouvert]
+      rollData.difficulte += __tailleCible[rollData.tailleCible]
+      rollData.difficulte += rollData.cibleDeplace ? 3 : 0
+      rollData.difficulte += rollData.cibleCaC ? 3 : 0
+    }
+    if (rollData.attaqueDesarme) {
+      rollData.difficulte += 10
+    }
+    
    // Ajout adversités
    rollData.diceFormula += `-${rollData.nbAdversites}`

@@ -395,7 +448,7 @@ export class HawkmoonUtility {

    let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
    await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
-    rollData.roll = myRoll
+    rollData.roll = duplicate(myRoll)
    console.log(">>>> ", myRoll)

    rollData.finalResult = myRoll.total
@@ -408,15 +461,31 @@ export class HawkmoonUtility {
      content: await renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-generic-result.html`, rollData)
    }, rollData)

+    if (rollData.arme && rollData.isSuccess && rollData.defenderTokenId) {
+      this.applyCombativite(rollData, 1)
+    }
+
  }

+  /* -------------------------------------------- */
+  static getCombativiteList(nbActivite) {
+    let list = [ { value: 0, label: "Combatif"}]
+    for (let i = 1; i < nbActivite-2; i++) {
+      list.push({ value: i, label:"Eprouvé " + i} )
+    }
+    list[nbActivite-2] = { value: nbActivite-2, label:"Affaibli"}
+    list[nbActivite-1] = { value: nbActivite-1, label:"Très Affaibli"}
+    list[nbActivite] = { value: nbActivite, label:"Vaincu"}
+    return list
+
+  }
  /* -------------------------------------------- */
  static async bonusRollHawkmoon(rollData) {
    rollData.bonusFormula = rollData.addedBonus

    let bonusRoll = new Roll(rollData.bonusFormula).roll({ async: false })
    await this.showDiceSoNice(bonusRoll, game.settings.get("core", "rollMode"));
-    rollData.bonusRoll = bonusRoll
+    rollData.bonusRoll = duplicate(bonusRoll)

    rollData.finalResult += rollData.bonusRoll.total

@@ -430,7 +499,7 @@ export class HawkmoonUtility {

  /* -------------------------------------------- */
  static getUsers(filter) {
-    return game.users.filter(filter).map(user => user.data._id);
+    return game.users.filter(filter).map(user => user._id);
  }

  /* -------------------------------------------- */
@@ -520,7 +589,19 @@ export class HawkmoonUtility {
      pointAmeOptions: this.getPointAmeOptions(),
      difficulte: 0,
      modificateur: 0,
-      bonusMalusContext: 0
+      bonusMalusContext: 0,
+      bonusArmeNaturelle: 0,
+      defenseurAveugle: false,
+      defenseurDeDos: false,
+      defenseurAuSol: false,
+      defenseurRestreint: false,
+      defenseurImmobilise: false,
+      tailleCible: "normal",
+      tireurDeplacement: "immobile",
+      cibleCouvert: "aucun",
+      distanceTir: "porteemoyenne",
+      attaqueCharge: false,
+      attaqueDesarme: false
    }
    return rollData
  }
@@ -533,8 +614,14 @@ export class HawkmoonUtility {
      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
      rollData.armeDefense = defender.getBestDefenseValue()
      rollData.targetVigueur = defender.getVigueur()
+      rollData.protectionDefenseur = defender.getProtection()
      if (rollData.armeDefense) {
        rollData.difficulte = rollData.armeDefense.system.totalDefensif
+        if ( !rollData.arme.system.armenaturelle && !rollData.arme.system.armefortune ){
+          if (rollData.armeDefense.system.armenaturelle || rollData.armeDefense.system.armefortune) {
+            rollData.bonusArmeNaturelle = 3
+          }
+        }
      } else {
        ui.notifications.warn("Aucune arme de défense équipée, difficulté manuelle à positionner.")
      }
@@ -629,11 +716,11 @@ export class HawkmoonUtility {
  /* -------------------------------------------- */
  static async confirmDelete(actorSheet, li) {
    let itemId = li.data("item-id");
-    let msgTxt = "<p>Are you sure to remove this Item ?";
+    let msgTxt = "<p>Etes vous certain de vouloir supprimer cet item ?";
    let buttons = {
      delete: {
        icon: '<i class="fas fa-check"></i>',
-        label: "Yes, remove it",
+        label: "Oui !",
        callback: () => {
          actorSheet.actor.deleteEmbeddedDocuments("Item", [itemId]);
          li.slideUp(200, () => actorSheet.render(false));
@@ -641,12 +728,12 @@ export class HawkmoonUtility {
      },
      cancel: {
        icon: '<i class="fas fa-times"></i>',
-        label: "Cancel"
+        label: "Non"
      }
    }
    msgTxt += "</p>";
    let d = new Dialog({
-      title: "Confirm removal",
+      title: "Confirmer la suppression",
      content: msgTxt,
      buttons: buttons,
      default: "cancel"
@@ -665,7 +752,6 @@ export class HawkmoonUtility {
      console.log(entryData)
      htmlTab += `<tr><td>@UUID[Compendium.${compName}.${entryData._id}]{${entryData.name}}</td>`
      htmlTab += `<td>${entryData.system.description}</td>`;
-      //htmlTab += `<td>${entryData.system.resumebonus}</td>`;
      htmlTab += "</tr>\n";
    }
    htmlTab += "</table>";
--- a/styles/simple.css
+++ b/styles/simple.css
--- a/system.json
+++ b/system.json
@@ -1,7 +1,7 @@
 {
  "id": "fvtt-hawkmoon-cyd",
  "description": "Hawkmoon RPG for FoundryVTT (CYD system - French)",
-  "version": "10.1.7",
+  "version": "11.1.2",
  "authors": [
    {
      "name": "Uberwald/LeRatierBretonnien",
@@ -35,7 +35,7 @@
  "gridUnits": "m",
  "license": "LICENSE.txt",
  "manifest": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/raw/branch/master/system.json",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-10.1.7.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-11.1.2.zip",
  "languages": [
    {
      "lang": "fr",
@@ -44,96 +44,195 @@
      "flags": {}
    }
  ],
+  "packFolders": [
+    {
+      "name": "Hawkmoon",
+      "sorting": "m",
+      "color": "#00435c",
+      "folders": [
+        {
+          "name": "Création de Personnage",
+          "sorting": "a",
+          "color": "#00435c",
+          "packs": [
+            "skills",
+            "historiques",
+            "profils",
+            "talents",
+            "talents-cellule",
+            "mutations"
+          ],
+          "folders": []
+        },
+        {
+          "name": "Equipement",
+          "sorting": "a",
+          "color": "#00435c",
+          "packs": [
+            "armes",
+            "protections",
+            "equipement"
+          ],
+          "folders": []
+        },
+        {
+          "name": "Autre",
+          "sorting": "a",
+          "color": "#00435c",
+          "packs": [
+            "skills-creatures",
+            "tables",
+            "aides-de-jeu"
+          ],
+          "folders": []
+        }
+      ]
+    }
+  ],
  "packs": [
    {
      "type": "Item",
      "label": "Compétences",
      "name": "skills",
-      "path": "packs/competences.db",
+      "path": "packs/competences",
      "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
+    },
+    {
+      "type": "Item",
+      "label": "Mutations",
+      "name": "mutations",
+      "path": "packs/mutations",
+      "system": "fvtt-hawkmoon-cyd",
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
+    },
+    {
+      "type": "Item",
+      "label": "Compétences de Créatures",
+      "name": "skills-creatures",
+      "path": "packs/competences-creatures",
+      "system": "fvtt-hawkmoon-cyd",
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    },
    {
      "type": "Item",
      "label": "Historiques",
      "name": "historiques",
-      "path": "packs/historiques.db",
+      "path": "packs/historiques",
      "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    },
    {
      "type": "Item",
      "label": "Armes",
      "name": "armes",
-      "path": "packs/armes.db",
+      "path": "packs/armes",
      "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    },
    {
      "type": "Item",
      "label": "Protections",
      "name": "protections",
-      "path": "packs/protections.db",
+      "path": "packs/protections",
      "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    },
    {
      "type": "Item",
      "label": "Equipement",
      "name": "equipement",
-      "path": "packs/equipement.db",
+      "path": "packs/equipement",
      "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    },
    {
      "type": "Item",
      "label": "Profils",
      "name": "profils",
-      "path": "packs/profils.db",
+      "path": "packs/profils",
      "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    },
    {
      "type": "Item",
      "label": "Talents de Personnage",
      "name": "talents",
-      "path": "packs/talents.db",
+      "path": "packs/talents",
      "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    },
    {
      "type": "Item",
      "label": "Talents de Cellule",
      "name": "talents-cellule",
-      "path": "packs/talents-cellule.db",
+      "path": "packs/talents-cellule",
      "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    },
    {
      "type": "RollTable",
      "label": "Tables",
      "name": "tables",
-      "path": "packs/tables.db",
+      "path": "packs/tables",
      "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    },
    {
      "type": "JournalEntry",
      "label": "Aides de Jeu",
      "name": "aides-de-jeu",
-      "path": "packs/aides-de-jeu.db",
+      "path": "packs/aides-de-jeu",
      "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    }
  ],
  "primaryTokenAttribute": "sante.vigueur",
@@ -147,7 +246,6 @@
  "background": "systems/fvtt-hawkmoon-cyd/assets/ui/fond_hawkmoon.webp",
  "compatibility": {
    "minimum": "10",
-    "verified": "10",
-    "maximum": "10"
+    "verified": "11"
  }
 }
--- a/template.json
+++ b/template.json
@@ -19,7 +19,8 @@
          "habitat": "",
          "notes": "",
          "statut": "",
-          "gmnotes": ""
+          "gmnotes": "",
+          "statutresistant": "commun"
        }
      },
      "core": {
@@ -68,7 +69,9 @@
        },
        "sante": {
          "vigueur": 0,
-          "etat": 0
+          "etat": 0,
+          "vigueurmodifier": 0,
+          "nbcombativite": 5
        },
        "adversite":  {
          "bleue": 0,
@@ -143,7 +146,8 @@
      "equipement",
      "artefact",
      "ressource", 
-      "contact"
+      "contact",
+      "mutation"
    ],
    "ressource": {
      "pointdev": 0,
@@ -208,6 +212,8 @@
    },
    "arme": {
      "typearme": "",
+      "armenaturelle": false,
+      "armefortune": false,
      "bonusmaniementoff": 0,
      "seuildefense": 0,
      "onlevelonly": false,
@@ -254,7 +260,14 @@
        "base",
        "basequip"
      ]
-
+    },
+    "mutation": {
+      "templates": [
+        "base"
+      ],
+      "mutationcategorie": "tares_communes",
+      "hascomplexite": false,
+      "complexite": 0
    }
  }
 }
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -38,7 +38,9 @@
                  <select class="status-small-label color-class-common item-field-label-medium" type="text" name="system.sante.etat"
                    value="{{system.sante.etat}}" data-dtype="Number">
                    {{#select system.sante.etat}}
-                    {{> systems/fvtt-hawkmoon-cyd/templates/partial-sante-etat.html}}
+                      {{#each combativiteList as |combativite idx|}}*
+                        <option value="{{idx}}">{{combativite.label}}</option>
+                      {{/each}}
                    {{/select}}
                  </select>
                </li>
@@ -73,7 +75,7 @@
              {{#each system.attributs as |attr key|}}
              <li class="item flexrow " data-attr-key="{{key}}">
                <img class="item-name-img" src="systems/fvtt-hawkmoon-cyd/assets/icons/{{attr.labelnorm}}.webp">
-                <span class="item-name-label competence-name item-field-label-medium"><a
+                <span data-tooltip="Cliquez pour faire un jet" class="item-name-label competence-name item-field-label-medium"><a
                    class="roll-attribut">{{attr.label}}</a></span>
                <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
                  name="system.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="Number">
@@ -112,6 +114,13 @@
              </li>
              {{/each}}
            </ul>
+            {{#if isGM}}
+            <div class="flexrow">
+              <span class="item-name-label competence-name item-field-label-medium">Modificateur de Vigueur</span>
+              <input type="text" class="item-field-label-short" name="system.sante.vigueurmodifier"
+                  value="{{system.sante.vigueurmodifier}}" data-dtype="Number" />
+            </div>
+            {{/if}}
          </div>
        </div>

@@ -125,9 +134,13 @@
                <label class="short-label">Résumé</label>
              </span>
              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                    class="fas fa-plus"></i></a>
+              </div>
            </li>
            {{#each talents as |talent key|}}
-            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
+            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="talent">
              <img class="item-name-img" src="{{talent.img}}" />
              <span class="item-name-label competence-name">{{talent.name}}</span>
              <span class="item-name-label item-field-label-long2">{{talent.system.resumebonus}}</span>
@@ -142,6 +155,39 @@
          </ul>
        </div>

+        {{#if (count mutations)}}
+          <div class="sheet-box color-bg-archetype">
+            <ul class="item-list alternate-list">
+              <li class="item flexrow">
+                <span class="item-name-label-header">
+                  <h3><label class="items-title-text">Mutations</label></h3>
+                </span>
+                <span class="item-field-label-long">
+                  <label class="short-label">Catégorie</label>
+                </span>
+                <div class="item-filler">&nbsp;</div>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-add" data-type="mutation" title="Ajouter une Mutation"><i
+                      class="fas fa-plus"></i></a>
+                </div>
+              </li>
+              {{#each mutations as |mutation key|}}
+              <li class="item flexrow " data-item-id="{{mutation._id}}" data-item-type="mutation">
+                <img class="item-name-img" src="{{mutation.img}}" />
+                <span class="item-name-label competence-name">{{mutation.name}}</span>
+                <span class="item-name-label item-field-label-long2">{{mutation.system.mutationcategorie}}</span>
+
+                <div class="item-filler">&nbsp;</div>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                  <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                </div>
+              </li>
+              {{/each}}
+            </ul>
+          </div>
+        {{/if}}
+
        <div class="flexrow">
          <div class="sheet-box color-bg-archetype">
            <ul class="item-list alternate-list">
@@ -153,7 +199,11 @@
                  <label class="short-label">Résumé</label>
                </span>
                <div class="item-filler">&nbsp;</div>
-              </li>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                      class="fas fa-plus"></i></a>
+                </div>
+                </li>
              {{#each talentsCell as |talent key|}}
              <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
                <img class="item-name-img" src="{{talent.img}}" />
@@ -192,8 +242,20 @@
            {{#each skills as |skill key|}}
            <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
              <img class="item-name-img" src="{{skill.img}}" />
-              <span class="item-name-label competence-name"><a class="roll-competence item-field-label-short"
+              <div class="flexcol item-name-label">
+
+                <span class="item-name-label competence-name"><a class="roll-competence item-field-label-short"
                  data-attr-key="tochoose">{{skill.name}}</a></span>
+
+                    <span class="predilection-text">
+                    {{#each skill.system.predilections as |pred key|}}
+                      {{#if (and pred.acquise (not pred.used))}}
+                        {{pred.name}},
+                      {{/if}} 
+                    {{/each}}
+                  </span>
+              </div>
+
              <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
                data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
                {{#select skill.system.niveau}}
@@ -275,11 +337,11 @@

              {{#if arme.system.isdefense}}
              <span class="item-field-label-short arme-defensif item-field-label-short"><label
-                  class="arme-defensif item-field-label-short">{{arme.system.totalDefensif}}</label></span>
+                  class="arme-defensif item-field-label-short defense-sheet">{{arme.system.totalDefensif}}</label></span>
              {{else}}
-              <span class="item-field-label-short arme-defensif"><label
-                  class="item-field-label-short arme-defensif">-</label></span>
-              {{/if}}
+              <span class="item-field-label-short arme-defensif item-field-label-short"><label
+                class="arme-defensif item-field-label-short defense-sheet">N/A</label></span>
+            {{/if}}

              <span class="item-field-label-short">
                {{#if arme.system.equipped}}
@@ -312,7 +374,7 @@
              </span>
              <div class="item-filler">&nbsp;</div>
              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-add" data-type="arme" title="Ajouter une arme"><i
+                <a class="item-control item-add" data-type="protection" title="Ajouter une arme"><i
                    class="fas fa-plus"></i></a>
              </div>
            </li>
@@ -325,6 +387,8 @@
              </span>
              <div class="item-filler">&nbsp;</div>
              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-equip" title="Worn">{{#if protection.system.equipped}}<i
+                  class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
              </div>
@@ -502,6 +566,17 @@
      <div class="grid grid-3col">
        <div>
          <ul>
+            <li class="flexrow item">
+              <label class="generic-label">Statut de résistant</label>
+              <select class="status-small-label color-class-common item-field-label-long" type="text"
+              name="system.biodata.statutresistant" value="{{system.biodata.statutresistant}}" data-dtype="String">
+                {{#select system.biodata.statutresistant}}
+                <option value="commun">Commun</option>
+                <option value="clandestin">Clandestin</option>
+                <option value="insurge">Insurgé</option>
+                {{/select}}
+              </select>
+            </li>
            <li class="flexrow item">
              <label class="generic-label">Sexe</label>
              <input type="text" class="" name="system.biodata.sex" value="{{system.biodata.sex}}"
--- a/templates/cellule-sheet.html
+++ b/templates/cellule-sheet.html
@@ -81,6 +81,10 @@
                <label class="short-label">Résumé</label>
              </span>
              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                    class="fas fa-plus"></i></a>
+              </div>
            </li>
            {{#each talents as |talent key|}}
            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="talent">
--- a/templates/chat-degats-result.html
+++ b/templates/chat-degats-result.html
@@ -19,10 +19,11 @@
 <div>
  <ul>
    <li>Arme : {{arme.name}} (+{{arme.system.totalDegats}})</li>
+    <li>Formule : {{formula}}</li>
    <li>Dégats : {{finalResult}}</li>    
    {{#if targetVigueur}}
      <li>Vigueur de la cible : {{targetVigueur}}</li>    
-      <li>Etats Combativité supplémentaires perdus (manuel): {{nbEtatPerdus}} </li>
+      <li>Etats de Combativité supplémentaires perdus (auto): {{nbEtatPerdus}} </li>
    {{/if}}
  </ul>
 </div>
--- a/templates/chat-generic-result.html
+++ b/templates/chat-generic-result.html
@@ -19,6 +19,9 @@
 <div>
  <ul>
    <li class="hawkmoon-roll">Attribut : {{attr.label}} ({{attr.value}})</li>
+    {{#if attr2}}
+      <li>Attribut : {{attr2.label}} ({{attr2.value}})</li>
+    {{/if}}

    {{#if competence}}
    <li>Compétence : {{competence.name}} ({{competence.system.niveau}})</li>
@@ -42,10 +45,19 @@

    <li>Total : {{finalResult}}</li>

+    {{#if attaqueCharge}}
+    <li>Vous avez chargé : vos adversaires bénéficient de +3 pour vous attaquer</li>
+    {{/if}}
+
    {{#if difficulte}}
+    <li>SD : {{difficulte}}</li>
+
    {{#if isSuccess}}
    <li class="chat-success">Succés...
    </li>
+      {{#if attaqueDesarme}}
+      <li>Vous désarmez votre adversaire ! Son arme tombe hors de sa portée.</li>
+      {{/if}}
    {{else}}
    <li class="chat-failure">Echec...</li>
    {{/if}}
@@ -53,6 +65,9 @@

    {{#if isHeroique}}
    <li class="chat-success">Héroïque !!!</li>
+      {{#if attaqueDesarme}}
+        <li>... Et en plus vous récupérez l'arme de votre adversaire dans votre main (si vous le souhaitez) !.</li>
+      {{/if}}
    {{/if}}
    {{#if isDramatique}}
    <li class="chat-failure">Dramatique !!!</li>
@@ -64,9 +79,12 @@

    {{#if isSuccess}}
      {{#if arme}}
-        <li>Votre adversaire perd 1 Etat de Combativité (manuel) </li>
+        <li>Votre adversaire a perdu 1 Etat de Combativité (auto)</li>
        {{#if (not arme.system.onlevelonly)}}
          <button class="chat-card-button roll-chat-degat">Dégats de l'arme</button>
+          {{#if coupDevastateur}}
+          <button class="chat-card-button roll-chat-degat-devastateur">Dégats de l'arme avec Coup Dévastateur</button>
+          {{/if}}
        {{/if}}
      {{/if}}
    {{/if}}
@@ -74,8 +92,11 @@

    {{#each predilections as |pred key|}}
    <li>
-      <button class="chat-card-button predilection-reroll" data-predilection-index="{{key}}">Predilection :
-        {{pred.name}}</button>
+        {{#if (and (and pred.acquise (not pred.maitrise)) (not pred.used))}}
+        <button class="chat-card-button predilection-reroll" data-predilection-index="{{key}}">Predilection :
+          {{pred.name}}
+        </button>
+        {{/if}}
    </li>
    {{/each}}

--- a/templates/creature-sheet.html
+++ b/templates/creature-sheet.html
@@ -49,7 +49,7 @@
              <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
                name="system.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="Number">
                {{#select attr.value}}
-                {{> systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html}}
+                {{> systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau-creature.html}}
                {{/select}}
              </select>
            </li>
@@ -58,20 +58,24 @@
              <img class="item-name-img" src="systems/fvtt-hawkmoon-cyd/assets/icons/vitesse.webp">
              <span class="item-name-label competence-name item-field-label-medium">Vitesse</span>
              <input type="text" class="padd-right numeric-input item-field-label-short" name="system.vitesse.value"
-                    value="{{system.vitesse.value}}" data-dtype="Number" />
+                value="{{system.vitesse.value}}" data-dtype="Number" />
            </li>
          </ul>
          <h4 class="item-name-label competence-name">Santé</h4>
          <ul class="item-list alternate-list">
            <li class="item flexrow">
-              <label class="label-name item-field-label-short">Vigueur</label>
-              <label class="label-name item-field-label-short">{{system.sante.vigueur}}</label>
+              <label class="label-name item-field-label-medium">Vigueur</label>
+              <input type="text" class="padd-right numeric-input item-field-label-short" data-dtype="Number"
+                name="system.sante.vigueur" value="{{system.sante.vigueur}}">
            </li>
            <li class="item  flexrow">
-              <label class="label-name item-field-label-short">Etat</label>
-              <select class="label-name item-field-label-medium" type="text" name="system.sante.etat" value="{{system.sante.etat}}" data-dtype="Number">
+              <label class="label-name item-field-label-medium">Etat</label>
+              <select class="label-name item-field-label-medium" type="text" name="system.sante.etat"
+                value="{{system.sante.etat}}" data-dtype="Number">
                {{#select system.sante.etat}}
-                {{> systems/fvtt-hawkmoon-cyd/templates/partial-sante-etat.html}}
+                {{#each combativiteList as |combativite idx|}}
+                <option value="{{idx}}">{{combativite.label}}</option>
+                {{/each}}
                {{/select}}
              </select>
            </li>
@@ -103,12 +107,11 @@
            </li>
            {{/each}}
          </ul>
-
-          <h4 class="item-name-label competence-name">Vitesse</h4>
          <ul class="item-list alternate-list">
-            <li class="item flexrow" data-adversite="{{key}}">
-              <input type="text" class="padd-right numeric-input item-field-label-short" name="system.vitesse.value"
-                value="{{system.vitesse.value}}" data-dtype="Number" />      
+            <li class="item  flexrow">
+              <label class="label-name item-field-label-long1">Niveaux de combativité</label>
+              <input type="text" class="padd-right numeric-input item-field-label-short" data-dtype="Number"
+                name="system.sante.nbcombativite" value="{{system.sante.nbcombativite}}">
            </li>
          </ul>

@@ -143,21 +146,21 @@
              <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
                data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
                {{#select skill.system.niveau}}
-                  {{> systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html}}
+                {{> systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html}}
                {{/select}}
              </select>

              {{#if (ne skill.system.attribut1 "none")}}
-                <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut1}}">{{upper
-                  skill.system.attribut1}} : {{skill.system.attribut1total}}</button>
+              <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut1}}">{{upper
+                skill.system.attribut1}} : {{skill.system.attribut1total}}</button>
              {{/if}}
              {{#if (ne skill.system.attribut2 "none")}}
-                <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut2}}">{{upper
-                  skill.system.attribut2}} : {{skill.system.attribut2total}}</button>
+              <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut2}}">{{upper
+                skill.system.attribut2}} : {{skill.system.attribut2total}}</button>
              {{/if}}
              {{#if (ne skill.system.attribut3 "none")}}
-                <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut3}}">{{upper
-                  skill.system.attribut3}} : {{skill.system.attribut3total}}</button>
+              <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut3}}">{{upper
+                skill.system.attribut3}} : {{skill.system.attribut3total}}</button>
              {{/if}}

              <div class="item-filler">&nbsp;</div>
@@ -189,9 +192,13 @@
                <label class="short-label">Résumé</label>
              </span>
              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                    class="fas fa-plus"></i></a>
+              </div>
            </li>
            {{#each talents as |talent key|}}
-            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
+            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="talent">
              <img class="item-name-img" src="{{talent.img}}" />
              <span class="item-name-label competence-name">{{talent.name}}</span>
              <span class="item-name-label item-field-label-long2">{{talent.system.resumebonus}}</span>
@@ -218,9 +225,13 @@
                <label class="short-label">Résumé</label>
              </span>
              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                    class="fas fa-plus"></i></a>
+              </div>
            </li>
            {{#each talentsCell as |talent key|}}
-            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
+            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="talent">
              <img class="item-name-img" src="{{talent.img}}" />
              <span class="item-name-label competence-name">{{talent.name}}</span>
              <span class="item-name-label item-field-label-long2">{{talent.system.resumebonus}}</span>
@@ -278,9 +289,10 @@

              {{#if arme.system.isdefense}}
              <span class="item-field-label-short arme-defensif item-field-label-short"><label
-                  class="arme-defensif item-field-label-short">{{arme.system.totalDefensif}}</label></span>
+                  class="arme-defensif item-field-label-short defense-sheet">{{arme.system.totalDefensif}}</label></span>
              {{else}}
-              <span class="item-field-label-short arme-defensif"><label class="item-field-label-short arme-defensif">-</label></span>
+              <span class="item-field-label-short arme-defensif item-field-label-short"><label
+                  class="arme-defensif item-field-label-short defense-sheet">N/A</label></span>
              {{/if}}

              <span class="item-field-label-short">
@@ -314,7 +326,7 @@
              </span>
              <div class="item-filler">&nbsp;</div>
              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-add" data-type="arme" title="Ajouter une arme"><i
+                <a class="item-control item-add" data-type="protection" title="Ajouter une arme"><i
                    class="fas fa-plus"></i></a>
              </div>
            </li>
--- a/templates/item-arme-sheet.html
+++ b/templates/item-arme-sheet.html
@@ -23,6 +23,14 @@
          {{/select}}
        </select>
      </li>
+      <li class="flexrow item">
+        <label class="generic-label item-field-label-long2">Arme naturelle ? </label>
+        <input type="checkbox" name="system.armenaturelle" {{checked system.armenaturelle}} />
+      </li>
+      <li class="flexrow item">
+        <label class="generic-label item-field-label-long2">Arme de fortune ? </label>
+        <input type="checkbox" name="system.armefortune" {{checked system.armefortune}} />
+      </li>
      <li class="flexrow item">
        <label class="generic-label item-field-label-long">Bonus offensif : </label>
        <input type="text" class="padd-right numeric-input item-field-label-short" name="system.bonusmaniementoff"
@@ -42,7 +50,7 @@
      <li class="flexrow item">
        <label class="generic-label item-field-label-long">Dégâts : </label>
          <input type="text" class="padd-right numeric-input item-field-label-short" name="system.degats"
-            value="{{system.degats}}" data-dtype="Number" />
+            value="{{system.degats}}" data-dtype="String" />
        </li>
      {{/if}}
      <li class="flexrow item">
@@ -82,6 +90,7 @@
      </li>

      {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-prix.html}}
+      </ul>
      
    </div>

--- a/templates/item-mutation-sheet.html
+++ b/templates/item-mutation-sheet.html
@@ -0,0 +1,48 @@
+<form class="{{cssClass}}" autocomplete="off">
+  {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html}}
+
+  {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}}
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-description.html}}
+
+    <div class="tab details" data-group="primary" data-tab="details">
+
+      <ul class="item-list alternate-list">
+        <li class="flexrow item">
+          <label class="generic-label item-field-label-long">Catégorie : </label>
+          <select class="item-field-label-long2" type="text" name="system.mutationcategorie"
+            value="{{system.mutationcategorie}}" data-dtype="string">
+            {{#select system.mutationcategorie}}
+              <option value="tares_communes">Tares et Malformations communes</option>
+              <option value="evolutions_communes">Evolutions communes</option>
+              <option value="tares_rares">Tares et Malformations rares</option>
+              <option value="evolutions_rares">Evolutions rares</option>
+              <option value="tares_majeures">Tares et Maformations majeures</option>
+              <option value="evolutions_majeures">Evolutions majeures</option>
+              <option value="tares_except">Tares et Malformations exceptionnelles</option>
+              <option value="evolutions_except">Evolutions exceptionnelles</option>
+            {{/select}}
+          </select>
+        </li>
+
+
+        <li class="flexrow item">
+          <label class="generic-label item-field-label-long2">Complexité ? </label>
+          <input type="checkbox" name="system.hascomplexite" {{checked system.hascomplexite}} />
+        </li>
+        {{#if system.hascomplexite}}
+        <li class="flexrow item">
+          <label class="generic-label item-field-label-long2">Valeur de complexité : </label>
+          <input type="text" class="padd-right numeric-input item-field-label-short" name="system.complexite"
+            value="{{system.complexite}}" data-dtype="Number" />
+        </li>
+        {{/if}}
+      </ul>
+
+    </div>
+
+  </section>
+</form>
--- a/templates/partial-list-niveau-creature.html
+++ b/templates/partial-list-niveau-creature.html
@@ -0,0 +1,21 @@
+<option value="0">0</option>
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option value="5">5</option>
+<option value="6">6</option>
+<option value="7">7</option>
+<option value="8">8</option>
+<option value="9">9</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15">15</option>
+<option value="16">16</option>
+<option value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
--- a/templates/roll-dialog-generic.html
+++ b/templates/roll-dialog-generic.html
@@ -49,6 +49,18 @@
        </select>      
      </div>
      {{/if}}
+    {{else}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">Second Attribut</span>
+        <select class="status-small-label color-class-common" id ="attrKey2" type="text" name="attrKey2" value="attrKey2" data-dtype="string" >
+          {{#select attrKey2}}
+          <option value="none">Aucun</option>
+          {{#each attributs as |attrLabel attrKey|}}
+            <option value="{{attrKey}}">{{attrLabel}}</option>
+          {{/each}}
+          {{/select}}
+        </select>      
+      </div>
    {{/if}}

    {{#if (count talents)}}
@@ -62,6 +74,85 @@
    </div>
    {{/if}}

+    {{#if arme}}
+      {{#if arme.system.isMelee}}
+        {{#if bonusArmeNaturelle}}
+          <div class="flexrow">
+            <span class="roll-dialog-label">Arme naturelle/fortune en défense</span>
+            <span class="small-label roll-dialog-label">{{bonusArmeNaturelle}}</span>
+          </div>
+        {{/if}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">En surplomb ou défenseur au sol (+3)?</span>
+          <input type="checkbox" id="defenseur-au-sol" {{checked defenseurAuSol}} />
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Défenseur aveuglé (+10)?</span>
+          <input type="checkbox" id="defenseur-aveugle" {{checked defenseurAveugle}} />
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Défenseur de dos (+5)?</span>
+          <input type="checkbox" id="defenseur-de-dos" {{checked defenseurDeDos}} />
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Défenseur dans espace restreint (+3)?</span>
+          <input type="checkbox" id="defenseur-restreint" {{checked defenseurRestreint}} />
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Défenseur immobilisé (+5)?</span>
+          <input type="checkbox" id="defenseur-immobilise" {{checked defenseurImmobilise}} />
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Charge ?</span>
+          <input type="checkbox" id="attaque-charge" {{checked attaqueCharge}} />
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Désarmer (SD+10)?</span>
+          <input type="checkbox" id="attaque-desarme" {{checked attaqueDesarme}} />
+        </div>
+      {{else}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">Tireur en déplacement ?</span>
+        <select class="item-field-label-long" type="text" id="tireur-deplacement" data-dtype="string">
+          {{#select tireurDeplacement}}
+            <option value="immobile">Immobile (SD+0)</option>
+            <option value="lent">Lent (SD+3)</option>
+            <option value="rapide">Rapide (SD+5)</option>
+          {{/select}}
+        </select>
+      </div>
+      <div class="flexrow">
+        <span class="roll-dialog-label">Couvert de la cible ?</span>
+        <select class="item-field-label-long" type="text" id="cible-couvert" data-dtype="string">
+          {{#select cibleCouvert}}
+            <option value="aucun">Aucun</option>
+            <option value="leger">Léger (SD+5)</option>
+            <option value="complet">Quasi complet (SD+10)</option>
+          {{/select}}
+        </select>
+      </div>
+      <div class="flexrow">
+        <span class="roll-dialog-label">Cible se déplace vite (SD+3)?</span>
+        <input type="checkbox" id="tireur-cible-deplace" {{checked cibleDeplace}} />
+      </div>
+      <div class="flexrow">
+        <span class="roll-dialog-label">Cible corps à corps (SD+3)?</span>
+        <input type="checkbox" id="tireur-cible-cac" {{checked cibleCaC}} />
+      </div>      
+      <div class="flexrow">
+        <span class="roll-dialog-label">Taille de la cible ?</span>
+        <select class="item-field-label-long" type="text" id="taille-cible" data-dtype="string">
+          {{#select tailleCible}}
+            <option value="normal">Normal (SD+0)</option>
+            <option value="main">Main (SD+10)</option>
+            <option value="enfant">Enfant (SD+3)</option>
+            <option value="maison">Maison (SD-10)</option>
+          {{/select}}
+        </select>
+      </div>
+      {{/if}}
+    {{/if}}
+
    <div class="flexrow">
      <span class="roll-dialog-label">Bonus/Malus </span>
      <select class="roll-dialog-label" id="bonus-malus-context" type="text" value="{{bonusMalusContext}}"
@@ -80,31 +171,47 @@
      </select>
    </div>

-    {{#if armeDefense}}
-    <div class="flexrow">
-      <span class="roll-dialog-label">Défense adversaire : </span>
-      <span class="roll-dialog-label"><strong>{{difficulte}}</strong> </span>
-    </div>
+    {{#if (or armeDefense arme.system.isDistance)}}
+    
+      {{#if arme.system.isDistance}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">SD de distance</span>
+        <select class="item-field-label-long" type="text" id="distance-tir" data-dtype="string">
+          {{#select distanceTir}}
+            <option value="porteecourte">Courte ({{protectionDefenseur}}+5)</option>
+            <option value="porteemoyenne">Moyenne ({{protectionDefenseur}}+9)</option>
+            <option value="porteelongue">Longue ({{protectionDefenseur}}+14)</option>
+          {{/select}}
+        </select>
+      </div>
+      {{else}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">Défense adversaire : </span>
+          <span class="roll-dialog-label"><strong>{{difficulte}}</strong> </span>
+        </div>
+      {{/if}}
+    
    {{else}}
+      
      {{#if isInit}}

      {{else}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Difficulté : </span>
-        <select class="roll-dialog-label" id="difficulte" type="text" name="difficulte" value="{{difficulte}}"
-          data-dtype="Number">
-          {{#select difficulte}}
-          <option value="0">Aucune/Inconnue</option>
-          <option value="5">Facile (5)</option>
-          <option value="10">Moyenne (10)</option>
-          <option value="15">Ardue (15)</option>
-          <option value="20">Hasardeuse (20)</option>
-          <option value="25">Insensée (25)</option>
-          <option value="30">Pure Folie (30)</option>
-          {{/select}}
-        </select>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Difficulté : </span>
+          <select class="roll-dialog-label" id="difficulte" type="text" name="difficulte" value="{{difficulte}}"
+            data-dtype="Number">
+            {{#select difficulte}}
+            <option value="0">Aucune/Inconnue</option>
+            <option value="5">Facile (5)</option>
+            <option value="10">Moyenne (10)</option>
+            <option value="15">Ardue (15)</option>
+            <option value="20">Hasardeuse (20)</option>
+            <option value="25">Insensée (25)</option>
+            <option value="30">Pure Folie (30)</option>
+            {{/select}}
+          </select>
+        </div>
      {{/if}}
-      </div>
    {{/if}}
    
  </div>
Author	SHA1	Message	Date
LeRatierBretonnien	89a7730d43	Ajout des mutations	2024-02-24 15:55:29 +01:00
LeRatierBretonnien	2ebd1bd1fd	Ajout des mutations	2024-02-24 15:54:47 +01:00
LeRatierBretonnien	9e023d3f01	Fix calcul defense	2024-02-15 11:47:15 +01:00
LeRatierBretonnien	2c12ec38fb	Enhance stats	2024-02-08 12:51:41 +01:00
LeRatierBretonnien	38059232cb	Automatisations de combats, WIP	2023-12-28 18:40:46 +01:00
LeRatierBretonnien	c331604393	Predilections et warning	2023-12-21 21:02:11 +01:00
LeRatierBretonnien	71c1e1cd29	Affichage des specialisations	2023-12-19 21:52:59 +01:00
LeRatierBretonnien	4a2ca5fab5	CSS fixes	2023-11-26 14:07:55 +01:00
LeRatierBretonnien	ea8c82256c	v11 ready	2023-08-21 22:46:12 +02:00
LeRatierBretonnien	7df8aad4dc	v11 ready	2023-08-16 13:02:06 +02:00
LeRatierBretonnien	bb38705d52	Fix arme à distance + modificateur de vigueur	2023-08-16 10:51:19 +02:00
LeRatierBretonnien	4344a5fbd3	v11 ready	2023-08-16 10:32:02 +02:00
LeRatierBretonnien	df461fecf9	Fix css for compendiums	2023-05-29 17:08:21 +02:00
LeRatierBretonnien	3aeb51c8ac	Fix css for compendiums	2023-05-29 16:35:16 +02:00
LeRatierBretonnien	154e9d3da5	Fix css for compendiums	2023-05-29 16:07:59 +02:00
LeRatierBretonnien	9b58acc058	v10/v11 compatibility	2023-05-25 07:24:34 +02:00
LeRatierBretonnien	189411eef8	v10/v11 compatibility	2023-05-25 07:23:25 +02:00
LeRatierBretonnien	b1966412a0	Correction sur init + assistance au combat dans la fenetre de dialogue	2023-04-24 22:20:47 +02:00
LeRatierBretonnien	c34d223d8f	Ajout statut resistant	2023-03-26 20:33:57 +02:00
LeRatierBretonnien	0e5be07fb9	Alpha sort	2023-03-19 18:58:28 +01:00
LeRatierBretonnien	22ae4fb588	Fix protections	2023-03-14 07:18:14 +01:00
LeRatierBretonnien	42ac857c06	Fix protections	2023-03-14 07:13:33 +01:00
LeRatierBretonnien	1c143f542c	Fix creature	2023-03-13 23:58:43 +01:00
LeRatierBretonnien	4d447c9783	Enhance creatures	2022-12-21 19:15:03 +01:00