Add attaque dos+plusieurs

Gestion assommer/charge
Rework combat
2023-04-10 14:11:47 +02:00 · 2023-04-09 21:45:46 +02:00 · 2023-04-08 20:21:09 +02:00 · 2023-04-08 18:50:30 +02:00 · 2023-04-08 18:49:54 +02:00 · 2023-04-08 09:55:08 +02:00
22 changed files with 1456 additions and 338 deletions
--- a/assets/icons/equipement.webp
+++ b/assets/icons/equipement.webp
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -1,8 +1,7 @@
 {
  "ACTOR": {
    "TypePersonnage": "Personnage",
-    "TypeCellule": "Cellule",
-    "TypeCreature": "Créature"
+    "TypePNJ": "PNJ"
  },

  "ITEM": {
--- a/modules/heritiers-actor-pnj-sheet.js
+++ b/modules/heritiers-actor-pnj-sheet.js
@@ -0,0 +1,26 @@
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+
+import { HeritiersActorSheet } from "./heritiers-actor-sheet.js";
+import { HeritiersUtility } from "./heritiers-utility.js";
+
+/* -------------------------------------------- */
+export class HeritiersActorPNJSheet extends HeritiersActorSheet {
+
+  /** @override */
+  static get defaultOptions() {
+
+    return mergeObject(super.defaultOptions, {
+      classes: ["fvtt-les-heritiers", "sheet", "actor"],
+      template: "systems/fvtt-les-heritiers/templates/actor-pnj-sheet.html",
+      width: 780,
+      height: 840,
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "stats" }],
+      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
+      editScore: false
+    })
+  }
+
+}
--- a/modules/heritiers-actor-sheet.js
+++ b/modules/heritiers-actor-sheet.js
@@ -14,8 +14,8 @@ export class HeritiersActorSheet extends ActorSheet {
    return mergeObject(super.defaultOptions, {
      classes: ["fvtt-les-heritiers", "sheet", "actor"],
      template: "systems/fvtt-les-heritiers/templates/actor-sheet.html",
-      width: 640,
-      height: 720,
+      width: 780,
+      height: 840,
      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "stats" }],
      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
      editScore: false
@@ -38,11 +38,13 @@ export class HeritiersActorSheet extends ActorSheet {
      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
      limited: this.object.limited,
      skills: this.actor.getSkills(),
-      utileSkills :this.actor.organizeUtileSkills(),
+      utileSkillsMental :this.actor.organizeUtileSkills("mental"),
+      utileSkillsPhysical :this.actor.organizeUtileSkills("physical"),
      futileSkills :this.actor.organizeFutileSkills(),
      contacts: this.actor.organizeContacts(),
      armes: duplicate(this.actor.getWeapons()),
      monnaies: duplicate(this.actor.getMonnaies()),
+      pouvoirs: duplicate(this.actor.getPouvoirs()),
      fee: duplicate(this.actor.getFee() || {} ),
      protections: duplicate(this.actor.getArmors()),
      combat: this.actor.getCombatValues(),      
@@ -59,10 +61,13 @@ export class HeritiersActorSheet extends ActorSheet {
      secretsdecouverts: await TextEditor.enrichHTML(this.object.system.biodata.secretsdecouverts, {async: true}),
      questions: await TextEditor.enrichHTML(this.object.system.biodata.questions, {async: true}),
      habitat: await TextEditor.enrichHTML(this.object.system.biodata.habitat, {async: true}),
+      playernotes: await TextEditor.enrichHTML(this.object.system.biodata.playernotes, {async: true}),
      options: this.options,
      owner: this.document.isOwner,
      editScore: this.options.editScore,
-      isGM: game.user.isGM
+      config: game.system.lesheritiers.config,
+      isGM: game.user.isGM,
+      isPNJ: (this.actor.type == "pnj")
    }
    this.formData = formData;

@@ -135,11 +140,45 @@ export class HeritiersActorSheet extends ActorSheet {
      const key = $(event.currentTarget).data("key")
      this.actor.rollCarac(key, false)
    })
+    html.find('.roll-rang').click((event) => {
+      const key = $(event.currentTarget).data("rang-key")
+      this.actor.rollRang(key, false)
+    })    
+    html.find('.roll-root-competence').click((event) => {
+      const compKey = $(event.currentTarget).data("attr-key")
+      this.actor.rollRootCompetence(compKey)
+    })
    html.find('.roll-competence').click((event) => {
      const li = $(event.currentTarget).parents(".item")
      let compId  = li.data("item-id")
      this.actor.rollCompetence(compId)
    })
+    html.find('.roll-attaque-arme').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      let armeId  = li.data("item-id")
+      this.actor.rollAttaqueArme(armeId)
+    })
+    html.find('.roll-attaque-brutale-arme').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      let armeId  = li.data("item-id")
+      this.actor.rollAttaqueBrutaleArme(armeId)
+    })    
+    html.find('.roll-attaque-charge-arme').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      let armeId  = li.data("item-id")
+      this.actor.rollAttaqueChargeArme(armeId)
+    })
+    html.find('.roll-assomer-arme').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      let armeId  = li.data("item-id")
+      this.actor.rollAssomerArme(armeId)
+    })
+    
+    html.find('.roll-pouvoir').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      let pouvoirId = li.data("item-id")
+      this.actor.rollPouvoir(pouvoirId)
+    })
    
    html.find('.item-add').click((event) => {
      const itemType = $(event.currentTarget).data("type")
--- a/modules/heritiers-actor.js
+++ b/modules/heritiers-actor.js
@@ -39,13 +39,14 @@ export class HeritiersActor extends Actor {

    if (data.type == 'personnage') {
      const skills = await HeritiersUtility.loadCompendium("fvtt-les-heritiers.competences")
-      data.items = skills.map(i => i.toObject())
+      data.items = []
+      for (let skill of skills) {
+        if (skill.system.categorie == "utile") {
+          data.items.push(skill.toObject())
+        }
+      }
    }
-    if (data.type == 'creature') {
-      const skills = await HeritiersUtility.loadCompendium("fvtt-les-heritiers.skills-creatures")
-      data.items = skills.map(i => i.toObject())
-      data.items.push({ name: "Arme naturelle 1", type: 'arme', img: "systems/fvtt-les-heritiers/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-les-heritiers/assets/icons/melee.webp", system: { typearme: "contact", bonusmaniementoff: 0, seuildefense: 0, degats: "0" } })
+    if (data.type == 'pnj') {
    }

    return super.create(data, options);
@@ -54,25 +55,7 @@ export class HeritiersActor extends Actor {
  /* -------------------------------------------- */
  prepareArme(arme) {
    arme = duplicate(arme)
-    let combat = this.getCombatValues()
-    if (arme.system.typearme == "contact" || arme.system.typearme == "contactjet") {
-      let bonusDefense = 0
-      arme.system.competence = duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "mêlée"))
-      arme.system.attrKey = "pui"
-      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
-      arme.system.isdefense = true
-    }
-    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
-      if (arme.system.isdefense) {
-        arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense
-      }
-    }
+    arme.system.isMelee = HeritiersUtility.isArmeMelee(arme)
    return arme
  }

@@ -103,38 +86,46 @@ export class HeritiersActor extends Actor {
  }

  /* -----------------------  --------------------- */
+  getItemSorted(types) {
+    let items = this.items.filter(item => types.includes(item.type)) || []
+    HeritiersUtility.sortArrayObjectsByName(items)
+    return items
+  }
  getEquipments() {
-    return this.items.filter(item => item.type == "equipement" || item.type == "accessoire")
+    return this.getItemSorted(["equipement", "accessoire"])
  }
  getAvantages() {
-    return this.items.filter(item => item.type == "avantage")
+    return this.getItemSorted(["avantage"])
  }
  getDesavantages() {
-    return this.items.filter(item => item.type == "desavantage")
+    return this.getItemSorted(["desavantage"])
  }
  getMonnaies() {
-    return this.items.filter(item => item.type == "monnaie")
+    return this.getItemSorted(["monnaie"])
  }
  getArmors() {
-    return this.items.filter(item => item.type == "protection")
+    return this.getItemSorted(["protection"])
  }
  getTalents() {
-    return this.items.filter(item => item.type == "talent")
+    return this.getItemSorted(["talent"])
  }
  getContacts() {
-    return this.items.filter(item => item.type == "contact")
+    return this.getItemSorted(["contact"])
  }
  getAtouts() {
-    return this.items.filter(item => item.type == "atoutfeerique")
+    return this.getItemSorted(["atoutfeerique"])
  }
  getCapacites() {
-    return this.items.filter(item => item.type == "capacitenaturelle")
+    return this.getItemSorted(["capacitenaturelle"])
  }
  getFee() {
    return this.items.find(item => item.type == "fee")
  }
  getProfils() {
-    return this.items.filter(item => item.type == "profil")
+    return this.getItemSorted(["profil"])
+  }
+  getPouvoirs() {
+    return this.getItemSorted(["pouvoir"])
  }
  /* -------------------------------------------- */
  getSkills() {
@@ -151,8 +142,8 @@ export class HeritiersActor extends Actor {
  /* -------------------------------------------- */
  prepareUtileSkill(item) {
    let specList = []
-    if (item.system.categorie == "utile") {
-      for (let spec of item.system.specialites)  {
+    if (item && item.system.categorie && item.system.categorie == "utile") {
+      for (let spec of item.system.specialites) {
        specList.push(spec.name)
      }
    }
@@ -161,31 +152,39 @@ export class HeritiersActor extends Actor {
  }

  /* -------------------------------------------- */
-  organizeUtileSkills() {
+  organizeUtileSkills(kind = "mental") {
    let comp = {}
    for (let key in game.system.lesheritiers.config.competenceProfil) {
-      comp[key] = []
+      if (game.system.lesheritiers.config.competenceProfil[key].kind == kind)
+        comp[key] = { skills: [], niveau: this.system.competences[key].niveau }
    }
    for (let item of this.items) {
      if (item.type == "competence") {
-        if (item.system.categorie == "utile") {
+        if (item.system.categorie == "utile" && comp[item.system.profil]) {
          this.prepareUtileSkill(item)
-          comp[item.system.profil].push(item)
+          comp[item.system.profil].skills.push(item)
        }
      }
    }
-    return comp
+
+    for (let key in comp) {
+      HeritiersUtility.sortArrayObjectsByName(comp[key].skills)
+    }
+    return Object.fromEntries(Object.entries(comp).sort())
  }
  /* -------------------------------------------- */
-  organizeContacts( ) {
+  organizeContacts() {
    let contactList = {}
    for (let item of this.items) {
      if (item.type == "contact") {
        let c = contactList[item.system.contacttype] || { label: game.system.lesheritiers.config.contactType[item.system.contacttype], list: [] }
-        c.list.push( item  )
+        c.list.push(item)
        contactList[item.system.contacttype] = c
      }
    }
+    for (let key in contactList) {
+      HeritiersUtility.sortArrayObjectsByName(contactList[key].list)
+    }
    return contactList
  }

@@ -199,6 +198,7 @@ export class HeritiersActor extends Actor {
        }
      }
    }
+    HeritiersUtility.sortArrayObjectsByName(comp)
    return HeritiersUtility.sortByName(comp)
  }

@@ -279,10 +279,12 @@ export class HeritiersActor extends Actor {
    let item = this.items.find(item => item.id == itemId)
    if (item) {
      console.log("Item ", item, itemField, dataType, value)
-      if (dataType.toLowerCase() == "number") {
-        value = Number(value)
-      } else {
-        value = String(value)
+      if (dataType) {
+        if (dataType.toLowerCase() == "number") {
+          value = Number(value)
+        } else {
+          value = String(value)
+        }
      }
      let update = { _id: item.id, [`system.${itemField}`]: value };
      this.updateEmbeddedDocuments("Item", [update])
@@ -293,14 +295,14 @@ export class HeritiersActor extends Actor {
  getPvMalus() {
    if (this.system.pv.value > 0) {
      if (this.system.pv.value < this.system.pv.max / 2) {
-        return -1
+        return { name: "Santé", value: -1 }
      }
      if (this.system.pv.value < 5) {
-        return -2
+        return { name: "Santé", value: -2 }
      }
-      return 0
+      return { name: "Santé", value: 0 }
    }
-    return "Moribond(e)"
+    return { name: "Moribond(e)", value: -50 }
  }

  /* -------------------------------------------- */
@@ -460,7 +462,23 @@ export class HeritiersActor extends Actor {
    }
    return talents
  }
-
+  /* -------------------------------------------- */
+  getCurrentParade() {
+    if (this.system.statutmasque == "masque") {
+      return this.system.combat.parade.masquee
+    }
+    return this.system.combat.parade.demasquee
+  }
+  /* -------------------------------------------- */
+  getCurrentEsquive() {
+    if (this.system.statutmasque == "masque") {
+      return this.system.combat.esquive.masquee
+    }
+    return this.system.combat.esquive.demasquee
+  }
+  getCurrentResistancePhysique() {
+    return this.system.combat.resistancephysique.value
+  }
  /* -------------------------------------------- */
  getTricherie() {
    return this.system.rang.tricherie.value
@@ -477,7 +495,19 @@ export class HeritiersActor extends Actor {
    tricherie.value = Math.min(tricherie.value, tricherie.max)
    this.update({ 'system.rang.tricherie': tricherie })
  }
-
+  /* -------------------------------------------- */
+  getPireCompetence(compName1, compName2) {
+    let comp1 = this.items.find( it => it.name == compName1)
+    let comp2 = this.items.find( it => it.name == compName2)
+    if ( comp1 && comp2 ) {
+      if (comp1.system.niveau > comp2.system.niveau) {
+        return comp1
+      } else {
+        return comp2
+      }
+    }
+    return undefined
+  }
  /* -------------------------------------------- */
  getCommonRollData(compId = undefined, compName = undefined) {
    let rollData = HeritiersUtility.getBasicRollData()
@@ -493,7 +523,7 @@ export class HeritiersActor extends Actor {
    rollData.useTricherie = false
    rollData.useSpecialite = false
    rollData.useHeritage = false
-    rollData.pvMalus = this.getPvMalus()
+    rollData.rulesMalus.push(this.getPvMalus())

    if (compId) {
      rollData.competence = duplicate(this.items.get(compId) || {})
@@ -502,15 +532,21 @@ export class HeritiersActor extends Actor {
    }
    if (compName) {
      rollData.competence = duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {})
-      this.prepareUtileSkill(rollData.competence)
-      rollData.actionImg = rollData.competence?.img
+      if (rollData.competence && rollData.competence.name) {
+        this.prepareUtileSkill(rollData.competence)
+        rollData.actionImg = rollData.competence?.img
+      } else {
+        rollData.competence = undefined
+      }
    }
+    HeritiersUtility.updateWithTarget(rollData)
+
    return rollData
  }
  /* -------------------------------------------- */
  async rollInitiative() {
    let rollData = this.getCommonRollData(undefined, "Art de la guerre")
-    rollData.mode = "init"    
+    rollData.mode = "init"
    if (this.system.caracteristiques["san"].value > this.system.caracteristiques["per"].value) {
      rollData.caracKey = "san"
    } else {
@@ -520,17 +556,37 @@ export class HeritiersActor extends Actor {
    let rollDialog = await HeritiersRollDialog.create(this, rollData)
    rollDialog.render(true)
  }
-  
+
  /* -------------------------------------------- */
  async rollCarac(key, isInit = false) {
    let rollData = this.getCommonRollData()
-    rollData.mode = "carac"    
+    rollData.mode = "carac"
    rollData.carac = this.system.caracteristiques[key]
    rollData.caracKey = key
    let rollDialog = await HeritiersRollDialog.create(this, rollData)
    rollDialog.render(true)
  }

+  /* -------------------------------------------- */
+  async rollRang(key, isInit = false) {
+    let rollData = this.getCommonRollData()
+    rollData.mode = "rang"
+    rollData.rang = this.system.rang[key]
+    rollData.rangKey = key
+    let rollDialog = await HeritiersRollDialog.create(this, rollData)
+    rollDialog.render(true)
+  }
+  /* -------------------------------------------- */
+  async rollRootCompetence(compKey) {
+    let rollData = this.getCommonRollData()
+    rollData.mode = "competence"
+    console.log("Compkey", compKey)
+    rollData.competence = { name: this.system.competences[compKey].label, system: { niveau: this.system.competences[compKey].niveau } }
+    console.log("RollDatra", rollData)
+    let rollDialog = await HeritiersRollDialog.create(this, rollData)
+    rollDialog.render(true)
+  }
+
  /* -------------------------------------------- */
  async rollCompetence(compId) {
    let rollData = this.getCommonRollData(compId)
@@ -541,45 +597,100 @@ export class HeritiersActor extends Actor {
  }

  /* -------------------------------------------- */
-  async rollArmeOffensif(armeId) {
+  async rollAttaqueArme(armeId) {
    let arme = this.items.get(armeId)
-    if (arme.type == "arme") {
-      arme = this.prepareArme(arme)
+    if (arme) {
+      arme = duplicate(arme)
+      arme.system.isMelee = HeritiersUtility.isArmeMelee(arme)
+      let competenceName = "Tir"
+      let key = "prec"
+      if (  arme.system.isMelee) {
+        competenceName = "Mêlée"
+        key = "agi"
+      }
+      let rollData = this.getCommonRollData(undefined, competenceName)
+      rollData.carac = this.system.caracteristiques[key]
+      rollData.caracKey = key
+      rollData.arme = arme
+      rollData.mode = "arme"
+      if (rollData.defenderTokenId && arme.system.isMelee ) {
+        rollData.cacheDifficulte = true
+      }
+      console.log(">>>> ARME", rollData)
+      let rollDialog = await HeritiersRollDialog.create(this, rollData)
+      rollDialog.render(true)
    }
-    let rollData = this.getCommonRollData(arme.system.attrKey, arme.system.competence._id)
-    rollData.arme = arme
-    HeritiersUtility.updateWithTarget(rollData)
-    console.log("ARME!", rollData)
-    let rollDialog = await HeritiersRollDialog.create(this, rollData)
-    rollDialog.render(true)
  }

  /* -------------------------------------------- */
-  async rollArmeDegats(armeId, targetVigueur = undefined) {
+  async rollAttaqueBrutaleArme(armeId) {
    let arme = this.items.get(armeId)
-    if (arme.type == "arme") {
-      arme = this.prepareArme(arme)
+    if (arme) {
+      let key = "for"
+      let competenceName = "Mêlée"
+      arme.system.isMelee = HeritiersUtility.isArmeMelee(arme)
+      let rollData = this.getCommonRollData(undefined, competenceName)
+      rollData.carac = this.system.caracteristiques[key]
+      rollData.caracKey = key
+      rollData.arme = duplicate(arme)
+      rollData.mode = "attaquebrutale"
+      rollData.rulesMalus.push({ name: "Attaque brutale", value: -2 } )
+      let rollDialog = await HeritiersRollDialog.create(this, rollData)
+      rollDialog.render(true)
    }
-    console.log("DEGATS", arme)
-    let roll = new Roll("1d10+" + arme.system.totalDegats).roll({ async: false })
-    await HeritiersUtility.showDiceSoNice(roll, game.settings.get("core", "rollMode"));
-    let nbEtatPerdus = 0
-    if (targetVigueur) {
-      nbEtatPerdus = Math.floor(roll.total / targetVigueur)
+  }
+  /* -------------------------------------------- */
+  async rollAttaqueChargeArme(armeId) {
+    let arme = this.items.get(armeId)
+    if (arme) {
+      let key = "agi"
+      arme.system.isMelee = HeritiersUtility.isArmeMelee(arme)
+      let pireCompetence = this.getPireCompetence("Mêlée", "Mouvement")
+      let rollData = this.getCommonRollData(undefined, pireCompetence.name)
+      rollData.carac = this.system.caracteristiques[key]
+      rollData.caracKey = key
+      rollData.arme = duplicate(arme)
+      rollData.mode = "attaquecharge"
+      let rollDialog = await HeritiersRollDialog.create(this, rollData)
+      rollDialog.render(true)
    }
-    let rollData = {
-      arme: arme,
-      finalResult: roll.total,
-      alias: this.name,
-      actorImg: this.img,
-      actorId: this.id,
-      actionImg: arme.img,
-      targetVigueur: targetVigueur,
-      nbEtatPerdus: nbEtatPerdus
+  }
+  
+  /* -------------------------------------------- */
+  async rollAssomerArme(armeId) {
+    let arme = this.items.get(armeId)
+    if (arme) {
+      let competenceName = "Mêlée"
+      //arme.system.isMelee = HeritiersUtility.isArmeMelee(arme)
+      let rollData = this.getCommonRollData(undefined, competenceName)
+      rollData.carac = this.system.caracteristiques["agi"]
+      rollData.caracKey = "agi"
+      rollData.arme = duplicate(arme)
+      rollData.mode = "assommer"
+      if (rollData.defenderTokenId) {
+        rollData.cacheDifficulte = true
+      }
+      let rollDialog = await HeritiersRollDialog.create(this, rollData)
+      rollDialog.render(true)
+    }
+  }
+
+  /* -------------------------------------------- */
+  async rollPouvoir(pouvoirId) {
+    let pouvoir = this.items.get(pouvoirId)
+    if (pouvoir) {
+      let rollData = this.getCommonRollData(undefined, undefined)
+      if (pouvoir.system.feeriemasque != "autre") {
+        rollData.pouvoirBase = duplicate(this.system.rang[pouvoir.system.feeriemasque.toLowerCase()])
+        rollData.pouvoirBase.label = "Féerie"
+        rollData.carac = duplicate(this.system.caracteristiques[pouvoir.system.carac])
+        rollData.caracKey = pouvoir.system.carac
+      }
+      rollData.pouvoir = duplicate(pouvoir)
+      rollData.mode = "pouvoir"
+      let rollDialog = await HeritiersRollDialog.create(this, rollData)
+      rollDialog.render(true)
    }
-    HeritiersUtility.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-les-heritiers/templates/chat-degats-result.html`, rollData)
-    })

  }
 }
--- a/modules/heritiers-config.js
+++ b/modules/heritiers-config.js
@@ -8,7 +8,7 @@ export const HERITIERS_CONFIG = {
    "prec": "Précision",
    "esp": "Esprit",
    "per": "Perception",
-    "pres": "Présence",
+    "pres": "Prestance",
    "san": "Sang-Froid"
  },

@@ -25,16 +25,16 @@ export const HERITIERS_CONFIG = {
  },

  competenceProfil  : {
-    "aventurier": "Aventurier",
-    "roublard": "Roublard",
-    "combattant": "Combattant",
-    "erudit": "Erudit",
-    "savant": "Savant",
-    "gentleman": "Gentleman"
+    "aventurier": {kind: "physical", name: "Aventurier"},
+    "roublard": {kind: "physical",name: "Roublard"},
+    "combattant": {kind: "physical",name:"Combattant"},
+    "erudit": {kind: "mental",name:"Erudit"},
+    "savant": {kind: "mental",name:"Savant"},
+    "gentleman": {kind: "mental",name:"Gentleman"}
  },
  baseTestPouvoir: {
    "feerie": "Féerie",
-    "Masque": "Masque",
+    "masque": "Masque",
    "autre": "Autre"
  },
  resistancePouvoir: {
@@ -50,6 +50,10 @@ export const HERITIERS_CONFIG = {
    "passif": "Passif",
    "metamorphose": "Métamorphose"
  },
+  statutMasque: {
+    "masque": "Masqué",
+    "demasque":"Démasqué"
+  },
  niveauPouvoir: {
    "normal": "Normal",
    "profond": "Profond",
@@ -60,20 +64,32 @@ export const HERITIERS_CONFIG = {
    "demasque": "Démasqué"
  },
  seuilsDifficulte: {
-    "0": "Aucun/Non applicable",
+    "-1": "Aucun/Non applicable",
    "5": "Enfantine",
    "6": "Triviale",
+    "7": "Moins Triviale",
    "8": "Aisée",
+    "7": "Moins Aisée",
    "10": "Normale",
+    "11": "Moins Normale",
    "12": "Compliquée",
+    "13": "Plus Compliquée",
    "14": "Difficile",
+    "15": "Plus Difficile",
    "16": "Très Difficile",
+    "17": "Très Très Difficile",
    "18": "Critique",
+    "19": "Plus Critique",
    "20": "Insurmontable",
+    "20": "Très Insurmontable",
    "22": "Surhumaine",
+    "23": "Très Surhumaine",
    "24": "Epique",
+    "25": "Plus Epique",
    "26": "Légendaire",
+    "26": "Très Légendaire",
    "28": "Mythique",
+    "29": "Plus Mythique",
    "30": "Divine"
  },

--- a/modules/heritiers-item-sheet.js
+++ b/modules/heritiers-item-sheet.js
@@ -62,6 +62,7 @@ export class HeritiersItemSheet extends ItemSheet {
      options: this.options,
      owner: this.document.isOwner,
      config: game.system.lesheritiers.config,
+      isArmeMelee: HeritiersUtility.isArmeMelee(this.object),
      description: await TextEditor.enrichHTML(this.object.system.description, {async: true}),
      mr: (this.object.type == 'specialisation'),
      isGM: game.user.isGM
--- a/modules/heritiers-item.js
+++ b/modules/heritiers-item.js
@@ -16,7 +16,8 @@ export const defaultItemImg = {
    accessoire: "systems/fvtt-les-heritiers/assets/icons/item.webp",  
    protection: "systems/fvtt-les-heritiers/assets/icons/armor.webp",  
    fee: "systems/fvtt-les-heritiers/assets/icons/faery_type.webp",
-    profil: "systems/fvtt-les-heritiers/assets/icons/profil.webp"
+    profil: "systems/fvtt-les-heritiers/assets/icons/profil.webp",
+    equipement: "systems/fvtt-les-heritiers/assets/icons/equipement.webp",  
 }

 /**
--- a/modules/heritiers-main.js
+++ b/modules/heritiers-main.js
@@ -11,6 +11,7 @@
 import { HeritiersActor } from "./heritiers-actor.js";
 import { HeritiersItemSheet } from "./heritiers-item-sheet.js";
 import { HeritiersActorSheet } from "./heritiers-actor-sheet.js";
+import { HeritiersActorPNJSheet } from "./heritiers-actor-pnj-sheet.js";
 import { HeritiersCreatureSheet } from "./heritiers-creature-sheet.js";
 import { HeritiersUtility } from "./heritiers-utility.js";
 import { HeritiersCombat } from "./heritiers-combat.js";
@@ -55,7 +56,7 @@ Hooks.once("init", async function () {
  // Register sheet application classes
  Actors.unregisterSheet("core", ActorSheet);
  Actors.registerSheet("fvtt-les-heritiers", HeritiersActorSheet, { types: ["personnage"], makeDefault: true })
-  Actors.registerSheet("fvtt-les-heritiers", HeritiersCreatureSheet, { types: ["creature"], makeDefault: true })
+  Actors.registerSheet("fvtt-les-heritiers", HeritiersActorPNJSheet, { types: ["pnj"], makeDefault: true })

  Items.unregisterSheet("core", ItemSheet);
  Items.registerSheet("fvtt-les-heritiers", HeritiersItemSheet, { makeDefault: true })
--- a/modules/heritiers-roll-dialog.js
+++ b/modules/heritiers-roll-dialog.js
@@ -13,32 +13,46 @@ export class HeritiersRollDialog extends Dialog {

  /* -------------------------------------------- */
  constructor(actor, rollData, html, options, close = undefined) {
+    let buttons = {
+      rolld8: {
+        icon: '<i class="fas fa-check"></i>',
+        label: "Lancer 1d8",
+        callback: () => { this.roll("d8") }
+      },
+      rolld10: {
+        icon: '<i class="fas fa-check"></i>',
+        label: "Lancer 1d10",
+        callback: () => { this.roll("d10") }
+      },
+      rolld12: {
+        icon: '<i class="fas fa-check"></i>',
+        label: "Lancer 1d12",
+        callback: () => { this.roll("d12") }
+      }
+    }
+    if (rollData.tricherie) {
+      buttons["rollTricherie"] = {
+        icon: '<i class="fas fa-check"></i>',
+        label: "Lancer avec 1 Point de Tricherie",
+        callback: () => { this.roll("tricherie") }
+      }
+    }
+    if (rollData.heritage) {
+      buttons["rollHeritage"] = {
+        icon: '<i class="fas fa-check"></i>',
+        label: "Lancer avec 1 Point d'Héritage",
+        callback: () => { this.roll("heritage") }
+      }
+    }
+    buttons["Cancel"] = {
+      icon: '<i class="fas fa-times"></i>',
+      label: "Annuler",
+      callback: () => { this.close() }
+    }
    let conf = {
      title: "Test de Capacité",
      content: html,
-      buttons:
-      {
-        rolld8: {
-          icon: '<i class="fas fa-check"></i>',
-          label: "Lancer 1d8",
-          callback: () => { this.roll("d8") }
-        },
-        rolld10: {
-          icon: '<i class="fas fa-check"></i>',
-          label: "Lancer 1d10",
-          callback: () => { this.roll("d10") }
-        },
-        rolld12: {
-          icon: '<i class="fas fa-check"></i>',
-          label: "Lancer 1d12",
-          callback: () => { this.roll("d12") }
-        },
-        cancel: {
-          icon: '<i class="fas fa-times"></i>',
-          label: "Annuler",
-          callback: () => { this.close() }
-        }
-      },
+      buttons: buttons,
      close: close
    }
    // Overwrite in case of carac only -> 1d10
@@ -64,7 +78,16 @@ export class HeritiersRollDialog extends Dialog {

  /* -------------------------------------------- */
  roll(dice) {
-    this.rollData.mainDice = dice
+    if (dice == "heritage") {
+      this.rollData.useHeritage = true
+    }
+    else {
+      if (dice == "tricherie") {
+        this.rollData.useTricherie = true
+      } else {
+        this.rollData.mainDice = dice
+      }
+    }
    HeritiersUtility.rollHeritiers(this.rollData)
  }

@@ -87,14 +110,15 @@ export class HeritiersRollDialog extends Dialog {
    html.find('#bonus-malus-context').change((event) => {
      this.rollData.bonusMalusContext = Number(event.currentTarget.value)
    })
-    html.find('#useTricherie').change((event) => {
-      this.rollData.useTricherie = event.currentTarget.checked
+    html.find('#bonus-attaque-plusieurs').change((event) => {
+      this.rollData.bonusAttaquePlusieurs = Number(event.currentTarget.value)
    })
    html.find('#useSpecialite').change((event) => {
      this.rollData.useSpecialite = event.currentTarget.checked
    })
-    html.find('#useHeritage').change((event) => {
-      this.rollData.useHeritage = event.currentTarget.checked
+    html.find('#attaqueDos').change((event) => {
+      this.rollData.attaqueDos = event.currentTarget.checked
    })
+    
  }
 }
--- a/modules/heritiers-utility.js
+++ b/modules/heritiers-utility.js
@@ -42,17 +42,16 @@ export class HeritiersUtility {


  /* -------------------------------------------- */
-  static sortByName(table) {  
+  static sortByName(table) {
    return table.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;
+      return a.name.localeCompare(b.name);
+    })
+  }
+
+  /* -------------------------------------------- */
+  static sortArrayObjectsByName(myArray) {
+    myArray.sort((a, b) => {
+      return a.name.localeCompare(b.name);
    })
  }

@@ -115,6 +114,7 @@ export class HeritiersUtility {
      'systems/fvtt-les-heritiers/templates/partial-item-header.html',
      'systems/fvtt-les-heritiers/templates/partial-item-description.html',
      'systems/fvtt-les-heritiers/templates/partial-item-nav.html',
+      'systems/fvtt-les-heritiers/templates/partial-utile-skills.html',
      'systems/fvtt-les-heritiers/templates/partial-list-niveau.html'
    ]
    return loadTemplates(templatePaths);
@@ -269,100 +269,170 @@ export class HeritiersUtility {
  /* -------------------------------------------- */
  static computeMonnaieDetails(valueSC) {
    let po = Math.floor(valueSC / 400)
-    let pa = Math.floor((valueSC - (po*400)) / 20)
-    let sc = valueSC - (po*400) - (pa*20)
+    let pa = Math.floor((valueSC - (po * 400)) / 20)
+    let sc = valueSC - (po * 400) - (pa * 20)
    return {
-      po: po, pa: pa, sc: sc, valueSC: valueSC 
+      po: po, pa: pa, sc: sc, valueSC: valueSC
    }
  }
-  
+
  /* -------------------------------------------- */
  static incDecHeritage() {

  }
-  
+
  /* -------------------------------------------- */
  static computeResult(actor, rollData) {
-    rollData.diceResult = -1
-    let resTab = []
-    for ( let res of rollData.roll.terms[0].results) {
-      rollData.diceResult = Math.max(res.result, rollData.diceResult)      
-      resTab.push(res.result)
-    }    
-    let isFailure = false
-    if (rollData.mainDice.includes("d10")) {
-      if ( rollData.diceResult == 1) {
-        rollData.finalResult -= 3
-        isFailure = true
-      }
-    }
-    if (rollData.mainDice.includes("d12")) {
-      if ( rollData.diceResult == 1 || rollData.diceResult == 2) {
-        rollData.finalResult -= 5
-        isFailure = true
-      }
-    }
-    // Heritage/Tricherie management
+    let isTricherieHeritage = rollData.useHeritage || rollData.useTricherie
+
    rollData.marge = 0
-    if (!isFailure && (rollData.useHeritage || rollData.useTricherie)) {
+
+    if (isTricherieHeritage) {
+      let resTab = [rollData.roll.terms[0].results[0].result, rollData.roll.terms[0].results[1].result, rollData.roll.terms[0].results[2].result]
+      rollData.diceResult = resTab[0] + "," + resTab[1] + "," + resTab[2]
+      let foundryTotal = resTab[0] + resTab[1] + resTab[2] 
+      if (resTab[1] == 1) { resTab[1] -= 4 }
+      if (resTab[2] == 1) { resTab[2] -= 6 }
+      if (resTab[2] == 2) { resTab[2] -= 7 }
+      rollData.finalResult = rollData.roll.total - foundryTotal + Math.max(Math.max(resTab[0], resTab[1]), resTab[2])
+
+      // Gestion des résultats spéciaux
      resTab = resTab.sort()
-      if ( (resTab[0] == resTab[1]) && (resTab[1] == resTab[2])) {
+      if ((resTab[0] == resTab[1]) && (resTab[1] == resTab[2])) {
        rollData.marge = 7
        rollData.isSuccess = true
-        rollData.isCriticalSuccess = true        
+        rollData.isCriticalSuccess = true
+        rollData.isBrelan = true
      }
-      if ((resTab[0]+1 == resTab[1]) && (resTab[1]+1 == resTab[2]) ) {
+      if ((resTab[0] + 1 == resTab[1]) && (resTab[1] + 1 == resTab[2])) {
        rollData.marge = 7
        rollData.isSuccess = true
-        rollData.isCriticalSuccess = true        
-      }      
-      if ( rollData.useTricherie) {
+        rollData.isCriticalSuccess = true
+        rollData.isSuite = true
+      }
+      if (rollData.useTricherie) {
        actor.incDecTricherie(-1)
      }
-      if ( rollData.useHeritage) {
+      if (rollData.useHeritage) {
        this.incDecHeritage()
      }
+
+    } else {
+      rollData.finalResult = rollData.roll.total
+      let rollValue = rollData.roll.terms[0].results[0].result
+      rollData.diceResult = rollData.roll.terms[0].results[0].result
+      if (rollData.mainDice.includes("d10")) {
+        if (rollValue == 1) {
+          rollData.finalResult -= 3 + rollValue // substract 3 and the 1 value that has been added
+        }
+      }
+      if (rollData.mainDice.includes("d12")) {
+        if (rollValue == 1 || rollValue == 2) {
+          rollData.finalResult -= 5 + rollValue // Remove also the dice result has it has been added already
+        }
+      }
    }
-    //rollData.finalResult = Math.max(rollData.finalResult, 0)
-    //console.log("Result : ", rollData)
-    if (rollData.marge == 0 && rollData.sdValue > 0 ) {
-      rollData.marge = rollData.finalResult - rollData.sdValue
-      rollData.isSuccess = (rollData.finalResult >= rollData.sdValue)
-      rollData.isCriticalSuccess = ((rollData.finalResult - rollData.sdValue) >= 7)
-      rollData.isCriticalFailure = ((rollData.finalResult - rollData.sdValue) <= -7)
+
+  }
+
+  /* -------------------------------------------- */
+  static computeArmeDegats(rollData, actor) {
+    rollData.degatsArme = rollData.arme.system.degats + rollData.marge
+    if (rollData.arme.system.categorie == "lourde") {
+      rollData.degatsArme += actor.system.caracteristiques.for.value
+    }
+    if (rollData.arme.system.categorie == "blanche" || rollData.arme.system.categorie == "improvise") {
+      rollData.degatsArme += Math.max(0, actor.system.caracteristiques.for.value - 2)
+    }
+    if (rollData.mode == "attaquecharge") {
+      rollData.degatsArme += 3
    }
  }

+  /* -------------------------------------------- */
+  static computeMarge(rollData, seuil) {
+    if (rollData.marge == 0 && seuil >= 0) {
+      rollData.marge = rollData.finalResult - seuil
+      rollData.isSuccess = (rollData.finalResult >= seuil)
+      rollData.isCriticalSuccess = ((rollData.finalResult - seuil) >= 7)
+      rollData.isCriticalFailure = ((rollData.finalResult - seuil) <= -7)
+    }
+  }
+
+  /* -------------------------------------------- */
+  static async displayUneDefense(rollData, actor, nomDefense, valeurDefense) {
+    rollData.defenderMode = nomDefense
+    rollData.defenderValue = valeurDefense
+    rollData.marge = 0
+    this.computeMarge(rollData, valeurDefense)
+    if (rollData.isSuccess) {
+      this.computeArmeDegats(rollData, actor)
+    }
+    this.createChatWithRollMode(rollData.alias, {
+      content: await renderTemplate(`systems/fvtt-les-heritiers/templates/chat-cc-result.html`, rollData)
+    }, rollData, "selfroll")
+  }
+  /* -------------------------------------------- */
+  static async displayAsssomer(rollData, actor, nomAttaque, etatAssomer, valeurDefense) {
+    rollData.defenderMode = nomAttaque
+    rollData.etatAssommer = etatAssomer
+    rollData.defenderValue = valeurDefense
+    rollData.marge = 0
+    this.computeMarge(rollData, valeurDefense)
+    rollData.dureeAssommer = (rollData.marge) ? rollData.marge*2 : 1 
+    this.createChatWithRollMode(rollData.alias, {
+      content: await renderTemplate(`systems/fvtt-les-heritiers/templates/chat-assommer-result.html`, rollData)
+    }, rollData, "selfroll")
+  }
  /* -------------------------------------------- */
  static async rollHeritiers(rollData) {

    let actor = this.getActorFromRollData(rollData)
+
    //rollData.actionImg = "systems/fvtt-les-heritiers/assets/icons/" + actor.system.attributs[rollData.attrKey].labelnorm + ".webp"
    rollData.carac = duplicate(actor.system.caracteristiques[rollData.caracKey])

-    rollData.nbDice = (rollData.useTricherie || rollData.useHeritage) ? 3 : 1
-    rollData.diceFormula = rollData.nbDice + rollData.mainDice + "kh1"
-    //console.log("BEFORE COMP", rollData)
+    if (rollData.useTricherie || rollData.useHeritage) {
+      rollData.diceFormula = "{1d8, 1d10, 1d12}"
+    } else {
+      rollData.diceFormula = "1" + rollData.mainDice + "kh1"
+    }
+
+    let rangValue = 0
+    if (rollData.rang) {
+      rangValue = rollData.rang.value
+    }
    if (rollData.competence) {
      let compmod = (rollData.competence.system.niveau == 0) ? -3 : 0
      let specBonus = (rollData.useSpecialite) ? 1 : 0
-      rollData.diceFormula += `+${rollData.carac.value}+${rollData.competence.system.niveau}+${specBonus}+${rollData.bonusMalusContext}+${compmod}`
+      rollData.diceFormula += `+${rollData.carac.value}+${rangValue}+${rollData.competence.system.niveau}+${specBonus}+${rollData.bonusMalusContext}+${compmod}`
+    } else if (rollData.pouvoirBase) {
+      rollData.diceFormula += `+${rollData.pouvoirBase.value}+${rangValue}+${rollData.bonusMalusContext}`
    } else {
-      rollData.diceFormula += `+${rollData.carac.value}+${rollData.bonusMalusContext}`
+      rollData.diceFormula += `+${rollData.carac.value}+${rangValue}+${rollData.bonusMalusContext}`
    }
-    rollData.diceFormula += `+${rollData.pvMalus}`
+    let ruleMalus = 0
+    for (let malus of rollData.rulesMalus) {
+      ruleMalus += malus.value
+    }
+    rollData.diceFormula += `+${ruleMalus}`

-    if (rollData.arme && rollData.arme.type == "arme") {
-      rollData.diceFormula += `+${rollData.arme.system.bonusmaniementoff}`
+    let bonusAttaque = rollData.bonusAttaquePlusieurs
+    if (rollData.attaqueDos) {
+      bonusAttaque = 2
+      if (rollData.bonusAttaquePlusieurs) { 
+        bonusAttaque = 3 // Valeur max, cf règle page 197
+      }
    }
+    rollData.diceFormula += `+${bonusAttaque}`

    let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
    await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
    rollData.roll = myRoll
    console.log(">>>> ", myRoll)
-
-    rollData.finalResult = myRoll.total
    this.computeResult(actor, rollData)
+    this.computeMarge(rollData, rollData.sdValue) // Calcul de la marge si seuil présent
+
    if (rollData.mode == "init") {
      actor.setFlag("world", "last-initiative", rollData.finalResult)
    }
@@ -371,6 +441,26 @@ export class HeritiersUtility {
      content: await renderTemplate(`systems/fvtt-les-heritiers/templates/chat-generic-result.html`, rollData)
    }, rollData)

+    // Gestion attaque standard
+    if ( (rollData.mode == "arme" || rollData.mode == "attaquebrutale" || rollData.mode == "attaquecharge") && 
+          rollData.defenderTokenId && rollData.arme) {
+      if (rollData.arme.system.categorie != "trait" && rollData.arme.system.categorie != "poing" && rollData.arme.system.categorie != "epaule" ) {
+        await this.displayUneDefense(rollData, actor, "Parade", rollData.defenderParade)
+        await this.displayUneDefense(rollData, actor, "Esquive", rollData.defenderEsquive)
+      } else if (rollData.sdValue) {
+        this.displayUneDefense(rollData, actor, "A Distance", rollData.sdValue)
+      } else {
+        ui.notifications.warn("Pas de difficulté positionnée pour l'attaque à distance.")
+      }
+    }
+    // Gestion assomer
+    if (rollData.mode == "assommer" && rollData.defenderTokenId && rollData.arme) {
+      await this.displayAsssomer(rollData, actor, "Assommer", "Surprise", rollData.defenderResistancePhysique)
+      await this.displayAsssomer(rollData, actor, "Assommer", "Conscient, Résistance+6", rollData.defenderResistancePhysique+6) 
+      await this.displayAsssomer(rollData, actor, "Assommer", "Conscient, Parade", rollData.defenderParade) 
+      await this.displayAsssomer(rollData, actor, "Assommer", "Conscient, Esquive", rollData.defenderEsquive+6) 
+    }
+
  }

  /* -------------------------------------------- */
@@ -396,6 +486,10 @@ export class HeritiersUtility {
    return game.users.filter(filter).map(user => user._id);
  }

+  /* -------------------------------------------- */
+  static isArmeMelee(arme) {
+    return (arme.type == "arme" && (arme.system.categorie == "lourde" || arme.system.categorie == "blanche" || arme.system.categorie == "improvise")) ? true : false
+  }
  /* -------------------------------------------- */
  static getWhisperRecipients(rollMode, name) {
    switch (rollMode) {
@@ -480,8 +574,11 @@ export class HeritiersUtility {
      rollId: randomID(16),
      rollMode: game.settings.get("core", "rollMode"),
      sdList: game.system.lesheritiers.config.seuilsDifficulte,
-      sdValue: 0,
-      bonusMalusContext: 0
+      sdValue: -1,
+      bonusAttaquePlusieurs: 0,
+      attaqueDos: false,
+      bonusMalusContext: 0,
+      rulesMalus : []
    }
    return rollData
  }
@@ -492,18 +589,18 @@ export class HeritiersUtility {
    if (target) {
      rollData.defenderTokenId = target.id
      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
-      rollData.armeDefense = defender.getBestDefenseValue()
-      rollData.targetVigueur = defender.getVigueur()
-      if (rollData.armeDefense) {
-        rollData.difficulte = rollData.armeDefense.system.totalDefensif
-      } else {
-        ui.notifications.warn("Aucune arme de défense équipée, difficulté manuelle à positionner.")
-      }
+      rollData.defenderName = defender.name
+      rollData.defenderParade = defender.getCurrentParade()
+      rollData.defenderEsquive = defender.getCurrentEsquive()
+      rollData.defenderResistancePhysique = defender.getCurrentResistancePhysique()
    }
  }

  /* -------------------------------------------- */
-  static createChatWithRollMode(name, chatOptions, rollData = undefined) {
+  static createChatWithRollMode(name, chatOptions, rollData = undefined, rollMode = undefined) {
+    if (rollMode == undefined) {
+      rollMode = game.settings.get("core", "rollMode")
+    }
    this.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions, rollData)
  }

--- a/packs/pouvoirs.db
+++ b/packs/pouvoirs.db
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -78,9 +78,7 @@
 .window-app input, .fvtt-les-heritiers .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle {
  font-size: 0.8rem;
 }
-.fvtt-les-heritiers .sheet-header select option {
-  background-color: rgb(68, 25, 25);
-}
+
 .fvtt-les-heritiers .sheet-header input, .fvtt-les-heritiers .sheet-header select {
  color: rgb(41, 38, 38);
 }
@@ -88,6 +86,13 @@
  background: rgba(0,0,0,0.75);
 }

+.page-heading {
+  color: #151c1f;
+}
+.heading-link {
+  color: #151c1f;
+}
+
 .window-app.sheet .window-content {
  margin: 0;
  padding: 0;
@@ -438,7 +443,7 @@ table {border: 1px solid #7a7971;}
  background-repeat: repeat;
 }

-.window-app.sheet .window-content .sheet-header input[type="text"], .window-app.sheet .window-content .sheet-header input[type="number"], .window-app.sheet .window-content .sheet-header input[type="password"], .window-app.sheet .window-content .sheet-header input[type="date"], .window-app.sheet .window-content .sheet-header input[type="time"] {
+.window-app.sheet .window-content .sheet-header input[type="text"], .window-app.sheet .window-content .sheet-header select, .window-app.sheet .window-content .sheet-header input[type="number"], .window-app.sheet .window-content .sheet-header input[type="password"], .window-app.sheet .window-content .sheet-header input[type="date"], .window-app.sheet .window-content .sheet-header input[type="time"] {
  /*color: rgba(36, 37, 37, 0.75);*/
  /*background: rgba(255, 255, 255, 0.05);*/
  /*border: 2px saddlebrown;*/
@@ -647,7 +652,15 @@ ul, li {
  margin: 4px 0;
  padding-top: 7px;
 }
-
+.roll-style {
+  background-color: rgba(56, 32, 32, 0.4);
+  border-radius: 0.25rem;
+  padding-left: 0.25rem;
+  margin-right: 0.25rem;
+}
+.specialisarion-margin {
+  margin-left: 1.5rem;
+}
 .short-label {
  flex-grow: 1;
 }
@@ -1232,7 +1245,10 @@ ul, li {
  position:relative;
  top:1px;
 }
-
+.button-sheet-roll-long1 {
+  max-width: 6.1rem;
+  min-width: 6.1rem;
+}
 .defense-sheet {
  border-radius: 4px;
  text-align: center;
--- a/system.json
+++ b/system.json
@@ -1,7 +1,7 @@
 {
  "id": "fvtt-les-heritiers",
  "description": "Les Héritiers pour FoundryVTT",
-  "version": "10.0.18",
+  "version": "10.0.37",
  "authors": [
    {
      "name": "Uberwald/LeRatierBretonnien",
@@ -19,7 +19,7 @@
  "gridUnits": "m",
  "license": "LICENSE.txt",
  "manifest": "https://www.uberwald.me/gitea/public/fvtt-les-heritiers/raw/branch/master/system.json",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-les-heritiers/archive/fvtt-les-heritiers-10.0.18.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-les-heritiers/archive/fvtt-les-heritiers-10.0.37.zip",
  "languages": [
    {
      "lang": "fr",
--- a/template.json
+++ b/template.json
@@ -2,7 +2,7 @@
  "Actor": {
    "types": [
      "personnage",
-      "creature"
+      "pnj"
    ],
    "templates": {
      "biodata": {
@@ -36,6 +36,7 @@
          "habitat": "",
          "notes": "",
          "statut": "",
+          "playernotes":"",
          "gmnotes": ""
        }
      },
@@ -97,8 +98,8 @@
            "max": 1
          },
          "pres": {
-            "label": "Présence",
-            "labelnorm": "presence",
+            "label": "Prestance",
+            "labelnorm": "prestance",
            "abbrev": "pre",
            "kind": "mental",
            "value": 1,
@@ -115,20 +116,25 @@
            "max": 1
          }
        },
+        "statutmasque": "masque",
        "rang": {
          "tricherie": {
+            "label": "Tricherie",
            "value": 0,
            "max": 0
          },
          "feerie": {
+            "label": "Féerie",
            "value": 0,
            "max": 0
          },
          "masque": {
+            "label": "Masque",
            "value": 0,
            "max": 0
          },
          "heritage": {
+            "label": "Héritage",
            "value": 0,
            "max": 0,
            "scenarios": 0
@@ -141,31 +147,37 @@
        "competences": {
          "aventurier": {
            "label": "Aventurier",
+            "niveau": 0,
            "rang": 0,
            "pp": 0
          },
          "combattant": {
            "label": "Aventurier",
+            "niveau": 0,
            "rang": 0,
            "pp": 0
          },
          "erudit": {
            "label": "Erudit",
+            "niveau": 0,
            "rang": 0,
            "pp": 0
          },
          "gentleman": {
            "label": "Gentleman",
+            "niveau": 0,
            "rang": 0,
            "pp": 0
          },
          "roublard": {
            "label": "Roublard",
+            "niveau": 0,
            "rang": 0,
            "pp": 0
          },
          "savant": {
            "label": "Savant",
+            "niveau": 0,
            "rang": 0,
            "pp": 0
          }
@@ -180,6 +192,8 @@
            "demasquee": 0
          },
          "parade": {
+            "masquee": 0,
+            "demasquee": 0,
            "value": 0
          },
          "resistancephysique": {
@@ -219,6 +233,12 @@
        "biodata",
        "core"
      ]
+    },
+    "pnj": {
+      "templates": [
+        "biodata",
+        "core"
+      ]
    }
  },
  "Item": {
--- a/templates/actor-pnj-sheet.html
+++ b/templates/actor-pnj-sheet.html
@@ -0,0 +1,480 @@
+<form class="{{cssClass}}" autocomplete="off">
+
+  {{!-- Sheet Header --}}
+  <header class="sheet-header">
+    <div class="header-fields background-sheet-header">
+      <div class="flexrow">
+        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+        <div class="flexcol">
+          <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
+          <div class="flexrow">
+
+            <div class="flexrow">
+              <ul class="item-list alternate-list">
+                {{#each system.caracteristiques as |carac key|}}
+                {{#if (eq kind "physical")}}
+                <li class="item flexrow ">
+                  <h4 class="item-name-label competence-name roll-style"><a class="roll-carac" data-key="{{key}}">{{carac.label}}</a></h4>
+                  <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
+                    name="system.caracteristiques.{{key}}.value" value="{{carac.value}}" data-dtype="Number" />
+                  <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
+                    name="system.caracteristiques.{{key}}.rang" value="{{carac.rang}}" data-dtype="Number" />
+                </li>
+                {{/if}}
+                {{/each}}
+              </ul>
+            </div>
+
+            <div class="flexrow">
+              <ul class="item-list alternate-list">
+                {{#each system.caracteristiques as |carac key|}}
+                {{#if (eq kind "mental")}}
+                <li class="item flexrow ">
+                  <h4 class="item-name-label competence-name roll-style"><a class="roll-carac" data-key="{{key}}">{{carac.label}}</a></h4>
+                  <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
+                    name="system.caracteristiques.{{key}}.value" value="{{carac.value}}" data-dtype="Number" />
+                  <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
+                    name="system.caracteristiques.{{key}}.rang" value="{{carac.rang}}" data-dtype="Number" />
+                </li>
+                {{/if}}
+                {{/each}}
+              </ul>
+            </div>
+
+          </div>
+            
+            <div class="flexrow">
+              <label class="item-field-label-short">PV</label>
+              <input type="text" class="item-field-label-short" name="system.pv.value" value="{{system.pv.value}}" data-dtype="Number" />
+              <input type="text" class="item-field-label-short" name="system.pv.max" value="{{system.pv.max}}" data-dtype="Number" />
+              <label class="item-field-label-short">Malus</label>
+              <input type="text" class="item-field-label-short" value="{{pvMalus}}" data-dtype="Number" disabled />
+              <span>&nbsp;&nbsp;</span>
+
+              <select class="item-field-label-medium" type="text" name="system.statutmasque" value="{{system.statutmasque}}" data-dtype="string">
+                {{#select system.statutmasque}}
+                  {{#each config.statutMasque as |categ cKey|}}
+                    <option value="{{cKey}}">{{categ}}</option>
+                  {{/each}}
+                {{/select}}
+                </select>
+  
+              <span>&nbsp;&nbsp;</span>
+              <label class="item-field-label-short">Tricherie</label>
+              <input type="text" class="item-field-label-short" name="system.rang.tricherie.value" value="{{system.rang.tricherie.value}}" data-dtype="Number" />
+              <input type="text" class="item-field-label-short" name="system.rang.tricherie.max" value="{{system.rang.tricherie.max}}" data-dtype="Number" />
+            </div>
+
+        </div>
+      </div>
+  </header>
+
+  {{!-- Sheet Tab Navigation --}}
+  <nav class="sheet-tabs tabs" data-group="primary">
+    <a class="item" data-tab="competences">Compétences</a>
+    <a class="item" data-tab="atouts">Atouts&Matériel</a>
+    <a class="item" data-tab="combat">Combat</a>
+    <a class="item" data-tab="notes">Notes</a>
+  </nav>
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{!-- Competence Tab --}}
+    <div class="tab competences" data-group="primary" data-tab="competences">
+
+      <div class="flexcol">
+
+        <div class="grid-2col">
+
+          <div>
+            {{#each utileSkillsPhysical as |skillDef keyProfil|}}
+              {{> systems/fvtt-les-heritiers/templates/partial-utile-skills.html skillDef=skillDef keyProfil=keyProfil isPNJ=true}}
+            {{/each}}
+          </div>
+
+          <div>
+            {{#each utileSkillsMental as |skillDef keyProfil|}}
+              {{> systems/fvtt-les-heritiers/templates/partial-utile-skills.html skillDef=skillDef keyProfil=keyProfil isPNJ=true}}
+            {{/each}}
+          </div>
+
+        </div>
+
+        <div class="sheet-box color-bg-archetype">
+          <ul class="item-list alternate-list">
+            <li class="item flexrow">
+              <span class="item-field-label-long2">
+                <h3><label class="items-title-text">Compétences Futiles</label></h3>
+              </span>
+              <span class="item-field-label-short">
+                <label class="short-label">Niveau</label>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+            </li>
+            {{#each futileSkills as |skill key|}}
+            <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
+              <span class="item-field-label-long2 roll-style"><a class="roll-competence item-field-label-short"
+                  data-attr-key="tochoose">{{skill.name}}</a></span>
+
+                  <select class="item-field-label-short edit-item-data" type="text"
+                data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
+                {{#select skill.system.niveau}}
+                {{> systems/fvtt-les-heritiers/templates/partial-list-niveau.html}}
+                {{/select}}
+              </select>
+
+              <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>
+
+    </div>
+
+    {{!-- Equipement Tab --}}
+    <div class="tab combat" data-group="primary" data-tab="combat">
+
+      <ul class="item-list alternate-list">
+        <li class="item flexrow">
+          <button class="chat-card-button roll-initiative">Initiative (actuelle : {{initiative}} )</button>
+        </li>
+        <li class="item flexrow list-item items-title-bg">
+          <label class="item-field-label-medium"><strong>Esquive</strong></label>
+          <label class="item-field-label-medium">Masquée</label>
+          <input type="text" class="item-field-label-short" name="system.combat.esquive.masquee" value="{{system.combat.esquive.masquee}}" data-dtype="Number" />
+          <label class="item-field-label-medium">Démasquée</label>
+          <input type="text" class="item-field-label-short" name="system.combat.esquive.demasquee" value="{{system.combat.esquive.demasquee}}" data-dtype="Number" />
+          <label class="item-field-label-medium"><strong>Parade</strong></label>
+          <label class="item-field-label-medium">Masquée</label>
+          <input type="text" class="item-field-label-short" name="system.combat.parade.masquee" value="{{system.combat.parade.masquee}}" data-dtype="Number" />
+          <label class="item-field-label-medium">Démasquée</label>
+          <input type="text" class="item-field-label-short" name="system.combat.parade.demasquee" value="{{system.combat.parade.demasquee}}" data-dtype="Number" />
+        </li>
+        <li class="item flexrow list-item items-title-bg">
+          <label class="item-field-label-long">Rés. physique</label>
+          <input type="text" class="item-field-label-short" name="system.combat.resistancephysique.value" value="{{system.combat.resistancephysique.value}}" data-dtype="Number" />
+          <label class="item-field-label-long">Rés. psychique</label>
+          <input type="text" class="item-field-label-short" name="system.combat.resistancepsychique.value" value="{{system.combat.resistancepsychique.value}}" data-dtype="Number" />
+          <label class="item-field-label-medium">Protection : </label>
+          <input type="text" class="item-field-label-short" name="system.combat.protection.value" value="{{system.combat.protection.value}}" data-dtype="Number" />
+        </li>
+        <li class="item flexrow list-item items-title-bg">
+          <label class="item-field-label-long">Effets secondaires</label>
+          <input type="text" class="item-field-label-short" name="system.combat.effetssecondaires" value="{{system.combat.effetssecondaires}}" data-dtype="String" />
+          <label class="item-field-label-long">Dissimulation : </label>
+          <input type="text" class="item-field-label-short" name="system.combat.dissimulation.value" value="{{system.combat.dissimulation.value}}" data-dtype="Number" />
+        </li>
+        <li class="item flexrow list-item items-title-bg">
+          <label class="item-field-label-long"><strong>Corps à Corps</strong></label>
+          <label class="item-field-label-medium">Masqué</label>
+          <input type="text" class="item-field-label-short" name="system.combat.corpsacorps.masquee" value="{{system.combat.corpsacorps.masquee}}" data-dtype="Number" />
+          <label class="item-field-label-medium">Démasqué</label>
+          <input type="text" class="item-field-label-short" name="system.combat.corpsacorps.demasquee" value="{{system.combat.corpsacorps.demasquee}}" data-dtype="Number" />
+        </li>
+        <li class="item flexrow list-item items-title-bg">
+          <label class="item-field-label-long"><strong>A distance</strong></label>
+          <label class="item-field-label-medium">Masqué</label>
+          <input type="text" class="item-field-label-short" name="system.combat.tir.masquee" value="{{system.combat.tir.masquee}}" data-dtype="Number" />
+          <label class="item-field-label-medium">Démasqué</label>
+          <input type="text" class="item-field-label-short" name="system.combat.tir.demasquee" value="{{system.combat.tir.demasquee}}" data-dtype="Number" />
+        </li>
+      </ul>
+
+      <div class="flexcol">
+
+        <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">Armes</label></h3>
+              </span>
+              <span class="item-field-label-short">
+                <label class="short-label">Attaque</label>
+              </span>
+              <span class="item-field-label-short">
+                <label class="short-label">Dégats</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
+                    class="fas fa-plus"></i></a>
+              </div>
+            </li>
+            {{#each armes as |arme key|}}
+            <li class="item flexrow " data-item-id="{{arme._id}}" data-item-type="arme">
+              <img class="item-name-img" src="{{arme.img}}" />
+              <span class="item-name-label competence-name">{{arme.name}}</span>
+
+              <span class="item-field-label-short">
+                <button class="roll-attaque-arme button-sheet-roll">Attaquer</button>
+              </span>
+
+              <span class="item-field-label-short">
+                {{arme.system.degats}}
+              </span>
+
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-equip" title="Worn">{{#if arme.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>
+            </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">Protections</label></h3>
+              </span>
+              <span class="item-field-label-short">
+                <label class="short-label">Protection</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
+                    class="fas fa-plus"></i></a>
+              </div>
+            </li>
+            {{#each protections as |protection key|}}
+            <li class="item flexrow " data-item-id="{{protection._id}}" data-item-type="protection">
+              <img class="item-name-img" src="{{protection.img}}" />
+              <span class="item-name-label competence-name">{{protection.name}}</span>
+              <span class="item-field-label-short arme-defensif"><label
+                  class="arme-defensif">{{protection.system.protection}}</label>
+              </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>
+    </div>
+
+
+    {{!-- atouts Tab --}}
+    <div class="tab atouts" data-group="primary" data-tab="atouts">
+      
+      <div class="flexrow">
+        <li class="item flexrow " data-item-id="{{fee._id}}" data-item-type="avantage">
+          <img class="item-name-img" src="{{fee.img}}" />
+          <span class="item-field-label-long2">{{fee.name}}</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>
+      </div>
+
+      <div class="flexrow">
+        <ul>
+          <li class="flexrow item">
+            <label class="item-field-label-medium roll-style"><a class="roll-rang item-field-label-short" data-rang-key="feerie">Féerie</a></label> 
+            <input type="text" class="item-field-label-short" name="system.rang.feerie.value" value="{{system.rang.feerie.value}}" data-dtype="Number" />
+            <input type="text" class="item-field-label-short" name="system.rang.feerie.max" value="{{system.rang.feerie.max}}" data-dtype="Number" />
+            <span class="item-field-label-long"></span>
+            <label class="item-field-label-medium roll-style"><a class="roll-rang item-field-label-short" data-rang-key="masque">Masque</a></label> 
+            <input type="text" class="item-field-label-short" name="system.rang.masque.value" value="{{system.rang.masque.value}}" data-dtype="Number" />
+            <input type="text" class="item-field-label-short" name="system.rang.masque.max" value="{{system.rang.masque.max}}" data-dtype="Number" />
+          </li>
+        </ul>
+      </div>
+
+      <div class="flexcol">
+
+        <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">Avantages</label></h3>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+              </div>
+            </li>
+            {{#each avantages as |avantage key|}}
+            <li class="item flexrow " data-item-id="{{avantage._id}}" data-item-type="avantage">
+              <img class="item-name-img" src="{{avantage.img}}" />
+              <span class="item-field-label-long2">{{avantage.name}}</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">Désavantages</label></h3>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+              </div>
+            </li>
+            {{#each desavantages as |desavantage key|}}
+            <li class="item flexrow " data-item-id="{{desavantage._id}}" data-item-type="desavantage">
+              <img class="item-name-img" src="{{desavantage.img}}" />
+              <span class="item-field-label-long2">{{desavantage.name}}</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">Atouts Féériques</label></h3>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+              </div>
+            </li>
+            {{#each atouts as |atout key|}}
+            <li class="item flexrow " data-item-id="{{atout._id}}" data-item-type="atout">
+              <img class="item-name-img" src="{{atout.img}}" />
+              <span class="item-field-label-long2">{{atout.name}}</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 item-field-label-long2-img">
+                <h3><label class="items-title-text">Pouvoirs</label></h3>
+              </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">Masque</label>
+              </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">Type</label>
+              </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">Niveau</label>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+              </div>
+            </li>
+            {{#each pouvoirs as |pouvoir key|}}
+            <li class="item flexrow " data-item-id="{{pouvoir._id}}" data-item-type="pouvoir">
+              <img class="item-name-img" src="{{pouvoir.img}}" />
+              {{#if pouvoir.system.istest}}
+              <span class="item-field-label-long2 roll-style"><a class="roll-pouvoir">{{pouvoir.name}}</a></span>
+              {{else}}              
+              <span class="item-field-label-long2">{{pouvoir.name}}</span>
+              {{/if}}
+              <span class="item-field-label-medium">{{upperFirst pouvoir.system.masquetype}}</span>
+              <span class="item-field-label-medium">{{upperFirst pouvoir.system.pouvoirtype}}</span>
+              <span class="item-field-label-medium">{{upperFirst pouvoir.system.niveau}}</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">Capacités Naturelles</label></h3>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+              </div>
+            </li>
+            {{#each capacites as |capa key|}}
+            <li class="item flexrow " data-item-id="{{capa._id}}" data-item-type="capacite">
+              <img class="item-name-img" src="{{capa.img}}" />
+              <span class="item-field-label-long2">{{capa.name}}</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">Equipements</label></h3>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-add" data-type="equipement" title="Créer un équipement"><i class="fas fa-plus"></i></a>
+              </div>
+            </li>
+            {{#each equipements as |equip key|}}
+            <li class="item flexrow " data-item-id="{{equip._id}}" data-item-type="equipement">
+              <img class="item-name-img" src="{{equip.img}}" />
+              <span class="item-field-label-long2">{{equip.name}}</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>
+
+    </div>
+
+
+    <div class="tab notes" data-group="primary" data-tab="notes">
+      <span>
+        <h3>Historique</h3>
+      </span>
+      <div class="medium-editor item-text-long-line">
+        {{editor description target="system.biodata.description" button=true owner=owner editable=editable}}
+      </div>
+
+    </div>
+
+  </section>
+</form>
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -14,7 +14,7 @@
                {{#each system.caracteristiques as |carac key|}}
                {{#if (eq kind "physical")}}
                <li class="item flexrow ">
-                  <h4 class="item-name-label competence-name"><a class="roll-carac" data-key="{{key}}">{{carac.label}}</a></h4>
+                  <h4 class="item-name-label competence-name roll-style"><a class="roll-carac" data-key="{{key}}">{{carac.label}}</a></h4>
                  <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
                    name="system.caracteristiques.{{key}}.value" value="{{carac.value}}" data-dtype="Number" />
                  <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
@@ -30,7 +30,7 @@
                {{#each system.caracteristiques as |carac key|}}
                {{#if (eq kind "mental")}}
                <li class="item flexrow ">
-                  <h4 class="item-name-label competence-name"><a class="roll-carac" data-key="{{key}}">{{carac.label}}</a></h4>
+                  <h4 class="item-name-label competence-name roll-style"><a class="roll-carac" data-key="{{key}}">{{carac.label}}</a></h4>
                  <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
                    name="system.caracteristiques.{{key}}.value" value="{{carac.value}}" data-dtype="Number" />
                  <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
@@ -41,14 +41,23 @@
              </ul>
            </div>

-          </div>
-            
+          </div>            
            <div class="flexrow">
              <label class="item-field-label-short">PV</label>
              <input type="text" class="item-field-label-short" name="system.pv.value" value="{{system.pv.value}}" data-dtype="Number" />
              <input type="text" class="item-field-label-short" name="system.pv.max" value="{{system.pv.max}}" data-dtype="Number" />
              <label class="item-field-label-short">Malus</label>
              <input type="text" class="item-field-label-short" value="{{pvMalus}}" data-dtype="Number" disabled />
+              <span>&nbsp;&nbsp;</span>
+
+              <select class="item-field-label-medium" type="text" name="system.statutmasque" value="{{system.statutmasque}}" data-dtype="string">
+              {{#select system.statutmasque}}
+                {{#each config.statutMasque as |categ cKey|}}
+                  <option value="{{cKey}}">{{categ}}</option>
+                {{/each}}
+              {{/select}}
+              </select>
+  
              <span>&nbsp;&nbsp;</span>
              <label class="item-field-label-short">Tricherie</label>
              <input type="text" class="item-field-label-short" name="system.rang.tricherie.value" value="{{system.rang.tricherie.value}}" data-dtype="Number" />
@@ -78,41 +87,21 @@

      <div class="flexcol">

-        {{#each utileSkills as |skillList keyProfil|}}
-        <div class="sheet-box color-bg-archetype">
-          <ul class="item-list alternate-list">
-            <li class="item flexrow">
-              <span class="item-field-label-long">
-                <h3><label class="items-title-text">{{upperFirst keyProfil}}</label></h3>
-              </span>
-              <span class="item-field-label-short">
-                <label class="short-label">Niveau</label>
-              </span>
-              <div class="item-filler">&nbsp;</div>
-            </li>
-            {{#each skillList as |skill key|}}
-            <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
-              <span class="item-field-label-long"><a class="roll-competence item-field-label-short"
-                  data-attr-key="tochoose">{{skill.name}}</a></span>
-              <select class="item-field-label-short edit-item-data" type="text"
-                data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
-                {{#select skill.system.niveau}}
-                {{> systems/fvtt-les-heritiers/templates/partial-list-niveau.html}}
-                {{/select}}
-              </select>
+        <div class="grid-2col">

-              <input type="checkbox" class="item-field-label-short" name="skill.system.predilection" {{checked skill.system.predilection}}/>
-
-              <span class="item-field-label-long2">{{skill.specList}}</span>
-
-              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              </div>
-            </li>
+          <div>
+            {{#each utileSkillsPhysical as |skillDef keyProfil|}}
+              {{> systems/fvtt-les-heritiers/templates/partial-utile-skills.html skillDef=skillDef keyProfil=keyProfil}}
            {{/each}}
-          </ul>
+          </div>
+
+          <div>
+            {{#each utileSkillsMental as |skillDef keyProfil|}}
+              {{> systems/fvtt-les-heritiers/templates/partial-utile-skills.html skillDef=skillDef keyProfil=keyProfil}}
+            {{/each}}
+          </div>
+
        </div>
-        {{/each}}

        <div class="sheet-box color-bg-archetype">
          <ul class="item-list alternate-list">
@@ -127,10 +116,10 @@
            </li>
            {{#each futileSkills as |skill key|}}
            <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
-              <span class="item-field-label-long2"><a class="roll-competence item-field-label-short"
+              <span class="item-field-label-long2 roll-style"><a class="roll-competence item-field-label-short"
                  data-attr-key="tochoose">{{skill.name}}</a></span>

-                  <select class="item-field-label-short" type="text"
+                  <select class="item-field-label-short edit-item-data" type="text"
                data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
                {{#select skill.system.niveau}}
                {{> systems/fvtt-les-heritiers/templates/partial-list-niveau.html}}
@@ -163,37 +152,30 @@
          <input type="text" class="item-field-label-short" name="system.combat.esquive.masquee" value="{{system.combat.esquive.masquee}}" data-dtype="Number" />
          <label class="item-field-label-medium">Démasquée</label>
          <input type="text" class="item-field-label-short" name="system.combat.esquive.demasquee" value="{{system.combat.esquive.demasquee}}" data-dtype="Number" />
+          <label class="item-field-label-short">&nbsp;&nbsp;</label>
          <label class="item-field-label-medium"><strong>Parade</strong></label>
-          <input type="text" class="item-field-label-short" name="system.combat.parade.value" value="{{system.combat.parade.value}}" data-dtype="Number" />
+          <label class="item-field-label-medium">Masquée</label>
+          <input type="text" class="item-field-label-short" name="system.combat.parade.masquee" value="{{system.combat.parade.masquee}}" data-dtype="Number" />
+          <label class="item-field-label-medium">Démasquée</label>
+          <input type="text" class="item-field-label-short" name="system.combat.parade.demasquee" value="{{system.combat.parade.demasquee}}" data-dtype="Number" />
        </li>
        <li class="item flexrow list-item items-title-bg">
          <label class="item-field-label-long">Rés. physique</label>
          <input type="text" class="item-field-label-short" name="system.combat.resistancephysique.value" value="{{system.combat.resistancephysique.value}}" data-dtype="Number" />
+          <label class="item-field-label-short">&nbsp;&nbsp;</label>
          <label class="item-field-label-long">Rés. psychique</label>
          <input type="text" class="item-field-label-short" name="system.combat.resistancepsychique.value" value="{{system.combat.resistancepsychique.value}}" data-dtype="Number" />
+          <label class="item-field-label-short">&nbsp;&nbsp;</label>
          <label class="item-field-label-medium">Protection : </label>
          <input type="text" class="item-field-label-short" name="system.combat.protection.value" value="{{system.combat.protection.value}}" data-dtype="Number" />
        </li>
        <li class="item flexrow list-item items-title-bg">
          <label class="item-field-label-long">Effets secondaires</label>
          <input type="text" class="item-field-label-short" name="system.combat.effetssecondaires" value="{{system.combat.effetssecondaires}}" data-dtype="String" />
+          <label class="item-field-label-short">&nbsp;&nbsp;</label>
          <label class="item-field-label-long">Dissimulation : </label>
          <input type="text" class="item-field-label-short" name="system.combat.dissimulation.value" value="{{system.combat.dissimulation.value}}" data-dtype="Number" />
        </li>
-        <li class="item flexrow list-item items-title-bg">
-          <label class="item-field-label-long"><strong>Corps à Corps</strong></label>
-          <label class="item-field-label-medium">Masqué</label>
-          <input type="text" class="item-field-label-short" name="system.combat.corpsacorps.masquee" value="{{system.combat.corpsacorps.masquee}}" data-dtype="Number" />
-          <label class="item-field-label-medium">Démasqué</label>
-          <input type="text" class="item-field-label-short" name="system.combat.corpsacorps.demasquee" value="{{system.combat.corpsacorps.demasquee}}" data-dtype="Number" />
-        </li>
-        <li class="item flexrow list-item items-title-bg">
-          <label class="item-field-label-long"><strong>A distance</strong></label>
-          <label class="item-field-label-medium">Masqué</label>
-          <input type="text" class="item-field-label-short" name="system.combat.tir.masquee" value="{{system.combat.tir.masquee}}" data-dtype="Number" />
-          <label class="item-field-label-medium">Démasqué</label>
-          <input type="text" class="item-field-label-short" name="system.combat.tir.demasquee" value="{{system.combat.tir.demasquee}}" data-dtype="Number" />
-        </li>
      </ul>

      <div class="flexcol">
@@ -204,15 +186,12 @@
              <span class="item-name-label-header">
                <h3><label class="items-title-text">Armes</label></h3>
              </span>
-              <span class="item-field-label-short">
-                <label class="short-label">Attaque</label>
-              </span>
-              <span class="item-field-label-short">
-                <label class="short-label">Défense</label>
-              </span>
              <span class="item-field-label-short">
                <label class="short-label">Dégats</label>
              </span>
+              <span class="item-field-label-short">
+                <label class="short-label">Attaque</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
@@ -225,13 +204,26 @@
              <span class="item-name-label competence-name">{{arme.name}}</span>

              <span class="item-field-label-short">
-                <button class="roll-arme-offensif button-sheet-roll">Attaquer</button>
+                {{arme.system.degats}}
              </span>

              <span class="item-field-label-short">
-                <button class="roll-arme-degats button-sheet-roll">{{arme.system.totalDegats}}</button>
+                <button class="roll-attaque-arme button-sheet-roll">Attaque</button>
              </span>

+              <span class="item-field-label-short">
+                <button class="roll-assomer-arme button-sheet-roll">Assomer</button>
+              </span>
+              
+              {{#if arme.system.isMelee}}
+              <span class="item-field-label-short">
+                <button class="roll-attaque-charge-arme button-sheet-roll">Charger</button>
+              </span>
+              <span class="item-field-label-short">
+                <button class="roll-attaque-brutale-arme button-sheet-roll button-sheet-roll-long1">Attaque brutale</button>
+              </span>
+              {{/if}}
+
              <div class="item-filler">&nbsp;</div>
              <div class="item-controls item-controls-fixed">
                <a class="item-control item-equip" title="Worn">{{#if arme.system.equipped}}<i
@@ -297,11 +289,11 @@
      <div class="flexrow">
        <ul>
          <li class="flexrow item">
-            <label class="item-field-label-medium">Féerie</label> 
+            <label class="item-field-label-medium roll-style"><a class="roll-rang item-field-label-short" data-rang-key="feerie">Féerie</a></label> 
            <input type="text" class="item-field-label-short" name="system.rang.feerie.value" value="{{system.rang.feerie.value}}" data-dtype="Number" />
            <input type="text" class="item-field-label-short" name="system.rang.feerie.max" value="{{system.rang.feerie.max}}" data-dtype="Number" />
            <span class="item-field-label-long"></span>
-            <label class="item-field-label-medium">Masque</label> 
+            <label class="item-field-label-medium roll-style"><a class="roll-rang item-field-label-short" data-rang-key="masque">Masque</a></label> 
            <input type="text" class="item-field-label-short" name="system.rang.masque.value" value="{{system.rang.masque.value}}" data-dtype="Number" />
            <input type="text" class="item-field-label-short" name="system.rang.masque.max" value="{{system.rang.masque.max}}" data-dtype="Number" />
          </li>
@@ -382,6 +374,48 @@
          </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 item-field-label-long2-img">
+                <h3><label class="items-title-text">Pouvoirs</label></h3>
+              </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">Masque</label>
+              </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">Type</label>
+              </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">Niveau</label>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+              </div>
+            </li>
+            {{#each pouvoirs as |pouvoir key|}}
+            <li class="item flexrow " data-item-id="{{pouvoir._id}}" data-item-type="pouvoir">
+              <img class="item-name-img" src="{{pouvoir.img}}" />
+              {{#if pouvoir.system.istest}}
+              <span class="item-field-label-long2 roll-style"><a class="roll-pouvoir">{{pouvoir.name}}</a></span>
+              {{else}}              
+              <span class="item-field-label-long2">{{pouvoir.name}}</span>
+              {{/if}}
+              <span class="item-field-label-medium">{{upperFirst pouvoir.system.masquetype}}</span>
+              <span class="item-field-label-medium">{{upperFirst pouvoir.system.pouvoirtype}}</span>
+              <span class="item-field-label-medium">{{upperFirst pouvoir.system.niveau}}</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">
@@ -421,7 +455,8 @@
              <h3><label class="items-title-text">Equipements</label></h3>
            </span>
            <div class="item-filler">&nbsp;</div>
-            <div class="item-controls item-controls-fixed">
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="equipement" title="Créer un équipement"><i class="fas fa-plus"></i></a>
            </div>
          </li>
          {{#each equipements as |equip key|}}
@@ -441,7 +476,20 @@

    {{!-- Contact Tab --}}
    <div class="tab contact" data-group="primary" data-tab="contact">
-      
+
+      <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 item-field-label-long3">
+              <h3><label class="items-title-text">Contacts, Allies et Ennemis</label></h3>
+            </span>
+            <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="contact" title="Créer un contact"><i class="fas fa-plus"></i></a>
+            </div>
+          </li>
+      </div>
+
      {{#each contacts as |contactList idx|}}
      <div class="sheet-box color-bg-archetype">
        <ul class="item-list alternate-list">
@@ -450,7 +498,8 @@
              <h3><label class="items-title-text">{{contactList.label}}</label></h3>
            </span>
            <div class="item-filler">&nbsp;</div>
-            <div class="item-controls item-controls-fixed">
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="contact" title="Créer un contact"><i class="fas fa-plus"></i></a>
            </div>
          </li>
          {{#each contactList.list as |contact key|}}
@@ -595,18 +644,28 @@
      <div class="medium-editor item-text-long-line">
        {{editor description target="system.biodata.description" button=true owner=owner editable=editable}}
      </div>
+
+      <span>
+        <h3>Notes diverses</h3>
+      </span>
+      <div class="medium-editor item-text-long-line">
+        {{editor playernotes target="system.biodata.playernotes" button=true owner=owner editable=editable}}
+      </div>
+
      <span>
        <h3>Rêves étranges</h3>
      </span>
      <div class="medium-editor item-text-long-line">
        {{editor revesetranges target="system.biodata.revesetranges" button=true owner=owner editable=editable}}
      </div>
+
      <span>
        <h3>Secrets découverts</h3>
      </span>
      <div class="medium-editor item-text-long-line">
        {{editor secretsdecouverts target="system.biodata.secretsdecouverts" button=true owner=owner editable=editable}}
      </div>
+
      <span>
        <h3>Questions en suspens</h3>
      </span>
--- a/templates/chat-assommer-result.html
+++ b/templates/chat-assommer-result.html
@@ -18,11 +18,13 @@

 <div>
  <ul>
-    <li>Arme : {{arme.name}} (+{{arme.system.totalDegats}})</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>Assomer {{defenderName}} en état de : {{etatAssommer}}</li>    
+    
+    {{#if isSuccess}}
+      <li>Marge : {{marge}}</li>
+      <li>{{defenderName}} est assomé pour {{dureeAssommer}} minutes !</li>
+    {{else}}
+      <li>{{defenderName}} n'a pas été assomé et est conscient la tentative !</li>
    {{/if}}
  </ul>
 </div>
--- a/templates/chat-cc-result.html
+++ b/templates/chat-cc-result.html
@@ -0,0 +1,34 @@
+<div class="chat-message-header">
+  {{#if actorImg}}
+  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
+  {{/if}}
+  <h4 class=chat-actor-name>{{alias}}</h4>
+</div>
+
+<hr>
+
+{{#if actionImg}}
+<div>
+  <img class="chat-icon" src="{{actionImg}}" alt="{{name}}" />
+</div>
+{{/if}}
+
+<div class="flexcol">
+</div>
+
+<div>
+  <ul>
+    <li>Défense de {{defenderName}} : {{defenderMode}} ({{defenderValue}})</li>    
+    
+    {{#if isSuccess}}
+      <li>Marge : {{marge}}</li>
+      <li>Degats de l'arme : {{degatsArme}}</li>
+      {{#if isCriticalSuccess}}
+      <Li>Critique : Aubaine ou +2 aux dégats ci-dessus</li>
+      {{/if}}
+    {{else}}
+      <li>Echec face à la {{defenderMode}} !</li>
+    {{/if}}
+
+  </ul>
+</div>
--- a/templates/chat-generic-result.html
+++ b/templates/chat-generic-result.html
@@ -20,6 +20,10 @@
  <ul>
    <li class="heritiers-roll">Caractéristique : {{carac.label}} ({{carac.value}})</li>

+    {{#if rang}}
+    <li>{{rang.label}} : {{rang.value}}</li>
+    {{/if}}
+
    {{#if competence}}
    <li>Compétence : {{competence.name}} ({{competence.system.niveau}})</li>
      {{#if useSpecialite}}
@@ -27,20 +31,38 @@
      {{/if}}
    {{/if}}

+    {{#if arme}}
+    <li>Attaque avec : {{arme.name}}</li>
+      {{#if (eq mode "assommer")}}
+      <li>Attaque pour assommer</li>
+      {{/if}}
+    {{/if}}
+
+    {{#if pouvoir}}
+    <li>Pouvoir : {{pouvoir.name}}</li>
+    <li>Effet : {{pouvoir.system.effet}}</li>
+    {{/if}}
+
    <li>Formule : {{diceFormula}}</li>
-    <li>Résultat du dé : {{diceResult}}</li>
+    <li>Résultat du dé : {{diceResult}} </li>  
+    <li>Total : {{finalResult}} {{#if (gt sdValue "-1")}}(Marge : {{marge}}){{/if}}</li>

-    <li>Total : {{finalResult}}</li>
-
-    {{#if sdValue}}
+    {{#if (gt sdValue "-1")}}
    {{#if isSuccess}}
-    <li class="chat-success">Succés...
+    <li class="chat-success">Succès...
    </li>
    {{else}}
    <li class="chat-failure">Echec...</li>
    {{/if}}
    {{/if}}

+    {{#if isBrelan}}
+    <li class="chat-success">Brelan sur 3 dés !</li>
+    {{/if}}
+    {{#if isSuite}}
+    <li class="chat-success">Suite sur 3 dés !</li>
+    {{/if}}
+
    {{#if isCriticalSuccess}}
    <li class="chat-success">Réussite Critique !!!</li>
    {{/if}}
--- a/templates/partial-utile-skills.html
+++ b/templates/partial-utile-skills.html
@@ -0,0 +1,50 @@
+            <div class="sheet-box color-bg-archetype">
+              <ul class="item-list alternate-list">
+                <li class="item flexrow">
+                  {{#if isPNJ}}
+                    <span class="item-field-label-long roll-style">
+                      <a class="roll-root-competence item-field-label-short" data-attr-key="{{keyProfil}}">
+                        <h3><label class="items-title-text">{{upperFirst keyProfil}}</label></h3>
+                      </a>
+                    </span>
+                  {{else}}
+                    <span class="item-field-label-long">
+                      <h3><label class="items-title-text">{{upperFirst keyProfil}}</label></h3>
+                  </span>
+                  {{/if}}
+
+                  <span class="item-field-label-short">
+                    <label class="short-label">Niveau</label>
+                  </span>
+                  {{#if isPNJ}}
+                    <span class="item-field-label-short">
+                      <input type="text" data-dtype="Number" class="item-field-label-short" name="system.competences.{{keyProfil}}.niveau" value="{{skillDef.niveau}}">
+                    </span>
+                  {{/if}}
+                  <div class="item-filler">&nbsp;</div>
+                </li>
+                {{#each skillDef.skills as |skill key|}}
+                <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
+                  <span class="item-field-label-long roll-style"><a class="roll-competence item-field-label-short"
+                      data-attr-key="tochoose">{{skill.name}}</a></span>
+                  <select class="item-field-label-short edit-item-data" type="text"
+                    data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
+                    {{#select skill.system.niveau}}
+                    {{> systems/fvtt-les-heritiers/templates/partial-list-niveau.html}}
+                    {{/select}}
+                  </select>
+                  <input type="checkbox" class="item-field-label-short edit-item-data" data-item-field="predilection" {{checked skill.system.predilection}}/>
+                  <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>
+                  {{#if (count skill.specList)}}
+                  <li class="item flexrow" data-item-id="{{skill._id}}" data-item-type="competence">
+                    <span class="specialisarion-margin item-field-label-long2">{{skill.specList}}</span>
+                  </li>
+                  {{/if}}
+    
+                {{/each}}
+              </ul>
+            </div>
--- a/templates/roll-dialog-generic.html
+++ b/templates/roll-dialog-generic.html
@@ -8,6 +8,13 @@

  <div class="flexcol">

+    {{#if (eq mode "rang")}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">{{rang.label}}</span>
+      <span class="roll-dialog-label">{{rang.value}}</span>
+    </div>
+    {{/if}}
+    
    {{#if (eq mode "carac")}}
      <div class="flexrow">
        <span class="roll-dialog-label">Caracteristique</span>
@@ -42,22 +49,45 @@
      {{/if}}
    {{/if}}

+    {{#if pouvoir}}
    <div class="flexrow">
-      <span class="roll-dialog-label">Malus de Santé</span>
-      <span class="small-label roll-dialog-label">{{pvMalus}}</span>
+      <span class="roll-dialog-label">Pouvoir : </span>
+      <span class="small-label roll-dialog-label">{{pouvoir.name}}</span>
    </div>
-
-    {{#if tricherie}}
    <div class="flexrow">
-      <span class="roll-dialog-label">Utiliser 1 point de Tricherie ({{tricherie}}) ?</span>
-      <input type="checkbox" class="item-field-label-short" id="useTricherie" {{checked useTricherie}}/>
+      <span class="roll-dialog-label">Activation : </span>
+      <span class="small-label roll-dialog-label">{{pouvoir.system.activation}}</span>
    </div>
+      {{#if pouvoirBase}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">{{pouvoirBase.label}} : </span>
+        <span class="small-label roll-dialog-label">{{pouvoirBase.value}}</span>
+      </div>  
+      {{/if}}
    {{/if}}

-    {{#if heritage}}
+    {{#each rulesMalus as |malus key|}}
    <div class="flexrow">
-      <span class="roll-dialog-label">Utiliser 1 point d'Heritage ? ({{heritage}})</span>
-      <input type="checkbox" class="item-field-label-short" id="useHeritage" {{checked useHeritage}}/>
+      <span class="roll-dialog-label">{{malus.name}}</span>
+      <span class="small-label roll-dialog-label">{{malus.value}}</span>
+    </div>
+    {{/each}}
+
+    {{#if (and arme arme.system.isMelee)}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">Attaque à plusieurs </span>
+      <select class="roll-dialog-label" id="bonus-attaque-plusieurs" type="text" value="{{bonusAttaquePlusieurs}}"
+        data-dtype="Number">
+        {{#select bonusAttaquePlusieurs}}
+        <option value="0">0</option>
+        <option value="1">+1</option>
+        <option value="2">+2</option>
+        {{/select}}
+      </select>
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Attaque dans le dos ?</span>
+      <input type="checkbox" class="item-field-label-short" id="attaqueDos" {{checked attaqueDos}}/>
    </div>
    {{/if}}

@@ -83,6 +113,11 @@
      </select>
    </div>

+    {{#if cacheDifficulte}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">Difficulté Cachée/Inconnue</span>
+    </div>
+    {{else}}
    <div class="flexrow">
      <span class="roll-dialog-label">Difficulté</span>
      <select class="status-small-label color-class-common" id ="sdValue" type="text" name="sdValue" value="sdValue" data-dtype="string" >
@@ -93,6 +128,7 @@
        {{/select}}
      </select>
    </div>
+    {{/if}}

  </div>
Author	SHA1	Message	Date
LeRatierBretonnien	05026d454b	Add attaque dos+plusieurs	2023-04-10 14:11:47 +02:00
LeRatierBretonnien	6497369d7f	Gestion assommer/charge	2023-04-09 21:45:46 +02:00
LeRatierBretonnien	5e5ddd1c3b	Rework combat	2023-04-08 20:21:09 +02:00
LeRatierBretonnien	a72108db5b	Rework combat	2023-04-08 18:50:30 +02:00
LeRatierBretonnien	6a46faadc2	Rework combat	2023-04-08 18:49:54 +02:00
LeRatierBretonnien	e95f7de0c5	Fix divers	2023-04-08 09:55:08 +02:00
LeRatierBretonnien	9d3ef8cbeb	CSS journal fix	2023-04-07 16:56:37 +02:00
LeRatierBretonnien	c6ec1b74a2	Petits fixes	2023-03-13 20:39:38 +01:00
LeRatierBretonnien	1b12dc44c9	Fiches de PNJ	2023-03-13 09:00:49 +01:00
LeRatierBretonnien	f26cd7670c	Various fixes	2023-03-11 12:11:27 +01:00
LeRatierBretonnien	02f8207fb7	Tri alpha + ajout contacts	2023-03-10 13:21:06 +01:00
LeRatierBretonnien	439797e71e	Fix predilection	2023-03-10 09:30:43 +01:00
LeRatierBretonnien	1d82a6aa60	Fix predilection	2023-03-10 09:08:10 +01:00
LeRatierBretonnien	11b0f22aa7	Diverses ameliorations	2023-03-09 13:16:19 +01:00
LeRatierBretonnien	b0a3cb08cb	Fix sur armes et affichage	2023-03-09 00:26:52 +01:00
LeRatierBretonnien	2f3a8e91bd	Fix sur armes et affichage	2023-03-09 00:04:23 +01:00
LeRatierBretonnien	f00825ea91	Fix sur armes et affichage	2023-03-08 23:44:59 +01:00
LeRatierBretonnien	3fa80b6e57	Fix sur armes et affichage	2023-03-08 23:44:19 +01:00