Release 10.0.22

Reviewed-on: #560

module/actor-creature-sheet.js

@@ -36,7 +36,7 @@ export class RdDActorCreatureSheet extends RdDActorSheet {
       surEncombrementMessage: this.actor.getMessageSurEncombrement()
     }
 
-    RdDUtility.filterItemsPerTypeForSheet(formData);
+    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
     this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
     formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
 

module/actor-entite-sheet.js

@@ -39,11 +39,12 @@ export class RdDActorEntiteSheet extends ActorSheet {
       limited: this.actor.limited,
       options: this.options,
       owner: this.actor.isOwner,
-      itemsByType: Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i))),
+      description:  await TextEditor.enrichHTML(this.object.system.description, {async: true}),
+      notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}),
     };
     
     formData.options.isGM = game.user.isGM;
-    RdDUtility.filterItemsPerTypeForSheet(formData);
+    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
 
 
     return formData;

module/actor-sheet.js

@@ -29,7 +29,6 @@ export class RdDActorSheet extends ActorSheet {
       width: 640,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
-      editCaracComp: false,
       showCompNiveauBase: false,
       vueDetaillee: false
     });
@@ -52,15 +51,17 @@ export class RdDActorSheet extends ActorSheet {
       limited: this.actor.limited,
       options: this.options,
       owner: this.actor.isOwner,
-      itemsByType: Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i))),
+      biographie:  await TextEditor.enrichHTML(this.object.system.biographie, {async: true}),
+      notes:  await TextEditor.enrichHTML(this.object.system.notes, {async: true}),
+      notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}),
     }
-    RdDUtility.filterItemsPerTypeForSheet(formData)
+    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
   
     formData.options.isGM = game.user.isGM;
 
     if (formData.type == 'creature') return formData; // Shortcut
 
-    formData.competenceByCategory = Misc.classify(formData.competences, it => it.system.categorie)
+    formData.byCateg = Misc.classify(formData.competences, it => it.system.categorie)
 
     formData.calc = {
       comptageArchetype: RdDItemCompetence.computeResumeArchetype(formData.competences),
@@ -102,7 +103,6 @@ export class RdDActorSheet extends ActorSheet {
     formData.hautreve = {
       isDemiReve: this.actor.getEffect(STATUSES.StatusDemiReve),
       rencontres: duplicate(formData.system.reve.rencontre.list),
-      casesTmr: formData.itemsByType.casetmr,
       cacheTMR: this.actor.isTMRCache()
     }
 
@@ -191,7 +191,6 @@ export class RdDActorSheet extends ActorSheet {
       const item = RdDSheetUtility.getItem(event, this.actor);
       item?.postItem();
     });
-
     html.find('.item-action').click(async event => {
       const item = RdDSheetUtility.getItem(event, this.actor)
       this.actor.actionItem(item);
@@ -204,7 +203,16 @@ export class RdDActorSheet extends ActorSheet {
         RdDUtility.confirmerSuppressionSubacteur(this, subActor, li);
       }
     });
-
+    html.find('.experiencelog-delete').click(async event => {
+      const li = $(event.currentTarget)?.parents(".experiencelog");
+      const key = Number(li.data("key") ?? -1);
+      await this.actor.deleteExperienceLog(key, 1);
+    });
+    html.find('.experiencelog-delete-previous').click(async event => {
+      const li = $(event.currentTarget)?.parents(".experiencelog");
+      const key = Number(li.data("key") ?? -1);
+      await this.actor.deleteExperienceLog(0, key + 1);
+    });
     html.find('.encaisser-direct').click(async event => {
       this.actor.encaisser();
     })
@@ -241,7 +249,7 @@ export class RdDActorSheet extends ActorSheet {
     });
 
     // Blessure data
