Foundry v13 migration

.gitignore

@@ -0,0 +1 @@
+.history/

README.md

@@ -1,8 +1,8 @@
-# Système Foundry pour Hawkmoon (French RPG, Titam France/Sombres Projets)
+# Système Foundry pour Les Héritiers (French RPG, Titam France/Sombres Projets)
 
 ## EN
 
-Unofficial system for Hawkmoon (French version from Titam France).
+Unofficial system for Les Heritiers (from Titam France).
 
 This system has been approved by Département des Sombres Projets ( http://www.titam-france.fr/ ), thanks !
 
@@ -10,7 +10,7 @@ Books are mandatory to play and are available at : http://www.titam-france.fr
 
 ## FR
 
-Système non-officiel pour le JDR Hawkmoon (Titam France/Sombres Projets).
+Système non-officiel pour le JDR Les Héritiers (Titam France/Sombres Projets).
 
 Ce système a été autorisé par le Département des Sombres Projets ( http://www.titam-france.fr/ ), merci à eux !
 
@@ -18,7 +18,7 @@ Les livres du jeu sont nécessaires pour jouer, et sont disponibles ici : http:/
 
 # Credits 
 
-Hawkmoon, le jeu de rôle du Troisième Millénaire, is a property of Titam France/Sombres Projets.
+Les Héritiers, is a property of Titam France/Sombres Projets.
 
 # Developmement 
 
@@ -26,4 +26,4 @@ LeRatierBretonnien
 
 # Tests, icones et saisie des données
 
-Prêtre, Blondin, Zechrub/Chris, Kyllian, Lightbringer
+Prêtre, Carter

lang/fr.json

@@ -1,31 +1,24 @@
 {
-  "ACTOR": {
-    "TypePersonnage": "Personnage",
-    "TypeCellule": "Cellule",
-    "TypeCreature": "Créature"
-  },
-
-  "ITEM": {
-    "TypeArtefact": "Artefact",
-    "TypeArme": "Arme",
-    "TypeTalent": "Talent",
-    "TypeHistorique": "Historique",
-    "TypeProfil": "Profil",
-    "TypeCompetence": "Compétence",
-    "TypeProtection": "Protection",
-    "TypeMonnaie": "Monnaie",
-    "TypeEquipement": "Equipement",
-    "TypeRessource": "Ressource", 
-    "TypeContact": "Contact"
-
-  },
-
-  "HAWKMOON": {
-    "ui": {
-      "editContact": "Modifier le contact",
-      "deleteContact": "Supprimer le contact",
-      "editTrait": "Modifier le trait",
-      "deleteTrait": "Supprimer le trait"
+  "TYPES": {
+    "Actor": {
+      "personnage": "Personnage",
+      "pnj": "PNJ"
+    },
+    "Item": {
+      "accessoire": "Accessoire",
+      "arme": "Arme",
+      "atoutfeerique": "Atout féerique",
+      "avantage": "Avantage",
+      "capacitenaturelle": "Capacité naturelle",
+      "competence": "Compétence",
+      "contact": "Contact",
+      "desavantage": "Désavantage",
+      "equipement": "Equipement",
+      "fee": "Fée",
+      "pouvoir": "Pouvoir",
+      "profil": "Profil",
+      "protection": "Protection",
+      "sort": "Sort"
     }
   }
 }

modules/heritiers-actor-pnj-sheet.js

@@ -3,23 +3,24 @@
  * @extends {ActorSheet}
  */
 
- import { HeritiersActorSheet } from "./heritiers-actor-sheet.js";
+import { HeritiersActorSheet } from "./heritiers-actor-sheet.js";
 import { HeritiersUtility } from "./heritiers-utility.js";
 
 /* -------------------------------------------- */
-export class HeritiersCreatureSheet extends HeritiersActorSheet {
+export class HeritiersActorPNJSheet extends HeritiersActorSheet {
 
   /** @override */
   static get defaultOptions() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-les-heritiers", "sheet", "actor"],
-      template: "systems/fvtt-les-heritiers/templates/creature-sheet.html",
-      width: 640,
-      height: 720,
+      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
     })
   }
+
 }

modules/heritiers-actor-sheet.js

@@ -6,16 +6,16 @@
 import { HeritiersUtility } from "./heritiers-utility.js";
 
 /* -------------------------------------------- */
-export class HeritiersActorSheet extends ActorSheet {
+export class HeritiersActorSheet extends foundry.appv1.sheets.ActorSheet {
 
   /** @override */
   static get defaultOptions() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.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
@@ -24,7 +24,7 @@ export class HeritiersActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = duplicate(this.object)    
+    const objectData = foundry.utils.duplicate(this.object)
 
     let formData = {
       title: this.title,
@@ -38,32 +38,38 @@ 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(),      
-      equipements: duplicate(this.actor.getEquipments()),
-      avantages: duplicate(this.actor.getAvantages()),
-      atouts: duplicate(this.actor.getAtouts()),
-      capacites: duplicate(this.actor.getCapacites()),
-      desavantages: duplicate(this.actor.getDesavantages()),
-      profils: duplicate(this.actor.getProfils()),
-      pvMalus: this.actor.getPvMalus(),      
+      armes: foundry.utils.duplicate(this.actor.getWeapons()),
+      monnaies: foundry.utils.duplicate(this.actor.getMonnaies()),
+      pouvoirs: foundry.utils.duplicate(this.actor.getPouvoirs()),
+      fee: foundry.utils.duplicate(this.actor.getFee() || {} ),
+      protections: foundry.utils.duplicate(this.actor.getArmors()),
+      combat: this.actor.getCombatValues(),
+      equipements: foundry.utils.duplicate(this.actor.getEquipments()),
+      avantages: foundry.utils.duplicate(this.actor.getAvantages()),
+      atouts: foundry.utils.duplicate(this.actor.getAtouts()),
+      capacites: foundry.utils.duplicate(this.actor.getCapacites()),
+      desavantages: foundry.utils.duplicate(this.actor.getDesavantages()),
+      profils: foundry.utils.duplicate(this.actor.getProfils()),
+      pvMalus: this.actor.getPvMalus(),
+      heritage: game.settings.get("fvtt-les-heritiers", "heritiers-heritage"),
       initiative: this.actor.getFlag("world", "last-initiative") || -1,
-      description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),
-      revesetranges: await TextEditor.enrichHTML(this.object.system.biodata.revesetranges, {async: true}),
-      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}),
+      description: await  foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.description, {async: true}),
+      revesetranges: await  foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.revesetranges, {async: true}),
+      secretsdecouverts: await  foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.secretsdecouverts, {async: true}),
+      questions: await  foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.questions, {async: true}),
+      habitat: await  foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.habitat, {async: true}),
+      playernotes: await  foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.playernotes, {async: true}),
+      magieList: this.actor.prepareMagie(),
       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;
 
@@ -72,19 +78,42 @@ export class HeritiersActorSheet extends ActorSheet {
   }
 
   /* -------------------------------------------- */
-  getCelluleTalents( )  {
-    let talents = []
-    for(let cellule of game.actors) {
-      if (cellule.type == "cellule") {
-        let found = cellule.system.members.find( it => it.id == this.actor.id)
-        if (found) {
-          talents = talents.concat( cellule.getTalents() )
+  dialogRecupUsage() {
+    new Dialog({
+      title: "Récupération des Points d'Usage",
+      content: "<p>Combien de Points d'Usage souhaitez-vous récupérer ?</p>",
+      buttons: {
+        one: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "1 Point",
+          callback: () => {
+            this.actor.recupUsage(1)
+          }
+        },
+        two: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "2 Points",
+          callback: () => {
+            this.actor.recupUsage(2)
+          }
+        },
+        four: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "4 Points",
+          callback: () => {
+            this.actor.recupUsage(4)
+          }
+        },
+        all: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "Tous les Points",
+          callback: () => {
+            this.actor.recupUsage(100)
+          }
         }
       }
-    }
-    return talents
+    }).render(true)
   }
-
   /* -------------------------------------------- */
   /** @override */
   activateListeners(html) {
@@ -92,14 +121,14 @@ export class HeritiersActorSheet extends ActorSheet {
 
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
-    
+
     // Update Inventory Item
     html.find('.item-edit').click(ev => {
       const li = $(ev.currentTarget).parents(".item")
       let itemId = li.data("item-id")
       const item = this.actor.items.get( itemId )
       item.sheet.render(true)
-    })      
+    })
     // Delete Inventory Item
     html.find('.item-delete').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
@@ -121,7 +150,7 @@ export class HeritiersActorSheet extends ActorSheet {
       let value = Number($(event.currentTarget).data("adversite-value"))
       this.actor.incDecAdversite(adv, value)
     })
-    
+
     html.find('.quantity-modify').click(event => {
       const li = $(event.currentTarget).parents(".item")
       const value = Number($(event.currentTarget).data("quantite-value"))
@@ -131,34 +160,76 @@ export class HeritiersActorSheet extends ActorSheet {
     html.find('.roll-initiative').click((event) => {
       this.actor.rollInitiative()
     })
-    
+
     html.find('.roll-carac').click((event) => {
       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-sort').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      let sortId  = li.data("item-id")
+      this.actor.rollSort(sortId)
+    })
+    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('.dialog-recup-usage').click((event) => {
+      this.dialogRecupUsage()
+    })
+
     html.find('.item-add').click((event) => {
       const itemType = $(event.currentTarget).data("type")
       this.actor.createEmbeddedDocuments('Item', [{ name: `Nouveau ${itemType}`, type: itemType }], { renderSheet: true })
     })
-    
+
     html.find('.lock-unlock-sheet').click((event) => {
       this.options.editScore = !this.options.editScore;
       this.render(true);
-    });    
+    });
     html.find('.item-equip').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
       this.actor.equipItem( li.data("item-id") );
-      this.render(true);      
+      this.render(true);
     });
 
   }
