Fix calcul defense

Enhance stats
Automatisations de combats, WIP
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 · 2023-12-19 21:52:59 +01:00 · 2023-11-26 14:07:55 +01:00
28 changed files with 1150 additions and 305 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/LICENCE.txt
+++ b/LICENCE.txt
@ -0,0 +1,25 @@
+MIT License
+
+Copyright (c) 2022 Uberwald/LeRatierBretonnien
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+This license does not apply to the compendium content listed in this software's
+"packs" directory. See the README for licensing information for the compendium
+packs.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/README.md
+++ b/README.md
@ -1,23 +1,29 @@
-# Système Foundry pour Mournblade (French RPG, Titam France/Sombres Projets)
+# Système Foundry pour Hawkmoon (French RPG, Titam France/Sombres Projets)

 ## EN

-Unofficial system for Mournblade (French version from Titam France).
+Unofficial system for Hawkmoon (French version from Titam France).
+
+This system has been approved by Département des Sombres Projets ( http://www.titam-france.fr/ ), thanks !

 Books are mandatory to play and are available at : http://www.titam-france.fr

 ## FR

-Système non-officiel pour le JDR Mournblade (Titam France).
+Système non-officiel pour le JDR Hawkmoon (Titam France/Sombres Projets).

-Ce système a été autorisé par Ludospherik ( http://www.ludospherik.fr/ ), merci à eux !
+Ce système a été autorisé par le Département des Sombres Projets ( http://www.titam-france.fr/ ), merci à eux !

 Les livres du jeu sont nécessaires pour jouer, et sont disponibles ici : http://www.titam-france.fr

 # Credits 

-Mournblade, le jeu de rôle de Sword & Sorcery, is a property of Titam France/Sombres Projets.
+Hawkmoon, le jeu de rôle du Troisième Millénaire, is a property of Titam France/Sombres Projets.

 # Developmement 

 LeRatierBretonnien
+
+# Tests, icones et saisie des données
+
+Prêtre, Blondin, Zechrub/Chris, Kyllian, Lightbringer
--- a/lang/fr.json
+++ b/lang/fr.json
@ -0,0 +1,31 @@
+{
+  "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"
+    
+    }
+  },
+  "HAWKMOON": {
+    "ui": {
+      "editContact": "Modifier le contact",
+      "deleteContact": "Supprimer le contact",
+      "editTrait": "Modifier le trait",
+      "deleteTrait": "Supprimer le trait"
+    }
+  }
+}
--- a/modules/hawkmoon-actor-sheet.js
+++ b/modules/hawkmoon-actor-sheet.js
@ -42,12 +42,19 @@ export class HawkmoonActorSheet extends ActorSheet {
      armes: duplicate(this.actor.getWeapons()),
      monnaies: duplicate(this.actor.getMonnaies()),
      protections: duplicate(this.actor.getArmors()),
-      historique: duplicate(this.actor.getHistorique() || {}),
-      talents: duplicate(this.actor.getTalents() || {}),
+      historiques: duplicate(this.actor.getHistoriques() || []),
+      talents: duplicate(this.actor.getTalents() || []),
      talentsCell: this.getCelluleTalents(),
-      profils: duplicate(this.actor.getProfils()  || {}),
+      profils: duplicate(this.actor.getProfils()  || []),
      combat: this.actor.getCombatValues(),      
      equipements: duplicate(this.actor.getEquipments()),
+      artefacts: duplicate(this.actor.getArtefacts()),
+      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}),
      options: this.options,
@ -111,18 +118,15 @@ export class HawkmoonActorSheet extends ActorSheet {
      let value = Number($(event.currentTarget).data("adversite-value"))
      this.actor.incDecAdversite(adv, value)
    })
-      
-    html.find('.quantity-minus').click(event => {
-      const li = $(event.currentTarget).parents(".item");
-      this.actor.incDecQuantity( li.data("item-id"), -1 );
-    } );
-    html.find('.quantity-plus').click(event => {
-      const li = $(event.currentTarget).parents(".item");
-      this.actor.incDecQuantity( li.data("item-id"), +1 );
-    } );
+    
+    html.find('.quantity-modify').click(event => {
+      const li = $(event.currentTarget).parents(".item")
+      const value = Number($(event.currentTarget).data("quantite-value"))
+      this.actor.incDecQuantity( li.data("item-id"), value );
+    })

    html.find('.roll-initiative').click((event) => {
-      this.actor.rollAttribut("pre", true)
+      this.actor.rollAttribut("adr", true)
    })
    
    html.find('.roll-attribut').click((event) => {
@ -146,7 +150,11 @@ export class HawkmoonActorSheet extends ActorSheet {
      let armeId  = li.data("item-id")
      this.actor.rollArmeDegats(armeId)
    })
-        
+    
+    html.find('.item-add').click((event) => {
+      const itemType = $(event.currentTarget).data("type")
+      this.actor.createEmbeddedDocuments('Item', [{ name: `Nouveau ${itemType}`, type: itemType }], { renderSheet: true })
+    })
    
    html.find('.lock-unlock-sheet').click((event) => {
      this.options.editScore = !this.options.editScore;
--- 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,47 +108,37 @@ 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.getItemSorted(["artefact"])
  }
-  /* -------------------------------------------- */
  getArmors() {
-    return this.items.filter(item => item.type == "protection")
+    return this.getItemSorted(["protection"])
  }
-  getHistorique() {
-    return this.items.find(item => item.type == "historique")
+  getHistoriques() {
+    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"])
  }
+
  /* -------------------------------------------- */
  getSkills() {
    let comp = []
@ -155,22 +159,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)
  }

  /* -------------------------------------------- */
@ -180,7 +186,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)
      }
@ -201,7 +207,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
@ -221,7 +227,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 })
      }
