Ajout des mutations

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",

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}),

modules/hawkmoon-actor.js

@@ -76,6 +76,7 @@ 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
@@ -118,7 +119,7 @@ export class HawkmoonActor extends Actor {
   }
   getArtefacts() {
     return this.getItemSorted(["artefact"])
- }
+  }
   getArmors() {
     return this.getItemSorted(["protection"])
   }
@@ -137,6 +138,9 @@ export class HawkmoonActor extends Actor {
   getContacts() {
     return this.getItemSorted(["contact"])
   }
+  getMutations() {
+    return this.getItemSorted(["mutation"])
+  }
 
   /* -------------------------------------------- */
   getSkills() {
@@ -175,7 +179,7 @@ export class HawkmoonActor extends Actor {
 
   /* -------------------------------------------- */
   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)
   }
 
   /* -------------------------------------------- */
@@ -185,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)
       }
@@ -382,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
     }
@@ -434,7 +461,7 @@ 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
     }
   }
 
@@ -538,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
@@ -597,31 +626,42 @@ export class HawkmoonActor extends Actor {
     if (arme.type == "arme") {
       arme = this.prepareArme(arme)
     }
-    console.log("DEGATS", arme)
+    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).roll({ async: false })
+      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).roll({ async: false })
+      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
@@ -630,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)
+    }
+
   }
 }

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) {
   }
 
-
 }

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",  
 }
 
 /**

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";
-  }
 });
 
 /* -------------------------------------------- */

modules/hawkmoon-roll-dialog.js

@@ -66,6 +66,9 @@ 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)
     })

modules/hawkmoon-utility.js

@@ -153,6 +153,15 @@ export class HawkmoonUtility {
       let actor = this.getActorFromRollData(rollData)
       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)
+    })
+    
   }
 
   /* -------------------------------------------- */
@@ -250,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)
     }
   }
 
@@ -352,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) {
 
@@ -364,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)
@@ -374,10 +379,10 @@ 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}`
-
+      
       if (rollData.selectedTalents && rollData.selectedTalents.length > 0) {
         for (let id of rollData.selectedTalents) {
           let talent = rollData.talents.find(t => t._id == id)
@@ -396,9 +401,12 @@ 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}`
@@ -453,8 +461,24 @@ 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
@@ -692,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));
@@ -704,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"
@@ -728,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>";

system.json

@@ -1,7 +1,7 @@
 {
   "id": "fvtt-hawkmoon-cyd",
   "description": "Hawkmoon RPG for FoundryVTT (CYD system - French)",
-  "version": "11.0.6",
+  "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-11.0.6.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-11.1.2.zip",
   "languages": [
     {
       "lang": "fr",
@@ -44,6 +44,51 @@
       "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",
@@ -57,6 +102,18 @@
         "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",

template.json

@@ -70,7 +70,8 @@
         "sante": {
           "vigueur": 0,
           "etat": 0,
-          "vigueurmodifier": 0
+          "vigueurmodifier": 0,
+          "nbcombativite": 5
         },
         "adversite":  {
           "bleue": 0,
@@ -145,7 +146,8 @@
       "equipement",
       "artefact",
       "ressource", 
-      "contact"
+      "contact",
+      "mutation"
     ],
     "ressource": {
       "pointdev": 0,
@@ -258,7 +260,14 @@
         "base",
         "basequip"
       ]
-
+    },
+    "mutation": {
+      "templates": [
+        "base"
+      ],
+      "mutationcategorie": "tares_communes",
+      "hascomplexite": false,
+      "complexite": 0
     }
   }
 }

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">
@@ -132,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>
@@ -149,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">
@@ -160,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}}" />
@@ -199,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}}
@@ -332,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>

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">

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>

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>
@@ -76,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}}
@@ -86,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}}
 

templates/creature-sheet.html

@@ -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>
-              <input type="text" class="padd-right numeric-input item-field-label-short" data-dtype="Number" name="system.sante.vigueur" value="{{system.sante.vigueur}}" >
+              <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,6 +107,13 @@
             </li>
             {{/each}}
           </ul>
+          <ul class="item-list alternate-list">
+            <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>
 
 
         </div>
@@ -135,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>
@@ -181,13 +192,17 @@
                 <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>
-  
+
               <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>
@@ -210,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>
@@ -269,10 +288,10 @@
               </span>
 
               {{#if arme.system.isdefense}}
-                <span class="item-field-label-short arme-defensif item-field-label-short"><label
+              <span class="item-field-label-short arme-defensif item-field-label-short"><label
                   class="arme-defensif item-field-label-short defense-sheet">{{arme.system.totalDefensif}}</label></span>
               {{else}}
-                <span class="item-field-label-short arme-defensif item-field-label-short"><label
+              <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}}
 

templates/item-arme-sheet.html

@@ -90,7 +90,8 @@
       </li>
 
       {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-prix.html}}
-
+      </ul>
+      
     </div>
 
   </section>

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>

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)}}