-  
+
   /* -------------------------------------------- */
   /** @override */
   setPosition(options = {}) {

modules/heritiers-actor.js

@@ -41,16 +41,12 @@ export class HeritiersActor extends Actor {
       const skills = await HeritiersUtility.loadCompendium("fvtt-les-heritiers.competences")
       data.items = []
       for (let skill of skills) {
-        if (skill.system.categorie == "utile") {
-          data.items.push( skill.toObject())    
-        } 
+        if (skill.system.categorie == "utile" && skill.system.profil != "magie") {
+          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);
@@ -58,26 +54,8 @@ 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 = foundry.utils.duplicate(arme)
+    arme.system.isMelee = HeritiersUtility.isArmeMelee(arme)
     return arme
   }
 
@@ -92,13 +70,23 @@ export class HeritiersActor extends Actor {
     return armes
   }
   /* -------------------------------------------- */
+  getOtherMeleeWeapons(excludeArme) {
+    let armes = []
+    for (let arme of this.items) {
+      if (HeritiersUtility.isArmeMelee(arme) && arme.id != excludeArme._id) {
+        armes.push(this.prepareArme(arme))
+      }
+    }
+    return armes
+  }
+  /* -------------------------------------------- */
   getMonnaies() {
     return this.items.filter(it => it.type == "monnaie")
   }
 
   /* -----------------------  --------------------- */
   addMember(actorId) {
-    let members = duplicate(this.system.members)
+    let members = foundry.utils.duplicate(this.system.members)
     members.push({ id: actorId })
     this.update({ 'system.members': members })
   }
@@ -108,49 +96,94 @@ 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() {
-    let pouvoirs = this.items.filter(item => item.type == "pouvoir")
+    let pouvoirs = []
+    for (let item of this.items) {
+      if (item.type == "pouvoir") {
+        let itemObj = foundry.utils.duplicate(item)
+        itemObj.maxUsage = this.getPouvoirUsageMax(item)
+        pouvoirs.push(itemObj)
+      }
+    }
     HeritiersUtility.sortArrayObjectsByName(pouvoirs)
     return pouvoirs
   }
+  getSorts() {
+    return this.getItemSorted(["sort"])
+  }
+  getCompetencesMagie() {
+    let comp = []
+    for (let item of this.items) {
+      if (item.type == "competence" && item.system.profil == "magie") {
+        let itemObj = foundry.utils.duplicate(item)
+        comp.push(itemObj)
+      }
+    }
+    HeritiersUtility.sortArrayObjectsByName(comp)
+    return comp
+  }
+  prepareMagie() {
+    let magieList = []
+    for (let item of this.items) {
+      if (item.type == "competence" && item.system.profil == "magie") {
+        let magie = {}
+        magie.name = item.name
+        magie.competence = foundry.utils.duplicate(item)
+        magie.sorts = []
+        for (let sort of this.items) {
+          if (sort.type == "sort" && sort.system.competence == item.name) {
+            magie.sorts.push(sort)
+          }
+        }
+        magieList.push(magie)
+      }
+    }
+    return magieList
+  }
+
   /* -------------------------------------------- */
   getSkills() {
     let comp = []
     for (let item of this.items) {
-      item = duplicate(item)
+      item = foundry.utils.duplicate(item)
       if (item.type == "competence") {
         comp.push(item)
       }
@@ -161,8 +194,8 @@ export class HeritiersActor extends Actor {
   /* -------------------------------------------- */
   prepareUtileSkill(item) {
     let specList = []
-    if (item.system.categorie == "utile") {
-      for (let spec of item.system.specialites)  {
+    if (item?.system?.categorie == "utile") {
+      for (let spec of item.system.specialites) {
         specList.push(spec.name)
       }
     }
@@ -171,32 +204,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)
         }
       }
     }
-    HeritiersUtility.sortArrayObjectsByName(comp)
-    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
   }
 
@@ -250,9 +290,39 @@ export class HeritiersActor extends Actor {
 
   /* -------------------------------------------- */
   async prepareData() {
+
+    let pvMax = (this.system.caracteristiques.con.rang * 3) + 9 + this.system.pv.mod
+    if (this.system.pv.max != pvMax) {
+      this.update({ 'system.pv.max': pvMax })
+    }
+    if (this.system.biodata.magie || this.type == "pnj") {
+      let pointsAmes = this.system.caracteristiques.esp.rang + this.system.caracteristiques.san.rang + this.getMaxRangMagie()
+      if (this.system.magie.pointsame.max != pointsAmes) {
+        this.update({ 'system.magie.pointsame.max': pointsAmes })
+      }
+    }
+    
     super.prepareData();
   }
 
+  /* -------------------------------------------- */
+  getMaxRangMagie() {
+    let niv = 0
+    let bestMagie
+    for (let comp of this.items) {
+      if (comp.type == "competence" && comp.system.profil == "magie") {
+        if (comp.system.niveau > niv) {
+          bestMagie = comp
+          niv = comp.system.niveau
+        }
+      }
+    }
+    if (bestMagie) {
+      return Math.round(bestMagie.system.niveau / 2)
+    }
+    return 0
+  }
+
   /* -------------------------------------------- */
   prepareDerivedData() {
 
@@ -272,7 +342,7 @@ export class HeritiersActor extends Actor {
   getItemById(id) {
     let item = this.items.find(item => item.id == id);
     if (item) {
-      item = duplicate(item)
+      item = foundry.utils.duplicate(item)
     }
     return item;
   }
@@ -280,7 +350,7 @@ export class HeritiersActor extends Actor {
   /* -------------------------------------------- */
   async equipItem(itemId) {
     let item = this.items.find(item => item.id == itemId)
-    if (item && item.system) {
+    if (item?.system) {
       let update = { _id: item.id, "system.equipped": !item.system.equipped }
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
@@ -291,10 +361,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])
@@ -304,15 +376,15 @@ export class HeritiersActor extends Actor {
   /* -------------------------------------------- */
   getPvMalus() {
     if (this.system.pv.value > 0) {
-      if (this.system.pv.value < this.system.pv.max / 2) {
-        return -1
-      }
       if (this.system.pv.value < 5) {
-        return -2
+        return { name: "Santé", value: -2 }
       }
-      return 0
+      if (this.system.pv.value < this.system.pv.max / 2) {
+        return { name: "Santé", value: -1 }
+      }
+      return { name: "Santé", value: 0 }
     }
-    return "Moribond(e)"
+    return { name: "Moribond(e)", value: -50 }
   }
 
   /* -------------------------------------------- */
@@ -328,7 +400,7 @@ export class HeritiersActor extends Actor {
 
   /* -------------------------------------------- */
   getCarac(attrKey) {
-    return duplicate(this.system.caracteristiques)
+    return foundry.utils.duplicate(this.system.caracteristiques)
   }
 
   /* -------------------------------------------- */
@@ -339,7 +411,7 @@ export class HeritiersActor extends Actor {
   /* -------------------------------------------- */
   async equipGear(equipmentId) {
     let item = this.items.find(item => item.id == equipmentId);
-    if (item && item.system.data) {
+    if (item?.system) {
       let update = { _id: item.id, "system.equipped": !item.system.equipped };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
@@ -349,13 +421,13 @@ export class HeritiersActor extends Actor {
   getSubActors() {
     let subActors = [];
     for (let id of this.system.subactors) {
-      subActors.push(duplicate(game.actors.get(id)));
+      subActors.push(foundry.utils.duplicate(game.actors.get(id)));
     }
     return subActors;
   }
   /* -------------------------------------------- */
   async addSubActor(subActorId) {
-    let subActors = duplicate(this.system.subactors);
+    let subActors = foundry.utils.duplicate(this.system.subactors);
     subActors.push(subActorId);
     await this.update({ 'system.subactors': subActors });
   }
@@ -377,7 +449,7 @@ export class HeritiersActor extends Actor {
 
   /* -------------------------------------------- */
   async incDecAdversite(adv, incDec = 0) {
-    let adversite = duplicate(this.system.adversite)
+    let adversite = foundry.utils.duplicate(this.system.adversite)
     adversite[adv] += Number(incDec)
     adversite[adv] = Math.max(adversite[adv], 0)
     this.update({ 'system.adversite': adversite })
@@ -424,7 +496,7 @@ export class HeritiersActor extends Actor {
   /* -------------------------------------------- */
   async setPredilectionUsed(compId, predIdx) {
     let comp = this.items.get(compId)
-    let pred = duplicate(comp.system.predilections)
+    let pred = foundry.utils.duplicate(comp.system.predilections)
     pred[predIdx].used = true
     await this.updateEmbeddedDocuments('Item', [{ _id: compId, 'system.predilections': pred }])
   }
@@ -446,7 +518,7 @@ export class HeritiersActor extends Actor {
       }
       if (arme.system.totalDefensif > maxDef) {
         maxDef = arme.system.totalDefensif
-        bestArme = duplicate(arme)
+        bestArme = foundry.utils.duplicate(arme)
       }
     }
     return bestArme
@@ -461,7 +533,7 @@ export class HeritiersActor extends Actor {
         for (let auto of talent.system.automations) {
           if (auto.eventtype === "prepare-roll") {
             if (auto.competence.toLowerCase() == competence.name.toLowerCase()) {
-              talent = duplicate(talent)
+              talent = foundry.utils.duplicate(talent)
               talent.system.bonus = auto.bonus
               talent.system.baCost = auto.baCost
               talents.push(talent)
@@ -472,7 +544,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
@@ -485,9 +573,27 @@ export class HeritiersActor extends Actor {
   incDecTricherie(value) {
     let tricherie = this.system.rang.tricherie
     tricherie.value += value
+    if (tricherie.value < 0 || tricherie.value > tricherie.max) {
+      ui.notifications.warn("Pas assez de points de Tricherie !")
+      return false
+    }
     tricherie.value = Math.max(tricherie.value, 0)
     tricherie.value = Math.min(tricherie.value, tricherie.max)
     this.update({ 'system.rang.tricherie': tricherie })
+    return true
+  }
+  /* -------------------------------------------- */
+  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
   }
 
   /* -------------------------------------------- */
@@ -505,24 +611,31 @@ export class HeritiersActor extends Actor {
     rollData.useTricherie = false
     rollData.useSpecialite = false
     rollData.useHeritage = false
-    rollData.pvMalus = this.getPvMalus()
+    rollData.pouvoirPointsUsage = 1
+    rollData.rulesMalus.push(this.getPvMalus())
 
     if (compId) {
-      rollData.competence = duplicate(this.items.get(compId) || {})
+      rollData.competence = foundry.utils.duplicate(this.items.get(compId) || {})
       this.prepareUtileSkill(rollData.competence)
       rollData.actionImg = rollData.competence?.img
     }
     if (compName) {
-      rollData.competence = duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {})
-      this.prepareUtileSkill(rollData.competence)
-      rollData.actionImg = rollData.competence?.img
+      rollData.competence = foundry.utils.duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {})
+      if (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 {
@@ -532,17 +645,36 @@ 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"
+    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)
@@ -553,45 +685,237 @@ export class HeritiersActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  async rollArmeOffensif(armeId) {
-    let arme = this.items.get(armeId)
-    if (arme.type == "arme") {
-      arme = this.prepareArme(arme)
+  async rollSort(sortId) {
+    let sort = this.items.get(sortId)
+    let comp = this.items.find(it => it.type =="competence" && it.name.toLowerCase() == sort.system.competence.toLowerCase())
+    if (!comp) {
+      ui.notifications.warn("Compétence de magie associée non trouvée !")
+      return
     }
-    let rollData = this.getCommonRollData(arme.system.attrKey, arme.system.competence._id)
-    rollData.arme = arme
-    HeritiersUtility.updateWithTarget(rollData)
-    console.log("ARME!", rollData)
+
+    let rollData = this.getCommonRollData(comp.id)
+    rollData.mode = "sort"
+    rollData.sort = foundry.utils.duplicate(sort)
+    rollData.sdValue = HeritiersUtility.getSDSortValue(sort.system.niveau)
+    rollData.sortPointsAme = sort.system.niveau
+    rollData.caracKey = sort.system.carac 
+    console.log("RollData", rollData)
     let rollDialog = await HeritiersRollDialog.create(this, rollData)
     rollDialog.render(true)
   }
+  
+  /* -------------------------------------------- */
+  async rollAttaqueArme(armeId) {
+    let arme = this.items.get(armeId)
+    if (arme) {
+      arme = foundry.utils.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"
+      rollData.armes = this.getOtherMeleeWeapons(arme)
+      if (rollData.defenderTokenId && arme.system.isMelee) {
+        rollData.cacheDifficulte = true
+      }
+      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 = foundry.utils.duplicate(arme)
+      rollData.mode = "attaquebrutale"
+      rollData.armes = this.getOtherMeleeWeapons(arme)
+      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 = foundry.utils.duplicate(arme)
+      rollData.armes = this.getOtherMeleeWeapons(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 = foundry.utils.duplicate(arme)
+      rollData.mode = "assommer"
+      if (rollData.defenderTokenId) {
+        rollData.cacheDifficulte = true
+      }
+      let rollDialog = await HeritiersRollDialog.create(this, rollData)
+      rollDialog.render(true)
+    }
+  }
+
+  /* -------------------------------------------- */
+  pouvoirPassifDialog(pouvoir) {
+    let rollData = this.getCommonRollData()
+    rollData.pouvoir = pouvoir
+    rollData.mode = "pouvoirpassif"
+    rollData.pouvoirPointsUsage = 0
+    rollData.noRoll = true
+
+    let d = new Dialog({
+      title: "Activer le pouvoir passif " + pouvoir.name,
+      content: "<p>Choisissez le nombre de Points d'Usage</p>",
+      buttons: {
+        one: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "1 Point d'Usage",
+          callback: () => {
+            rollData.pouvoirPointsUsage = 1;
+            HeritiersUtility.rollHeritiers(rollData);
+          }
+        },
+        two: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "2 Points d'Usage",
+          callback: () => {
+            rollData.pouvoirPointsUsage = 2;
+            HeritiersUtility.rollHeritiers(rollData);
+          }
+        },
+        three: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "3 Points d'Usage",
+          callback: () => {
+            rollData.pouvoirPointsUsage = 3;
+            HeritiersUtility.rollHeritiers(rollData);
+          }
+        },
+        four: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "4 Points d'Usage",
+          callback: () => {
+            rollData.pouvoirPointsUsage = 4;
+            HeritiersUtility.rollHeritiers(rollData);
+          }
+        },
+        close: {
+          icon: '<i class="fas fa-times"></i>',
+          label: "Annuler",
+          callback: () => {
+          }
+        }
+      },
+      default: "one",
+      render: html => console.log("Pouvoir passif"),
+      close: html => console.log("No option")
+    });
+    d.render(true);
+  }
+
+  /* -------------------------------------------- */
+  async rollPouvoir(pouvoirId) {
+    let pouvoir = this.items.get(pouvoirId)
+    if (pouvoir) {
+      if (pouvoir.system.pouvoirtype == "passif") {
+        this.pouvoirPassifDialog(pouvoir)
+        return
+      }
+
+      let rollData = this.getCommonRollData(undefined, undefined)
+
+      rollData.pouvoirMaxUsage = this.getPouvoirUsageMax(pouvoir)
+      rollData.pouvoir = foundry.utils.duplicate(pouvoir)
+      rollData.mode = "pouvoir"
+
+      if (pouvoir.system.feeriemasque != "autre") {
+        rollData.pouvoirBase = foundry.utils.duplicate(this.system.rang[pouvoir.system.feeriemasque.toLowerCase()])
+        rollData.pouvoirBase.label = "Féerie"
+        if (pouvoir.system.istest && !pouvoir.system.carac) {
+          ui.notifications.warn("Le pouvoir actif " + pouvoir.name + " n'a pas de caractéristique associée")
+        }
+        if (pouvoir.system.istest) {
+          rollData.carac = foundry.utils.duplicate(this.system.caracteristiques[pouvoir.system.carac])
+          rollData.caracKey = pouvoir.system.carac
+        } else {
+          rollData.noRoll = true
+          HeritiersUtility.rollHeritiers(rollData);
+          return;
+          //this.incDecPointsUsage(pouvoir.id, -rollData.pouvoirPointsUsage)
+          //ui.notifications.warn("Le pouvoir actif " + pouvoir.name + " a été utilisé, dépense de " + pouvoirPointsUsage + " points d'usage")
+        }
+      }
+      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)
-    })
 
   }
+  /* -------------------------------------------- */
+  incDecPointsUsage(pouvoirId, value) {
+    let pouvoir = this.items.get(pouvoirId)
+    let newValue = pouvoir.system.pointsusagecourant + value
+    newValue = Math.max(newValue, 0)
+    newValue = Math.min(newValue, this.getPouvoirUsageMax(pouvoir))
+    this.updateEmbeddedDocuments('Item', [{ _id: pouvoirId, 'system.pointsusagecourant': newValue }])
+  }
+
+  /* -------------------------------------------- */
+  getPouvoirUsage(pouvoirId) {
+    let pouvoir = this.items.get(pouvoirId)
+    return pouvoir.system.pointsusagecourant
+  }
+
+  /* -------------------------------------------- */
+  getPouvoirUsageMax(pouvoir) {
+    if (pouvoir.system.masquetype == "masque") {
+      return this.system.rang.masque.value
+    }
+    return this.system.rang.feerie.value
+  }
+  /* -------------------------------------------- */
+  recupUsage(value) {
+    let updates = []
+    for (let pouvoir of this.items) {
+      if (pouvoir.type == "pouvoir") {
+        let newValue = pouvoir.system.pointsusagecourant + value
+        newValue = Math.max(newValue, 0)
+        newValue = Math.min(newValue, this.getPouvoirUsageMax(pouvoir))
+        updates.push({ _id: pouvoir.id, 'system.pointsusagecourant': newValue })
+      }
+    }
+    if (updates.length > 0) {
+      this.updateEmbeddedDocuments('Item', updates)
+    }
+  }
 }

modules/heritiers-config.js

@@ -8,7 +8,7 @@ export const HERITIERS_CONFIG = {
     "prec": "Précision",
     "esp": "Esprit",
     "per": "Perception",
-    "pres": "Préstance",
+    "pres": "Prestance",
     "san": "Sang-Froid"
   },
 
@@ -25,16 +25,17 @@ 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"},
+    "magie": {kind: "magical", name: "Magie"},
   },
   baseTestPouvoir: {
     "feerie": "Féerie",
-    "Masque": "Masque",
+    "masque": "Masque",
     "autre": "Autre"
   },
   resistancePouvoir: {
@@ -50,6 +51,10 @@ export const HERITIERS_CONFIG = {
     "passif": "Passif",
     "metamorphose": "Métamorphose"
   },
+  statutMasque: {
+    "masque": "Masqué",
+    "demasque":"Démasqué"
+  },
   niveauPouvoir: {
     "normal": "Normal",
     "profond": "Profond",
@@ -60,23 +65,42 @@ export const HERITIERS_CONFIG = {
     "demasque": "Démasqué"
   },
   seuilsDifficulte: {
-    "0": "Aucun/Non applicable",
-    "5": "Enfantine",
-    "6": "Triviale",
-    "8": "Aisée",
-    "10": "Normale",
-    "12": "Compliquée",
-    "14": "Difficile",
-    "16": "Très Difficile",
-    "18": "Critique",
-    "20": "Insurmontable",
-    "22": "Surhumaine",
-    "24": "Epique",
-    "26": "Légendaire",
-    "28": "Mythique",
-    "30": "Divine"
+    "-1": "Aucun/Non applicable",
+    "5": "Enfantine (5)",
+    "6": "Triviale (6)",
+    "7": "Moins Triviale (7)",
+    "8": "Aisée (8)",
+    "9": "Moins Aisée (9)",
+    "10": "Normale (10)",
+    "11": "Moins Normale (11)",
+    "12": "Compliquée (12)",
+    "13": "Plus Compliquée (13)",
+    "14": "Difficile (14)",
+    "15": "Plus Difficile (15)",
+    "16": "Très Difficile (16)",
+    "17": "Très Très Difficile (17)",
+    "18": "Critique (18)",
+    "19": "Plus Critique (19)",
+    "20": "Insurmontable (20)",
+    "21": "Très Insurmontable (21)",
+    "22": "Surhumaine (22)",
+    "23": "Très Surhumaine (23)",
+    "24": "Epique (24)",
+    "25": "Plus Epique (25)",
+    "26": "Légendaire (26)",
+    "27": "Très Légendaire (27)",
+    "28": "Mythique (28)",
+    "29": "Plus Mythique (29)",
+    "30": "Divine (30)"
   },
 
+  attaqueCible: {
+    "none": "Aucune",
+    "membre": "Membre",
+    "main": "Main",
+    "tete": "Tête/Coeur"
+  },
+  
   categorieArme : {
     "trait": "Arme de trait",
     "poing": "Arme de poing",
@@ -122,7 +146,72 @@ export const HERITIERS_CONFIG = {
     "traditionnelle": "Traditionnelle",
     "moderne": "Moderne",
     "orientale": "Orientale"
-  }
+  }, 
+  typeContact: {
+    "contact": "Contact",
+    "allie": "Allié",
+    "ennemi": "Ennemi",
+    "interet": "Personne d'interêt"
+  },
+  niveauContact: {
+    "1": "1",
+    "2": "2",
+    "3": "3",
+  },
+  pointsUsageList: {
+    "1": "1",
+    "2": "2",
+    "3": "3",
+    "4": "4",
+  },
+  attaquePlusieursList : {
+    "0": "0",
+    "1": "+1",
+    "2": "+2",
+  },
+  attaque2ArmesListe: [
+    {value: "0", label:  "Aucun"}, 
+    {value: "-4", label: "Deux armes à 1 main"},
+    {value: "-2", label: "Deux armes naturelles"},
+    {value: "-2", label: "Avec spécialisation \"Mauvaise Main\""}
+  ],
+  typeProfil: {
+    "mineur": "Mineur",
+    "majeur": "Majeur",
+  },
+  bonusMalusContext: [ 
+    {value: "-6", label: "-6"},
+    {value: "-5", label: "-5"},
+    {value: "-4", label: "-4"},
+    {value: "-3", label: "-3"},
+    {value: "-2", label: "-2"},
+    {value: "-1", label: "-1"},
+    {value: "0", label: "0"},
+    {value: "1", label: "+1"},
+    {value: "2", label: "+2"},
+    {value: "3", label: "+3"},
+    {value: "4", label: "+4"},
+    {value: "5", label: "+5"},
+    {value: "6", label: "+6"}
+  ],
+  listNiveauSort: {
+    "1" : "1",
+    "2" : "2",
+    "3" : "3",
+    "4" : "4"
+  },
+  listNiveau: {
+    "0": "0",
+    "1": "1",
+    "2": "2",
+    "3": "3",
+    "4": "4",
+    "5": "5",
+    "6": "6",
+    "7": "7",
+    "8": "8",
+    "9": "9",
+    "10": "10"
+  },
 
-  
 }

modules/heritiers-item-sheet.js

@@ -4,12 +4,12 @@ import { HeritiersUtility } from "./heritiers-utility.js";
  * Extend the basic ItemSheet with some very simple modifications
  * @extends {ItemSheet}
  */
-export class HeritiersItemSheet extends ItemSheet {
+export class HeritiersItemSheet extends foundry.appv1.sheets.ItemSheet {
 
   /** @override */
   static get defaultOptions() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-les-heritiers", "sheet", "item"],
       template: "systems/fvtt-les-heritiers/templates/item-sheet.html",
       dragDrop: [{ dragSelector: null, dropSelector: null }],
@@ -48,7 +48,7 @@ export class HeritiersItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = duplicate(this.object)
+    const objectData = foundry.utils.duplicate(this.object)
     let formData = {
       title: this.title,
       id: this.id,
@@ -62,11 +62,25 @@ export class HeritiersItemSheet extends ItemSheet {
       options: this.options,
       owner: this.document.isOwner,
       config: game.system.lesheritiers.config,
-      description: await TextEditor.enrichHTML(this.object.system.description, {async: true}),
+      isArmeMelee: HeritiersUtility.isArmeMelee(this.object),
+      description: await  foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.description, {async: true}),
       mr: (this.object.type == 'specialisation'),
-      isGM: game.user.isGM
+      isGM: game.user.isGM,
+      usageMax: -1
     }
 
+    // Items specific data
+    if (this.object.type == 'pouvoir' && this.document.isOwner && this.actor) {
+      formData.usageMax = this.actor.getPouvoirUsageMax(this.object)
+      if (this.object.system.pointsusagecourant == -1) {
+        this.object.system.pointsusagecourant = formData.usageMax
+      }
+    }
+    if (this.object.type == 'sort' ) {
+      formData.competencesMagie = HeritiersUtility.getCompetencesMagie()
+    }
+
+
     //this.options.editable = !(this.object.origin == "embeddedItem");
     console.log("ITEM DATA", formData, this);
     return formData;
@@ -86,7 +100,7 @@ export class HeritiersItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   postItem() {
-    let chatData = duplicate(HeritiersUtility.data(this.item));
+    let chatData = foundry.utils.duplicate(HeritiersUtility.data(this.item));
     if (this.actor) {
       chatData.actor = { id: this.actor.id };
     }
@@ -128,55 +142,55 @@ export class HeritiersItemSheet extends ItemSheet {
     })
 
     html.find('#add-specialite').click(ev => {
-      let spec = duplicate(this.object.system.specialites)
-      spec.push( { name: "Nouvelle Spécialité", id: randomID(16), used: false }) 
+      let spec = foundry.utils.duplicate(this.object.system.specialites)
+      spec.push( { name: "Nouvelle Spécialité", id: foundry.utils.randomID(16), used: false })
       this.object.update( { 'system.specialites': spec })
     })
     html.find('.delete-specialite').click(ev => {
       const li = $(ev.currentTarget).parents(".specialite-item")
       let index = li.data("specialite-index")
-      let spec = duplicate(this.object.system.specialites)
+      let spec = foundry.utils.duplicate(this.object.system.specialites)
       spec.splice(index,1)
       this.object.update( { 'system.specialites': spec })
     })
     html.find('.edit-specialite').change(ev => {
       const li = $(ev.currentTarget).parents(".specialite-item")
       let index = li.data("specialite-index")
-      let spec = duplicate(this.object.system.specialites)
+      let spec = foundry.utils.duplicate(this.object.system.specialites)
       spec[index].name = ev.currentTarget.value
-      spec[index].id = spec[index].id || randomID(16)
+      spec[index].id = spec[index].id || foundry.utils.randomID(16)
       this.object.update( { 'system.specialites': spec })
     })
     html.find('.edit-specialite-description').change(ev => {
       const li = $(ev.currentTarget).parents(".specialite-item")
       let index = li.data("specialite-index")
-      let spec = duplicate(this.object.system.specialites)
+      let spec = foundry.utils.duplicate(this.object.system.specialites)
       spec[index].description = ev.currentTarget.value
-      spec[index].id = spec[index].id || randomID(16)
+      spec[index].id = spec[index].id || foundry.utils.randomID(16)
       this.object.update( { 'system.specialites': spec })
-    })    
+    })
 
     html.find('#add-automation').click(ev => {
-      let autom = duplicate(this.object.system.automations)
-      autom.push( { eventtype: "on-drop", name: "Automatisation 1", competence: "", minLevel: 0, id: randomID(16) }) 
+      let autom = foundry.utils.duplicate(this.object.system.automations)
+      autom.push( { eventtype: "on-drop", name: "Automatisation 1", competence: "", minLevel: 0, id: foundry.utils.randomID(16) })
       this.object.update( { 'system.automations': autom })
     })
     html.find('.delete-automation').click(ev => {
       const li = $(ev.currentTarget).parents(".automation-item")
       let index = li.data("automation-index")
-      let autom = duplicate(this.object.system.automations)
+      let autom = foundry.utils.duplicate(this.object.system.automations)
       autom.splice(index,1)
       this.object.update( { 'system.automations': autom })
     })
     html.find('.automation-edit-field').change(ev => {
       let index = $(ev.currentTarget).data("automation-index")
       let field = $(ev.currentTarget).data("automation-field")
-      let auto = duplicate(this.object.system.automations)
+      let auto = foundry.utils.duplicate(this.object.system.automations)
       auto[index][field] = ev.currentTarget.value
-      auto[index].id = auto[index].id || randomID(16)
+      auto[index].id = auto[index].id || foundry.utils.randomID(16)
       this.object.update( { 'system.automations': auto })
-    })    
-    
+    })
+
     // Update Inventory Item
     html.find('.item-delete').click(ev => {
       const li = $(ev.currentTarget).parents(".item");

modules/heritiers-item.js

@@ -16,7 +16,9 @@ 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",  
+    sort: "systems/fvtt-les-heritiers/assets/icons/sort.webp",
 }
 
 /**

modules/heritiers-main.js

@@ -11,7 +11,7 @@
 import { HeritiersActor } from "./heritiers-actor.js";
 import { HeritiersItemSheet } from "./heritiers-item-sheet.js";
 import { HeritiersActorSheet } from "./heritiers-actor-sheet.js";
-import { HeritiersCreatureSheet } from "./heritiers-creature-sheet.js";
+import { HeritiersActorPNJSheet } from "./heritiers-actor-pnj-sheet.js";
 import { HeritiersUtility } from "./heritiers-utility.js";
 import { HeritiersCombat } from "./heritiers-combat.js";
 import { HeritiersItem } from "./heritiers-item.js";
@@ -30,7 +30,7 @@ Hooks.once("init", async function () {
   HeritiersUtility.preloadHandlebarsTemplates()
 
   /* -------------------------------------------- */
-  // Set an initiative formula for the system 
+  // Set an initiative formula for the system
   CONFIG.Combat.initiative = {
     formula: "1d10",
     decimals: 1
@@ -46,6 +46,8 @@ Hooks.once("init", async function () {
   CONFIG.Combat.documentClass = HeritiersCombat
   CONFIG.Actor.documentClass = HeritiersActor
   CONFIG.Item.documentClass = HeritiersItem
+  // Create an object of bonus/malus from -6 to +6 signed
+  HERITIERS_CONFIG.bonusMalus = Array.from({ length: 7 }, (v, k) => toString(k - 6))
   game.system.lesheritiers = {
     HeritiersUtility,
     config: HERITIERS_CONFIG
@@ -53,12 +55,12 @@ 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 })
+  foundry.documents.collections.Actors.unregisterSheet("core", foundry.appv1.sheets.ActorSheet);
+  foundry.documents.collections.Actors.registerSheet("fvtt-les-heritiers", HeritiersActorSheet, { types: ["personnage"], makeDefault: true })
+  foundry.documents.collections.Actors.registerSheet("fvtt-les-heritiers", HeritiersActorPNJSheet, { types: ["pnj"], makeDefault: true })
 
-  Items.unregisterSheet("core", ItemSheet);
-  Items.registerSheet("fvtt-les-heritiers", HeritiersItemSheet, { makeDefault: true })
+  foundry.documents.collections.Items.unregisterSheet("core", foundry.appv1.sheets.ItemSheet);
+  foundry.documents.collections.Items.registerSheet("fvtt-les-heritiers", HeritiersItemSheet, { makeDefault: true })
 
   HeritiersUtility.init()
 
@@ -78,31 +80,17 @@ function welcomeMessage() {
 }
 
 /* -------------------------------------------- */
-// Register world usage statistics
-function registerUsageCount(registerKey) {
-  if (game.user.isGM) {
-    game.settings.register(registerKey, "world-key", {
-      name: "Unique world key",
-      scope: "world",
-      config: false,
-      default: "",
-      type: String
-    });
-
-    let worldKey = game.settings.get(registerKey, "world-key")
-    if (worldKey == undefined || worldKey == "") {
-      worldKey = randomID(32)
-      game.settings.set(registerKey, "world-key", worldKey)
-    }
-    // Simple API counter
-    let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
-    //$.ajaxSetup({
-    //headers: { 'Access-Control-Allow-Origin': '*' }
-    //})
-    $.ajax(regURL)
+async function importDefaultScene() {
+  let exists = game.scenes.find(j => j.name == "Accueil");
+  if (!exists) {
+    const scenes = await HeritiersUtility.loadCompendium("fvtt-les-heritiers.scenes")
+    let newDocuments = scenes.filter(i => i.name == "Accueil");
+    await game.scenes.documentClass.create(newDocuments);
+    game.scenes.find(i => i.name == "Accueil").activate();
   }
 }
 
+
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
 /* -------------------------------------------- */
@@ -119,14 +107,15 @@ Hooks.once("ready", function () {
     });
   }
 
-  registerUsageCount('fvtt-les-heritiers')
-  welcomeMessage()
+  import("https://www.uberwald.me/fvtt_appcount/count-class-ready.js").then(moduleCounter=>{
+    console.log("ClassCounter loaded", moduleCounter)
+    moduleCounter.ClassCounter.registerUsageCount()
+  }).catch(err=>
+    console.log("No stats available, giving up.")
+  )
+  welcomeMessage();
+  importDefaultScene();
 
-  // CSS patch for v9
-  if (game.version) {
-    let sidebar = document.getElementById("sidebar");
-    sidebar.style.width = "min-content";
-  }
 });
 
 /* -------------------------------------------- */
@@ -136,10 +125,9 @@ Hooks.on("chatMessage", (html, content, msg) => {
   if (content[0] == '/') {
     let regExp = /(\S+)/g;
     let commands = content.match(regExp);
-    if (game.system.mournblade.commands.processChatCommand(commands, content, msg)) {
+    if (game.system.lesheritiers.commands.processChatCommand(commands, content, msg)) {
       return false;
     }
   }
   return true;
 });
-

modules/heritiers-roll-dialog.js

@@ -5,43 +5,70 @@ export class HeritiersRollDialog extends Dialog {
   /* -------------------------------------------- */
   static async create(actor, rollData) {
 
-    let options = { classes: ["HeritiersDialog"], width: 320, height: 'fit-content', 'z-index': 99999 };
-    let html = await renderTemplate('systems/fvtt-les-heritiers/templates/roll-dialog-generic.html', rollData);
+    let options = { classes: ["HeritiersDialog"], width: 420, height: 'fit-content', 'z-index': 99999 };
+    let html = await foundry.applications.handlebars.renderTemplate('systems/fvtt-les-heritiers/templates/roll-dialog-generic.html', rollData);
 
     return new HeritiersRollDialog(actor, rollData, html, options);
   }
 
   /* -------------------------------------------- */
   constructor(actor, rollData, html, options, close = undefined) {
+    let buttons = {
+      rolld8: {
+        icon: '<i class="fas fa-check"></i>',
+        label: "Lancer 1d8",
+        callback: () => { this.roll("d8") }
+      }
+    }
+    let enableD10 = false
+    let enableD12 = false
+    if (rollData.mode == "pouvoir" || rollData.competence?.system.niveau > 0) {
+      enableD10 = true
+    }
+    if (rollData.mode == "pouvoir" || rollData.competence?.system.niveau > 1) {
+      enableD12 = true
+    }
+    if (enableD10) {
+      buttons.rolld10 = {
+        icon: '<i class="fas fa-check"></i>',
+        label: "Lancer 1d10",
+        callback: () => { this.roll("d10") }
+      }
+    }
+    if (enableD12) {
+        buttons.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
+    // Overwrite in case of carac only -> 1d8
     if (rollData.mode == "carac") {
       conf.buttons = {
         rolld8: {
@@ -64,7 +91,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)
   }
 
@@ -73,7 +109,6 @@ export class HeritiersRollDialog extends Dialog {
   activateListeners(html) {
     super.activateListeners(html);
 
-    var dialog = this;
     function onLoad() {
     }
     $(function () { onLoad(); });
@@ -82,19 +117,30 @@ export class HeritiersRollDialog extends Dialog {
       this.rollData.sdValue = Number(event.currentTarget.value)
     })
     html.find('#caracKey').change(async (event) => {
+      //console.log("caracKey", event.currentTarget.value)
       this.rollData.caracKey = String(event.currentTarget.value)
     })
     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('#pouvoirPointsUsage').change((event) => {
+      this.rollData.pouvoirPointsUsage = Number(event.currentTarget.value)
     })
+    html.find('#attaqueDos').change((event) => {
+      this.rollData.attaqueDos = event.currentTarget.checked
+    })
+    html.find('#bonus-attaque-seconde-arme').change((event) => {
+      this.rollData.secondeArme = String(event.currentTarget.value)
+    })
+    html.find('#attaque-cible').change((event) => {
+      this.rollData.attaqueCible = String(event.currentTarget.value)
+    })
+
   }
 }

modules/heritiers-utility.js

@@ -2,6 +2,45 @@
 import { HeritiersCombat } from "./heritiers-combat.js";
 import { HeritiersCommands } from "./heritiers-commands.js";
 
+const __facesAdjacentes = {
+  "d8": {
+    1: [4, 8, 6],
+    2: [7, 5, 3],
+    3: [2, 8, 6],
+    4: [1, 5, 7],
+    5: [2, 4, 8],
+    6: [1, 7, 3],
+    7: [2, 4, 6],
+    8: [1, 3, 5]
+  },
+  "d10": {
+    1: [4, 6, 9, 7],
+    2: [6, 8, 5, 9],
+    3: [7, 5, 8, 10],
+    4: [10, 6, 7, 1],
+    5: [3, 9, 2, 8],
+    6: [1, 4, 2, 9],
+    7: [1, 3, 4, 10],
+    8: [2, 10, 5, 3],
+    9: [1, 5, 6, 2],
+    10: [8, 4, 3, 7]
+  },
+  "d12": {
+    1:[2, 3, 4, 5, 6],
+    2: [1, 6, 8, 12, 3],
+    3: [1, 4, 11, 12, 2],
+    4: [1, 5, 10, 11, 3],
+    5: [1, 6, 9, 10, 4],
+    6: [1, 2, 8, 9, 5],
+    7: [8, 9, 10, 11, 12],
+    8: [2, 6, 9, 7, 12],
+    9: [5, 10, 7, 8, 6],
+    10: [4, 11, 7, 9, 5],
+    11: [7, 10, 4, 3, 12],
+    12: [2, 8, 7, 11, 3]
+  }
+}
+
 /* -------------------------------------------- */
 export class HeritiersUtility {
 
@@ -9,7 +48,7 @@ export class HeritiersUtility {
   /* -------------------------------------------- */
   static async init() {
     Hooks.on('renderChatLog', (log, html, data) => HeritiersUtility.chatListeners(html))
-    Hooks.on("getChatLogEntryContext", (html, options) => HeritiersUtility.chatRollMenu(html, options))
+    /* Unused for Heitiers : Hooks.on("getChatMessageContextOptions", (html, options) => HeritiersUtility.chatRollMenu(html, options))*/
 
     this.rollDataStore = {}
     this.defenderStore = {}
@@ -42,32 +81,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) => {
-      let fa = a.name.toLowerCase();
-      let fb = b.name.toLowerCase();
-      if (fa < fb) {
-        return -1;
-      }
-      if (fa > fb) {
-        return 1;
-      }
-      return 0;
+      return a.name.localeCompare(b.name);
     })
   }
 
@@ -81,6 +104,29 @@ export class HeritiersUtility {
     const skills = await HeritiersUtility.loadCompendium("fvtt-les-heritiers.competences")
     this.skills = skills.map(i => i.toObject())
 
+    this.competencesMagie = this.skills.filter(s => s.system.profil == "magie")
+
+    game.settings.register("fvtt-les-heritiers", "heritiers-heritage", {
+      name: "Points d'héritage",
+      hint: "Points d'héritage du groupe",
+      scope: "world",
+      config: true,
+      default: 0,
+      type: Number
+    })
+  }
+
+  /* -------------------------------------------- */
+  static getSDSortValue(niveau) {
+    if (niveau <= 2) return 12;
+    if (niveau <= 4) return 14;
+    if (niveau <= 6) return 16;
+    return 18;
+  }
+
+  /* -------------------------------------------- */
+  static getCompetencesMagie() {
+    return this.competencesMagie
   }
 
   /* -------------------------------------------- */
@@ -102,18 +148,29 @@ export class HeritiersUtility {
   /* -------------------------------------------- */
   static async chatListeners(html) {
 
-    html.on("click", '.predilection-reroll', async event => {
+    $(html).on("click", '.predilection-reroll', async event => {
       let predIdx = $(event.currentTarget).data("predilection-index")
       let messageId = HeritiersUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "heritiers-roll")
       let actor = this.getActorFromRollData(rollData)
       await actor.setPredilectionUsed(rollData.competence._id, predIdx)
-      rollData.competence = duplicate(actor.getCompetence(rollData.competence._id))
+      rollData.competence = foundry.utils.duplicate(actor.getCompetence(rollData.competence._id))
       HeritiersUtility.rollHeritiers(rollData)
     })
 
-    html.on("click", '.roll-chat-degat', async event => {
+    $(html).on("click", '.roll-tricherie-2', async event => {
+      let messageId = HeritiersUtility.findChatMessageId(event.currentTarget)
+      let message = game.messages.get(messageId)
+      let rollData = message.getFlag("world", "heritiers-roll")
+      let actor = this.getActorFromRollData(rollData)
+      if ( await actor.incDecTricherie(-2) ) {
+        rollData.forcedValue = Number($(event.currentTarget).data("dice-value"))
+        HeritiersUtility.rollHeritiers(rollData)
+      }
+    })
+
+    $(html).on("click", '.roll-chat-degat', async event => {
       let messageId = HeritiersUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "heritiers-roll")
@@ -130,9 +187,9 @@ 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-list-niveau.html'
+      'systems/fvtt-les-heritiers/templates/partial-utile-skills.html'
     ]
-    return loadTemplates(templatePaths);
+    return foundry.applications.handlebars.loadTemplates(templatePaths);
   }
 
   /* -------------------------------------------- */
@@ -209,14 +266,14 @@ export class HeritiersUtility {
 
     let id = rollData.rollId;
     let oldRollData = this.rollDataStore[id] || {};
-    let newRollData = mergeObject(oldRollData, rollData);
+    let newRollData = foundry.utils.mergeObject(oldRollData, rollData);
     this.rollDataStore[id] = newRollData;
   }
   /* -------------------------------------------- */
   static saveRollData(rollData) {
     game.socket.emit("system.fvtt-les-heritiers", {
       name: "msg_update_roll", data: rollData
-    }); // Notify all other clients of the roll    
+    }); // Notify all other clients of the roll
     this.updateRollData(rollData);
   }
 
@@ -227,7 +284,6 @@ export class HeritiersUtility {
 
   /* -------------------------------------------- */
   static onSocketMesssage(msg) {
-    //console.log("SOCKET MESSAGE", msg.name, game.user.character.id, msg.data.defenderId);
     if (msg.name == "msg_update_defense_state") {
       this.updateDefenseState(msg.data.defenderId, msg.data.rollId);
     }
@@ -284,124 +340,274 @@ 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.diceValue = Math.max(Math.max(resTab[0], resTab[1]), resTab[2])
+      rollData.finalResult = rollData.roll.total - foundryTotal + rollData.diceValue
+
+      // 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()
       }
-    }
-    //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)
+
+    } else {
+      rollData.finalResult = rollData.roll.total
+      let rollValue = rollData.forcedValue || rollData.roll.terms[0].results[0].result
+      rollData.diceResult = rollValue
+      rollData.diceValue = rollValue
+      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
+        }
+      }
+      if ( !rollData.forcedValue) {
+        rollData.adjacentFaces = foundry.utils.duplicate(__facesAdjacentes[rollData.mainDice][rollData.diceValue])
+      }
     }
   }
 
+  /* -------------------------------------------- */
+  static computeArmeDegats(rollData, actor) {
+    rollData.degatsArme = rollData.arme.system.degats + rollData.marge
+    if (rollData.attaqueDeuxArmes != 0 && rollData.secondeArme) {
+      let secondeArme = actor.items.get(secondeArme)
+      if (secondeArme) {
+        rollData.degatsArme += secondeArme.system.degats
+        rollData.degatsArme += actor.system.caracteristiques.for.value
+      }
+    } else {
+      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
+      }
+    }
+    if (rollData.attaqueCible == "membre") {
+      rollData.degatsArme -= 2
+    }
+    if (rollData.attaqueCible == "main") {
+      rollData.degatsArme -= 3
+    }
+    if (rollData.attaqueCible == "tete") {
+      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)
+      // Si compétence > 0 et d8 -> echec critique impossible
+      if (rollData?.competence?.system.niveau > 0 && rollData?.mainDice == "d8") {
+        rollData.isCriticalFailure = false
+      }
+    }
+  }
+
+  /* -------------------------------------------- */
+  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 foundry.applications.handlebars.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 foundry.applications.handlebars.renderTemplate(`systems/fvtt-les-heritiers/templates/chat-assommer-result.html`, rollData)
+    }, rollData, "selfroll")
+  }
   /* -------------------------------------------- */
   static async rollHeritiers(rollData) {
 
     let actor = this.getActorFromRollData(rollData)
+
+    if ( rollData.mode == "pouvoir" && actor.getPouvoirUsage(rollData.pouvoir._id) < rollData.pouvoirPointsUsage) {
+      ui.notifications.warn("Pas assez de points d'usage pour ce pouvoir.")
+      return
+    }
+
     //rollData.actionImg = "systems/fvtt-les-heritiers/assets/icons/" + actor.system.attributs[rollData.attrKey].labelnorm + ".webp"
-    rollData.carac = duplicate(actor.system.caracteristiques[rollData.caracKey])
+    if (rollData.caracKey == "pre") rollData.caracKey = "pres"; // Patch tomanage wrong carac key
+    rollData.carac = foundry.utils.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.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}`
+    if (rollData.forcedValue) {
+      rollData.diceFormula = rollData.forcedValue
     } else {
-      rollData.diceFormula += `+${rollData.carac.value}+${rollData.bonusMalusContext}`
-    }
-    rollData.diceFormula += `+${rollData.pvMalus}`
-
-    if (rollData.arme && rollData.arme.type == "arme") {
-      rollData.diceFormula += `+${rollData.arme.system.bonusmaniementoff}`
+      if (rollData.useTricherie || rollData.useHeritage) {
+        rollData.diceFormula = "{1d8, 1d10, 1d12}"
+      } else {
+        rollData.diceFormula = "1" + rollData.mainDice + "kh1"
+      }
     }
 
-    let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
-    await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
-    rollData.roll = myRoll
-    console.log(">>>> ", myRoll)
+    let rangValue = 0
+    if (rollData.rang) {
+      rangValue = rollData.rang.value
+    }
+    if (rollData.competence) {
+      let compmod = 0 // Bonus de compétence à 0 dans Les Heritiers
+      let specBonus = (rollData.useSpecialite) ? 1 : 0
+      rollData.diceFormula += `+${rollData.carac.value}+${rangValue}+${rollData.competence.system.niveau}+${specBonus}+${rollData.bonusMalusContext}+${compmod}`
+    } else if (rollData.pouvoirBase) {
+      rollData.diceFormula += `+${rollData.carac.value}+${rollData.pouvoirBase.value}+${rangValue}+${rollData.bonusMalusContext}`
+    } else {
+      rollData.diceFormula += `+${rollData.carac.value}+${rangValue}+${rollData.bonusMalusContext}`
+    }
+    let ruleMalus = 0
+    for (let malus of rollData.rulesMalus) {
+      ruleMalus += malus.value
+    }
+    rollData.diceFormula += `+${ruleMalus}`
+
+    // Gestion bonus attaque à plusieurs
+    let bonusAttaque = rollData.bonusAttaquePlusieurs
+    if (rollData.attaqueDos) {
+      bonusAttaque = 2
+      if (rollData.bonusAttaquePlusieurs) {
+        bonusAttaque = 3 // Valeur max, cf règle page 197
+      }
+    }
+    rollData.diceFormula += `+${bonusAttaque}`
+
+    // Gestion attaque avec 2 armes
+    if (rollData.attaqueDeuxArmes != 0) {
+      rollData.diceFormula += `+${rollData.attaqueDeuxArmes}`
+    }
+    // Gestion des attaques ciblées
+    if (rollData.attaqueCible != "none") {
+      if (rollData.attaqueCible == "membre") {
+        rollData.diceFormula += `-2`
+      }
+      if (rollData.attaqueCible == "main") {
+        rollData.diceFormula += `-3`
+      }
+      if (rollData.attaqueCible == "tete") {
+        rollData.diceFormula += `-6`
+      }
+    }
+
+    if ( !rollData.noRoll) {
+      let myRoll = await new Roll(rollData.diceFormula).roll()
+      await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
+      rollData.roll = foundry.utils.duplicate(myRoll)
+      console.log(">>>> ", myRoll)
+      this.computeResult(actor, rollData)
+      this.computeMarge(rollData, rollData.sdValue) // Calcul de la marge si seuil présent
+    }
 
-    rollData.finalResult = myRoll.total
-    this.computeResult(actor, rollData)
     if (rollData.mode == "init") {
       actor.setFlag("world", "last-initiative", rollData.finalResult)
     }
 
+    // Gestion pouvoir et points d'usage
+    if (rollData.mode == "pouvoir" || rollData.mode == "pouvoirpassif") {
+      actor.incDecPointsUsage(rollData.pouvoir._id, -rollData.pouvoirPointsUsage)
+    }
+
     this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-les-heritiers/templates/chat-generic-result.html`, rollData)
+      content: await foundry.applications.handlebars.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)
+    }
+
   }
 
   /* -------------------------------------------- */
   static async bonusRollHeritiers(rollData) {
     rollData.bonusFormula = rollData.addedBonus
 
-    let bonusRoll = new Roll(rollData.bonusFormula).roll({ async: false })
+    let bonusRoll = await new Roll(rollData.bonusFormula).roll()
     await this.showDiceSoNice(bonusRoll, game.settings.get("core", "rollMode"));
-    rollData.bonusRoll = bonusRoll
+    rollData.bonusRoll = foundry.utils.duplicate(bonusRoll)
 
     rollData.finalResult += rollData.bonusRoll.total
 
     this.computeResult(rollData)
 
     this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-les-heritiers/templates/chat-generic-result.html`, rollData)
+      content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-les-heritiers/templates/chat-generic-result.html`, rollData)
     }, rollData)
 
   }
@@ -411,6 +617,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"))
+  }
   /* -------------------------------------------- */
   static getWhisperRecipients(rollMode, name) {
     switch (rollMode) {
@@ -428,7 +638,7 @@ export class HeritiersUtility {
 
   /* -------------------------------------------- */
   static blindMessageToGM(chatOptions) {
-    let chatGM = duplicate(chatOptions);
+    let chatGM = foundry.utils.duplicate(chatOptions);
     chatGM.whisper = this.getUsers(user => user.isGM);
     chatGM.content = "Blinde message of " + game.user.name + "<br>" + chatOptions.content;
     console.log("blindMessageToGM", chatGM);
@@ -492,11 +702,17 @@ export class HeritiersUtility {
   /* -------------------------------------------- */
   static getBasicRollData() {
     let rollData = {
-      rollId: randomID(16),
+      rollId: foundry.utils.randomID(16),
       rollMode: game.settings.get("core", "rollMode"),
       sdList: game.system.lesheritiers.config.seuilsDifficulte,
-      sdValue: 0,
-      bonusMalusContext: 0
+      sdValue: -1,
+      bonusAttaquePlusieurs: 0,
+      attaqueDeuxArmes: 0,
+      attaqueDos: false,
+      bonusMalusContext: 0,
+      attaqueCible: "none",
+      config: game.system.lesheritiers.config,
+      rulesMalus: []
     }
     return rollData
   }
@@ -507,18 +723,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)
   }
 
@@ -564,13 +780,13 @@ export class HeritiersUtility {
   static chatRollMenu(html, options) {
     let canApply = li => canvas.tokens.controlled.length && li.find(".heritiers-roll").length
     let canApplyBA = function (li) {
-      let message = game.messages.get(li.attr("data-message-id"))
+      let message = game.messages.get($(li).attr("data-message-id"))
       let rollData = message.getFlag("world", "heritiers-roll")
       let actor = this.getActorFromRollData(rollData)
       return (!rollData.isReroll && actor.getBonneAventure() > 0)
     }
     let canApplyPE = function (li) {
-      let message = game.messages.get(li.attr("data-message-id"))
+      let message = game.messages.get($(li).attr("data-message-id"))
       let rollData = message.getFlag("world", "heritiers-roll")
       let actor = this.getActorFromRollData(rollData)
       return (!rollData.isReroll && actor.getEclat() > 0)
@@ -605,11 +821,11 @@ export class HeritiersUtility {
   /* -------------------------------------------- */
   static async confirmDelete(actorSheet, li) {
     let itemId = li.data("item-id");
-    let msgTxt = "<p>Are you sure to remove this Item ?";
+    let msgTxt = "<p>Certain de supprimer cet item ?";
     let buttons = {
       delete: {
         icon: '<i class="fas fa-check"></i>',
-        label: "Yes, remove it",
+        label: "Oui !",
         callback: () => {
           actorSheet.actor.deleteEmbeddedDocuments("Item", [itemId]);
           li.slideUp(200, () => actorSheet.render(false));
@@ -617,12 +833,12 @@ export class HeritiersUtility {
       },
       cancel: {
         icon: '<i class="fas fa-times"></i>',
-        label: "Cancel"
+        label: "Non !"
       }
     }
     msgTxt += "</p>";
     let d = new Dialog({
-      title: "Confirm removal",
+      title: "Confirmer la suppression",
       content: msgTxt,
       buttons: buttons,
       default: "cancel"
@@ -630,21 +846,4 @@ export class HeritiersUtility {
     d.render(true);
   }
 
-  /************************************************************************************/
-  static async __create_talents_table() {
-    let compName = "fvtt-les-heritiers.talents-cellule"
-    const compData = await HeritiersUtility.loadCompendium(compName)
-    let talents = compData.map(i => i.toObject())
-
-    let htmlTab = "<table border='1'><tbody>";
-    for (let entryData of talents) {
-      console.log(entryData)
-      htmlTab += `<tr><td>@UUID[Compendium.${compName}.${entryData._id}]{${entryData.name}}</td>`
-      htmlTab += `<td>${entryData.system.description}</td>`;
-      //htmlTab += `<td>${entryData.system.resumebonus}</td>`;
-      htmlTab += "</tr>\n";
-    }
-    htmlTab += "</table>";
-    await JournalEntry.create({ name: 'Liste des Talents de Cellule', content: htmlTab });
-  }
 }

packs/archetypes-fees/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000175

packs/archetypes-fees/LOG

@@ -0,0 +1,15 @@
+2025/05/02-08:12:38.578482 7f4168bf96c0 Recovering log #173
+2025/05/02-08:12:38.589780 7f4168bf96c0 Delete type=3 #171
+2025/05/02-08:12:38.589884 7f4168bf96c0 Delete type=0 #173
+2025/05/02-08:32:33.547850 7f4162bff6c0 Level-0 table #178: started
+2025/05/02-08:32:33.552846 7f4162bff6c0 Level-0 table #178: 76976 bytes OK
+2025/05/02-08:32:33.560090 7f4162bff6c0 Delete type=0 #176
+2025/05/02-08:32:33.575866 7f4162bff6c0 Manual compaction at level-0 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end)
+2025/05/02-08:32:33.601802 7f4162bff6c0 Manual compaction at level-1 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at '!items!y1yOenfAJTsb3r6e' @ 93 : 1
+2025/05/02-08:32:33.601825 7f4162bff6c0 Compacting 1@1 + 1@2 files
+2025/05/02-08:32:33.607383 7f4162bff6c0 Generated table #179@1: 31 keys, 76976 bytes
+2025/05/02-08:32:33.607418 7f4162bff6c0 Compacted 1@1 + 1@2 files => 76976 bytes
+2025/05/02-08:32:33.613654 7f4162bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/05/02-08:32:33.613823 7f4162bff6c0 Delete type=2 #106
+2025/05/02-08:32:33.614198 7f4162bff6c0 Delete type=2 #178
+2025/05/02-08:32:33.630595 7f4162bff6c0 Manual compaction at level-1 from '!items!y1yOenfAJTsb3r6e' @ 93 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end)

packs/archetypes-fees/LOG.old

@@ -0,0 +1,8 @@
+2024/11/17-22:48:43.433551 7f1d08bf96c0 Recovering log #169
+2024/11/17-22:48:43.443811 7f1d08bf96c0 Delete type=3 #167
+2024/11/17-22:48:43.443896 7f1d08bf96c0 Delete type=0 #169
+2024/11/17-22:50:28.249266 7f1d027ff6c0 Level-0 table #174: started
+2024/11/17-22:50:28.249291 7f1d027ff6c0 Level-0 table #174: 0 bytes OK
+2024/11/17-22:50:28.255594 7f1d027ff6c0 Delete type=0 #172
+2024/11/17-22:50:28.274735 7f1d027ff6c0 Manual compaction at level-0 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end)
+2024/11/17-22:50:28.274768 7f1d027ff6c0 Manual compaction at level-1 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end)

packs/armes-et-protection/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000175

packs/armes-et-protection/LOG

@@ -0,0 +1,15 @@
+2025/05/02-08:12:38.625683 7f41693fa6c0 Recovering log #173
+2025/05/02-08:12:38.636729 7f41693fa6c0 Delete type=3 #171
+2025/05/02-08:12:38.636867 7f41693fa6c0 Delete type=0 #173
+2025/05/02-08:32:33.536656 7f4162bff6c0 Level-0 table #178: started
+2025/05/02-08:32:33.540777 7f4162bff6c0 Level-0 table #178: 18161 bytes OK
+2025/05/02-08:32:33.547563 7f4162bff6c0 Delete type=0 #176
+2025/05/02-08:32:33.575848 7f4162bff6c0 Manual compaction at level-0 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end)
+2025/05/02-08:32:33.589023 7f4162bff6c0 Manual compaction at level-1 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at '!items!zbsVCsWxRzkzzG1N' @ 216 : 1
+2025/05/02-08:32:33.589042 7f4162bff6c0 Compacting 1@1 + 1@2 files
+2025/05/02-08:32:33.593271 7f4162bff6c0 Generated table #179@1: 72 keys, 18161 bytes
+2025/05/02-08:32:33.593306 7f4162bff6c0 Compacted 1@1 + 1@2 files => 18161 bytes
+2025/05/02-08:32:33.600921 7f4162bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/05/02-08:32:33.601153 7f4162bff6c0 Delete type=2 #106
+2025/05/02-08:32:33.601536 7f4162bff6c0 Delete type=2 #178
+2025/05/02-08:32:33.630581 7f4162bff6c0 Manual compaction at level-1 from '!items!zbsVCsWxRzkzzG1N' @ 216 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end)

packs/armes-et-protection/LOG.old

@@ -0,0 +1,8 @@
+2024/11/17-22:48:43.459868 7f1d093fa6c0 Recovering log #169
+2024/11/17-22:48:43.470425 7f1d093fa6c0 Delete type=3 #167
+2024/11/17-22:48:43.470517 7f1d093fa6c0 Delete type=0 #169
+2024/11/17-22:50:28.262661 7f1d027ff6c0 Level-0 table #174: started
+2024/11/17-22:50:28.262685 7f1d027ff6c0 Level-0 table #174: 0 bytes OK
+2024/11/17-22:50:28.268581 7f1d027ff6c0 Delete type=0 #172
+2024/11/17-22:50:28.274758 7f1d027ff6c0 Manual compaction at level-0 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end)
+2024/11/17-22:50:28.274792 7f1d027ff6c0 Manual compaction at level-1 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end)

packs/atouts-feeriques/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000175

packs/atouts-feeriques/LOG

@@ -0,0 +1,15 @@
+2025/05/02-08:12:38.561663 7f41637fe6c0 Recovering log #173
+2025/05/02-08:12:38.572350 7f41637fe6c0 Delete type=3 #171
+2025/05/02-08:12:38.572464 7f41637fe6c0 Delete type=0 #173
+2025/05/02-08:32:33.524401 7f4162bff6c0 Level-0 table #178: started
+2025/05/02-08:32:33.529756 7f4162bff6c0 Level-0 table #178: 61883 bytes OK
+2025/05/02-08:32:33.536322 7f4162bff6c0 Delete type=0 #176
+2025/05/02-08:32:33.575825 7f4162bff6c0 Manual compaction at level-0 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end)
+2025/05/02-08:32:33.575912 7f4162bff6c0 Manual compaction at level-1 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at '!items!zvtBlG6KCIn0oCVk' @ 459 : 1
+2025/05/02-08:32:33.575922 7f4162bff6c0 Compacting 1@1 + 1@2 files
+2025/05/02-08:32:33.581216 7f4162bff6c0 Generated table #179@1: 153 keys, 61883 bytes
+2025/05/02-08:32:33.581273 7f4162bff6c0 Compacted 1@1 + 1@2 files => 61883 bytes
+2025/05/02-08:32:33.588098 7f4162bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/05/02-08:32:33.588368 7f4162bff6c0 Delete type=2 #106
+2025/05/02-08:32:33.588802 7f4162bff6c0 Delete type=2 #178
+2025/05/02-08:32:33.630551 7f4162bff6c0 Manual compaction at level-1 from '!items!zvtBlG6KCIn0oCVk' @ 459 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end)

packs/atouts-feeriques/LOG.old

@@ -0,0 +1,8 @@
+2024/11/17-22:48:43.420896 7f1d03fff6c0 Recovering log #169
+2024/11/17-22:48:43.431112 7f1d03fff6c0 Delete type=3 #167
+2024/11/17-22:48:43.431187 7f1d03fff6c0 Delete type=0 #169
+2024/11/17-22:50:28.236628 7f1d027ff6c0 Level-0 table #174: started
+2024/11/17-22:50:28.236663 7f1d027ff6c0 Level-0 table #174: 0 bytes OK
+2024/11/17-22:50:28.242846 7f1d027ff6c0 Delete type=0 #172
+2024/11/17-22:50:28.249127 7f1d027ff6c0 Manual compaction at level-0 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end)
+2024/11/17-22:50:28.249160 7f1d027ff6c0 Manual compaction at level-1 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end)

packs/avantages/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000175

packs/avantages/LOG

@@ -0,0 +1,15 @@
+2025/05/02-08:12:38.502811 7f41637fe6c0 Recovering log #173
+2025/05/02-08:12:38.513277 7f41637fe6c0 Delete type=3 #171
+2025/05/02-08:12:38.513388 7f41637fe6c0 Delete type=0 #173
+2025/05/02-08:32:33.465976 7f4162bff6c0 Level-0 table #178: started
+2025/05/02-08:32:33.470234 7f4162bff6c0 Level-0 table #178: 27421 bytes OK
+2025/05/02-08:32:33.477187 7f4162bff6c0 Delete type=0 #176
+2025/05/02-08:32:33.477436 7f4162bff6c0 Manual compaction at level-0 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end)
+2025/05/02-08:32:33.512028 7f4162bff6c0 Manual compaction at level-1 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at '!items!zfpjROW9LDAlXUkN' @ 189 : 1
+2025/05/02-08:32:33.512048 7f4162bff6c0 Compacting 1@1 + 1@2 files
+2025/05/02-08:32:33.516387 7f4162bff6c0 Generated table #179@1: 63 keys, 27421 bytes
+2025/05/02-08:32:33.516430 7f4162bff6c0 Compacted 1@1 + 1@2 files => 27421 bytes
+2025/05/02-08:32:33.523531 7f4162bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/05/02-08:32:33.523711 7f4162bff6c0 Delete type=2 #106
+2025/05/02-08:32:33.523938 7f4162bff6c0 Delete type=2 #178
+2025/05/02-08:32:33.524156 7f4162bff6c0 Manual compaction at level-1 from '!items!zfpjROW9LDAlXUkN' @ 189 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end)

packs/avantages/LOG.old

@@ -0,0 +1,8 @@
+2024/11/17-22:48:43.382022 7f1d08bf96c0 Recovering log #169
+2024/11/17-22:48:43.392929 7f1d08bf96c0 Delete type=3 #167
+2024/11/17-22:48:43.392989 7f1d08bf96c0 Delete type=0 #169
+2024/11/17-22:50:28.229453 7f1d027ff6c0 Level-0 table #174: started
+2024/11/17-22:50:28.229478 7f1d027ff6c0 Level-0 table #174: 0 bytes OK
+2024/11/17-22:50:28.236445 7f1d027ff6c0 Delete type=0 #172
+2024/11/17-22:50:28.249116 7f1d027ff6c0 Manual compaction at level-0 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end)
+2024/11/17-22:50:28.249151 7f1d027ff6c0 Manual compaction at level-1 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end)

packs/capacites/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000175

packs/capacites/LOG

@@ -0,0 +1,15 @@
+2025/05/02-08:12:38.545135 7f4163fff6c0 Recovering log #173
+2025/05/02-08:12:38.556273 7f4163fff6c0 Delete type=3 #171
+2025/05/02-08:12:38.556450 7f4163fff6c0 Delete type=0 #173
+2025/05/02-08:32:33.455447 7f4162bff6c0 Level-0 table #178: started
+2025/05/02-08:32:33.459276 7f4162bff6c0 Level-0 table #178: 24174 bytes OK
+2025/05/02-08:32:33.465795 7f4162bff6c0 Delete type=0 #176
+2025/05/02-08:32:33.477419 7f4162bff6c0 Manual compaction at level-0 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end)
+2025/05/02-08:32:33.500781 7f4162bff6c0 Manual compaction at level-1 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at '!items!yWDg2KlXEz33TSmZ' @ 108 : 1
+2025/05/02-08:32:33.500794 7f4162bff6c0 Compacting 1@1 + 1@2 files
+2025/05/02-08:32:33.504939 7f4162bff6c0 Generated table #179@1: 36 keys, 24174 bytes
+2025/05/02-08:32:33.504980 7f4162bff6c0 Compacted 1@1 + 1@2 files => 24174 bytes
+2025/05/02-08:32:33.511393 7f4162bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/05/02-08:32:33.511579 7f4162bff6c0 Delete type=2 #106
+2025/05/02-08:32:33.511848 7f4162bff6c0 Delete type=2 #178
+2025/05/02-08:32:33.524138 7f4162bff6c0 Manual compaction at level-1 from '!items!yWDg2KlXEz33TSmZ' @ 108 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end)