@ -374,13 +380,36 @@ export class HawkmoonActor extends Actor {

  /* -------------------------------------------- */
  getBonusDegats() {
-    return 0; 
+    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
    }
@ -427,12 +456,36 @@ export class HawkmoonActor extends Actor {
  async incDecQuantity(objetId, incDec = 0) {
    let objetQ = this.items.get(objetId)
    if (objetQ) {
-      let newQ = objetQ.system.quantity + incDec
+      let newQ = objetQ.system.quantite + incDec
      newQ = Math.max(newQ, 0)
-      const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantity': 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) {
+      if (monnaie.type == "monnaie") {
+        valueSC += Number(monnaie.system.prixsc) * Number(monnaie.system.quantite)
+      }
+    }
+    return HawkmoonUtility.computeMonnaieDetails(valueSC)
+  }
+
+  /* -------------------------------------------- */
+  computeValeurEquipement() {
+    let valueSC = 0
+    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)
+  }
+
  /* -------------------------------------------- */
  getCompetence(compId) {
    return this.items.get(compId)
@ -458,7 +511,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) {
@ -490,13 +543,17 @@ export class HawkmoonActor extends Actor {
    return talents
  }

+  /* -------------------------------------------- */
+  buildListeAdversites() {
+    return []
+  }
+
  /* -------------------------------------------- */
  getCommonRollData(attrKey = undefined, compId = undefined, compName = undefined) {
    let rollData = HawkmoonUtility.getBasicRollData()
    rollData.alias = this.name
    rollData.actorImg = this.img
    rollData.actorId = this.id
-    rollData.isToken = this.isToken
    rollData.tokenId = this.token?.id
    rollData.img = this.img
    rollData.attributs = HawkmoonUtility.getAttributs()
@ -505,6 +562,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
@ -528,8 +587,8 @@ export class HawkmoonActor extends Actor {

  /* -------------------------------------------- */
  async rollAttribut(attrKey, isInit = false) {
-    let rollData = this.getCommonRollData(attrKey)    
-    rollData.multiplier = (isInit)? 1 : 2
+    let rollData = this.getCommonRollData(attrKey)
+    rollData.multiplier = (isInit) ? 1 : 2
    rollData.isInit = isInit
    let rollDialog = await HawkmoonRollDialog.create(this, rollData)
    rollDialog.render(true)
@ -559,24 +618,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 
+    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
@ -585,5 +667,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-hud.js
+++ b/modules/hawkmoon-hud.js
@ -0,0 +1,71 @@
+/* -------------------------------------------- */
+
+/* -------------------------------------------- */
+export class HawkmoonTokenHud {
+
+  static init() {
+    // Integration du TokenHUD
+    Hooks.on('renderTokenHUD', (app, html, data) => { HawkmoonTokenHud.addTokenHudExtensions(app, html, data._id) });
+  }
+
+  /* -------------------------------------------- */
+  static async removeExtensionHud(app, html, tokenId) {
+    html.find('.control-icon.hawkmoon-adversite').remove()
+  }
+
+  /* -------------------------------------------- */
+  static async addExtensionHud(app, html, tokenId) {
+
+    let token = canvas.tokens.get(tokenId)
+    let actor = token.actor
+    app.hasExtension = true
+
+    const hudData = { actor: actor }
+
+    const controlIconActions = html.find('.control-icon[data-action=combat]');
+    // initiative
+    await HawkmoonTokenHud._configureSubMenu(controlIconActions, 'systems/fvtt-hawkmoon-cyd/templates/hud-adversites.html', hudData,
+      (event) => {
+        let adversite = event.currentTarget.attributes['data-action-index'].value
+        let value = Number(event.currentTarget.attributes['data-action-value'].value)
+        hudData.actor.incDecAdversite( adversite, value)
+      } )
+  }
+
+  /* -------------------------------------------- */
+  static async addTokenHudExtensions(app, html, tokenId) {
+    const controlIconCombat  = html.find('.control-icon[data-action=combat]')
+    if (controlIconCombat.length>0 ) {
+      HawkmoonTokenHud.addExtensionHud(app, html, tokenId);
+    }
+  }
+
+  /* -------------------------------------------- */
+  static async _configureSubMenu(insertionPoint, template, hudData, onMenuItem) {
+    const hud = $(await renderTemplate(template, hudData))
+    const list = hud.find('div.hawkmoon-hud-list')
+    
+    HawkmoonTokenHud._toggleHudListActive(hud, list);
+    
+    hud.find('img.hawkmoon-hud-togglebutton').click(event => HawkmoonTokenHud._toggleHudListActive(hud, list));
+    list.find('.hawkmoon-hud-adversite').click(onMenuItem);
+
+    insertionPoint.after(hud);
+  }
+
+  /* -------------------------------------------- */
+  static _showControlWhen(control, condition) {
+    if (condition) {
+      control.show()
+    }
+    else {
+      control.hide()
+    }
+  }
+
+  /* -------------------------------------------- */
+  static _toggleHudListActive(hud, list) {
+    hud.toggleClass('active')
+    HawkmoonTokenHud._showControlWhen(list, hud.hasClass('active'))
+  }
+}
--- 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-main.js
+++ b/modules/hawkmoon-main.js
@ -17,6 +17,8 @@ import { HawkmoonUtility } from "./hawkmoon-utility.js";
 import { HawkmoonCombat } from "./hawkmoon-combat.js";
 import { HawkmoonItem } from "./hawkmoon-item.js";
 import { HawkmoonAutomation } from "./hawkmoon-automation.js";
+import { HawkmoonTokenHud } from "./hawkmoon-hud.js";
+import { ClassCounter} from "https://www.uberwald.me/fvtt_appcount/count-class-ready.js"

 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
@ -64,6 +66,7 @@ Hooks.once("init", async function () {

  HawkmoonUtility.init()
  HawkmoonAutomation.init()
+  HawkmoonTokenHud.init()

 });

@ -75,42 +78,18 @@ function welcomeMessage() {
    content: `<div id="welcome-message-Hawkmoon"><span class="rdd-roll-part">
    <strong>Bienvenue dans Hawkmoon et le troisième Millénaire !</strong>
    <p>Les livres de Hawkmoon sont nécessaires pour jouer : https://www.titam-france.fr</p>
-    <p>Hawkmoon est jeude rôle publié par Titam France/Sombres projets, tout les droits leur appartiennent.<p>
+    <p>Hawkmoon est jeu de rôle publié par Titam France/Sombres projets, tout les droits leur appartiennent.</p>
+    <p>Système développé par LeRatierBretonnien, support sur le <a href="https://discord.gg/pPSDNJk">Discord FR de Foundry</a>.</p>
    ` });
 }

-/* -------------------------------------------- */
-// 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                  */
 /* -------------------------------------------- */
 Hooks.once("ready", function () {

-  HawkmoonUtility.ready();
+  HawkmoonUtility.ready()
+
  // User warning
  if (!game.user.isGM && game.user.character == undefined) {
    ui.notifications.info("Attention ! Aucun personnage n'est relié au joueur !");
@ -120,14 +99,9 @@ Hooks.once("ready", function () {
    });
  }

-  registerUsageCount('fvtt-hawkmoon-cyd')
+  ClassCounter.registerUsageCount();
  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 = []
@ -96,7 +109,7 @@ export class HawkmoonUtility {
  static async ready() {
    const skills = await HawkmoonUtility.loadCompendium("fvtt-hawkmoon-cyd.skills")
    this.skills = skills.map(i => i.toObject())
-    
+
    // Setup pause logo
    let logoPause = "systems/fvtt-hawkmoon-cyd/assets/logos/" + game.settings.get("fvtt-hawkmoon-cyd", "hawkmoon-pause-logo") + ".webp"
    let logoImg = document.querySelector('#pause').children[0]
@ -127,7 +140,7 @@ export class HawkmoonUtility {
      let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
      let message = game.messages.get(messageId)
      let rollData = message.getFlag("world", "hawkmoon-roll")
-      let actor = game.actors.get(rollData.actorId)
+      let actor = this.getActorFromRollData(rollData)
      await actor.setPredilectionUsed(rollData.competence._id, predIdx)
      rollData.competence = duplicate(actor.getCompetence(rollData.competence._id))
      HawkmoonUtility.rollHawkmoon(rollData)
@ -137,9 +150,18 @@ export class HawkmoonUtility {
      let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
      let message = game.messages.get(messageId)
      let rollData = message.getFlag("world", "hawkmoon-roll")
-      let actor = game.actors.get(rollData.actorId)
-      actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur)
+      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)
+    })
+    
  }

  /* -------------------------------------------- */
@ -151,9 +173,11 @@ 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',
+      'systems/fvtt-hawkmoon-cyd/templates/hud-adversites.html',
    ]
    return loadTemplates(templatePaths);
  }
@ -216,8 +240,15 @@ export class HawkmoonUtility {
  }

  /* -------------------------------------------- */
-  static getDefenseState(actorId) {
-    return this.defenderStore[actorId];
+  static getActorFromRollData(rollData) {
+    let actor = game.actors.get(rollData.actorId)
+    if (rollData.tokenId) {
+      let token = canvas.tokens.placeables.find(t => t.id == rollData.tokenId)
+      if (token) {
+        actor = token.actor
+      }
+    }
+    return actor
  }

  /* -------------------------------------------- */
@ -228,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)
    }
  }