-    html.find('.blessures-soins').change(async event => {
+    html.find('.blessure-soins').change(async event => {
       const tr = $(event.currentTarget).parents(".item");
       let btype = tr.data('blessure-type');
       let index = tr.data('blessure-index');
@@ -386,7 +394,7 @@ export class RdDActorSheet extends ActorSheet {
       this.actor.updateCompetenceStress(RdDSheetUtility.getItemId(event));
     });
 
-    if (this.options.editCaracComp) {
+    if (this.options.vueDetaillee) {
       // On carac change
       html.find('.carac-value').change(async event => {
         let caracName = event.currentTarget.name.replace(".value", "").replace("system.carac.", "");
@@ -423,10 +431,6 @@ export class RdDActorSheet extends ActorSheet {
       this.options.showCompNiveauBase = !this.options.showCompNiveauBase;
       this.render(true);
     });
-    html.find('.lock-unlock-sheet').click(async event => {
-      this.options.editCaracComp = !this.options.editCaracComp;
-      this.render(true);
-    });
 
     html.find('.recherche')
       .each((index, field) => {

module/actor-vehicule-sheet.js

@@ -40,10 +40,11 @@ export class RdDActorVehiculeSheet extends ActorSheet {
       limited: this.actor.limited,
       options: this.options,
       owner: this.actor.isOwner,
-      itemsByType: Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i))),
+      description:  await TextEditor.enrichHTML(this.object.system.biographie, {async: true}),
+      notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}),
     };
 
-    RdDUtility.filterItemsPerTypeForSheet(formData);
+    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
     this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
     formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
 

module/actor.js

@@ -1020,10 +1020,20 @@ export class RdDActor extends Actor {
     let expLog = duplicate(this.system.experiencelog);
     expLog.push({
       mode: Misc.upperFirst(modeXP), valeur: valeurXP, raison: Misc.upperFirst(raisonXP),
-      daterdd: game.system.rdd.calendrier.getDateFromIndex(), datereel: `${d.getDate()}/${d.getMonth() + 1}/${d.getFullYear()}`
+      daterdd: game.system.rdd.calendrier.getDateFromIndex(),
+      datereel: `${d.getDate()}/${d.getMonth() + 1}/${d.getFullYear()}`
     });
     await this.update({ [`system.experiencelog`]: expLog });
   }
+  
+  async deleteExperienceLog(from, count) {
+    if (from >= 0 && count > 0) {
+      let expLog = duplicate(this.system.experiencelog);
+      expLog.splice(from, count);
+      await this.update({ [`system.experiencelog`]: expLog });
+    }
+  }
+
 
   /* -------------------------------------------- */
   async updateCompteurValue(fieldName, fieldValue, raison = 'Inconnue') {
@@ -1123,28 +1133,29 @@ export class RdDActor extends Actor {
    * de leurs ID */
   async enleverDeConteneur(item, conteneur, onEnleverDeConteneur) {
     if (conteneur?.isConteneur()) {
-      let data2use = duplicate(conteneur);
-      let contenu = data2use.system.contenu;
-      let index = contenu.indexOf(item.id);
-      while (index >= 0) { // Force cleanup, itemId is unique
-        contenu.splice(index, 1);
-        index = contenu.indexOf(item.id);
-      }
-      item.system.estContenu = false;
-      await this.updateEmbeddedDocuments('Item', [data2use]);
+      item.estContenu = false;
+      await this.updateEmbeddedDocuments('Item', [{
+        _id: conteneur.id,
+        'system.contenu': conteneur.system.contenu.filter(id => id != item.id)
+      }]);
       onEnleverDeConteneur();
     }
   }
-
+  
   /* -------------------------------------------- */
   /** Ajoute un item dans un conteneur, sur la base
    * de leurs ID */
   async ajouterDansConteneur(item, conteneur, onAjouterDansConteneur) {
-    if (conteneur?.isConteneur()) {
-      let data2use = duplicate(conteneur);
-      data2use.system.contenu.push(item.id);
-      item.system.estContenu = true;
-      await this.updateEmbeddedDocuments('Item', [data2use]);
+    if (!conteneur) {
+      // TODO: afficher
+      item.estContenu = false;
+    }
+    else if (conteneur.isConteneur()) {
+      item.estContenu = true;
+      await this.updateEmbeddedDocuments('Item', [{
+        _id: conteneur.id,
+        'system.contenu': [...conteneur.system.contenu, item.id]
+        }]);
       onAjouterDansConteneur(item.id, conteneur.id);
     }
   }
@@ -1182,23 +1193,39 @@ export class RdDActor extends Actor {
     if (item?.isEquipement() && sourceActorId == targetActorId) {
       // rangement
       if (srcId != destId && itemId != destId) { // déplacement de l'objet
-        const dest = this.getObjet(destId);
         const src = this.getObjet(srcId);
-        // changer de conteneur
-        if (this.conteneurPeutContenir(dest, item)) {
-          await this.enleverDeConteneur(item, src, params.onEnleverConteneur);
-          await this.ajouterDansConteneur(item, dest, params.onAjouterDansConteneur);
-        }
-        else if (dest?.isEquipementSimilaire(item)) {
+        const dest = this.getObjet(destId);
+        const cible = this.getContenantOrParent(dest);
+        const messageEquipementDifferent = item.messageEquipementDifferent(dest);
+        if (dest && !messageEquipementDifferent) {
           await this.regrouperEquipementsSimilaires(item, dest);
           result = false;
         }
+        // changer de conteneur
+        else if (!cible || this.conteneurPeutContenir(cible, item)) {
+          await this.enleverDeConteneur(item, src, params.onEnleverConteneur);
+          await this.ajouterDansConteneur(item, cible, params.onAjouterDansConteneur);
+        }
+        else {
+          ui.notifications.info(messageEquipementDifferent);
+        }
       }
     }
     await this.computeEncombrementTotalEtMalusArmure();
     return result;
   }
 
+  getContenantOrParent(dest) {
+    if (!dest || dest.isConteneur()) {
+      return dest;
+    }
+    return this.getContenant(dest);
+  }
+
+  getContenant(item) {
+    return this.itemTypes['conteneur'].find(it => it.system.contenu.includes(item.id));
+  }
+
   /* -------------------------------------------- */
   conteneurPeutContenir(dest, item) {
     if (!dest) {
@@ -3859,8 +3886,10 @@ export class RdDActor extends Actor {
       id: vehicle.id,
       name: vehicle.name,
       img: vehicle.img,
-      categorie: vehicle.system.categorie,
-      structure: vehicle.system.structure,
+      system: {
+        categorie: vehicle.system.categorie,
+        etat: vehicle.system.etat
+      }
     };
   }
 

module/item-sheet.js

@@ -74,7 +74,10 @@ export class RdDItemSheet extends ItemSheet {
       owner: this.item.isOwner,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      isSoins: false
+      isSoins: false,
+      description:  await TextEditor.enrichHTML(this.object.system.description, {async: true}),
+      descriptionmj:  await TextEditor.enrichHTML(this.object.system.descriptionmj, {async: true})
+
     }
     if (this.actor) {
       formData.isOwned = true;
@@ -93,8 +96,15 @@ export class RdDItemSheet extends ItemSheet {
       formData.competences = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.competences', it => RdDItemCompetence.isCompetenceArme(it));
       console.log(formData.competences)
     }
+    if (this.item.type == 'recettecuisine') {
+      formData.ingredients =  await TextEditor.enrichHTML(this.object.system.ingredients, {async: true})
+    }
     if (this.item.type == 'recettealchimique') {
       RdDAlchimie.processManipulation(this.item, this.actor && this.actor.id);
+      formData.manipulation_update =  await TextEditor.enrichHTML(this.object.system.manipulation_update, {async: true})
+      formData.utilisation =  await TextEditor.enrichHTML(this.object.system.utilisation, {async: true})
+      formData.enchantement =  await TextEditor.enrichHTML(this.object.system.enchantement, {async: true})
+      formData.sureffet =  await TextEditor.enrichHTML(this.object.system.sureffet, {async: true})
     }
     if (this.item.type == 'gemme') {
       formData.gemmeTypeList = RdDGemme.getGemmeTypeOptionList();
@@ -121,8 +131,7 @@ export class RdDItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   prepareConteneurData(formData) {
-    formData.itemsByType = Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i)))
-    RdDUtility.filterEquipementParType(formData)
+    RdDUtility.filterEquipementParType(formData, this.actor.itemTypes);
 
     this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
     formData.subItems = formData.conteneurs.find(it => it._id == this.item.id)?.subItems;

module/item.js

@@ -198,8 +198,9 @@ export class RdDItem extends Item {
 
   /* -------------------------------------------- */
   // détermine si deux équipements sont similaires: de même type, et avec les même champs hormis la quantité
-  isEquipementSimilaire(other) {
-    if (!this.isEquipement()) return false;
+  messageEquipementDifferent(other) {
+    if (!other || !this.isEquipement()) return undefined;
+
     let message = undefined;
     if (this.type != other.type) {
       message = `Impossible de regrouper ${this.type} avec ${other.type}`;
@@ -220,11 +221,7 @@ export class RdDItem extends Item {
         }
       }
     }
-    if (message){
-      ui.notifications.info(message)
-      return false;
-    }
-    return true;
+    return message;
   }
 
   async proposerVente() {

module/migrations.js

@@ -80,11 +80,30 @@ class _10_0_17_MigrationCompetenceCreature extends Migration {
   }
 }
 
+class _10_0_21_VehiculeStructureResistanceMax extends Migration {
+  get code() { return "vehicule-structure-resistance-max"; }
+  get version() { return "10.0.21"; }
+
+  async migrate() {
+    await game.actors
+      .filter((actor) => actor.type == "vehicule")
+      .forEach(async (actor) => {
+        await actor.update({
+          'system.etat.resistance.value': actor.system.resistance,
+          'system.etat.resistance.max': actor.system.resistance,
+          'system.etat.structure.value': actor.system.structure,
+          'system.etat.structure.max': actor.system.structure
+        })
+      });
+  }
+}
+
 export class Migrations {
   static getMigrations() {
     return [
       new _10_0_16_MigrationSortsReserve(),
-      new _10_0_17_MigrationCompetenceCreature()
+      new _10_0_17_MigrationCompetenceCreature(),
+      new _10_0_21_VehiculeStructureResistanceMax(),
     ];
   }
 

module/rdd-hotbar-drop.js

@@ -2,14 +2,18 @@ import { Misc } from "./misc.js";
 
 export class RdDHotbar {
 
-  static async createMacro(item, command) {
-    let macro = await Macro.create({
-      name: item.name,
-      type: "script",
-      img: item.img,
-      command: command
-    }, { displaySheet: false })
-    return macro
+  static async addToHotbar(item, slot) {
+    let command = `game.system.rdd.RdDHotbar.rollMacro("${item.name}", "${item.type}");`;
+    let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command));
+    if (!macro) {
+      macro = await Macro.create({
+        name: item.name,
+        type: "script",
+        img: item.img,
+        command: command
+      }, { displaySheet: false })
+    }
+    await game.user.assignHotbarMacro(macro, slot);
   }
 
   /**
@@ -32,69 +36,33 @@ export class RdDHotbar {
         if (!item || (item.type != "arme" && item.type != "competence")) {
           return true
         }
-        let command = `game.system.rdd.RdDHotbar.rollMacro("${item.name}", "${item.type}");`;
-        let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command));
-        if (!macro) {
-          macro = this.createMacro(item, command)
-        }
-        game.user.assignHotbarMacro(macro, slot);
+        this.addToHotbar(item, slot)
         return false
       }
 
-          // Create a macro to open the actor sheet of the actor dropped on the hotbar
-    /*else if (documentData.type == "Actor") {
-      let actor = game.actors.get(documentData.id);
-      let command = `game.actors.get("${documentData.id}").sheet.render(true)`
-      let macro = game.macros.contents.find(m => (m.name === actor.name) && (m.command === command));
-      if (!macro) {
-        macro = await Macro.create({
-          name: actor.name,
-          type: "script",
-          img: actor.img,
-          command: command
-        }, { displaySheet: false })
-        game.user.assignHotbarMacro(macro, slot);
-      }
-    }
-
-    // Create a macro to open the journal sheet of the journal dropped on the hotbar
-    else if (documentData.type == "JournalEntry") {
-      let journal = fromUuidSync(documentData.uuid)
-      let command = `game.journal.get("${documentData.id}").sheet.render(true)`
-      let macro = game.macros.contents.find(m => (m.name === journal.name) && (m.command === command));
-      if (!macro) {
-        macro = await Macro.create({
-          name: journal.name,
-          type: "script",
-          img: "systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp",
-          command: command
-        }, { displaySheet: false })
-        game.user.assignHotbarMacro(macro, slot);
-      }
-    }*/
-    return true;
-  });
-}
+      return true
+    })
+  }
 
   /** Roll macro */
   static rollMacro(itemName, itemType, bypassData) {
-  const speaker = ChatMessage.getSpeaker();
-  let actor;
-  if (speaker.token) actor = game.actors.tokens[speaker.token];
-  if (!actor) actor = game.actors.get(speaker.actor);
+    const speaker = ChatMessage.getSpeaker();
+    let actor;
+    if (speaker.token) actor = game.actors.tokens[speaker.token];
+    if (!actor) actor = game.actors.get(speaker.actor);
 
-  let item = actor?.items.find(it => it.name === itemName && it.type == itemType) ?? undefined;
-  if (!item) {
-    return ui.notifications.warn(`Impossible de trouver l'objet de cette macro`);
+    let item = actor?.items.find(it => it.name === itemName && it.type == itemType) ?? undefined;
+    if (!item) {
+      return ui.notifications.warn(`Impossible de trouver l'objet de cette macro`);
+    }
+
+    // Trigger the item roll
+    switch (item.type) {
+      case "arme":
+        return actor.rollArme(item);
+      case "competence":
+        return actor.rollCompetence(itemName);
+    }
   }
 
-  // Trigger the item roll
-  switch (item.type) {
-    case "arme":
-      return actor.rollArme(item);
-    case "competence":
-      return actor.rollCompetence(itemName);
-  }
-}
-
 }

module/rdd-utility.js

@@ -115,22 +115,43 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-effects-partial.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html',
-      // Conteneur/item in Actor sheet
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-item-queue.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html',
-      "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html",
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-suivants.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html',
+      // sous-parties de feuilles de personnages
+      'systems/foundryvtt-reve-de-dragon/templates/actor/competence.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/effects.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/xp-competences.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/combat.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/blessures.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/blessure.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/maladies-poisons.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/possessions.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/taches.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/taches.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/oeuvres.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/jeux.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/alchimie.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/astrologie.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/non-haut-revant.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/haut-revant.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/dragon-queues.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/dragon-queue.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/dragon-souffles.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/dragon-tetes.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/hr-signes-draconiques.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/hr-rencontres.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/hr-sorts.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/hr-sorts-reserve.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/hr-meditations.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/hr-casestmr.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/xp-journal.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/inventaire.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-item.html',
+      "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-monnaie.html",
+      'systems/foundryvtt-reve-de-dragon/templates/actor/liens-animaux.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/liens-suivants.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/liens-vehicules.html',
       //Items
       'systems/foundryvtt-reve-de-dragon/templates/header-item.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-competence-sheet.html',
@@ -368,49 +389,50 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static filterItemsPerTypeForSheet(formData) {
+  static filterItemsPerTypeForSheet(formData, itemTypes) {
 
-    RdDUtility.filterEquipementParType(formData);
+    RdDUtility.filterEquipementParType(formData, itemTypes);
 
-    formData.sorts = this.arrayOrEmpty(formData.itemsByType['sort']);
-    formData.signesdraconiques = this.arrayOrEmpty(formData.itemsByType['signedraconique']);
-    formData.queues = this.arrayOrEmpty(formData.itemsByType['queue']);
-    formData.souffles = this.arrayOrEmpty(formData.itemsByType['souffle']);
-    formData.ombres = this.arrayOrEmpty(formData.itemsByType['ombre']);
-    formData.tetes = this.arrayOrEmpty(formData.itemsByType['tete']);
-    formData.taches = this.arrayOrEmpty(formData.itemsByType['tache']);
-    formData.meditations = this.arrayOrEmpty(formData.itemsByType['meditation']);
-    formData.chants = this.arrayOrEmpty(formData.itemsByType['chant']);
-    formData.danses = this.arrayOrEmpty(formData.itemsByType['danse']);
-    formData.musiques = this.arrayOrEmpty(formData.itemsByType['musique']);
-    formData.oeuvres = this.arrayOrEmpty(formData.itemsByType['oeuvre']);
-    formData.jeux = this.arrayOrEmpty(formData.itemsByType['jeu']);
+    formData.sorts = this.arrayOrEmpty(itemTypes['sort']);
+    formData.casestmr = this.arrayOrEmpty(itemTypes['casetmr']);
+    formData.signesdraconiques = this.arrayOrEmpty(itemTypes['signedraconique']);
+    formData.queues = this.arrayOrEmpty(itemTypes['queue']);
+    formData.souffles = this.arrayOrEmpty(itemTypes['souffle']);
+    formData.ombres = this.arrayOrEmpty(itemTypes['ombre']);
+    formData.tetes = this.arrayOrEmpty(itemTypes['tete']);
+    formData.taches = this.arrayOrEmpty(itemTypes['tache']);
+    formData.meditations = this.arrayOrEmpty(itemTypes['meditation']);
+    formData.chants = this.arrayOrEmpty(itemTypes['chant']);
+    formData.danses = this.arrayOrEmpty(itemTypes['danse']);
+    formData.musiques = this.arrayOrEmpty(itemTypes['musique']);
+    formData.oeuvres = this.arrayOrEmpty(itemTypes['oeuvre']);
+    formData.jeux = this.arrayOrEmpty(itemTypes['jeu']);
 
-    formData.recettescuisine = this.arrayOrEmpty(formData.itemsByType['recettecuisine']);
-    formData.recettesAlchimiques = this.arrayOrEmpty(formData.itemsByType['recettealchimique']);
-    formData.maladies = this.arrayOrEmpty(formData.itemsByType['maladie']);
-    formData.poisons = this.arrayOrEmpty(formData.itemsByType['poison']);
-    formData.possessions = this.arrayOrEmpty(formData.itemsByType['possession']);
+    formData.recettescuisine = this.arrayOrEmpty(itemTypes['recettecuisine']);
+    formData.recettesAlchimiques = this.arrayOrEmpty(itemTypes['recettealchimique']);
+    formData.maladies = this.arrayOrEmpty(itemTypes['maladie']);
+    formData.poisons = this.arrayOrEmpty(itemTypes['poison']);
+    formData.possessions = this.arrayOrEmpty(itemTypes['possession']);
     formData.maladiesPoisons = formData.maladies.concat(formData.poisons);
-    formData.competences = (formData.itemsByType.competence ?? []).concat(formData.itemsByType.competencecreature ?? []);
-    formData.sortsReserve = this.arrayOrEmpty(formData.itemsByType['sortreserve']);
+    formData.competences = (itemTypes['competence'] ?? []).concat(itemTypes['competencecreature'] ?? []);
+    formData.sortsReserve = this.arrayOrEmpty(itemTypes['sortreserve']);
   }
 
-  static filterEquipementParType(formData) {
-    formData.conteneurs = this.arrayOrEmpty(formData.itemsByType['conteneur']);
+  static filterEquipementParType(formData, itemTypes) {
+    formData.conteneurs = this.arrayOrEmpty(itemTypes['conteneur']);
 
-    formData.materiel = this.arrayOrEmpty(formData.itemsByType['objet']);
-    formData.armes = this.arrayOrEmpty(formData.itemsByType['arme']);
-    formData.armures = this.arrayOrEmpty(formData.itemsByType['armure']);
-    formData.munitions = this.arrayOrEmpty(formData.itemsByType['munition']);
-    formData.livres = this.arrayOrEmpty(formData.itemsByType['livre']);
-    formData.potions = this.arrayOrEmpty(formData.itemsByType['potion']);
-    formData.ingredients = this.arrayOrEmpty(formData.itemsByType['ingredient']);
-    formData.herbes = this.arrayOrEmpty(formData.itemsByType['herbe']);
-    formData.monnaie = this.arrayOrEmpty(formData.itemsByType['monnaie']);
+    formData.materiel = this.arrayOrEmpty(itemTypes['objet']);
+    formData.armes = this.arrayOrEmpty(itemTypes['arme']);
+    formData.armures = this.arrayOrEmpty(itemTypes['armure']);
+    formData.munitions = this.arrayOrEmpty(itemTypes['munition']);
+    formData.livres = this.arrayOrEmpty(itemTypes['livre']);
+    formData.potions = this.arrayOrEmpty(itemTypes['potion']);
+    formData.ingredients = this.arrayOrEmpty(itemTypes['ingredient']);
+    formData.herbes = this.arrayOrEmpty(itemTypes['herbe']);
+    formData.monnaie = this.arrayOrEmpty(itemTypes['monnaie']);
     formData.monnaie.sort(Monnaie.triValeurDenier());
-    formData.nourritureboissons = this.arrayOrEmpty(formData.itemsByType['nourritureboisson']);
-    formData.gemmes = this.arrayOrEmpty(formData.itemsByType['gemme']);
+    formData.nourritureboissons = this.arrayOrEmpty(itemTypes['nourritureboisson']);
+    formData.gemmes = this.arrayOrEmpty(itemTypes['gemme']);
 
     formData.objets = formData.conteneurs
       .concat(formData.materiel)
@@ -480,7 +502,7 @@ export class RdDUtility {
     const isConteneur = objet.type == 'conteneur';
     const isOuvert = isConteneur && this.getAfficheContenu(objet._id);
     const isVide = isConteneur && objet.system.contenu.length == 0;
-    const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html']({
+    const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-item.html']({
       item: objet,
       vide: isVide,
       ouvert: isOuvert

packs/vehicules.db

@@ -1,9 +1,9 @@
-{"_id":"0ZW71u9G8fqnyNfy","name":"Drakkar","permission":{"default":0,"rYShh2P1DNavdoBD":3},"type":"vehicule","data":{"categorie":"Bateau","resistance":28,"structure":12,"vitesse":"3/2/1","bonus":"(10)/+10/+14","manoeuvrabilite":"0/-2/-4","equipage":8,"capacite_encombrement":150,"description":"Description ...","notesmj":"Notes du MJ"},"sort":100001,"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/drakkar.webp","token":{"flags":{},"name":"Drakkar","displayName":0,"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/drakkar_token.webp","tint":"","width":10,"height":10,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":false,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"0ZW71u9G8fqnyNfy","actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":""},"bar2":{"attribute":""},"randomImg":false},"items":[],"effects":[]}
-{"_id":"5FWY38a5emYmqisa","name":"Cariole","permission":{"default":0,"rYShh2P1DNavdoBD":3},"type":"vehicule","data":{"categorie":"Cariole à Bras","resistance":10,"structure":6,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":1,"capacite_encombrement":50,"description":"Description ...","notesmj":"Notes du MJ"},"sort":100001,"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/cariole.webp","token":{"flags":{},"name":"Cariole","displayName":0,"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/cariole_token.webp","tint":"","width":2,"height":2,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":false,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"5FWY38a5emYmqisa","actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":""},"bar2":{"attribute":""},"randomImg":false},"items":[],"effects":[]}
-{"_id":"C0JpbzQSELoml971","name":"Canot","permission":{"default":0,"rYShh2P1DNavdoBD":3},"type":"vehicule","data":{"categorie":"Barque","resistance":14,"structure":6,"vitesse":"","bonus":"(2)/+3/+5","manoeuvrabilite":"","equipage":1,"capacite_encombrement":50,"description":"Description ...","notesmj":"Notes du MJ"},"sort":100001,"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/canot.webp","token":{"flags":{},"name":"Canot","displayName":0,"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/canot_token.webp","tint":"","width":3,"height":3,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":false,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"C0JpbzQSELoml971","actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":""},"bar2":{"attribute":""},"randomImg":false},"items":[],"effects":[]}
-{"_id":"PoQUTsNThYDp6XAW","name":"Nef","permission":{"default":0,"rYShh2P1DNavdoBD":3},"type":"vehicule","data":{"categorie":"Bateau","resistance":30,"structure":14,"vitesse":"5/4/2","bonus":"","manoeuvrabilite":"0/-3/-4","equipage":12,"capacite_encombrement":200,"description":"Description ...","notesmj":"Notes du MJ"},"sort":100001,"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/nef.webp","token":{"flags":{},"name":"Nef","displayName":0,"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/nef_token.webp","tint":"","width":13,"height":13,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":false,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"PoQUTsNThYDp6XAW","actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":""},"bar2":{"attribute":""},"randomImg":false},"items":[],"effects":[]}
-{"_id":"RFOYL8HBUxd32DXS","name":"Galère","permission":{"default":0,"rYShh2P1DNavdoBD":3},"type":"vehicule","data":{"categorie":"Bateau","resistance":36,"structure":14,"vitesse":"2/2/1","bonus":"(12)/+12/+16","manoeuvrabilite":"0/-4/-6","equipage":10,"capacite_encombrement":300,"description":"Description ...","notesmj":"Notes du MJ"},"sort":100001,"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/galere.webp","token":{"flags":{},"name":"Galère","displayName":0,"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/galere_token.webp","tint":"","width":14,"height":14,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":false,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"RFOYL8HBUxd32DXS","actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":""},"bar2":{"attribute":""},"randomImg":false},"items":[],"effects":[]}
-{"_id":"TDpSn7GawJ1LCHp7","name":"Charette","permission":{"default":0,"rYShh2P1DNavdoBD":3},"type":"vehicule","data":{"categorie":"Chariot","resistance":16,"structure":8,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":1,"capacite_encombrement":100,"description":"Description ...","notesmj":"Notes du MJ"},"sort":100001,"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/charette.webp","token":{"flags":{},"name":"Charette","displayName":0,"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/charette_token.webp","tint":"","width":3,"height":3,"scale":1.1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":false,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"TDpSn7GawJ1LCHp7","actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":""},"bar2":{"attribute":""},"randomImg":false},"items":[],"effects":[]}
-{"_id":"ZiyRDzz3gGzlpLIc","name":"Barque","permission":{"default":0,"rYShh2P1DNavdoBD":3},"type":"vehicule","data":{"categorie":"Barque","resistance":20,"structure":10,"vitesse":"3/2/1","bonus":"(4)/+4/+6","manoeuvrabilite":"0/0/-4","equipage":4,"capacite_encombrement":100,"description":"Description ...","notesmj":"Notes du MJ"},"sort":100001,"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/barque.webp","token":{"flags":{},"name":"Barque","displayName":0,"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/barque_token.webp","tint":"","width":6,"height":6,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":false,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"ZiyRDzz3gGzlpLIc","actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":""},"bar2":{"attribute":""},"randomImg":false},"items":[],"effects":[]}
-{"_id":"gM77co80kmpVsYg6","name":"Posé par terre","permission":{"default":0,"Q2G6GTdrotKzYGUC":3},"type":"vehicule","data":{"categorie":"Autre","resistance":0,"structure":0,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":0,"capacite_encombrement":100,"description":"<p>D&eacute;poser ici les objets que vous voulez &eacute;changer avec d'autres joueurs</p>","notesmj":""},"sort":100001,"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp","token":{"flags":{},"name":"Posé par terre","displayName":0,"img":"systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp","tint":"","width":1,"height":1,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":false,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"gM77co80kmpVsYg6","actorLink":true,"disposition":0,"displayBars":0,"bar1":{"attribute":""},"bar2":{"attribute":""},"randomImg":false},"items":[],"effects":[]}
-{"_id":"idyDmDWYpQ4Eppen","name":"Chariot","permission":{"default":0,"rYShh2P1DNavdoBD":3},"type":"vehicule","data":{"categorie":"Chariot","resistance":20,"structure":10,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":1,"capacite_encombrement":150,"description":"Description ...","notesmj":"Notes du MJ"},"sort":100001,"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/chariot.webp","token":{"flags":{},"name":"Chariot","displayName":0,"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/chariot_token.webp","tint":"","width":4,"height":4,"scale":1.4,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":false,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"idyDmDWYpQ4Eppen","actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":""},"bar2":{"attribute":""},"randomImg":false},"items":[],"effects":[]}
+{"_id":"0ZW71u9G8fqnyNfy","name":"Drakkar","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.0ZW71u9G8fqnyNfy"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/drakkar.webp","items":[],"effects":[],"system":{"categorie":"Bateau","resistance":28,"structure":12,"vitesse":"3/2/1","bonus":"(10)/+10/+14","manoeuvrabilite":"0/-2/-4","equipage":8,"capacite_encombrement":150,"etat":{"resistance":{"type":"number","max":28,"value":28,"label":"Résistance","derivee":false},"structure":{"type":"number","max":12,"value":12,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Drakkar","displayName":0,"width":10,"height":10,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/drakkar_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097623,"modifiedTime":1664231486338,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"5FWY38a5emYmqisa","name":"Cariole","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.5FWY38a5emYmqisa"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/cariole.webp","items":[],"effects":[],"system":{"categorie":"Cariole à Bras","resistance":10,"structure":6,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":1,"capacite_encombrement":50,"etat":{"resistance":{"type":"number","max":10,"value":10,"label":"Résistance","derivee":false},"structure":{"type":"number","max":6,"value":6,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Cariole","displayName":0,"width":2,"height":2,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/cariole_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097624,"modifiedTime":1664231486337,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"C0JpbzQSELoml971","name":"Canot","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.C0JpbzQSELoml971"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/canot.webp","items":[],"effects":[],"system":{"categorie":"Barque","resistance":14,"structure":6,"vitesse":"","bonus":"(2)/+3/+5","manoeuvrabilite":"","equipage":1,"capacite_encombrement":50,"etat":{"resistance":{"type":"number","max":14,"value":14,"label":"Résistance","derivee":false},"structure":{"type":"number","max":6,"value":6,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Canot","displayName":0,"width":3,"height":3,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/canot_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097625,"modifiedTime":1664231486336,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"PoQUTsNThYDp6XAW","name":"Nef","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.PoQUTsNThYDp6XAW"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/nef.webp","items":[],"effects":[],"system":{"categorie":"Bateau","resistance":30,"structure":14,"vitesse":"5/4/2","bonus":"","manoeuvrabilite":"0/-3/-4","equipage":12,"capacite_encombrement":200,"etat":{"resistance":{"type":"number","max":30,"value":30,"label":"Résistance","derivee":false},"structure":{"type":"number","max":14,"value":14,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Nef","displayName":0,"width":13,"height":13,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/nef_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097626,"modifiedTime":1664231486339,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"RFOYL8HBUxd32DXS","name":"Galère","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.RFOYL8HBUxd32DXS"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/galere.webp","items":[],"effects":[],"system":{"categorie":"Bateau","resistance":36,"structure":14,"vitesse":"2/2/1","bonus":"(12)/+12/+16","manoeuvrabilite":"0/-4/-6","equipage":10,"capacite_encombrement":300,"etat":{"resistance":{"type":"number","max":36,"value":36,"label":"Résistance","derivee":false},"structure":{"type":"number","max":14,"value":14,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Galère","displayName":0,"width":14,"height":14,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/galere_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097627,"modifiedTime":1664231486339,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"TDpSn7GawJ1LCHp7","name":"Charette","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.TDpSn7GawJ1LCHp7"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/charette.webp","items":[],"effects":[],"system":{"categorie":"Chariot","resistance":16,"structure":8,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":1,"capacite_encombrement":100,"etat":{"resistance":{"type":"number","max":16,"value":16,"label":"Résistance","derivee":false},"structure":{"type":"number","max":8,"value":8,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Charette","displayName":0,"width":3,"height":3,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/charette_token.webp","tint":null,"scaleX":1.1,"scaleY":1.1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097629,"modifiedTime":1664231486337,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"ZiyRDzz3gGzlpLIc","name":"Barque","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.ZiyRDzz3gGzlpLIc"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/barque.webp","items":[],"effects":[],"system":{"categorie":"Barque","resistance":20,"structure":10,"vitesse":"3/2/1","bonus":"(4)/+4/+6","manoeuvrabilite":"0/0/-4","equipage":4,"capacite_encombrement":100,"etat":{"resistance":{"type":"number","max":20,"value":20,"label":"Résistance","derivee":false},"structure":{"type":"number","max":10,"value":10,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Barque","displayName":0,"width":6,"height":6,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/barque_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097629,"modifiedTime":1664231486336,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"gM77co80kmpVsYg6","name":"Posé par terre","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.gM77co80kmpVsYg6"}},"img":"systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp","items":[],"effects":[],"system":{"categorie":"Autre","resistance":0,"structure":0,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":0,"capacite_encombrement":100,"etat":{"resistance":{"type":"number","max":0,"value":0,"label":"Résistance","derivee":false},"structure":{"type":"number","max":0,"value":0,"label":"Structure","derivee":false}},"description":"<p>D&eacute;poser ici les objets que vous voulez &eacute;changer avec d'autres joueurs</p>","race":"","notesmj":"","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"prototypeToken":{"flags":{},"name":"Posé par terre","displayName":0,"width":1,"height":1,"lockRotation":false,"rotation":0,"actorLink":true,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097630,"modifiedTime":1664231486340,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"idyDmDWYpQ4Eppen","name":"Chariot","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.idyDmDWYpQ4Eppen"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/chariot.webp","items":[],"effects":[],"system":{"categorie":"Chariot","resistance":20,"structure":10,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":1,"capacite_encombrement":150,"etat":{"resistance":{"type":"number","max":20,"value":20,"label":"Résistance","derivee":false},"structure":{"type":"number","max":10,"value":10,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Chariot","displayName":0,"width":4,"height":4,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/chariot_token.webp","tint":null,"scaleX":1.4,"scaleY":1.4,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097632,"modifiedTime":1664231486338,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}

styles/simple.css

@@ -252,6 +252,49 @@ table {border: 1px solid #7a7971;}
   justify-content: center;
   text-align: left;
 }
+.blessure-control {
+  flex-grow: 1;
+  flex-direction: row;
+}
+.blessure-soins {
+  flex-direction: row;
+  align-content: flex-start;
+  justify-content: flex-start;
+  margin-right: 2px;
+  margin-left: 2px;
+  padding: 2px;
+}
+input:is(.blessure-psdone, .blessure-scdone) {
+  width: 20px;
+}
+input:is(.blessure-premiers_soins, .blessure-soins_complets) {
+  width: calc(100% - 25px);
+}
+.blessure-jours {
+  flex-direction: row;
+  align-content: flex-start;
+  justify-content: flex-start;
+}
+.blessure-localisation {
+  flex-direction: row;
+  align-content: flex-start;
+  justify-content: flex-start;
+}
+.blessure-inactive {
+  color:rgba(150, 150, 150, 0.4);
+}
+.blessure-active-legere {
+  color:rgba(60, 60, 60, 0.9);
+  text-shadow: 1px 1px 4px rgba(60, 60, 60, 1);
+}
+.blessure-active-grave {
+  color: rgba(218, 126, 21, 0.9);
+  text-shadow: 1px 1px 4px rgba(60, 60, 60, 1);
+}
+.blessure-active-critique {
+  color: rgba(173, 36, 26, 0.9);
+  text-shadow: 1px 1px 4px rgba(60, 60, 60, 1);
+}
 
 .foundryvtt-reve-de-dragon .sheet-header {
   -webkit-box-flex: 0;
@@ -366,6 +409,12 @@ table {border: 1px solid #7a7971;}
   flex-wrap: nowrap;
   justify-content: stretch;
 }
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique.vehicle {
+  flex-wrap: nowrap;
+  justify-content: stretch;
+  flex-basis: 7.5em;
+}
+
 .rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .carac-label {
   flex-basis: 50%;
 }
@@ -450,20 +499,6 @@ table {border: 1px solid #7a7971;}
   border-bottom: 1px solid #BBB;
 }
 
-.blessure-inactive {
-  color:rgba(150, 150, 150, 0.4)
-}
-.blessure-active-legere {
-  color:rgba(60, 60, 60, 0.9);
-  text-shadow: rgba(60, 60, 60, 0.7);
-}
-.blessure-active-grave {
-  color:rgba(218, 126, 21, 0.9);
-}
-.blessure-active-critique {
-  color:rgba(173, 36, 26, 0.9);
-
-}
 .foundryvtt-reve-de-dragon .items-list .item .item-image {
   -webkit-box-flex: 0;
   -ms-flex: 0 0 24px;
@@ -908,6 +943,12 @@ ul, li {
   margin-right: 0.2rem;
   margin-left: 0.2rem;
 }
+.initiative-value {
+  flex-grow: 0;
+  flex-basis: 3rem;
+  margin-right: 0.2rem;
+  margin-left: 0.2rem;
+}
 .description-value {
   flex-grow: 0;
   flex-basis: 4rem;
@@ -926,23 +967,6 @@ ul, li {
 .alchimie-title { 
   font-weight: bold;
 }
-.blessure-data {
-  flex-direction: row;
-  align-content: flex-start;
-  justify-content: flex-start;
-}
-.blessures-soins {
-  flex-grow: 0;
-  flex-basis: 32px;
-  margin-right: 4px;
-  margin-left: 4px;
-}
-.blessures-loc {
-  flex-grow: 0;
-  flex-basis: 96px;
-  margin-right: 4px;
-  margin-left: 4px;
-}
 .pointsreve-value {
   flex-grow: 0;
   flex-basis: 64px;
@@ -1093,7 +1117,7 @@ ul, li {
 .table-fatigue .fatigue-malus {
   font-size: 0.8rem;
 }
- .flex-actions-bar  {
+.flex-actions-bar  {
   flex-grow: 2;
 }
 

system.json

@@ -34,7 +34,7 @@
   ],
   "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
-  "version": "10.0.19",
+  "version": "10.0.22",
   "compatibility": {
     "minimum": "10",
     "verified": "10.286"
@@ -333,7 +333,7 @@
   ],
   "socket": true,
   "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.19.zip",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.22.zip",
   "gridDistance": 1,
   "gridUnits": "m",
   "primaryTokenAttribute": "sante.vie",

template.json

@@ -31,13 +31,27 @@
     },
     "vehicule": {
       "categorie": "",
-      "resistance": 0,
-      "structure": 0,
       "vitesse": "",
       "bonus": "",
       "manoeuvrabilite": "",
       "equipage": 0,
-      "capacite_encombrement": 0
+      "capacite_encombrement": 0,
+      "etat": {
+        "resistance" : {
+          "type": "number",
+          "max": 20,
+          "value": 20,
+          "label": "Résistance",
+          "derivee": false
+        },
+        "structure":{
+          "type": "number",
+          "max": 10,
+          "value": 10,
+          "label": "Structure",
+          "derivee": false
+        }
+      }
     },
     "entite": {
       "definition": {

templates/actor-blessure-partial.html

@@ -1,27 +0,0 @@
-<tr class="table-row alterne-row item" data-blessure-type="{{gravite}}" data-attribute={{key}} data-blessure-index="{{key}}" >
-  <td class="blessure-control" title="Blessure {{title}}" data-blessure-active="{{bless.active}}">
-    {{#if bless.active}}
-    <i class="fas fa-skull-crossbones blessure-active-{{gravite}}" name="blessure-{{gravite}}-{{key}}-active"></i>
-    {{else}}
-    <i class="fas fa-skull-crossbones blessure-inactive" name="blessure-{{gravite}}-{{key}}-active"></i>
-    {{/if}}
-  </td>
-  <td>
-    <input class="blessures-soins blessure-localisation" type="text" name="blessure-{{gravite}}-{{key}}-localisation" data-dtype="String" value="{{bless.loc}}"/>
-  </td>
-  <td>
-    <input class="blessures-soins blessure-premiers_soins" type="text" name="blessure-{{gravite}}-{{key}}-premiers_soins" data-dtype="number" value="{{bless.premiers_soins}}"/>
-  </td>
-  <td>
-    <input class="blessures-soins blessure-psdone" name="blessure-{{gravite}}-{{key}}-psdone" type="checkbox" name="bless.psdone"  {{#if bless.psdone}}checked{{/if}}/>
-  </td>
-  <td>
-    <input class="blessures-soins blessure-soins_complets" type="text" name="blessure-{{gravite}}-{{key}}-soins_complets" data-dtype="number" value="{{bless.soins_complets}}"/>
-  </td>
-  <td>
-    <input class="blessures-soins blessure-scdone" name="blessure-{{gravite}}-{{key}}-scdone" type="checkbox" name="bless.scdone"  {{#if bless.scdone}}checked{{/if}}/>
-  </td>
-  <td>
-    <input class="blessures-soins blessure-jours" type="text" name="blessure-{{gravite}}-{{key}}-jours" name="jours" data-dtype="number" value="{{bless.jours}}"/>
-  </td>
-</tr>

templates/actor-creature-sheet.html

@@ -18,7 +18,7 @@
           <span>{{calc.resumeBlessures}}</span>
         </div>
         <div class="flexrow">
-          {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-effects-partial.html"}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/actor/effects.html"}}
         </div>
     </div>
     </div>
@@ -121,12 +121,12 @@
     {{!-- blessures Tab --}}
     <div class="tab blessures" data-group="primary" data-tab="blessures" style="height:200px">
       {{!-- Liste de blessures --}}
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html" this}}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor/blessures.html"}}
     </div>
 
     {{!-- Equipment Tab --}}
     <div class="tab items" data-group="primary" data-tab="items">
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire.html"}}
     </div>
 
     {{!-- Biography Tab --}}
@@ -139,10 +139,10 @@
 
       <div class="form-group editor">        
         <span class="item-name"><h4>Description</h4>          
-        {{editor system.description target="system.description" button=true owner=owner editable=true}}
+        {{editor description target="system.description" button=true owner=owner editable=true}}
       </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
 
     </div>
 

templates/actor-entite-sheet.html

@@ -131,9 +131,9 @@
     {{!-- Biography Tab --}}
     <div class="tab description" data-group="primary" data-tab="description">
       <div class="form-group editor">
-        {{editor system.description target="system.description" button=true owner=owner editable=true}}
+        {{editor description target="system.description" button=true owner=owner editable=true}}
       </div>
-      {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
     </div>
 
   </section>

templates/actor-liste-blessures-partial.html

@@ -1,28 +0,0 @@
-<h3>Blessures:</h3>
-<table class="table-container" role="table">
-  <thead>
-    <tr class="competence-header competence-title competence-label" >
-      <th></th>
-      <th>Loc.</th>
-      <th>Premiers soins</th>
-      <th>P.S. OK?</th>
-      <th>Soins complets</th>
-      <th>S.C. OK?</th>
-      <th>Age (jours)</th>   
-    </tr>
-  </thead>
-  <tbody>
-    <tr class="table-row alterne-row" ><td/><td colspan="4">Légères</td></tr>
-    {{#each system.blessures.legeres.liste as |bless key|}}
-    {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="legere" title="Légère"}}
-    {{/each}}
-    <tr class="table-row alterne-row"><td/><td colspan="4">Graves</td></tr>
-    {{#each system.blessures.graves.liste as |bless key|}}
-    {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="grave" title="Grave"}}
-    {{/each}}
-    <tr class="table-row alterne-row"><td/><td colspan="4">Critiques</td></tr>
-    {{#each system.blessures.critiques.liste as |bless key|}}
-    {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="critique" title="Critique"}}
-    {{/each}}
-  </tbody>
-</table>

templates/actor-sheet-editor-notes-mj.html

@@ -1,6 +0,0 @@
-{{#if options.isGM}}
-<h3>Notes du MJ : </h3>
-<div class="form-group editor">
-  {{editor system.notesmj target="system.notesmj" button=true owner=owner editable=editable}}
-</div>
-{{/if}}

templates/actor-sheet-inventaire-conteneur.html

@@ -1,52 +0,0 @@
-<li class="item flexrow list-item" data-item-id="{{item._id}}" draggable="true">
-  {{#if (eq item.type 'conteneur')}}
-    <span class="sheet-competence-img conteneur-name">
-      {{#if vide}}
-       <i class="far fa-square"></i>
-      {{else}}
-        <a data-item-id="{{item._id}}">
-        {{#if ouvert}}
-        <i class="far fa-minus-square"></i>
-        <!-- <i class="far fa-caret-square-down"></i> -->
-        {{else}}
-        <i class="far fa-plus-square"></i>
-        <!-- <i class="fas fa-caret-square-right"></i> -->
-        {{/if}}
-        </a>
-      {{/if}}
-    </span>
-    <span class="item-name conteneur-name flex-grow">
-      <a data-item-id="{{item._id}}">
-        <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
-        {{item.name}}
-      </a>
-    </span>
-  {{else}}
-  <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
-  <span class="item-name flex-grow">{{item.name}}</span>
-  {{/if}}
-  <span class="item-quantite">{{item.system.quantite}}
-    {{#if (gt item.system.quantite 1)}}
-    <a class="item-control item-split" title="Séparer"><i class="fas fa-unlink"></i></a>
-    {{/if}}
-  </span>
-  <span class="item-quantite">{{numberFormat item.system.encTotal decimals=2}}</span>
-  <div class="item-controls flex-grow">
-    {{#unless item.estContenu}}
-    {{#if (ne item.type 'conteneur')}}
-    <a class="item-control item-equip" title="Equiper">{{#if item.system.equipe}}<i class="fas fa-hand-rock"></i>{{else}}<i class="far fa-hand-paper"></i>{{/if}}</a>
-    {{/if}}
-    {{/unless}}
-    <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
-    <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-    {{#if (or (eq item.type 'arme') (eq item.type 'conteneur') item.system.quantite)}}
-    &nbsp;
-    <a class="item-control item-vendre" title="Vendre ou donner"><i class="fas fa-comments-dollar"></i></a>
-    {{/if}}
-    <a class="item-control item-montrer" title="Montrer"><i class="fas fa-comment"></i></a>
-    {{#if item.system.actionPrincipale}}
-    <a class="item-name item-action">{{item.system.actionPrincipale}}</a>
-    {{/if}}
-  </div>
-</li>
-

templates/actor-sheet-liens-vehicules.html

@@ -1,15 +0,0 @@
-<span class="item-name"><h4>Véhicules</h4></span>
-<ul class="item-list alterne-list">
-  {{#each subacteurs.vehicules as |vehicule id|}}
-  <li class="item flexrow list-item" data-actor-id="{{vehicule.id}}">
-    <img class="sheet-competence-img" src="{{vehicule.img}}" title="{{vehicule.name}}"/>
-    <span class="flex-grow subacteur-label"><a>{{vehicule.name}}</a></span>
-    <span>{{vehicule.categorie}}</span>
-    <span>{{vehicule.structure}}</span>
-    <div class="flex-shrink">
-      <a class="subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-  </div>
-  </li>
-  {{/each}}
-</ul>
-

templates/actor-sheet.html

@@ -69,7 +69,7 @@
               <span>{{system.compteurs.surenc.label}}: {{system.compteurs.surenc.value}}</span>
             </div>
             <div class="flexrow">
-              {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-effects-partial.html"}}
+              {{>"systems/foundryvtt-reve-de-dragon/templates/actor/effects.html"}}
             </div>
           </div>
         </div>
@@ -93,9 +93,10 @@
         {{!-- Carac Tab --}}
         <div class="tab items" data-group="primary" data-tab="carac">
           <div class="flexrow">
-              <span><a class="lock-unlock-sheet"><img class="small-button-container"
-                                                      src="systems/foundryvtt-reve-de-dragon/icons/{{#if options.editCaracComp}}unlocked.svg{{else}}locked.svg{{/if}}" alt="blocker/débloquer"
-              >{{#if options.editCaracComp}}Verrouiller{{else}}Déverrouiller{{/if}}</a></span>
+            <span><a class="vue-detaillee">
+              <i class="fas {{#if options.vueDetaillee}}fa-eye-slash{{else}}fa-eye{{/if}}"></i>
+              {{#if options.vueDetaillee}}Vue simplifiée{{else}}Vue détaillée{{/if}}</a>
+            </span>
           </div>
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol">
@@ -108,7 +109,7 @@
                     {{/if}}
                     {{#if (eq key 'taille')}}
                       <span class="carac-label" name="system.carac.{{key}}.label">{{carac.label}}</span>
-                      <input class="carac-value" type="text" name="system.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+                      <input class="carac-value" type="text" name="system.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
                       <label class="carac-xp"/>
                     {{else}}
                         {{#if carac.derivee}}
@@ -125,9 +126,9 @@
                           {{else}}
                             <span class="carac-label tooltip" name="system.carac.{{key}}.label"><a name={{key}}>{{carac.label}}</a></span>
                           {{/if}}
-                          <input class="carac-value" type="text" name="system.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+                          <input class="carac-value" type="text" name="system.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
                           <span class="carac-xp tooltip">
-                          <input class="carac-xp" type="text" name="system.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number" {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+                          <input class="carac-xp" type="text" name="system.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
                           <span class="tooltiptext ttt-xp">Vous devez acquérir {{carac.xpNext}} points d'Experience pour augmenter de 1 votre {{carac.label}}</span>      
                           </span>
                           {{#if carac.isLevelUp}}
@@ -149,7 +150,7 @@
               <ul class="carac-list">
                 <li class="caracteristique flexrow list-item">
                   <span class="carac-label" name="beaute">Beauté&nbsp;:</span>
-                  <input class="description-value" type="text" name="system.beaute" value="{{system.beaute}}" data-dtype="String" {{#unless @root.options.editCaracComp}}disabled{{/unless}}/>
+                  <input class="description-value" type="text" name="system.beaute" value="{{system.beaute}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}/>
                   <label class="carac-xp"/>
                 </li>
                 {{#each system.attributs as |attr key|}}
@@ -211,449 +212,80 @@
         
         {{!-- Compétences Tab --}}
         <div class="tab competences" data-group="primary" data-tab="competences">
-          <div class="grid grid-4col">
-            <span><a class="lock-unlock-sheet"><img class="small-button-container"
-              src="systems/foundryvtt-reve-de-dragon/icons/{{#if options.editCaracComp}}unlocked.svg{{else}}locked.svg{{/if}}" alt="blocker/débloquer">
-              {{#if options.editCaracComp}}Verrouiller{{else}}Déverrouiller{{/if}}</a></span>
-            <span>
-              <input class="recherche flex-grow" type="text" value="{{options.recherche.text}}" name="recherche" 
-                  size="8" data-dtype="String" placeholder="chercher"/>
+          <div class="flexrow">
+            <span><a class="vue-detaillee">
+              <i class="fas {{#if options.vueDetaillee}}fa-eye-slash{{else}}fa-eye{{/if}}"></i>
+              {{#if options.vueDetaillee}}Vue simplifiée{{else}}Vue détaillée{{/if}}</a>
             </span>
             <span><a class="show-hide-competences"><img class="small-button-container"
               src="systems/foundryvtt-reve-de-dragon/icons/{{#if options.showCompNiveauBase}}no-filter.svg{{else}}filter.svg{{/if}}" alt="filter/montrer tout">
               {{#if options.showCompNiveauBase}}Montrer tout{{else}}Filtrer{{/if}}</a>
             </span>
-            <span><a class="vue-detaillee">
-              <i class="fas {{#if options.vueDetaillee}}fa-eye-slash{{else}}fa-eye{{/if}}"></i>
-              {{#if options.vueDetaillee}}Vue simplifiée{{else}}Vue détaillée{{/if}}</a>
+            <span class="flexrow">
+              <i class="fas fa-search flex-shrink"></i>
+              <input class="recherche flex-grow" type="text" value="{{options.recherche.text}}" name="recherche" 
+              size="8" data-dtype="String" placeholder="chercher"/>
             </span>
           </div>
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol competence-column">
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.generale) categorie="Compétences générales"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.particuliere) categorie="Compétences Particulières"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.specialisee) categorie="Compétences Spécialisées"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.generale) categorie="Compétences générales"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.particuliere) categorie="Compétences Particulières"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.specialisee) categorie="Compétences Spécialisées"}}
             </div>
 
             <div class="flex-group-left flexcol competence-column">
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.melee) categorie="Compétences de Mêlée"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.tir) categorie="Compétences de Tir"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.lancer) categorie="Compétences de Lancer"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.connaissance) categorie="Connaissances"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.melee) categorie="Compétences de Mêlée"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.tir) categorie="Compétences de Tir"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.lancer) categorie="Compétences de Lancer"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.connaissance) categorie="Connaissances"}}
               {{#if (or system.attributs.hautrevant.value options.vueDetaillee)}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.draconic) categorie="Draconic"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.draconic) categorie="Draconic"}}
               {{/if}}
-
-              <div>
-                <ul class="item-list">
-                  <li class="item flexrow">
-                    <span class="generic-label">Stress transformé</span>
-                    <input class="compteur-edit" type="text" name="experience" value="{{system.compteurs.experience.value}}" data-dtype="number" size="3"/>
-                  </li>
-
-                  <li class="item flexrow">
-                    <span class="generic-label">Total XP compétences</span>
-                    <span class="competence-value">{{calc.competenceXPTotal}}</span>
-                  </li>
-                  {{#if options.vueDetaillee}}
-                  <li>Niveaux d'archétype à répartir</li>
-                  {{#each calc.comptageArchetype as |archetype key|}}
-                  {{#if (lt archetype.nombre archetype.nombreMax)}}
-                  <li class="item flexrow">
-                    <label class="generic-label">Archetype {{archetype.niveau}} : {{archetype.nombre}} / {{archetype.nombreMax}}</label>
-                  </li>
-                  {{/if}}
-                  {{/each}}
-                  {{/if}}
-                </ul>
-              </div>    
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/xp-competences.html"}}
             </div>
           </div>
         </div>
 
         {{!-- Combat Tab --}}
         <div class="tab combat" data-group="primary" data-tab="combat">
-          <h3 class="blessures-title">Armes et Défenses:</h3>
-            <ul class="item-list alterne-list">
-              <li class="competence-header flexrow">
-                <span class="competence-title competence-label">Armes</span>
-                <span class="competence-title competence-label">Initiative</span>
-                <span class="competence-title competence-label">Comp.</span>
-                <span class="competence-title competence-value">Niveau</span>
-                <span class="competence-title competence-value">+dom</span>
-              </li>
-            {{#each combat as |arme key|}}
-              <li class="item flexrow list-item" data-item-id="{{arme._id}}"
-                  data-arme-name="{{arme.name}}" data-competence-name="{{arme.system.competence}}" >
-                  <span class="arme-label">
-                    <a>
-                      {{#if arme.img}}
-                      <img class="sheet-competence-img" src="{{arme.img}}"/>
-                      {{/if}}
-                      <span>{{arme.name}}</span>
-                    </a>
-                  </span>
-                  <span class="arme-initiative"><a>{{arme.system.initiative}}</a></span>
-                  <span class="competence-label">{{arme.system.competence}}</span>
-                  <span class="competence-value">{{numberFormat arme.system.niveau decimals=0 sign=true}}</span>
-                  <span class="competence-value">{{numberFormat arme.system.dommagesReels decimals=0 sign=true}}</span>
-              </li>
-            {{/each}}
-            {{#each esquives as |esq key|}}
-              <li class="item flexrow list-item" data-item-id="{{esq._id}}">
-                <span class="competence-label">
-                  <a class="competence-label" name="{{esq.name}}">
-                    <img class="sheet-competence-img" src="{{esq.img}}"/>
-                    <span>{{esq.name}}</span>
-                  </a>
-                </span>
-                <span class="arme-initiative"></span>
-                <span class="competence-label"></span>
-                <span class="competence-value">{{numberFormat esq.system.niveau decimals=0 sign=true}}</span>
-                <span class="competence-value"></span>
-              </li>
-            {{/each}}
-
-        </ul>
-        <hr>
-        {{!-- Liste de blessures --}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html" this}}
-
-        {{#if maladiesPoisons.length}}
-        {{!-- Maladies & Poison --}}
-        <h3 class="blessures-title">Maladies & Poisons:</h3>
-        <ul class="item-list alterne-list">
-          <li class="competence-header flexrow">
-            <span class="competence-title flex-grow competence-label">Nom</span>
-            <span class="competence-title competence-label">Type</span>
-            <span class="competence-title competence-value">Remèdes</span>
-            <span class="competence-title flex-grow competence-value">Edition</span>
-          </li>
-        {{#each maladiesPoisons as |maladie key|}}
-          <li class="item flexrow list-item" data-item-id="{{maladie._id}}">
-              <span class="competence-label">
-                {{#if (or @root.options.isGM maladie.system.identifie)}} 
-                  {{maladie.name}}
-                {{else}}
-                  Inconnue
-                {{/if}}
-              </span>
-              <span class="competence-label">{{maladie.type}}</span>
-              <span class="competence-label">
-                {{#if (or @root.options.isGM maladie.system.remedesconnus)}} 
-                  {{maladie.system.remedes}}
-                {{else}}
-                  Remèdes Inconnus
-                {{/if}}
-              </span>
-              <div class="item-controls">
-                <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
-                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-              </div>          
-          </li>
-          {{/each}}
-          </ul>
-        {{/if}}
-
-        {{#if possessions.length}}
-        {{!-- Possession --}}
-        <h3 class="blessures-title">Possession:</h3>
-        <ul class="item-list alterne-list">
-          <li class="competence-header flexrow">
-            <span class="competence-title flex-grow competence-label">Nom</span>
-            <span class="competence-title competence-label">Type</span>
-          </li>
-          {{#each possessions as |possession  key|}}
-          <li class="item flexrow list-item" data-item-id="{{possession._id}}">
-              <span class="competence-label">
-                <a class="sheet-possession-attack">{{possession.name}} (Conjurer)</a>
-              </span>
-              <span class="competence-label">{{possession.system.type}}</span>
-              <div class="item-controls">
-                <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
-                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-              </div>          
-          </li>
-          {{/each}}
-          </ul>
-        {{/if}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/combat.html"}}<hr>
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/blessures.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/maladies-poisons.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/possessions.html"}}
+        
       </div>
-
+      
       {{!-- Connaissances Tab --}}
       <div class="tab connaissances" data-group="primary" data-tab="connaissances">
-        <h3>Tâches</h3><a class='creer-tache'>Créer une nouvelle Tâche</a>
-        <ul class="item-list alterne-list">
-          {{#each taches as |tache id|}}
-          <li class="item flexrow list-item" data-item-id="{{tache._id}}">
-            <img class="sheet-competence-img" src="{{tache.img}}" />
-            <span class="competence-title tache-label"><a>{{tache.name}}
-            ({{tache.system.points_de_tache_courant}}{{#if
-               (or @root.options.isGM (not tache.system.cacher_points_de_tache))
-            }}/{{tache.system.points_de_tache}}{{/if}})</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        <hr>
-        <h3>Oeuvres diverses :</h3><a class="creer-une-oeuvre">Créer une oeuvre</a>
-        <ul class="item-list alterne-list">
-          {{#each chants as |chant id|}}
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=chant typeOeuvre="Chant" classOeuvre="chant-label"}}
-          {{/each}}
-          {{#each musiques as |musique id|}}
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=musique typeOeuvre="Musique" classOeuvre="musique-label"}}
-          {{/each}}
-          {{#each danses as |danse id|}}
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=danse typeOeuvre="Danse" classOeuvre="danse-label"}}
-          {{/each}}
-          {{#each oeuvres as |oeuvre id|}}
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=oeuvre typeOeuvre=oeuvre.system.competence classOeuvre="oeuvre-label"}}
-          {{/each}}
-          {{#each recettescuisine as |recette id|}}
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=recette typeOeuvre="Recette de cuisine" classOeuvre="recettecuisine-label"}}
-          {{/each}}
-        </ul>
-        <h3>Jeux :</h3>
-        <ul class="item-list alterne-list">
-          {{#each jeux as |jeu id|}}
-          <li class="item flexrow list-item" data-item-id="{{jeu._id}}"><span class="competence-title jeu-label"><a>{{jeu.name}} (base {{jeu.system.base}})</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        <h3>Recettes Alchimiques</h3>
-        <ul class="item-list alterne-list">
-          {{#each recettesAlchimiques as |recette id|}}
-          <li class="item flexrow list-item" data-item-id="{{recette._id}}"><span class="competence-title recette-label item-edit"><a>{{recette.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        <hr>
-        <h3>Astrologie</h3>
-        <span class="astrologie-label"><a id="jet-astrologie">Astrologie : Nombres Astraux</a></span>
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/taches.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvres.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/jeux.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/alchimie.html"}}
       </div>
-
+      
       {{!-- hautreve Tab --}}
       <div class="tab hautreve " data-group="primary" data-tab="hautreve" style="height:200px">
         <div>
           {{#if system.attributs.hautrevant.value}}
           <h3>Haut rêvant</h3>
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor/haut-revant.html"}}
           {{else}}
-          <h3>Vous n'avez pas le don de haut-rêve! Il faut attribuer la Tête de Dragon 'Don de Haut Rêve' si votre personnage est ou devient Haut-Rêvant.</h3>
+          <h3>Vous n'avez pas le don de haut-rêve</h3>
+          <p>Attribuer la Tête de Dragon 'Don de Haut Rêve' pour rendre le personnage Haut-Rêvant.</p>
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor/non-haut-revant.html"}}
           {{/if}}
-          <ul class="item-list">
-            {{#if system.attributs.hautrevant.value}}
-            {{#if options.isGM}}
-            <li class="item flexrow">
-              <span>
-                <a class="chat-card-button forcer-tmr-aleatoire">Ré-insertion aléatoire (ie TMR cachée)</a>
-              </span>
-              <span>
-                <a class="chat-card-button afficher-tmr">Montrer les TMR</a>
-              </span>
-            </li>
-            {{/if}}
-            <li class="item flexrow">
-              <span class="competence-label flex-shrink">Demi rêve :
-              {{#if options.isGM}}
-                {{caseTmr-label system.reve.tmrpos.coord}}
-              </span><span>
-                <input class="competence-value" type="text" name="system.reve.tmrpos.coord" value="{{system.reve.tmrpos.coord}}" data-dtype="String"/>
-              {{else if hautreve.cacheTMR}}
-                {{caseTmr-type system.reve.tmrpos.coord}}
-              </span><span>
-                ??
-              {{else}}
-                {{caseTmr-label system.reve.tmrpos.coord}}
-              </span><span>
-                {{system.reve.tmrpos.coord}}
-              {{/if}}
-              </span> 
-            </li>
-            {{/if}}
-            <li class="item flexrow">
-              <span class="competence-label">Seuil de Rêve :</span>
-              <span>
-              {{#if options.isGM}}
-                <input class="seuil-reve-value" type="text" name="system.reve.seuil.value" value="{{system.reve.seuil.value}}" data-dtype="Number"/>
-              {{else}}
-                {{system.reve.seuil.value}}
-              {{/if}}
-              </span>
-            </li>
-            <li class="item flexrow" >
-              <span class="competence-label">Refoulement : </span>
-              <span>
-              {{#if options.isGM}}
-                <input class="competence-value" type="text" name="system.reve.refoulement.value" value="{{system.reve.refoulement.value}}" data-dtype="Number"/>
-              {{else}}
-                {{system.reve.refoulement.value}}
-              {{/if}}
-              </span>
-            </li>
-          </ul>
+          <br><br>
         </div>
-        <hr>
-        {{!-- Queues, Souffles, Tetes, Ombre --}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html"}}
-        {{#if souffles.length}}
-        <h3>Souffles:</h3>
-        <ul class="item-list">
-          {{#each souffles as |souffle key|}}
-          <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}">
-            <img class="sheet-competence-img" src="{{souffle.img}}" />
-            <span class="display-label flex-grow"><a>{{souffle.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        {{/if}}
-        {{#if tetes.length}}
-        <h3>Tetes:</h3>
-        <ul class="item-list">
-          {{#each tetes as |tete key|}}
-          <li class="item flexrow" data-attribute={{key}} data-item-id="{{tete._id}}">
-            <img class="sheet-competence-img" src="{{tete.img}}" />
-            <span class="display-label flex-grow"><a>{{tete.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        {{/if}}
-        {{#if system.attributs.hautrevant.value}}
-        {{#if (and options.isGM signesdraconiques.length)}}
-        <h3>Signes draconiques</h3>
-        <ul class="item-list alterne-list">
-          {{#each signesdraconiques as |signe key|}}
-            <li class="item list-item flexrow" data-item-id="{{signe._id}}" data-attribute="{{key}}">
-                <img class="sheet-competence-img" src="{{signe.img}}" />
-                <span class="display-label flex-grow"><a>{{signe.name}}</a></span> 
-                <span class="flex-shrink">{{signe.system.difficulte}}</span>
-                <div class="item-controls flex-shrink">
-                  <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-              {{/each}}
-            </ul>
-            {{/if}}
-            
-            {{#if hautreve.rencontres.length}}
-            <h3>Rencontres présentes:</h3>
-            <ul class="item-list">
-              {{#each hautreve.rencontres as |rencontre key|}}
-              <li class="item flexrow" data-item-id="{{key}}" data-attribute="{{key}}">
-                <span class="display-label"><a data-item-id="{{key}}">{{rencontre.name}} r{{rencontre.force}}</a></span> 
-                <span class="flex-shrink">{{rencontre.coord}} - {{caseTmr-label rencontre.coord}}</span> 
-                {{#if rencontre.date}}
-                <span>{{upperFirst rencontre.heure}}, le {{rencontre.date}}</span> 
-                {{/if}}
-                <div class="item-controls flex-shrink">
-                  <a class="rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-              {{/each}}
-            </ul>
-            {{/if}}
-            {{#if sortsReserve.length}}
-            <h3>Sorts en Réserve:</h3>
-            <ul class="item-list alterne-list">
-              {{#each sortsReserve as |sort key|}}
-              <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
-                <img class="sheet-competence-img" src="{{sort.img}}" />
-                <span class="display-label"><a>{{#if sort.system.echectotal}}Echec total: {{/if}}{{sort.name}} r{{sort.system.ptreve}}</a></span> 
-                <span>{{sort.system.coord}} - {{caseTmr-label sort.system.coord}}</span> 
-                <div class="item-controls flex-shrink">
-                  <a class="item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-              {{/each}}
-              {{#each hautreve.sortsReserve as |reserve key|}}
-              <li class="item list-item flexrow" data-index="{{key}}">
-                <img class="sheet-competence-img" src="{{reserve.img}}" />
-                <span class="display-label">{{reserve.sort.name}} r{{reserve.sort.system.ptreve_reel}}</span> 
-                <span>{{reserve.coord}} - {{caseTmr-label reserve.coord}}</span> 
-                <div class="item-controls flex-shrink">
-                  <a class="delete-sort-reserve flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-              {{/each}}
-            </ul>
-          {{/if}}
-          
-          <hr>
-          
-          <h3>Sorts:</h3>
-          <ul class="item-list alterne-list">
-            {{#each sorts as |sort key|}}
-            <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
-              <img class="sheet-competence-img" src="{{sort.img}}" />
-              <span class="display-label flex-grow">
-                <a data-item-id="{{sort._id}}">{{sort.name}}
-                  - {{#if sort.system.caseTMRspeciale}}{{sort.system.caseTMRspeciale}}{{else}}{{upperFirst sort.system.caseTMR}}{{/if}}
-                </a>
-              </span> 
-              <span>{{sort.system.draconic}} / {{sort.system.difficulte}}</span>
-              <div class="item-controls flex-shrink">
-                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ul>
-
-          <h3>Méditations:</h3>
-          <ul class="item-list">
-            {{#each meditations as |meditation key|}}
-            <li class="item flexrow" data-item-id="{{meditation._id}}" data-attribute="{{key}}">
-              <img class="sheet-competence-img" src="{{meditation.img}}" />
-              <span class="meditation-label flex-grow"><a data-item-id="{{meditation._id}}">{{meditation.name}} - {{meditation.system.competence}}</a></span> 
-              <div class="item-controls flex-shrink">
-                <a class="item-edit" title="Editer"><i class="fas fa-edit"></i></a>
-                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ul>
-          <hr>
-          {{#if hautreve.casesTmr}}
-            <h3>Cases Spéciales:</h3>
-            <ul class="item-list">
-              {{#each hautreve.casesTmr as |casetmr key|}}
-              <li class="item flexrow" data-item-id="{{casetmr._id}}" data-attribute="{{key}}">
-                <img class="sheet-competence-img" src="{{casetmr.img}}" />
-                <span class="display-label"><a data-item-id="{{casetmr._id}}">{{casetmr.name}}</a></span>
-                <span>{{casetmr.system.coord}} - {{caseTmr-label casetmr.system.coord}}</span> 
-                <div class="item-controls flex-shrink">
-                  <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-              {{/each}}
-            </ul>
-          {{/if}}
-        <br><br>
-        {{/if}}
       </div>
 
       {{!-- Equipment Tab --}}
       <div class="tab items" data-group="primary" data-tab="items">
         
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html"}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-suivants.html"}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/liens-animaux.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/liens-suivants.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/liens-vehicules.html"}}
 
       </div>
 
@@ -713,27 +345,14 @@
         <article class="flexcol">
           <h3>Biographie : </h3>
           <div class="form-group editor">
-            {{editor system.biographie target="system.biographie" button=true owner=owner editable=editable}}
+            {{editor biographie target="system.biographie" button=true owner=owner editable=editable}}
           </div>
           <h3>Notes : </h3>
           <div class="form-group editor">
-            {{editor system.notes target="system.notes" button=true owner=owner editable=editable}}
+            {{editor notes target="system.notes" button=true owner=owner editable=editable}}
           </div>
-          <h3>Journal d'Experience</h3>
-          <div class="form-group editor">
-            <ul class="item-list alterne-list">
-              {{#each system.experiencelog as |xp key|}}
-              <li class="item flexrow list-item">
-                <label class="flex-shrink">{{xp.mode}} </label>
-                <label class="flex-grow">{{xp.valeur}} {{xp.raison}} </label>
-                <label class="flex-shrink">{{xp.daterdd}} </label>
-                <label class="flex-shrink">{{xp.datereel}} </label>
-              </li>
-            {{/each}}
-          </ul>
-        </div>
-
-          {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor/xp-journal.html"}}
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
         </article>
       </div>
 

templates/actor-vehicule-sheet.html

@@ -26,7 +26,7 @@
         <div class="flex-group-left flexcol">
           <ol class="carac-list alterne-list">
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label flexrow" name="categorie">Catégorie</span>
+              <span class="carac-label">Catégorie</span>
               <select name="system.categorie" class="categorie" data-dtype="String">
                 {{#select system.categorie}}
                 {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-vehicule.html"}}
@@ -34,52 +34,53 @@
               </select>
             </li>
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label flexrow" name="categorie">Résistance</span>
-              <input class="competence-value flexrow" type="text" name="system.resistance" value="{{system.resistance}}" data-dtype="Number" />
+              <span class="carac-label">Résistance</span>
+              <input class="competence-value flexrow" type="text" name="system.etat.resistance.value" value="{{system.etat.resistance.value}}" data-dtype="Number" />
+              /
+              <input class="competence-value flexrow" type="text" name="system.etat.resistance.max" value="{{system.etat.resistance.max}}" data-dtype="Number" />
             </li>
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label flexrow" name="categorie">Structure</span>
-              <input class="competence-value flexrow" type="text" name="system.structure" value="{{system.structure}}" data-dtype="Number" />
+              <span class="carac-label">Structure</span>
+              <input class="competence-value flexrow" type="text" name="system.etat.structure.value" value="{{system.etat.structure.value}}" data-dtype="Number" />
+              /
+              <input class="competence-value flexrow" type="text" name="system.etat.structure.max" value="{{system.etat.structure.max}}" data-dtype="Number" />
             </li>
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label flexrow" name="categorie">Vitesse</span>
-              <input class="competence-value flexrow" type="text" name="system.vitesse" value="{{system.vitesse}}" data-dtype="String" />
+              <span class="carac-label">Vitesse</span>
+              <input class="caracteristique vehicle" type="text" name="system.vitesse" value="{{system.vitesse}}" data-dtype="String" />
             </li>
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label flexrow" name="categorie">Bonus</span>
-              <input class="competence-value flexrow" type="text" name="system.bonus" value="{{system.bonus}}" data-dtype="String" />
+              <span class="carac-label">Bonus</span>
+              <input class="caracteristique vehicle" type="text" name="system.bonus" value="{{system.bonus}}" data-dtype="String" />
             </li>
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label flexrow" name="categorie">Manoeuvrabilité</span>
-              <input class="competence-value flexrow" type="text" name="system.manoeuvrabilite" value="{{system.manoeuvrabilite}}" data-dtype="String" />
+              <span class="carac-label">Manoeuvrabilité</span>
+              <input class="caracteristique vehicle" type="text" name="system.manoeuvrabilite" value="{{system.manoeuvrabilite}}" data-dtype="String" />
             </li>
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label flexrow" name="categorie">Equipage</span>
-              <input class="competence-value flexrow" type="text" name="system.equipage" value="{{system.equipage}}" data-dtype="Number" />
+              <span class="carac-label">Equipage</span>
+              <input class="caracteristique vehicle" type="text" name="system.equipage" value="{{system.equipage}}" data-dtype="Number" />
             </li>
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label flexrow" name="categorie">Capacité d'Encombrement</span>
-              <input class="competence-value flexrow" type="text" name="system.capacite_encombrement" value="{{system.capacite_encombrement}}" data-dtype="Number" />
+              <span class="carac-label">Capacité d'Encombrement</span>
+              <input class="caracteristique vehicle" type="text" name="system.capacite_encombrement" value="{{system.capacite_encombrement}}" data-dtype="Number" />
             </li>
           </ol>
         </div>
       </div>
     </div>
-    
+
     {{!-- Equipment Tab --}}
     <div class="tab items" data-group="primary" data-tab="items">
-
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
-      
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire.html"}}
+    </div>
 
     {{!-- Biography Tab --}}
     <div class="tab description" data-group="primary" data-tab="description">
       <div class="form-group editor">
-        {{editor content=system.description target="system.description" button=true owner=owner editable=editable}}
+        {{editor description target="system.description" button=true owner=owner editable=editable}}
       </div>
-      {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
-    </div>
-    
+      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
     </div>
 
   </section>

templates/actor/alchimie.html

@@ -0,0 +1,13 @@
+{{#if recettesAlchimiques.length}}
+<h3>Recettes Alchimiques</h3>
+<ul class="item-list alterne-list">
+  {{#each recettesAlchimiques as |recette id|}}
+  <li class="item flexrow list-item" data-item-id="{{recette._id}}"><span class="competence-title recette-label item-edit"><a>{{recette.name}}</a></span>
+    <div class="item-controls flex-shrink">
+      <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}

templates/actor/astrologie.html

@@ -0,0 +1,2 @@
+<h3>Astrologie</h3>
+<span class="astrologie-label"><a id="jet-astrologie">Astrologie : Nombres Astraux</a></span>

templates/actor/blessure.html

@@ -0,0 +1,27 @@
+<li class="item flexrow list-item {{#if blessure.active}}blessure-active-{{gravite}}{{else}}blessure-inactive{{/if}}"
+      data-blessure-type="{{gravite}}"
+      data-attribute={{key}}
+      data-blessure-index="{{key}}"
+      data-blessure-active="{{blessure.active}}">
+  <span class="blessure-control" title="Blessure {{title}}">
+    <i class="fas fa-skull-crossbones" name="blessure-{{gravite}}-{{key}}-active"></i>
+    {{title}}
+  </span>
+  {{#if blessure.active}}
+  <span class="blessure-soins flexrow">
+    <input class="blessure-psdone" name="blessure-{{gravite}}-{{key}}-psdone" type="checkbox" name="blessure.psdone"  {{#if blessure.psdone}}checked{{/if}}/>
+    <input class="blessure-premiers_soins" type="text" name="blessure-{{gravite}}-{{key}}-premiers_soins" data-dtype="number" value="{{blessure.premiers_soins}}"/>
+  </span>
+  <span class="blessure-soins flexrow">
+    <input class="blessure-scdone" name="blessure-{{gravite}}-{{key}}-scdone" type="checkbox" name="blessure.scdone"  {{#if blessure.scdone}}checked{{/if}}/>
+    <input class="blessure-soins_complets" type="text" name="blessure-{{gravite}}-{{key}}-soins_complets" data-dtype="number" value="{{blessure.soins_complets}}"/>
+  </span>
+  <input class="blessure-jours" type="text" name="blessure-{{gravite}}-{{key}}-jours" name="jours" data-dtype="number" value="{{blessure.jours}}"/>
+  <input class="blessure-localisation" type="text" name="blessure-{{gravite}}-{{key}}-localisation" data-dtype="String" value="{{blessure.loc}}"/>
+  {{else}}
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  {{/if}}
+</li>

templates/actor/blessures.html

@@ -0,0 +1,18 @@
+<ul class="item-list alterne-list">
+  <li class="competence-header flexrow" >
+    <span>Blessures</span>
+    <span>Premiers soins</span>
+    <span>Soins complets</span>
+    <span>Age (jours)</span>
+    <span>Localisation</span>
+  </li>
+  {{#each system.blessures.legeres.liste as |blessure key|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/blessure.html" blessure=blessure key=key gravite="legere" title="Légère"}}
+  {{/each}}
+  {{#each system.blessures.graves.liste as |blessure key|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/blessure.html" blessure=blessure key=key gravite="grave" title="Grave"}}
+  {{/each}}
+  {{#each system.blessures.critiques.liste as |blessure key|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/blessure.html" blessure=blessure key=key gravite="critique" title="Critique"}}
+  {{/each}}
+</ul>

templates/actor/categorie-competences.html

@@ -6,7 +6,6 @@
   <ul class="item-list alterne-list competence-list">
     {{#if @root.options.vueDetaillee}}
     <li class="item flexrow list-item ">
-      
       <span class="competence-label"></span>
       <span class="competence-value" >Niv.</span>
       <span class="competence-xp">xp</span>
@@ -15,7 +14,7 @@
       {{/if}}
       <div class="item-controls">
         <i class="far fa-arrow-alt-circle-up"></i>
-        <span class="competence-archetype">Arch</span>
+        <span class="competence-archetype">Arch.</span>
         <i class="far fa-edit"></i>
         {{#if @root.options.isGM}}
         <i class="far fa-trash"></i>
@@ -24,7 +23,7 @@
     </li>
     {{/if}}
     {{#each competences as |comp key|}}
-    {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
+    {{> "systems/foundryvtt-reve-de-dragon/templates/actor/competence.html" comp}}
     {{/each}}
   </ul>
 </div>

templates/actor/combat.html

@@ -0,0 +1,43 @@
+<ul class="item-list alterne-list">
+  <li class="competence-header flexrow">
+    <span class="competence-title competence-label">Armes et Défenses</span>
+    <span class="competence-title competence-value">Niveau</span>
+    <span class="competence-title competence-value">+dom</span>
+    <span class="competence-title competence-value"></span>
+    <span class="competence-title initiative-value">Initiative</span>
+  </li>
+{{#each combat as |arme key|}}
+  <li class="item flexrow list-item"
+      data-item-id="{{arme._id}}"
+      data-arme-name="{{arme.name}}"
+      data-competence-name="{{arme.system.competence}}" >
+    <span class="arme-label">
+      <a>
+        {{#if arme.img}}
+        <img class="sheet-competence-img" src="{{arme.img}}"/>
+        {{/if}}
+        <span>{{arme.name}}</span>
+      </a>
+      ({{arme.system.competence}})
+    </span>
+    <span class="competence-value">{{numberFormat arme.system.niveau decimals=0 sign=true}}</span>
+    <span class="competence-value">{{numberFormat arme.system.dommagesReels decimals=0 sign=true}}</span>
+    <span class="competence-value"></span>
+    <span class="initiative-value arme-initiative"><a>{{arme.system.initiative}}</a></span>
+  </li>
+  {{/each}}
+  {{#each esquives as |esq key|}}
+  <li class="item flexrow list-item" data-item-id="{{esq._id}}">
+    <span class="competence-label">
+      <a class="competence-label" name="{{esq.name}}">
+        <img class="sheet-competence-img" src="{{esq.img}}"/>
+        <span>{{esq.name}}</span>
+      </a>
+    </span>
+    <span class="competence-value">{{numberFormat esq.system.niveau decimals=0 sign=true}}</span>
+    <span class="competence-value"></span>
+    <span class="competence-value"></span>
+    <span class="initiative-value"></span>
+  </li>
+{{/each}}
+</ul>

templates/actor/competence.html

@@ -14,19 +14,19 @@
 
     <input class="competence-value" type="text" compname="{{name}}" name="comp-value-{{name}}"
           value="{{numberFormat system.niveau decimals=0 sign=true}}" data-dtype="number"
-          {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
-    
+          {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
+
+    {{#if @root.options.vueDetaillee}}
     <span class="competence-xp tooltip">
       <input class="competence-xp " type="text" compname="{{name}}" name="comp-xp-{{name}}"
-          value="{{numberFormat system.xp decimals=0 sign=false}}" data-dtype="number"
-          {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+          value="{{numberFormat system.xp decimals=0 sign=false}}" data-dtype="number"/>
       <span class="tooltiptext left-competence ttt-xp">Vous devez acquérir {{system.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}}</span>      
     </span>
-
+    {{/if}}
     {{#if (eq system.categorie 'draconic')}}
     <input class="competence-xp-sort" type="text" compname="{{name}}" name="comp-xp-sort-{{name}}"
           value="{{numberFormat system.xp_sort decimals=0 sign=false}}" data-dtype="number"
-          {{#unless @root.options.editCaracComp}}disabled{{/unless}}/>
+          {{#unless @root.options.vueDetaillee}}disabled{{/unless}}/>
     {{/if}}
     {{#if @root.options.vueDetaillee}}
     <div class="item-controls">
@@ -39,8 +39,7 @@
       <i class="far fa-circle"></i>
       {{/if}}
       <input class="competence-archetype niveau-archetype" type="text" compname="{{name}}" name="comp-archetype-{{name}}"
-            value="{{numberFormat system.niveau_archetype decimals=0 sign=true}}" data-dtype="number"
-            {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+            value="{{numberFormat system.niveau_archetype decimals=0 sign=true}}" data-dtype="number"/>
       <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
       {{#if @root.options.isGM}}
       <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>

templates/actor/dragon-queues.html

@@ -3,13 +3,13 @@
   {{#if queues.length}}Queues de Dragon{{/if}}
   {{#if (and queues.length ombres.length)}} et {{/if}}
   {{#if ombres.length}}Ombres de Thanatos{{/if}}
-  :</h3>
+</h3>
 <ul class="flex-group-left">
   {{#each queues as |queue key|}}
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-item-queue.html" queue=queue key=key}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/dragon-queue.html" queue=queue key=key}}
   {{/each}}
   {{#each ombres as |ombre key|}}
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-item-queue.html" queue=ombre key=key}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/dragon-queue.html" queue=ombre key=key}}
   {{/each}}
 </ul>
 {{/if}}

templates/actor/dragon-souffles.html

@@ -0,0 +1,14 @@
+{{#if souffles.length}}
+<h3>Souffles</h3>
+<ul class="item-list">
+  {{#each souffles as |souffle key|}}
+  <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}">
+    <img class="sheet-competence-img" src="{{souffle.img}}" />
+    <span class="display-label flex-grow"><a>{{souffle.name}}</a></span>
+    <div class="item-controls flex-shrink">
+      <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}

templates/actor/dragon-tetes.html

@@ -0,0 +1,14 @@
+{{#if tetes.length}}
+<h3>Tetes</h3>
+<ul class="item-list">
+  {{#each tetes as |tete key|}}
+  <li class="item flexrow" data-attribute={{key}} data-item-id="{{tete._id}}">
+    <img class="sheet-competence-img" src="{{tete.img}}" />
+    <span class="display-label flex-grow"><a>{{tete.name}}</a></span>
+    <div class="item-controls flex-shrink">
+      <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}

templates/actor/editor-notes-mj.html

@@ -0,0 +1,6 @@
+{{#if options.isGM}}
+<h3>Notes du MJ : </h3>
+<div class="form-group editor">
+  {{editor notesmj target="system.notesmj" button=true owner=owner editable=editable}}
+</div>
+{{/if}}

templates/actor/haut-revant.html

@@ -0,0 +1,35 @@
+{{#if options.isGM}}
+<li class="item flexrow">
+  <span>
+    <a class="chat-card-button forcer-tmr-aleatoire">Ré-insertion aléatoire (ie TMR cachée)</a>
+  </span>
+  <span>
+    <a class="chat-card-button afficher-tmr">Montrer les TMR</a>
+  </span>
+</li>
+{{/if}}
+<li class="item flexrow">
+  <span class="competence-label flex-shrink">Demi rêve :
+  {{#if options.isGM}}
+    {{caseTmr-label system.reve.tmrpos.coord}}
+  </span><span>
+    <input class="competence-value" type="text" name="system.reve.tmrpos.coord" value="{{system.reve.tmrpos.coord}}" data-dtype="String"/>
+  {{else if hautreve.cacheTMR}}
+    {{caseTmr-type system.reve.tmrpos.coord}}
+  </span><span>
+    ??
+  {{else}}
+    {{caseTmr-label system.reve.tmrpos.coord}}
+  </span><span>
+    {{system.reve.tmrpos.coord}}
+  {{/if}}
+  </span> 
+</li>
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/non-haut-revant.html"}}
+<hr>
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/hr-signes-draconiques.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/hr-rencontres.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/hr-sorts.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/hr-sorts-reserve.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/hr-meditations.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/hr-casestmr.html"}}

templates/actor/hr-casestmr.html

@@ -0,0 +1,15 @@
+{{#if casestmr.length}}
+  <h3>Effets sur les cases des TMR</h3>
+  <ul class="item-list alterne-list">
+    {{#each casestmr as |casetmr key|}}
+    <li class="item list-item flexrow" data-item-id="{{casetmr.id}}" data-attribute="{{key}}">
+      <img class="sheet-competence-img" src="{{casetmr.img}}" />
+      <span class="display-label"><a>{{casetmr.name}}</a></span>
+      <span>{{casetmr.system.coord}} - {{caseTmr-label casetmr.system.coord}}</span> 
+      <div class="item-controls flex-shrink">
+        <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+      </div>
+    </li>
+    {{/each}}
+  </ul>
+{{/if}}

templates/actor/hr-meditations.html

@@ -0,0 +1,15 @@
+{{#if meditations.length}}
+<h3>Méditations</h3>
+<ul class="item-list">
+  {{#each meditations as |meditation key|}}
+  <li class="item flexrow" data-item-id="{{meditation._id}}" data-attribute="{{key}}">
+    <img class="sheet-competence-img" src="{{meditation.img}}" />
+    <span class="meditation-label flex-grow"><a data-item-id="{{meditation._id}}">{{meditation.name}} - {{meditation.system.competence}}</a></span> 
+    <div class="item-controls flex-shrink">
+      <a class="item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}

templates/actor/hr-rencontres.html

@@ -0,0 +1,17 @@
+{{#if hautreve.rencontres.length}}
+<h3>Rencontres en attente dans les TMR</h3>
+<ul class="item-list">
+  {{#each hautreve.rencontres as |rencontre key|}}
+  <li class="item flexrow" data-item-id="{{key}}" data-attribute="{{key}}">
+    <span class="display-label"><a data-item-id="{{key}}">{{rencontre.name}} r{{rencontre.force}}</a></span> 
+    <span class="flex-shrink">{{rencontre.coord}} - {{caseTmr-label rencontre.coord}}</span> 
+    {{#if rencontre.date}}
+    <span>{{upperFirst rencontre.heure}}, le {{rencontre.date}}</span> 
+    {{/if}}
+    <div class="item-controls flex-shrink">
+      <a class="rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}

templates/actor/hr-signes-draconiques.html

@@ -0,0 +1,15 @@
+{{#if (and options.isGM signesdraconiques.length)}}
+<h3>Signes draconiques</h3>
+<ul class="item-list alterne-list">
+  {{#each signesdraconiques as |signe key|}}
+    <li class="item list-item flexrow" data-item-id="{{signe._id}}" data-attribute="{{key}}">
+      <img class="sheet-competence-img" src="{{signe.img}}" />
+      <span class="display-label flex-grow"><a>{{signe.name}}</a></span> 
+      <span class="flex-shrink">{{signe.system.difficulte}}</span>
+      <div class="item-controls flex-shrink">
+        <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+      </div>
+    </li>
+  {{/each}}
+</ul>
+{{/if}}

templates/actor/hr-sorts-reserve.html

@@ -0,0 +1,15 @@
+{{#if sortsReserve.length}}
+<h3>Sorts en Réserve</h3>
+<ul class="item-list alterne-list">
+  {{#each sortsReserve as |sort key|}}
+  <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
+    <img class="sheet-competence-img" src="{{sort.img}}" />
+    <span class="display-label"><a>{{#if sort.system.echectotal}}Echec total: {{/if}}{{sort.name}} r{{sort.system.ptreve}}</a></span> 
+    <span>{{sort.system.coord}} - {{caseTmr-label sort.system.coord}}</span> 
+    <div class="item-controls flex-shrink">
+      <a class="item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}

templates/actor/hr-sorts.html

@@ -0,0 +1,19 @@
+{{#if sorts.length}}
+<h3>Sorts</h3>
+<ul class="item-list alterne-list">
+  {{#each sorts as |sort key|}}
+  <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
+    <img class="sheet-competence-img" src="{{sort.img}}" />
+    <span class="display-label flex-grow">
+      <a data-item-id="{{sort._id}}">{{sort.name}}
+        - {{#if sort.system.caseTMRspeciale}}{{sort.system.caseTMRspeciale}}{{else}}{{upperFirst sort.system.caseTMR}}{{/if}}
+      </a>
+    </span> 
+    <span>{{sort.system.draconic}} / {{sort.system.difficulte}}</span>
+    <div class="item-controls flex-shrink">
+      <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}

templates/actor/inventaire-item.html

@@ -1,24 +1,16 @@
 <li class="item flexrow list-item" data-item-id="{{item._id}}" draggable="true">
   <span class="equipement-nom {{#if (eq item.type 'conteneur')}}conteneur-name{{/if}} ">
     {{#if (eq item.type 'conteneur')}}
-      {{#if vide}}
-        <i class="far fa-square"></i>
-      {{else}}
-        <a data-item-id="{{item._id}}">
-        {{#if ouvert}}
-        <i class="far fa-minus-square"></i>
-        {{else}}
-        <i class="far fa-plus-square"></i>
-        {{/if}}
-        </a>
-      {{/if}}
-      <a data-item-id="{{item._id}}">
-        <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
-        <span>{{item.name}}</span>
-      </a>
-    {{else}}
+    <a>
+      <i class="{{~#if vide}}far fa-square
+      {{else if ouvert}}far fa-minus-square
+      {{else}}far fa-plus-square
+      {{/if~}}"></i>
+    {{/if}}
     <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
     <span>{{item.name}}</span>
+    {{#if (eq item.type 'conteneur')}}
+    </a>
     {{/if}}
   </span>
   <span class="equipement-detail">{{item.system.quantite}}

templates/actor/inventaire-monnaie.html

@@ -13,12 +13,6 @@
     <span class="equipement-detail item-controls">
       <a class="monnaie-plus"><i class="fas fa-plus-square"></i></a>
     </span>
-
-    <!-- <span class="equipement-detail">
-      <span class="flex-shrink"><a class="monnaie-moins"><i class="fas fa-minus-square"></i></a></span>
-      <span>{{piece.system.quantite}}</span>
-      <span class="flex-shrink"><a class="monnaie-plus"><i class="fas fa-plus-square"></i></a></span>
-    </span> -->
     <span class="equipement-actions  item-controls">
       <a class="item-edit" title="Editer"><i class="fas fa-edit"></i></a>
       <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>

templates/actor/inventaire.html

@@ -1,4 +1,4 @@
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-monnaie.html" monnaie=monnaie}}
 
 <span class="item-name"><h4>Equipement</h4></span>
 <span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{system.attributs.encombrement.value}} <b>{{calc.surEncombrementMessage}}</b></span> - 
@@ -16,7 +16,7 @@
   {{#each objets as |item id|}}
     {{#unless item.estContenu}}
     {{#if (ne item.type 'conteneur')}}
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html" item=item vide=true ouvert=true }}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-item.html" item=item vide=true ouvert=true }}
     {{/if}}
     {{/unless}}
   {{/each}}

templates/actor/jeux.html

@@ -0,0 +1,13 @@
+{{#if jeux.length}}
+<h3>Jeux :</h3>
+<ul class="item-list alterne-list">
+  {{#each jeux as |jeu id|}}
+  <li class="item flexrow list-item" data-item-id="{{jeu._id}}"><span class="competence-title jeu-label"><a>{{jeu.name}} (base {{jeu.system.base}})</a></span>
+    <div class="item-controls flex-shrink">
+      <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}

templates/actor/liens-vehicules.html

@@ -0,0 +1,33 @@
+{{#if subacteurs.vehicules.length}}
+<ul class="item-list alterne-list">
+  
+  <li class="competence-header flexrow">
+    <span class="item-name"><h4>Véhicules</h4></span>
+    <span></span>
+    <span>Catégorie</span>
+    <span>Résistance</span>
+    <span>Structure</span>
+    <span></span>
+  </li>
+
+  {{#each subacteurs.vehicules as |vehicule id|}}
+  <li class="item flexrow list-item" data-actor-id="{{vehicule.id}}">
+    <span class="subacteur-label">
+      <a>
+        <img class="sheet-competence-img" src="{{vehicule.img}}" title="{{vehicule.name}}"/>
+        {{vehicule.name}}
+      </a>
+    </span>
+    <span>{{vehicule.system.categorie}}</span>
+    <span>{{vehicule.system.etat.resistance.max}}</span>
+    <span>{{vehicule.system.etat.structure.max}}</span>
+    <span>
+      <a class="subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+    </span>
+  </li>
+  {{/each}}
+</ul>
+{{else}}
+<span class="item-name"><h4>Véhicules</h4></span>
+{{/if}}
+

templates/actor/maladies-poisons.html

@@ -0,0 +1,34 @@
+{{#if maladiesPoisons.length}}
+<h3 class="blessures-title">Maladies & Poisons:</h3>
+<ul class="item-list alterne-list">
+  <li class="competence-header flexrow">
+    <span class="competence-title flex-grow competence-label">Nom</span>
+    <span class="competence-title competence-label">Type</span>
+    <span class="competence-title competence-value">Remèdes</span>
+    <span class="competence-title flex-grow competence-value">Edition</span>
+  </li>
+  {{#each maladiesPoisons as |maladie key|}}
+  <li class="item flexrow list-item" data-item-id="{{maladie._id}}">
+      <span class="competence-label">
+        {{#if (or @root.options.isGM maladie.system.identifie)}} 
+          {{maladie.name}}
+        {{else}}
+          Inconnue
+        {{/if}}
+      </span>
+      <span class="competence-label">{{maladie.type}}</span>
+      <span class="competence-label">
+        {{#if (or @root.options.isGM maladie.system.remedesconnus)}} 
+          {{maladie.system.remedes}}
+        {{else}}
+          Remèdes Inconnus
+        {{/if}}
+      </span>
+      <div class="item-controls">
+        <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
+        <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+      </div>          
+  </li>
+  {{/each}}
+  </ul>
+{{/if}}

templates/actor/non-haut-revant.html

@@ -0,0 +1,26 @@
+<ul class="item-list">
+  <li class="item flexrow">
+    <span class="competence-label">Seuil de Rêve :</span>
+    <span>
+    {{#if options.isGM}}
+      <input class="seuil-reve-value" type="text" name="system.reve.seuil.value" value="{{system.reve.seuil.value}}" data-dtype="Number"/>
+    {{else}}
+      {{system.reve.seuil.value}}
+    {{/if}}
+    </span>
+  </li>
+  <li class="item flexrow" >
+    <span class="competence-label">Refoulement : </span>
+    <span>
+    {{#if options.isGM}}
+      <input class="competence-value" type="text" name="system.reve.refoulement.value" value="{{system.reve.refoulement.value}}" data-dtype="Number"/>
+    {{else}}
+      {{system.reve.refoulement.value}}
+    {{/if}}
+    </span>
+  </li>
+</ul>
+<hr>
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/dragon-queues.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/dragon-souffles.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/dragon-tetes.html"}}

templates/actor/oeuvres.html

@@ -0,0 +1,18 @@
+<h3>Oeuvres diverses</h3><a class="creer-une-oeuvre">Créer une oeuvre</a>
+<ul class="item-list alterne-list">
+  {{#each chants as |chant id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html" oeuvre=chant typeOeuvre="Chant" classOeuvre="chant-label"}}
+  {{/each}}
+  {{#each musiques as |musique id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html" oeuvre=musique typeOeuvre="Musique" classOeuvre="musique-label"}}
+  {{/each}}
+  {{#each danses as |danse id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html" oeuvre=danse typeOeuvre="Danse" classOeuvre="danse-label"}}
+  {{/each}}
+  {{#each oeuvres as |oeuvre id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html" oeuvre=oeuvre typeOeuvre=oeuvre.system.competence classOeuvre="oeuvre-label"}}
+  {{/each}}
+  {{#each recettescuisine as |recette id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html" oeuvre=recette typeOeuvre="Recette de cuisine" classOeuvre="recettecuisine-label"}}
+  {{/each}}
+</ul>

templates/actor/possessions.html

@@ -0,0 +1,22 @@
+{{#if possessions.length}}
+{{!-- Possession --}}
+<h3 class="blessures-title">Possession:</h3>
+<ul class="item-list alterne-list">
+  <li class="competence-header flexrow">
+    <span class="competence-title flex-grow competence-label">Nom</span>
+    <span class="competence-title competence-label">Type</span>
+  </li>
+  {{#each possessions as |possession  key|}}
+  <li class="item flexrow list-item" data-item-id="{{possession._id}}">
+      <span class="competence-label">
+        <a class="sheet-possession-attack">{{possession.name}} (Conjurer)</a>
+      </span>
+      <span class="competence-label">{{possession.system.type}}</span>
+      <div class="item-controls">
+        <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
+        <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+      </div>          
+  </li>
+  {{/each}}
+  </ul>
+{{/if}}

templates/actor/taches.html

@@ -0,0 +1,16 @@
+<h3>Tâches</h3><a class='creer-tache'>Créer une nouvelle Tâche</a>
+<ul class="item-list alterne-list">
+  {{#each taches as |tache id|}}
+  <li class="item flexrow list-item" data-item-id="{{tache._id}}">
+    <img class="sheet-competence-img" src="{{tache.img}}" />
+    <span class="competence-title tache-label"><a>{{tache.name}}
+    ({{tache.system.points_de_tache_courant}}{{#if
+       (or @root.options.isGM (not tache.system.cacher_points_de_tache))
+    }}/{{tache.system.points_de_tache}}{{/if}})</a></span>
+    <div class="item-controls flex-shrink">
+      <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>

templates/actor/xp-competences.html

@@ -0,0 +1,23 @@
+<div>
+  <ul class="item-list">
+    <li class="item flexrow">
+      <span class="generic-label">Stress transformé</span>
+      <input class="compteur-edit" type="text" name="experience" value="{{system.compteurs.experience.value}}" data-dtype="number" size="3"/>
+    </li>
+
+    <li class="item flexrow">
+      <span class="generic-label">Total XP compétences</span>
+      <span class="competence-value">{{calc.competenceXPTotal}}</span>
+    </li>
+    {{#if options.vueDetaillee}}
+    <li>Niveaux d'archétype à répartir</li>
+    {{#each calc.comptageArchetype as |archetype key|}}
+    {{#if (lt archetype.nombre archetype.nombreMax)}}
+    <li class="item flexrow">
+      <label class="generic-label">Archetype {{archetype.niveau}} : {{archetype.nombre}} / {{archetype.nombreMax}}</label>
+    </li>
+    {{/if}}
+    {{/each}}
+    {{/if}}
+  </ul>
+</div>

templates/actor/xp-journal.html

@@ -0,0 +1,23 @@
+<h3>Journal d'Experience</h3>
+<div class="form-group editor">
+  <ul class="item-list alterne-list">
+  {{#each system.experiencelog as |xp key|}}
+    <li class="experiencelog flexrow list-item" data-key="{{key}}">
+      <label class="flex-grow">{{xp.valeur}} {{xp.raison}}</label>
+      <label class="flex-shrink">{{xp.mode}}</label>
+      <label class="flex-shrink">{{xp.daterdd}}</label>
+      <label class="flex-shrink">{{xp.datereel}}</label>
+      {{#if @root.options.isGM}}
+      <span>
+        <a class="experiencelog-delete" title="Supprimer">
+          <i class="fas fa-trash"></i>
+        </a>
+        <a class="experiencelog-delete-previous" title="Supprimer jusqu'ici">
+          <i class="fas fa-eraser"></i>
+        </a>
+      </span>
+      {{/if}}
+    </li>
+  {{/each}}
+  </ul>
+</div>

templates/item-recettealchimique-sheet.html

@@ -9,25 +9,25 @@
     <div class="flexcol">
       <span><label class="alchimie-title">Manipulation : </label></span>
       <div class="form-group medium-editor">
-        {{editor system.manipulation_update target="system.manipulation" button=true owner=owner editable=editable}}
+        {{editor manipulation_update target="system.manipulation" button=true owner=owner editable=editable}}
       </div>
     </div>
     <div class="flexcol">
       <span><label class="alchimie-title">Utilisation : </label></span>
       <div class="form-group small-editor">
-        {{editor system.utilisation target="system.utilisation" button=true owner=owner editable=editable}}
+        {{editor utilisation target="system.utilisation" button=true owner=owner editable=editable}}
       </div>
     </div>
     <div class="flexcol">
       <span><label class="alchimie-title">Enchantement : </label></span>
       <div class="form-group small-editor">
-        {{editor system.enchantement target="system.enchantement" button=true owner=owner editable=editable}}
+        {{editor enchantement target="system.enchantement" button=true owner=owner editable=editable}}
       </div>
     </div>
     <div class="flexcol">
       <span><label class="alchimie-title">Sur-effet : </label></span>
       <div class="form-group small-editor">
-        {{editor system.sureffet target="system.sureffet" button=true owner=owner editable=editable}}
+        {{editor sureffet target="system.sureffet" button=true owner=owner editable=editable}}
       </div>
     </div>
 

templates/item-recettecuisine-sheet.html

@@ -25,7 +25,7 @@
     <div class="flexcol">
       <span><label>Ingrédients : </label></span>
       <div class="form-group editor">
-        {{editor system.ingredients target="system.ingredients" button=true owner=owner editable=editable}}
+        {{editor ingredients target="system.ingredients" button=true owner=owner editable=editable}}
       </div>
     </div>
 

templates/item-sheet.html

@@ -25,7 +25,7 @@
 
         {{!-- Description Tab --}}
         <div class="tab" data-group="primary" data-tab="description">
-            {{editor system.description target="system.description" button=true owner=owner editable=editable}}
+            {{editor description target="system.description" button=true owner=owner editable=editable}}
         </div>
 
         {{!-- Attributes Tab --}}

templates/partial-item-description.html

@@ -1,14 +1,14 @@
 <div class="flexcol">
   <span><label>Description : </label></span>
   <div class="form-group editor">
-    {{editor system.description target="system.description" button=true owner=owner editable=editable}}
+    {{editor description target="system.description" button=true owner=owner editable=editable}}
   </div>
 </div>
 {{#if isGM}}
 <div class="flexcol">
   <span><label>Description (MJ seulement): </label></span>
   <div class="form-group editor">
-    {{editor system.descriptionmj target="system.descriptionmj" button=true owner=owner editable=editable}}
+    {{editor descriptionmj target="system.descriptionmj" button=true owner=owner editable=editable}}
   </div>
 </div>
 {{/if}}