packs/capacites/LOG.old

@@ -0,0 +1,8 @@
+2024/11/17-22:48:43.408818 7f1d093fa6c0 Recovering log #169
+2024/11/17-22:48:43.418583 7f1d093fa6c0 Delete type=3 #167
+2024/11/17-22:48:43.418635 7f1d093fa6c0 Delete type=0 #169
+2024/11/17-22:50:28.268699 7f1d027ff6c0 Level-0 table #174: started
+2024/11/17-22:50:28.268724 7f1d027ff6c0 Level-0 table #174: 0 bytes OK
+2024/11/17-22:50:28.274639 7f1d027ff6c0 Delete type=0 #172
+2024/11/17-22:50:28.274776 7f1d027ff6c0 Manual compaction at level-0 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end)
+2024/11/17-22:50:28.274799 7f1d027ff6c0 Manual compaction at level-1 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end)

packs/competences/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000176

packs/competences/LOG

@@ -0,0 +1,15 @@
+2025/05/02-08:12:38.486843 7f4163fff6c0 Recovering log #174
+2025/05/02-08:12:38.497823 7f4163fff6c0 Delete type=3 #172
+2025/05/02-08:12:38.497971 7f4163fff6c0 Delete type=0 #174
+2025/05/02-08:32:33.432014 7f4162bff6c0 Level-0 table #179: started
+2025/05/02-08:32:33.436580 7f4162bff6c0 Level-0 table #179: 30205 bytes OK
+2025/05/02-08:32:33.443380 7f4162bff6c0 Delete type=0 #177
+2025/05/02-08:32:33.477388 7f4162bff6c0 Manual compaction at level-0 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end)
+2025/05/02-08:32:33.477460 7f4162bff6c0 Manual compaction at level-1 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at '!items!zEl2NQsnCpELVWzh' @ 285 : 1
+2025/05/02-08:32:33.477471 7f4162bff6c0 Compacting 1@1 + 1@2 files
+2025/05/02-08:32:33.481585 7f4162bff6c0 Generated table #180@1: 74 keys, 30205 bytes
+2025/05/02-08:32:33.481642 7f4162bff6c0 Compacted 1@1 + 1@2 files => 30205 bytes
+2025/05/02-08:32:33.488072 7f4162bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/05/02-08:32:33.488265 7f4162bff6c0 Delete type=2 #159
+2025/05/02-08:32:33.488483 7f4162bff6c0 Delete type=2 #179
+2025/05/02-08:32:33.524098 7f4162bff6c0 Manual compaction at level-1 from '!items!zEl2NQsnCpELVWzh' @ 285 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end)