@ -297,10 +313,20 @@ 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)
+    return {
+      po, pa, sc, valueSC
+    }
+  }
+
  /* -------------------------------------------- */
  static computeResult(rollData) {
    rollData.diceResult = rollData.roll.terms[0].results[0].result
-    if (rollData.mainDice.includes("d20") ) {
+    if (rollData.mainDice.includes("d20")) {
      let diceValue = rollData.roll.terms[0].results[0].result
      if (diceValue % 2 == 1) {
        //console.log("PAIR/IMP2", diceValue)
@ -318,13 +344,21 @@ export class HawkmoonUtility {
      rollData.isHeroique = ((rollData.finalResult - rollData.difficulte) >= 10)
      rollData.isDramatique = ((rollData.finalResult - rollData.difficulte) <= -10)
    }
-    
-  }

+  }
+  /* -------------------------------------------- */
+  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) {

-    let actor = game.actors.get(rollData.actorId)
+    let actor = this.getActorFromRollData(rollData)
    if (rollData.attrKey == "tochoose") { // No attr selected, force address
      rollData.attrKey = "adr"
    }
@ -332,9 +366,12 @@ 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 )
+    if (rollData.maitriseId != "none") {
+      rollData.selectedMaitrise = rollData.maitrises.find(p => p.id == rollData.maitriseId)
      rollData.diceFormula = "2" + rollData.mainDice + "kh"
    } else {
      rollData.diceFormula = "1" + rollData.mainDice
@ -342,18 +379,18 @@ 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) {
+      if (rollData.selectedTalents && rollData.selectedTalents.length > 0) {
        for (let id of rollData.selectedTalents) {
          let talent = rollData.talents.find(t => t._id == id)
          let bonusOK = true
-          if ( talent.system.baCost ) {
-            bonusOK = actor.checkBonneAventure( talent.system.baCost)
-            if ( bonusOK ) {
-              actor.changeBonneAventure( -talent.system.baCost )
+          if (talent.system.baCost) {
+            bonusOK = actor.checkBonneAventure(talent.system.baCost)
+            if (bonusOK) {
+              actor.changeBonneAventure(-talent.system.baCost)
            } else {
              ui.notifications.warn("Vous n'avez pas assez de points de Bonne Aventure !")
            }
@ -362,12 +399,46 @@ export class HawkmoonUtility {
            rollData.diceFormula += `+${talent.system.bonus}`
          }
        }
-      }  
+      }
      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}`

@ -377,33 +448,44 @@ 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
    this.computeResult(rollData)
    if (rollData.isInit) {
-      let actorInit = actor
-      if ( rollData.isToken && rollData.tokenId) {
-        actorInit = game.canvas.tokens.get(rollData.tokenId).actor
-      }
-      actorInit.setFlag("world", "last-initiative", rollData.finalResult)
-      //console.log("IS TOKEN ?????", actor, actor.isToken)
+      actor.setFlag("world", "last-initiative", rollData.finalResult)
    }

    this.createChatWithRollMode(rollData.alias, {
      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

@ -417,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);
  }

  /* -------------------------------------------- */
@ -507,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
  }
@ -520,8 +614,14 @@ export class HawkmoonUtility {
      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
      rollData.armeDefense = defender.getBestDefenseValue()
      rollData.targetVigueur = defender.getVigueur()
-      if ( rollData.armeDefense)  {
+      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.")
      }
@ -539,7 +639,7 @@ export class HawkmoonUtility {
    let msg = game.messages.get(msgId)
    if (msg) {
      let rollData = msg.getFlag("world", "hawkmoon-roll")
-      let actor = game.actors.get(rollData.actorId)
+      let actor = this.getActorFromRollData(rollData)
      actor.changeBonneAventure(changed)
      rollData.isReroll = true
      rollData.textBonus = "Bonus de Points d'Aventure"
@ -558,7 +658,7 @@ export class HawkmoonUtility {
    let msg = game.messages.get(msgId)
    if (msg) {
      let rollData = msg.getFlag("world", "hawkmoon-roll")
-      let actor = game.actors.get(rollData.actorId)
+      let actor = this.getActorFromRollData(rollData)
      actor.changeEclat(changed)
      rollData.isReroll = true
      rollData.textBonus = "Bonus d'Eclat"
@ -577,14 +677,14 @@ export class HawkmoonUtility {
    let canApplyBA = function (li) {
      let message = game.messages.get(li.attr("data-message-id"))
      let rollData = message.getFlag("world", "hawkmoon-roll")
-      let actor = game.actors.get(rollData.actorId)
-      return (!rollData.isReroll && actor.getBonneAventure() > 0 )
+      let actor = this.getActorFromRollData(rollData)
+      return (!rollData.isReroll && actor.getBonneAventure() > 0)
    }
    let canApplyPE = function (li) {
      let message = game.messages.get(li.attr("data-message-id"))
      let rollData = message.getFlag("world", "hawkmoon-roll")
-      let actor = game.actors.get(rollData.actorId)
-      return (!rollData.isReroll && actor.getEclat() > 0 )
+      let actor = this.getActorFromRollData(rollData)
+      return (!rollData.isReroll && actor.getEclat() > 0)
    }
    options.push(
      {
@ -616,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));
@ -628,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"
@ -641,4 +741,20 @@ export class HawkmoonUtility {
    d.render(true);
  }

-}
+  /************************************************************************************/
+  static async __create_talents_table() {
+    let compName = "fvtt-hawkmoon-cyd.talents-cellule"
+    const compData = await HawkmoonUtility.loadCompendium(compName)
+    let talents = compData.map(i => i.toObject())
+
+    let htmlTab = "<table border='1'><tbody>";
+    for (let entryData of talents) {
+      console.log(entryData)
+      htmlTab += `<tr><td>@UUID[Compendium.${compName}.${entryData._id}]{${entryData.name}}</td>`
+      htmlTab += `<td>${entryData.system.description}</td>`;
+      htmlTab += "</tr>\n";
+    }
+    htmlTab += "</table>";
+    await JournalEntry.create({ name: 'Liste des Talents de Cellule', content: htmlTab });
+  }
+}
--- a/packs/aides-de-jeu.SAVED
+++ b/packs/aides-de-jeu.SAVED
--- a/packs/competences-creatures.db
+++ b/packs/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/packs/equipement.db
+++ b/packs/equipement.db
@ -28,6 +28,7 @@
 {"name":"Gourde de cuir","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"<p>1 litre</p>","prixpo":0,"prixca":0,"prixsc":5,"rarete":3,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.Bk7CwCfqllFJyRzo"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667052151738,"modifiedTime":1667056681209,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"BBHGx79XunHAqgLm"}
 {"name":"Anneau en argent","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"","prixpo":0,"prixca":8,"prixsc":0,"rarete":7,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.euNUZvN2AaNQX5Eh"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667053448337,"modifiedTime":1667056840190,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"BDzR3nDpE58cpzMf"}
 {"name":"Ceinture de cuir","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"","prixpo":0,"prixca":0,"prixsc":8,"rarete":3,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.zUMIT05ItRjqyXzx"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667050981153,"modifiedTime":1667056547008,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"BWpLFLDuRQTntKNW"}
+{"name":"Sous de Cuivre","type":"monnaie","img":"systems/fvtt-hawkmoon-cyd/assets/icons/monnaie.webp","system":{"description":"","prixpo":0,"prixca":0,"prixsc":1,"rarete":0,"quantite":1,"equipped":false},"effects":[],"ownership":{"default":0,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Item.BuH79gmBwS61TNMs"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.3","coreVersion":"10.291","createdTime":1670105962535,"modifiedTime":1670108270030,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"CUHVKLJStGcH1pfV"}
 {"name":"Écharpe de laine","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"","prixpo":0,"prixca":0,"prixsc":3,"rarete":2,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.gu8GIe9rTpa30y0L"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667051095332,"modifiedTime":1667056566818,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"D4FStoSsSD5t1pyR"}
 {"name":"Antipoison","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"<p>Effets et notes :</p>\n<p>Conf&egrave;re un bonus de + 5 au test de Soins pour stopper les effets d&rsquo;un empoisonnement.</p>\n<p>&nbsp;</p>","prixpo":0,"prixca":20,"prixsc":0,"rarete":8,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.6JwVwbG95Jro0jyA"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667056200587,"modifiedTime":1667056884888,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"DEAaZnyqfZTSnj5l"}
 {"name":"Peigne en ivoire sculpté","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"","prixpo":0,"prixca":100,"prixsc":0,"rarete":9,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.qO3PbRUDrBAsl9Eg"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667052473087,"modifiedTime":1667056725327,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"DWbXCgeKhtxBop5k"}
@ -97,6 +98,7 @@
 {"name":"Tambourin","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"","prixpo":0,"prixca":2,"prixsc":0,"rarete":5,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.3w6hbSQaxhkKHeNK"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667053372874,"modifiedTime":1667056832786,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"gRXQlfeiJzEYGcRL"}
 {"name":"Robe de bal","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"<p>Co&ucirc;t : 20 &agrave; 200 PA</p>","prixpo":0,"prixca":20,"prixsc":0,"rarete":8,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.oXhEGerIeFe5qWPe"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667051286585,"modifiedTime":1667056586658,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"gbG7p0z7UVXdfNSR"}
 {"name":"Cor de chasse en corne","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"","prixpo":0,"prixca":2,"prixsc":0,"rarete":5,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.KEsLoT5TtwpUgb5g"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667053304777,"modifiedTime":1667056825041,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"hi1uIij2vnhblvyc"}
+{"name":"Pièce d'Or","type":"monnaie","img":"systems/fvtt-hawkmoon-cyd/assets/icons/monnaie.webp","system":{"description":"","prixpo":0,"prixca":0,"prixsc":400,"rarete":0,"quantite":1,"equipped":false},"effects":[],"ownership":{"default":0,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Item.arqqVEV5qwgVh1qz"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.3","coreVersion":"10.291","createdTime":1670105962535,"modifiedTime":1670108267437,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"iDsF5gfusUp56ffF"}
 {"name":"Sphère noire","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"","prixpo":0,"prixca":30,"prixsc":0,"rarete":9,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.wgZufKzZs1mv6U7m"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667053281244,"modifiedTime":1667056823317,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"iTgpQBOfOLKOOIpx"}
 {"name":"Lampe à huile","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"<p>dur&eacute;e huit heures</p>","prixpo":0,"prixca":0,"prixsc":15,"rarete":3,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.52qKfCHjAXnPd42R"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667050221162,"modifiedTime":1667056522865,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"k549mRHCTM5qvoAq"}
 {"name":"Parfum d’Italia","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"","prixpo":1,"prixca":0,"prixsc":0,"rarete":8,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.nQpYaf3lVGlHWZDd"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667053201541,"modifiedTime":1667056816027,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"kimJnMkFr6mx2GR2"}
@ -110,6 +112,7 @@
 {"name":"Miroir","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"","prixpo":0,"prixca":1,"prixsc":0,"rarete":5,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.w2y1ZIQwrq16pyro"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667052391234,"modifiedTime":1667056715568,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"oF4ctqBDkAw6gNkd"}
 {"name":"Nuit en dortoir sur une paillasse sale","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"","prixpo":0,"prixca":0,"prixsc":3,"rarete":2,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.4GmLW6TqSQaDktX6"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667049989473,"modifiedTime":1667056509383,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"oOuBI5T6XB91aHCE"}
 {"name":"Pourpoint de cuir","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"","prixpo":0,"prixca":3,"prixsc":0,"rarete":5,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.WzLzKVbZzw68cXko"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667051273146,"modifiedTime":1667056584869,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"oRg2ar1k6VMZpy77"}
+{"name":"Pièce d'Argent","type":"monnaie","img":"systems/fvtt-hawkmoon-cyd/assets/icons/monnaie.webp","system":{"description":"","prixpo":0,"prixca":0,"prixsc":20,"rarete":0,"quantite":1,"equipped":false},"effects":[],"ownership":{"default":0,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Item.I6sMdUOBJV7DuOB2"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.3","coreVersion":"10.291","createdTime":1670105962535,"modifiedTime":1670108264731,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"pHLxatpIeOjQ4SY9"}
 {"name":"Couverts en argent","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"<p>un couteau, une fourchette, une cuiller</p>","prixpo":0,"prixca":30,"prixsc":0,"rarete":9,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.QszRAgf7F0ZSbN6z"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667051873930,"modifiedTime":1667056657906,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"pJAfqX7SieQmRGDF"}
 {"name":"Cataplasme miraculeux","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"<p>cr&egrave;me de nanocompo\u0002sites r&eacute;g&eacute;n&eacute;rants &ndash; cr&eacute;ation technologique</p>\n<p><strong>Effets et notes :</strong><br>Permet de d&eacute;fausser jusqu&rsquo;&agrave; 2 Adversit&eacute;s noires apr&egrave;s (10 &ndash; Trempe) x 10 minutes.</p>","prixpo":0,"prixca":100,"prixsc":0,"rarete":10,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.6fA5jRN6HAXN3sLM"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667055976728,"modifiedTime":1667056878533,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"q6gtm9fNDyIWJ90X"}
 {"name":"Nuit sur le plancher de la salle commune ou à l’étable","type":"equipement","img":"systems/fvtt-hawkmoon-cyd/assets/icons/equipement.webp","system":{"description":"","prixpo":0,"prixca":0,"prixsc":1,"rarete":1,"equipped":false},"effects":[],"flags":{"core":{"sourceId":"Item.V0lq8ve5orlZBG3G"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.0.7","coreVersion":"10.286","createdTime":1667049973754,"modifiedTime":1667056508034,"lastModifiedBy":"aU5ncDYkHS7NmLl4"},"folder":null,"sort":0,"ownership":{"default":0,"aU5ncDYkHS7NmLl4":3},"_id":"q8jVTrkQM9EDa6E1"}
--- a/styles/simple.css
+++ b/styles/simple.css
@ -40,7 +40,6 @@
    --debug-box-shadow-blue: inset 0 0 2px blue;
    --debug-box-shadow-green: inset 0 0 2px green;
  }
-
 /*@import url("https://fonts.googleapis.com/css2?family=Martel:wght@400;800&family=Roboto:wght@300;400;500&display=swap");*/
 /* Global styles & Font */
 .window-app {
@ -527,7 +526,6 @@ section.sheet-body:after {
 h1, h2, h3, h4 {
  font-weight: bold;
 }
-
 ul, ol {
    margin: 0;
    padding: 0;
@ -790,6 +788,7 @@ ul, li {
  width: fit-content;
  height: fit-content;
  min-width: 6rem;
+  min-height: 1.2rem;
  flex-basis: auto;
  padding: 0;
  line-height: 1rem;
@ -827,7 +826,6 @@ ul, li {
 #sidebar {
  font-size: 1rem;
  background-position: 100%;
-  color: rgba(220,220,220,0.75);
 }

 /*  background: rgb(105,85,65) url("../images/ui/texture_feuille_perso_onglets.webp") no-repeat right bottom;*/
@ -896,6 +894,22 @@ ul, li {
  border: 0px;
 }

+.hud-adversite-container {
+  position: relative;
+  text-align: center;
+  color: white;
+  width: 64px;
+  min-height: 64px;
+}
+.hud-adversite-text {
+  font-weight: bold;
+  font-size:0.9rem;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -85%);
+}
+
 .actor-icon {
  float: left;
  width: 48px;
@ -929,22 +943,11 @@ ul, li {
  height: 15%;
  font-size: 15px;
  padding: 10px;
-  padding-bottom: 20px;
+  /*padding-bottom: 20px;*/
  padding-top: .2rem;
  padding-bottom: .2rem;
 }

-.div-river-full {
-  height: 5rem;
-  align-items: flex-start;
-}
-
-.div-river {
-  align-content: center;
-  margin-left: 8px;
-  align-content:space-around;
-  justify-content: space-around;
-}

 .div-center {
  align-self: center;
@ -982,13 +985,10 @@ ul, li {
 }

 #sidebar #sidebar-tabs i{
-  width: 25px;
-  height: 25px;
  display: inline-block;
  background-position:center;
  background-size:cover;
  text-shadow: 1px 1px 0 rgba(0,0,0,0.75);
-
 }

 /*#sidebar #sidebar-tabs i.fa-comments:before, #sidebar #sidebar-tabs i.fa-fist-raised:before, #sidebar #sidebar-tabs i.fa-users:before, #sidebar #sidebar-tabs i.fa-map:before, #sidebar #sidebar-tabs i.fa-suitcase:before, #sidebar #sidebar-tabs i.fa-book-open:before, #sidebar #sidebar-tabs i.fa-th-list:before, #sidebar #sidebar-tabs i.fa-music:before, #sidebar #sidebar-tabs i.fa-atlas:before, #sidebar #sidebar-tabs i.fa-cogs:before {content: "";}
@ -1192,12 +1192,10 @@ ul, li {
  text-shadow: 0px 1px 0px #4d3534;
  position: relative;
  max-height:1.7rem;
-  margin-left:4px;
  flex-grow:1;
-  max-width: 4rem;
-  min-width: 4rem;
+  max-width: 3.5rem;
+  min-width: 3.5rem;
 }
-
 .button-sheet-roll:hover {
  background: linear-gradient(to bottom, #800000 5%, #3e0101 100%);
  background-color: rgb(56, 33, 33);
@ -1207,6 +1205,21 @@ ul, li {
  top:1px;
 }

+.defense-sheet {
+  border-radius: 4px;
+  text-align: center;
+  display: inline-block;
+  font-size: 0.8rem;
+  padding: 1px 1px 0px 1px;
+  text-decoration: none;
+  position: relative;
+  max-height:1.7rem;
+  margin-left:4px;
+  flex-grow:1;
+  max-width: 3.5rem;
+  min-width: 3.5rem;
+}
+
 .plus-minus-button {
  box-shadow: inset 0px 1px 0px 0px #a6827e;
  background: linear-gradient(to bottom, #21374afc 5%, #152833ab 100%);
@ -1247,24 +1260,6 @@ ul, li {
  padding-left: 2rem;
 }

-.drop-equipment-effect,
-.drop-power-effect,
-.drop-perk-effect,
-.drop-ability-effect,
-.drop-effect-specaffected,
-.drop-effect-spec,
-.drop-ability-weapon,
-.drop-ability-armor,
-.drop-race-perk,
-.drop-spec-perk,
-.drop-ability-power,
-.drop-ability-spec,
-.drop-spec-power,
-.drop-abilities, 
-.drop-optionnal-abilities,
-.drop-specialperk1,
-.drop-perk2,
-.drop-spec1 ,
 .drop-spec2 {
  background: linear-gradient(to bottom, #6c95b9fc 5%, #105177ab 100%);
  background-color: #7d5d3b00;
@ -1298,13 +1293,10 @@ ul, li {
 /*************************************************************/
 .arme-defensif {
  padding-top: 7px;
-  padding-left: 4px;
-  margin-left: 4px;
  text-align: center;
  flex-grow: 2;
 }

-
 /*************************************************************/
 .item-name-img {
  flex-grow:1;
@ -1382,6 +1374,12 @@ ul, li {
  max-width: 8rem;
  min-width: 8rem;
 }
+.item-field-label-long1 {
+  padding-top: 6px;
+  flex-grow:1;
+  max-width: 12rem;
+  min-width: 12rem;
+}
 .item-field-label-long2 {
  padding-top: 6px;
  flex-grow:1;
@ -1419,4 +1417,27 @@ ul, li {
 }
 .adversite-modify {
  margin-top: 12px;
-}
+}
+.argent-total-text {
+  margin-left: 4px;
+}
+
+.compendium h4.entry-name.document-name {
+  color: black;
+}
+.page-title {
+  color: black;
+}
+textarea {
+  font-family: "Charlemagne";
+  font-size: 0.8rem;
+}
+.fxmaster {
+  background: #443e37E0;
+  background-color: #443e37E0;
+}
+.predilection-text {
+  padding-left: 8px;
+  font-style: italic;
+  font-size: 0.6rem;
+}
--- a/system.json
+++ b/system.json
@ -1,7 +1,7 @@
 {
  "id": "fvtt-hawkmoon-cyd",
-  "description": "Hawmoon RPG for FoundryVTT (CYD system - French)",
-  "version": "10.1.0",
+  "description": "Hawkmoon RPG for FoundryVTT (CYD system - French)",
+  "version": "11.1.1",
  "authors": [
    {
      "name": "Uberwald/LeRatierBretonnien",
@ -35,88 +35,147 @@
  "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.0.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-11.1.1.zip",
+  "languages": [
+    {
+      "lang": "fr",
+      "name": "French",
+      "path": "lang/fr.json",
+      "flags": {}
+    }
+  ],
  "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": "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",
+      "system": "fvtt-hawkmoon-cyd",
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    }
  ],
  "primaryTokenAttribute": "sante.vigueur",
@ -130,7 +189,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,
@ -124,6 +127,7 @@
        "prixca": 0,
        "prixsc": 0, 
        "rarete": 0,
+        "quantite": 0,
        "equipped": false
      },
      "automation": {
@ -207,6 +211,8 @@
    },
    "arme": {
      "typearme": "",
+      "armenaturelle": false,
+      "armefortune": false,
      "bonusmaniementoff": 0,
      "seuildefense": 0,
      "onlevelonly": false,
--- 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>
@ -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,6 +134,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="competence">
@ -153,7 +166,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 +209,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}}
@ -233,7 +262,7 @@

      <ul class="item-list alternate-list">
        <li class="item flexrow">
-          <button class="chat-card-button roll-initiative">Initiative</button>
+          <button class="chat-card-button roll-initiative">Initiative (actuelle : {{initiative}} )</button>
        </li>
      </ul>

@ -275,11 +304,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 +341,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 +354,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>
@ -340,6 +371,58 @@
    <div class="tab equipement" data-group="primary" data-tab="equipement">

      <div class="flexcol">
+        
+        <hr>
+        <div class="sheet-box color-bg-archetype">
+            <h4>
+              <label class="argent-total-text">
+                Argent Total : {{richesse.po}} PO - {{richesse.pa}} PA - {{richesse.sc}} SC (total {{richesse.valueSC}} SC)
+              </label>
+          </h4>  
+        </div>
+        
+        <div class="sheet-box color-bg-archetype">
+          <ul class="item-list alternate-list">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Richesses et Argent</label></h3>  
+              </span>
+              <span class="item-field-label-short">
+                <label class="short-label">Quantité</label>
+              </span>
+
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="monnaie" title="Ajouter une monnaie"><i
+                    class="fas fa-plus"></i></a>
+              </div>
+            </li>
+            {{#each monnaies as |monnaie key|}}
+            <li class="item flexrow " data-item-id="{{monnaie._id}}" data-item-type="monnaie">
+              <img class="item-name-img" src="{{monnaie.img}}" />
+              <span class="item-name-label competence-name">{{monnaie.name}}</span>
+              <span class="item-name-label competence-name item-field-label-medium">{{monnaie.system.quantite}} 
+                <a class="quantity-modify plus-minus-button" data-quantite-value="-1">-</a>
+                <a class="quantity-modify plus-minus-button" data-quantite-value="+1">+</a>
+              </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>
+
+        <hr>
+        <div class="sheet-box color-bg-archetype">
+            <h4>
+              <label class="argent-total-text">
+                Valeur Total Equipement : {{valeurEquipement.po}} PO - {{valeurEquipement.pa}} PA - {{valeurEquipement.sc}} SC (total {{valeurEquipement.valueSC}} SC)
+              </label>
+          </h4>  
+        </div>

        <div class="sheet-box color-bg-archetype">
          <ul class="item-list alternate-list">
@ -347,9 +430,14 @@
              <span class="item-name-label-header">
                <h3><label class="items-title-text">Equipements</label></h3>
              </span>
+
+              <span class="item-field-label-short">
+                <label class="short-label">Quantité</label>
+              </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="equipement" title="Ajouter un équipement"><i
                    class="fas fa-plus"></i></a>
              </div>
            </li>
@ -357,6 +445,45 @@
            <li class="item flexrow " data-item-id="{{equipement._id}}" data-item-type="equipement">
              <img class="item-name-img" src="{{equipement.img}}" />
              <span class="item-name-label competence-name">{{equipement.name}}</span>
+              <span class="item-name-label competence-name item-field-label-medium">{{equipement.system.quantite}}
+                <a class="quantity-modify plus-minus-button" data-quantite-value="-1">-</a>
+                <a class="quantity-modify plus-minus-button" data-quantite-value="+1">+</a>
+              </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>
+
+        <div class="sheet-box color-bg-archetype">
+          <ul class="item-list alternate-list">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Artefacts</label></h3>
+              </span>
+
+              <span class="item-field-label-short">
+                <label class="short-label">Quantité</label>
+              </span>
+
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="artefact" title="Ajouter un artefact"><i
+                    class="fas fa-plus"></i></a>
+              </div>
+            </li>
+            {{#each artefacts as |artefact key|}}
+            <li class="item flexrow " data-item-id="{{artefact._id}}" data-item-type="artefact">
+              <img class="item-name-img" src="{{artefact.img}}" />
+              <span class="item-name-label competence-name">{{artefact.name}}</span>
+              <span class="item-name-label competence-name item-field-label-medium">{{artefact.system.quantite}}
+                <a class="quantity-modify plus-minus-button" data-quantite-value="-1">-</a>
+                <a class="quantity-modify plus-minus-button" data-quantite-value="+1">+</a>
+              </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>
@ -377,6 +504,7 @@

      <div>
        <ul class="item-list alternate-list">
+          {{#each historiques as |historique key|}}
          <li class="item flexrow" data-item-id="{{historique._id}}">
            <label class="generic-label">Historique : </label>
            <label class="generic-label">{{historique.name}}</label>
@ -386,6 +514,7 @@
              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
            </div>
          </li>
+          {{/each}}
          {{#each profils as |profil key|}}
          <li class="item flexrow" data-item-id="{{profil._id}}">
            <label class="generic-label">Profil : </label>
@ -404,6 +533,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,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>
@ -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/hud-adversites.html
+++ b/templates/hud-adversites.html
@ -0,0 +1,48 @@
+<div class="control-icon hawkmoon-adversite ">
+  <img class="hawkmoon-hud-togglebutton" src="icons/svg/sword.svg" width="36" height="36" title="Action" />
+  <div class="hawkmoon-hud-list tokenhudext right">
+    
+    <div class="flexrow tokenhudicon">
+      <div class="hawkmoon-hud-adversite hud-adversite-container" data-action-value="-1"
+        data-action-index="bleue" title="Adversite Bleue">
+        <img class="icon-adversite" src="systems/fvtt-hawkmoon-cyd/assets/icons/gemme_bleue.webp">
+        <div class="hud-adversite-text">&nbsp;-1</div>
+      </div>
+
+      <div class="hawkmoon-hud-adversite hud-adversite-container" data-action-value="+1"
+        data-action-index="bleue" title="Adversite Bleue">
+        <img class="icon-adversite" src="systems/fvtt-hawkmoon-cyd/assets/icons/gemme_bleue.webp">
+        <div class="hud-adversite-text">&nbsp;+1</div>
+      </div>      
+    </div>
+
+    <div class="flexrow tokenhudicon">
+      <div class="hawkmoon-hud-adversite hud-adversite-container" data-action-value="-1"
+          data-action-index="rouge" title="Adversite Rouge">
+        <img class="icon-adversite" src="systems/fvtt-hawkmoon-cyd/assets/icons/gemme_rouge.webp">
+        <div class="hud-adversite-text">&nbsp;-1</div>
+      </div>
+
+      <div class="hawkmoon-hud-adversite hud-adversite-container" data-action-value="+1"
+          data-action-index="rouge" title="Adversite Rouge">
+        <img class="icon-adversite" src="systems/fvtt-hawkmoon-cyd/assets/icons/gemme_rouge.webp">
+        <div class="hud-adversite-text">&nbsp;+1</div>
+      </div>
+    </div>
+
+    <div class="flexrow tokenhudicon">
+      <div class="hawkmoon-hud-adversite hud-adversite-container" data-action-value="-1"
+        data-action-index="noire" title="Adversite Noire">
+        <img class="icon-adversite" src="systems/fvtt-hawkmoon-cyd/assets/icons/gemme_noire.webp">
+        <div class="hud-adversite-text">&nbsp;-1</div>
+      </div>
+
+      <div class="hawkmoon-hud-adversite hud-adversite-container" data-action-value="+1"
+        data-action-index="noire" title="Adversite Noire">
+        <img class="icon-adversite" src="systems/fvtt-hawkmoon-cyd/assets/icons/gemme_noire.webp">
+        <div class="hud-adversite-text">&nbsp;+1</div>
+      </div>
+    </div>
+
+  </div>
+</div>
--- 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">
--- a/templates/item-monnaie-sheet.html
+++ b/templates/item-monnaie-sheet.html
@ -13,8 +13,19 @@
      
      <ul class="item-list alternate-list">

-        {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-prix.html}}
+        <li class="flexrow item">
+          <label class="generic-label item-field-label-long">Quantite </label>
+          <input type="text" class="padd-right numeric-input item-field-label-short" name="system.quantite"
+                  value="{{system.quantite}}" data-dtype="Number" />
+        </li>

+        <li class="flexrow item">
+          <label class="generic-label item-field-label-long">Valeur en Sous de Cuivre (SC)</label>
+          <input type="text" class="numeric-input item-field-label-short" name="system.prixsc" value="{{system.prixsc}}"
+                data-dtype="Number" />
+        </li>
+
+      
      </ul>

    </div>
--- a/templates/partial-item-prix.html
+++ b/templates/partial-item-prix.html
@ -9,6 +9,12 @@
  <input type="checkbox" name="system.equipped" {{checked system.equipped}} />
 </li>

+<li class="flexrow item">
+  <label class="generic-label item-field-label-long">Quantite </label>
+  <input type="text" class="padd-right numeric-input item-field-label-short" name="system.quantite"
+          value="{{system.quantite}}" data-dtype="Number" />
+</li>
+
 <li class="flexrow item">

  <label class="generic-label item-field-label-long">Prix (PA) </label>
--- 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	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
LeRatierBretonnien	8760e3eb6e	Fix ajout equipements	2022-12-19 10:15:46 +01:00
LeRatierBretonnien	b3ddfb802e	Fix name	2022-12-18 17:50:18 +01:00
LeRatierBretonnien	9f111771df	Fix Historiques	2022-12-11 18:42:35 +01:00
LeRatierBretonnien	44141e3982	Fix Historiques	2022-12-11 18:42:16 +01:00
LeRatierBretonnien	35b47d5aaf	Mise à jour diu README	2022-12-06 07:41:57 +01:00
LeRatierBretonnien	c48116de54	Mise à jour diu README	2022-12-06 07:41:51 +01:00
LeRatierBretonnien	295c68a16e	Mise à jour diu README	2022-12-06 07:37:11 +01:00
LeRatierBretonnien	b9d12843a5	Ajout Artefacts et syntaxe item/acteurs	2022-12-06 07:27:51 +01:00
LeRatierBretonnien	dd3f13f095	Gestion des quantites et de l'argent	2022-12-03 23:58:18 +01:00
LeRatierBretonnien	5dde9ac72f	Gestion des quantites et de l'argent	2022-12-03 23:57:30 +01:00
LeRatierBretonnien	5ab6b99ef6	HUD + liste de talents	2022-12-03 23:13:08 +01:00
sladecraven	6b508c96be	Better use of tokens/actors	2022-11-30 12:15:45 +01:00