packs/competences/LOG.old

@@ -0,0 +1,8 @@
+2024/11/17-22:48:43.369953 7f1d03fff6c0 Recovering log #170
+2024/11/17-22:48:43.379524 7f1d03fff6c0 Delete type=3 #168
+2024/11/17-22:48:43.379589 7f1d03fff6c0 Delete type=0 #170
+2024/11/17-22:50:28.223060 7f1d027ff6c0 Level-0 table #175: started
+2024/11/17-22:50:28.223138 7f1d027ff6c0 Level-0 table #175: 0 bytes OK
+2024/11/17-22:50:28.229321 7f1d027ff6c0 Delete type=0 #173
+2024/11/17-22:50:28.249101 7f1d027ff6c0 Manual compaction at level-0 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end)
+2024/11/17-22:50:28.249144 7f1d027ff6c0 Manual compaction at level-1 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end)

packs/desavantages/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000175

packs/desavantages/LOG

@@ -0,0 +1,15 @@
+2025/05/02-08:12:38.518058 7f41693fa6c0 Recovering log #173
+2025/05/02-08:12:38.529950 7f41693fa6c0 Delete type=3 #171
+2025/05/02-08:12:38.530055 7f41693fa6c0 Delete type=0 #173
+2025/05/02-08:32:33.443582 7f4162bff6c0 Level-0 table #178: started
+2025/05/02-08:32:33.448404 7f4162bff6c0 Level-0 table #178: 31582 bytes OK
+2025/05/02-08:32:33.455254 7f4162bff6c0 Delete type=0 #176
+2025/05/02-08:32:33.477406 7f4162bff6c0 Manual compaction at level-0 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end)
+2025/05/02-08:32:33.488601 7f4162bff6c0 Manual compaction at level-1 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at '!items!xzRJ6JP1HqoqxLdj' @ 195 : 1
+2025/05/02-08:32:33.488624 7f4162bff6c0 Compacting 1@1 + 1@2 files
+2025/05/02-08:32:33.493136 7f4162bff6c0 Generated table #179@1: 65 keys, 31582 bytes
+2025/05/02-08:32:33.493174 7f4162bff6c0 Compacted 1@1 + 1@2 files => 31582 bytes
+2025/05/02-08:32:33.500214 7f4162bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/05/02-08:32:33.500377 7f4162bff6c0 Delete type=2 #106
+2025/05/02-08:32:33.500642 7f4162bff6c0 Delete type=2 #178
+2025/05/02-08:32:33.524120 7f4162bff6c0 Manual compaction at level-1 from '!items!xzRJ6JP1HqoqxLdj' @ 195 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end)

packs/desavantages/LOG.old

@@ -0,0 +1,8 @@
+2024/11/17-22:48:43.395898 7f1d037fe6c0 Recovering log #169
+2024/11/17-22:48:43.406363 7f1d037fe6c0 Delete type=3 #167
+2024/11/17-22:48:43.406473 7f1d037fe6c0 Delete type=0 #169
+2024/11/17-22:50:28.242967 7f1d027ff6c0 Level-0 table #174: started
+2024/11/17-22:50:28.242990 7f1d027ff6c0 Level-0 table #174: 0 bytes OK
+2024/11/17-22:50:28.248975 7f1d027ff6c0 Delete type=0 #172
+2024/11/17-22:50:28.249136 7f1d027ff6c0 Manual compaction at level-0 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end)
+2024/11/17-22:50:28.249166 7f1d027ff6c0 Manual compaction at level-1 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end)

packs/pouvoirs/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000176

packs/pouvoirs/LOG

@@ -0,0 +1,15 @@
+2025/05/02-08:12:38.599663 7f4163fff6c0 Recovering log #174
+2025/05/02-08:12:38.610256 7f4163fff6c0 Delete type=3 #172
+2025/05/02-08:12:38.610386 7f4163fff6c0 Delete type=0 #174
+2025/05/02-08:32:33.560393 7f4162bff6c0 Level-0 table #179: started
+2025/05/02-08:32:33.568946 7f4162bff6c0 Level-0 table #179: 279479 bytes OK
+2025/05/02-08:32:33.575435 7f4162bff6c0 Delete type=0 #177
+2025/05/02-08:32:33.575893 7f4162bff6c0 Manual compaction at level-0 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end)
+2025/05/02-08:32:33.614470 7f4162bff6c0 Manual compaction at level-1 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at '!items!zON0h5SjFyANjPnA' @ 540 : 1
+2025/05/02-08:32:33.614491 7f4162bff6c0 Compacting 1@1 + 1@2 files
+2025/05/02-08:32:33.623438 7f4162bff6c0 Generated table #180@1: 135 keys, 279479 bytes
+2025/05/02-08:32:33.623477 7f4162bff6c0 Compacted 1@1 + 1@2 files => 279479 bytes
+2025/05/02-08:32:33.629748 7f4162bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/05/02-08:32:33.629951 7f4162bff6c0 Delete type=2 #139
+2025/05/02-08:32:33.630303 7f4162bff6c0 Delete type=2 #179
+2025/05/02-08:32:33.630622 7f4162bff6c0 Manual compaction at level-1 from '!items!zON0h5SjFyANjPnA' @ 540 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end)

packs/pouvoirs/LOG.old

@@ -0,0 +1,8 @@
+2024/11/17-22:48:43.446368 7f1d037fe6c0 Recovering log #170
+2024/11/17-22:48:43.456501 7f1d037fe6c0 Delete type=3 #168
+2024/11/17-22:48:43.456578 7f1d037fe6c0 Delete type=0 #170
+2024/11/17-22:50:28.255715 7f1d027ff6c0 Level-0 table #175: started
+2024/11/17-22:50:28.255743 7f1d027ff6c0 Level-0 table #175: 0 bytes OK
+2024/11/17-22:50:28.262546 7f1d027ff6c0 Delete type=0 #173
+2024/11/17-22:50:28.274749 7f1d027ff6c0 Manual compaction at level-0 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end)
+2024/11/17-22:50:28.274785 7f1d027ff6c0 Manual compaction at level-1 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end)

packs/profils/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000174

packs/profils/LOG

@@ -0,0 +1,7 @@
+2025/05/02-08:12:38.642095 7f4168bf96c0 Recovering log #172
+2025/05/02-08:12:38.652987 7f4168bf96c0 Delete type=3 #170
+2025/05/02-08:12:38.653107 7f4168bf96c0 Delete type=0 #172
+2025/05/02-08:32:33.630766 7f4162bff6c0 Level-0 table #177: started
+2025/05/02-08:32:33.630831 7f4162bff6c0 Level-0 table #177: 0 bytes OK
+2025/05/02-08:32:33.637591 7f4162bff6c0 Delete type=0 #175
+2025/05/02-08:32:33.669383 7f4162bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/profils/LOG.old

@@ -0,0 +1,7 @@
+2024/11/17-22:48:43.473498 7f1d093fa6c0 Recovering log #168
+2024/11/17-22:48:43.483301 7f1d093fa6c0 Delete type=3 #166
+2024/11/17-22:48:43.483362 7f1d093fa6c0 Delete type=0 #168
+2024/11/17-22:50:28.281429 7f1d027ff6c0 Level-0 table #173: started
+2024/11/17-22:50:28.281470 7f1d027ff6c0 Level-0 table #173: 0 bytes OK
+2024/11/17-22:50:28.288046 7f1d027ff6c0 Delete type=0 #171
+2024/11/17-22:50:28.300645 7f1d027ff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/scenes/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000144

packs/scenes/LOG

@@ -0,0 +1,15 @@
+2025/05/02-08:12:38.657367 7f41637fe6c0 Recovering log #142
+2025/05/02-08:12:38.668877 7f41637fe6c0 Delete type=3 #140
+2025/05/02-08:12:38.668996 7f41637fe6c0 Delete type=0 #142
+2025/05/02-08:32:33.658042 7f4162bff6c0 Level-0 table #147: started
+2025/05/02-08:32:33.662480 7f4162bff6c0 Level-0 table #147: 4682 bytes OK
+2025/05/02-08:32:33.669142 7f4162bff6c0 Delete type=0 #145
+2025/05/02-08:32:33.669454 7f4162bff6c0 Manual compaction at level-0 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end)
+2025/05/02-08:32:33.669512 7f4162bff6c0 Manual compaction at level-1 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at '!scenes!ypDutqjqZcr7lx6I' @ 16 : 1
+2025/05/02-08:32:33.669532 7f4162bff6c0 Compacting 1@1 + 1@2 files
+2025/05/02-08:32:33.673201 7f4162bff6c0 Generated table #148@1: 4 keys, 2992 bytes
+2025/05/02-08:32:33.673241 7f4162bff6c0 Compacted 1@1 + 1@2 files => 2992 bytes
+2025/05/02-08:32:33.681539 7f4162bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/05/02-08:32:33.681688 7f4162bff6c0 Delete type=2 #87
+2025/05/02-08:32:33.681917 7f4162bff6c0 Delete type=2 #147
+2025/05/02-08:32:33.707107 7f4162bff6c0 Manual compaction at level-1 from '!scenes!ypDutqjqZcr7lx6I' @ 16 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end)

packs/scenes/LOG.old

@@ -0,0 +1,8 @@
+2024/11/17-22:48:43.485905 7f1d08bf96c0 Recovering log #138
+2024/11/17-22:48:43.496531 7f1d08bf96c0 Delete type=3 #136
+2024/11/17-22:48:43.496608 7f1d08bf96c0 Delete type=0 #138
+2024/11/17-22:50:28.294362 7f1d027ff6c0 Level-0 table #143: started
+2024/11/17-22:50:28.294392 7f1d027ff6c0 Level-0 table #143: 0 bytes OK
+2024/11/17-22:50:28.300492 7f1d027ff6c0 Delete type=0 #141
+2024/11/17-22:50:28.300663 7f1d027ff6c0 Manual compaction at level-0 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end)
+2024/11/17-22:50:28.300690 7f1d027ff6c0 Manual compaction at level-1 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end)

styles/simple.css

@@ -12,7 +12,7 @@
     font-family: Garamond;
     src: url('../assets/fonts/Garamond.woff') format("woff");
   }
-  
+
   :root {
   /* =================== 1. ACTOR SHEET FONT STYLES =========== */
     --window-header-font-family: GismondaFG;
@@ -39,7 +39,7 @@
     --actor-label-font-weight: 700;
     --actor-label-color: #464331c4;
 
-  /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */ 
+  /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */
     --debug-background-color-red: #ff000054;
     --debug-background-color-blue: #1d00ff54;
     --debug-background-color-green: #54ff0054;
@@ -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;*/
@@ -477,15 +482,15 @@ table {border: 1px solid #7a7971;}
   line-height: 1.5rem;
   border-top: 0 none;
   border-bottom: 0 none;
-  /*background-color:#2e5561;*/
   color: #cbdaa3;
   background-image: url("../assets/ui/bandeau_01.webp");
 }
 
-/*  background: rgb(245,245,240) url("../images/ui/fond4.webp") repeat left top;*/
+nav.sheet-tabs a,
 nav.sheet-tabs .item {
   position: relative;
   padding: 0 0.25rem;
+  color: beige;
 }
 
 nav.sheet-tabs .item:after {
@@ -495,7 +500,6 @@ nav.sheet-tabs .item:after {
   right: 0;
   height: 2rem;
   width: 1px;
-  /*border-right: 1px dashed rgba(52, 52, 52, 0.25);*/
 }
 
 .sheet .tab[data-tab] {
@@ -568,6 +572,7 @@ ul, li {
 
 .specialisation-label {
   font-size: 0.8rem;
+  font-style: italic;
 }
 
 .carac-label,
@@ -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;
 }
@@ -694,10 +707,10 @@ ul, li {
   margin-right: 0.25rem;
   margin-left: 0.25rem;
 }
-.blessures-title { 
+.blessures-title {
   font-weight: bold;
 }
-.alchimie-title { 
+.alchimie-title {
   font-weight: bold;
 }
 .blessure-data {
@@ -779,7 +792,7 @@ ul, li {
 
 /* ======================================== */
 .tokenhudext {
-	display: flex; 
+	display: flex;
 	flex: 0 !important;
   font-weight: 600;
 }
@@ -856,7 +869,7 @@ ul, li {
 .sidebar-tab .directory-list .entity {
     border-top: 1px dashed rgba(0,0,0,0.25);
     border-bottom: 0 none;
-    padding: 0.25rem 0; 
+    padding: 0.25rem 0;
 }
 
 .sidebar-tab .directory-list .entity:hover {
@@ -870,10 +883,10 @@ ul, li {
   text-align: center;
   vertical-align: middle;
   display: flex;
-  align-items: center; 
+  align-items: center;
 }
 
-.chat-message .message-header .flavor-text, .chat-message .message-header .whisper-to { 
+.chat-message .message-header .flavor-text, .chat-message .message-header .whisper-to {
   font-size: 0.9rem;
 }
 .chat-actor-name {
@@ -1010,8 +1023,6 @@ ul, li {
 }
 
 #sidebar #sidebar-tabs i{
-  width: 25px;
-  height: 25px;
   display: inline-block;
   background-position:center;
   background-size:cover;
@@ -1019,23 +1030,6 @@ ul, li {
 
 }
 
-/*#sidebar #sidebar-tabs i.fa-comments:before, #sidebar #sidebar-tabs i.fa-fist-raised:before, #sidebar #sidebar-tabs i.fa-users:before, #sidebar #sidebar-tabs i.fa-map:before, #sidebar #sidebar-tabs i.fa-suitcase:before, #sidebar #sidebar-tabs i.fa-book-open:before, #sidebar #sidebar-tabs i.fa-th-list:before, #sidebar #sidebar-tabs i.fa-music:before, #sidebar #sidebar-tabs i.fa-atlas:before, #sidebar #sidebar-tabs i.fa-cogs:before {content: "";}
-#sidebar #sidebar-tabs i.fa-comments {background: url("img/ui/icon_sidebar_chat.svg") no-repeat;}
-#sidebar #sidebar-tabs i.fa-fist-raised {background: url("img/ui/icon_sidebar_fight.svg") no-repeat;}
-#sidebar #sidebar-tabs i.fa-users {background: url("img/ui/icon_sidebar_actor.svg") no-repeat;}
-#sidebar #sidebar-tabs i.fa-map {background: url("img/ui/icon_sidebar_scene.svg") no-repeat;}
-#sidebar #sidebar-tabs i.fa-suitcase {background: url("img/ui/icon_sidebar_item.svg") no-repeat;}
-#sidebar #sidebar-tabs i.fa-book-open {background: url("img/ui/icon_sidebar_journal.svg") no-repeat;}
-#sidebar #sidebar-tabs i.fa-th-list {background: url("img/ui/icon_sidebar_rolltable.svg") no-repeat;}
-#sidebar #sidebar-tabs i.fa-music {background: url("img/ui/icon_sidebar_music.svg") no-repeat;}
-#sidebar #sidebar-tabs i.fa-atlas {background: url("img/ui/icon_sidebar_compendium.svg") no-repeat;}
-#sidebar #sidebar-tabs i.fa-cogs {background: url("img/ui/icon_sidebar_settings.svg") no-repeat;}
-
-#combat #combat-controls {
-  box-shadow: inset 0 0 2rem rgba(0,0,0,0.5);
-}
-*/
-
 /*--------------------------------------------------------------------------*/
 /* Control, Tool, hotbar & navigation */
 
@@ -1072,7 +1066,7 @@ ul, li {
   border-radius: 0px;
 }
 
-#hotbar .bar-controls {  
+#hotbar .bar-controls {
   background: rgba(30, 25, 20, 1);
   border: 1px solid rgba(72, 46, 28, 1);
 }
@@ -1132,7 +1126,7 @@ ul, li {
   top: 1px;
   position: absolute;
   z-index: 1;
-  
+
   /* Fade in tooltip */
   visibility: hidden;
   opacity: 0;
@@ -1141,7 +1135,7 @@ ul, li {
 
 .tooltip .ttt-fatigue{
   width: 360px;
-  
+
   background: rgba(30, 25, 20, 0.9);
   border-image: url(img/ui/bg_control.jpg) 21 repeat;
   border-image-slice: 6 6 6 6 fill;
@@ -1204,7 +1198,17 @@ ul, li {
   top:1px;
 }
 
+h4.entry-name.document-name {
+  color: #f3eeee;
+}
+.compendium h4.entry-name.document-name {
+  color: black;
+}
 
+.fxmaster {
+  background: #443e37E0;
+  background-color: #443e37E0;
+}
 .button-sheet-roll {
   box-shadow: inset 0px 1px 0px 0px #a6827e;
   background: linear-gradient(to bottom, #41545a 5%, #2e5561 100%);
@@ -1228,11 +1232,26 @@ ul, li {
   background: linear-gradient(to bottom, #800000 5%, #3e0101 100%);
   background-color: rgb(56, 33, 33);
 }
+.roll-tricherie-2 {
+  margin: 2px 2px 2px 2px;
+  box-shadow: inset 0px 1px 0px 0px #a6827e;
+  background: linear-gradient(to bottom, #41545a 5%, #2e5561 100%);
+  background-color: #7d5d3b00;
+  border-radius: 4px;
+  border: 1px ridge #846109;
+  padding: 1px 1px 0px 1px;
+  text-decoration: none;
+  text-shadow: 0px 1px 0px #4d3534;
+  color: beige;
+}
 .button-sheet-roll:active {
   position:relative;
   top:1px;
 }
-
+.button-sheet-roll-long1 {
+  max-width: 6.1rem;
+  min-width: 6.1rem;
+}
 .defense-sheet {
   border-radius: 4px;
   text-align: center;
@@ -1301,7 +1320,7 @@ ul, li {
 .drop-ability-power,
 .drop-ability-spec,
 .drop-spec-power,
-.drop-abilities, 
+.drop-abilities,
 .drop-optionnal-abilities,
 .drop-specialperk1,
 .drop-perk2,
@@ -1374,7 +1393,7 @@ ul, li {
   height: 40px;
 }
 
-.dice-cell {  
+.dice-cell {
   padding-left: 12px;
   padding-right: 12px;
   width: 60px;
@@ -1408,6 +1427,12 @@ ul, li {
   max-width: 4rem;
   min-width: 4rem;
 }
+.item-field-label-short-num {
+  padding-top: 6px;
+  flex-grow:1;
+  max-width: 2rem;
+  min-width: 2rem;
+}
 .item-field-label-medium {
   padding-top: 6px;
   flex-grow:1;
@@ -1444,7 +1469,7 @@ ul, li {
   flex-wrap: nowrap;
 }
 .item-filler {
-  flex-grow: 6;  
+  flex-grow: 6;
   flex-shrink: 7;
 }
 .item-controls-fixed {

system.json

@@ -1,7 +1,7 @@
 {
   "id": "fvtt-les-heritiers",
   "description": "Les Héritiers pour FoundryVTT",
-  "version": "10.0.20",
+  "version": "13.0.0",
   "authors": [
     {
       "name": "Uberwald/LeRatierBretonnien",
@@ -15,11 +15,13 @@
   "esmodules": [
     "modules/heritiers-main.js"
   ],
-  "gridDistance": 5,
-  "gridUnits": "m",
+  "grid": {
+    "distance": 5,
+    "units": "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.20.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-les-heritiers/archive/fvtt-les-heritiers-13.0.0.zip",
   "languages": [
     {
       "lang": "fr",
@@ -28,87 +30,163 @@
       "flags": {}
     }
   ],
+  "packFolders": [
+    {
+      "name": "Les Héritiers",
+      "sorting": "m",
+      "color": "#00435c",
+      "folders": [
+        {
+          "name": "Création de Personnage",
+          "sorting": "a",
+          "color": "#00435c",
+          "packs": [
+            "competences",
+            "atouts-feeriques",
+            "avantages",
+            "capacites",
+            "competences",
+            "desavantages",
+            "pouvoirs",
+            "profils",
+            "archetypes-fees"
+          ],
+          "folders": []
+        },
+        {
+          "name": "Equipement",
+          "sorting": "a",
+          "color": "#00435c",
+          "packs": [
+            "armes-et-protection"
+          ],
+          "folders": []
+        }
+      ],
+      "packs":
+        ["scenes"]
+    }
+  ],
   "packs": [
     {
       "type": "Item",
       "label": "Compétences",
       "name": "competences",
-      "path": "packs/competences.db",
+      "path": "packs/competences",
       "system": "fvtt-les-heritiers",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Avantages",
       "name": "avantages",
-      "path": "packs/avantages.db",
+      "path": "packs/avantages",
       "system": "fvtt-les-heritiers",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Désavantages",
       "name": "desavantages",
-      "path": "packs/desavantages.db",
+      "path": "packs/desavantages",
       "system": "fvtt-les-heritiers",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Capacités Naturelles",
       "name": "capacites",
-      "path": "packs/capacites.db",
+      "path": "packs/capacites",
       "system": "fvtt-les-heritiers",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Atouts Féériques",
       "name": "atouts-feeriques",
-      "path": "packs/atouts-feeriques.db",
+      "path": "packs/atouts-feeriques",
       "system": "fvtt-les-heritiers",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Fées",
       "name": "archetypes-fees",
-      "path": "packs/archetypes-fees.db",
+      "path": "packs/archetypes-fees",
       "system": "fvtt-les-heritiers",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Pouvoirs",
       "name": "pouvoirs",
-      "path": "packs/pouvoirs.db",
+      "path": "packs/pouvoirs",
       "system": "fvtt-les-heritiers",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Armes et Protections",
       "name": "armes-et-protection",
-      "path": "packs/armes-et-protection.db",
+      "path": "packs/armes-et-protection",
       "system": "fvtt-les-heritiers",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Profils",
       "name": "profils",
-      "path": "packs/profils.db",
+      "path": "packs/profils",
       "system": "fvtt-les-heritiers",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
+    },
+    {
+      "type": "Scene",
+      "label": "Scènes",
+      "name": "scenes",
+      "path": "packs/scenes",
+      "system": "fvtt-les-heritiers",
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     }
   ],
   "primaryTokenAttribute": "sante.vigueur",
@@ -121,8 +199,7 @@
   "url": "https://www.uberwald.me/gitea/public/fvtt-les-heritiers",
   "background": "systems/fvtt-les-heritiers/assets/ui/wallpaper_foundry2.webp",
   "compatibility": {
-    "minimum": "10",
-    "verified": "10",
-    "maximum": "10"
+    "minimum": "13",
+    "verified": "13"
   }
 }

template.json

@@ -2,7 +2,7 @@
   "Actor": {
     "types": [
       "personnage",
-      "creature"
+      "pnj"
     ],
     "templates": {
       "biodata": {
@@ -36,7 +36,9 @@
           "habitat": "",
           "notes": "",
           "statut": "",
-          "gmnotes": ""
+          "playernotes":"",
+          "gmnotes": "",
+          "magie": false
         }
       },
       "core": {
@@ -99,7 +101,7 @@
           "pres": {
             "label": "Prestance",
             "labelnorm": "prestance",
-            "abbrev": "pre",
+            "abbrev": "pres",
             "kind": "mental",
             "value": 1,
             "rang": 0,
@@ -115,20 +117,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
@@ -136,40 +143,53 @@
         },
         "pv": {
           "value": 0,
-          "max": 0
+          "max": 0,
+          "mod": 0
         },
         "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
           }
         },
+        "magie": {
+          "pointsame": {
+            "value": 0,
+            "max": 0
+          }
+        },
         "experience": {
           "value": 0,
           "pourtricher": 0
@@ -180,6 +200,8 @@
             "demasquee": 0
           },
           "parade": {
+            "masquee": 0,
+            "demasquee": 0,
             "value": 0
           },
           "resistancephysique": {
@@ -219,6 +241,12 @@
         "biodata",
         "core"
       ]
+    },
+    "pnj": {
+      "templates": [
+        "biodata",
+        "core"
+      ]
     }
   },
   "Item": {
@@ -234,19 +262,20 @@
       }
     },
     "types": [
-      "fee",
-      "avantage",
-      "desavantage",
-      "capacitenaturelle",
-      "pouvoir",
-      "atoutfeerique",
-      "competence",
-      "arme",
-      "protection",
-      "equipement",
       "accessoire",
+      "arme",
+      "atoutfeerique",
+      "avantage",
+      "capacitenaturelle",
+      "competence",
       "contact",
-      "profil"
+      "desavantage",
+      "equipement",
+      "fee",
+      "pouvoir",
+      "profil",
+      "protection",
+      "sort"
     ],
     "profil": {
       "profiltype": "majeur",
@@ -302,6 +331,7 @@
       "portee": "",
       "resistance": "",      
       "resistanceautre":"",
+      "pointsusagecourant": -1,
       "isvirulence": false,
       "virulence":"",
       "description": ""
@@ -315,6 +345,7 @@
       "niveau": 0,
       "predilection": false,
       "specialites": [],
+      "ismagie": false,
       "description": ""
     },
     "equipement": {
@@ -323,6 +354,19 @@
         "basequip"
       ]
     },
+    "sort": {
+      "niveau": "novice",
+      "competence": "Druidisme",
+      "carac": "esp",
+      "duree": "",
+      "portee": "",
+      "concentration": "",
+      "critique": "",
+      "ingredients": "",
+      "resistance": "",
+      "coutactivation": "",
+      "description": ""
+    },
     "arme": {
       "categorie": "",
       "armetype": "",

templates/actor-pnj-sheet.html

@@ -0,0 +1,547 @@
+<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.value}}" 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">
+                {{selectOptions config.statutMasque selected=system.statutmasque}}
+                </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">
+                {{selectOptions @root.config.listNiveau selected=skill.system.niveau}}
+              </select>
+
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+        </div>
+
+
+        <li class="item flexrow " >
+          <h2>Magie</h3>
+        </li>
+
+        <div class="flexrow">
+          <ul>
+            <li class="flexrow item">
+              <label class="item-field-label-medium roll-style"><a class="item-field-label-short"
+                  data-rang-key="feerie">Point d'Ame</a></label>
+              <input type="text" class="item-field-label-short" name="system.magie.pointsame.value"
+                value="{{system.magie.pointsame.value}}" data-dtype="Number" />
+              <input type="text" class="item-field-label-short" name="system.magie.pointsame.max"
+                value="{{system.magie.pointsame.max}}" data-dtype="Number" {{#if issGM}} {{else}} disabled {{/if}} />
+            </li>
+          </ul>
+        </div>
+
+        {{#each magieList as |magie idx|}}
+        <li class="item flexrow " data-item-id="{{magie.competence._id}}" data-item-type="competence">
+          <h2 class="flexrow"><label class="items-title-text "><a class="roll-competence item-field-label-short"
+            data-attr-key="tochoose">{{magie.name}} {{magie.competence.system.niveau}} </a> </label>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+            <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
+          </div>
+        </h2>      
+        </li>
+  
+        <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">Nom du sort</label></h3>
+              </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">
+                <a class="item-control item-add" data-type="sort" title="Ajouter un sort"><i
+                    class="fas fa-plus"></i></a>
+              </div>
+            </li>
+            {{#each sorts as |sort key|}}
+            <li class="item flexrow " data-item-id="{{sort._id}}" data-item-type="sort">
+              <img class="item-name-img" src="{{sort.img}}" />
+              <span class="item-field-label-long2 roll-style"><a class="roll-sort">{{sort.name}}</a></span>
+              <span class="item-field-label-medium">{{upperFirst sort.system.niveau}}</span>
+  
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+        </div>
+        {{/each}}
+
+
+      </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="Equipé">{{#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="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'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="protection" title="Ajouter une protection"><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="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'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="Editer l'item"><i class="fas fa-edit"></i></a>
+            <a class="item-control item-delete" title="Supprimer l'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-medium"></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" />
+            <span class="item-field-label-medium"></span>
+            <label class="item-field-label-long roll-style"><a class="dialog-recup-usage item-field-label-long">Récup. P. d'Usage</a></label> 
+          </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">
+                <a class="item-control item-add" data-type="avantage" title="Ajouter un avantage"><i
+                    class="fas fa-plus"></i></a>
+              </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="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'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">
+                <a class="item-control item-add" data-type="desavantage" title="Ajouter un Désavantage"><i
+                    class="fas fa-plus"></i></a>
+              </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="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'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">
+                <a class="item-control item-add" data-type="atoutfeerique" title="Ajouter un Atout féerique"><i
+                    class="fas fa-plus"></i></a>
+              </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="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'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>
+              <span class="item-field-label-medium">
+                <label class="short-label">Usage</label>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="pouvoir" title="Ajouter un pouvoir"><i
+                    class="fas fa-plus"></i></a>
+              </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}}" />
+              <span class="item-field-label-long2 roll-style"><a class="roll-pouvoir">{{pouvoir.name}}</a></span>
+              <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>
+              <span class="item-field-label-medium">{{pouvoir.system.pointsusagecourant}}/{{pouvoir.maxUsage}}</span>
+              
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'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">
+                <a class="item-control item-add" data-type="capacitenaturelle" title="Ajouter une Capacité naturelle"><i
+                    class="fas fa-plus"></i></a>
+              </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="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'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="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'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>

templates/actor-sheet.html

@@ -14,7 +14,8 @@
                 {{#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 +31,8 @@
                 {{#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"
@@ -42,18 +44,30 @@
             </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>
-              <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 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}}" disabled
+              data-dtype="Number" />
+            <input type="text" class="item-field-label-short" name="system.pv.mod" value="{{system.pv.mod}}"
+              data-dtype="Number" />
+            <label class="item-field-label-short">Malus</label>
+            <input type="text" class="item-field-label-short" value="{{pvMalus.value}}" 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">
+              {{selectOptions config.statutMasque selected=system.statutmasque}}
+            </select>
+
+            <span>&nbsp;&nbsp;</span>
+            <label class="item-field-label-short">Tricherie</label>
+            <input type="text" class="item-field-label-short-num" name="system.rang.tricherie.value"
+              value="{{system.rang.tricherie.value}}" data-dtype="Number" />
+            <input type="text" class="item-field-label-short-num" name="system.rang.tricherie.max"
+              value="{{system.rang.tricherie.max}}" data-dtype="Number" />
+          </div>
 
         </div>
       </div>
@@ -63,6 +77,9 @@
   <nav class="sheet-tabs tabs" data-group="primary">
     <a class="item" data-tab="competences">Compétences</a>
     <a class="item" data-tab="fee">Fée</a>
+    {{#if system.biodata.magie}}
+    <a class="item" data-tab="magie">Magie</a>
+    {{/if}}
     <a class="item" data-tab="combat">Combat</a>
     <a class="item" data-tab="equipement">Equipement</a>
     <a class="item" data-tab="contact">Contacts</a>
@@ -78,42 +95,23 @@
 
       <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>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
+          <div>
+            {{#each utileSkillsPhysical as |skillDef keyProfil|}}
+            {{> systems/fvtt-les-heritiers/templates/partial-utile-skills.html skillDef=skillDef keyProfil=keyProfil
+            config=config}}
             {{/each}}
-          </ul>
+          </div>
+
+          <div>
+            {{#each utileSkillsMental as |skillDef keyProfil|}}
+            {{> systems/fvtt-les-heritiers/templates/partial-utile-skills.html skillDef=skillDef keyProfil=keyProfil
+            config=config}}
+            {{/each}}
+          </div>
+
         </div>
-        {{/each}}
 
         <div class="sheet-box color-bg-archetype">
           <ul class="item-list alternate-list">
@@ -125,22 +123,24 @@
                 <label class="short-label">Niveau</label>
               </span>
               <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="competence" title="Ajouter une compétence futile"><i
+                    class="fas fa-plus"></i></a>
+              </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"><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"
-                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 class="item-field-label-short edit-item-data" type="text" data-item-field="niveau"
+                value="{{skill.system.niveau}}" data-dtype="Number">
+                {{selectOptions @root.config.listNiveau selected=skill.system.niveau}}
               </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>
+                <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -161,39 +161,41 @@
         <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" />
+          <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" />
+          <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" />
+          <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" />
+          <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" />
+          <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" />
+          <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" />
+          <input type="text" class="item-field-label-short" name="system.combat.dissimulation.value"
+            value="{{system.combat.dissimulation.value}}" data-dtype="Number" />
         </li>
       </ul>
 
@@ -205,15 +207,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
@@ -226,19 +225,33 @@
               <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
+                <a class="item-control item-equip" title="Equipé">{{#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>
+                <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -256,7 +269,7 @@
               </span>
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
-                <a class="item-control item-add" data-type="arme" title="Ajouter une arme"><i
+                <a class="item-control item-add" data-type="protection" title="Ajouter une protection"><i
                     class="fas fa-plus"></i></a>
               </div>
             </li>
@@ -269,8 +282,8 @@
               </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>
+                <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -282,15 +295,15 @@
 
     {{!-- Fee Tab --}}
     <div class="tab fee" data-group="primary" data-tab="fee">
-      
+
       <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>
+            <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+            <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
           </div>
         </li>
       </div>
@@ -298,13 +311,22 @@
       <div class="flexrow">
         <ul>
           <li class="flexrow item">
-            <label class="item-field-label-medium">Féerie</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> 
-            <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" />
+            <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-medium"></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" />
+            <span class="item-field-label-medium"></span>
+            <label class="item-field-label-long roll-style"><a class="dialog-recup-usage item-field-label-long">Récup.
+                P. d'Usage</a></label>
           </li>
         </ul>
       </div>
@@ -319,6 +341,8 @@
               </span>
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="avantage" title="Ajouter un avantage"><i
+                    class="fas fa-plus"></i></a>
               </div>
             </li>
             {{#each avantages as |avantage key|}}
@@ -327,8 +351,8 @@
               <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>
+                <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -343,6 +367,8 @@
               </span>
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="desavantage" title="Ajouter un désavantage"><i
+                    class="fas fa-plus"></i></a>
               </div>
             </li>
             {{#each desavantages as |desavantage key|}}
@@ -351,8 +377,8 @@
               <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>
+                <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -367,6 +393,8 @@
               </span>
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="atoutfeerique" title="Ajouter un atout féerique"><i
+                    class="fas fa-plus"></i></a>
               </div>
             </li>
             {{#each atouts as |atout key|}}
@@ -375,8 +403,8 @@
               <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>
+                <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -398,22 +426,28 @@
               <span class="item-field-label-medium">
                 <label class="short-label">Niveau</label>
               </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">Usage</label>
+              </span>
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="pouvoir" title="Ajouter un pouvoir"><i
+                    class="fas fa-plus"></i></a>
               </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}}" />
-              <span class="item-field-label-long2">{{pouvoir.name}}</span>
+              <span class="item-field-label-long2 roll-style"><a class="roll-pouvoir">{{pouvoir.name}}</a></span>
               <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>
-              
+              <span class="item-field-label-medium">{{pouvoir.system.pointsusagecourant}}/{{pouvoir.maxUsage}}</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>
+                <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -429,6 +463,8 @@
               </span>
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="capacitenaturelle" title="Ajouter une capacité naturelle"><i
+                    class="fas fa-plus"></i></a>
               </div>
             </li>
             {{#each capacites as |capa key|}}
@@ -437,8 +473,8 @@
               <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>
+                <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -450,9 +486,71 @@
 
     </div>
 
+    {{!-- Magie Tab --}}
+    <div class="tab magie" data-group="primary" data-tab="magie">
+
+      <div class="flexrow">
+        <ul>
+          <li class="flexrow item">
+            <label class="item-field-label-medium roll-style"><a class="item-field-label-short"
+                data-rang-key="feerie">Point d'Ame</a></label>
+            <input type="text" class="item-field-label-short" name="system.magie.pointsame.value"
+              value="{{system.magie.pointsame.value}}" data-dtype="Number" />
+            <input type="text" class="item-field-label-short" name="system.magie.pointsame.max"
+              value="{{system.magie.pointsame.max}}" data-dtype="Number" {{#if issGM}} {{else}} disabled {{/if}} />
+          </li>
+        </ul>
+      </div>
+
+      {{#each magieList as |magie idx|}}
+      <li class="item flexrow " data-item-id="{{magie.competence._id}}" data-item-type="competence">
+        <h2 class="flexrow"><label class="items-title-text "><a class="roll-competence item-field-label-short"
+          data-attr-key="tochoose">{{magie.name}} {{magie.competence.system.niveau}} </a> </label>
+        <div class="item-controls item-controls-fixed">
+          <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+          <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
+        </div>
+      </h2>
+      </li>
+
+      <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">Nom du sort</label></h3>
+            </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">
+              <a class="item-control item-add" data-type="sort" title="Ajouter un sort"><i
+                  class="fas fa-plus"></i></a>
+            </div>
+          </li>
+          {{#each sorts as |sort key|}}
+          <li class="item flexrow " data-item-id="{{sort._id}}" data-item-type="sort">
+            <img class="item-name-img" src="{{sort.img}}" />
+            <span class="item-field-label-long2 roll-style"><a class="roll-sort">{{sort.name}}</a></span>
+            <span class="item-field-label-medium">{{upperFirst sort.system.niveau}}</span>
+
+            <div class="item-filler">&nbsp;</div>
+            <div class="item-controls item-controls-fixed">
+              <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+              <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
+            </div>
+          </li>
+          {{/each}}
+        </ul>
+      </div>
+      {{/each}}
+
+    </div>
+
+
     {{!-- Equipement Tab --}}
     <div class="tab equipement" data-group="primary" data-tab="equipement">
-      
+
       <div class="sheet-box color-bg-archetype">
         <ul class="item-list alternate-list">
           <li class="item flexrow list-item items-title-bg">
@@ -461,6 +559,8 @@
             </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|}}
@@ -469,8 +569,8 @@
             <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>
+              <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+              <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -480,7 +580,21 @@
 
     {{!-- 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">
@@ -490,6 +604,8 @@
             </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>
           {{#each contactList.list as |contact key|}}
@@ -498,8 +614,8 @@
             <span class="item-field-label-long2">{{contact.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>
+              <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+              <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -532,8 +648,8 @@
             <span class="item-field-label-medium">{{upperFirst profil.system.profiltype}}</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>
+              <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
+              <a class="item-control item-delete" title="Supprimer l'item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -543,28 +659,37 @@
       <div class="flexrow">
         <ul>
           <li class="flexrow item">
-            <label class="item-field-label-long2">Nom humain</label> <input type="text" class="" name="system.biodata.nomhumain" value="{{system.biodata.nomhumain}}" data-dtype="String" />
+            <label class="item-field-label-long2">Nom humain</label> <input type="text" class=""
+              name="system.biodata.nomhumain" value="{{system.biodata.nomhumain}}" data-dtype="String" />
           </li>
           <li class="flexrow item">
-            <label class="item-field-label-long2">Activités</label> <input type="text" class="" name="system.biodata.activites" value="{{system.biodata.activites}}" data-dtype="String" />
+            <label class="item-field-label-long2">Activités</label> <input type="text" class=""
+              name="system.biodata.activites" value="{{system.biodata.activites}}" data-dtype="String" />
           </li>
           <li class="flexrow item">
-            <label class="item-field-label-long2">Apparence masquée</label> <input type="text" class="" name="system.biodata.apparencemasquee" value="{{system.biodata.apparencemasquee}}" data-dtype="String" />
+            <label class="item-field-label-long2">Apparence masquée</label> <input type="text" class=""
+              name="system.biodata.apparencemasquee" value="{{system.biodata.apparencemasquee}}" data-dtype="String" />
           </li>
           <li class="flexrow item">
-            <label class="item-field-label-long2">Apparence démasquée</label> <input type="text" class="" name="system.biodata.apparencedemasquee" value="{{system.biodata.apparencedemasquee}}" data-dtype="String" />
+            <label class="item-field-label-long2">Apparence démasquée</label> <input type="text" class=""
+              name="system.biodata.apparencedemasquee" value="{{system.biodata.apparencedemasquee}}"
+              data-dtype="String" />
           </li>
           <li class="flexrow item">
-            <label class="item-field-label-long2">Titre et Famille</label> <input type="text" class="" name="system.biodata.titrefamille" value="{{system.biodata.titrefamille}}" data-dtype="String" />
+            <label class="item-field-label-long2">Titre et Famille</label> <input type="text" class=""
+              name="system.biodata.titrefamille" value="{{system.biodata.titrefamille}}" data-dtype="String" />
           </li>
           <li class="flexrow item">
-            <label class="item-field-label-long2">Factions féériques</label> <input type="text" class="" name="system.biodata.factionfeerique" value="{{system.biodata.factionfeerique}}" data-dtype="String" />
+            <label class="item-field-label-long2">Factions féériques</label> <input type="text" class=""
+              name="system.biodata.factionfeerique" value="{{system.biodata.factionfeerique}}" data-dtype="String" />
           </li>
           <li class="flexrow item">
-            <label class="item-field-label-long2">Traits de caractères dominants</label> <input type="text" class="" name="system.biodata.traitscaracteres" value="{{system.biodata.traitscaracteres}}" data-dtype="String" />
+            <label class="item-field-label-long2">Traits de caractères dominants</label> <input type="text" class=""
+              name="system.biodata.traitscaracteres" value="{{system.biodata.traitscaracteres}}" data-dtype="String" />
           </li>
           <li class="flexrow item">
-            <label class="item-field-label-long2">Langues</label> <input type="text" class="" name="system.biodata.langues" value="{{system.biodata.langues}}" data-dtype="String" />
+            <label class="item-field-label-long2">Langues</label> <input type="text" class=""
+              name="system.biodata.langues" value="{{system.biodata.langues}}" data-dtype="String" />
           </li>
         </ul>
       </div>
@@ -587,6 +712,13 @@
               <input type="text" class="" name="system.biodata.age" value="{{system.biodata.age}}"
                 data-dtype="String" />
             </li>
+            {{#if isGM}}
+            <li class="item flexrow">
+              <label class="generic-label">Fiche de Magie ?</label>
+              <input type="checkbox" class="item-field-label-short edit-item-data" name="system.biodata.magie" {{checked
+                system.biodata.magie}} />
+            </li>
+            {{/if}}
           </ul>
         </div>
         <div>
@@ -598,14 +730,19 @@
             </li>
             <li class="item flexrow">
               <label class="generic-label">Taille Démasquée</label>
-              <input type="text" class="" name="system.biodata.tailledemasquee" value="{{system.biodata.tailledemasquee}}"
-                data-dtype="String" />
+              <input type="text" class="" name="system.biodata.tailledemasquee"
+                value="{{system.biodata.tailledemasquee}}" data-dtype="String" />
             </li>
             <li class="flexrow item">
               <label class="generic-label">Type de taille</label>
               <input type="text" class="" name="system.experience.typetaille" value="{{system.experience.typetaille}}"
                 data-dtype="String" />
             </li>
+            <li class="flexrow item">
+              <label class="generic-label">Points d'héritage</label>
+              <input type="text" class="" name="system.rang.heritage.value" value="{{system.rang.heritage.value}}"
+                data-dtype="String" />
+            </li>
 
           </ul>
         </div>
@@ -622,6 +759,16 @@
               <input type="text" class="" name="system.biodata.poidsdemasquee" value="{{system.biodata.poidsdemasquee}}"
                 data-dtype="String" />
             </li>
+            <li class="item flexrow">
+              <label class="generic-label">XP</label>
+              <input type="text" class="" name="system.experience.value" value="{{system.experience.value}}"
+                data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">XP pour tricher</label>
+              <input type="text" class="" name="system.experience.pourtricher" value="{{system.experience.pourtricher}}"
+                data-dtype="String" />
+            </li>
           </ul>
         </div>
       </div>
@@ -634,18 +781,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>

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>
+</div>

templates/chat-cc-result.html

@@ -0,0 +1,43 @@
+<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 (eq attaqueCible "membre")}}
+    <li><strong>Cible un membre : La cible a -2 de malus sur ces actions avec ce membre (mouvement 2 si jambes)</strong>
+    </li>
+    {{/if}}
+    {{#if (eq attaqueCible "main")}}
+    <li><strong>Cible une main : La cible ne peut plus utiliser sa main</strong></li>
+    {{/if}}
+
+    {{#if isCriticalSuccess}}
+    <Li>Critique : Aubaine ou +2 aux dégats ci-dessus</li>
+    {{/if}}
+    {{else}}
+    <li>Echec face à la {{defenderMode}} !</li>
+    {{/if}}
+
+  </ul>
+</div>

templates/chat-generic-result.html

@@ -20,34 +20,79 @@
   <ul>
     <li class="heritiers-roll">Caractéristique : {{carac.label}} ({{carac.value}})</li>
 
-    {{#if competence}}
-    <li>Compétence : {{competence.name}} ({{competence.system.niveau}})</li>
-      {{#if useSpecialite}}
-      <li>Bonus de spécialité +1</li>
-      {{/if}}
+    {{#if rang}}
+    <li>{{rang.label}} : {{rang.value}}</li>
     {{/if}}
 
+    {{#if competence}}
+    <li>Compétence : {{competence.name}} ({{competence.system.niveau}})</li>
+    {{#if useSpecialite}}
+    <li>Bonus de spécialité +1</li>
+    {{/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>
+    <li>Points d'usage consommés : {{pouvoirPointsUsage}}</li>
+    {{/if}}
+
+    {{#if sort}}
+    <li>Sort : {{sort.name}}</li>
+    <li>Cout en Points d'âmes : {{sortPointsAme}}</li>
+    {{/if}}
+
+    {{#if forcedValue}}
+    <li>Vous dépense 2 points de Tricherie et utilisé une face adjacente du dé !</li>
+    {{/if}}
+
+    {{#if noRoll}}
+    {{else}}
     <li>Formule : {{diceFormula}}</li>
-    <li>Résultat du dé : {{diceResult}}</li>
+    <li>Résultat du dé : {{diceResult}} </li>
 
-    <li>Total : {{finalResult}}</li>
+    {{#if adjacentFaces}}
+    <li>Faces Adjacentes :
+      {{#each adjacentFaces as |value key|}}
+      <a class="roll-tricherie-2" data-dice-value="{{value}}">{{value}}</a>
+      {{/each}}
+    </li>
+    {{/if}}
 
-    {{#if sdValue}}
+    <li>Total : {{finalResult}} {{#if (gt sdValue "-1")}}(Marge : {{marge}}){{/if}}</li>
+
+
+    {{#if (gt sdValue "-1")}}
+    <li>Seuil de difficulté : {{sdValue}}</li>
     {{#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}}
     {{#if isCriticalFailure}}
     <li class="chat-failure">Echec Critique !!!</li>
     {{/if}}
-    
-  </ul>
-</div>
+    {{/if}}
 
+  </ul>
+</div>

templates/creature-sheet.html

@@ -1,356 +0,0 @@
-<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">
-
-            <ul class="item-list alternate-list">
-
-              <li class="item flexrow ">
-                <h4 class="item-name-label competence-name">Ressources</h4>
-                <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
-                  name="system.ressources.value" value="{{system.ressources.value}}" data-dtype="Number" />
-              </li>
-            </ul>
-          </div>
-        </div>
-      </div>
-  </header>
-
-  {{!-- Sheet Tab Navigation --}}
-  <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="principal">Technique</a>
-    <a class="item" data-tab="competences">Compétences</a>
-    <a class="item" data-tab="talents">Talents</a>
-    <a class="item" data-tab="armes">Armes</a>
-    <a class="item" data-tab="biodata">Bio&Notes</a>
-  </nav>
-
-  {{!-- Sheet Body --}}
-  <section class="sheet-body">
-
-    {{!-- Main Tab --}}
-    <div class="tab principal" data-group="primary" data-tab="principal">
-
-      <div class="grid grid-2col">
-
-        <div class="sheet-box color-bg-archetype">
-          <ul class="item-list alternate-list">
-            {{#each system.attributs as |attr key|}}
-            <li class="item flexrow " data-attr-key="{{key}}">
-              <img class="item-name-img" src="systems/fvtt-les-heritiers/assets/icons/{{attr.labelnorm}}.webp">
-              <span class="item-name-label competence-name item-field-label-medium"><a
-                  class="roll-attribut">{{attr.label}}</a></span>
-              <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
-                name="system.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="Number">
-                {{#select attr.value}}
-                {{> systems/fvtt-les-heritiers/templates/partial-list-niveau.html}}
-                {{/select}}
-              </select>
-            </li>
-            {{/each}}
-            <li class="item flexrow">
-              <img class="item-name-img" src="systems/fvtt-les-heritiers/assets/icons/vitesse.webp">
-              <span class="item-name-label competence-name item-field-label-medium">Vitesse</span>
-              <input type="text" class="padd-right numeric-input item-field-label-short" name="system.vitesse.value"
-                    value="{{system.vitesse.value}}" data-dtype="Number" />
-            </li>
-          </ul>
-          <h4 class="item-name-label competence-name">Santé</h4>
-          <ul class="item-list alternate-list">
-            <li class="item flexrow">
-              <label class="label-name item-field-label-short">Vigueur</label>
-              <label class="label-name item-field-label-short">{{system.sante.vigueur}}</label>
-            </li>
-            <li class="item  flexrow">
-              <label class="label-name item-field-label-short">Etat</label>
-              <select class="label-name item-field-label-medium" type="text" name="system.sante.etat" value="{{system.sante.etat}}" data-dtype="Number">
-                {{#select system.sante.etat}}
-                {{> systems/fvtt-les-heritiers/templates/partial-sante-etat.html}}
-                {{/select}}
-              </select>
-            </li>
-          </ul>
-
-          <h4 class="item-name-label competence-name">Combat</h4>
-          <ul class="item-list alternate-list">
-            <li class="item flexrow">
-              <button class="chat-card-button roll-initiative">Initiative</button>
-            </li>
-          </ul>
-
-        </div>
-
-        <div class="sheet-box color-bg-archetype">
-          <h4 class="item-name-label competence-name">Adversité</h4>
-          <ul class="item-list alternate-list">
-            {{#each system.adversite as |adv key|}}
-            <li class="item flexrow" data-adversite="{{key}}">
-              <a class="adversite-modify plus-minus-button" data-adversite-value="-1">-</a>
-              <div class="icon-adversite-container">
-                <img class="icon-adversite" src="systems/fvtt-les-heritiers/assets/icons/gemme_{{key}}.webp">
-                <div class="adversite-text">{{adv}}</div>
-              </div>
-              <a class="adversite-modify plus-minus-button" data-adversite-value="1">+</a>
-              <div class="">&nbsp;</div>
-              <div class="">&nbsp;</div>
-              <div class="">&nbsp;</div>
-            </li>
-            {{/each}}
-          </ul>
-
-
-        </div>
-
-      </div>
-
-    </div>
-
-    {{!-- Competence Tab --}}
-    <div class="tab competences" data-group="primary" data-tab="competences">
-
-      <div class="flexrow">
-
-        <div class="sheet-box color-bg-archetype">
-          <ul class="item-list alternate-list">
-            <li class="item flexrow">
-              <span class="item-name-label-header">
-                <h3><label class="items-title-text">Compétences</label></h3>
-              </span>
-              <span class="item-field-label-short">
-                <label class="short-label">Niveau</label>
-              </span>
-              <div class="item-filler">&nbsp;</div>
-            </li>
-            {{#each skills as |skill key|}}
-            <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
-              <img class="item-name-img" src="{{skill.img}}" />
-              <span class="item-name-label competence-name"><a class="roll-competence item-field-label-short"
-                  data-attr-key="tochoose">{{skill.name}}</a></span>
-              <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
-                data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
-                {{#select skill.system.niveau}}
-                  {{> systems/fvtt-les-heritiers/templates/partial-list-niveau.html}}
-                {{/select}}
-              </select>
-
-              {{#if (ne skill.system.attribut1 "none")}}
-                <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut1}}">{{upper
-                  skill.system.attribut1}} : {{skill.system.attribut1total}}</button>
-              {{/if}}
-              {{#if (ne skill.system.attribut2 "none")}}
-                <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut2}}">{{upper
-                  skill.system.attribut2}} : {{skill.system.attribut2total}}</button>
-              {{/if}}
-              {{#if (ne skill.system.attribut3 "none")}}
-                <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut3}}">{{upper
-                  skill.system.attribut3}} : {{skill.system.attribut3total}}</button>
-              {{/if}}
-
-              <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>
-
-    {{!-- Talents Tab --}}
-    <div class="tab talents" data-group="primary" data-tab="talents">
-
-      <div class="flexrow">
-
-        <div class="sheet-box color-bg-archetype">
-          <ul class="item-list alternate-list">
-            <li class="item flexrow">
-              <span class="item-name-label-header">
-                <h3><label class="items-title-text">Talents</label></h3>
-              </span>
-              <span class="item-field-label-short">
-                <label class="short-label">Résumé</label>
-              </span>
-              <div class="item-filler">&nbsp;</div>
-            </li>
-            {{#each talents as |talent key|}}
-            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
-              <img class="item-name-img" src="{{talent.img}}" />
-              <span class="item-name-label competence-name">{{talent.name}}</span>
-              <span class="item-name-label item-field-label-long2">{{talent.system.resumebonus}}</span>
-  
-              <div class="item-filler">&nbsp;</div>
-              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ul>
-        </div>
-      </div>
-
-      <div class="flexrow">
-        <div class="sheet-box color-bg-archetype">
-          <ul class="item-list alternate-list">
-            <li class="item flexrow">
-              <span class="item-name-label-header">
-                <h3><label class="items-title-text">Talents de Cellule</label></h3>
-              </span>
-              <span class="item-field-label-short">
-                <label class="short-label">Résumé</label>
-              </span>
-              <div class="item-filler">&nbsp;</div>
-            </li>
-            {{#each talentsCell as |talent key|}}
-            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
-              <img class="item-name-img" src="{{talent.img}}" />
-              <span class="item-name-label competence-name">{{talent.name}}</span>
-              <span class="item-name-label item-field-label-long2">{{talent.system.resumebonus}}</span>
-              <div class="item-filler">&nbsp;</div>
-              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ul>
-        </div>
-
-      </div>
-
-    </div>
-
-    {{!-- Equipement Tab --}}
-    <div class="tab armes" data-group="primary" data-tab="armes">
-
-      <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éfense</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">
-                {{#if arme.system.equipped}}
-                <button class="roll-arme-offensif button-sheet-roll">{{arme.system.totalOffensif}}</button>
-                {{else}}
-                <button disabled class="roll-arme-offensif button-sheet-roll">{{arme.system.totalOffensif}}</button>
-                {{/if}}
-              </span>
-
-              {{#if arme.system.isdefense}}
-                <span class="item-field-label-short arme-defensif item-field-label-short"><label
-                  class="arme-defensif item-field-label-short defense-sheet">{{arme.system.totalDefensif}}</label></span>
-              {{else}}
-                <span class="item-field-label-short arme-defensif item-field-label-short"><label
-                  class="arme-defensif item-field-label-short defense-sheet">N/A</label></span>
-              {{/if}}
-
-              <span class="item-field-label-short">
-                {{#if arme.system.equipped}}
-                <button class="roll-arme-degats button-sheet-roll">{{arme.system.totalDegats}}</button>
-                {{else}}
-                <button disabled class="roll-arme-degats button-sheet-roll">{{arme.system.totalDegats}}</button>
-                {{/if}}
-              </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>
-
-
-    {{!-- Biography Tab --}}
-    <div class="tab biodata" data-group="primary" data-tab="biodata">
-
-      <span>
-        <h3>Description</h3>
-      </span>
-      <div class="medium-editor item-text-long-line">
-        {{editor description target="system.biodata.description" button=true owner=owner editable=editable}}
-      </div>
-
-      <span>
-        <h3>Habitat</h3>
-      </span>
-      <div class="medium-editor item-text-long-line">
-        {{editor habitat target="system.biodata.habitat" button=true owner=owner editable=editable}}
-      </div>
-
-    </div>
-
-  </section>
-</form>

templates/item-arme-sheet.html

@@ -16,11 +16,7 @@
         <label class="item-field-label-long">Catégorie : </label>
         <select class="item-field-label-long" type="text" name="system.categorie"
           value="{{system.categorie}}" data-dtype="string">
-          {{#select system.categorie}}
-            {{#each config.categorieArme as |categ key|}}
-              <option value="{{key}}">{{categ}}</option>
-            {{/each}}
-          {{/select}}
+          {{selectOptions config.categorieArme selected=system.categorie}}
         </select>
       </li>
 
@@ -28,11 +24,7 @@
         <label class="item-field-label-long">Type : </label>
         <select class="item-field-label-long" type="text" name="system.armetype"
           value="{{system.armetype}}" data-dtype="string">
-          {{#select system.armetype}}
-            {{#each config.typeArme as |type key|}}
-              <option value="{{key}}">{{type}}</option>
-            {{/each}}
-          {{/select}}
+          {{selectOptions config.typeArme selected=system.armetype}}
         </select>
       </li>
 
@@ -74,22 +66,14 @@
         <label class="generic-label item-field-label-long">Légalité :  </label>
         <select class="item-field-label-long" type="text" name="system.legalite"
           value="{{system.legalite}}" data-dtype="string">
-          {{#select system.legalite}}
-            {{#each config.armeLegalite as |legal key|}}
-              <option value="{{key}}">{{legal}}</option>
-            {{/each}}
-          {{/select}}
+          {{selectOptions config.armeLegalite selected=system.legalite}}
         </select>
       </li>
       <li class="flexrow item">
         <label class="generic-label item-field-label-long">Dissimulation :  </label>
         <select class="item-field-label-long" type="text" name="system.dissimulation"
           value="{{system.dissimulation}}" data-dtype="string">
-          {{#select system.dissimulation}}
-            {{#each config.armeDissimulation as |diss key|}}
-              <option value="{{key}}">{{diss}}</option>
-            {{/each}}
-          {{/select}}
+          {{selectOptions config.armeDissimulation selected=system.dissimulation}}
         </select>
       </li>
       <li class="flexrow item">