Merge pull request 'Corrections v10' (#550) from VincentVk/foundryvtt-reve-de-dragon:v10 into v10

Reviewed-on: #550

module/actor-creature-sheet.js

@@ -27,8 +27,8 @@ export class RdDActorCreatureSheet extends RdDActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    let formData = await super.getData();
+    let formData = await super.getData()
-    console.log("Creature : ", formData);
+    //console.log("Creature : ", formData, formData.system)
     formData.calc = {
       caracTotal: RdDCarac.computeTotal(formData.data.carac),
       resumeBlessures: this.actor.computeResumeBlessure(formData.data.blessures),

module/actor-entite-sheet.js

@@ -22,17 +22,10 @@ export class RdDActorEntiteSheet extends ActorSheet {
     });
   }
 
-  /* -------------------------------------------- */  
-  _checkNull(items) {
-    if (items && items.length) {
-      return items;
-    }
-    return [];
-  }
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = Misc.data(this.object);
+    const objectData = this.object;
     let formData = {
       title: this.title,
       id: objectData.id,
@@ -42,13 +35,13 @@ export class RdDActorEntiteSheet extends ActorSheet {
       //   actor: this.object,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      data: foundry.utils.deepClone(Misc.templateData(this.object)),
+      data: foundry.utils.deepClone(this.actor.system),
-      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
+      effects: this.object.effects.map(e => foundry.utils.deepClone(e)),
       //   items: items,
       limited: this.object.limited,
       options: this.options,
       owner: this.document.isOwner,
-      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i.data))),
+      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i))),
     };
     
     formData.options.isGM = game.user.isGM;

module/actor-sheet.js

@@ -36,33 +36,31 @@ export class RdDActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = Misc.data(this.object);
+    const objectData = this.object.system
-
+    this.timerRecherche = undefined;
-    //this.actor.checkMonnaiePresence(this.actor.data.items); // Always check 
+    
-
     let formData = {
       title: this.title,
-      id: objectData.id,
+      id: this.object.id,
-      type: objectData.type,
+      type: this.object.type,
-      img: objectData.img,
+      img: this.object.img,
-      name: objectData.name,
+      name: this.object.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      data: foundry.utils.deepClone(Misc.templateData(this.object)),
+      data: foundry.utils.deepClone(this.actor.system),
-      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
+      effects: this.object.effects.map(e => foundry.utils.deepClone(e)),
       limited: this.object.limited,
       options: this.options,
       owner: this.document.isOwner,
-      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i.data))),
+      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i))),
-    };
+    }
-
+    RdDUtility.filterItemsPerTypeForSheet(formData)
-    RdDUtility.filterItemsPerTypeForSheet(formData);
+  
-
     formData.options.isGM = game.user.isGM;
 
     if (formData.type == 'creature') return formData; // Shortcut
 
-    formData.competenceByCategory = Misc.classify(formData.competences, it => it.data.categorie);
+    formData.competenceByCategory = Misc.classify(formData.competences, it => it.system.categorie)
 
     formData.calc = {
       comptageArchetype: RdDItemCompetence.computeResumeArchetype(formData.competences),
@@ -78,12 +76,11 @@ export class RdDActorSheet extends ActorSheet {
     };
 
     formData.competences.forEach(item => {
-      item.visible = this.options.cherchercompetence
+      item.system.isVisible = this.options.recherche
-        ? RdDItemCompetence.nomContientTexte(item, this.options.cherchercompetence)
+        ? RdDItemCompetence.nomContientTexte(item, this.options.recherche.text)
         : (!this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(item));
       RdDItemCompetence.levelUp(item, formData.data.compteurs.experience.value);
     });
-
     Object.values(formData.data.carac).forEach(c => {
       RdDCarac.levelUp(c);
     });
@@ -93,8 +90,8 @@ export class RdDActorSheet extends ActorSheet {
     formData.combat = duplicate(formData.armes ?? []);
     RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
     RdDItemArme.ajoutCorpsACorps(formData.combat, formData.competences, formData.data.carac);
-    formData.esquives = this.actor.getCompetences("Esquive").map(i => foundry.utils.deepClone(i.data));
+    formData.esquives = this.actor.getCompetences("Esquive");
-    formData.combat = RdDCombatManager.finalizeArmeList(formData.combat, formData.competences, formData.data.carac);
+    formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.data.carac);
 
     this.armesList = formData.combat;
 
@@ -118,7 +115,7 @@ export class RdDActorSheet extends ActorSheet {
       montures: this.actor.listeMontures(),
       suivants: this.actor.listeSuivants()
     }
-    if (this.actor.getBestDraconic().data.niveau > -11 && !this.actor.isHautRevant()) {
+    if (this.actor.getBestDraconic().system.niveau > -11 && !this.actor.isHautRevant()) {
       ui.notifications.error(`${this.actor.name} a des compétences draconiques, mais pas le don de Haut-Rêve!
         <br>Ajoutez-lui la tête "Don de Haut-Rêve" pour lui permettre d'utiliser ses compétences et d'accéder aux terres médianes du rêve`);
     }
@@ -131,16 +128,16 @@ export class RdDActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async _onDropActor(event, dragData) {
-    console.log("_onDropActor", this.actor.id, dragData);
+    const dropActor = fromUuidSync(dragData.uuid);
-    this.actor.addSubActeur(dragData.id || dragData.data._id);
+    this.actor.addSubActeur(dropActor);
     super._onDropActor(event, dragData);
   }
 
   /* -------------------------------------------- */
   async _onDropItem(event, dragData) {
-    const destItemId = $(event.target)?.closest('.item').attr('data-item-id');
+    const destItemId = $(event.target)?.closest('.item').attr('data-item-id')
-    const dropParams = RdDSheetUtility.prepareItemDropParameters(destItemId, this.actor.id, dragData, this.objetVersConteneur);
+    const dropParams = RdDSheetUtility.prepareItemDropParameters(destItemId, this.actor.id, dragData, this.objetVersConteneur)
-    const callSuper = await this.actor.processDropItem(dropParams);
+    const callSuper = await this.actor.processDropItem(dropParams)
     if (callSuper) {
       await super._onDropItem(event, dragData)
     }
@@ -315,7 +312,7 @@ export class RdDActorSheet extends ActorSheet {
 
     // Boutons spéciaux MJs
     html.find('.forcer-tmr-aleatoire').click(async event => {
-      this.actor.cacheTMRetMessage();
+      this.actor.reinsertionAleatoire("Action MJ");
     });
     html.find('.afficher-tmr').click(async event => {
       this.actor.afficheTMRetMessage();
@@ -335,8 +332,8 @@ export class RdDActorSheet extends ActorSheet {
     html.find('.arme-initiative a').click(async event => {
       let combatant = game.combat.data.combatants.find(c => c.actor.data._id == this.actor.data._id);
       if (combatant) {
-        let arme = this._getEventArmeCombat(event);
+        let action = this._getEventArmeCombat(event);
-        RdDCombatManager.rollInitiativeCompetence(combatant._id, arme);
+        RdDCombatManager.rollInitiativeAction(combatant._id, action);
       } else {
         ui.notifications.info("Impossible de lancer l'initiative sans être dans un combat.");
       }
@@ -385,12 +382,10 @@ export class RdDActorSheet extends ActorSheet {
       // On carac change
       html.find('.carac-value').change(async event => {
         let caracName = event.currentTarget.name.replace(".value", "").replace("data.carac.", "");
-        //console.log("Value changed :", event, caracName);
         this.actor.updateCarac(caracName, parseInt(event.target.value));
       });
-      html.find('.carac-xp').change(async event => {
+      html.find('input.carac-xp').change(async event => {
         let caracName = event.currentTarget.name.replace(".xp", "").replace("data.carac.", "");
-        //console.log("Value changed :", event, caracName);
         this.actor.updateCaracXP(caracName, parseInt(event.target.value));
       });
       // On competence change
@@ -400,12 +395,12 @@ export class RdDActorSheet extends ActorSheet {
         this.actor.updateCompetence(compName, parseInt(event.target.value));
       });
       // On competence xp change
-      html.find('.competence-xp').change(async event => {
+      html.find('input.competence-xp').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
         this.actor.updateCompetenceXP(compName, parseInt(event.target.value));
       });
       // On competence xp change
-      html.find('.competence-xp-sort').change(async event => {
+      html.find('input.competence-xp-sort').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
         this.actor.updateCompetenceXPSort(compName, parseInt(event.target.value));
       });
@@ -424,12 +419,31 @@ export class RdDActorSheet extends ActorSheet {
       this.options.editCaracComp = !this.options.editCaracComp;
       this.render(true);
     });
-    html.find('.cherchercompetence').change(async event => {
+
-      this.options.cherchercompetence = event.currentTarget.value;
+    html.find('.recherche')
-      this.render(true);
+      .each((index, field) => {
-    });
+        if (this.options.recherche) {
+          field.focus();
+          field.setSelectionRange(this.options.recherche.start, this.options.recherche.end);
+        }
+      })
+      .keyup(async event => {
+        const nouvelleRecherche = this._optionRecherche(event.currentTarget);
+        if (this.options.recherche?.text != nouvelleRecherche?.text){
+          this.options.recherche = nouvelleRecherche;
+          if (this.timerRecherche) {
+            clearTimeout(this.timerRecherche);
+          }
+          this.timerRecherche = setTimeout(() => {
+            this.timerRecherche = undefined;
+            this.render(true);
+          }, 500);
+        }
+      })
+      .change(async event =>
+        this.options.recherche = this._optionRecherche(event.currentTarget)
+      );
     html.find('.vue-detaillee').click(async event => {
-      console.log("CONTROLS", this.options.vueDetaillee)
       this.options.vueDetaillee = !this.options.vueDetaillee;
       this.render(true);
     });
@@ -515,13 +529,24 @@ export class RdDActorSheet extends ActorSheet {
     });
   }
 
+  _optionRecherche(target) {
+    if (!target.value?.length){
+      return undefined;
+    }
+    return {
+      text: target.value,
+      start: target.selectionStart,
+      end: target.selectionEnd,
+    };
+  }
+
   _getEventArmeCombat(event) {
     const li = $(event.currentTarget)?.parents(".item");
     let armeName = li.data("arme-name");
     let compName = li.data('competence-name');
-    const arme = this.armesList.find(a => a.name == armeName && a.data.competence == compName);
+    const arme = this.armesList.find(a => a.name == armeName && a.system.competence == compName);
     if (!arme) {
-      return { name: armeName, data: { competence: compName } };
+      return { name: armeName, system: { competence: compName } };
     }
     return arme;
   }
@@ -552,9 +577,9 @@ export class RdDActorSheet extends ActorSheet {
   }
 
   async _onSplitItem(item, split) {
-    if (split >= 1 && split < Misc.data(item).data.quantite) {
+    if (split >= 1 && split < item.system.quantite) {
       await item.diminuerQuantite(split);
-      const itemData = duplicate(Misc.data(item));
+      const itemData = duplicate(item.system);
       itemData.data.quantite = split;
       await this.actor.createEmbeddedDocuments('Item', [itemData])
     }

module/actor-vehicule-sheet.js

@@ -25,17 +25,9 @@ export class RdDActorVehiculeSheet extends ActorSheet {
     });
   }
 
-  /* -------------------------------------------- */
-  _checkNull(items) {
-    if (items && items.length) {
-      return items;
-    }
-    return [];
-  }
-
   /* -------------------------------------------- */
   async getData() {
-    const objectData = Misc.data(this.object);
+    const objectData = this.object
     let formData = {
       title: this.title,
       id: objectData.id,
@@ -44,12 +36,12 @@ export class RdDActorVehiculeSheet extends ActorSheet {
       name: objectData.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      data: foundry.utils.deepClone(Misc.templateData(this.object)),
+      data: foundry.utils.deepClone(this.object.system),
-      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
+      effects: this.object.effects.map(e => foundry.utils.deepClone(e)),
       limited: this.object.limited,
       options: this.options,
       owner: this.document.isOwner,
-      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i.data))),
+      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i))),
     };
 
     RdDUtility.filterItemsPerTypeForSheet(formData);
@@ -90,7 +82,7 @@ export class RdDActorVehiculeSheet extends ActorSheet {
   async monnaieIncDec(id, value) {
     let monnaie = this.getMonnaie(id);
     if (monnaie) {
-      const quantite = Math.max(0, Misc.templateData(monnaie).quantite + value);
+      const quantite = Math.max(0, monnaie.system.quantite + value);
       await this.updateEmbeddedDocuments('Item', [{ _id: monnaie.id, 'data.quantite': quantite }]);
     }
   }

module/chat-utility.js

@@ -58,7 +58,7 @@ export class ChatUtility {
   static onRemoveMessages(data) {
     if (Misc.isUniqueConnectedGM()) {
       if (data.part) {
-        const toDelete = game.messages.filter(it => it.data.content.includes(data.part));
+        const toDelete = game.messages.filter(it => it.content.includes(data.part));
         toDelete.forEach(it => it.delete());
       }
       if (data.messageId) {
@@ -141,7 +141,7 @@ export class ChatUtility {
 
   /* -------------------------------------------- */
   static getUsers(filter) {
-    return Misc.getUsers().filter(filter).map(user => user.data._id);
+    return Misc.getUsers().filter(filter).map(user => user.id);
   }
 
   /* -------------------------------------------- */

module/constants.js

@@ -3,3 +3,7 @@ export const SYSTEM_SOCKET_ID = 'system.foundryvtt-reve-de-dragon';
 
 export const HIDE_DICE = 'hide';
 export const SHOW_DICE = 'show';
+
+export const ENTITE_INCARNE = 'incarne';
+export const ENTITE_NONINCARNE = 'nonincarne';
+export const ENTITE_BLURETTE = 'blurette';

module/dialog-create-signedraconique.js

@@ -12,7 +12,7 @@ export class DialogCreateSigneDraconique extends Dialog {
       signe: signe,
       tmrs: TMRUtility.listSelectedTMR(signe.data.typesTMR ?? []),
       actors: game.actors.filter(actor => actor.isHautRevant()).map(actor => {
-        let actorData = duplicate(Misc.data(actor));
+        let actorData = duplicate(actor);
         actorData.selected = actor.hasPlayerOwner;
         return actorData;
       })
@@ -48,10 +48,10 @@ export class DialogCreateSigneDraconique extends Dialog {
   async _createSigneForActor(actor, signe) {
     actor.createEmbeddedDocuments("Item", [signe]);
     ChatMessage.create({
-      whisper: ChatUtility.getWhisperRecipientsAndGMs(Misc.data(actor).name),
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(actor.name),
       content: await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/chat-signe-draconique-actor.html", {
         signe: signe,
-        alias: Misc.data(actor).name
+        alias: actor.name
       })
     });
   }

module/dialog-fabriquer-potion.js

@@ -9,7 +9,7 @@ export class DialogFabriquerPotion extends Dialog {
     let potionData = DialogFabriquerPotion.prepareData(actor, item);
 
     let conf = {
-      title: `Fabriquer une potion de ${potionData.data.categorie}`,
+      title: `Fabriquer une potion de ${potionData.system.categorie}`,
       content: await renderTemplate(dialogConfig.html, potionData),
       default: potionData.buttonName,
     };
@@ -24,9 +24,9 @@ export class DialogFabriquerPotion extends Dialog {
 
   /* -------------------------------------------- */
   static prepareData(actor, item) {
-    let potionData = duplicate(Misc.data(item));
+    let potionData = duplicate(item)
-    potionData.nbBrinsSelect = RdDUtility.buildListOptions(1, potionData.data.quantite);
+    potionData.nbBrinsSelect = RdDUtility.buildListOptions(1, potionData.system.quantite);
-    potionData.nbBrins = Math.min(potionData.data.quantite, DialogFabriquerPotion.getNombreBrinOptimal(potionData));
+    potionData.nbBrins = Math.min(potionData.system.quantite, DialogFabriquerPotion.getNombreBrinOptimal(potionData));
     potionData.buttonName = "Fabriquer";
     return potionData;
   }
@@ -46,9 +46,9 @@ export class DialogFabriquerPotion extends Dialog {
   }
 
   static getNombreBrinOptimal(herbeData) {
-    switch (herbeData.data.categorie ?? '') {
+    switch (herbeData.system.categorie ?? '') {
-      case "Soin": return 12 - herbeData.data.niveau;
+      case "Soin": return 12 - herbeData.system.niveau;
-      case "Repos": return 7 - herbeData.data.niveau;
+      case "Repos": return 7 - herbeData.system.niveau;
     }
     return 1;
   }

module/dialog-item-achat.js

@@ -55,12 +55,12 @@ export class DialogItemAchat extends Dialog {
 
   static prepareVenteData(buttonAcheter, vendeurId, vendeur, acheteur) {
     const jsondata = buttonAcheter.attributes['data-jsondata']?.value;
-    const prixLot = buttonAcheter.attributes['data-prixLot']?.value ?? 0;
+    const prixLot = parseInt(buttonAcheter.attributes['data-prixLot']?.value ?? 0);
     let venteData = {
       item: JSON.parse(jsondata),
       vendeurId: vendeurId,
-      vendeur: Misc.data(vendeur),
+      vendeur: vendeur,
-      acheteur: Misc.data(acheteur),
+      acheteur:acheteur,
       tailleLot: parseInt(buttonAcheter.attributes['data-tailleLot']?.value ?? 1),
       quantiteIllimite: buttonAcheter.attributes['data-quantiteIllimite']?.value == 'true',
       quantiteNbLots: parseInt(buttonAcheter.attributes['data-quantiteNbLots']?.value),

module/dialog-item-consommer.js

@@ -38,10 +38,10 @@ export class DialogConsommer extends Dialog {
 
   /* -------------------------------------------- */
   static prepareData(actor, item) {
-    const itemData = duplicate(Misc.data(item));
+    const itemData = duplicate(item);
     let consommerData = {
       item: itemData,
-      cuisine: Misc.data(actor.getCompetence('cuisine')),
+      cuisine: actor.getCompetence('cuisine'),
       choix: {
         doses: 1,
         seForcer: false,

module/dialog-item-vente.js

@@ -4,15 +4,15 @@ import { Misc } from "./misc.js";
 export class DialogItemVente extends Dialog {
 
   static async create(item, callback) {
-    const itemData = Misc.data(item);
+    const itemData = item
-    const quantite = item.isConteneur() ? 1 : itemData.data.quantite;
+    const quantite = item.isConteneur() ? 1 : itemData.system.quantite;
     const venteData = {
       item: itemData,
       alias: item.actor?.name ?? game.user.name,
       vendeurId: item.actor?.id,
-      prixOrigine: itemData.data.cout,
+      prixOrigine: itemData.system.cout,
-      prixUnitaire: itemData.data.cout,
+      prixUnitaire: itemData.system.cout,
-      prixLot: itemData.data.cout,
+      prixLot: itemData.system.cout,
       tailleLot: 1,
       quantiteNbLots: quantite,
       quantiteMaxLots: quantite,

module/dialog-repos.js

@@ -3,7 +3,7 @@ import { Misc } from "./misc.js";
 export class DialogRepos extends Dialog {
 
   static async create(actor) {
-    let actorData = Misc.data(actor)
+    let actorData = actor
     const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-repos.html", actorData);
     new DialogRepos(html, actor).render(true);
   }

module/dialog-split-item.js

@@ -3,10 +3,10 @@ import { Misc } from "./misc.js";
 export class DialogSplitItem extends Dialog {
 
   static async create(item, callback) {
-    const itemData = Misc.data(item);
+    const itemData = item
     const splitData = {
       item: itemData,
-      choix: { quantite: 1, max: itemData.data.quantite - 1 }
+      choix: { quantite: 1, max: itemData.system.quantite - 1 }
     };
     const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-split.html`, splitData);
     return new DialogSplitItem(item, splitData, html, callback)

module/dialog-stress.js

@@ -9,7 +9,7 @@ export class DialogStress extends Dialog {
       immediat: false,
       actors: game.actors.filter(actor => actor.hasPlayerOwner && actor.isPersonnage())
         .map(actor => {
-          let actorData = duplicate(Misc.data(actor));
+          let actorData = duplicate(actor);
           actorData.selected = actor.hasPlayerOwner;
           return actorData;
         })

module/item-arme.js

@@ -20,35 +20,35 @@ const nomCategorieParade = {
 export class RdDItemArme extends Item {
 
   static isArme(itemData) {
-    itemData = Misc.data(itemData);
+    itemData = itemData
-    return (itemData.type == 'competencecreature' && itemData.data.iscombat) || itemData.type == 'arme';
+    return (itemData.type == 'competencecreature' && itemData.system.iscombat) || itemData.type == 'arme';
   }
 
   /* -------------------------------------------- */
   static getArmeData(armeData) {
-    armeData = Misc.data(armeData);
+    armeData = armeData
     switch (armeData ? armeData.type : '') {
       case 'arme': return armeData;
       case 'competencecreature':
-        return RdDItemCompetenceCreature.toArme(armeData);
+        return RdDItemCompetenceCreature.toActionArme(armeData);
     }
     return RdDItemArme.mainsNues();
   }
 
   static computeNiveauArmes(armes, competences) {
     for (const arme of armes) {
-      arme.data.niveau = RdDItemArme.niveauCompetenceArme(arme, competences);
+      arme.system.niveau = RdDItemArme.niveauCompetenceArme(arme, competences);
     }
   }
 
   static niveauCompetenceArme(arme, competences) {
-    const compArme = competences.find(it => it.name == arme.data.competence);
+    const compArme = competences.find(it => it.name == arme.system.competence);
-    return compArme?.data.niveau ?? -8;
+    return compArme?.system.niveau ?? -8;
   }
 
   /* -------------------------------------------- */
   static getNomCategorieParade(arme) {
-    const categorie = arme?.data ? RdDItemArme.getCategorieParade(arme) : arme;
+    const categorie = arme?.system ? RdDItemArme.getCategorieParade(arme) : arme;
     return nomCategorieParade[categorie];
   }
 
@@ -66,21 +66,20 @@ export class RdDItemArme extends Item {
 
   /* -------------------------------------------- */
   static getCategorieParade(armeData) {
-    armeData = Misc.data(armeData);
+    if (armeData.system.categorie_parade) {
-    if (armeData.data.categorie_parade) {
+      return armeData.system.categorie_parade;
-      return armeData.data.categorie_parade;
     }
     // pour compatibilité avec des personnages existants
-    if (armeData.type == 'competencecreature' || armeData.data.categorie == 'creature') {
+    if (armeData.type == 'competencecreature' || armeData.system.categorie == 'creature') {
-      return armeData.data.categorie_parade || (armeData.data.isparade ? 'armes-naturelles' : '');
+      return armeData.system.categorie_parade || (armeData.system.isparade ? 'armes-naturelles' : '');
     }
     if (!armeData.type.match(/arme|competencecreature/)) {
       return '';
     }
-    if (armeData.data.competence == undefined) {
+    if (armeData.system.competence == undefined) {
       return 'competencecreature';
     }
-    let compname = armeData.data.competence.toLowerCase();
+    let compname = armeData.system.competence.toLowerCase();
     if (compname.match(/^(dague de jet|javelot|fouet|arc|arbalête|fronde|hache de jet|fléau)$/)) return '';
 
     if (compname.match('hache')) return 'haches';
@@ -137,22 +136,21 @@ export class RdDItemArme extends Item {
 
   /* -------------------------------------------- */
   static armeUneOuDeuxMains(armeData, aUneMain) {
-    armeData = Misc.data(armeData);
+    if (armeData && !armeData.system.cac) {
-    if (armeData && !armeData.data.cac) {
+      armeData.system.unemain = armeData.system.unemain || !armeData.system.deuxmains;
-      armeData.data.unemain = armeData.data.unemain || !armeData.data.deuxmains;
+      const uneOuDeuxMains = armeData.system.unemain && armeData.system.deuxmains;
-      const uneOuDeuxMains = armeData.data.unemain && armeData.data.deuxmains;
+      const containsSlash = !Number.isInteger(armeData.system.dommages) && armeData.system.dommages.includes("/");
-      const containsSlash = !Number.isInteger(armeData.data.dommages) && armeData.data.dommages.includes("/");
       if (containsSlash) { // Sanity check
         armeData = duplicate(armeData);
 
-        const tableauDegats = armeData.data.dommages.split("/");
+        const tableauDegats = armeData.system.dommages.split("/");
         if (aUneMain)
-          armeData.data.dommagesReels = Number(tableauDegats[0]);
+          armeData.system.dommagesReels = Number(tableauDegats[0]);
         else // 2 mains
-          armeData.data.dommagesReels = Number(tableauDegats[1]);
+          armeData.system.dommagesReels = Number(tableauDegats[1]);
       }
       else {
-        armeData.data.dommagesReels = Number(armeData.data.dommages);
+        armeData.system.dommagesReels = Number(armeData.system.dommages);
       }
 
       if (uneOuDeuxMains != containsSlash) {
@@ -163,14 +161,13 @@ export class RdDItemArme extends Item {
   }
 
   static isArmeUtilisable(itemData) {
-    itemData = Misc.data(itemData);
+    return itemData.type == 'arme' && itemData.system.equipe && (itemData.system.resistance > 0 || itemData.system.portee_courte > 0);
-    return itemData.type == 'arme' && itemData.data.equipe && (itemData.data.resistance > 0 || itemData.data.portee_courte > 0);
   }
 
   static ajoutCorpsACorps(armes, competences, carac) {
-    let corpsACorps = competences.find(it => it.name == 'Corps à corps') ?? { data: { niveau: -6 } };
+    let corpsACorps = competences.find(it => it.name == 'Corps à corps') ?? { system: { niveau: -6 } };
-    let init = RdDCombatManager.calculInitiative(corpsACorps.data.niveau, carac['melee'].value);
+    let init = RdDCombatManager.calculInitiative(corpsACorps.system.niveau, carac['melee'].value);
-    armes.push(RdDItemArme.mainsNues({ niveau: corpsACorps.data.niveau, initiative: init }));
+    armes.push(RdDItemArme.mainsNues({ niveau: corpsACorps.system.niveau, initiative: init }));
     //armes.push(RdDItemArme.empoignade({ niveau: corpsACorps.data.niveau, initiative: init }));
   }
 
@@ -178,7 +175,7 @@ export class RdDItemArme extends Item {
     const corpsACorps = {
       name: 'Corps à corps',
       img: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp',
-      data: {
+      system: {
         equipe: true,
         rapide: true,
         force: 0,
@@ -189,24 +186,24 @@ export class RdDItemArme extends Item {
         categorie_parade: 'sans-armes'
       }
     };
-    mergeObject(corpsACorps.data, actorData ??{}, { overwrite: false });
+    mergeObject(corpsACorps.system, actorData ?? {}, { overwrite: false });
     return corpsACorps;
   }
 
   static mainsNues(actorData) {
-    const mainsNues = RdDItemArme.corpsACorps(actorData);
+    const mainsNues = RdDItemArme.corpsACorps(actorData)
-    mainsNues.name = 'Mains nues';
+    mainsNues.name = 'Mains nues'
-    mainsNues.data.cac = 'pugilat';
+    mainsNues.system.cac = 'pugilat'
-    mainsNues.data.baseInit = 4;
+    mainsNues.system.baseInit = 4
     return mainsNues;
   }
   
   static empoignade(actorData) {
-    const empoignade = RdDItemArme.corpsACorps(actorData);
+    const empoignade = RdDItemArme.corpsACorps(actorData)
-    empoignade.name = 'Empoignade';
+    empoignade.name = 'Empoignade'
-    empoignade.data.cac = 'empoignade';
+    empoignade.system.cac = 'empoignade'
-    empoignade.data.baseInit = 3;
+    empoignade.system.baseInit = 3
-    empoignade.data.mortalite = 'empoignade';
+    empoignade.system.mortalite = 'empoignade'
-    return empoignade;
+    return empoignade
   }
 }

module/item-competence.js

@@ -76,10 +76,10 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static getCategorie(competence) {
-    return Misc.data(competence)?.data.categorie;
+    return competence?.system.categorie;
   }
   static isDraconic(competence) {
-    return Misc.data(competence)?.data.categorie == 'draconic';
+    return competence?.system.categorie == 'draconic';
   }
 
   /* -------------------------------------------- */
@@ -89,9 +89,9 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static isCompetenceArme(competence) {
-    switch (Misc.templateData(competence).categorie) {
+    switch (competence.system.categorie) {
       case 'melee':
-        return Misc.data(competence).name != 'Esquive';
+        return competence.name != 'Esquive';
       case 'tir':
       case 'lancer':
         return true;
@@ -101,15 +101,15 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static isArmeUneMain(competence) {
-    return Misc.data(competence)?.name.toLowerCase().includes("1 main");
+    return competence.name.toLowerCase().includes("1 main");
   }
   static isArme2Main(competence) {
-    return Misc.data(competence)?.name.toLowerCase().includes("2 main");
+    return competence.name.toLowerCase().includes("2 main");
   }
 
   /* -------------------------------------------- */
   static isMalusEncombrementTotal(competence) {
-    return Misc.data(competence)?.name.toLowerCase().match(/(natation|acrobatie)/);
+    return competence?.name.toLowerCase().match(/(natation|acrobatie)/) || 0;
   }
 
   /* -------------------------------------------- */
@@ -133,11 +133,10 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static computeXP(competence) {
-    const itemData = Misc.data(competence);
+    const factor = competence.name.includes('Thanatos') ? 2 : 1; // Thanatos compte double !
-    const factor = itemData.name.includes('Thanatos') ? 2 : 1; // Thanatos compte double !
+    const xpNiveau = RdDItemCompetence.computeDeltaXP(competence.system.base, competence.system.niveau ?? competence.system.base);
-    const xpNiveau = RdDItemCompetence.computeDeltaXP(itemData.data.base, itemData.data.niveau ?? itemData.data.base);
+    const xp = competence.system.xp ?? 0;
-    const xp = itemData.data.xp ?? 0;
+    const xpSort = competence.system.xp_sort ?? 0;
-    const xpSort = itemData.data.xp_sort ?? 0;
     return factor * (xpNiveau + xp) + xpSort;
   }
 
@@ -146,7 +145,7 @@ export class RdDItemCompetence extends Item {
     return competenceTroncs.map(
       list => list.map(name => RdDItemCompetence.findCompetence(competences, name))
         // calcul du coût xp jusqu'au niveau 0 maximum
-        .map(it => RdDItemCompetence.computeDeltaXP(it?.data.base ?? -11, Math.min(it?.data.niveau ?? -11, 0)))
+        .map(it => RdDItemCompetence.computeDeltaXP(it?.system.base ?? -11, Math.min(it?.system.niveau ?? -11, 0)))
         .sort(Misc.ascending())
         .splice(0, list.length - 1) // prendre toutes les valeurs sauf l'une des plus élevées
         .reduce(Misc.sum(), 0)
@@ -162,11 +161,10 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static computeCompetenceXPCost(competence) {
-    const compData = Misc.data(competence);
+    let xp = RdDItemCompetence.getDeltaXp(competence.system.base, competence.system.niveau ?? competence.system.base);
-    let xp = RdDItemCompetence.getDeltaXp(compData.data.base, compData.data.niveau ?? compData.data.base);
+    xp += competence.system.xp ?? 0;
-    xp += compData.data.xp ?? 0;
     if (compData.name.includes('Thanatos')) xp *= 2; /// Thanatos compte double !
-    xp += compData.data.xp_sort ?? 0;
+    xp += competence.system.xp_sort ?? 0;
     return xp;
   }
 
@@ -175,24 +173,24 @@ export class RdDItemCompetence extends Item {
     let economie = 0;
     for (let troncList of competenceTroncs) {
       let list = troncList.map(name => RdDItemCompetence.findCompetence(competences, name))
-        .sort(Misc.descending(c => Misc.templateData(c).niveau)); // tri du plus haut au plus bas
+        .sort(Misc.descending(c => this.system.niveau)); // tri du plus haut au plus bas
       list.splice(0, 1); // ignorer la plus élevée
-      list.map(c => Misc.templateData(c)).forEach(tplData => {
+      list.map(c => c).forEach(c => {
-        economie += RdDItemCompetence.getDeltaXp(tplData.base, Math.min(tplData.niveau, 0));
+        economie += RdDItemCompetence.getDeltaXp(c.system.base, Math.min(c.system.niveau, 0))
       });
     }
     return economie;
   }
 
   /* -------------------------------------------- */
-  static levelUp(itemData, stressTransforme) {
+  static levelUp(item, stressTransforme) {
-    itemData.data.xpNext = RdDItemCompetence.getCompetenceNextXp(itemData.data.niveau);
+    item.system.xpNext = RdDItemCompetence.getCompetenceNextXp(item.system.niveau);
-    const xpManquant = itemData.data.xpNext - itemData.data.xp;
+    const xpManquant = item.system.xpNext - item.system.xp;
-    itemData.data.isLevelUp = xpManquant <= 0;
+    item.system.isLevelUp = xpManquant <= 0;
-    itemData.data.isStressLevelUp = (xpManquant > 0 && stressTransforme >= xpManquant && itemData.data.niveau < itemData.data.niveau_archetype);
+    item.system.isStressLevelUp = (xpManquant > 0 && stressTransforme >= xpManquant && item.system.niveau < item.system.niveau_archetype);
-    itemData.data.stressXpMax = 0;
+    item.system.stressXpMax = 0;
-    if (xpManquant > 0 && stressTransforme > 0 && itemData.data.niveau < itemData.data.niveau_archetype) {
+    if (xpManquant > 0 && stressTransforme > 0 && item.system.niveau < item.system.niveau_archetype) {
-        itemData.data.stressXpMax = Math.min(xpManquant , stressTransforme);
+        item.system.stressXpMax = Math.min(xpManquant , stressTransforme);
     }
   }
 
@@ -207,13 +205,16 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static isNiveauBase(itemData) {
-    return Number(itemData.data.niveau) == RdDItemCompetence.getNiveauBase(itemData.data.categorie);
+    return Number(itemData.system.niveau) == RdDItemCompetence.getNiveauBase(itemData.system.categorie);
   }
 
   /* -------------------------------------------- */
   static findCompetence(list, idOrName, options = {}) {
+    if (idOrName == undefined) {
+      return undefined;
+    }
     options = mergeObject(options, {
-      filter: it => RdDItemCompetence.isCompetence(it),
+      preFilter: it => RdDItemCompetence.isCompetence(it),
       description: 'compétence',
     });
     return list.find(it => it.id == idOrName && RdDItemCompetence.isCompetence(it))
@@ -257,7 +258,7 @@ export class RdDItemCompetence extends Item {
   /* -------------------------------------------- */
   static computeResumeArchetype(competences) {
     const archetype = RdDItemCompetence.getLimitesArchetypes();
-    competences.map(it => Math.max(0, Misc.templateData(it).niveau_archetype))
+    competences.map(it => Math.max(0, it.system.niveau_archetype))
       .forEach(niveau => {
         archetype[niveau] = archetype[niveau] ?? { "niveau": niveau, "nombreMax": 0, "nombre": 0 };
         archetype[niveau].nombre = (archetype[niveau]?.nombre ?? 0) + 1;

module/item-competencecreature.js

@@ -5,46 +5,47 @@ export class RdDItemCompetenceCreature extends Item {
 
   /* -------------------------------------------- */
   static setRollDataCreature(rollData) {
-    rollData.competence = Misc.data(rollData.competence);
+    rollData.competence = rollData.competence
-    rollData.carac = { "carac_creature": { label: rollData.competence.name, value: rollData.competence.data.carac_value } };
+    rollData.carac = { "carac_creature": { label: rollData.competence.name, value: rollData.competence.system.carac_value } }
-    rollData.competence.data.defaut_carac = "carac_creature"
+    rollData.competence.system.defaut_carac = "carac_creature"
-    rollData.competence.data.categorie = "creature"
+    rollData.competence.system.categorie = "creature"
     rollData.selectedCarac =  rollData.carac.carac_creature
-    if (rollData.competence.data.iscombat) {
+    if (rollData.competence.system.iscombat) {
-      rollData.arme = RdDItemCompetenceCreature.toArme(rollData.competence);
+      rollData.arme = RdDItemCompetenceCreature.toActionArme(rollData.competence);
     }
   }
 
   /* -------------------------------------------- */
-  static toArme(item) {
+  static toActionArme(item) {
     if (RdDItemCompetenceCreature.isCompetenceAttaque(item)) {
       // si c'est un Item compétence: cloner pour ne pas modifier lma compétence
-      let arme = Misc.data( (item instanceof Item) ? item.clone():  item);
+      let arme = (item instanceof Item) ? item.clone():  item;
-      mergeObject(arme.data,
+      mergeObject(arme.system,
         {
           competence: arme.name,
           resistance: 100,
           equipe: true,
-          dommagesReels: arme.data.dommages,
+          dommagesReels: arme.system.dommages,
           penetration: 0,
           force: 0,
-          rapide: true
+          rapide: true,
+          action: 'attaque'
         });
       return arme;
     }
-    console.error("RdDItemCompetenceCreature.toArme(", item, ") : impossible de transformer l'Item en arme");
+    console.error("RdDItemCompetenceCreature.toActionArme(", item, ") : impossible de transformer l'Item en arme");
     return undefined;
   }
 
   /* -------------------------------------------- */
   static isCompetenceAttaque(itemData) {
-    itemData = Misc.data(itemData);
+    itemData = itemData
-    return itemData.type == 'competencecreature' && itemData.data.iscombat;
+    return itemData.type == 'competencecreature' && itemData.system.iscombat;
   }
   
   /* -------------------------------------------- */
   static isCompetenceParade(itemData) {
-    itemData = Misc.data(itemData);
+    itemData = itemData
-    return itemData.type == 'competencecreature' && itemData.data.isparade;
+    return itemData.type == 'competencecreature' && itemData.system.isparade;
   }
 }  

module/item-meditation.js

@@ -3,7 +3,7 @@ export class RdDItemMeditation {
   static calculDifficulte(rollData) {
     if (rollData.meditation) {
       // Malus permanent éventuel
-      let diff = -rollData.meditation.data.malus ?? 0;
+      let diff = rollData.meditation.system.malus ?? 0;
       if (!rollData.conditionMeditation.isHeure) diff -= 2;
       if (!rollData.conditionMeditation.isVeture) diff -= 2;
       if (!rollData.conditionMeditation.isComportement) diff -= 2;

module/item-monnaie.js

@@ -4,29 +4,29 @@ const monnaiesData = [
   {
     name: "Etain (1 denier)", type: 'monnaie',
     img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp",
-    data: { quantite: 0, valeur_deniers: 1, encombrement: 0.001, description: "" }
+    system: { quantite: 0, valeur_deniers: 1, encombrement: 0.001, description: "" }
   },
   {
     name: "Bronze (10 deniers)", type: 'monnaie',
     img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_bronze_epees.webp",
-    data: { quantite: 0, valeur_deniers: 10, encombrement: 0.002, description: "" }
+    system: { quantite: 0, valeur_deniers: 10, encombrement: 0.002, description: "" }
   },
   {
     name: "Argent (1 sol)", type: 'monnaie',
     img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_argent_sol.webp",
-    data: { quantite: 0, valeur_deniers: 100, encombrement: 0.003, description: "" }
+    system: { quantite: 0, valeur_deniers: 100, encombrement: 0.003, description: "" }
   },
   {
     name: "Or (10 sols)", type: 'monnaie',
     img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_or_sol.webp",
-    data: { quantite: 0, valeur_deniers: 1000, encombrement: 0.004, description: "" }
+    system: { quantite: 0, valeur_deniers: 1000, encombrement: 0.004, description: "" }
   }
 ]
 
 export class Monnaie {
 
   static isSystemMonnaie(item) {
-    let present = monnaiesData.find(monnaie => monnaie.data.valeur_deniers == Misc.data(item)?.data?.valeur_deniers);
+    let present = monnaiesData.find(monnaie => monnaie.system.valeur_deniers == item?.system?.valeur_deniers);
     return present;
   }
 
@@ -35,20 +35,18 @@ export class Monnaie {
   }
 
   static filtrerMonnaies(items) {
-    return items.filter(it => Misc.data(it).type == 'monnaie');
+    return items.filter(it => it.type == 'monnaie');
   }
 
   static monnaiesManquantes(items) {
     const valeurs = Monnaie.filtrerMonnaies(items)
-      .map(it => Misc.templateData(it).valeur_deniers);
+      .map(it => it.system.valeur_deniers);
-    const manquantes = monnaiesData.filter(monnaie => !valeurs.find(v => v != Misc.templateData(monnaie).valeur_deniers));
+    const manquantes = monnaiesData.filter(monnaie => !valeurs.find(v => v != monnaie.system?.valeur_deniers))
-    //const manquantes = monnaiesData.filter(monnaie => !valeurs.find(v => v != Misc.templateData(monnaie).valeur_deniers) );
-    //console.log("Valeurs : ", valeurs, manquantes);
     return []; //manquantes;
   }
 
   static deValeur(monnaie, v) {
-    return v != monnaie.data.valeur_deniers;
+    return v != monnaie.system.valeur_deniers
   }
 
   static arrondiDeniers(sols) {
@@ -56,6 +54,6 @@ export class Monnaie {
   }
 
   static triValeurDenier() {
-    return Misc.ascending(item => Misc.data(item).data.valeur_deniers);
+    return Misc.ascending(item => item.system.valeur_deniers)
   }
 }

module/item-sheet.js

@@ -32,7 +32,7 @@ export class RdDItemSheet extends ItemSheet {
     let buttons = super._getHeaderButtons();
     // Add "Post to chat" button
     // We previously restricted this to GM and editable items only. If you ever find this comment because it broke something: eh, sorry!
-    if ("cout" in Misc.templateData(this.object) && this.object.isVideOuNonConteneur()) {
+    if ("cout" in this.object.system && this.object.isVideOuNonConteneur()) {
       buttons.unshift({
         class: "vendre",
         icon: "fas fa-comments-dollar",
@@ -60,14 +60,13 @@ export class RdDItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = Misc.data(this.object)
     let formData = {
       id: this.object.id,
-      title: objectData.name,
+      title: this.object.name,
-      type: objectData.type,
+      type: this.object.type,
-      img: objectData.img,
+      img: this.object.img,
-      name: objectData.name,
+      name: this.object.name,
-      data: objectData.data,
+      data: this.object.system,
       isGM: game.user.isGM,
       actorId: this.actor?.id,
       owner: this.document.isOwner,
@@ -77,7 +76,7 @@ export class RdDItemSheet extends ItemSheet {
     }
     if (this.actor) {
       formData.isOwned = true;
-      if (objectData.type == 'conteneur') {
+      if (this.object.type == 'conteneur') {
         this.prepareConteneurData(formData);
       }
     }
@@ -106,7 +105,7 @@ export class RdDItemSheet extends ItemSheet {
       }
       RdDHerbes.updatePotionData(formData);
     }
-    if (formData.isOwned && formData.type == 'herbe' && (formData.data.categorie == 'Soin' || formData.data.categorie == 'Repos')) {
+    if (formData.isOwned && formData.type == 'herbe' && (formData.system.categorie == 'Soin' || formData.system.categorie == 'Repos')) {
       formData.isIngredientPotionBase = true;
     }
     formData.bonusCaseList = RdDItemSort.getBonusCaseList(formData, true);
@@ -116,8 +115,8 @@ export class RdDItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   prepareConteneurData(formData) {
-    formData.itemsByType = Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i.data)));
+    formData.itemsByType = Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i)))
-    RdDUtility.filterEquipementParType(formData);
+    RdDUtility.filterEquipementParType(formData)
 
     this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
     formData.subItems = formData.conteneurs.find(it => it._id == this.object.id)?.subItems;
@@ -182,7 +181,7 @@ export class RdDItemSheet extends ItemSheet {
       if (actor) {
         actor.effectuerTacheAlchimie(recetteId, tacheName, tacheData);
       } else {
-        ui.notifications.info("Impossible trouver un actur pour réaliser cette tache Alchimique.");
+        ui.notifications.info("Impossible trouver un acteur pour réaliser cette tache Alchimique.");
       }
     });
 
@@ -222,14 +221,14 @@ export class RdDItemSheet extends ItemSheet {
 
     if (this.object.isCompetence()) {
       let level = RdDItemCompetence.getNiveauBase(event.currentTarget.value);
-      Misc.templateData(this.object).base = level;
+      this.object.system.base = level;
       $("#base").val(level);
     }
   }
 
   /* -------------------------------------------- */
   get template() {
-    let type = this.object.data.type;
+    let type = this.object.type
     return `systems/foundryvtt-reve-de-dragon/templates/item-${type}-sheet.html`;
   }
 

module/item-signedraconique-sheet.js

@@ -40,7 +40,7 @@ export class RdDSigneDraconiqueItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const formData = duplicate(Misc.data(this.object));
+    const formData = duplicate(this.object);
     mergeObject(formData, {
       title: formData.name,
       isGM: game.user.isGM,
@@ -80,7 +80,7 @@ export class RdDSigneDraconiqueItemSheet extends ItemSheet {
   async onValeurXpSort(event) {
     const codeReussite = event.currentTarget.attributes['data-typereussite']?.value ?? 0;
     const xp = Number(event.currentTarget.value);
-    const oldValeur = Misc.templateData(this.object).valeur;
+    const oldValeur = this.object.system.valeur;
     const newValeur = RdDItemSigneDraconique.calculValeursXpSort(codeReussite, xp, oldValeur);
     await this.object.update({ 'data.valeur': newValeur });
   }

module/item-signedraconique.js

@@ -13,25 +13,24 @@ const tableSignesIndicatifs = [
 
 ]
 
+const DIFFICULTE_LECTURE_SIGNE_MANQUE = +11;
+
 export class RdDItemSigneDraconique {
 
   static prepareSigneDraconiqueMeditation(meditation, rolled) {
-    if (rolled.isSuccess != undefined) {
+    meditation = meditation
-      meditation = Misc.data(meditation);
+    return {
-      return {
+      name: "de la " + meditation.name,
-        name: "de la " + meditation.name,
+      type: "signedraconique",
-        type: "signedraconique",
+      img: meditation.img,
-        img: meditation.img,
+      data: {
-        data: {
+        typesTMR: [TMRUtility.typeTmrName(meditation.data.tmr)],
-          typesTMR: [TMRUtility.typeTmrName(meditation.data.tmr)],
+        difficulte: rolled.isSuccess ? RdDItemSigneDraconique.getDiffSigneMeditation(rolled.code) : DIFFICULTE_LECTURE_SIGNE_MANQUE,
-          difficulte: RdDItemSigneDraconique.getDiffSigneMeditation(rolled.code),
+        ephemere: true,
-          ephemere: true,
+        duree: "1 round",
-          duree: "1 round",
+        valeur: rolled.isSuccess ? { "norm": 3, "sign": 5, "part": 10 } : { "norm": 0, "sign": 0, "part": 0 }
-          valeur: { "norm": 3, "sign": 5, "part": 10 }
+      }
-        }
+    };
-      };
-    }
-    return undefined;
   }
 
   static getDiffSigneMeditation(code) {
@@ -44,7 +43,7 @@ export class RdDItemSigneDraconique {
   }
 
   static getXpSortSigneDraconique(code, signe) {
-    return Misc.data(signe).data.valeur[code] ?? 0;
+    return Misc.toInt(signe.system.valeur[code] ?? 0);
   }
 
   static calculValeursXpSort(qualite, valeur, avant) {

module/item-sort.js

@@ -18,7 +18,7 @@ export class RdDItemSort extends Item {
   /* -------------------------------------------- */
   static setCoutReveReel(sort){
     if (sort) {
-      sort.data.ptreve_reel = this.isCoutVariable(sort) ? 1 : sort.data.ptreve;
+      sort.system.ptreve_reel = this.isCoutVariable(sort) ? 1 : sort.system.ptreve;
     }
   }
 

module/item.js

@@ -57,61 +57,56 @@ export class RdDItem extends Item {
   }
 
   isCompetence() {
-    return Misc.data(this).type == 'competence';
+    return this.type == 'competence';
   }
 
   isConteneur() {
-    return Misc.data(this).type == 'conteneur';
+    return this.type == 'conteneur';
   }
 
   isConteneurNonVide() {
-    return this.isConteneur() && (Misc.templateData(this).contenu?.length ?? 0) > 0;
+    return this.isConteneur() && (this.system.contenu?.length ?? 0) > 0;
   }
 
   isConteneurVide() {
-    return this.isConteneur() && (Misc.templateData(this).contenu?.length ?? 0) == 0;
+    return this.isConteneur() && (this.system.contenu?.length ?? 0) == 0;
   }
 
   isVideOuNonConteneur() {
-    return !this.isConteneur() || (Misc.templateData(this).contenu?.length ?? 0) == 0;
+    return !this.isConteneur() || (this.system.contenu?.length ?? 0) == 0;
   }
 
   isAlcool() {
-    const itemData = Misc.data(this);
+    return this.type == 'nourritureboisson' && this.system.boisson && this.system.alcoolise;
-    return itemData.type == 'nourritureboisson' && itemData.data.boisson && itemData.data.alcoolise;
   }
   isHerbeAPotion() {
-    const itemData = Misc.data(this);
+    return this.type == 'herbe' && (this.system.categorie == 'Soin' || this.system.categorie == 'Repos');
-    return itemData.type == 'herbe' && (itemData.data.categorie == 'Soin' || itemData.data.categorie == 'Repos');
   }
   isPotion() {
-    return Misc.data(this).type == 'potion';
+    return this.type == 'potion';
   }
 
   isEquipement() {
-    return RdDItem.getTypeObjetsEquipement().includes(Misc.data(this).type);
+    return RdDItem.getTypeObjetsEquipement().includes(this.type)
   }
 
   isCristalAlchimique() {
-    const itemData = Misc.data(this);
+    return this.type == 'objet' && Grammar.toLowerCaseNoAccent(this.name) == 'cristal alchimique' && this.system.quantite > 0;
-    return itemData.type == 'objet' && Grammar.toLowerCaseNoAccent(itemData.name) == 'cristal alchimique' && itemData.data.quantite > 0;
   }
 
   isMagique() {
-    return Misc.templateData(this).magique;
+    return this.system.magique
   }
 
   getEncTotal() {
-    const itemData = Misc.data(this);
+    return Number(this.system.encombrement ?? 0) * Number(this.system.quantite ?? 1)
-    return Number(itemData.data.encombrement ?? 0) * Number(itemData.data.quantite ?? 1);
   }
   getEnc() {
-    const itemData = Misc.data(this);
+    switch (this.type) {
-    switch (itemData.type) {
       case 'herbe':
         return encBrin;
     }
-    return itemData.data.encombrement ?? 0;
+    return this.system.encombrement ?? 0;
   }
 
   prepareDerivedData() {
@@ -122,51 +117,47 @@ export class RdDItem extends Item {
       if (this.isPotion()) {
         this.prepareDataPotion()
       }
-      const itemData = Misc.data(this);
+      this.system.actionPrincipale = this.getActionPrincipale({ warnIfNot: false });
-      itemData.data.actionPrincipale = this.getActionPrincipale({ warnIfNot: false });
     }
   }
 
   prepareDataPotion() {
-    const tplData = Misc.templateData(this);
+    const categorie = Grammar.toLowerCaseNoAccent(this.system.categorie);
-    const categorie = Grammar.toLowerCaseNoAccent(tplData.categorie);
+    this.system.magique = categorie.includes('enchante');
-    tplData.magique = categorie.includes('enchante');
+    if (this.system.magique) {
-    if (tplData.magique) {
       if (categorie.includes('soin') || categorie.includes('repos')) {
-        tplData.puissance = tplData.herbebonus * tplData.pr;
+        this.system.puissance = this.system.herbebonus * this.system.pr;
       }
     }
   }
 
   _calculsEquipement() {
-    const tplData = Misc.templateData(this);
+    const quantite = this.isConteneur() ? 1 : (this.system.quantite ?? 0);
-    const quantite = this.isConteneur() ? 1 : (tplData.quantite ?? 0);
     const enc = this.getEnc();
     if (enc != undefined) {
-      tplData.encTotal = Math.max(enc, 0) * quantite;
+      this.system.encTotal = Math.max(enc, 0) * quantite;
     }
-    if (tplData.cout != undefined) {
+    if (this.cout != undefined) {
-      tplData.prixTotal = Math.max(tplData.cout, 0) * quantite;
+      this.system.prixTotal = Math.max(this.cout, 0) * quantite;
     }
   }
 
   getActionPrincipale(options = { warnIfNot: true }) {
-    const itemData = Misc.data(this);
+    if (!this.isConteneur() && (this.system.quantite ?? 0) <= 0) {
-    if (!this.isConteneur() && (itemData.data.quantite ?? 0) <= 0) {
       if (options.warnIfNot) {
-        ui.notifications.warn(`Vous n'avez plus de ${itemData.name}.`);
+        ui.notifications.warn(`Vous n'avez plus de ${this.name}.`);
       }
       return undefined;
     }
-    switch (itemData.type) {
+    switch (this.type) {
-      case 'nourritureboisson': return itemData.data.boisson ? 'Boire' : 'Manger';
+      case 'nourritureboisson': return this.boisson ? 'Boire' : 'Manger';
       case 'potion': return 'Boire';
       case 'livre': return 'Lire';
       case 'conteneur': return 'Ouvrir';
     }
     if (this.isHerbeAPotion()) { return 'Décoction'; }
     if (options.warnIfNot) {
-      ui.notifications.warn(`Impossible d'utiliser un ${itemData.name}, aucune action associée définie.`);
+      ui.notifications.warn(`Impossible d'utiliser un ${this.name}, aucune action associée définie.`);
     }
 
     return undefined;
@@ -178,18 +169,17 @@ export class RdDItem extends Item {
   }
 
   async quantiteIncDec(nombre, options = { diminuerQuantite: true, supprimerSiZero: false }) {
-    const itemData = Misc.data(this);
+    const quantite = Number(this.system.quantite ?? -1);
-    const quantite = Number(itemData.data.quantite ?? -1);
     if (quantite >= 0) {
       const reste = Math.max(quantite + Number(nombre), 0);
 
       if (reste == 0) {
         if (options.supprimerSiZero) {
-          ui.notifications.notify(`${itemData.name} supprimé de votre équipement`);
+          ui.notifications.notify(`${this.name} supprimé de votre équipement`);
           await this.delete();
         }
         else {
-          ui.notifications.notify(`Il ne vous reste plus de ${itemData.name}, vous pouvez le supprimer de votre équipement, ou trouver un moyen de vous en procurer.`);
+          ui.notifications.notify(`Il ne vous reste plus de ${this.name}, vous pouvez le supprimer de votre équipement, ou trouver un moyen de vous en procurer.`);
           await this.update({ "data.quantite": 0 });
         }
       }
@@ -202,22 +192,28 @@ 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) {
-    const itemData = Misc.data(this);
-    const otherData = Misc.data(other);
-    const tplData = Misc.templateData(this);
-    const otherTplData = Misc.templateData(other);
     if (!this.isEquipement()) return false;
-    if (itemData.type != otherData.type) return false;
+    let message = undefined;
-    if (itemData.name != otherData.name) return false;
+    if (this.type != other.type) {
-    if (tplData.quantite == undefined) return false;
+      message = `Impossible de regrouper ${this.type} avec ${other.type}`;
-
+    }
-    const differences = Object.entries(tplData).filter(([key, value]) => !['quantite', 'encTotal', 'prixTotal', 'cout'].includes(key))
+    else if (this.name != other.name) {
-      .filter(([key, value]) => value != otherTplData[key]);
+      message = `Impossible de regrouper ${this.name} avec ${other.name}`;
-    if (differences.length > 0) {
+    }
-      let message = `Impossible de regrouper les ${itemData.type} ${itemData.name}: `;
+    else if (this.system.quantite == undefined) {
-      for (const [key, value] of differences) {
+      message = `Impossible de regrouper des ${this.type}, ils ne sont pas empilables`;
-        message += `<br>${key}: ${value} vs ${otherTplData[key]}`;
+    } 
+    else {
+      const differences = Object.entries(this.system)
+        .filter(([key, value]) => !['quantite', 'encTotal', 'prixTotal', 'cout'].includes(key) && value != other.system[key]);
+      if (differences.length > 0) {
+        message = `Impossible de regrouper les ${this.type} ${this.name}: `;
+        for (const [key, value] of differences) {
+          message += `<br>${key}: ${value} vs ${other.system[key]}`;
+        }
       }
+    }
+    if (message){
       ui.notifications.info(message)
       return false;
     }
@@ -251,13 +247,13 @@ export class RdDItem extends Item {
 
   /* -------------------------------------------- */
   getProprietes() {
-    return this[`_${Misc.data(this).type}ChatData`]();
+    return this[`_${this.type}ChatData`]();
   }
 
   /* -------------------------------------------- */
   async postItem(modeOverride) {
     console.log(this);
-    let chatData = duplicate(Misc.data(this));
+    let chatData = duplicate(this);
     const properties = this.getProprietes();
     chatData["properties"] = properties
     if (this.actor) {
@@ -282,7 +278,7 @@ export class RdDItem extends Item {
 
   /* -------------------------------------------- */
   _objetChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [].concat(
       RdDItem.propertyIfDefined('Résistance', tplData.resistance, tplData.resistance),
       RdDItem.propertyIfDefined('Qualité', tplData.qualite, tplData.qualite),
@@ -293,7 +289,7 @@ export class RdDItem extends Item {
 
   /* -------------------------------------------- */
   _nourritureboissonChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [].concat(
       RdDItem.propertyIfDefined('Sustentation', tplData.sust, tplData.sust > 0),
       RdDItem.propertyIfDefined('Désaltère', tplData.desaltere, tplData.boisson),
@@ -306,7 +302,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _armeChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Compétence</b>: ${tplData.competence}`,
       `<b>Dommages</b>: ${tplData.dommages}`,
@@ -318,7 +314,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _conteneurChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Capacité</b>: ${tplData.capacite} Enc.`,
       `<b>Encombrement</b>: ${tplData.encombrement}`
@@ -327,7 +323,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _munitionChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Encombrement</b>: ${tplData.encombrement}`
     ]
@@ -335,7 +331,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _armureChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Protection</b>: ${tplData.protection}`,
       `<b>Détérioration</b>: ${tplData.deterioration}`,
@@ -346,7 +342,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _competenceChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Catégorie</b>: ${tplData.categorie}`,
       `<b>Niveau</b>: ${tplData.niveau}`,
@@ -357,7 +353,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _competencecreatureChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Catégorie</b>: ${tplData.categorie}`,
       `<b>Niveau</b>: ${tplData.niveau}`,
@@ -368,7 +364,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _sortChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Draconic</b>: ${tplData.draconic}`,
       `<b>Difficulté</b>: ${tplData.difficulte}`,
@@ -379,7 +375,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _herbeChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Milieu</b>: ${tplData.milieu}`,
       `<b>Rareté</b>: ${tplData.rarete}`,
@@ -389,7 +385,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _ingredientChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Milieu</b>: ${tplData.milieu}`,
       `<b>Rareté</b>: ${tplData.rarete}`,
@@ -399,7 +395,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _tacheChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Caractéristique</b>: ${tplData.carac}`,
       `<b>Compétence</b>: ${tplData.competence}`,
@@ -415,7 +411,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _livreChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Compétence</b>: ${tplData.competence}`,
       `<b>Auteur</b>: ${tplData.auteur}`,
@@ -427,7 +423,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _potionChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Rareté</b>: ${tplData.rarete}`,
       `<b>Catégorie</b>: ${tplData.categorie}`,
@@ -437,7 +433,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _queueChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Refoulement</b>: ${tplData.refoulement}`
     ]
@@ -445,7 +441,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _ombreChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Refoulement</b>: ${tplData.refoulement}`
     ]
@@ -453,19 +449,19 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _souffleChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [];
     return properties;
   }
   /* -------------------------------------------- */
   _teteChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [];
     return properties;
   }
   /* -------------------------------------------- */
   _tarotChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Concept</b>: ${tplData.concept}`,
       `<b>Aspect</b>: ${tplData.aspect}`,
@@ -474,7 +470,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _nombreastralChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Valeur</b>: ${tplData.value}`,
       `<b>Jour</b>: ${tplData.jourlabel}`,
@@ -483,7 +479,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _monnaieChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Valeur en Deniers</b>: ${tplData.valeur_deniers}`,
       `<b>Encombrement</b>: ${tplData.encombrement}`
@@ -492,7 +488,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _meditationChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Thème</b>: ${tplData.theme}`,
       `<b>Compétence</b>: ${tplData.competence}`,
@@ -507,7 +503,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _casetmrChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Coordonnée</b>: ${tplData.coord}`,
       `<b>Spécificité</b>: ${tplData.specific}`
@@ -516,7 +512,7 @@ export class RdDItem extends Item {
   }
   /* -------------------------------------------- */
   _maladieChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties
     if (tplData.identifie) {
       properties = [
@@ -541,7 +537,7 @@ export class RdDItem extends Item {
 
   /* -------------------------------------------- */
   _gemmeChatData() {
-    const tplData = Misc.templateData(this);
+    const tplData = this.system
     let properties = [
       `<b>Pureté</b>: ${tplData.purete}`,
       `<b>Taille</b>: ${tplData.taille}`,

module/misc.js

@@ -69,9 +69,9 @@ export class Misc {
   }
 
   static classify(items, classifier = it => it.type) {
-    let itemsBy = {};
+    let itemsBy = {}
-    Misc.classifyInto(itemsBy, items, classifier);
+    Misc.classifyInto(itemsBy, items, classifier)
-    return itemsBy;
+    return itemsBy
   }
 
   static classifyFirst(items, classifier) {
@@ -87,13 +87,13 @@ export class Misc {
 
   static classifyInto(itemsBy, items, classifier = it => it.type) {
     for (const item of items) {
-      const classification = classifier(item);
+      const classification = classifier(item)
       let list = itemsBy[classification];
       if (!list) {
-        list = [];
+        list = []
-        itemsBy[classification] = list;
+        itemsBy[classification] = list
       }
-      list.push(item);
+      list.push(item)
     }
   }
 
@@ -106,20 +106,9 @@ export class Misc {
   }
 
 
-  static data(it) {
-    if (it instanceof Actor || it instanceof Item || it instanceof Combatant) {
-      return it.data;
-    }
-    return it;
-  }
-
-  static templateData(it) {
-    return Misc.data(it)?.data ?? {}
-  }
-
   static getEntityTypeLabel(entity) {
-    const documentName = entity?.documentName;
+    const documentName = entity?.documentName
-    const type = entity?.data.type;
+    const type = entity?.type
     if (documentName === 'Actor' || documentName === 'Item') {
       const label = CONFIG[documentName]?.typeLabels?.[type] ?? type;
       return game.i18n.has(label) ? game.i18n.localize(label) : t;
@@ -192,7 +181,7 @@ export class Misc {
     if (!single) {
       single = subset[0];
       const choices = Misc.join(subset.map(it => options.mapper(it)), '<br>');
-      options.info(`Plusieurs choix de ${options.description}s possibles:<br>${choices}<br>Le premier sera choisi: ${mapToValue(single)}`);
+      options.onMessage(`Plusieurs choix de ${options.description}s possibles:<br>${choices}<br>Le premier sera choisi: ${options.mapper(single)}`);
     }
     return single;
   }
@@ -211,7 +200,7 @@ export class Misc {
     }
     value = Grammar.toLowerCaseNoAccent(value);
     const subset = elements.filter(options.preFilter)
-      .filter(it => Grammar.toLowerCaseNoAccent(options.mapper(it)).includes(value));
+      .filter(it => Grammar.toLowerCaseNoAccent(options.mapper(it))?.includes(value));
     if (subset.length == 0) {
       options.onMessage(`Pas de ${options.description} correspondant à ${value}`);
     }

module/rdd-astrologie-joueur.js

@@ -17,7 +17,7 @@ export class RdDAstrologieJoueur extends Dialog {
       dates: game.system.rdd.calendrier.getJoursSuivants(10),
       etat: actor.getEtatGeneral(),
       ajustementsConditions: CONFIG.RDD.ajustementsConditions,
-      astrologie: RdDItemCompetence.findCompetence(actor.data.items, 'Astrologie')
+      astrologie: RdDItemCompetence.findCompetence(actor.items, 'Astrologie')
     }
     const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-astrologie-joueur.html', data);
     let options = { classes: ["rdddialog"], width: 600, height: 500, 'z-index': 99999 };
@@ -49,12 +49,12 @@ export class RdDAstrologieJoueur extends Dialog {
     let itemNombres = actor.listItemsData('nombreastral');
     let itemFiltered = {};
     for (let item of itemNombres) {
-      if (itemFiltered[item.data.jourindex]) {
+      if (itemFiltered[item.system.jourindex]) {
-        itemFiltered[item.data.jourindex].listValues.push(item.data.value);
+        itemFiltered[item.system.jourindex].listValues.push(item.system.value);
       } else {
-        itemFiltered[item.data.jourindex] = {
+        itemFiltered[item.system.jourindex] = {
-          listValues: [item.data.value],
+          listValues: [item.system.value],
-          jourlabel: item.data.jourlabel
+          jourlabel: item.system.jourlabel
         }
       }
     }
@@ -64,8 +64,8 @@ export class RdDAstrologieJoueur extends Dialog {
   /* -------------------------------------------- */
   requestJetAstrologie() {
     let data = {
-      id: this.actor.data._id,
+      id: this.actor.id,
-      carac_vue: Misc.data(this.actor).data.carac['vue'].value,
+      carac_vue: this.actor.system.carac['vue'].value,
       etat: this.dataNombreAstral.etat,
       astrologie: this.dataNombreAstral.astrologie,
       conditions: $("#diffConditions").val(),

module/rdd-bonus.js

@@ -20,7 +20,7 @@ export class RdDBonus {
 
   static isAjustementAstrologique(rollData) {
     return RdDCarac.isChance(rollData.selectedCarac) ||
-      rollData.selectedSort?.data.isrituel;
+      rollData.selectedSort?.system.isrituel;
   }
   /* -------------------------------------------- */
   static isDefenseAttaqueFinesse(rollData) {
@@ -68,23 +68,23 @@ export class RdDBonus {
     }
     return isCauchemar ? "cauchemar"
       : rollData.dmg?.mortalite
-      ?? rollData.arme?.data.mortalite
+      ?? rollData.arme?.system.mortalite
       ?? "mortel";
   }
 
   /* -------------------------------------------- */
   static _dmgArme(rollData) {
     if ( rollData.arme) {
-      let dmgBase = rollData.arme.data.dommagesReels ?? Number(rollData.arme.data.dommages ?? 0);
+      let dmgBase = rollData.arme.system.dommagesReels ?? Number(rollData.arme.system.dommages ?? 0);
       //Le bonus dégats magiques ne peut pas faire dépasser le bonus de l'arme (cf p.278)
-      return dmgBase + Math.min(dmgBase, rollData.arme.data.magique ? rollData.arme.data.ecaille_efficacite : 0);
+      return dmgBase + Math.min(dmgBase, rollData.arme.system.magique ? rollData.arme.system.ecaille_efficacite : 0);
     }
     return 0;
   }
 
   /* -------------------------------------------- */
   static _peneration(rollData) {
-    return parseInt(rollData.arme?.data.penetration ?? 0);
+    return parseInt(rollData.arme?.system.penetration ?? 0);
   }
 
   /* -------------------------------------------- */

module/rdd-calendrier.js

@@ -320,7 +320,7 @@ export class RdDCalendrier extends Application {
     if (Misc.isUniqueConnectedGM()) { // Only once
       console.log(request);
       let jourDiff = this.getLectureAstrologieDifficulte(request.date);
-      let niveau = Number(request.astrologie.data.niveau) + Number(request.conditions) + Number(jourDiff) + Number(request.etat);
+      let niveau = Number(request.astrologie.system.niveau) + Number(request.conditions) + Number(jourDiff) + Number(request.etat);
       let rollData = {
         caracValue: request.carac_vue,
         finalLevel: niveau,

module/rdd-combat.js

@@ -1,5 +1,6 @@
 import { ChatUtility } from "./chat-utility.js";
-import { HIDE_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { ENTITE_INCARNE, ENTITE_NONINCARNE, HIDE_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { Grammar } from "./grammar.js";
 import { RdDItemArme } from "./item-arme.js";
 import { RdDItemCompetence } from "./item-competence.js";
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
@@ -26,7 +27,7 @@ const premierRoundInit = [
   { pattern: 'epeegnome', init: 5.35 },
   { pattern: 'masse', init: 5.30 },
   { pattern: 'gourdin', init: 5.25 },
-  { pattern: 'fléau', init: 5.20 },
+  { pattern: 'fleau', init: 5.20 },
   { pattern: 'dague', init: 5.15 },
   { pattern: 'autre', init: 5.10 },
 ];
@@ -84,28 +85,23 @@ export class RdDCombatManager extends Combat {
     // calculate initiative
     for (let cId = 0; cId < ids.length; cId++) {
       const combatant = this.combatants.get(ids[cId]);
-      //if (!c) return results;
+      let rollFormula = formula ?? RdDCombatManager.formuleInitiative(2, 10, 0, 0);
-
+      if (!formula) {
-      let rollFormula = formula; // Init per default
+        if (combatant.actor.type == 'creature' || combatant.actor.type == 'entite') {
-      if (!rollFormula) {
+          const competence = combatant.actor.items.find(it => it.system.iscombat)
-        let armeCombat, competence;
+          if (competence) {
-        if (combatant.actor.data.type == 'creature' || combatant.actor.data.type == 'entite') {
+            rollFormula = RdDCombatManager.formuleInitiative(2, competence.system.carac_value, competence.system.niveau, 0);
-          for (const competenceItemData of combatant.actor.data.items) {
-            if (competenceItemData.data.data.iscombat) {
-              competence = duplicate(competenceItemData);
-            }
           }
-          rollFormula = "2+( (" + RdDCombatManager.calculInitiative(competence.data.niveau, competence.data.carac_value) + ")/100)";
         } else {
-          for (const itemData of combatant.actor.data.items) {
+          const armeCombat = combatant.actor.items.find(it => it.type == 'arme' && itemData.system.equipe)
-            if (itemData.type == "arme" && itemData.data.equipe) {
+          const compName = (armeCombat == undefined) ? "Corps à corps" : armeCombat.system.competence;
-              armeCombat = duplicate(itemData);
+          const competence = RdDItemCompetence.findCompetence(combatant.actor.items, compName);
-            }
+          if (competence) {
+            const carac = combatant.actor.system.carac[competence.system.defaut_carac].value;
+            const niveau = competence.system.niveau;
+            const bonusEcaille = (armeCombat?.system.magique) ? armeCombat.system.ecaille_efficacite : 0;
+            rollFormula = RdDCombatManager.formuleInitiative(2,  carac, niveau, bonusEcaille);
           }
-          let compName = (armeCombat == undefined) ? "Corps à corps" : armeCombat.data.competence;
-          competence = RdDItemCompetence.findCompetence(combatant.actor.data.items, compName);
-          let bonusEcaille = (armeCombat && armeCombat.data.magique) ? armeCombat.data.ecaille_efficacite : 0;
-          rollFormula = "2+( (" + RdDCombatManager.calculInitiative(competence.data.niveau, Misc.data(combatant.actor).data.carac[competence.data.defaut_carac].value, bonusEcaille) + ")/100)";
         }
       }
       //console.log("Combatat", c);
@@ -142,6 +138,10 @@ export class RdDCombatManager extends Combat {
     return this;
   };
 
+  static formuleInitiative(rang, carac, niveau, bonusMalus) {
+    return `${rang} +( (${RdDCombatManager.calculInitiative(niveau, carac, bonusMalus)} )/100)`;
+  }
+
   /* -------------------------------------------- */
   static calculInitiative(niveau, caracValue, bonusEcaille = 0) {
     let base = niveau + Math.floor(caracValue / 2);
@@ -150,63 +150,77 @@ export class RdDCombatManager extends Combat {
   }
 
   /* -------------------------------------------- */
-  /** Retourne une liste triée d'armes avec le split arme1 main / arme 2 main */
+  /** Retourne une liste triée d'actions d'armes avec le split arme1 main / arme 2 main */
-  static finalizeArmeList(armes, competences, carac) {
+  static listActionsArmes(armes, competences, carac) {
     // Gestion des armes 1/2 mains
-    let armesEquipe = [];
+    let actionsArme = [];
     for (const arme of armes) {
-      let armeData = duplicate(Misc.data(arme));
+      let action = duplicate(arme)
-      if (armeData.data.equipe) {
+      if (action.system.equipe) {
-        let compData = competences.map(c => Misc.data(c)).find(c => c.name == armeData.data.competence);
+        let compData = competences.find(c => c.name == action.system.competence)
 
-        armesEquipe.push(armeData);
+        actionsArme.push(action);
-        armeData.data.dommagesReels = Number(armeData.data.dommages);
+        action.action = 'attaque';
-        armeData.data.niveau = compData.data.niveau;
+        action.system.dommagesReels = Number(action.system.dommages);
-        armeData.data.initiative = RdDCombatManager.calculInitiative(compData.data.niveau, carac[compData.data.defaut_carac].value);
+        action.system.niveau = compData.system.niveau;
+        action.system.initiative = RdDCombatManager.calculInitiative(compData.system.niveau, carac[compData.system.defaut_carac].value);
         // Dupliquer les armes pouvant être à 1 main et 2 mains en patchant la compétence
-        if (armeData.data.unemain && !armeData.data.deuxmains) {
+        if (action.system.unemain && !action.system.deuxmains) {
-          armeData.data.mainInfo = "(1m)";
+          action.system.mainInfo = "(1m)";
-        } else if (!armeData.data.unemain && armeData.data.deuxmains) {
+        } else if (!action.system.unemain && action.system.deuxmains) {
-          armeData.data.mainInfo = "(2m)";
+          action.system.mainInfo = "(2m)";
-        } else if (armeData.data.unemain && armeData.data.deuxmains) {
+        } else if (action.system.unemain && action.system.deuxmains) {
-          armeData.data.mainInfo = "(1m)";
+          action.system.mainInfo = "(1m)";
 
-          const comp2m = armeData.data.competence.replace(" 1 main", " 2 mains"); // Replace !
+          const comp2m = action.system.competence.replace(" 1 main", " 2 mains"); // Replace !
-          const comp = Misc.data(competences.find(c => c.name == comp2m));
+          const comp = competences.find(c => c.name == comp2m)
 
-          const arme2main = duplicate(armeData);
+          const arme2main = duplicate(action);
-          arme2main.data.mainInfo = "(2m)";
+          arme2main.system.mainInfo = "(2m)";
-          arme2main.data.niveau = comp.data.niveau;
+          arme2main.system.niveau = comp.system.niveau;
-          arme2main.data.competence = comp2m;
+          arme2main.system.competence = comp2m;
-          arme2main.data.initiative = RdDCombatManager.calculInitiative(arme2main.data.niveau, carac[comp.data.defaut_carac].value);
+          arme2main.system.initiative = RdDCombatManager.calculInitiative(arme2main.system.niveau, carac[comp.system.defaut_carac].value);
-          armesEquipe.push(arme2main);
+          actionsArme.push(arme2main);
-          const containsSlash = armeData.data.dommages.includes("/");
+          const containsSlash = action.system.dommages.includes("/");
           if (containsSlash) {
-            const tableauDegats = armeData.data.dommages.split("/");
+            const tableauDegats = action.system.dommages.split("/");
-            armeData.data.dommagesReels = Number(tableauDegats[0]);
+            action.system.dommagesReels = Number(tableauDegats[0]);
-            arme2main.data.dommagesReels = Number(tableauDegats[1]);
+            arme2main.system.dommagesReels = Number(tableauDegats[1]);
           }
           else{
-            ui.notifications.info("Les dommages de l'arme à 1/2 mains " + armeData.name + " ne sont pas corrects (ie sous la forme X/Y)");
+            ui.notifications.info("Les dommages de l'arme à 1/2 mains " + action.name + " ne sont pas corrects (ie sous la forme X/Y)");
           }
         }
       }
     }
-    return armesEquipe.sort(Misc.ascending(armeData => armeData.name + (armeData.data.mainInfo ?? '')));
+    return actionsArme.sort(Misc.ascending(armeData => armeData.name + (armeData.system.mainInfo ?? '')));
+  }
+
+  static listActionsPossessions(actor) {
+    return RdDCombatManager._indexActions(actor.getPossessions().map(p =>
+      {
+        return {
+          name: p.name,
+          action: 'conjurer',
+          data: {
+            competence: p.name,
+            possessionid: p.system.possessionid,
+          }
+        }
+      }));
   }
 
   /* -------------------------------------------- */
-  static buildListeActionsCombat(combatant) {
+  static listActionsCombat(combatant) {
-    if (combatant.actor == undefined) {
+    const actor = combatant.actor;
-      ui.notifications.warn(`Le combatant ${combatant.name} n'est pas associé à un acteur, impossible de déterminer ses actions de combat!`)
+    let actions = RdDCombatManager.listActionsPossessions(actor);
-      return [];
+    if (actions.length>0) {
+      return actions;
     }
-    const actorData = Misc.data(combatant.actor);
+    let items = actor.items;
-    let items = combatant.actor.data.items;
+    if (actor.isCreature()) {
-    let actions = []
-    if (combatant.actor.isCreature()) {
       actions = actions.concat(items.filter(it => RdDItemCompetenceCreature.isCompetenceAttaque(it))
-        .map(competence => RdDItemCompetenceCreature.toArme(competence)));
+        .map(competence => RdDItemCompetenceCreature.toActionArme(competence)));
     } else {
       // Recupération des items 'arme'
       let armes = items.filter(it => RdDItemArme.isArmeUtilisable(it))
@@ -214,14 +228,17 @@ export class RdDCombatManager extends Combat {
         .concat(RdDItemArme.mainsNues());
 
       let competences = items.filter(it => it.type == 'competence');
-      actions = actions.concat(RdDCombatManager.finalizeArmeList(armes, competences, actorData.data.carac));
+      actions = actions.concat(RdDCombatManager.listActionsArmes(armes, competences, actor.system.carac));
 
-      if (actorData.data.attributs.hautrevant.value) {
+      if (actor.system.attributs.hautrevant.value) {
-        actions.push({ name: "Draconic", data: { initOnly: true, competence: "Draconic" } });
+        actions.push({ name: "Draconic", action: 'haut-reve', data: { initOnly: true, competence: "Draconic" } });
       }
     }
 
-    actions.push({ name: "Autre action", data: { initOnly: true, competence: "Autre action" } });
+    return RdDCombatManager._indexActions(actions);
+  }
+
+  static _indexActions(actions) {
     for (let index = 0; index < actions.length; index++) {
       actions[index].index = index;
     }
@@ -235,15 +252,15 @@ export class RdDCombatManager extends Combat {
       let initMissing = game.combat.data.combatants.find(it => !it.initiative);
       if (!initMissing) { // Premier round !
         for (let combatant of game.combat.data.combatants) {
-          let arme = combatant.initiativeData?.arme;
+          let action = combatant.initiativeData?.arme;
           //console.log("Parsed !!!", combatant, initDone, game.combat.current, arme);
-          if (arme && arme.type == "arme") {
+          if (action && action.type == "arme") {
             for (let initData of premierRoundInit) {
-              if (arme.data.initpremierround.toLowerCase().includes(initData.pattern)) {
+              if (Grammar.toLowerCaseNoAccentNoSpace(action.system.initpremierround).includes(initData.pattern)) {
                 let msg = `<h4>L'initiative de ${combatant.actor.name} a été modifiée !</h4>
                       <hr>
                       <div>
-                        Etant donné son ${arme.name}, son initative pour ce premier round est désormais de ${initData.init}.
+                        Etant donné son ${action.name}, son initative pour ce premier round est désormais de ${initData.init}.
                       </div>`
                 ChatMessage.create({ content: msg });
                 game.combat.setInitiative(combatant._id, initData.init);
@@ -281,7 +298,7 @@ export class RdDCombatManager extends Combat {
     ].concat(options);
   }
   /* -------------------------------------------- */
-  static rollInitiativeCompetence(combatantId, arme) {
+  static rollInitiativeAction(combatantId, action) {
     const combatant = game.combat.combatants.get(combatantId);
     if (combatant.actor == undefined) {
       ui.notifications.warn(`Le combatant ${combatant.name} n'est pas associé à un acteur, impossible de déterminer ses actions de combat!`)
@@ -299,34 +316,40 @@ export class RdDCombatManager extends Combat {
     } else if (combatant.actor.getSurprise() == "demi") {
       initOffset = 0;
       initInfo = "Demi Surprise"
-    } else if (arme.name == "Autre action") {
+    } else if (action.action == 'conjurer') {
+      initOffset = 10;
+      caracForInit = combatant.actor.getReveActuel();
+      initInfo = "Possession"
+    } else if (action.action == 'autre') {
       initOffset = 2;
       initInfo = "Autre Action"
-    } else if (arme.name == "Draconic") {
+    } else if (action.action == 'haut-reve') {
       initOffset = 9;
       initInfo = "Draconic"
     } else {
-      compData = Misc.data(RdDItemCompetence.findCompetence(combatant.actor.data.items, arme.data.competence));
+      compData = RdDItemCompetence.findCompetence(combatant.actor.items, arme.system.competence);
-      compNiveau = compData.data.niveau;
+      compNiveau = compData.system.niveau;
-      initInfo = arme.name + " / " + arme.data.competence;
+        initInfo = action.name + " / " + action.system.competence;
-      if (combatant.actor.data.type == 'creature' || combatant.actor.data.type == 'entite') {
+         
-        caracForInit = compData.data.carac_value;
+        if (combatant.actor.type == 'creature' || combatant.actor.type == 'entite') {
-        if (compData.data.categorie == "lancer") {
+          caracForInit = compData.system.carac_value;
-          initOffset = 7;
+          if (compData.system.categorie == "lancer") {
-        }
+            initOffset = 7;
-        else {
+          }
-          initOffset = 5;
+          else {
-        }
+            initOffset = 5;
-      } else {
+          }
-        caracForInit = Misc.data(combatant.actor).data.carac[compData.data.defaut_carac].value;
+        } else {
-        initOffset = RdDCombatManager._baseInitOffset(compData.data.categorie, arme);
+          caracForInit = combatant.actor.system.carac[compData.system.defaut_carac].value;
+          initOffset = RdDCombatManager._baseInitOffset(compData.system.categorie, action);
       }
     }
+
     let malus = combatant.actor.getEtatGeneral(); // Prise en compte état général 
     // Cas des créatures et entités vs personnages
-    let rollFormula = initOffset + "+ ( (" + RdDCombatManager.calculInitiative(compNiveau, caracForInit) + " + " + malus + ") /100)";
+    let rollFormula = RdDCombatManager.formuleInitiative(initOffset, caracForInit, compNiveau, malus);
     // Garder la trace de l'arme/compétence utilisée pour l'iniative
-    combatant.initiativeData = { arme: arme } // pour reclasser l'init au round 0
+    combatant.initiativeData = { arme: action } // pour reclasser l'init au round 0
     game.combat.rollInitiative(combatantId, rollFormula, { initInfo: initInfo });
   }
 
@@ -338,7 +361,7 @@ export class RdDCombatManager extends Combat {
       return 7;
     }
     // Offset de principe pour les armes de jet
-    switch (arme.data.cac) {
+    switch (arme.system.cac) {
       case "empoignade": return 3;
       case "pugilat": return 4;
     }
@@ -349,16 +372,21 @@ export class RdDCombatManager extends Combat {
   static displayInitiativeMenu(html, combatantId) {
     console.log("Combatant ; ", combatantId);
     const combatant = game.combat.combatants.get(combatantId);
-    let armesList = RdDCombatManager.buildListeActionsCombat(combatant);
+    if (! (combatant?.actor) ) {
+      ui.notifications.warn(`Le combatant ${combatant.name ?? combatantId} n'est pas associé à un acteur, impossible de déterminer ses actions de combat!`)
+      return;
+    }
+
+    let actions = RdDCombatManager.listActionsCombat(combatant);
 
     // Build the relevant submenu
-    if (armesList) {
+    if (actions) {
       let menuItems = [];
-      for (let arme of armesList) {
+      for (let action of actions) {
         menuItems.push({
-          name: arme.data.competence,
+          name: action.system.competence,
           icon: "<i class='fas fa-dice-d6'></i>",
-          callback: target => { RdDCombatManager.rollInitiativeCompetence(combatantId, arme) }
+          callback: target => { RdDCombatManager.rollInitiativeAction(combatantId, action) }
         });
       }
       new ContextMenu(html, ".directory-list", menuItems).render();
@@ -428,8 +456,8 @@ export class RdDCombat {
     }
     else {
       const defender = target?.actor;
-      const defenderTokenId = target?.data._id;
+      const defenderTokenId = target?.id;
-      if ( defender.type == 'entite' && defender.data.data.definition.typeentite == 'nonincarne') {
+      if ( defender.type == 'entite' && defender.system.definition.typeentite == ENTITE_NONINCARNE) {
         ui.notifications.warn("Vous ne pouvez pas cibler une entité non incarnée !!!!");
       } else {
         return this.create(attacker, defender, defenderTokenId, target)
@@ -465,15 +493,15 @@ export class RdDCombat {
   }
 
   /* -------------------------------------------- */
-  static onMsgEncaisser(data) {
+  static onMsgEncaisser(msg) {
-    let defender = canvas.tokens.get(data.defenderTokenId).actor;
+    let defender = canvas.tokens.get(msg.defenderTokenId).actor;
     if (Misc.isOwnerPlayerOrUniqueConnectedGM()) {
-      let attackerRoll = data.attackerRoll;
+      let attackerRoll = msg.attackerRoll;
-      let attacker = data.attackerId ? game.actors.get(data.attackerId) : null;
+      let attacker = msg.attackerId ? game.actors.get(msg.attackerId) : null;
 
       defender.encaisserDommages(attackerRoll, attacker);
-      RdDCombat._deleteDefense(attackerRoll.passeArme);
+      const rddCombat = RdDCombat.createForAttackerAndDefender(msg.attackerId, msg.defenderTokenId);
-      RdDCombat._deleteAttaque(data.attackerId);
+      rddCombat?.removeChatMessageActionsPasseArme(attackerRoll.passeArme);
     }
   }
 
@@ -482,11 +510,8 @@ export class RdDCombat {
     let defenderToken = canvas.tokens.get(msg.defenderTokenId);
     if (defenderToken && Misc.isUniqueConnectedGM()) {
       const rddCombat = RdDCombat.createForAttackerAndDefender(msg.attackerId, msg.defenderTokenId);
-      if (rddCombat) {
+      rddCombat?.removeChatMessageActionsPasseArme(msg.defenderRoll.passeArme);
-        const defenderRoll = msg.defenderRoll;
+      rddCombat?._chatMessageDefense(msg.paramChatDefense, msg.defenderRoll);
-        rddCombat.removeChatMessageActionsPasseArme(defenderRoll.passeArme);
-        rddCombat._chatMessageDefense(msg.paramChatDefense, msg.defenderRoll);
-      }
     }
   }
 
@@ -533,8 +558,8 @@ export class RdDCombat {
     this.attacker = attacker;
     this.defender = defender;
     this.target = target;
-    this.attackerId = this.attacker.data._id;
+    this.attackerId = this.attacker.id;
-    this.defenderId = this.defender.data._id;
+    this.defenderId = this.defender.id;
     this.defenderTokenId = defenderTokenId;
   }
 
@@ -666,7 +691,7 @@ export class RdDCombat {
     if (!await this.accorderEntite('avant-attaque')) {
       return;
     }
-    if (arme.data.cac == 'empoignade' && this.attacker.isCombatTouche()) {
+    if (arme.system.cac == 'empoignade' && this.attacker.isCombatTouche()) {
       ChatMessage.create({
         alias: this.attacker.name,
         whisper: ChatUtility.getWhisperRecipientsAndGMs(this.attacker.name),
@@ -709,7 +734,7 @@ export class RdDCombat {
   _prepareAttaque(competence, arme) {
     let rollData = {
       passeArme: randomID(16),
-      mortalite: arme?.data.mortalite,
+      mortalite: arme?.system.mortalite,
       coupsNonMortels: false,
       competence: competence,
       surprise: this.attacker.getSurprise(true),
@@ -726,8 +751,8 @@ export class RdDCombat {
     }
     else {
       // sans armes: à mains nues
-      const niveau = competence.data.niveau;
+      const niveau = competence.system.niveau;
-      const init = RdDCombatManager.calculInitiative(niveau, Misc.templateData(this.attacker).carac['melee'].value);
+      const init = RdDCombatManager.calculInitiative(niveau, this.attacker.system.carac['melee'].value);
       rollData.arme = RdDItemArme.mainsNues({ niveau: niveau, initiative: init });
     }
     return rollData;
@@ -740,9 +765,9 @@ export class RdDCombat {
     // force toujours, sauf empoignade
     // finesse seulement en mélée, pour l'empoignade, ou si la difficulté libre est de -1 minimum
     // rapidité seulement en mêlée, si l'arme le permet, et si la difficulté libre est de -1 minimum
-    const isForce = !rollData.arme.data.empoignade;
+    const isForce = !rollData.arme.system.empoignade;
-    const isFinesse = rollData.arme.data.empoignade || isMeleeDiffNegative;
+    const isFinesse = rollData.arme.system.empoignade || isMeleeDiffNegative;
-    const isRapide = !rollData.arme.data.empoignade && isMeleeDiffNegative && rollData.arme.data.rapide;
+    const isRapide = !rollData.arme.system.empoignade && isMeleeDiffNegative && rollData.arme.system.rapide;
     // si un seul choix possible, le prendre
     if (isForce && !isFinesse && !isRapide) {
       return await this.choixParticuliere(rollData, "force");
@@ -774,10 +799,10 @@ export class RdDCombat {
   async _onAttaqueNormale(attackerRoll) {
     console.log("RdDCombat.onAttaqueNormale >>>", attackerRoll);
 
-    attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker.getBonusDegat(), this.defender.isEntiteCauchemar());
+    attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker.getBonusDegat(), this.defender.isEntite());
     let defenderRoll = { attackerRoll: attackerRoll, passeArme: attackerRoll.passeArme, show: {} }
     attackerRoll.show = {
-      cible: this.target ? this.defender.data.name : 'la cible',
+      cible: this.target ? this.defender.system.name : 'la cible',
       isRecul: (attackerRoll.particuliere == 'force' || attackerRoll.tactique == 'charge')
     }
     await RdDResolutionTable.displayRollData(attackerRoll, this.attacker, 'chat-resultat-attaque.html');
@@ -798,7 +823,7 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   async _sendMessageDefense(attackerRoll, defenderRoll, essaisPrecedents = undefined) {
-    console.log("RdDCombat._sendMessageDefense", attackerRoll, defenderRoll, essaisPrecedents, " / ", this.attacker, this.target, this.attackerId, attackerRoll.competence.data.categorie);
+    console.log("RdDCombat._sendMessageDefense", attackerRoll, defenderRoll, essaisPrecedents, " / ", this.attacker, this.target, this.attackerId, attackerRoll.competence.system.categorie);
 
     this.removeChatMessageActionsPasseArme(attackerRoll.passeArme);
     if (essaisPrecedents) {
@@ -806,16 +831,16 @@ export class RdDCombat {
     }
 
     // # utilisation esquive
-    const corpsACorps = Misc.data(this.defender.getCompetence("Corps à corps", { onMessage: it => console.info(it, this.defender) }));
+    const corpsACorps = this.defender.getCompetence("Corps à corps", { onMessage: it => console.info(it, this.defender) });
-    const esquives = duplicate(this.defender.getCompetences("esquive", { onMessage: it => console.info(it, this.defender) }).map(c => Misc.data(c)));
+    const esquives = duplicate(this.defender.getCompetences("esquive", { onMessage: it => console.info(it, this.defender) }))
     esquives.forEach(e => e.usages = e?.id ? this.defender.getItemUse(e.id) : 0);
 
     const paramChatDefense = {
       passeArme: attackerRoll.passeArme,
       essais: attackerRoll.essais,
       isPossession: this.isPossession(attackerRoll),
-      defender: Misc.data(this.defender),
+      defender: this.defender,
-      attacker: Misc.data(this.attacker),
+      attacker: this.attacker,
       attackerId: this.attackerId,
       esquives: esquives,
       defenderTokenId: this.defenderTokenId,
@@ -823,7 +848,7 @@ export class RdDCombat {
       armes: this._filterArmesParade(this.defender, attackerRoll.competence, attackerRoll.arme),
       diffLibre: attackerRoll.ajustements?.diffLibre?.value ?? 0,
       attaqueParticuliere: attackerRoll.particuliere,
-      attaqueCategorie: attackerRoll.competence.data.categorie,
+      attaqueCategorie: attackerRoll.competence.system.categorie,
       attaqueArme: attackerRoll.arme,
       surprise: this.defender.getSurprise(true),
       dmg: attackerRoll.dmg,
@@ -855,8 +880,8 @@ export class RdDCombat {
     // envoyer le message au destinataire
     game.socket.emit(SYSTEM_SOCKET_ID, {
       msg: "msg_defense", data: {
-        attackerId: this.attacker?.data._id,
+        attackerId: this.attacker?.id,
-        defenderId: this.defender?.data._id,
+        defenderId: this.defender?.id,
         defenderTokenId: this.defenderTokenId,
         defenderRoll: defenderRoll,
         paramChatDefense: paramChatDefense,
@@ -867,13 +892,12 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   _filterArmesParade(defender, competence) {
-    let items = defender.data.items;
+    let items = defender.items;
     items = items.filter(it => RdDItemArme.isArmeUtilisable(it) || RdDItemCompetenceCreature.isCompetenceParade(it))
-      .map(Misc.data);
     for (let item of items) {
-      item.data.nbUsage = defender.getItemUse(item._id); // Ajout du # d'utilisation ce round  
+      item.system.nbUsage = defender.getItemUse(item.id); // Ajout du # d'utilisation ce round  
     }
-    switch (competence.data.categorie) {
+    switch (competence.system.categorie) {
       case 'tir':
       case 'lancer':
         return items.filter(item => RdDItemArme.getCategorieParade(item) == 'boucliers')
@@ -892,7 +916,7 @@ export class RdDCombat {
       whisper: ChatUtility.getWhisperRecipientsAndGMs(this.attacker.name),
       content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-attaque-etotal.html', {
         attackerId: this.attackerId,
-        attacker: Misc.data(this.attacker),
+        attacker: this.attacker,
         defenderTokenId: this.defenderTokenId,
         essais: attackerRoll.essais
       })
@@ -905,7 +929,7 @@ export class RdDCombat {
     console.log("RdDCombat._onEchecTotal >>>", rollData);
 
     const arme = rollData.arme;
-    const avecArme = !['', 'sans-armes', 'armes-naturelles'].includes(arme?.data.categorie_parade ?? '');
+    const avecArme = !['', 'sans-armes', 'armes-naturelles'].includes(arme?.system.categorie_parade ?? '');
     const action = (rollData.attackerRoll ? (arme ? "la parade" : "l'esquive") : "l'attaque");
     ChatUtility.createChatWithRollMode(this.defender.name, {
       content: `<strong>Maladresse à ${action}!</strong> ` + await RdDRollTables.getMaladresse({ arme: avecArme })
@@ -924,7 +948,7 @@ export class RdDCombat {
     console.log("RdDCombat.choixParticuliere >>>", rollData, choix);
 
     if (choix != "rapidite") {
-      this.attacker.incDecItemUse(rollData.arme._id);
+      this.attacker.incDecItemUse(rollData.arme.id);
     }
 
     this.removeChatMessageActionsPasseArme(rollData.passeArme);
@@ -936,7 +960,7 @@ export class RdDCombat {
   async parade(attackerRoll, armeParadeId) {
     const arme = this.defender.getArmeParade(armeParadeId);
     console.log("RdDCombat.parade >>>", attackerRoll, armeParadeId, arme);
-    const competence = Misc.templateData(arme)?.competence;
+    const competence = this.system?.competence;
     if (competence == undefined)
     {
       console.error("Pas de compétence de parade associée à ", arme) ;
@@ -971,12 +995,12 @@ export class RdDCombat {
       passeArme: attackerRoll.passeArme,
       diffLibre: attackerRoll.diffLibre,
       attackerRoll: attackerRoll,
-      competence: Misc.data(this.defender.getCompetence(competenceParade)),
+      competence: this.defender.getCompetence(competenceParade),
       arme: armeParade,
       surprise: this.defender.getSurprise(true),
       needParadeSignificative: ReglesOptionelles.isUsing('categorieParade') && RdDItemArme.needParadeSignificative(attackerRoll.arme, armeParade),
       needResist: RdDItemArme.needArmeResist(attackerRoll.arme, armeParade),
-      carac: Misc.templateData(this.defender).carac,
+      carac: this.defender.system.carac,
       show: {}
     };
 
@@ -1005,8 +1029,7 @@ export class RdDCombat {
     await this.computeRecul(defenderRoll);
     await this.computeDeteriorationArme(defenderRoll);
     await RdDResolutionTable.displayRollData(defenderRoll, this.defender, 'chat-resultat-parade.html');
-
+    this.removeChatMessageActionsPasseArme(defenderRoll.passeArme);
-    RdDCombat._deleteDefense(defenderRoll.passeArme);
   }
 
   /* -------------------------------------------- */
@@ -1021,7 +1044,7 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   async esquive(attackerRoll, compId, compName) {
-    const esquive = Misc.data(this.defender.getCompetence(compId) ?? this.defender.getCompetence(compName));
+    const esquive = this.defender.getCompetence(compId) ?? this.defender.getCompetence(compName)
     if (esquive == undefined) {
       ui.notifications.error(this.defender.name + " n'a pas de compétence " + compName);
       return;
@@ -1055,7 +1078,7 @@ export class RdDCombat {
       competence: competence,
       surprise: this.defender.getSurprise(true),
       surpriseDefenseur: this.defender.getSurprise(true),
-      carac: Misc.templateData(this.defender).carac,
+      carac: this.defender.system.carac,
       show: {}
     };
 
@@ -1077,7 +1100,7 @@ export class RdDCombat {
   async _onEsquiveNormale(defenderRoll) {
     console.log("RdDCombat._onEsquiveNormal >>>", defenderRoll);
     await RdDResolutionTable.displayRollData(defenderRoll, this.defender, 'chat-resultat-esquive.html');
-    RdDCombat._deleteDefense(defenderRoll.passeArme);
+    this.removeChatMessageActionsPasseArme(defenderRoll.passeArme);
   }
 
   /* -------------------------------------------- */
@@ -1105,11 +1128,11 @@ export class RdDCombat {
 
         const dmg = attackerRoll.dmg.dmgArme + attackerRoll.dmg.dmgActor;
         let arme = defenderRoll.arme;
-        let resistance = Misc.toInt(arme.data.resistance);
+        let resistance = Misc.toInt(arme.system.resistance);
-        if (arme.data.magique) {
+        if (arme.system.magique) {
           defenderRoll.show.deteriorationArme = 'resiste'; // Par défaut
-          if (arme.data.resistance_magique == undefined) arme.data.resistance_magique = 0; // Quick fix
+          if (arme.system.resistance_magique == undefined) arme.system.resistance_magique = 0; // Quick fix
-          if (dmg > arme.data.resistance_magique) { // Jet uniquement si dommages supérieur à résistance magique (cf. 274)
+          if (dmg > arme.system.resistance_magique) { // Jet uniquement si dommages supérieur à résistance magique (cf. 274)
             // Jet de résistance de l'arme de parade (p.132)
             let resistRoll = await RdDResolutionTable.rollData({
               caracValue: resistance,
@@ -1117,7 +1140,7 @@ export class RdDCombat {
               showDice: HIDE_DICE
             });
             if (!resistRoll.rolled.isSuccess) {
-              let perteResistance = (dmg - arme.data.resistance_magique)
+              let perteResistance = (dmg - arme.system.resistance_magique)
               resistance -= perteResistance;
               defenderRoll.show.deteriorationArme = resistance <= 0 ? 'brise' : 'perte';
               defenderRoll.show.perteResistance = perteResistance;
@@ -1144,7 +1167,7 @@ export class RdDCombat {
         if (ReglesOptionelles.isUsing('defenseurDesarme') && resistance > 0 && RdDItemArme.getCategorieParade(defenderRoll.arme) != 'boucliers') {
           let desarme = await RdDResolutionTable.rollData({
             caracValue: this.defender.getForce(),
-            finalLevel: Misc.toInt(defenderRoll.competence.data.niveau) - dmg,
+            finalLevel: Misc.toInt(defenderRoll.competence.system.niveau) - dmg,
             showDice: HIDE_DICE
           });
           defenderRoll.show.desarme = desarme.rolled.isEchec;
@@ -1187,7 +1210,7 @@ export class RdDCombat {
   _computeImpactRecul(attaque) {
     const taille = this.defender.getTaille();
     const force = this.attacker.getForce();
-    const dommages = attaque.arme.data.dommagesReels ?? attaque.arme.data.dommages;
+    const dommages = attaque.arme.system.dommagesReels ?? attaque.arme.system.dommages;
     return taille - (force + dommages);
   }
 
@@ -1217,7 +1240,6 @@ export class RdDCombat {
         }
       });
     }
-    RdDCombat._deleteDefense(attackerRoll.passeArme);
     this.removeChatMessageActionsPasseArme(attackerRoll.passeArme);
   }
 
@@ -1226,12 +1248,12 @@ export class RdDCombat {
   async accorderEntite(when = 'avant-encaissement') {
     if (when != game.settings.get(SYSTEM_RDD, "accorder-entite-cauchemar")
       || this.defender == undefined
-      || !this.defender.isEntiteCauchemar()
+      || !this.defender.isEntite([ENTITE_INCARNE])
-      || this.defender.isEntiteCauchemarAccordee(this.attacker)) {
+      || this.defender.isEntiteAccordee(this.attacker)) {
       return true;
     }
 
-    let rolled = await RdDResolutionTable.roll(this.attacker.getReveActuel(), - Number(Misc.templateData(this.defender).carac.niveau.value));
+    let rolled = await RdDResolutionTable.roll(this.attacker.getReveActuel(), - Number(this.defender.system.carac.niveau.value));
 
     let message = {
       content: "Jet de points actuels de rêve à " + rolled.finalLevel + RdDResolutionTable.explain(rolled) + "<br>",
@@ -1259,7 +1281,7 @@ export class RdDCombat {
       isSonne: actor.getSonne(),
       blessuresStatus: actor.computeResumeBlessure(),
       SConst: actor.getSConst(),
-      actorId: actor.data._id,
+      actorId: actor.id,
       isGrave: false,
       isCritique: false
     }

module/rdd-commands.js

@@ -7,6 +7,7 @@ import { RdDItemCompetence } from "./item-competence.js";
 import { Misc } from "./misc.js";
 import { RdDCarac } from "./rdd-carac.js";
 import { RdDDice } from "./rdd-dice.js";
+import { RdDMeteo } from "./rdd-meteo.js";
 import { RdDNameGen } from "./rdd-namegen.js";
 import { RdDResolutionTable } from "./rdd-resolution-table.js";
 import { RdDRollResolutionTable } from "./rdd-roll-resolution-table.js";
@@ -34,6 +35,7 @@ export class RdDCommands {
       rddCommands.registerCommand({ path: ["/table", "souffle"], func: (content, msg, params) => RdDRollTables.getSouffle(true), descr: " Tire un Souffle de Dragon" });
       rddCommands.registerCommand({ path: ["/table", "comp"], func: (content, msg, params) => RdDRollTables.getCompetence(true), descr: "Tire une compétence au hasard" });
       rddCommands.registerCommand({ path: ["/table", "tarot"], func: (content, msg, params) => RdDRollTables.getTarot(true), descr: "Tire une carte du Tarot Draconique" });
+      rddCommands.registerCommand({ path: ["/meteo"], func: (content, msg, params) => rddCommands.getMeteo(msg, params), descr: "Propose une météo marine" });
       rddCommands.registerCommand({ path: ["/nom"], func: (content, msg, params) => RdDNameGen.getName(msg, params), descr: "Génère un nom aléatoire" });
 
       rddCommands.registerCommand({
@@ -274,9 +276,11 @@ export class RdDCommands {
           diff = 0;
         }
         const caracName = params[0];
-        const compName = length > 1 ? Misc.join(params.slice(1, length), ' ') : undefined;
+        let competence = length > 1 ? actors[0].getCompetence(Misc.join(params.slice(1, length), ' ')) : undefined;
-        for (let actor of actors) {
+        if (competence) {
-          await actor.rollCaracCompetence(caracName, compName, diff);
+          for (let actor of actors) {
+            await actor.rollCaracCompetence(caracName, competence.name, diff);
+          }
         }
         return;
       }
@@ -354,7 +358,7 @@ export class RdDCommands {
 
   async supprimerSignesDraconiquesEphemeres() {
     game.actors.forEach(actor => {
-      const ephemeres = actor.filterItems(item => Misc.data(item).type = 'signedraconique' && Misc.data(item).data.ephemere)
+      const ephemeres = actor.filterItems(item => item.type = 'signedraconique' && item.system.ephemere)
         .map(item => item.id);
       if (ephemeres.length > 0) {
         actor.deleteEmbeddedDocuments("Item", ephemeres);
@@ -398,5 +402,8 @@ export class RdDCommands {
     }
     return true;
   }
+  async getMeteo(msg, params) {
+    return await RdDMeteo.getMeteo();
+  }
 }
 

module/rdd-herbes.js

@@ -8,11 +8,11 @@ export class RdDHerbes extends Item {
 
   /* -------------------------------------------- */
   static isHerbeSoin( botaniqueItem ) {
-    return Misc.templateData(botaniqueItem).categorie == 'Soin';
+    return botaniqueItem.categorie == 'Soin';
   }
   /* -------------------------------------------- */
   static isHerbeRepos( botaniqueItem ) {
-    return Misc.templateData(botaniqueItem).categorie == 'Repos';
+    return botaniqueItem.categorie == 'Repos';
   }
 
   /* -------------------------------------------- */
@@ -25,7 +25,7 @@ export class RdDHerbes extends Item {
   static buildHerbesList(listHerbes, max) {
     let list = {}
     for ( let herbe of listHerbes) {
-      let herbeData = Misc.templateData(herbe);
+      let herbeData = herbe.system
       let brins = max - herbeData.niveau;
       list[herbe.data.name] = `${herbe.data.name} (Bonus: ${herbeData.niveau}, Brins: ${brins})`;
     }
@@ -65,7 +65,7 @@ export class RdDHerbes extends Item {
     if ( Number(formData.data.herbebrins) ) {
     let herbe = herbesList.find(item => item.name.toLowerCase() == formData.data.herbe.toLowerCase() );
       if( herbe ) {
-        let herbeData = Misc.templateData(herbe);
+        let herbeData = herbe.system;
         let brinsBase = max - herbeData.niveau;
         //console.log(herbeData, brinsBase, formData.data.herbebrins);
         formData.data.herbebonus = Math.max(herbeData.niveau - Math.max(brinsBase - formData.data.herbebrins, 0), 0);

module/rdd-hotbar-drop.js

@@ -11,11 +11,18 @@ export class RdDHotbar {
   static initDropbar( ) {
 
     Hooks.on("hotbarDrop", async (bar, documentData, slot) => {
+
+      
     // Create item macro if rollable item - weapon, spell, prayer, trait, or skill
     if (documentData.type == "Item") {
-      if (documentData.data.type != "arme" && documentData.data.type != "competence" )
+      let item = fromUuidSync(documentData.uuid)
+      if (item == undefined) {
+        item = this.actor.items.get( documentData.uuid )
+      }
+      console.log( "DROP", documentData, item)
+      if (!item || (item.type != "arme" && item.type != "competence" ) ) {
         return
-      let item = documentData.data
+      }
       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) {
@@ -28,6 +35,7 @@ export class RdDHotbar {
       }
       game.user.assignHotbarMacro(macro, slot);
     }
+
     // 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);
@@ -35,7 +43,7 @@ export class RdDHotbar {
       let macro = game.macros.contents.find(m => (m.name === actor.name) && (m.command === command));
       if (!macro) {
         macro = await Macro.create({
-          name: actor.data.name,
+          name: actor.name,
           type: "script",
           img: actor.data.img,
           command: command
@@ -45,12 +53,12 @@ export class RdDHotbar {
     }
     // Create a macro to open the journal sheet of the journal dropped on the hotbar
     else if (documentData.type == "JournalEntry") {
-      let journal = game.journal.get(documentData.id);
+      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.data.name,
+          name: journal.name,
           type: "script",
           img: "systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp",
           command: command
@@ -69,8 +77,10 @@ export class RdDHotbar {
     if (speaker.token) actor = game.actors.tokens[speaker.token];
     if (!actor) actor = game.actors.get(speaker.actor);
 
-    let item = Misc.data(actor?.items.find(it => it.name === itemName && it.type == itemType));
+    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`);
+    if (!item){
+      return ui.notifications.warn(`Impossible de trouver l'objet de cette macro`);
+    } 
 
     // Trigger the item roll
     switch (item.type) {

module/rdd-main.js

@@ -221,19 +221,20 @@ function messageDeBienvenue() {
 // Register world usage statistics
 function registerUsageCount( registerKey ) {
   if ( game.user.isGM ) {
-    game.settings.register(registerKey, "world-key", {
+    game.settings.register("world", "world-key", {
       name: "Unique world key",
       scope: "world",
       config: false,
+      default: "NONE",
       type: String
     });
 
-    let worldKey = game.settings.get(registerKey, "world-key")
+    let worldKey = game.settings.get("world", "world-key")
     if ( worldKey == undefined || worldKey == "" ) {
       worldKey = randomID(32)
-      game.settings.set(registerKey, "world-key", worldKey )
+      game.settings.set("world", "world-key", worldKey )
     }
-    let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.data.version}"`
+    let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
     $.ajax(regURL)
     /* -------------------------------------------- */
   }

module/rdd-meteo.js

@@ -0,0 +1,134 @@
+
+const vents = [
+  { min: 0, max: 0, valeur: 'Calme' },
+  { min: 1, max: 1, valeur: 'Légère brise' },
+  { min: 2, max: 2, valeur: 'Jolie brise' },
+  { min: 3, max: 3, valeur: 'Bonne brise' },
+  { min: 4, max: 4, valeur: 'Vent frais' },
+  { min: 5, max: 5, valeur: 'Coup de vent' },
+  { min: 6, max: 6, valeur: 'Fort coup de vent' },
+  { min: 7, max: 9, valeur: 'Tempête' },
+  { min: 10, max: 13, valeur: 'Violente tempête' },
+  { min: 14, valeur: 'Ouragan' },
+]
+const mers = [
+  { min: 0, max: 0, valeur: 'Calme' },
+  { min: 1, max: 1, valeur: 'Belle' },
+  { min: 2, max: 2, valeur: 'Peu agitée' },
+  { min: 3, max: 3, valeur: 'Agitée' },
+  { min: 4, max: 4, valeur: 'Forte' },
+  { min: 5, max: 6, valeur: 'Très forte' },
+  { min: 7, max: 9, valeur: 'Grosse' },
+  { min: 10, max: 13, valeur: 'Très grosse' },
+  { min: 14, valeur: 'Énorme' },
+]
+
+const nuages = [
+  { min: 0, max: 3, valeur: 'dégagé' },
+  { min: 4, max: 6, valeur: 'passages nuageux' },
+  { min: 7, max: 9, valeur: 'nuageux',  },
+  { min: 10, max: 10, valeur: 'brouillard' },
+  { min: 11, max: 12, valeur: 'bruine' },
+  { min: 13, valeur: 'très nuageux' },
+]
+
+const pluies = [
+  { min: 0, max: 4, valeur: 'aucune' },
+  { min: 5, max: 5, valeur: 'bruine, crachin, éparse' },
+  { min: 6, max: 7, valeur: 'averses' },
+  { min: 8, max: 10, valeur: 'pluvieux', },
+  { min: 11, max: 13, valeur: 'forte pluie' },
+  { min: 14, valeur: 'déluge' },
+]
+
+const temperatures = [
+  { max: -14, valeur: 'glaciale' },
+  { min: -13, max: -10, valeur: 'Très froide' },
+  { min: -9, max: -7, valeur: 'froide' },
+  { min: -6, max: -4, valeur: 'fraîche' },
+  { min: -3, max: 3, valeur: 'de saison' },
+  { min: 4, max: 6, valeur: 'élevée' },
+  { min: 7, max: 9, valeur: 'chaude' },
+  { min: 10, max: 13, valeur: 'torride' },
+  { min: 14, valeur: 'caniculaire' },
+]
+
+export class RdDMeteo {
+  static async getForce() {
+    const roll = new Roll(`1dr`);
+    await roll.evaluate({ async: true });
+    return roll.total;
+  }
+
+  static async getPluie(nuage) {
+    return nuage <= 3 ? 0 : await RdDMeteo.getForce();
+  }
+
+  static async getTemperature() {
+    const degre = await RdDMeteo.getForce();
+    const rollChaudFroid = new Roll('1d2');
+    await rollChaudFroid.evaluate({ async: true });
+    const chaudFroid = rollChaudFroid.total == 1;
+    return chaudFroid.total ? degre : -degre;
+  }
+
+  static async getDirection(direction) {
+    const roll = new Roll(`1d16`);
+    await roll.evaluate({ async: true });
+    switch (roll.total % 16) {
+      case 0: return 'Nord';
+      case 1: return 'Nord Nord Est';
+      case 2: return 'Nord Est';
+      case 3: return 'Est Nord Est';
+      case 4: return 'Est';
+      case 5: return 'Est Sud Est';
+      case 6: return 'Sud Est';
+      case 7: return 'Sud Sud Est';
+      case 8: return 'Sud';
+      case 9: return 'Sud Sud Ouest';
+      case 10: return 'Sud Ouest';
+      case 11: return 'Ouest Sud Ouest';
+      case 12: return 'Ouest';
+      case 13: return 'Ouest Nord Ouest';
+      case 14: return 'Nord Ouest';
+      case 15: return 'Nord Nord Ouest';
+    }
+    return undefined;
+  }
+
+  static async getMeteo() {
+    const vent = await RdDMeteo.getForce();
+    const mer = await RdDMeteo.getForce();
+    const nuage = await RdDMeteo.getForce();
+    const pluie = await RdDMeteo.getPluie(nuage);
+    const temperature = await RdDMeteo.getTemperature();
+    const meteo = {
+      vent: { force: vent, direction: await RdDMeteo.getDirection(), },
+      mer: { force: mer, direction: await RdDMeteo.getDirection(), },
+      temperature: { force: temperature },
+      nuage: { force: nuage, },
+      pluie: { force: pluie },
+    }
+    meteo.vent.description = RdDMeteo.vent(meteo.vent.force);
+    meteo.mer.description = RdDMeteo.mer(meteo.mer.force),
+    meteo.temperature.description = RdDMeteo.temperature(meteo.temperature.force);
+    meteo.nuage.description = RdDMeteo.nuage(meteo.nuage.force);
+    meteo.pluie.description = RdDMeteo.pluie(meteo.pluie.force);
+
+    ChatMessage.create({
+      content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-meteo.html', meteo),
+      whisper: ChatMessage.getWhisperRecipients('GM')
+    });
+  }
+
+  static description(liste, force, valeur = it => it.valeur) {
+    let select = liste.find(it => (it.min == undefined || it.min <= force) && (it.max == undefined || force <= it.max));
+    return valeur(select ?? liste[0]);
+  }
+
+  static vent(force) { return this.description(vents, force); }
+  static mer(force) { return this.description(mers, force); }
+  static nuage(force) { return this.description(nuages, force); }
+  static pluie(force) { return this.description(pluies, force); }
+  static temperature(force) { return this.description(temperatures, force); }
+}

module/rdd-namegen.js

@@ -1,19 +1,29 @@
+import { RdDActor } from "./actor.js";
 import { Misc } from "./misc.js";
 import { RdDDice } from "./rdd-dice.js";
 
-const words = [ 'pore', 'pre', 'flor', 'lane', 'turlu', 'pin', 'a', 'alph', 'i', 'onse', 'iane', 'ane', 'zach', 'arri', 'ba', 'bo', 'bi', 
+const words = ['pore', 'pre', 'flor', 'lane', 'turlu', 'pin', 'a', 'alph', 'i', 'onse', 'iane', 'ane', 'zach', 'arri', 'ba', 'bo', 'bi',
-              'alta', 'par', 'pir', 'zor', 'zir', 'de', 'pol', 'tran', 'no', 'la', 'al' , 'pul', 'one', 'ner', 'nur', 'mac', 'mery',
+  'alta', 'par', 'pir', 'zor', 'zir', 'de', 'pol', 'tran', 'no', 'la', 'al', 'pul', 'one', 'ner', 'nur', 'mac', 'mery',
-              'cat', 'do', 'di', 'der', 'er', 'el', 'far', 'fer', 'go', 'guer', 'hot', 'jor', 'jar', 'ji', 'kri', 'ket', 'lor', 'hur',
+  'cat', 'do', 'di', 'der', 'er', 'el', 'far', 'fer', 'go', 'guer', 'hot', 'jor', 'jar', 'ji', 'kri', 'ket', 'lor', 'hur',
-              'lar', 'lir', 'lu', 'pot', 'pro', 'pra', 'pit', 'qua', 'qui', 're', 'ral', 'sal', 'sen', 'ted', 'to', 'ta', 'lars', 'ver',
+  'lar', 'lir', 'lu', 'pot', 'pro', 'pra', 'pit', 'qua', 'qui', 're', 'ral', 'sal', 'sen', 'ted', 'to', 'ta', 'lars', 'ver',
-              'vin', 'ov', 'wal', 'ry', 'ly', '' ];
+  'vin', 'ov', 'wal', 'ry', 'ly', ''];
 
 /* -------------------------------------------- */
 export class RdDNameGen {
 
-  static async getName( msg, params ) {
+  static async getName(msg, params) {
-    let name = Misc.upperFirst( await RdDDice.rollOneOf(words) + await RdDDice.rollOneOf(words) )
+    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-command-nom.html`, {
-    //console.log(name);
+      nom: Misc.upperFirst(await RdDDice.rollOneOf(words) + await RdDDice.rollOneOf(words))
-    ChatMessage.create( { content: `Nom : ${name}`, whisper: ChatMessage.getWhisperRecipients("GM") } );
+    });
+    ChatMessage.create({ content: html, whisper: ChatMessage.getWhisperRecipients("GM") });
   }
 
+  static async onCreerActeur(event) {
+    const button = event.currentTarget;
+    await RdDActor.create({
+        name: button.attributes['data-nom'].value,
+        type: button.attributes['data-type'].value
+      },
+      {renderSheet: true});
+  }
 }

module/rdd-possession.js

@@ -14,100 +14,86 @@ Donc la compétence Possession ne peut être démarrée que par le MJ.
 export class RdDPossession {
 
   /* -------------------------------------------- */
-  static init() {    
+  static init() {
   }
 
   /* -------------------------------------------- */
-  static searchPossessionFromEntite( attacker, defender) {
+  static searchPossessionFromEntite(attacker, defender) {
-    let poss = attacker.data.items.find( poss => poss.type == 'possession' && poss.data.data.possedeid == defender.data._id);
+    let poss = attacker.items.find(poss => poss.type == 'possession' && poss.system.possedeid == defender.id);
     if (!poss) {
-      poss = defender.data.items.find( poss => poss.type == 'possession' && poss.data.data.possedeid == defender.data._id);
+      poss = defender.items.find(poss => poss.type == 'possession' && poss.system.possedeid == defender.id);
     }
     return poss && duplicate(poss) || undefined;
   }
 
   /* -------------------------------------------- */
-  static updateEtatPossession( possession ) {
+  static updateEtatPossession(possession) {
     possession.ptsConjuration = 0
     possession.ptsPossession = 0
     console.log("Possession", possession)
-    if ( possession.data.compteur > 0) {
+    if (possession.system.compteur > 0) {
-      possession.ptsPossession = possession.data.compteur
+      possession.ptsPossession = possession.system.compteur
-    } 
+    }
-    if ( possession.data.compteur < 0) {
+    if (possession.system.compteur < 0) {
-      possession.ptsConjuration = Math.abs(possession.data.compteur)
+      possession.ptsConjuration = Math.abs(possession.system.compteur)
-    } 
+    }
     possession.isPosseder = false
     possession.isConjurer = false
-    if (possession.ptsPossession >= 2 ) {
+    if (possession.ptsPossession >= 2) {
       possession.isPosseder = true
     }
-    if (possession.ptsConjuration >= 2 ) {      
+    if (possession.ptsConjuration >= 2) {
       possession.isConjurer = true
     }
   }
 
   /* -------------------------------------------- */
-  static async resultConjuration( rollData) {
+  static async resultConjuration(rollData) {
-    let actor = game.actors.get(rollData.possession.data.possedeid)
+    let actor = game.actors.get(rollData.possession.system.possedeid)
-    if ( !rollData.rolled.isSuccess ) {
+    if (!rollData.rolled.isSuccess) {
-      if( rollData.isECNIDefender) {
+      if (rollData.isECNIDefender) {
-        rollData.possession.data.compteur--
+        rollData.possession.system.compteur--
       } else {
-        rollData.possession.data.compteur++
+        rollData.possession.system.compteur++
       }
-      let update = { _id: rollData.possession._id, "data.compteur": rollData.possession.data.compteur }
+      let update = { _id: rollData.possession._id, "system.compteur": rollData.possession.system.compteur }
       await actor.updateEmbeddedDocuments('Item', [update])
     }
-      
+
     this.updateEtatPossession(rollData.possession)
     await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-possession.html')
-    if ( rollData.possession.isPosseder || rollData.possession.isConjurer) {
+    if (rollData.possession.isPosseder || rollData.possession.isConjurer) {
       actor.deleteEmbeddedDocuments("Item", [rollData.possession._id])
     }
   }
 
   /* -------------------------------------------- */
-  static async onDefensePossession( attackerId, defenderId, possessionId) {
+  static async onDefensePossession(attackerId, defenderId, possessionId) {
     let attacker = game.actors.get(attackerId)
     let defender = game.actors.get(defenderId)
-
+    let possession = attacker.getPossession(possessionId) ?? defender.getPossession(possessionId) ;
-    let possession = attacker.items.find( item => item.type =='possession' && item.data.data.possessionid == possessionId)
+    if (!possession) {
-    if ( !possession ) {    
+      ui.notifications.warn("Une erreur s'est produite : Aucune possession trouvée !!")
-      possession = defender.items.find( item => item.type =='possession' && item.data.data.possessionid == possessionId)
+      return
-      if ( !possession) {
-        ui.notifications.warn("Une erreur s'est produite : Aucune possession trouvée !!")
-        return
-      }
     }
-    possession = duplicate(possession)
-
     // Update for draconic roll
     let rollData = {
-      possession: possession
+      mode: "conjuration",
+      isECNIDefender: defender.type == "entite",
+      possession: duplicate(possession),
+      attacker: attacker,
+      defender: defender,
+      competence: defender.getDraconicOuPossession(),
+      selectedCarac: defender.system.data.carac.reve,
+      forceCarac: { 'reve-actuel': { label: "Rêve Actuel", value: defender.getReveActuel() } }
     }
-    rollData.actor = defender
+    rollData.competence.system.defaut_carac = 'reve-actuel'
-    if ( defender.type == "personnage") {
+
-      rollData.competence = duplicate(defender.getDraconicOrZero())
-      rollData.competence.data.defaut_carac = 'reve-actuel'
-      rollData.forceCarac = { 'reve-actuel': { label: "Rêve Actuel", value: defender.getReveActuel() } }
-      rollData.selectedCarac = defender.data.data.carac.reve
-      rollData.isECNIDefender = false
-    } else {
-      rollData.competence = duplicate(defender.getCompetence("Possession"))
-      rollData.competence.data.defaut_carac = "reve"
-      rollData.forceCarac = { 'reve': { label: "Rêve", value: defender.data.data.carac.reve.value } }
-      rollData.selectedCarac = defender.data.data.carac.reve
-      rollData.isECNIDefender = true
-      //RdDItemCompetenceCreature.setRollDataCreature( rollData )
-    }
-    rollData.mode =  "conjuration"
-    rollData.possesseur = attacker.name
 
     const dialog = await RdDRoll.create(defender, rollData,
       {
         html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-defense-possession.html',
-        options: { height: 400 }
+        options: { height: 450 }
       },
       {
         name: 'conjurer',
@@ -121,54 +107,38 @@ export class RdDPossession {
   }
 
   /* -------------------------------------------- */
-  static async _onRollPossession( rollData, isSuccess ) {
+  static async onAttaquePossession(attacker, competence, possession = undefined) {
-    let possession = rollData.possession
-    possession.isSuccess = isSuccess
-    this.updateEtatPossession( possession)
-    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-possession.html');
-  }
-
-  /* -------------------------------------------- */
-  static async managePossession(attacker, competence, possession=undefined) {    
-    
     const target = RdDCombat.getTarget()
     if (target == undefined) {
       ui.notifications.warn((game.user.targets?.size ?? 0) > 1
         ? "Vous devez choisir <strong>une seule</strong> cible à posséder!"
         : "Vous devez choisir une cible à posséder!");
       return;
-    }    
-    
-    const defender = target.actor
-    if ( !possession) {
-      possession = this.searchPossessionFromEntite( attacker, defender)
-      if ( !possession) {
-        possession = await this.createPossession(attacker, defender)
-      }
     }
-    possession = duplicate(possession)
 
+    const defender = target.actor;
+    possession = duplicate(possession ?? this.searchPossessionFromEntite(attacker, defender) ??(await this.createPossession(attacker, defender)));
+    
     this.updateEtatPossession(possession)
     let rollData = {
+      mode: "possession",
+      isECNIDefender: defender.type == "entite",
       competence: competence,
       possession: possession,
-      possede: defender.name,
+      attacker: attacker,
-      possesseur: attacker.name,
+      defender: defender
-      attackerId: attacker.data._id,
-      defenderId: defender.data._id,
-      mode: "possession"
     };
-    if ( attacker.isCreature()) {
+    if (attacker.isCreature()) {
       RdDItemCompetenceCreature.setRollDataCreature(rollData)
     }
 
-    const dialog = await RdDRoll.create( attacker, rollData,
+    const dialog = await RdDRoll.create(attacker, rollData,
       {
         html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html',
         options: { height: 540 }
       }, {
       name: 'jet-possession',
-      label: 'Possession: ',
+      label: rollData.isECNIDefender ? 'Conjurer la possession' : 'Possession',
       callbacks: [
         { condition: r => (r.rolled.isSuccess), action: async r => await this._onRollPossession(r, true) },
         { condition: r => (r.rolled.isEchec), action: async r => await this._onRollPossession(r, false) },
@@ -178,11 +148,18 @@ export class RdDPossession {
   }
 
   /* -------------------------------------------- */
-  static async createPossession( attacker, defender ) {
+  static async _onRollPossession(rollData, isSuccess) {
+    rollData.possession.isSuccess = isSuccess;
+    this.updateEtatPossession(rollData.possession);
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-possession.html');
+  }
+
+  /* -------------------------------------------- */
+  static async createPossession(attacker, defender) {
     let possessionData = {
       name: "Possession en cours de " + attacker.name, type: 'possession',
       img: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp",
-      data: { description: "", typepossession: attacker.name, possede: false, possessionid: randomID(16), possesseurid: attacker.data._id, possedeid: defender.data._id, date: 0, compteur: 0 }
+      data: { description: "", typepossession: attacker.name, possede: false, possessionid: randomID(16), possesseurid: attacker.id, possedeid: defender.id, date: 0, compteur: 0 }
     }
     // Creates only the possession on the personnage side
     let poss = await defender.createEmbeddedDocuments('Item', [possessionData])

module/rdd-roll-encaisser.js

@@ -1,3 +1,5 @@
+import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE } from "./constants.js";
+
 /**
  * Extend the base Dialog entity by defining a custom window to perform roll.
  * @extends {Dialog}
@@ -7,15 +9,19 @@ export class RdDEncaisser extends Dialog {
   /* -------------------------------------------- */
   constructor(html, actor) {
     // Common conf
-    const buttonsCreatures = {
+    let buttons = {};
-      "mortel": { label: "Mortel", callback: html => this.performEncaisser("mortel") },
+    if (!actor.isEntite()){
-      "non-mortel": { label: "Non-mortel", callback: html => this.performEncaisser("non-mortel") },
+      buttons = {
-      "sonne": { label: "Sonné", callback: html => this.actor.setSonne() },
+        "mortel": { label: "Mortel", callback: html => this.performEncaisser("mortel") },
-    };
+        "non-mortel": { label: "Non-mortel", callback: html => this.performEncaisser("non-mortel") },
-    const buttonsEntitesCauchemar = {
+        "sonne": { label: "Sonné", callback: html => this.actor.setSonne() },
-      "cauchemar": { label: "cauchemar", callback: html => this.performEncaisser("cauchemar") }
+      };
-    };
+    }
-    const buttons = actor.isEntiteCauchemar() ? buttonsEntitesCauchemar : buttonsCreatures;
+    else if (actor.isEntite([ENTITE_BLURETTE, ENTITE_INCARNE])){
+      buttons = {
+        "cauchemar": { label: "cauchemar", callback: html => this.performEncaisser("cauchemar") }
+      }
+    }
 
     let dialogConf = {
       title: "Jet d'Encaissement",
@@ -24,7 +30,6 @@ export class RdDEncaisser extends Dialog {
       default: "mortel"
     }
 
-
     let dialogOptions = {
       classes: ["rdddialog"],
       width: 320,

module/rdd-roll.js

@@ -38,25 +38,25 @@ export class RdDRoll extends Dialog {
 
   /* -------------------------------------------- */
   static _setDefaultOptions(actor, rollData) {
-    const actorData = Misc.data(actor);
+    const actorData = actor.system
     let defaultRollData = {
       alias: actor.name,
       ajustementsConditions: CONFIG.RDD.ajustementsConditions,
       difficultesLibres: CONFIG.RDD.difficultesLibres,
       etat: actor.getEtatGeneral(),
       moral: actor.getMoralTotal(), /* La valeur du moral pour les jets de volonté */
-      carac: actorData.data.carac,
+      carac: actorData.carac,
       finalLevel: 0,
       diffConditions: 0,
-      diffLibre: rollData.competence?.data.default_diffLibre ?? 0,
+      diffLibre: rollData.competence?.system.default_diffLibre ?? 0,
       malusArmureValue: actor.getMalusArmure(),
-      surencMalusFlag: actor.isPersonnage() ? (actorData.data.compteurs.surenc.value < 0) : false,
+      surencMalusFlag: actor.isPersonnage() ? (actorData.compteurs.surenc.value < 0) : false,
       surencMalusValue: actor.computeMalusSurEncombrement(),
       useMalusSurenc: false,
       useMoral: false,     /* Est-ce que le joueur demande d'utiliser le moral ? Utile si le joueur change plusieurs fois de carac associée. */
       perteMoralEchec: false, /* Pour l'affichage dans le chat */
       use: { libre: true, conditions: true, surenc: false, encTotal: false },
-      isMalusEncombrementTotal: RdDItemCompetence.isMalusEncombrementTotal(rollData.competence),
+      isMalusEncombrementTotal: rollData.competence ? RdDItemCompetence.isMalusEncombrementTotal(rollData.competence) : 0,
       useMalusEncTotal: false,
       encTotal: actor.getEncTotal(),
       ajustementAstrologique: actor.ajustementAstrologique(),
@@ -67,7 +67,7 @@ export class RdDRoll extends Dialog {
     }
     // Mini patch :Ajout du rêve actuel
     if ( actorData.type == "personnage") {
-      defaultRollData.carac["reve-actuel"] = actorData.data.reve.reve
+      defaultRollData.carac["reve-actuel"] = actorData.reve.reve
     }
 
     mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
@@ -165,17 +165,17 @@ export class RdDRoll extends Dialog {
 
     function onLoad() {
       let rollData = dialog.rollData;
-      console.log(rollData);
+      console.log('Ouverture RdDRoll', rollData);
       // Update html, according to data
       if (rollData.competence) {
-        const defaut_carac = Misc.templateData(rollData.competence).defaut_carac;
+        const defaut_carac = rollData.competence.system.defaut_carac
         // Set the default carac from the competence item
         rollData.selectedCarac = rollData.carac[defaut_carac];
         $("#carac").val(defaut_carac);
       }
       if (rollData.selectedSort) {
         dialog.setSelectedSort(rollData.selectedSort);
-        $(".draconic").val(rollData.selectedSort.data.listIndex); // Uniquement a la selection du sort, pour permettre de changer 
+        $(".draconic").val(rollData.selectedSort.system.listIndex); // Uniquement a la selection du sort, pour permettre de changer 
       }
       RdDItemSort.setCoutReveReel(rollData.selectedSort);
       $("#diffLibre").val(Misc.toInt(rollData.diffLibre));
@@ -271,21 +271,21 @@ export class RdDRoll extends Dialog {
 
   async setSelectedSort(sort) {
     this.rollData.selectedSort = sort; // Update the selectedCarac
-    this.rollData.competence = RdDItemCompetence.getVoieDraconic(this.rollData.draconicList, sort.data.draconic);
+    this.rollData.competence = RdDItemCompetence.getVoieDraconic(this.rollData.draconicList, sort.system.draconic);
     this.rollData.bonus = RdDItemSort.getCaseBonus(sort, this.rollData.tmr.coord);
     this.rollData.diffLibre = RdDItemSort.getDifficulte(sort, -7);
     RdDItemSort.setCoutReveReel(sort);
     const htmlSortDescription = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/partial-description-sort.html", { sort: sort });
-    $(".sort-ou-rituel").text(sort.data.isrituel ? "rituel" : "sort");
+    $(".sort-ou-rituel").text(sort.system.isrituel ? "rituel" : "sort");
     $(".bonus-case").text(`${this.rollData.bonus}%`);
     $(".details-sort").remove();
     $(".description-sort").append(htmlSortDescription);
-    $(".roll-draconic").val(sort.data.listIndex);
+    $(".roll-draconic").val(sort.system.listIndex);
-    $(".div-sort-difficulte-fixe").text(Misc.toSignedString(sort.data.difficulte));
+    $(".div-sort-difficulte-fixe").text(Misc.toSignedString(sort.system.difficulte));
-    $(".div-sort-ptreve-fixe").text(sort.data.ptreve);
+    $(".div-sort-ptreve-fixe").text(sort.system.ptreve);
     const diffVariable = RdDItemSort.isDifficulteVariable(sort);
     const coutVariable = RdDItemSort.isCoutVariable(sort);
-    HtmlUtility._showControlWhen($(".div-sort-non-rituel"), !sort.data.isrituel);
+    HtmlUtility._showControlWhen($(".div-sort-non-rituel"), !sort.system.isrituel);
     HtmlUtility._showControlWhen($(".div-sort-difficulte-var"), diffVariable);
     HtmlUtility._showControlWhen($(".div-sort-difficulte-fixe"), !diffVariable);
     HtmlUtility._showControlWhen($(".div-sort-ptreve-var"), coutVariable);
@@ -294,7 +294,7 @@ export class RdDRoll extends Dialog {
 
   async setSelectedSigneDraconique(signe){
     this.rollData.signe = signe;
-    this.rollData.diffLibre =  Misc.data(signe).data.difficulte,
+    this.rollData.diffLibre = signe.system.difficulte,
     $(".signe-difficulte").text(Misc.toSignedString(this.rollData.diffLibre));
   }
 
@@ -388,7 +388,7 @@ export class RdDRoll extends Dialog {
       return compName + " - " + rollData.selectedSort.name;
     }
     // If a weapon is there, add it in the title
-    const niveau = Misc.toSignedString(rollData.competence.data.niveau);
+    const niveau = Misc.toSignedString(rollData.competence.system.niveau)
     if (compName == carac) {
       // cas des créatures
       return carac + " Niveau " + niveau

module/rdd-rolltables.js

@@ -10,21 +10,22 @@ export class RdDRollTables {
       table = await pack.getDocument(entry._id);
     }
     const draw = await table.draw({ displayChat: toChat, rollMode: "gmroll"});
-    console.log("RdDRollTables", tableName, toChat, ":", draw);
+    //console.log("RdDRollTables", tableName, toChat, ":", draw);
     return draw.results.length > 0 ? draw.results[0] : undefined;
   }
 
   /* -------------------------------------------- */
   static async drawItemFromRollTable(tableName, toChat = false) {
     const drawResult = await RdDRollTables.genericGetTableResult(tableName, toChat);
-    const pack = game.packs.get(drawResult.data.collection);
+    const pack = game.packs.get(drawResult.documentCollection)
-    return await pack.getDocument(drawResult.data.resultId);
+    let doc = await pack.getDocument(drawResult.documentId)
+    return doc
   }
   
   /* -------------------------------------------- */
   static async drawTextFromRollTable(tableName, toChat) {
     const drawResult = await RdDRollTables.genericGetTableResult(tableName, toChat);
-    return drawResult.data.text;
+    return drawResult.system.text;
   }
 
   /* -------------------------------------------- */

module/rdd-sheet-utility.js

@@ -21,12 +21,15 @@ export class RdDSheetUtility {
   }
 
   static prepareItemDropParameters(destItemId, actorId, dragData, objetVersConteneur) {
-    const itemId = dragData.id || dragData.data._id;
+    console.log("ID", dragData)
+    const item = fromUuidSync(dragData.uuid)
+    let itemId = item.id
+    //const itemId = dragData.id || dragData.data._id
     return {
       destId: destItemId,
       targetActorId: actorId,
       itemId: itemId,
-      sourceActorId: dragData.actorId,
+      sourceActorId: item.actor.id,
       srcId: objetVersConteneur[itemId],
       onEnleverConteneur: () => { delete objetVersConteneur[itemId]; },
       onAjouterDansConteneur: (itemId, conteneurId) => { objetVersConteneur[itemId] = conteneurId; }
@@ -42,11 +45,11 @@ export class RdDSheetUtility {
   }
 
   static async _onSplitItem(item, split, actor) {
-    if (split >= 1 && split < Misc.data(item).data.quantite) {
+    if (split >= 1 && split < item.system.quantite) {
       await item.diminuerQuantite(split);
-      const itemData = duplicate(Misc.data(item));
+      const itemData = duplicate(item);
       // todo: ajouter dans le même conteneur?
-      itemData.data.quantite = split;
+      itemData.system.quantite = split;
       await actor.createEmbeddedDocuments('Item', [itemData])
     }
   }

module/rdd-tmr-dialog.js

@@ -78,12 +78,12 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   loadCasesSpeciales() {
-    this.casesSpeciales = this.actor.data.items.filter(item => Draconique.isCaseTMR(item));
+    this.casesSpeciales = this.actor.items.filter(item => Draconique.isCaseTMR(item));
   }
 
   /* -------------------------------------------- */
   loadSortsReserve() {
-    this.sortsReserves = Misc.data(this.actor).data.reve.reserve.list;
+    this.sortsReserves = this.actor.system.reve.reserve.list;
   }
 
   /* -------------------------------------------- */
@@ -95,12 +95,15 @@ export class RdDTMRDialog extends Dialog {
   createPixiSprites() {
     EffetsDraconiques.carteTmr.createSprite(this.pixiTMR);
     this.updateTokens();
-    this.demiReve = this._tokenDemiReve();
+    this.forceDemiRevePositionView();
-    this._updateDemiReve();
   }
-
+  
   /* -------------------------------------------- */
   _createTokens() {
+    if (!this.isDemiReveCache()){
+      this.demiReve = this._tokenDemiReve();
+      this._trackToken(this.demiReve);
+    }
     let tokens = this._getTokensCasesTmr()
       .concat(this._getTokensRencontres())
       .concat(this._getTokensSortsReserve());
@@ -141,26 +144,25 @@ export class RdDTMRDialog extends Dialog {
     return EffetsDraconiques.rencontre.token(this.pixiTMR, rencontre, () => rencontre.coord);
   }
   _tokenCaseSpeciale(casetmr) {
-    const caseData = Misc.data(casetmr);
+    const caseData = casetmr;
-    const draconique = Draconique.get(caseData.data.specific);
+    const draconique = Draconique.get(caseData.system.specific);
-    return draconique?.token(this.pixiTMR, caseData, () => caseData.data.coord);
+    return draconique?.token(this.pixiTMR, caseData, () => caseData.system.coord);
   }
   _tokenSortEnReserve(sortEnReserve) {
     return EffetsDraconiques.sortReserve.token(this.pixiTMR, sortEnReserve.sort, () => sortEnReserve.coord);
   }
 
   _tokenDemiReve() {
-    const actorData = Misc.data(this.actor);
+    return EffetsDraconiques.demiReve.token(this.pixiTMR, this.actor.system, () => this.actor.system.reve.tmrpos.coord);
-    return EffetsDraconiques.demiReve.token(this.pixiTMR, actorData, () => actorData.data.reve.tmrpos.coord);
   }
 
-  _updateDemiReve() {
+  forceDemiRevePositionView() {
     this.notifierResonanceSigneDraconique(this._getActorCoord());
-    this._setTokenPosition(this.demiReve);
+    this._trackToken(this.demiReve);
   }
 
   _getActorCoord() {
-    return Misc.data(this.actor).data.reve.tmrpos.coord;
+    return this.actor.system.reve.tmrpos.coord;
   }
 
   /* -------------------------------------------- */
@@ -244,12 +246,11 @@ export class RdDTMRDialog extends Dialog {
   /* -------------------------------------------- */
   async updateValuesDisplay() {
     const coord = this._getActorCoord();
-    const actorData = Misc.data(this.actor);
 
     HtmlUtility._showControlWhen($(".lire-signe-draconique"), this.actor.isResonanceSigneDraconique(coord));
 
     let ptsreve = document.getElementById("tmr-pointsreve-value");
-    ptsreve.innerHTML = actorData.data.reve.reve.value;
+    ptsreve.innerHTML = this.actor.system.reve.reve.value;
 
     let tmrpos = document.getElementById("tmr-pos");
     if (this.isDemiReveCache()) {
@@ -262,12 +263,12 @@ export class RdDTMRDialog extends Dialog {
     etat.innerHTML = this.actor.getEtatGeneral();
 
     let refoulement = document.getElementById("tmr-refoulement-value");
-    refoulement.innerHTML = actorData.data.reve.refoulement.value;
+    refoulement.innerHTML = this.actor.system.reve.refoulement.value;
 
     if (ReglesOptionelles.isUsing("appliquer-fatigue")) {
       let fatigueItem = document.getElementById("tmr-fatigue-table");
       //console.log("Refresh : ", actorData.data.sante.fatigue.value);
-      fatigueItem.innerHTML = "<table class='table-fatigue'>" + RdDUtility.makeHTMLfatigueMatrix(actorData.data.sante.fatigue.value, actorData.data.sante.endurance.max).html() + "</table>";
+      fatigueItem.innerHTML = "<table class='table-fatigue'>" + RdDUtility.makeHTMLfatigueMatrix(this.actor.system.sante.fatigue.value, this.actor.system.sante.endurance.max).html() + "</table>";
     }
   }
 
@@ -336,6 +337,10 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   async choisirCasePortee(coord, portee) {
+    if (this.actor.isTMRCache())
+    {
+      return;
+    }
     // Récupère la liste des cases à portées
     let locList = TMRUtility.getTMRPortee(coord, portee);
     this.colorierZoneRencontre(locList);
@@ -507,7 +512,7 @@ export class RdDTMRDialog extends Dialog {
     const presentCite = this.casesSpeciales.find(c => EffetsDraconiques.presentCites.isCase(c, tmr.coord));
     if (presentCite) {
       this.minimize();
-      const caseData = Misc.data(presentCite);
+      const caseData = presentCite;
       EffetsDraconiques.presentCites.choisirUnPresent(caseData, (type => this._utiliserPresentCite(presentCite, type, tmr, postRencontre)));
     }
     return presentCite;
@@ -589,7 +594,7 @@ export class RdDTMRDialog extends Dialog {
         maitrise: { verbe: 'maîtriser', action: 'Maîtriser le fleuve' }
       }
       rollData.double = EffetsDraconiques.isDoubleResistanceFleuve(this.actor) ? true : undefined,
-      rollData.competence.data.defaut_carac = 'reve-actuel';
+      rollData.competence.system.defaut_carac = 'reve-actuel';
       await this._rollMaitriseCaseHumide(rollData);
     }
   }
@@ -714,7 +719,7 @@ export class RdDTMRDialog extends Dialog {
       forceCarac: { 'reve-actuel': { label: "Rêve Actuel", value: this.actor.getReveActuel() } },
       maitrise: { verbe: 'conquérir', action: options.action }
     };
-    rollData.competence.data.defaut_carac = 'reve-actuel';
+    rollData.competence.system.defaut_carac = 'reve-actuel';
 
     await this._maitriserTMR(rollData, r => this._onResultatConquerir(r, options));
   }
@@ -743,6 +748,7 @@ export class RdDTMRDialog extends Dialog {
   /* -------------------------------------------- */
   async _maitriserTMR(rollData, callbackMaitrise) {
     this.minimize(); // Hide
+    rollData.isTMRCache = rollData.actor.isTMRCache();
     const dialog = await RdDRoll.create(this.actor, rollData,
       {
         html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-maitrise-tmr.html',
@@ -813,7 +819,7 @@ export class RdDTMRDialog extends Dialog {
     //this.updateSortReserve();
     console.log("declencheSortEnReserve", sortReserve)
     this._tellToUserAndGM(`Vous avez déclenché le sort en réserve <strong> ${sortReserve.sort.name}</strong>
-        avec ${sortReserve.sort.data.ptreve_reel} points de Rêve
+        avec ${sortReserve.sort.system.ptreve_reel} points de Rêve
         en ${sortReserve.coord} (${TMRUtility.getTMRLabel(sortReserve.coord)})
         `);
     this.close();
@@ -874,49 +880,62 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   async _onClickTMRPos(clickOddq) {
-    if (this.isDemiReveCache()) {
-      ui.notifications.error(`Vous ne connaissez plus votre position dans les TMR.
-      Vous devez utiliser les boutons de direction pour vous déplacer.
-      Une fois que vous aurez retrouvé votre demi-rêve, demandez au gardien de vérifier et rendre les TMR visibles.
-      `);
-      return;
-    }
-
     let currentOddq = TMRUtility.coordTMRToOddq(this._getActorCoord());
-
-    console.log("deplacerDemiReve >>>>", currentOddq, clickOddq);
-
     let targetCoord = TMRUtility.oddqToCoordTMR(clickOddq);
     let currentCoord = TMRUtility.oddqToCoordTMR(currentOddq);
-
     // Validation de la case de destination (gestion du cas des rencontres qui peuvent téléporter)
     let deplacementType = this._calculDeplacement(targetCoord, currentCoord, currentOddq, clickOddq);
 
-    // Si le deplacement est valide
+    if (this.isDemiReveCache()) {
-    if (deplacementType == 'normal' || deplacementType == 'saut') {
+      if (this.isTerreAttache(targetCoord)
-      await this._deplacerDemiReve(targetCoord, deplacementType);
+      || (this.isCaseHumide(currentCoord) && this.isCaseHumide(targetCoord))
-    } else if (deplacementType == 'messager') { // Dans ce cas, ouverture du lancement de sort sur la case visée
+      || deplacementType == 'changeur')
-      await this._messagerDemiReve(targetCoord);
+      {
-    } else {
+        // déplacement possible
-      ui.notifications.error("Vous ne pouvez pas vous déplacer que sur des cases adjacentes à votre position ou valides dans le cas d'une rencontre");
+        await this.actor.montreTMR();
-      console.log("STATUS :", this.rencontreState, this.currentRencontre);
+      }
+      else
+      {
+        ui.notifications.error(`Vous ne connaissez plus votre position dans les TMR.
+        Vous devez utiliser les boutons de direction pour vous déplacer.
+        Une fois que vous aurez retrouvé votre demi-rêve, demandez au gardien de vérifier et rendre les TMR visibles.
+        `);
+        return;
+      }
     }
+
+    switch (deplacementType){
+      case 'normal':
+        await this._deplacerDemiReve(targetCoord, deplacementType);
+        break;
+      case 'messager':
+        await this._messagerDemiReve(targetCoord);
+        break;
+      case 'changeur':
+      case 'passeur':
+        await this._deplacerDemiReve(targetCoord, deplacementType);
+        break;
+      default:
+          ui.notifications.error("Vous ne pouvez pas vous déplacer que sur des cases adjacentes à votre position ou valides dans le cas d'une rencontre");
+          console.log("STATUS :", this.rencontreState, this.currentRencontre);
+    }
+
     this.checkQuitterTMR();
   }
 
   /* -------------------------------------------- */
   _calculDeplacement(targetCoord, currentCoord, fromOddq, toOddq) {
+
     const isInArea = this.rencontreState == 'aucune'
       ? (this.isTerreAttache(targetCoord) || this.isConnaissanceFleuve(currentCoord, targetCoord) || TMRUtility.distanceOddq(fromOddq, toOddq) <= 1)
       : this.currentRencontre?.locList.find(coord => coord == targetCoord) ?? false
     if (isInArea) {
       switch (this.rencontreState) {
         case 'aucune': return 'normal';
-        case 'messager': return 'messager';
+        case 'passeur': case 'changeur': case 'messager': return this.rencontreState;
-        case 'passeur': case 'changeur': return 'saut';
       }
     }
-    return 'erreur'
+    return 'erreur';
   }
 
   /* -------------------------------------------- */
@@ -932,9 +951,8 @@ export class RdDTMRDialog extends Dialog {
   }
 
   /* -------------------------------------------- */
-  externalRefresh(tmrData) {
+  externalRefresh() {
     this.createPixiSprites();
-    this.forceDemiRevePositionView();
     this.updateValuesDisplay();
     this.updateTokens();
     console.log("TMR REFRESHED !!!");
@@ -946,23 +964,17 @@ export class RdDTMRDialog extends Dialog {
       this.nettoyerRencontre();
     }
     let tmr = TMRUtility.getTMR(targetCoord);
-    //console.log("deplacerDemiReve", tmr, this);
     // Gestion cases spéciales type Trou noir, etc
     tmr = await this.manageTmrInnaccessible(tmr);
 
     await this.actor.updateCoordTMR(tmr.coord);
 
-    this._updateDemiReve();
+    this.forceDemiRevePositionView();
     if (ReglesOptionelles.isUsing("appliquer-fatigue")) {
       this.cumulFatigue += this.fatigueParCase;
     }
     this.updateValuesDisplay();
-    game.socket.emit(SYSTEM_SOCKET_ID, {
+    this.actor.notifyRefreshTMR();
-      msg: "msg_tmr_move", data: {
-        actorId: this.actor.data._id,
-        tmrPos: Misc.data(this.actor).data.reve.tmrpos
-      }
-    });
 
     if (deplacementType == 'normal') { // Pas de rencontres après un saut de type passeur/changeur/...
       await this.manageRencontre(tmr, () => this.postRencontre(tmr));
@@ -995,14 +1007,9 @@ export class RdDTMRDialog extends Dialog {
   }
 
   /* -------------------------------------------- */
-  async forceDemiRevePositionView() {
+  async positionnerDemiReve(coord) {
-    this._updateDemiReve();
-  }
-
-  /* -------------------------------------------- */
-  async forceDemiRevePosition(coord) {
     await this.actor.updateCoordTMR(coord);
-    this._updateDemiReve();
+    this.forceDemiRevePositionView();
     let tmr = TMRUtility.getTMR(coord);
     await this.postRencontre(tmr);
     return tmr;
@@ -1024,15 +1031,7 @@ export class RdDTMRDialog extends Dialog {
   _getCaseRectangleCoord(coord) {
     return this.pixiTMR.getCaseRectangle(TMRUtility.coordTMRToOddq(coord));
   }
-
+  
-  /* -------------------------------------------- */
-  _setTokenPosition(token) {
-    if (this.isDemiReveCache() && this.demiReve === token ) {
-      return;
-    }
-    this.pixiTMR.setPosition(token.sprite, TMRUtility.coordTMRToOddq(token.coordTMR()));
-  }
-
   /* -------------------------------------------- */
   _removeTokens(filter) {
     const tokensToRemove = this.allTokens.filter(filter);
@@ -1040,10 +1039,13 @@ export class RdDTMRDialog extends Dialog {
       this.pixiApp.stage.removeChild(token.sprite);
     }
   }
-
+  
   /* -------------------------------------------- */
   _trackToken(token) {
+    if (this.demiReve === token && this.isDemiReveCache()) {
+      return;
+    }
+    this.pixiTMR.setPosition(token.sprite, TMRUtility.coordTMRToOddq(token.coordTMR()));
     this.allTokens.push(token);
-    this._setTokenPosition(token);
   }
 }

module/rdd-token-hud.js

@@ -22,41 +22,64 @@ export class RdDTokenHud {
 
     let token = canvas.tokens.get(tokenId);
     let actor = token.actor;
-    let combatant = game.combat.combatants.find(c => Misc.data(c).tokenId == tokenId);
+    let combatant = game.combat.combatants.find(c => c.tokenId == tokenId);
+    if (! (combatant?.actor) ) {
+        ui.notifications.warn(`Le combatant ${token.name} n'est pas associé à un acteur, impossible de déterminer ses actions de combat!`)
+        return;
+    }
     app.hasExtension = true;
 
-    let armesList = RdDCombatManager.buildListeActionsCombat(combatant);
+    let actionsCombat = RdDCombatManager.listActionsCombat(combatant);
     const hudData = {
-      combatant: combatant, armes: armesList,
+      combatant: combatant,
-      commandes: [{ name: 'Initiative +1', command: 'inc', value: 0.01 }, { name: 'Initiative -1', command: 'dec', value: -0.01 }]
+      actions: actionsCombat,
+      commandes: [
+        { name: "Autre action", command: 'autre' },
+        { name: 'Initiative +1', command: 'inc', value: 0.01 }, 
+        { name: 'Initiative -1', command: 'dec', value: -0.01 }]
     };
 
     const controlIconCombat = html.find('.control-icon[data-action=combat]');
     // initiative
-    await RdDTokenHud._configureSubMenu(controlIconCombat, 'systems/foundryvtt-reve-de-dragon/templates/hud-actor-init.html', hudData,
+    await RdDTokenHud._configureSubMenu(controlIconCombat,
+      'systems/foundryvtt-reve-de-dragon/templates/hud-actor-init.html',
+      hudData,
       (event) => {
-        let initCommand = event.currentTarget.attributes['data-command'].value;
+        let initCommand = event.currentTarget.attributes['data-command']?.value;
-        let combatantId = event.currentTarget.attributes['data-combatant-id'].value;
+        let combatantId = event.currentTarget.attributes['data-combatant-id']?.value;
-        if (!initCommand) {
+        if (initCommand) {
-          let armeIndex = event.currentTarget.attributes['data-arme-id'].value;
+          RdDTokenHud._initiativeCommand(initCommand, combatantId);
-          let arme = armesList[armeIndex];
+        } else {
-          RdDCombatManager.rollInitiativeCompetence(combatantId, arme);
+          let index = event.currentTarget.attributes['data-action-index'].value;
-        } else if (initCommand == 'inc') {
+          let action = actionsCombat[index];
-          RdDCombatManager.incDecInit(combatantId, 0.01);
+          RdDCombatManager.rollInitiativeAction(combatantId, action);
-        } else if (initCommand == 'dec') {
+        } 
-          RdDCombatManager.incDecInit(combatantId, -0.01);
-        }
       });
 
     const controlIconTarget = html.find('.control-icon[data-action=target]');
     // combat
     await RdDTokenHud._configureSubMenu(controlIconTarget, 'systems/foundryvtt-reve-de-dragon/templates/hud-actor-attaque.html', hudData,
       (event) => {
-        let armeIndex = event.currentTarget.attributes['data-arme-id'].value;
+        const actionIndex = event.currentTarget.attributes['data-action-index']?.value;
-        actor.rollArme(armesList[armeIndex]);
+        const action = actionsCombat[actionIndex];
+        if (action.action == 'conjurer') {
+          actor.conjurerPossession(actor.getPossession(action.data.possessionid));
+        }
+        else {
+          actor.rollArme(action);
+        }
       });
   }
 
+  static _initiativeCommand(initCommand, combatantId) {
+    switch (initCommand) {
+      case 'inc': return RdDCombatManager.incDecInit(combatantId, 0.01);
+      case 'dec': return RdDCombatManager.incDecInit(combatantId, -0.01);
+      case 'autre': return RdDCombatManager.rollInitiativeAction(combatantId, 
+        { name: "Autre action", action: 'autre', data: { initOnly: true, competence: "Autre action" } });
+    }
+  }
+
   /* -------------------------------------------- */
   static async addTokenHudExtensions(app, html, tokenId) {
     const controlIconCombat  = html.find('.control-icon[data-action=combat]');

module/rdd-utility.js

@@ -11,6 +11,7 @@ import { RdDDice } from "./rdd-dice.js";
 import { RdDItem } from "./item.js";
 import { Monnaie } from "./item-monnaie.js";
 import { RdDPossession } from "./rdd-possession.js";
+import { RdDNameGen } from "./rdd-namegen.js";
 
 /* -------------------------------------------- */
 // This table starts at 0 -> niveau -10
@@ -121,8 +122,12 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html',
       // Conteneur/item in Actor sheet
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.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',
       //Items
       'systems/foundryvtt-reve-de-dragon/templates/item-competence-sheet.html',
@@ -221,8 +226,10 @@ export class RdDUtility {
     ];
 
     Handlebars.registerHelper('upperFirst', str => Misc.upperFirst(str ?? 'Null'));
+    Handlebars.registerHelper('lowerFirst', str => Misc.lowerFirst(str ?? 'Null'));
     Handlebars.registerHelper('upper', str => str?.toUpperCase() ?? 'NULL');
     Handlebars.registerHelper('le', str => Grammar.articleDetermine(str));
+    Handlebars.registerHelper('apostrophe', (article, str) => Grammar.apostrophe(article, str));
     Handlebars.registerHelper('un', str => Grammar.articleIndetermine(str));
     Handlebars.registerHelper('accord', (genre, ...args) => Grammar.accord(genre, args));
     Handlebars.registerHelper('buildConteneur', (objet) => { return new Handlebars.SafeString(RdDUtility.buildConteneur(objet)); });
@@ -232,36 +239,38 @@ export class RdDUtility {
     Handlebars.registerHelper('typeTmr-name', coord => TMRUtility.typeTmrName(coord));
     Handlebars.registerHelper('min', (...args) => Math.min(...args.slice(0, -1)));
 
-    Handlebars.registerHelper('sortCompetence', competences => competences.sort((a, b) => {
+    Handlebars.registerHelper('filtreTriCompetences', competences => competences.filter(it => it.system.isVisible)
-      if (a.name.startsWith("Survie") && b.name.startsWith("Survie")) {
+      .sort((a, b) => {
-        if (a.name.includes("Cité")) return -1;
+        if (a.name.startsWith("Survie") && b.name.startsWith("Survie")) {
-        if (b.name.includes("Cité")) return 1;
+          if (a.name.includes("Cité")) return -1;
-        if (a.name.includes("Extérieur")) return -1;
+          if (b.name.includes("Cité")) return 1;
-        if (b.name.includes("Extérieur")) return 1;
+          if (a.name.includes("Extérieur")) return -1;
+          if (b.name.includes("Extérieur")) return 1;
+          return a.name.localeCompare(b.name);
+        }
+        if (a.system.categorie.startsWith("melee") && b.system.categorie.startsWith("melee")) {
+          if (a.name.includes("Corps")) return -1;
+          if (b.name.includes("Corps")) return 1;
+          if (a.name.includes("Dague")) return -1;
+          if (b.name.includes("Dague")) return 1;
+          if (a.name.includes("Esquive")) return -1;
+          if (b.name.includes("Esquive")) return 1;
+          return a.name.localeCompare(b.name);
+        }
+        if (a.name.startsWith("Voie") && b.name.startsWith("Voie")) {
+          if (a.name.includes("Oniros")) return -1;
+          if (b.name.includes("Oniros")) return 1;
+          if (a.name.includes("Hypnos")) return -1;
+          if (b.name.includes("Hypnos")) return 1;
+          if (a.name.includes("Narcos")) return -1;
+          if (b.name.includes("Narcos")) return 1;
+          if (a.name.includes("Thanatos")) return -1;
+          if (b.name.includes("Thanatos")) return 1;
+          return a.name.localeCompare(b.name);
+        }
         return a.name.localeCompare(b.name);
-      }
+      })
-      if (a.data.categorie.startsWith("melee") && b.data.categorie.startsWith("melee")) {
+    );
-        if (a.name.includes("Corps")) return -1;
-        if (b.name.includes("Corps")) return 1;
-        if (a.name.includes("Dague")) return -1;
-        if (b.name.includes("Dague")) return 1;
-        if (a.name.includes("Esquive")) return -1;
-        if (b.name.includes("Esquive")) return 1;
-        return a.name.localeCompare(b.name);
-      }
-      if (a.name.startsWith("Voie") && b.name.startsWith("Voie")) {
-        if (a.name.includes("Oniros")) return -1;
-        if (b.name.includes("Oniros")) return 1;
-        if (a.name.includes("Hypnos")) return -1;
-        if (b.name.includes("Hypnos")) return 1;
-        if (a.name.includes("Narcos")) return -1;
-        if (b.name.includes("Narcos")) return 1;
-        if (a.name.includes("Thanatos")) return -1;
-        if (b.name.includes("Thanatos")) return 1;
-        return a.name.localeCompare(b.name);
-      }
-      return a.name.localeCompare(b.name);
-    }));
 
     return loadTemplates(templatePaths);
   }
@@ -326,8 +335,8 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static checkNull(items) {
+  static arrayOrEmpty(items) {
-    if (items && items.length) {
+    if (items?.length) {
       return items;
     }
     return [];
@@ -360,44 +369,44 @@ export class RdDUtility {
 
     RdDUtility.filterEquipementParType(formData);
 
-    formData.sorts = this.checkNull(formData.itemsByType['sort']);
+    formData.sorts = this.arrayOrEmpty(formData.itemsByType['sort']);
-    formData.signesdraconiques = this.checkNull(formData.itemsByType['signedraconique']);
+    formData.signesdraconiques = this.arrayOrEmpty(formData.itemsByType['signedraconique']);
-    formData.queues = this.checkNull(formData.itemsByType['queue']);
+    formData.queues = this.arrayOrEmpty(formData.itemsByType['queue']);
-    formData.souffles = this.checkNull(formData.itemsByType['souffle']);
+    formData.souffles = this.arrayOrEmpty(formData.itemsByType['souffle']);
-    formData.ombres = this.checkNull(formData.itemsByType['ombre']);
+    formData.ombres = this.arrayOrEmpty(formData.itemsByType['ombre']);
-    formData.tetes = this.checkNull(formData.itemsByType['tete']);
+    formData.tetes = this.arrayOrEmpty(formData.itemsByType['tete']);
-    formData.taches = this.checkNull(formData.itemsByType['tache']);
+    formData.taches = this.arrayOrEmpty(formData.itemsByType['tache']);
-    formData.meditations = this.checkNull(formData.itemsByType['meditation']);
+    formData.meditations = this.arrayOrEmpty(formData.itemsByType['meditation']);
-    formData.chants = this.checkNull(formData.itemsByType['chant']);
+    formData.chants = this.arrayOrEmpty(formData.itemsByType['chant']);
-    formData.danses = this.checkNull(formData.itemsByType['danse']);
+    formData.danses = this.arrayOrEmpty(formData.itemsByType['danse']);
-    formData.musiques = this.checkNull(formData.itemsByType['musique']);
+    formData.musiques = this.arrayOrEmpty(formData.itemsByType['musique']);
-    formData.oeuvres = this.checkNull(formData.itemsByType['oeuvre']);
+    formData.oeuvres = this.arrayOrEmpty(formData.itemsByType['oeuvre']);
-    formData.jeux = this.checkNull(formData.itemsByType['jeu']);
+    formData.jeux = this.arrayOrEmpty(formData.itemsByType['jeu']);
 
-    formData.recettescuisine = this.checkNull(formData.itemsByType['recettecuisine']);
+    formData.recettescuisine = this.arrayOrEmpty(formData.itemsByType['recettecuisine']);
-    formData.recettesAlchimiques = this.checkNull(formData.itemsByType['recettealchimique']);
+    formData.recettesAlchimiques = this.arrayOrEmpty(formData.itemsByType['recettealchimique']);
-    formData.maladies = this.checkNull(formData.itemsByType['maladie']);
+    formData.maladies = this.arrayOrEmpty(formData.itemsByType['maladie']);
-    formData.poisons = this.checkNull(formData.itemsByType['poison']);
+    formData.poisons = this.arrayOrEmpty(formData.itemsByType['poison']);
-    formData.possessions = this.checkNull(formData.itemsByType['possession']);
+    formData.possessions = this.arrayOrEmpty(formData.itemsByType['possession']);
     formData.maladiesPoisons = formData.maladies.concat(formData.poisons);
     formData.competences = (formData.itemsByType.competence ?? []).concat(formData.itemsByType.competencecreature ?? []);
   }
 
   static filterEquipementParType(formData) {
-    formData.conteneurs = this.checkNull(formData.itemsByType['conteneur']);
+    formData.conteneurs = this.arrayOrEmpty(formData.itemsByType['conteneur']);
 
-    formData.materiel = this.checkNull(formData.itemsByType['objet']);
+    formData.materiel = this.arrayOrEmpty(formData.itemsByType['objet']);
-    formData.armes = this.checkNull(formData.itemsByType['arme']);
+    formData.armes = this.arrayOrEmpty(formData.itemsByType['arme']);
-    formData.armures = this.checkNull(formData.itemsByType['armure']);
+    formData.armures = this.arrayOrEmpty(formData.itemsByType['armure']);
-    formData.munitions = this.checkNull(formData.itemsByType['munition']);
+    formData.munitions = this.arrayOrEmpty(formData.itemsByType['munition']);
-    formData.livres = this.checkNull(formData.itemsByType['livre']);
+    formData.livres = this.arrayOrEmpty(formData.itemsByType['livre']);
-    formData.potions = this.checkNull(formData.itemsByType['potion']);
+    formData.potions = this.arrayOrEmpty(formData.itemsByType['potion']);
-    formData.ingredients = this.checkNull(formData.itemsByType['ingredient']);
+    formData.ingredients = this.arrayOrEmpty(formData.itemsByType['ingredient']);
-    formData.herbes = this.checkNull(formData.itemsByType['herbe']);
+    formData.herbes = this.arrayOrEmpty(formData.itemsByType['herbe']);
-    formData.monnaie = this.checkNull(formData.itemsByType['monnaie']);
+    formData.monnaie = this.arrayOrEmpty(formData.itemsByType['monnaie']);
     formData.monnaie.sort(Monnaie.triValeurDenier());
-    formData.nourritureboissons = this.checkNull(formData.itemsByType['nourritureboisson']);
+    formData.nourritureboissons = this.arrayOrEmpty(formData.itemsByType['nourritureboisson']);
-    formData.gemmes = this.checkNull(formData.itemsByType['gemme']);
+    formData.gemmes = this.arrayOrEmpty(formData.itemsByType['gemme']);
 
     formData.objets = formData.conteneurs
       .concat(formData.materiel)
@@ -419,7 +428,7 @@ export class RdDUtility {
     // Attribution des objets aux conteneurs
     for (let conteneur of conteneurs) {
       conteneur.subItems = [];
-      for (let id of conteneur.data.contenu ?? []) {
+      for (let id of conteneur.system.contenu ?? []) {
         let objet = objets.find(objet => (id == objet._id));
         if (objet) {
           objet.estContenu = true; // Permet de filtrer ce qui est porté dans le template
@@ -429,27 +438,26 @@ export class RdDUtility {
       }
     }
     for (let conteneur of conteneurs) {
-      conteneur.data.encTotal = RdDUtility.calculEncContenu(conteneur, objets);
+      conteneur.system.encTotal = RdDUtility.calculEncContenu(conteneur, objets);
     }
     return objetVersConteneur;
   }
 
   /* -------------------------------------------- */
   static calculEncContenu(conteneur, objets) {
-    const itemData = Misc.data(conteneur);
+    const contenuDatas = (conteneur.system.contenu ?? []).filter(id => id != undefined)
-    const contenuDatas = (itemData.data.contenu ?? []).filter(id => id != undefined)
+      .map(id => objets.find(it => (id == it._id)))
-      .map(id => Misc.data(objets.find(it => (id == it._id))))
       .filter(it => it);
-    let enc = Number(itemData.data.encombrement ?? 0) * Number(itemData.data.quantite ?? 1);
+    let enc = Number(conteneur.system.encombrement ?? 0) * Number(conteneur.system.quantite ?? 1);
     for (let itemData of contenuDatas) {
       if (itemData.type == 'conteneur') {
         enc += RdDUtility.calculEncContenu(itemData, objets);
       }
       else {
-        enc += Number(itemData.data.encombrement ?? 0) * Number(itemData.data.quantite ?? 1);
+        enc += Number(itemData.system.encombrement ?? 0) * Number(itemData.system.quantite ?? 1)
       }
     }
-    return enc;
+    return enc
   }
 
   /* -------------------------------------------- */
@@ -462,34 +470,32 @@ export class RdDUtility {
   /** Construit la structure récursive des conteneurs, avec imbrication potentielle
    * 
    */
-  static buildConteneur(objet, niveau) {
+  static buildConteneur(objet, profondeur) {
-    if (!niveau) niveau = 1;
+    if (!profondeur) profondeur = 1;
-    objet.niveau = niveau;
+    objet.niveau = profondeur;
-    //console.log("OBJ:", objet);
+    const isConteneur = objet.type == 'conteneur';
-    let str = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html']({ item: objet });
+    const isOuvert = isConteneur && this.getAfficheContenu(objet._id);
-    if (objet.type == 'conteneur') {
+    const isVide = isConteneur && objet.system.contenu.length == 0;
-      const afficherContenu = this.getAfficheContenu(objet._id);
+    const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html']({
-      str = str + RdDUtility.buildContenu(objet, niveau, afficherContenu);
+      item: objet,
-    }
+      vide: isVide,
-    return str;
+      ouvert: isOuvert
+    });
+    const contenu = isConteneur ? RdDUtility.buildContenu(objet, profondeur, isOuvert) : '';
+    return conteneur + contenu;
   }
 
   /* -------------------------------------------- */
-  static buildContenu(objet, niveau, afficherContenu) {
+  static buildContenu(objet, profondeur, afficherContenu) {
-    if (!niveau) niveau = 1;
+    if (!profondeur) profondeur = 1;
-    objet.niveau = niveau;
+    objet.niveau = profondeur;
-    let strContenu = "";
+    const display = afficherContenu ? 'item-display-show' : 'item-display-hide';
     //console.log("ITEM DISPLAYED", objet );
-    if (afficherContenu) {
+    let strContenu = `<ul class='item-list alterne-list ${display} list-item-margin${profondeur}'>`;
-      strContenu = "<ul class='item-list alterne-list item-display-show list-item-margin" + niveau + "'>";
-    } else {
-      strContenu = "<ul class='item-list alterne-list item-display-hide list-item-margin" + niveau + "'>";
-    }
     for (let subItem of objet.subItems) {
-      strContenu = strContenu + this.buildConteneur(subItem, niveau + 1);
+      strContenu += this.buildConteneur(subItem, profondeur + 1);
     }
-    strContenu = strContenu + "</ul>";
+    return strContenu + "</ul>";
-    return strContenu;
   }
 
   /* -------------------------------------------- */
@@ -666,7 +672,7 @@ export class RdDUtility {
       case "msg_tmr_move":
         let actor = game.actors.get(sockmsg.data.actorId);
         if (actor.isOwner || game.user.isGM) {
-          actor.refreshTMRView(sockmsg.data.tmrPos);
+          actor.refreshTMRView();
         }
         break;
     }
@@ -681,7 +687,7 @@ export class RdDUtility {
       let coord = event.currentTarget.attributes['data-tmr-coord'].value;
       let actorId = event.currentTarget.attributes['data-actor-id'].value;
       let actor = game.actors.get(actorId);
-      actor.tmrApp.forceDemiRevePosition(coord);
+      actor.tmrApp.positionnerDemiReve(coord);
     });
     // Gestion spécifique des sorts en réserve multiples (ie têtes)
     html.on("click", '#sort-reserve', event => {
@@ -692,7 +698,7 @@ export class RdDUtility {
       actor.tmrApp.lancerSortEnReserve(coord, sortId);
     });
 
-    // gestion bouton tchat Acheter
+    // gestion bouton tchat Possession
     html.on("click", '.defense-possession', event => {
       let attackerId = event.currentTarget.attributes['data-attackerId'].value
       let defenderId = event.currentTarget.attributes['data-defenderId'].value
@@ -702,6 +708,7 @@ export class RdDUtility {
 
     // gestion bouton tchat Acheter
     html.on("click", '.button-acheter', event => DialogItemAchat.onButtonAcheter(event));
+    html.on("click", '.button-creer-acteur', event => RdDNameGen.onCreerActeur(event));
 
     // Gestion du bouton payer
     html.on("click", '.payer-button', event => {
@@ -824,7 +831,7 @@ export class RdDUtility {
   static confirmerSuppressionSubacteur(actorSheet, li) {
     let actorId = li.data("actor-id");
     let actor = game.actors.get(actorId);
-    let msgTxt = "<p>Etes vous certain de vouloir supprimer le lien vers ce véhicule/monture/suivant : " + actor.data.name + " ?</p>";
+    let msgTxt = "<p>Etes vous certain de vouloir supprimer le lien vers ce véhicule/monture/suivant : " + actor.name + " ?</p>";
     let d = new Dialog({
       title: "Confirmer la suppression du lien",
       content: msgTxt,
@@ -874,8 +881,7 @@ export class RdDUtility {
         label: "Annuler"
       }
     }
-    const docData = Misc.data(objet);
+    if (objet.type == 'conteneur' && objet.system.contenu.length > 0) {
-    if (docData.type == 'conteneur' && docData.data.contenu.length > 0) {
       msgTxt += "<br>Ce conteneur n'est pas vide. Choisissez l'option de suppression";
       buttons['deleteall'] = {
         icon: '<i class="fas fa-check"></i>',

module/rolldata-ajustements.js

@@ -19,9 +19,9 @@ import { ReglesOptionelles } from "./regles-optionelles.js";
  */
 export const referenceAjustements = {
   competence: {
-    isUsed: (rollData, actor) => Misc.data(rollData.competence),
+    isUsed: (rollData, actor) => rollData.competence,
-    getLabel: (rollData, actor) => Misc.data(rollData.competence)?.name,
+    getLabel: (rollData, actor) => rollData.competence?.name,
-    getValue: (rollData, actor) => Misc.data(rollData.competence)?.data?.niveau,
+    getValue: (rollData, actor) => rollData.competence?.system?.niveau,
   },
   meditation: {
     isUsed: (rollData, actor) => rollData.meditation,
@@ -33,7 +33,7 @@ export const referenceAjustements = {
     getLabel: (rollData, actor) => rollData.selectedSort?.name ?? rollData.attackerRoll ? 'Imposée' : 'Libre',
     getValue: (rollData, actor) => rollData.selectedSort
       ? RdDItemSort.getDifficulte(rollData.selectedSort, rollData.diffLibre)
-      : rollData.diffLibre ?? Misc.data(rollData.competence)?.data.default_diffLibre ?? 0
+      : rollData.diffLibre ?? rollData.competence?.data.default_diffLibre ?? 0
   },
   diffConditions: {
     isUsed: (rollData, actor) => rollData.diffConditions != undefined,
@@ -95,10 +95,10 @@ export const referenceAjustements = {
     getDescr: (rollData, actor) => rollData.diviseurSignificative > 1 ? `Facteur significative <span class="rdd-diviseur">&times;${Misc.getFractionHtml(rollData.diviseurSignificative)}</span>` : ''
   },
   isEcaille: {
-    isVisible: (rollData, actor) => Misc.data(rollData.arme)?.data.magique && Number(Misc.data(rollData.arme)?.data.ecaille_efficacite) > 0,
+    isVisible: (rollData, actor) => rollData.arme?.system.magique && Number(rollData.arme?.system.ecaille_efficacite) > 0,
-    isUsed: (rollData, actor) => Misc.data(rollData.arme)?.data.magique && Number(Misc.data(rollData.arme)?.data.ecaille_efficacite) > 0,
+    isUsed: (rollData, actor) => rollData.arme?.system.magique && Number(rollData.arme?.system.ecaille_efficacite) > 0,
     getLabel: (rollData, actor) => "Ecaille d'Efficacité: ",
-    getValue: (rollData, actor) => Math.max(Number(Misc.data(rollData.arme)?.data.ecaille_efficacite), 0),
+    getValue: (rollData, actor) => Math.max(Number(rollData.arme?.system.ecaille_efficacite), 0),
   },
   finesse: {
     isUsed: (rollData, actor) => RdDBonus.isDefenseAttaqueFinesse(rollData),

module/tmr-rencontres.js

@@ -8,9 +8,14 @@ import { TMRType } from "./tmr-utility.js";
 const typeRencontres = {
 
   messager: {
-    msgSucces: (rencData) => `Le ${rencData.rencontre.name} vous propose d'emmener le message de votre un sort à ${rencData.rencontre.force} cases ${rencData.tmr.label}.`,
+    msgSucces: async (rencData) => {
-    msgEchec: (rencData) => `Le ${rencData.rencontre.name} est pressé et continue son chemin d'une traite sans vous accorder un regard.`,
+      if (rencData.actor.isTMRCache()){
-    postSucces: (tmrDialog, rencData) => {
+        return `Le ${rencData.rencontre.name} vous propose d'emmener le message de votre un sort,  mais vous ne savez pas où vous êtes.`;
+      }
+      return `Le ${rencData.rencontre.name} vous propose d'emmener le message de votre un sort à ${rencData.rencontre.force} cases ${rencData.tmr.label}.`;
+    },
+    msgEchec: async (rencData)=> `Le ${rencData.rencontre.name} est pressé et continue son chemin d'une traite sans vous accorder un regard.`,
+    postSucces: async (tmrDialog, rencData) => {
       tmrDialog.setStateRencontre(rencData.rencontre.type);
       tmrDialog.choisirCasePortee(rencData.tmr.coord, rencData.rencontre.force);
     },
@@ -28,9 +33,14 @@ const typeRencontres = {
   },
 
   passeur: {
-    msgSucces: (rencData) => `Le ${rencData.rencontre.name} vous propose de vous transporter à ${rencData.rencontre.force} cases des ${rencData.tmr.label}.`,
+    msgSucces: async (rencData) => {
-    msgEchec: (rencData) => `Le prix que demande le ${rencData.rencontre.name} est trop élevé, vous êtes réduit à poursuivre votre chemin par vos propres moyens.`,
+      if (rencData.actor.isTMRCache()){
-    postSucces: (tmrDialog, rencData) => {
+        return `Le ${rencData.rencontre.name} vous propose de vous transporter, mais vous ne savez pas où vous êtes.`;
+      }
+      return `Le ${rencData.rencontre.name} vous propose de vous transporter à ${rencData.rencontre.force} cases des ${rencData.tmr.label}.`;
+    },
+    msgEchec: async (rencData)=> `Le prix que demande le ${rencData.rencontre.name} est trop élevé, vous êtes réduit à poursuivre votre chemin par vos propres moyens.`,
+    postSucces: async (tmrDialog, rencData) => {
       tmrDialog.setStateRencontre(rencData.rencontre.type);
       tmrDialog.choisirCasePortee(rencData.tmr.coord, rencData.rencontre.force);
     },
@@ -49,9 +59,9 @@ const typeRencontres = {
   },
 
   fleur: {
-    msgSucces: (rencData) => `Vous cueillez la ${rencData.rencontre.name}, son parfum vous apporte ${rencData.rencontre.force} points de Rêve.`,
+    msgSucces: async (rencData) => `Vous cueillez la ${rencData.rencontre.name}, son parfum vous apporte ${rencData.rencontre.force} points de Rêve.`,
-    msgEchec: (rencData) => `La ${rencData.rencontre.name} se fâne et disparaît entre vos doigts.`,
+    msgEchec: async (rencData)=> `La ${rencData.rencontre.name} se fâne et disparaît entre vos doigts.`,
-    postSucces: (tmrDialog, rencData) => tmrDialog.actor.reveActuelIncDec(rencData.rencontre.force),
+    postSucces: async (tmrDialog, rencData) => tmrDialog.actor.reveActuelIncDec(rencData.rencontre.force),
     poesieSucces: {
       reference: "L'Ennemi, Charles Baudelaire",
       extrait: `Et qui sait si les fleurs nouvelles que je rêve
@@ -66,9 +76,9 @@ const typeRencontres = {
   },
 
   mangeur: {
-    msgSucces: (rencData) => `Le ${rencData.rencontre.name} claque de sa machoire dans le vide avant de fuir.`,
+    msgSucces: async (rencData) => `Le ${rencData.rencontre.name} claque de sa machoire dans le vide avant de fuir.`,
-    msgEchec: (rencData) => `Le ${rencData.rencontre.name} croque votre Rêve ! Il emporte ${rencData.rencontre.force} de vos points de rêve actuels`,
+    msgEchec: async (rencData)=> `Le ${rencData.rencontre.name} croque votre Rêve ! Il emporte ${rencData.rencontre.force} de vos points de rêve actuels`,
-    postEchec: (tmrDialog, rencData) => tmrDialog.actor.reveActuelIncDec(-rencData.rencontre.force),
+    postEchec: async (tmrDialog, rencData) => tmrDialog.actor.reveActuelIncDec(-rencData.rencontre.force),
     poesieSucces: {
       reference: "Conseil, Victor Hugo",
       extrait: `Rois ! la bure est souvent jalouse du velours.
@@ -85,16 +95,17 @@ const typeRencontres = {
   },
 
   changeur: {
-    msgSucces: (rencData) => `Le ${rencData.rencontre.name} vaincu accepte de vous déplacer sur une autre ${TMRType[rencData.tmr.type].name} de votre choix en échange de sa liberté.`,
+    msgSucces: async (rencData) => `Le ${rencData.rencontre.name} vaincu accepte de vous déplacer sur une autre ${TMRType[rencData.tmr.type].name} de votre choix en échange de sa liberté.`,
-    msgEchec: (rencData) => {
+    msgEchec: async (rencData) => `Le ${rencData.rencontre.name} vous embobine avec des promesses, et vous transporte sur une autre ${TMRType[rencData.tmr.type].name} sans attendre votre avis.`,
-      rencData.newTMR = TMRUtility.getTMRAleatoire(it => it.type = rencData.tmr.type);
+    postSucces: async (tmrDialog, rencData) => {
-      return `Le ${rencData.rencontre.name} vous embobine avec des promesses, et vous transporte en ${rencData.newTMR.label} sans attendre votre avis.`;
-    },
-    postSucces: (tmrDialog, rencData) => {
       tmrDialog.setStateRencontre(rencData.rencontre.type);
       tmrDialog.choisirCaseType(rencData.tmr.type);
     },
-    postEchec: (tmrDialog, rencData) => tmrDialog.forceDemiRevePosition(rencData.newTMR.coord),
+    postEchec: async (tmrDialog, rencData) => {
+      const newTMR = await TMRUtility.getTMRAleatoire(it => it.type == rencData.tmr.type && it.coord != rencData.tmr.coord);
+      await tmrDialog.actor.forcerPositionTMRInconnue(newTMR);
+      tmrDialog.positionnerDemiReve(newTMR.coord);
+    },
     poesieSucces: {
       reference: "Caligula - IIIème chant, Gérard de Nerval",
       extrait: `Allez, que le caprice emporte
@@ -111,9 +122,9 @@ const typeRencontres = {
   },
 
   briseur: {
-    msgSucces: (rencData) => `Le ${rencData.rencontre.name} tente vainement de vous déconcentrer, avant de fuir sans demander son reste.`,
+    msgSucces: async (rencData) => `Le ${rencData.rencontre.name} tente vainement de vous déconcentrer, avant de fuir sans demander son reste.`,
-    msgEchec: (rencData) => `Le ${rencData.rencontre.name} vous déconcentre au point de briser votre demi-rêve.`,
+    msgEchec: async (rencData)=> `Le ${rencData.rencontre.name} vous déconcentre au point de briser votre demi-rêve.`,
-    postEchec: (tmrDialog, rencData) => tmrDialog.close(),
+    postEchec: async (tmrDialog, rencData) => tmrDialog.close(),
     poesieSucces: {
       reference: "Rêve de Dragon, Denis Gerfaud",
       extrait: `La légende affirme que ce sont les Gnomes qui furent
@@ -134,8 +145,8 @@ const typeRencontres = {
   },
 
   reflet: {
-    msgSucces: (rencData) => `Le ${rencData.rencontre.name} s'estompe dans l'oubli.`,
+    msgSucces: async (rencData) => `Le ${rencData.rencontre.name} s'estompe dans l'oubli.`,
-    msgEchec: (rencData) => `Vous êtes submergé par un ${rencData.rencontre.name}, les souvenirs vous retiennent tant qu'il ne sera pas vaincu!`,
+    msgEchec: async (rencData)=> `Vous êtes submergé par un ${rencData.rencontre.name}, les souvenirs vous retiennent tant qu'il ne sera pas vaincu!`,
     poesieSucces: {
       reference: "Une charogne, Charles Baudelaire",
       extrait: `Les formes s'effaçaient et n'étaient plus qu'un rêve,
@@ -152,9 +163,9 @@ const typeRencontres = {
   },
 
   passeurfou: {
-    msgSucces: (rencData) => `Le ${rencData.rencontre.name} tente vainement de découvrir où vous avez caché vos réserves. Vous le chassez, et en déroute il part harceler un autre voyageur du rêve.`,
+    msgSucces: async (rencData) => `Le ${rencData.rencontre.name} tente vainement de découvrir où vous avez caché vos réserves. Vous le chassez, et en déroute il part harceler un autre voyageur du rêve.`,
-    msgEchec: (rencData) => TMRRencontres.msgEchecPasseurFou(rencData),
+    msgEchec: async (rencData)=> TMRRencontres.msgEchecPasseurFou(rencData),
-    postEchec: (tmrDialog, rencData) => TMRRencontres.postEchecPasseurFou(tmrDialog, rencData),
+    postEchec: async (tmrDialog, rencData) => TMRRencontres.postEchecPasseurFou(tmrDialog, rencData),
     poesieSucces: {
       reference: "Un Fou et un Sage, Jean de La Fontaine",
       extrait: `Certain Fou poursuivait à coups de pierre un Sage.
@@ -174,9 +185,9 @@ const typeRencontres = {
   },
 
   tbblanc: {
-    msgSucces: (rencData) => `Le ${rencData.rencontre.name} souleve une poussière blanche, vous tenez bon, et il tourbillonne en s'éloignant.`,
+    msgSucces: async (rencData) => `Le ${rencData.rencontre.name} souleve une poussière blanche, vous tenez bon, et il tourbillonne en s'éloignant.`,
-    msgEchec: (rencData) => `Le souffle du ${rencData.rencontre.name} vous déstabilise et vous emmène dans un nuage de poussière.`,
+    msgEchec: async (rencData)=> `Le souffle du ${rencData.rencontre.name} vous déstabilise et vous emmène dans un nuage de poussière.`,
-    postEchec: (tmrDialog, rencData) => TMRRencontres.onPostEchecTourbillon(tmrDialog, rencData, 1),
+    postEchec: async (tmrDialog, rencData) => TMRRencontres.onPostEchecTourbillon(tmrDialog, rencData, 1),
     poesieSucces: {
       reference: "Rêve de Dragon, Denis Gerfaud",
       extrait: `Le Premier Âge fut appelé l'Âge des Dragons. Ce fut le commencement
@@ -191,9 +202,9 @@ const typeRencontres = {
   },
 
   tbnoir: {
-    msgSucces: (rencData) => `Le ${rencData.rencontre.name} orageux vous enveloppe de fureur et d'éclairs, vous tenez bon face à la tempête qui s'éloigne sans vous éloigner de votre chemin.`,
+    msgSucces: async (rencData) => `Le ${rencData.rencontre.name} orageux vous enveloppe de fureur et d'éclairs, vous tenez bon face à la tempête qui s'éloigne sans vous éloigner de votre chemin.`,
-    msgEchec: (rencData) => `Le ${rencData.rencontre.name} furieux vous secoue tel un fichu de paille malmené par les vents, et vous emporte dans la tourmente.`,
+    msgEchec: async (rencData)=> `Le ${rencData.rencontre.name} furieux vous secoue tel un fichu de paille malmené par les vents, et vous emporte dans la tourmente.`,
-    postEchec: (tmrDialog, rencData) => TMRRencontres.onPostEchecTourbillon(tmrDialog, rencData, 2),
+    postEchec: async (tmrDialog, rencData) => TMRRencontres.onPostEchecTourbillon(tmrDialog, rencData, 2),
     poesieSucces: {
       reference: "Rêve de Dragon, Denis Gerfaud",
       extrait: `Car le Second Âge fut bel et bien celui des Magiciens. Durant cette période, les
@@ -207,9 +218,9 @@ const typeRencontres = {
   },
 
   tbrouge: {
-    msgSucces: (rencData) => `Le ${rencData.rencontre.name} s'abat avec violence mais vous êtes plus rapide et parvenez à lui échapper.`,
+    msgSucces: async (rencData) => `Le ${rencData.rencontre.name} s'abat avec violence mais vous êtes plus rapide et parvenez à lui échapper.`,
-    msgEchec: (rencData) => `Le ${rencData.rencontre.name} vous frappe de milliers de morsure et vous malmène à travers les terres médianes.`,
+    msgEchec: async (rencData)=> `Le ${rencData.rencontre.name} vous frappe de milliers de morsure et vous malmène à travers les terres médianes.`,
-    postEchec: (tmrDialog, rencData) => TMRRencontres.onPostEchecTourbillonRouge(tmrDialog, rencData),
+    postEchec: async (tmrDialog, rencData) => TMRRencontres.onPostEchecTourbillonRouge(tmrDialog, rencData),
     poesieSucces: {
       reference: "Qu'est-ce de votre vie ? une bouteille molle, Jean-Baptiste Chassignet",
       extrait: `Qu'est-ce de votre vie ? un tourbillon rouant
@@ -228,10 +239,10 @@ const typeRencontres = {
   },
 
   rdd: {
-    msgSucces: (rencData) => `A tout seigneur, tout honneur, vous faites face à un ${rencData.rencontre.name}. Vous le maîtrisez et récupérez ses rêves. Vous gagnez ses ${rencData.rencontre.force} points de rêve`,
+    msgSucces: async (rencData) => `A tout seigneur, tout honneur, vous faites face à un ${rencData.rencontre.name}. Vous le maîtrisez et récupérez ses rêves. Vous gagnez ses ${rencData.rencontre.force} points de rêve`,
-    msgEchec: (rencData) => `A tout seigneur, tout honneur, vous faites face à un ${rencData.rencontre.name}. La rencontre tourne au cauchemar, dans la lutte épique, vous subissez ${rencData.rolled.isETotal ? 'deux queues' : 'une queue'} de dragon!`,
+    msgEchec: async (rencData)=> `A tout seigneur, tout honneur, vous faites face à un ${rencData.rencontre.name}. La rencontre tourne au cauchemar, dans la lutte épique, vous subissez ${rencData.rolled.isETotal ? 'deux queues' : 'une queue'} de dragon!`,
-    postSucces: (tmrDialog, rencData) => TMRRencontres.onPostSuccessReveDeDragon(tmrDialog, rencData),
+    postSucces: async (tmrDialog, rencData) => TMRRencontres.onPostSuccessReveDeDragon(tmrDialog, rencData),
-    postEchec: (tmrDialog, rencData) => TMRRencontres.onPostEchecReveDeDragon(tmrDialog, rencData),
+    postEchec: async (tmrDialog, rencData) => TMRRencontres.onPostEchecReveDeDragon(tmrDialog, rencData),
     poesieSucces: {
       reference: "Rêve de Dragon, Denis Gerfaud",
       extrait: `Le monde est Rêve de Dragons, mais nous ne savons
@@ -404,7 +415,7 @@ export class TMRRencontres {
   static async gererRencontre(tmrDialog, rencData) {
     let gestion = TMRRencontres.getGestionRencontre(rencData.rencontre.type);
     if (rencData.rolled.isSuccess) {
-      rencData.message = gestion.msgSucces(rencData);
+      rencData.message = await gestion.msgSucces(rencData);
       if (rencData.nbRounds > 1) {
         rencData.message += ` Au total, vous avez passé ${rencData.nbRounds} rounds à vous battre!`;
       }
@@ -412,7 +423,7 @@ export class TMRRencontres {
       return gestion.postSucces;
     }
 
-    rencData.message = gestion.msgEchec(rencData);
+    rencData.message = await gestion.msgEchec(rencData);
     if (rencData.nbRounds > 1) {
       rencData.message += ` Vous avez passé ${rencData.nbRounds} rounds à lutter!`;
     }
@@ -422,7 +433,7 @@ export class TMRRencontres {
 
   /* -------------------------------------------- */
   static async msgEchecPasseurFou(tmrData) {
-    tmrData.sortReserve = Misc.templateData(tmrData.actor).reve.reserve.list[0];
+    tmrData.sortReserve = tmrData.actor.system.reve.reserve.list[0];
     if (tmrData.sortReserve) {
       // Passeur fou positionne sur la case d'un ort en réserve // TODO : Choisir le sort le plus loin ou au hasard
       tmrData.newTMR = TMRUtility.getTMR(tmrData.sortReserve.coord);
@@ -444,7 +455,7 @@ export class TMRRencontres {
     if (tmrData.sortReserve) {
       await tmrDialog.processSortReserve(tmrData.sortReserve);
     }
-    await tmrDialog.forceDemiRevePosition(tmrData.newTMR.coord);
+    await tmrDialog.positionnerDemiReve(tmrData.newTMR.coord);
     if (tmrData.sortReserve) {
       tmrDialog.close();
     }
@@ -465,17 +476,17 @@ export class TMRRencontres {
 
   /* -------------------------------------------- */
   static async _toubillonner(tmrDialog, actor, cases) {
-    let coord = Misc.templateData(actor).reve.tmrpos.coord;
+    let coord = actor.system.reve.tmrpos.coord;
     for (let i = 0; i < cases; i++) {
       coord = await TMRUtility.deplaceTMRAleatoire(actor, coord).coord;
     }
-    await tmrDialog.forceDemiRevePosition(coord)
+    await tmrDialog.positionnerDemiReve(coord)
   }
 
   /* -------------------------------------------- */
   static async onPostSuccessReveDeDragon(tmrDialog, tmrData) {
     if (tmrData.rolled.isPart) {
-      await tmrData.actor.appliquerAjoutExperience(tmrData, true);
+      await tmrData.actor.appliquerAjoutExperience(tmrData);
     }
     await tmrData.actor.resultCombatReveDeDragon(tmrData);
   }

module/tmr-utility.js

@@ -2,7 +2,6 @@ import { TMRRencontres } from "./tmr-rencontres.js";
 import { Misc } from "./misc.js";
 import { Grammar } from "./grammar.js";
 import { RdDDice } from "./rdd-dice.js";
-import { tmrConstants } from "./tmr-constants.js";
 
 /* -------------------------------------------- */
 const TMRMapping = {
@@ -12,7 +11,7 @@ const TMRMapping = {
   D1: { type: "fleuve", label: "Fleuve de l'Oubli" },
   E1: { type: "monts", label: "Monts de Kanaï" },
   F1: { type: "cite", label: "Cité Glauque" },
-  G1: { type: "desolation", label: "Désolation de Demain" },
+  G1: { type: "desolation", label: "Désolation de Jamais" },
   H1: { type: "lac", label: "Lac d’Anticalme" },
   I1: { type: "plaines", label: "Plaines Grises" },
   J1: { type: "monts", label: "Monts Fainéants" },
@@ -70,7 +69,7 @@ const TMRMapping = {
   F5: { type: "cite", label: "Cité de Panople" },
   G5: { type: "pont", label: "Pont d’Ik" },
   H5: { type: "desert", label: "Désert de Krane" },
-  I5: { type: "desolation", label: "Désolation de Demain" },
+  I5: { type: "desolation", label: "Désolation de Toujours" },
   J5: { type: "marais", label: "Marais de Jab" },
   K5: { type: "fleuve", label: "Fleuve de l'Oubli" },
   L5: { type: "collines", label: "Collines Suaves" },
@@ -86,9 +85,9 @@ const TMRMapping = {
   H6: { type: "monts", label: "Monts Gurdes" },
   I6: { type: "necropole", label: "Nécropole de Xotar" },
   J6: { type: "lac", label: "Lac d’Iaupe" },
-  K6: { type: "desolation", label: "Désolation de Demain" },
+  K6: { type: "desolation", label: "Désolation de Poor" },
   L6: { type: "foret", label: "Forêt Gueuse" },
-  M6: { type: "desolation", label: "Désolation de Demain" },
+  M6: { type: "desolation", label: "Désolation de Presque" },
 
   A7: { type: "plaines", label: "Plaines de l’Arc" },
   B7: { type: "marais", label: "Marais Bluants" },
@@ -124,7 +123,7 @@ const TMRMapping = {
   D9: { type: "pont", label: "Pont d’Orx" },
   E9: { type: "fleuve", label: "Fleuve de l'Oubli" },
   F9: { type: "plaines", label: "Plaines de Foe" },
-  G9: { type: "desolation", label: "Désolation de Demain" },
+  G9: { type: "desolation", label: "Désolation de Sel" },
   H9: { type: "collines", label: "Collines de Noirseul" },
   I9: { type: "fleuve", label: "Fleuve de l'Oubli" },
   J9: { type: "marais", label: "Marais Gronchants" },
@@ -146,10 +145,10 @@ const TMRMapping = {
   L10: { type: "desert", label: "Désert de Nicrop" },
   M10: { type: "foret", label: "Forêt de Jajou" },
 
-  A11: { type: "desolation", label: "Désolation de Demain" },
+  A11: { type: "desolation", label: "Désolation d’Hier" },
   B11: { type: "cite", label: "Cité de Brilz" },
   C11: { type: "pont", label: "Pont de Roï" },
-  D11: { type: "desolation", label: "Désolation de Demain" },
+  D11: { type: "desolation", label: "Désolation de Partout" },
   E11: { type: "lac", label: "Lac de Glinster" },
   F11: { type: "cite", label: "Cité de Noape" },
   G11: { type: "fleuve", label: "Fleuve de l'Oubli" },
@@ -170,7 +169,7 @@ const TMRMapping = {
   H12: { type: "collines", label: "Collines de Tooth" },
   I12: { type: "gouffre", label: "Gouffre Abimeux" },
   J12: { type: "cite", label: "Cité Folle" },
-  K12: { type: "desolation", label: "Désolation de Demain" },
+  K12: { type: "desolation", label: "Désolation d’Amour" },
   L12: { type: "plaines", label: "Plaines Venteuses" },
   M12: { type: "collines", label: "Collines Révulsantes" },
 
@@ -181,7 +180,7 @@ const TMRMapping = {
   E13: { type: "plaines", label: "Plaines de Xnez" },
   F13: { type: "foret", label: "Forêt des Cris" },
   G13: { type: "plaines", label: "Plaines Calcaires" },
-  H13: { type: "desolation", label: "Désolation de Demain" },
+  H13: { type: "desolation", label: "Désolation de Rien" },
   I13: { type: "monts", label: "Monts Bigleux" },
   J13: { type: "gouffre", label: "Gouffre de Gromph" },
   K13: { type: "foret", label: "Forêt de Kluth" },
@@ -200,8 +199,8 @@ const TMRMapping = {
   J14: { type: "desert", label: "Désert de Sank" },
   K14: { type: "necropole", label: "Nécropole d’Antinéar" },
   L14: { type: "plaines", label: "Plaines de Jislith" },
-  M14: { type: "desolation", label: "Désolation de Demain" },
+  M14: { type: "desolation", label: "Désolation d’Après" },
-
+  
   A15: { type: "cite", label: "Cité de Mielh" },
   C15: { type: "plaines", label: "Plaines de Toué" },
   E15: { type: "foret", label: "Forêt des Furies" },

module/tmr/conquete.js

@@ -32,14 +32,14 @@ export class Conquete extends Draconique {
   }
 
   async _creerConquete(actor, queue) {
-    let existants = actor.data.items.filter(it => this.isCase(it)).map(it => Misc.data(it).data.coord);
+    let existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
     let possibles = TMRUtility.filterTMR(tmr => !TMRUtility.isCaseHumide(tmr) && !existants.includes(tmr.coord));
     let conquete = await RdDDice.rollOneOf(possibles);
     await this.createCaseTmr(actor, 'Conquête: ' + conquete.label, conquete, queue.id);
   }
 
   async onActorDeleteCaseTmr(actor, casetmr) {
-    await actor.deleteEmbeddedDocuments('Item', [casetmr.data.sourceid]);
+    await actor.deleteEmbeddedDocuments('Item', [casetmr.system.sourceid]);
   }
 
 }

module/tmr/debordement.js

@@ -13,7 +13,7 @@ export class Debordement extends Draconique {
   match(item) { return Draconique.isSouffleDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('debordement'); }
   manualMessage() { return false }
   async onActorCreateOwned(actor, souffle) {
-    const existants = actor.data.items.filter(it => this.isCase(it)).map(it => it.data.coord);
+    const existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
     const tmr = await TMRUtility.getTMRAleatoire(it => !(TMRUtility.isCaseHumide(it) || existants.includes(it.coord)));
     await this.createCaseTmr(actor, 'Debordement: ' + tmr.label, tmr, souffle.id);
   }

module/tmr/desorientation.js

@@ -22,7 +22,7 @@ export class Desorientation extends Draconique {
   }
 
   _typesPossibles(actor) {
-    const dejaDesorientes = Misc.distinct(actor.data.items.filter(it => this.isCase(it)).map(it => it.type));
+    const dejaDesorientes = Misc.distinct(actor.items.filter(it => this.isCase(it)).map(it => it.type));
     return Object.keys(TMRType).filter(it => !dejaDesorientes.includes(it));
   }
 
@@ -42,7 +42,7 @@ export class Desorientation extends Draconique {
   }
 
   async _creerCasesTmr(actor, type, souffle) {
-    const existants = actor.data.items.filter(it => this.isCase(it)).map(it => it.data.coord);
+    const existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
     let tmrs = TMRUtility.filterTMR(it => it.type == type && !existants.includes(it.coord));
     for (let tmr of tmrs) {
       await this.createCaseTmr(actor, 'Désorientation: ' + tmr.label, tmr, souffle.id);

module/tmr/draconique.js

@@ -15,7 +15,7 @@ export class Draconique {
   static isTeteDragon(itemData) { return itemData.type == 'tete'; }
   static isQueueSouffle(itemData) { return Draconique.isQueueDragon(itemData) || Draconique.isSouffleDragon(itemData); }
 
-  tmrLabel(linkData) { return TMRUtility.getTMRLabel(linkData.data.coord); }
+  tmrLabel(linkData) { return TMRUtility.getTMRLabel(linkData.system.coord); }
 
   static register(draconique) {
     registeredEffects[draconique.code()] = draconique;
@@ -38,7 +38,7 @@ export class Draconique {
    * @returns true si l'item correspond
    */
   match(item) {
-    const itemData = Misc.data(item);
+    const itemData = item;
     return Draconique.isQueueDragon(itemData) || Draconique.isSouffleDragon(itemData) || Draconique.isTeteDragon(itemData);
   }
 
@@ -94,9 +94,8 @@ export class Draconique {
     token[type ?? this.code()] = linkData;
     pixiTMR.addTooltip(token.sprite, this.tooltip(linkData));
     return token;
-
-    return sprite;
   }
+
   /**
    * factory d'élément graphique PIXI correpsondant à l'objet draconique
    * @param {*} pixiTMR instance de PixiTMR qui gère les tooltips, les méthodes de création de sprite standard, les clicks.
@@ -116,34 +115,32 @@ export class Draconique {
    * @param {*} coord les coordonnées d'une case. Si undefined toute case du type correspondra, 
    */
   isCase(item, coord = undefined) {
-    const itemData = Misc.data(item);
+    return Draconique.isCaseTMR(item) && item.system.specific == this.code() && (coord ? item.system.coord == coord : true);
-    return Draconique.isCaseTMR(itemData) && itemData.data.specific == this.code() && (coord ? itemData.data.coord == coord : true);
   }
   
   find(list, coord = undefined) {
-    return list.find(c => this.isCase(Misc.data(c), coord));
+    return list.find(c => this.isCase(c, coord));
   }
   
   async createCaseTmr(actor, label, tmr, sourceId = undefined) {
     const casetmrData = {
       name: label, type: 'casetmr', img: this.img(),
-      data: { coord: tmr.coord, specific: this.code(), sourceid: sourceId }
+      system: { coord: tmr.coord, specific: this.code(), sourceid: sourceId }
     };
     await actor.createEmbeddedDocuments('Item', [casetmrData]);
   }
   
   async deleteCasesTmr(actor, draconique) {
-    let caseTmrs = actor.data.items.filter(it => this.isCaseForSource(it, draconique));
+    let caseTmrs = actor.items.filter(it => this.isCaseForSource(it, draconique));
     await actor.deleteEmbeddedDocuments('Item', caseTmrs.map(it => it.id));
   }
   
   isCaseForSource(item, draconique) {
-    const itemData = Misc.data(item);
+    return Draconique.isCaseTMR(item) && item.system.specific == this.code() && item.system.sourceid == draconique.id;
-    return Draconique.isCaseTMR(itemData) && itemData.data.specific == this.code() && itemData.data.sourceid == draconique.id;
   }
 
   async onVisiteSupprimer(actor, tmr, onRemoveToken) {
-    let existants = actor.data.items.filter(it => this.isCase(it, tmr.coord));
+    let existants = actor.items.filter(it => this.isCase(it, tmr.coord));
     await actor.deleteEmbeddedDocuments('Item', existants.map(it => it.id));
     for (let casetmr of existants) {
       onRemoveToken(tmr, casetmr);

module/tmr/effets-draconiques.js

@@ -95,7 +95,7 @@ export class EffetsDraconiques {
 
   /* -------------------------------------------- */
   static isSortImpossible(actor) {
-    return actor.data.items.find(it =>
+    return actor.items.find(it =>
       EffetsDraconiques.conquete.match(it) ||
       EffetsDraconiques.periple.match(it) ||
       EffetsDraconiques.urgenceDraconique.match(it) ||
@@ -104,7 +104,7 @@ export class EffetsDraconiques {
   }
 
   static isSortReserveImpossible(actor) {
-    return actor.data.items.find(it =>
+    return actor.items.find(it =>
       EffetsDraconiques.conquete.match(it) ||
       EffetsDraconiques.periple.match(it) ||
       EffetsDraconiques.pelerinage.match(it)
@@ -112,7 +112,7 @@ export class EffetsDraconiques {
   }
 
   static filterItems(actor, filter, name) {
-    return actor.data.items.filter(filter)
+    return actor.filter(filter)
       .filter(it => Grammar.includesLowerCaseNoAccent(it.name, name));
   }
 
@@ -150,11 +150,11 @@ export class EffetsDraconiques {
   }
 
   static isPontImpraticable(actor) {
-    return actor.data.items.find(it => EffetsDraconiques.pontImpraticable.match(it));
+    return actor.items.find(it => EffetsDraconiques.pontImpraticable.match(it));
   }
 
   static isUrgenceDraconique(actor) {
-    return actor.data.items.find(it => EffetsDraconiques.urgenceDraconique.match(it));
+    return actor.items.find(it => EffetsDraconiques.urgenceDraconique.match(it));
   }
 
   static isPeage(actor) {

module/tmr/fermeture-cites.js

@@ -30,7 +30,7 @@ export class FermetureCites extends Draconique {
   }
 
   async _fermerLesCites(actor, souffle) {
-    let existants = actor.data.items.filter(it => this.isCase(it)).map(it => it.data.coord);
+    let existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
     let ouvertes = TMRUtility.filterTMR(it => it.type == 'cite' && !existants.includes(it.coord));
     for (let tmr of ouvertes) {
       await this.createCaseTmr(actor, 'Fermeture: ' + tmr.label, tmr, souffle.id);

module/tmr/pelerinage.js

@@ -33,7 +33,7 @@ export class Pelerinage extends Draconique {
   }
   
   async onActorDeleteCaseTmr(actor, casetmr) {
-    await actor.deleteEmbeddedDocuments('Item', [casetmr.data.sourceid]);
+    await actor.deleteEmbeddedDocuments('Item', [casetmr.system.sourceid]);
   }
 
 }

module/tmr/pixi-tmr.js

@@ -25,7 +25,7 @@ export class PixiTMR {
     for (const [name, img] of Object.entries(PixiTMR.textures)) {
       loader = loader.add(name, img);
     }
-    loader.onLoad.add((error, resaon) => { console.log("ERROR", error, resaon) });
+    loader.onLoad.add((error, reason) => { console.log("ERROR", error, reason) });
     loader.load( (loader, resources) =>  {
       onLoad(loader, resources);
       for (let onAnimate of this.callbacksOnAnimate) {

module/tmr/present-cites.js

@@ -30,7 +30,7 @@ export class PresentCites extends Draconique {
   }
 
   async _ajouterPresents(actor, tete) {
-    let existants = actor.data.items.filter(it => this.isCase(it)).map(it => it.data.coord);
+    let existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
     if (existants.length > 0) {
       ChatMessage.create({
         whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),

module/tmr/reserve-extensible.js

@@ -12,8 +12,8 @@ export class ReserveExtensible extends Draconique {
   match(item) { return Draconique.isTeteDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes("reserve extensible"); }
   manualMessage() { return "Vous pouvez re-configurer votre Réserve extensible" }
   async onActorCreateOwned(actor, tete) {
-    const existants = actor.data.items.filter(it => this.isCase(it)).map(it => it.data.coord);
+    const existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
-    const tmr = await TMRUtility.getTMRAleatoire(it => !(it.type == 'fleuve' || existants.includes(it.coord)));
+    const tmr = await TMRUtility.getTMRAleatoire(it => !(it.type == 'fleuve' || existants.includes(it.system.coord)));
     await this.createCaseTmr(actor, "Nouvelle Réserve extensible", tmr, tete.id);
   }
 

module/tmr/trou-noir.js

@@ -13,8 +13,8 @@ export class TrouNoir extends Draconique {
   manualMessage() { return false }
 
   async onActorCreateOwned(actor, souffle) {
-    const existants = actor.data.items.filter(it => this.isCase(it)).map(it => it.data.coord);
+    const existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
-    const tmr = await TMRUtility.getTMRAleatoire(it => !(TMRUtility.isCaseHumide(it) || existants.includes(it.coord)));
+    const tmr = await TMRUtility.getTMRAleatoire(it => !(TMRUtility.isCaseHumide(it) || existants.includes(it.system.coord)));
     await this.createCaseTmr(actor, 'Trou noir: ' + tmr.label, tmr, souffle.id);
   }
 

module/tmr/urgence-draconique.js

@@ -16,7 +16,7 @@ export class UrgenceDraconique extends Draconique {
   match(item) { return Draconique.isQueueDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('urgence draconique'); }
   manualMessage() { return false }
   async onActorCreateOwned(actor, queue) {
-    const coordSortsReserve = (Misc.templateData(actor).reve.reserve?.list.map(it => it.coord)) ?? [];
+    const coordSortsReserve = (actor.system.reve.reserve?.list.map(it => it.coord)) ?? [];
     if (coordSortsReserve.length == 0) {
       // La queue se transforme en idée fixe
       const ideeFixe = await RdDRollTables.getIdeeFixe();

styles/simple.css

@@ -65,7 +65,11 @@
   --debug-box-shadow-blue: inset 0 0 2px blue;
   --debug-box-shadow-green: inset 0 0 2px green;
 
-/* =================== 3. some constants ============ */ 
+/* =================== 3. some constants ============ */
+  --color-controls:rgba(0, 0, 0, 0.9);
+  --color-controls-hover:rgba(255, 255, 128, 0.7);
+  --color-control-border-hover:rgba(255, 128, 0, 0.8);
+  --color-gold: rgba(191, 149, 63, 0.8);
   --gradient-gold: linear-gradient(30deg, rgba(191, 149, 63, 0.3), rgba(252, 246, 186, 0.3), rgba(179, 135, 40, 0.3), rgba(251, 245, 183, 0.3), rgba(170, 119, 28, 0.3));
   --gradient-silver: linear-gradient(30deg, rgba(61, 55, 93, 0.3), rgba(178, 179, 196, 0.3), rgba(59, 62, 63, 0.6), rgba(206, 204, 199, 0.3), rgba(61, 46, 49, 0.3));
   --gradient-green: linear-gradient(30deg, rgba(7, 76, 0, 0.3), rgba(66, 163, 65, 0.2), rgba(184, 226, 163, 0.1), rgba(66, 163, 65, 0.2), rgba(184, 226, 163, 0.3));
@@ -104,6 +108,9 @@
 .strong-text{
   font-weight: bold;
 }
+i:is(.fas, .far) {
+  font-size: smaller;
+}
 
 .tabs .item.active, .blessures-list li ul li:first-child:hover, a:hover {
   text-shadow: 1px 0px 0px #ff6600;
@@ -225,6 +232,26 @@ table {border: 1px solid #7a7971;}
   flex-grow : 3;
 }
 /* Styles limited to foundryvtt-reve-de-dragon sheets */
+.equipement-nom {
+  flex-grow : 4;
+  margin: 0;
+  justify-content: center;
+  text-align: left;
+}
+.equipement-detail {
+  margin: 0;
+  flex: 'flex-shrink' ;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+}
+.equipement-actions {
+  margin: 0;
+  flex-grow: 2;
+  align-items: center;
+  justify-content: center;
+  text-align: left;
+}
 
 .foundryvtt-reve-de-dragon .sheet-header {
   -webkit-box-flex: 0;
@@ -266,14 +293,8 @@ table {border: 1px solid #7a7971;}
   height: 8%;
   max-height: 48px;
   border-width: 0;
-	border: 1px solid rgba(0, 0, 0, 0);
+  border: 1px solid rgba(0, 0, 0, 0);
 }
-.button-img:hover {
-	color: rgba(255, 255, 128, 0.7);
-	border: 1px solid rgba(255, 128, 0, 0.8);
-	cursor: pointer;
-}
-
 .button-effect-img {
   vertical-align: baseline;
   width: 16px;
@@ -281,9 +302,16 @@ table {border: 1px solid #7a7971;}
   height: 16;
   border-width: 0;
 }
-.button-effect-img:hover {
+.small-button-direction {
-  color: rgba(255, 255, 128, 0.7);
+  height: 32px;
-  border: 1px solid rgba(255, 128, 0, 0.8);
+  width: 32px;
+  border: 0;
+  vertical-align: bottom;
+}
+:is(.button-img,.button-effect-img:hover,.small-button-direction):hover {
+  color: var(--color-controls-hover);
+  border: 1px solid var(--color-control-border-hover);
+  text-shadow: 1px 0px 0px #ff6600;
   cursor: pointer;
 }
 
@@ -294,18 +322,6 @@ table {border: 1px solid #7a7971;}
   vertical-align: bottom;
 }
 
-.small-button-direction {
-  height: 32px;
-  width: 32px;
-  border: 0;
-  vertical-align: bottom;
-}
-.small-button-direction:hover {
-	color: rgba(255, 255, 128, 0.7);
-	border: 1px solid rgba(255, 128, 0, 0.8);
-	cursor: pointer;
-}
-
 .foundryvtt-reve-de-dragon .sheet-header .header-fields {
   -webkit-box-flex: 1;
   -ms-flex: 1;
@@ -346,25 +362,25 @@ table {border: 1px solid #7a7971;}
   flex-grow: 0;
 }
 
-.rdd.sheet .window-content .sheet-body .carac-list .competence {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique {
   flex-wrap: nowrap;
   justify-content: stretch;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .competence > .carac-label {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .carac-label {
   flex-basis: 50%;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .competence > .attribut-label {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .attribut-label {
   flex-basis: 50%;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .competence > .competence-value.total {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .competence-value.total {
   flex-grow: 1;
   text-align: right;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .competence > .utiliser-attribut {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .utiliser-attribut {
   flex-basis: available;
   flex-grow: 1;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .competence > * {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > * {
   flex-basis: 13%;
   flex-grow: 0;
 }
@@ -469,13 +485,18 @@ table {border: 1px solid #7a7971;}
   flex: 0 0 86px;
   text-align: right;
 }
-
 .competence-list .item-controls {
   display: contents !important;
 }
 .competence-list .item-controls.hidden-controls {
   display: none !important;
 }
+.item-controls i:is(.fas,.far) {
+  color: var(--color-controls);
+}
+.item-controls i:is(.fas,.far):hover {
+  opacity: 0.7  ;
+}
 
 .rdddialog .dialog-roll-sort s{
   width: 600px;
@@ -567,7 +588,7 @@ table {border: 1px solid #7a7971;}
   color: rgba(255, 255, 255, 0.75);
   background: rgba(255, 255, 255, 0.05);
   border: 0 none;
-  margin-bottom: 0.25rem;
+  margin-bottom: 0.2rem;
 }
 
 .window-app .window-content, .window-app.sheet .window-content .sheet-body{
@@ -601,7 +622,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
 
 nav.sheet-tabs .item {
   position: relative;
-  padding: 0 0.25rem;
+  padding: 0 0.2rem;
 }
 
 nav.sheet-tabs .item:after {
@@ -627,11 +648,15 @@ section.sheet-body:after {
 .sheet header.sheet-header .flex-compteurs {text-align: right;}
 .sheet header.sheet-header .resource-content {width: 2rem;}
 
-.ctn-vie span, .ctn-endu span, .ctn-fatigue span, .ctn-reve span {
+.compteur span {
   display: inline-block;
   text-align: left;
   width: 2rem;
 }
+.compteur a i:is(.fas,.far):hover {
+  opacity: 0.7  ;
+}
+
 .select-diff {
   display: inline-block;
   text-align: left;
@@ -644,17 +669,6 @@ section.sheet-body:after {
   max-width: 90%;
 }
 
-.plus-moins {
-  display: inline-block;
-  width: 1.25rem;
-  background: rgba(30, 25, 20, 1);
-  text-align: center;
-  border: 1px solid rgba(72, 46, 28, 1);
-  border-radius: 0.25rem;
-  line-height: 1.25rem;
-  color: rgba(255, 255, 255, 0.5);
-}
-
 .alchimie-tache {
   font-weight: bold;
   background: rgb(182, 180, 179);
@@ -711,10 +725,13 @@ ul, ol {
 ul, li {
   list-style-type: none;
 }
-
+.sheet .caracteristique li {
+  margin: 0.1rem;
+  padding: 0.2rem;
+}
 .sheet li {
-  margin: 0.125rem;
+  margin: 0.1rem;
-  padding: 0.25rem;
+  padding: 0.1rem;
 }
 .header-fields li {
   margin: 0;
@@ -731,23 +748,19 @@ ul, li {
   background: rgb(160, 130, 100, 0.05);
 }
 .xp-level-up {
-  margin: 0.125rem;
+  margin: 0.1rem;
   box-shadow: inset 0px 0px 1px #00000096;
   border-radius: 0.25rem;
-  padding: 0.125rem;
+  padding: 0.1rem;
   flex: 1 1 5rem;  
   background: var(--gradient-gold) !important;
 }
 .niveau-archetype {
   background: var(--gradient-silver-light) !important;
 }
-.fa-arrow-alt-circle-up.allouer-stress {
+.item-controls i.fas.allouer-stress.level-up {
-  color: rgba(83, 60, 14, 0.8);
+  color: var(--color-gold);
 }
-.fa-arrow-alt-circle-up.allouer-stress-level-up {
-  color: rgba(191, 149, 63, 0.8);
-}
-
 .blessures-list ul {
   display: flex;
 }
@@ -766,18 +779,18 @@ ul, li {
   font-weight: bold;
 }
 .list-item {
-  margin: 0.125rem;
+  margin: 0.1rem;
   box-shadow: inset 0px 0px 1px #00000096;
   border-radius: 0.25rem;
-  padding: 0.125rem;
+  padding: 0.1rem;
   flex: 1 1 5rem;
   display: flex !important;
-  align-items: baseline !important;
+  align-items: center !important;
 }
 
 .table-row {
-  margin: 0.125rem;
+  margin: 0.1rem;
-  padding: 0.125rem;
+  padding: 0.1rem;
   flex: 1 1 5rem;
 }
 
@@ -801,28 +814,37 @@ ul, li {
   background: rgb(200, 10, 100, 0.25);
 }
 
-.item-quantite {
+.item-column {
-  margin-left: 0.5rem;
+  margin-left: 0.2rem;
+  margin-right: 0.2rem;
+  justify-content: center;
+  text-align: center;
 }
 
 .list-item-margin1 {
-  margin-left: 1rem;
+  margin-left: 0.5rem;
 }
 .list-item-margin2 {
-  margin-left: 2rem;
+  margin-left: 1rem;
 }
 .list-item-margin3 {
-  margin-left: 3rem;
+  margin-left: 1.5rem;
 }
 .list-item-margin4 {
-  margin-left: 4rem;
+  margin-left: 2rem;
+}
+.list-item-margin5 {
+  margin-left: 2.5rem;
+}
+.list-item-margin6 {
+  margin-left: 3rem;
 }
 
 .sheet-competence-img {
   width: 24px;
   height: 24px;
   flex-grow: 0;
-  margin-right: 0.25rem;
+  margin-right: 0.2rem;
   vertical-align: bottom;
 }
 .competence-column {
@@ -866,20 +888,20 @@ ul, li {
 .competence-value {
   flex-grow: 0;
   flex-basis: 2rem;
-  margin-right: 0.25rem;
+  margin-right: 0.2rem;
-  margin-left: 0.25rem;
+  margin-left: 0.2rem;
 }
 .description-value {
   flex-grow: 0;
   flex-basis: 4rem;
-  margin-right: 0.25rem;
+  margin-right: 0.2rem;
-  margin-left: 0.25rem;
+  margin-left: 0.2rem;
 }
 .competence-xp {
   flex-grow: 0;
   flex-basis: 2rem;
-  margin-right: 0.25rem;
+  margin-right: 0.2rem;
-  margin-left: 0.25rem;
+  margin-left: 0.2rem;
 }
 .blessures-title { 
   font-weight: bold;
@@ -957,7 +979,7 @@ ul, li {
   flex-basis: auto;
   padding: 0;
   line-height: 1rem;
-  margin: 0.25rem;
+  margin: 0.2rem;
 }
 .control-icon.tokenhudicon.right {
   margin-left: 8px;
@@ -975,7 +997,7 @@ ul, li {
   border-left: none;
   font-weight: 500;
   font-size: 1rem;
-  color: black;
+  color: var(--color-controls);
   padding-top: 5px;
   margin-right: 0px;
   width: 45px;
@@ -1075,7 +1097,7 @@ ul, li {
 .sidebar-tab .directory-list .entity {
     border-top: 1px dashed rgba(0,0,0,0.25);
     border-bottom: 0 none;
-    padding: 0.25rem 0; 
+    padding: 0.2rem 0; 
 }
 
 .sidebar-tab .directory-list .entity:hover {
@@ -1153,11 +1175,11 @@ ul, li {
   border-image-width: 4px;
   border-image-outset: 0px;
 }
-  #controls .control-tools {
+#controls .control-tools {
-    max-height: calc(100vh - 156px);
+  max-height: calc(100vh - 156px);
-    height: auto;
+  height: auto;
 }
-#controls .scene-control.active, #controls .control-tool.active, #controls .scene-control:hover, #controls .control-tool:hover {
+#controls :is(.scene-control.active,.control-tool.active, .scene-control:hover, .control-tool:hover) {
   background: rgba(72, 46, 28, 1);
   background-origin: padding-box;
   border-image: url(img/ui/footer-button.webp) 10 repeat;
@@ -1343,8 +1365,8 @@ ul, li {
 	color: rgba(255, 255, 255, 0.5);
 }
 .calendar-btn:hover {
-	color: rgba(255, 255, 128, 0.7);
+	color: var(--color-controls-hover);
-	border: 1px solid rgba(255, 128, 0, 0.8);
+	border: 1px solid var(--color-control-border-hover);
 	cursor: pointer;
 }
 

system.json

@@ -1,38 +1,43 @@
 {
-  "name": "foundryvtt-reve-de-dragon",
+  "id": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "author": "LeRatierBretonnien",
   "authors": [
     {
-      "name": "LeRatierBretonnien"
+      "name": "LeRatierBretonnien",
+      "flags": {}
     },
     {
-      "name": "VincentVK"
+      "name": "VincentVK",
+      "flags": {}
     },
     {
-      "name": "Grendel"
+      "name": "Grendel",
+      "flags": {}
     },
     {
-      "name": "Michael Nonne"
+      "name": "Michael Nonne",
+      "flags": {}
     },
     {
-      "name": "Mandar"
+      "name": "Mandar",
+      "flags": {}
     },
     {
-      "name": "Fred"
+      "name": "Fred",
+      "flags": {}
     },
     {
-      "name": "Fab"
+      "name": "Fab",
+      "flags": {}
     }
   ],
   "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
-  "flags": {},
+  "version": "10.0.9",
-  "version": "1.5.75",
+  "compatibility": {
-  "minimumCoreVersion": "0.8.0",
+    "minimum": "10"
-  "compatibleCoreVersion": "9",
+  },
-  "scripts": [],
   "esmodules": [
     "module/rdd-main.js"
   ],
@@ -44,12 +49,13 @@
       "lang": "en",
       "name": "English",
       "path": "lang/fr.json",
-      "unreal": "this is a trick"
+      "flags": {}
     },
     {
       "lang": "fr",
       "name": "Français",
-      "path": "lang/fr.json"
+      "path": "lang/fr.json",
+      "flags": {}
     }
   ],
   "packs": [
@@ -57,453 +63,278 @@
       "name": "competences",
       "label": "Compétences",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/competences.db",
-      "path": "./packs/competences.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "compétences"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "arts-et-divertissements",
       "label": "Arts et Divertissements",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/arts-et-divertissements.db",
-      "path": "./packs/arts-et-divertissements.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "recette",
+      "flags": {}
-        "cuisine",
-        "danse",
-        "musique",
-        "chant",
-        "jeux"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "competences-creatures",
       "label": "Compétences de Créatures",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/competences-creatures.db",
-      "path": "./packs/competences-creatures.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "compétences",
-        "créatures"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "competences-entites",
       "label": "Compétences des Entités",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/competences-entites.db",
-      "path": "./packs/competences-entites.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "compétences",
-        "entités"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "sorts-oniros",
       "label": "Sorts d'Oniros",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/sorts-oniros.db",
-      "path": "./packs/sorts-oniros.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "sorts"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "sorts-hypnos",
       "label": "Sorts d'Hypnos",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/sorts-hypnos.db",
-      "path": "./packs/sorts-hypnos.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "sorts"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "sorts-narcos",
       "label": "Sorts de Narcos",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/sorts-narcos.db",
-      "path": "./packs/sorts-narcos.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "sorts"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "sorts-thanatos",
       "label": "Sorts de Thanatos",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/sorts-thanatos.db",
-      "path": "./packs/sorts-thanatos.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "sorts"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "equipement",
       "label": "Equipement",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/equipement.db",
-      "path": "./packs/equipement.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "équipement",
-        "objet"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "maladies-et-poisons",
       "label": "Maladies & Poisons",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/maladies-et-poisons.db",
-      "path": "./packs/maladies-et-poisons.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "maladie",
+      "flags": {}
-        "poison"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "rappel-des-regles",
       "label": "Rappels des Règles",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/rappel-des-regles.db",
-      "path": "./packs/rappel-des-regles.db",
       "type": "JournalEntry",
-      "tags": [
+      "private": false,
-        "journal",
+      "flags": {}
-        "règles"
-      ],
-      "entity": "JournalEntry",
-      "private": false
     },
     {
       "name": "queues-de-dragon",
       "label": "Queues de Dragon",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/queues-de-dragon.db",
-      "path": "./packs/queues-de-dragon.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "queue"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "ombres-de-thanatos",
       "label": "Ombres de Thanatos",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/ombres-de-thanatos.db",
-      "path": "./packs/ombres-de-thanatos.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "ombre"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "souffles-de-dragon",
       "label": "Souffles de Dragon",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/souffles-de-dragon.db",
-      "path": "./packs/souffles-de-dragon.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "souffle"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "tarot-draconique",
       "label": "Tarot Draconique",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/tarot-draconique.db",
-      "path": "./packs/tarot-draconique.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "tarot"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "tetes-de-dragon-pour-haut-revants",
       "label": "Têtes de Dragon (Hauts-Rêvants)",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/tetes-de-dragon-pour-haut-revants.db",
-      "path": "./packs/tetes-de-dragon-pour-haut-revants.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "tête"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "tetes-de-dragon-pour-tous-personnages",
       "label": "Têtes de Dragon (Tous Personnages)",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/tetes-de-dragon-pour-tous-personnages.db",
-      "path": "./packs/tetes-de-dragon-pour-tous-personnages.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "item",
+      "flags": {}
-        "tête"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "tables-diverses",
       "label": "Tables Diverses",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/tables-diverses.db",
-      "path": "./packs/tables-diverses.db",
       "type": "RollTable",
-      "tags": [
+      "private": false,
-        "table",
+      "flags": {}
-        "tables"
-      ],
-      "entity": "RollTable",
-      "private": false
     },
     {
       "name": "animaux",
       "label": "Animaux",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/animaux.db",
-      "path": "./packs/animaux.db",
       "type": "Actor",
-      "tags": [
+      "private": false,
-        "animaux",
+      "flags": {}
-        "creature"
-      ],
-      "entity": "Actor",
-      "private": false
     },
     {
       "name": "voyageurs",
       "label": "Voyageurs",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/voyageurs.db",
-      "path": "./packs/voyageurs.db",
       "type": "Actor",
-      "tags": [
+      "private": false,
-        "voyageur",
+      "flags": {}
-        "profils"
-      ],
-      "entity": "Actor",
-      "private": false
     },
     {
       "name": "vehicules",
       "label": "Véhicules",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/vehicules.db",
-      "path": "./packs/vehicules.db",
       "type": "Actor",
-      "tags": [
+      "private": false,
-        "vehicule",
+      "flags": {}
-        "bateau",
-        "charett",
-        "chariot",
-        "carriole",
-        "barque"
-      ],
-      "entity": "Actor",
-      "private": false
     },
     {
       "name": "archetypes",
       "label": "Archetypes PNJs",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/archetypes.db",
-      "path": "./packs/archetypes.db",
       "type": "Actor",
-      "tags": [
+      "private": false,
-        "archetype",
+      "flags": {}
-        "pnj"
-      ],
-      "entity": "Actor",
-      "private": false
     },
     {
       "name": "humanoides",
       "label": "Humanoïdes",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/humanoides.db",
-      "path": "./packs/humanoides.db",
       "type": "Actor",
-      "tags": [
+      "private": false,
-        "humanoides",
+      "flags": {}
-        "pnj"
-      ],
-      "entity": "Actor",
-      "private": false
     },
     {
       "name": "entites",
       "label": "Entités de Cauchemar",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/entites-de-cauchemar.db",
-      "path": "./packs/entites-de-cauchemar.db",
       "type": "Actor",
-      "tags": [
+      "private": false,
-        "entités",
+      "flags": {}
-        "entite",
-        "cauchemar",
-        "ecni",
-        "eni"
-      ],
-      "entity": "Actor",
-      "private": false
     },
     {
       "name": "invocations",
       "label": "Invocation d'Hypnos",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/invocations.db",
-      "path": "./packs/invocations.db",
       "type": "Actor",
-      "tags": [
+      "private": false,
-        "hypnos",
+      "flags": {}
-        "invocation"
-      ],
-      "entity": "Actor",
-      "private": false
     },
     {
       "name": "botanique",
       "label": "Botanique",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/botanique.db",
-      "path": "./packs/botanique.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "plantes",
+      "flags": {}
-        "champignons",
-        "herbes"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "taches-courantes",
       "label": "Tâches courantes",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/taches-courantes.db",
-      "path": "./packs/taches-courantes.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "taches"
+      "flags": {}
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "meditations-et-ecrits",
       "label": "Méditations et Ecrits",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/meditations-et-ecrits.db",
-      "path": "./packs/meditations-et-ecrits.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "meditations",
+      "flags": {}
-        "méditations",
-        "livres",
-        "livre",
-        "méditation",
-        "écrits",
-        "écrit"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "recettes-alchimiques",
       "label": "Recettes Alchimiques",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/recettes-alchimiques.db",
-      "path": "./packs/recettes-alchimiques.db",
       "type": "Item",
-      "tags": [
+      "private": false,
-        "recettes",
+      "flags": {}
-        "recette",
-        "alchimie",
-        "alchimique",
-        "potion"
-      ],
-      "entity": "Item",
-      "private": false
     },
     {
       "name": "scenes-rdd",
       "label": "Scenes Reve de Dragon",
       "system": "foundryvtt-reve-de-dragon",
-      "module": "foundryvtt-reve-de-dragon",
+      "path": "packs/scenes-rdd.db",
-      "path": "./packs/scenes-rdd.db",
       "type": "Scene",
-      "tags": [
+      "private": false,
-        "ecran",
+      "flags": {}
-        "scene"
-      ],
-      "entity": "Scene",
-      "private": false
     }
   ],
-  "system": [],
-  "dependencies": [],
   "socket": true,
-  "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v1.5/system.json",
+  "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-1.5.75.zip",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.8.zip",
-  "protected": false,
   "gridDistance": 1,
   "gridUnits": "m",
   "primaryTokenAttribute": "sante.vie",
   "secondaryTokenAttribute": "sante.endurance"
-}
+}

templates/actor-blessure-partial.html

@@ -1,5 +1,5 @@
 <tr class="table-row alterne-row item" data-blessure-type="{{gravite}}" data-attribute={{key}} data-blessure-index="{{key}}" >
-  <td class="item-control blessure-control" title="Blessure {{title}}" data-blessure-active="{{bless.active}}">
+  <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}}

templates/actor-creature-sheet.html

@@ -44,18 +44,17 @@
             {{#each data.carac as |carac key|}}
             <li class="flexrow list-item" data-attribute="{{key}}">
               {{#if (eq key 'taille')}}
-              <span class="carac-label flexrow" name="data.carac.{{key}}.label">{{carac.label}}</span>
+              <span class="carac-label flexrow" name="system.carac.{{key}}.label">{{carac.label}}</span>
               {{else}}
-              <span class="carac-label flexrow" name="data.carac.{{key}}.label"><a
+              <span class="carac-label flexrow" name="system.carac.{{key}}.label"><a
                   name={{key}}>{{carac.label}}</a></span>
               {{/if}}
-              <input class="competence-value flexrow" type="text" name="data.carac.{{key}}.value"
+              <input class="competence-value flexrow" type="text" name="system.carac.{{key}}.value"
                 value="{{carac.value}}" data-dtype="{{carac.type}}" />
             </li>
             {{/each}}
             <li class="flexrow">
               <span class="carac-label" name="carac-total">Total Caractéristiques</span>
-              {{log 'data-actor-creature' this}}
               <span class="competence-value" name="carac-total-value">{{calc.caracTotal}}</span>
             </li>
           </ol>
@@ -64,26 +63,26 @@
           <ol class="carac-list alterne-list">
             {{#each data.attributs as |attr key|}}
             <li class="flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label" name="data.attributs.{{key}}.label">{{attr.label}}</span>
+              <span class="carac-label" name="system.attributs.{{key}}.label">{{attr.label}}</span>
-              <input type="text" name="data.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="{{attr.type}}" />
+              <input type="text" name="system.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="{{attr.type}}" />
             </li>
             {{/each}}
             <li class="flexrow list-item" data-attribute="vie">
-              <span class="competence-label" name="data.sante.vie.label">Vie</span>
+              <span class="competence-label" name="system.sante.vie.label">Vie</span>
               <span class="flexrow" >
-                <input type="text" name="data.sante.vie.value" value="{{data.sante.vie.value}}" data-dtype="Number" /> / 
+                <input type="text" name="system.sante.vie.value" value="{{data.sante.vie.value}}" data-dtype="Number" /> / 
-                <input type="text" name="data.sante.vie.max" value="{{data.sante.vie.max}}" data-dtype="Number" />
+                <input type="text" name="system.sante.vie.max" value="{{data.sante.vie.max}}" data-dtype="Number" />
               </span>
             </li>
             <li class="flexrow list-item" data-attribute="endurance">
-              <span class="competence-label" name="data.sante.endurance.label">Endurance</span>
+              <span class="competence-label" name="system.sante.endurance.label">Endurance</span>
               <span class="flexrow" >
-                <input type="text" name="data.sante.endurance.value" value="{{data.sante.endurance.value}}" data-dtype="Number" /> / 
+                <input type="text" name="system.sante.endurance.value" value="{{data.sante.endurance.value}}" data-dtype="Number" /> / 
-                <input type="text" name="data.sante.endurance.max" value="{{data.sante.endurance.max}}" data-dtype="Number" />
+                <input type="text" name="system.sante.endurance.max" value="{{data.sante.endurance.max}}" data-dtype="Number" />
               </span>
             </li>
             <li class="flexrow list-item" data-attribute="etat">
-              <span class="competence-label" name="data.compteurs.etat.label">Etat Général</span>
+              <span class="competence-label" name="system.compteurs.etat.label">Etat Général</span>
               <input type="text" value="{{data.compteurs.etat.value}}" disabled />
             </li>
           </ol>
@@ -103,14 +102,14 @@
                 <span class="competence-label">{{comp.name}}</span>
               </a>
                 <input class="competence-value creature-carac" type="text" compname="{{comp.name}}"
-                value="{{comp.data.carac_value}}" data-dtype="number" />
+                value="{{comp.system.carac_value}}" data-dtype="number" />
               <input class="competence-value creature-niveau" type="text" compname="{{comp.name}}"
-                value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" />
+                value="{{numberFormat comp.system.niveau decimals=0 sign=true}}" data-dtype="number" />
               <input class="competence-value creature-dommages" type="text" compname="{{comp.name}}"
-                value="{{numberFormat comp.data.dommages decimals=0 sign=true}}" data-dtype="number" />
+                value="{{numberFormat comp.system.dommages decimals=0 sign=true}}" data-dtype="number" />
               <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -127,35 +126,7 @@
 
     {{!-- 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-inventaire-monnaie.html" monnaie=monnaie}}
-
-      <span class="item-name"><h4>Equipement porté</h4></span>
-      <span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.attributs.encombrement.value}} <b>{{calc.surEncombrementMessage}}</b></span> - 
-      <span class="item-name"><a class="creer-un-objet">Créer un objet</a></span>
-      {{#if options.isGM}}
-      <span class="item-name"> - <a id="nettoyer-conteneurs">Vider tout les conteneurs</a></span>
-      {{/if}}
-
-      <ul class="item-list alterne-list">
-        <li class="competence-header flexrow">
-          <img class="sheet-competence-img" src="{{img}}" title="Equipement"/>
-          <span class="competence-title flex-grow">Nom</span>
-          <span class="competence-title">Q.</span>
-          <span class="competence-title">Enc.</span>
-          <span class="competence-title flex-grow">Equiper/Editer/Suppr.</span>
-        </li>
-        {{#each objets as |item id|}}
-          {{#unless item.estContenu}}
-          {{#if (ne item.type 'conteneur')}}
-            {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html" item=item }}
-          {{/if}}
-          {{/unless}}
-        {{/each}}
-        {{#each conteneurs as |conteneur id|}}
-          {{buildConteneur this}}
-        {{/each}}
-      </ul>
     </div>
 
     {{!-- Biography Tab --}}
@@ -163,12 +134,12 @@
 
       <div class="form-group">
         <span class="item-name"><h4>Race</h4></span>
-        <input type="text" name="data.race" value="{{data.race}}" data-dtype="String" />
+        <input type="text" name="system.race" value="{{data.race}}" data-dtype="String" />
       </div>
 
-      <div class="form-group editor">
+      <div class="form-group editor">        
         <span class="item-name"><h4>Description</h4>          
-        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        {{editor data.description target="system.description" button=true owner=owner editable=true}}
       </div>
 
       {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}

templates/actor-entite-sheet.html

@@ -28,19 +28,19 @@
 
     {{!-- Carac Tab --}}
     <div class="tab items" data-group="primary" data-tab="carac">
-      
+
       <div class="grid grid-2col">
         <div class="flex-group-left flexcol">
           <ol class="carac-list alterne-list">
             {{#each data.carac as |carac key|}}
-            <li class="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
               {{#if (eq key 'taille')}}
-              <span class="carac-label flexrow" name="data.carac.{{key}}.label">{{carac.label}}</span>
+              <span class="carac-label flexrow" name="system.carac.{{key}}.label">{{carac.label}}</span>
               {{else}}
-              <span class="carac-label flexrow" name="data.carac.{{key}}.label"><a
+              <span class="carac-label flexrow" name="system.carac.{{key}}.label"><a
                   name={{key}}>{{carac.label}}</a></span>
               {{/if}}
-              <input class="competence-value flexrow" type="text" name="data.carac.{{key}}.value"
+              <input class="competence-value flexrow" type="text" name="system.carac.{{key}}.value"
                 value="{{carac.value}}" data-dtype="{{carac.type}}" />
             </li>
             {{/each}}
@@ -50,36 +50,37 @@
         <div class="flex-group-left flexcol">        
 
           <ol class="carac-list alterne-list">
-            <li class="competence flexrow list-item">
+            <li class="caracteristique flexrow list-item">
               <span class="carac-label flexrow" name="catEntite">Catégorie : </span>
-              <select name="data.definition.categorieentite" value="{{data.definition.categorieentite}}" data-dtype="String">
+              <select name="system.definition.categorieentite" value="{{data.definition.categorieentite}}" data-dtype="String">
                 {{#select data.definition.categorieentite}}
                 <option value="cauchemar">Cauchemar</option>
                 <option value="reve">Rêve</option>
                 {{/select}}
               </select>
             </li>
-            <li class="competence flexrow list-item">
+            <li class="caracteristique flexrow list-item">
               <span class="carac-label flexrow" name="typeEntite">Type d'entité : </span>
-              <select name="data.definition.typeentite" value="{{data.definition.typeentite}}" data-dtype="String">
+              <select name="system.definition.typeentite" value="{{data.definition.typeentite}}" data-dtype="String">
                 {{#select data.definition.typeentite}}
                 <option value="incarne">Incarnée</option>
                 <option value="nonincarne">Non Incarnée</option>
+                <option value="blurette">Blurete</option>
                 {{/select}}
               </select>
             </li>
             {{#each data.attributs as |attr key|}}
-            <li class="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label flexrow" name="data.attributs.{{key}}.label">{{attr.label}} : </span>
+              <span class="carac-label flexrow" name="system.attributs.{{key}}.label">{{attr.label}} : </span>
-              <span><input class="attribut-value flexrow" type="text" name="data.attributs.{{key}}.value"
+              <span><input class="attribut-value flexrow" type="text" name="system.attributs.{{key}}.value"
                   value="{{attr.value}}" data-dtype="{{attr.type}}" /></span>
             </li>
             {{/each}}
-            <li class="competence flexrow list-item" data-attribute="endurance">
+            <li class="caracteristique flexrow list-item" data-attribute="endurance">
-              <span class="competence-label flexrow" name="data.sante.endurance.label">Endurance : </span>
+              <span class="competence-label flexrow" name="system.sante.endurance.label">Endurance : </span>
-              <span><input class="sante-value flexrow" type="text" name="data.sante.endurance.value"
+              <span><input class="sante-value flexrow" type="text" name="system.sante.endurance.value"
                   value="{{data.sante.endurance.value}}" data-dtype="Number" /></span><span>/ </span>
-              <span><input class="sante-value flexrow" type="text" name="data.sante.endurance.max"
+              <span><input class="sante-value flexrow" type="text" name="system.sante.endurance.max"
                   value="{{data.sante.endurance.max}}" data-dtype="Number" /></span>
             </li>
           </ol>
@@ -89,9 +90,7 @@
     
     {{!-- Compétences Tab --}}
     <div class="tab competences" data-group="primary" data-tab="competences">
-
       <div class="flexcol">
-
         <div class="flex-group-left flexcol competence-column">
           <ol class="item-list alterne-list">
             {{#each competences as |comp key|}}
@@ -99,46 +98,43 @@
               <img class="sheet-competence-img" src="{{comp.img}}" />
               <span class="competence-label"><a>{{comp.name}}</a></span>
               <input class="competence-value creature-carac" type="text" compname="{{comp.name}}"
-                value="{{comp.data.carac_value}}" data-dtype="number" />
+                value="{{comp.system.carac_value}}" data-dtype="number" />
               <input class="competence-value creature-niveau" type="text" compname="{{comp.name}}"
-                value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number" />
+                value="{{numberFormat comp.system.niveau decimals=0 sign=true}}" data-dtype="number" />
               <input class="competence-value creature-dommages" type="text" compname="{{comp.name}}"
-                value="{{numberFormat comp.data.dommages decimals=0 sign=true}}" data-dtype="number" />
+                value="{{numberFormat comp.system.dommages decimals=0 sign=true}}" data-dtype="number" />
               <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ol>
+        </div>
+        <div class="flex-group-left flexcol competence-column">
+          <ol class="item-list alterne-list">
+            {{#each possessions as |possession key|}}
+            <li class="item flexrow list-item" data-item-id="{{possession._id}}">
+              <img class="sheet-competence-img" src="{{possession.img}}" />
+              <span class="competence-label">{{possession.name}}</span>
+              <div class="item-controls">
+                <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}}
           </ol>
-
-          <div class="flex-group-left flexcol competence-column">
-            <ol class="item-list alterne-list">
-              {{#each possessions as |possession key|}}
-              <li class="item flexrow list-item" data-item-id="{{possession._id}}">
-                <img class="sheet-competence-img" src="{{possession.img}}" />
-                <span class="competence-label">{{possession.name}}</span>
-                <div class="item-controls">
-                  <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                  <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-              {{/each}}
-            </ol>
-  
         </div>
       </div>
     </div>
-      
+
     {{!-- Biography Tab --}}
     <div class="tab description" data-group="primary" data-tab="description">
       <div class="form-group editor">
-        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        {{editor data.description target="system.description" button=true owner=owner editable=true}}
       </div>
       {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
     </div>
-    
-    </div>
 
   </section>
 </form>

templates/actor-sheet-categorie-competences-partial.html

@@ -1,27 +1,31 @@
-<header class="competence-header flexrow">
+{{#if competences}}
-  <span class="competence-title">{{categorie}}</span>
+<div class="flex-shrink">
-</header>
+  <header class="competence-header flexrow">
-<ul class="item-list alterne-list competence-list">
+    <span class="competence-title">{{categorie}}</span>
-  {{#if @root.options.vueDetaillee}}
+  </header>
-  <li class="item flexrow list-item ">
+  <ul class="item-list alterne-list competence-list">
-    
+    {{#if @root.options.vueDetaillee}}
-    <span class="competence-label"></span>
+    <li class="item flexrow list-item ">
-    <span class="competence-value" >Niv.</span>
+      
-    <span class="competence-xp">xp</span>
+      <span class="competence-label"></span>
-    {{#if (eq categorie 'Draconic')}}
+      <span class="competence-value" >Niv.</span>
-    <span class="competence-xp-sort">sort</span>
+      <span class="competence-xp">xp</span>
-    {{/if}}
+      {{#if (eq categorie 'Draconic')}}
-    <div class="item-controls">
+      <span class="competence-xp-sort">sort</span>
-      <i class="far fa-arrow-alt-circle-up"></i>
-      <span class="competence-archetype">Arch</span>
-      <i class="far fa-edit"></i>
-      {{#if @root.options.isGM}}
-      <i class="far fa-trash"></i>
       {{/if}}
-    </div>
+      <div class="item-controls">
-  </li>
+        <i class="far fa-arrow-alt-circle-up"></i>
-  {{/if}}
+        <span class="competence-archetype">Arch</span>
-  {{#each competences as |comp key|}}
+        <i class="far fa-edit"></i>
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
+        {{#if @root.options.isGM}}
-  {{/each}}
+        <i class="far fa-trash"></i>
-</ul>
+        {{/if}}
+      </div>
+    </li>
+    {{/if}}
+    {{#each competences as |comp key|}}
+    {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
+    {{/each}}
+  </ul>
+</div>
+{{/if}}

templates/actor-sheet-competence-partial.html

@@ -1,49 +1,49 @@
-{{#if visible}}
+{{#if system.isVisible}}
-  <li class="item flexrow list-item {{#if data.isLevelUp}}xp-level-up tooltip{{/if}}" data-item-id="{{_id}}">
+  <li class="item flexrow list-item {{#if system.isLevelUp}}xp-level-up tooltip{{/if}}" data-item-id="{{_id}}">
     <a class="competence-label" name="{{name}}">
       <img class="sheet-competence-img" src="{{img}}"/>
       <span class="competence-label">{{name}}</span>
     </a>
 
-    {{#if data.isLevelUp}}
+    {{#if system.isLevelUp}}
-    <span class="tooltiptext ttt-xp">Vous pouvez dépenser {{data.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}}</span>
+    <span class="tooltiptext ttt-xp">Vous pouvez dépenser {{system.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}}</span>
-    <a class="item-control competence-xp-augmenter" compname="{{name}}" title="Augmenter">
+    <a class="competence-xp-augmenter" compname="{{name}}" title="Augmenter">
       <i class="fas fa-arrow-alt-circle-up"></i>
     </a>
     {{/if}}
 
     <input class="competence-value" type="text" compname="{{name}}" name="comp-value-{{name}}"
-          value="{{numberFormat data.niveau decimals=0 sign=true}}" data-dtype="number"
+          value="{{numberFormat system.niveau decimals=0 sign=true}}" data-dtype="number"
           {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
     
     <span class="competence-xp tooltip">
       <input class="competence-xp " type="text" compname="{{name}}" name="comp-xp-{{name}}"
-          value="{{numberFormat data.xp decimals=0 sign=false}}" data-dtype="number"
+          value="{{numberFormat system.xp decimals=0 sign=false}}" data-dtype="number"
           {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
-      <span class="tooltiptext left-competence ttt-xp">Vous devez acquérir {{data.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}}</span>      
+      <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 (eq data.categorie 'draconic')}}
+    {{#if (eq system.categorie 'draconic')}}
     <input class="competence-xp-sort" type="text" compname="{{name}}" name="comp-xp-sort-{{name}}"
-          value="{{numberFormat data.xp_sort decimals=0 sign=false}}" data-dtype="number"
+          value="{{numberFormat system.xp_sort decimals=0 sign=false}}" data-dtype="number"
           {{#unless @root.options.editCaracComp}}disabled{{/unless}}/>
     {{/if}}
     {{#if @root.options.vueDetaillee}}
     <div class="item-controls">
-      {{#if data.stressXpMax}}
+      {{#if system.stressXpMax}}
-      <a class="item-control competence-stress-augmenter" compname="{{name}}" 
+      <a class="competence-stress-augmenter" compname="{{name}}" 
-            title="Dépenser {{data.stressXpMax}} points de stress {{#if data.isStressLevelUp}} pour augmenter d'un niveau {{/if}}">
+            title="Dépenser {{system.stressXpMax}} points de stress {{#if system.isStressLevelUp}} pour augmenter d'un niveau {{/if}}">
-            <i class="fas fa-arrow-alt-circle-up allouer-stress{{#if data.isStressLevelUp}}-level-up{{/if}}"></i>
+            <i class="fas fa-arrow-alt-circle-up allouer-stress{{#if system.isStressLevelUp}}-level-up{{/if}}"></i>
       </a>
       {{else}}
       <i class="far fa-circle"></i>
       {{/if}}
       <input class="competence-archetype niveau-archetype" type="text" compname="{{name}}" name="comp-archetype-{{name}}"
-            value="{{numberFormat data.niveau_archetype decimals=0 sign=true}}" data-dtype="number"
+            value="{{numberFormat system.niveau_archetype decimals=0 sign=true}}" data-dtype="number"
             {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
-      <a class="item-control item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
+      <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
       {{#if @root.options.isGM}}
-      <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+      <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
       {{/if}}
     </div>
     {{/if}}

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

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

templates/actor-sheet-inventaire-conteneur.html

@@ -1,32 +1,52 @@
 <li class="item flexrow list-item" data-item-id="{{item._id}}" draggable="true">
-  <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
-
   {{#if (eq item.type 'conteneur')}}
-  <span class="item-name conteneur-name flex-grow"><a data-item-id="{{item._id}}">+{{item.name}}</a></span>
+    <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.data.quantite}}
+  <span class="item-quantite">{{item.system.quantite}}
-    {{#if (gt item.data.quantite 1)}}
+    {{#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.data.encTotal decimals=2}}</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.data.equipe}}<i class="fas fa-hand-rock"></i>{{else}}<i class="far fa-hand-paper"></i>{{/if}}</a>
+    <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.data.quantite)}}
+    {{#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.data.actionPrincipale}}
+    {{#if item.system.actionPrincipale}}
-    <a class="item-name item-action">{{item.data.actionPrincipale}}</a>
+    <a class="item-name item-action">{{item.system.actionPrincipale}}</a>
     {{/if}}
   </div>
 </li>
+

templates/actor-sheet-inventaire-item.html

@@ -0,0 +1,48 @@
+<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}}
+    <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
+    <span>{{item.name}}</span>
+    {{/if}}
+  </span>
+  <span class="equipement-detail">{{item.system.quantite}}
+    {{#if (gt item.system.quantite 1)}}
+    <a class="item-split" title="Séparer"><i class="fas fa-unlink"></i></a>
+    {{/if}}
+  </span>
+  <span class="equipement-detail">{{numberFormat item.system.encTotal decimals=2}}</span>
+  <span class="equipement-actions item-controls">
+    {{#unless item.estContenu}}
+    {{#if (ne item.type 'conteneur')}}
+    <a class="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-edit" title="Editer"><i class="fas fa-edit"></i></a>
+    <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+    &nbsp;
+    {{#if (or (eq item.type 'arme') (eq item.type 'conteneur') item.system.quantite)}}
+    <a class="item-vendre" title="Vendre ou donner"><i class="fas fa-comments-dollar"></i></a>
+    {{/if}}
+    <a class="item-montrer" title="Montrer"><i class="fas fa-comment"></i></a>
+    {{#if item.actionPrincipale}}
+    <a class="item-action">{{item.actionPrincipale}}</a>
+    {{/if}}
+  </span>
+</li>
+

templates/actor-sheet-inventaire-monnaie.html

@@ -3,16 +3,26 @@
   {{#each monnaie as |piece id|}}
   <li class="item flexrow list-item" data-item-id="{{piece._id}}">
     <img class="sheet-competence-img" src="{{piece.img}}" title="{{piece.name}}"/>
-    <span class="competence-title competence-label">{{piece.name}}</span>
+    <span class="equipement-nom">{{piece.name}}</span>
-    <span class="competence-title competence-label">{{piece.data.quantite}}</span>
+    <span class="equipement-detail item-controls">
-    <span class="competence-title">
+      <a class="monnaie-moins"><i class="fas fa-minus-square"></i></a>
-      <a class="monnaie-plus plus-moins">+</a>
+    </span>
-      <a class="monnaie-moins plus-moins">-</a>
+    <span class="equipement-detail">
+      <span>{{piece.system.quantite}}</span>
+    </span>
+    <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>
     </span>
-    <div class="item-controls flex-shrink">
-      <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>
-  </div>
   </li>
   {{/each}}
 </ul>

templates/actor-sheet-inventaire.html

@@ -0,0 +1,26 @@
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-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}} / {{data.attributs.encombrement.value}} <b>{{calc.surEncombrementMessage}}</b></span> - 
+<span class="item-name"><a class="creer-un-objet">Créer un objet</a></span>
+{{#if options.isGM}}
+<span class="item-name"> - <a id="nettoyer-conteneurs">Vider tout les conteneurs</a></span>
+{{/if}}
+<ul class="item-list alterne-list">
+  <li class="competence-header flexrow">
+    <span class="equipement-nom">Nom</span>
+    <span class="equipement-detail">Q.</span>
+    <span class="equipement-detail">Enc.</span>
+    <span class="equipement-actions">Actions</span>
+  </li>
+  {{#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 }}
+    {{/if}}
+    {{/unless}}
+  {{/each}}
+  {{#each conteneurs as |conteneur id|}}
+    {{buildConteneur this}}
+  {{/each}}
+</ul>

templates/actor-sheet-liens-animaux.html

@@ -0,0 +1,12 @@
+<span class="item-name"><h4>Compagnons animaux</h4></span>
+<ul class="item-list alterne-list">
+  {{#each subacteurs.montures as |monture id|}}
+  <li class="item flexrow list-item" data-actor-id="{{monture.id}}">
+    <img class="sheet-competence-img" src="{{monture.img}}" title="{{monture.name}}"/>
+    <span class="subacteur-label"><a>{{monture.name}}</a></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-liens-suivants.html

@@ -0,0 +1,12 @@
+<span class="item-name"><h4>Suivants</h4></span>
+<ul class="item-list alterne-list">
+  {{#each subacteurs.suivants as |suivant id|}}
+  <li class="item flexrow list-item" data-actor-id="{{suivant.id}}">
+    <img class="sheet-competence-img" src="{{suivant.img}}" title="{{suivant.name}}"/>
+    <span class="competence-title subacteur-label"><a>{{suivant.name}}</a></span>
+    <div class="item-controls flex-shrink">
+      <a class="subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+  </div>
+  </li>
+  {{/each}}
+</ul>

templates/actor-sheet-liens-vehicules.html

@@ -0,0 +1,15 @@
+<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-oeuvre-partial.html

@@ -1,11 +1,11 @@
 <li class="item flexrow list-item" data-item-id="{{oeuvre._id}}">
   <span>{{upperFirst typeOeuvre}}</span>
   <span class="competence-title {{classOeuvre}}">
-    <a>{{oeuvre.name}} (niveau {{oeuvre.data.niveau}})</a>
+    <a>{{oeuvre.name}} (niveau {{oeuvre.system.niveau}})</a>
   </span>
   <div class="item-controls">
-    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+    <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
   </div>
 </li>
 

templates/actor-sheet.html

@@ -10,40 +10,40 @@
         <div class="flexrow">
           <ul class="flex-group-center flex-compteurs">
             <li>
-              <label class="ctn-vie">
+              <label class="compteur">
                 <a class="jet-vie">Vie</a>
-                <a class="vie-moins plus-moins">-</a>
+                <a class="vie-moins"><i class="fas fa-minus-square"></i></a>
-                <input class="resource-content" type="text" name="data.sante.vie.value" value="{{data.sante.vie.value}}" data-dtype="Number"/>
+                <input class="resource-content" type="text" name="system.sante.vie.value" value="{{data.sante.vie.value}}" data-dtype="Number"/>
                 <span>/ {{data.sante.vie.max}}</span>
-                <a class="vie-plus plus-moins">+</a>
+                <a class="vie-plus"><i class="fas fa-plus-square"></i></a>
               </label>
             </li>
             <li>
-              <label class="ctn-endu">
+              <label class="compteur">
-                <a class="jet-endurance">Endurance</a>                
+                <a class="jet-endurance">Endurance</a>
-                <a class="endurance-moins plus-moins">-</a>
+                <a class="endurance-moins"><i class="fas fa-minus-square"></i></a>
-                <input class="resource-content" type="text" name="data.sante.endurance.value" value="{{data.sante.endurance.value}}" data-dtype="Number"/>
+                <input class="resource-content" type="text" name="system.sante.endurance.value" value="{{data.sante.endurance.value}}" data-dtype="Number"/>
                 <span>/ {{data.sante.endurance.max}}</span>
-                <a class="endurance-plus plus-moins">+</a>
+                <a class="endurance-plus"><i class="fas fa-plus-square"></i></a>
               </label>
             </li>
             <li>
-              <label class="appliquerFatigue ctn-fatigue tooltip">
+              <label class="appliquerFatigue compteur tooltip">
                 <span class="tooltiptext ttt-fatigue">{{{calc.fatigue.html}}}</span>
                 Fatigue
-                <a class="fatigue-moins plus-moins">-</a>
+                <a class="fatigue-moins"><i class="fas fa-minus-square"></i></a>
-                <input class="resource-content" id="fatigue-value" type="text" name="data.sante.fatigue.value" value="{{data.sante.fatigue.value}}" data-dtype="Number" />
+                <input class="resource-content" id="fatigue-value" type="text" name="system.sante.fatigue.value" value="{{data.sante.fatigue.value}}" data-dtype="Number" />
                 <span>/ {{data.sante.fatigue.max}}</span>
-                <a class="fatigue-plus plus-moins">+</a>
+                <a class="fatigue-plus"><i class="fas fa-plus-square"></i></a>
               </label>
             </li>
             <li>
-              <label class="ctn-reve">
+              <label class="compteur">
                 <span class="ptreve-actuel"><a>Rêve</a></span>
-                <a class="ptreve-actuel-moins plus-moins">-</a>
+                <a class="ptreve-actuel-moins"><i class="fas fa-minus-square"></i></a>
-                <input class="resource-content" id="pointsreve-value" type="text" name="data.reve.reve.value" value="{{data.reve.reve.value}}" data-dtype="Number" />
+                <input class="resource-content" id="pointsreve-value" type="text" name="system.reve.reve.value" value="{{data.reve.reve.value}}" data-dtype="Number" />
                 <span>/ {{data.reve.seuil.value}}</span>
-                <a class="ptreve-actuel-plus plus-moins">+</a>
+                <a class="ptreve-actuel-plus"><i class="fas fa-plus-square"></i></a>
               </label>
             </li>
           </ul>
@@ -102,36 +102,36 @@
               <ul class="carac-list alterne-list">
                 {{#each data.carac as |carac key|}}
                     {{#if carac.isLevelUp}}
-                    <li class="competence flexrow item-list xp-level-up" data-attribute="{{key}}">
+                    <li class="caracteristique flexrow item-list xp-level-up" data-attribute="{{key}}">
                     {{else}}
-                    <li class="competence flexrow list-item" data-attribute="{{key}}">
+                    <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
                     {{/if}}
                     {{#if (eq key 'taille')}}
-                      <span class="carac-label" name="data.carac.{{key}}.label">{{carac.label}}</span>
+                      <span class="carac-label" name="system.carac.{{key}}.label">{{carac.label}}</span>
-                      <input class="carac-value" type="text" name="data.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.editCaracComp}}disabled{{/unless}} />
                       <label class="carac-xp"/>
                     {{else}}
                         {{#if carac.derivee}}
-                        <span class="carac-label" name="data.carac.{{key}}.label"> <a name={{key}}>{{carac.label}}</a></span>
+                        <span class="carac-label" name="system.carac.{{key}}.label"> <a name={{key}}>{{carac.label}}</a></span>
                         <label class="competence-value">{{carac.value}}</label>
                         <label class="carac-xp"/>
                         {{else}}
                           {{#if carac.isLevelUp}}
-                            <span class="carac-label tooltip" name="data.carac.{{key}}.label">
+                            <span class="carac-label tooltip" name="system.carac.{{key}}.label">
                               <span class="tooltiptext ttt-xp">
                               Vous pouvez dépenser {{carac.xpNext}} points d'Experience pour augmenter de 1 votre caractéristique {{carac.label}}
                             </span>
                             <a name={{key}}>{{carac.label}}</a></span>
                           {{else}}
-                            <span class="carac-label tooltip" name="data.carac.{{key}}.label"><a name={{key}}>{{carac.label}}</a></span>
+                            <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="data.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.editCaracComp}}disabled{{/unless}} />
                           <span class="carac-xp tooltip">
-                          <input class="carac-xp" type="text" name="data.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.editCaracComp}}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}}
-                          <a class="item-control carac-xp-augmenter" name="augmenter.{{key}}" title="Augmenter">
+                          <a class="carac-xp-augmenter" name="augmenter.{{key}}" title="Augmenter">
                             <i class="fas fa-arrow-alt-circle-up"></i>
                           </a>
                           {{/if}}
@@ -139,27 +139,27 @@
                     {{/if}}
                     </li>
                 {{/each}}
-                <li class="competence flexrow">
+                <li class="caracteristique flexrow">
                   <span class="carac-label" name="carac-total">Total Caractéristiques </span>
                   <span class="competence-value total" name="carac-total-value">{{calc.caracTotal}} </span>
                 </li>
-              </ul>          
+              </ul>
             </div>
             <div class="flex-group-left flexcol" >
               <ul class="carac-list">
-                <li class="competence flexrow list-item">
+                <li class="caracteristique flexrow list-item">
                   <span class="carac-label" name="beaute">Beauté&nbsp;:</span>
-                  <input class="description-value" type="text" name="data.beaute" value="{{data.beaute}}" data-dtype="String" {{#unless @root.options.editCaracComp}}disabled{{/unless}}/>
+                  <input class="description-value" type="text" name="system.beaute" value="{{data.beaute}}" data-dtype="String" {{#unless @root.options.editCaracComp}}disabled{{/unless}}/>
                   <label class="carac-xp"/>
                 </li>
                 {{#each data.attributs as |attr key|}}
                 {{#unless (eq key 'hautrevant')}}
-                <li class="competence flexrow  list-item" data-attribute="{{key}}">
+                <li class="caracteristique flexrow  list-item" data-attribute="{{key}}">
-                  <span class="carac-label" name="data.attributs.{{key}}.label">{{attr.label}}&nbsp;:</span>
+                  <span class="carac-label" name="system.attributs.{{key}}.label">{{attr.label}}&nbsp;:</span>
                   {{#if (eq key 'protection')}}
                   <input class="description-value" id="attribut-protection-edit" type="text" name="{{key}}" value="{{attr.value}}" data-dtype="number"/>
                   {{else}}
-                  <input class="description-value" type="text" disabled name="data.attributs.{{key}}." value="{{attr.value}}" data-dtype="number"/>
+                  <input class="description-value" type="text" disabled name="system.attributs.{{key}}." value="{{attr.value}}" data-dtype="number"/>
                   {{/if}}
                   <label class="carac-xp"/>
                 </li>
@@ -167,19 +167,19 @@
                 {{/each}}
               </ul>
               <ul class="carac-list alterne-list">
-                <li class="competence flexrow list-item">
+                <li class="caracteristique flexrow list-item">
                   <span class="attribut-label chance-actuelle"><a>Chance actuelle</a></span>
                   <input class="description-value compteur-edit" type="text" name="chance" value="{{data.compteurs.chance.value}}" data-dtype="number"/>
-                  <span class="utiliser-attribut" style="padding-left: 5px"><a class="item-control chance-appel">Utiliser</a></span>
+                  <span class="utiliser-attribut" style="padding-left: 5px"><a class="chance-appel">Utiliser</a></span>
                 </li>
                 {{#each data.compteurs as |compteur key|}}
                   {{#if (eq compteur.label 'Chance')}}
                   {{else if (eq compteur.label 'Experience')}}
                   {{else if compteur.isInput}}
-                    <li class="competence flexrow list-item">
+                    <li class="caracteristique flexrow list-item">
                       <span class="attribut-label">{{compteur.label}}</span>
                       {{#if (eq compteur.label 'Ethylisme')}}
-                      <select class="description-value" name="data.compteurs.ethylisme.value" id="ethylisme" data-dtype="Number">
+                      <select class="description-value" name="system.compteurs.ethylisme.value" id="ethylisme" data-dtype="Number">
                         {{#select compteur.value}}
                         {{>"systems/foundryvtt-reve-de-dragon/templates/niveau-ethylisme.html"}}
                         {{/select}}
@@ -189,9 +189,9 @@
                       {{/if}}
                       <span class="utiliser-attribut" style="padding-left: 5px">
                         {{#if compteur.isStress}}
-                        <a class="item-control stress-test" title="Transformer">Transformer</a>
+                        <a class="stress-test" title="Transformer">Transformer</a>
                         {{else if (eq compteur.label 'Ethylisme')}}
-                        <a class="item-control ethylisme-test" id="ethylisme-test" title="Jet d'Ethylisme">Boire</a>
+                        <a class="ethylisme-test" id="ethylisme-test" title="Jet d'Ethylisme">Boire</a>
                         {{else if (eq compteur.label 'Moral')}}
                         <a class="moral-malheureux" title="Jet de moral situation malheureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-malheureux.svg" alt="Jet de moral situation malheureuse"/></a>
                         <a class="moral-neutre" title="Jet de moral situation neutre"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg" alt="Jet de moral situation neutre"/></a>
@@ -215,11 +215,9 @@
             <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 class="flexrow">
+            <span>
-              <i class="fas fa-search"></i>
+              <input class="recherche flex-grow" type="text" value="{{options.recherche.text}}" name="recherche" 
-              <input class="cherchercompetence" type="text" value="{{options.cherchercompetence}}" name="cherchercompetence" 
+                  size="8" data-dtype="String" placeholder="chercher"/>
-                size="8" data-dtype="String" placeholder="chercher"/>
-              <span></span>
             </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">
@@ -232,18 +230,18 @@
           </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=(sortCompetence competenceByCategory.generale) categorie="Compétences générales"}}
+              {{> "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=(sortCompetence competenceByCategory.particuliere) categorie="Compétences Particulières"}}
+              {{> "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=(sortCompetence competenceByCategory.specialisee) categorie="Compétences Spécialisées"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.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=(sortCompetence competenceByCategory.melee) categorie="Compétences de Mêlée"}}
+              {{> "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=(sortCompetence competenceByCategory.tir) categorie="Compétences de Tir"}}
+              {{> "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=(sortCompetence competenceByCategory.lancer) categorie="Compétences de Lancer"}}
+              {{> "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=(sortCompetence competenceByCategory.connaissance) categorie="Connaissances"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.connaissance) categorie="Connaissances"}}
               {{#if (or data.attributs.hautrevant.value options.vueDetaillee)}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.draconic) categorie="Draconic"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.draconic) categorie="Draconic"}}
               {{/if}}
 
               <div>
@@ -286,7 +284,7 @@
               </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.data.competence}}" >
+                  data-arme-name="{{arme.name}}" data-competence-name="{{arme.system.competence}}" >
                   <span class="arme-label">
                     <a>
                       {{#if arme.img}}
@@ -295,24 +293,23 @@
                       <span>{{arme.name}}</span>
                     </a>
                   </span>
-                  <span class="arme-initiative"><a>{{arme.data.initiative}}</a></span>
+                  <span class="arme-initiative"><a>{{arme.system.initiative}}</a></span>
-                  <span class="competence-label">{{arme.data.competence}}</span>
+                  <span class="competence-label">{{arme.system.competence}}</span>
-                  <span class="competence-value">{{numberFormat arme.data.niveau decimals=0 sign=true}}</span>
+                  <span class="competence-value">{{numberFormat arme.system.niveau decimals=0 sign=true}}</span>
-                  <span class="competence-value">{{numberFormat arme.data.dommagesReels 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">
+              <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>
-                    {{log esq}}
                   </a>
                 </span>
                 <span class="arme-initiative"></span>
                 <span class="competence-label"></span>
-                <span class="competence-value">{{numberFormat esq.data.niveau decimals=0 sign=true}}</span>
+                <span class="competence-value">{{numberFormat esq.system.niveau decimals=0 sign=true}}</span>
                 <span class="competence-value"></span>
               </li>
             {{/each}}
@@ -322,6 +319,7 @@
         {{!-- 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">
@@ -334,7 +332,7 @@
         {{#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.data.identifie)}} 
+                {{#if (or @root.options.isGM maladie.system.identifie)}} 
                   {{maladie.name}}
                 {{else}}
                   Inconnue
@@ -342,41 +340,43 @@
               </span>
               <span class="competence-label">{{maladie.type}}</span>
               <span class="competence-label">
-                {{#if (or @root.options.isGM maladie.data.remedesconnus)}} 
+                {{#if (or @root.options.isGM maladie.system.remedesconnus)}} 
-                  {{maladie.data.remedes}}
+                  {{maladie.system.remedes}}
                 {{else}}
                   Remèdes Inconnus
                 {{/if}}
               </span>
               <div class="item-controls">
-                <a class="item-control item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
+                <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
               </div>          
           </li>
           {{/each}}
           </ul>
+        {{/if}}
 
-          {{!-- Possession --}}
+        {{#if possessions.length}}
-          <h3 class="blessures-title">Possession:</h3>
+        {{!-- Possession --}}
-          <ul class="item-list alterne-list">
+        <h3 class="blessures-title">Possession:</h3>
-            <li class="competence-header flexrow">
+        <ul class="item-list alterne-list">
-              <span class="competence-title flex-grow competence-label">Nom</span>
+          <li class="competence-header flexrow">
-              <span class="competence-title competence-label">Type</span>
+            <span class="competence-title flex-grow competence-label">Nom</span>
-            </li>
+            <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}}">
+          <li class="item flexrow list-item" data-item-id="{{possession._id}}">
-                <span class="competence-label">
+              <span class="competence-label">
-                  <a class="sheet-possession-attack">{{possession.name}} (Conjurer)</a>
+                <a class="sheet-possession-attack">{{possession.name}} (Conjurer)</a>
-                </span>
+              </span>
-                <span class="competence-label">{{possession.data.type}}</span>
+              <span class="competence-label">{{possession.system.type}}</span>
-                <div class="item-controls">
+              <div class="item-controls">
-                  <a class="item-control item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
+                <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
-                  <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-                </div>          
+              </div>          
-            </li>
+          </li>
-            {{/each}}
+          {{/each}}
-            </ul>
+          </ul>
-  
+        {{/if}}
       </div>
 
       {{!-- Connaissances Tab --}}
@@ -385,12 +385,12 @@
         <ul class="item-list alterne-list">
           {{#each taches as |tache id|}}
           <li class="item flexrow list-item" data-item-id="{{tache._id}}"><span class="competence-title tache-label"><a>{{tache.name}}
-            ({{tache.data.points_de_tache_courant}}{{#if
+            ({{tache.system.points_de_tache_courant}}{{#if
-               (or @root.options.isGM (not tache.data.cacher_points_de_tache))
+               (or @root.options.isGM (not tache.system.cacher_points_de_tache))
-            }}/{{tache.data.points_de_tache}}{{/if}})</a></span>
+            }}/{{tache.system.points_de_tache}}{{/if}})</a></span>
             <div class="item-controls flex-shrink">
-              <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -408,7 +408,7 @@
           {{> "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.data.competence classOeuvre="oeuvre-label"}}
+          {{> "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"}}
@@ -417,10 +417,10 @@
         <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.data.base}})</a></span>
+          <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-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -430,8 +430,8 @@
           {{#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-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -467,7 +467,7 @@
                 <span>{{caseTmr-label data.reve.tmrpos.coord}}</span>
               </span> 
               <span>
-                <input class="competence-value" type="text" name="data.reve.tmrpos.coord" value="{{data.reve.tmrpos.coord}}" data-dtype="String"/>
+                <input class="competence-value" type="text" name="system.reve.tmrpos.coord" value="{{data.reve.tmrpos.coord}}" data-dtype="String"/>
               </span> 
               
               {{else}}
@@ -490,7 +490,7 @@
               <span class="competence-label">Seuil de Rêve :</span>
               <span>
               {{#if options.isGM}}
-                <input class="seuil-reve-value" type="text" name="data.reve.seuil.value" value="{{data.reve.seuil.value}}" data-dtype="Number"/>
+                <input class="seuil-reve-value" type="text" name="system.reve.seuil.value" value="{{data.reve.seuil.value}}" data-dtype="Number"/>
               {{else}}
                 {{data.reve.seuil.value}}
               {{/if}}
@@ -500,7 +500,7 @@
               <span class="competence-label">Refoulement : </span>
               <span>
               {{#if options.isGM}}
-                <input class="competence-value" type="text" name="data.reve.refoulement.value" value="{{data.reve.refoulement.value}}" data-dtype="Number"/>
+                <input class="competence-value" type="text" name="system.reve.refoulement.value" value="{{data.reve.refoulement.value}}" data-dtype="Number"/>
               {{else}}
                 {{data.reve.refoulement.value}}
               {{/if}}
@@ -509,138 +509,154 @@
           </ul>
         </div>
         <hr>
-        {{#if data.attributs.hautrevant.value}}
-        {{#if options.isGM}}
-        <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}}">
-            <span class="display-label flex-grow"> <a data-item-id="{{signe._id}}">{{signe.name}}</a></span> 
-            <span class="flex-shrink">{{signe.data.difficulte}}</span>
-            <div class="item-controls flex-shrink">
-              <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        {{/if}}
-        <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}}">
-            <span class="display-label flex-grow"> <a data-item-id="{{sort._id}}">{{sort.name}}</a></span> 
-            <span>{{sort.data.draconic}} / {{sort.data.difficulte}}</span>
-            <div class="item-controls flex-shrink">
-              <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        
-        <h3>Sorts en Réserve:</h3>
-        <ul class="item-list alterne-list">
-          {{#each hautreve.sortsReserve as |reserve key|}}
-          <li class="item list-item flexrow" data-item-id="{{reserve._id}}" data-attribute="{{key}}">
-            <img class="sheet-competence-img" src="{{reserve.sort.img}}" />
-            <span class="display-label flex-grow">{{reserve.sort.name}}</span> 
-            <span class="flex-shrink">r{{reserve.sort.data.ptreve_reel}}</span> 
-            <span class="flex-shrink">{{reserve.coord}}</span> 
-            <span>{{caseTmr-label reserve.coord}}</span> 
-            <div class="item-controls flex-shrink">
-              <a class="item-control item-delete flex-shrink" 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}}">
-            <span class="meditation-label flex-grow"><a data-item-id="{{meditation._id}}">{{meditation.name}} - {{meditation.data.competence}}</a></span> 
-            <div class="item-controls flex-shrink">
-              <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>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        <hr>
-        {{/if}}
         {{!-- Queues, Souffles, Tetes, Ombre --}}
+        {{#if queues.length}}
         <h3>Queues:</h3>
         <ul class="flex-group-left">
           {{#each queues as |queue key|}}
           <li class="item flexrow" data-attribute={{key}} data-item-id="{{queue._id}}">
             <span class="display-label flex-grow"><a data-item-id="{{queue._id}}">{{queue.name}}</a></span>
             <div class="item-controls flex-shrink">
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        <h3>Souffles:</h3>
-        <ul class="item-list">
-          {{#each souffles as |souffle key|}}
-          <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}">
-            <span class="display-label flex-grow"><a data-item-id="{{souffle._id}}">{{souffle.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}                 
-        </ul>
-        <h3>Tetes:</h3>
-        <ul class="item-list">
-          {{#each tetes as |tete key|}}
-          <li class="item flexrow" data-attribute={{key}} data-item-id="{{tete._id}}">
-            <span class="display-label flex-grow"><a data-item-id="{{tete._id}}">{{tete.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
         </ul>
+        {{/if}}
+        {{#if ombres.length}}
         <h3>Ombres de Thanatos:</h3>
         <ul class="item-list">
           {{#each ombres as |ombre key|}}
           <li class="item flexrow" data-attribute={{key}} data-item-id="{{ombre._id}}">
             <span class="display-label flex-grow"><a data-item-id="{{ombre._id}}">{{ombre.name}}</a></span>
             <div class="item-controls flex-shrink">
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
         </ul>
+        {{/if}}
+        {{#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}}">
+            <span class="display-label flex-grow"><a data-item-id="{{souffle._id}}">{{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}}">
+            <span class="display-label flex-grow"><a data-item-id="{{tete._id}}">{{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 data.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}}">
+                <span class="display-label flex-grow"> <a data-item-id="{{signe._id}}">{{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 hautreve.sortsReserve.length}}
+            <h3>Sorts en Réserve:</h3>
+            <ul class="item-list alterne-list">
+              {{#each hautreve.sortsReserve as |reserve key|}}
+              <li class="item list-item flexrow" data-item-id="{{reserve._id}}" data-attribute="{{key}}">
+                <img class="sheet-competence-img" src="{{reserve.sort.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="item-delete 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}}">
+              <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}}">
+              <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>
-        <h3>Rencontres présentes:</h3>
+          {{#if hautreve.casesTmr}}
-        <ul class="item-list">
+            <h3>Cases Spéciales:</h3>
-          {{#each hautreve.rencontres as |rencontre key|}}
+            <ul class="item-list">
-          <li class="item flexrow" data-item-id="{{key}}" data-attribute="{{key}}">
+              {{#each hautreve.casesTmr as |casetmr key|}}
-            <span class="display-label"><a data-item-id="{{key}}">{{rencontre.name}} - {{rencontre.coord}}</a></span> 
+              <li class="item flexrow" data-item-id="{{casetmr._id}}" data-attribute="{{key}}">
-            <span class="flex-shrink">{{caseTmr-label rencontre.coord}}</span> 
+                <span class="display-label"><a data-item-id="{{casetmr._id}}">{{casetmr.name}}</a></span>
-            {{#if rencontre.date}}
+                <span>{{casetmr.system.coord}} - {{caseTmr-label casetmr.system.coord}}</span> 
-            <span>Le {{rencontre.date}} à {{rencontre.heure}}</span> 
+                <div class="item-controls flex-shrink">
-            {{/if}}
+                  <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-            <div class="item-controls flex-shrink">
+                </div>
-              <a class="item-control rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+              </li>
-            </div>
+              {{/each}}
-          </li>
+            </ul>
-          {{/each}}
+          {{/if}}
-        </ul>
-        <hr>
-        <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}}">
-            <span class="display-label"><a data-item-id="{{casetmr._id}}">{{casetmr.name}}</a></span> 
-            <div class="item-controls flex-shrink">
-              <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
         <br><br>
         {{/if}}
       </div>
@@ -648,79 +664,10 @@
       {{!-- Equipment Tab --}}
       <div class="tab items" data-group="primary" data-tab="items">
         
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
-
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html"}}
-        <span class="item-name"><h4>Equipement porté</h4></span>
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-suivants.html"}}
-        <div>
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html"}}
-          <span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.attributs.encombrement.value}} <b>{{calc.surEncombrementMessage}}</b></span> - 
-          <span class="item-name">Estimation de l'équipement : {{numberFormat calc.prixTotalEquipement decimals=2}} Sols</span>
-        </div>
-        <div>
-          <span class="item-name"><a class="creer-un-objet">Créer un objet</a></span>
-          {{#if options.isGM}}
-          <span class="item-name"> - <a id="nettoyer-conteneurs">Vider tout les conteneurs</a></span>
-          {{/if}}
-        </div>
-        <ul class="item-list alterne-list">
-          <li class="competence-header flexrow">
-            <img class="sheet-competence-img" src="{{img}}" title="Equipement"/>
-            <span class="competence-title flex-grow">Nom</span>
-            <span class="competence-title">Q.</span>
-            <span class="competence-title">Enc.</span>
-            <span class="competence-title flex-grow">Equiper/Editer/Suppr.</span>
-          </li>
-          {{#each objets as |item id|}}
-            {{#unless item.estContenu}}
-            {{#if (ne item.type 'conteneur')}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html" item=item }}
-            {{/if}}
-            {{/unless}}
-          {{/each}}
-          {{#each conteneurs as |conteneur id|}}
-            {{buildConteneur this}}
-          {{/each}}
-        </ul>
-
-        <span class="item-name"><h4>Compagnons animaux</h4></span>
-        <ul class="item-list alterne-list">
-          {{#each subacteurs.montures as |monture id|}}
-          <li class="item flexrow list-item" data-actor-id="{{monture.id}}">
-            <img class="sheet-competence-img" src="{{monture.img}}" title="{{monture.name}}"/>
-            <span class="competence-title subacteur-label"><a>{{monture.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-control subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-          </div>
-          </li>
-          {{/each}}
-        </ul>
-        
-        <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="competence-title subacteur-label"><a>{{vehicule.name}}</a></span>
-            <span class="competence-title">{{vehicule.categorie}}</span>
-            <span class="competence-title">{{vehicule.structure}}</span>
-            <div class="item-controls flex-shrink">
-              <a class="item-control subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-          </div>
-          </li>
-          {{/each}}
-        </ul>
-
-        <span class="item-name"><h4>Suivants</h4></span>
-        <ul class="item-list alterne-list">
-          {{#each subacteurs.suivants as |suivant id|}}
-          <li class="item flexrow list-item" data-actor-id="{{suivant.id}}">
-            <img class="sheet-competence-img" src="{{suivant.img}}" title="{{suivant.name}}"/>
-            <span class="competence-title subacteur-label"><a>{{suivant.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-control subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-          </div>
-          </li>
-          {{/each}}
-        </ul>
 
       </div>
 
@@ -730,33 +677,33 @@
           <ul class="item-list alterne-list">
             <li class="item flexrow list-item">
               <label for="data.race">Race :</label>
-              <input class="flex-grow" type="text" name="data.race" value="{{data.race}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.race" value="{{data.race}}" data-dtype="String"/>
             </li>
             <li class="item flexrow list-item">
               <label for="data.sexe">Sexe :</label>
-              <input class="flex-grow" type="text" name="data.sexe" value="{{data.sexe}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.sexe" value="{{data.sexe}}" data-dtype="String"/>
             </li>
             <li class="item flexrow list-item">
               <label for="data.age">Age :</label>
-              <input class="flex-grow" type="text" name="data.age" value="{{data.age}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.age" value="{{data.age}}" data-dtype="String"/>
             </li>
             <li class="item flexrow list-item">
               <label for="data.poids">Poids :</label>
-              <input class="flex-grow" type="text" name="data.poids" value="{{data.poids}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.poids" value="{{data.poids}}" data-dtype="String"/>
             </li>
             <li class="item flexrow list-item">
               <label for="data.taille">Taille :</label>
-              <input class="flex-grow" type="text" name="data.taille" value="{{data.taille}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.taille" value="{{data.taille}}" data-dtype="String"/>
             </li>
           </ul>
           <ul class="item-list alterne-list">
             <li class="item flexrow list-item">
               <label for="data.main">Main directrice :</label>
-              <input type="text" name="data.main" value="{{data.main}}" data-dtype="String"/>
+              <input type="text" name="system.main" value="{{data.main}}" data-dtype="String"/>
             </li>
             <li class="item flexrow list-item">
               <label for="data.heure">Heure de naissance :</label>
-              <select type="text" name="data.heure" value="{{data.heure}}" data-dtype="String">
+              <select type="text" name="system.heure" value="{{data.heure}}" data-dtype="String">
                 {{#select data.heure}}
                 {{>"systems/foundryvtt-reve-de-dragon/templates/heures-select-option.html"}}
                 {{/select}}
@@ -768,11 +715,11 @@
             </li>
             <li class="item flexrow list-item">
               <label for="data.cheveux">Cheveux :</label>
-              <input class="flex-grow" type="text" name="data.cheveux" value="{{data.cheveux}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.cheveux" value="{{data.cheveux}}" data-dtype="String"/>
             </li>
             <li class="item flexrow list-item">
               <label for="data.yeux">Yeux :</label>
-              <input class="flex-grow" type="text" name="data.yeux" value="{{data.yeux}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.yeux" value="{{data.yeux}}" data-dtype="String"/>
             </li>
           </ul>
         </article>
@@ -780,11 +727,11 @@
         <article class="flexcol">
           <h3>Biographie : </h3>
           <div class="form-group editor">
-            {{editor content=data.biographie target="data.biographie" button=true owner=owner editable=editable}}
+            {{editor data.biographie target="system.biographie" button=true owner=owner editable=editable}}
           </div>
           <h3>Notes : </h3>
           <div class="form-group editor">
-            {{editor content=data.notes target="data.notes" button=true owner=owner editable=editable}}
+            {{editor data.notes target="system.notes" button=true owner=owner editable=editable}}
           </div>
           <h3>Journal d'Experience</h3>
           <div class="form-group editor">

templates/actor-vehicule-sheet.html

@@ -25,41 +25,41 @@
       <div class="grid grid-2col">
         <div class="flex-group-left flexcol">
           <ol class="carac-list alterne-list">
-            <li class="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Catégorie</span>
-              <select name="data.categorie" class="categorie" data-dtype="String">
+              <select name="system.categorie" class="categorie" data-dtype="String">
                 {{#select data.categorie}}
                 {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-vehicule.html"}}
                 {{/select}}
               </select>
             </li>
-            <li class="competence flexrow list-item" data-attribute="{{key}}">
+            <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="data.resistance" value="{{data.resistance}}" data-dtype="Number" />
+              <input class="competence-value flexrow" type="text" name="system.resistance" value="{{data.resistance}}" data-dtype="Number" />
             </li>
-            <li class="competence flexrow list-item" data-attribute="{{key}}">
+            <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="data.structure" value="{{data.structure}}" data-dtype="Number" />
+              <input class="competence-value flexrow" type="text" name="system.structure" value="{{data.structure}}" data-dtype="Number" />
             </li>
-            <li class="competence flexrow list-item" data-attribute="{{key}}">
+            <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="data.vitesse" value="{{data.vitesse}}" data-dtype="String" />
+              <input class="competence-value flexrow" type="text" name="system.vitesse" value="{{data.vitesse}}" data-dtype="String" />
             </li>
-            <li class="competence flexrow list-item" data-attribute="{{key}}">
+            <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="data.bonus" value="{{data.bonus}}" data-dtype="String" />
+              <input class="competence-value flexrow" type="text" name="system.bonus" value="{{data.bonus}}" data-dtype="String" />
             </li>
-            <li class="competence flexrow list-item" data-attribute="{{key}}">
+            <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="data.manoeuvrabilite" value="{{data.manoeuvrabilite}}" data-dtype="String" />
+              <input class="competence-value flexrow" type="text" name="system.manoeuvrabilite" value="{{data.manoeuvrabilite}}" data-dtype="String" />
             </li>
-            <li class="competence flexrow list-item" data-attribute="{{key}}">
+            <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="data.equipage" value="{{data.equipage}}" data-dtype="Number" />
+              <input class="competence-value flexrow" type="text" name="system.equipage" value="{{data.equipage}}" data-dtype="Number" />
             </li>
-            <li class="competence flexrow list-item" data-attribute="{{key}}">
+            <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="data.capacite_encombrement" value="{{data.capacite_encombrement}}" data-dtype="Number" />
+              <input class="competence-value flexrow" type="text" name="system.capacite_encombrement" value="{{data.capacite_encombrement}}" data-dtype="Number" />
             </li>
           </ol>
         </div>
@@ -69,47 +69,9 @@
     {{!-- Equipment Tab --}}
     <div class="tab items" data-group="primary" data-tab="items">
 
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
-
-      <span class="item-name"><h4>Equipement chargé</h4></span>
-
-      <span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.capacite_encombrement}} <b>{{calc.surEncombrementMessage}}</b></span> - 
-      <span class="item-name"><a class="creer-un-objet">Créer un objet</a></span>
-      {{#if options.isGM}}
-      <span class="item-name"> - <a id="nettoyer-conteneurs">Vider tout les conteneurs</a></span>
-      {{/if}}
-      <ul class="item-list alterne-list">
-        <li class="competence-header flexrow">
-          <img class="sheet-competence-img" src="{{img}}" title="Equipement"/>
-          <span class="competence-title competence-label flex-grow">Nom</span>
-          <span class="competence-title competence-label">Q.</span>
-          <span class="competence-title competence-value">Enc.</span>
-          <span class="competence-title competence-value">Equiper/Editer/Suppr.</span>
-        </li>
-        {{#each objets as |item id|}}
-          {{#unless item.estContenu}}
-          {{#if (ne item.type 'conteneur')}}
-          <li class="item flexrow list-item" data-item-id="{{item._id}}">
-              <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
-              <span class="item-name flex-grow">{{item.name}}</span>
-              <span class="item-quantite">{{item.data.quantite}}</span>
-              <span class="item-quantite">{{numberFormat item.data.encTotal decimals=2}}</span>
-              <div class="item-controls">
-                  <a class="item-control item-equip" title="Equiper">{{#if item.data.equipe}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-                  <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>
-              </div>
-          </li>
-          {{/if}}
-          {{/unless}}
-          {{/each}}
-          {{#each conteneurs as |conteneur id|}}
-          {{buildConteneur this}}
-          {{/each}}
-        </ul>
-      </div>
-
       
+
     {{!-- Biography Tab --}}
     <div class="tab description" data-group="primary" data-tab="description">
       <div class="form-group editor">

templates/chat-command-nom.html

@@ -0,0 +1,16 @@
+
+<h4>Proposition de nom: {{nom}}</h4>
+<span class="chat-card-button-area">
+  <a class="button-creer-acteur chat-card-button"
+    data-nom='{{nom}}'
+    data-type='personnage'
+    >
+  Créer un Personnage</a>
+</span>
+<span class="chat-card-button-area">
+  <a class="button-creer-acteur chat-card-button"
+    data-nom='{{nom}}'
+    data-type='creature'>
+  Créer une créature</a>
+</span>
+

templates/chat-demande-defense.html

@@ -26,7 +26,7 @@
             <br>
             {{/if}}
             {{#if (eq defender.type 'personnage')}}
-            {{#if (gt defender.data.compteurs.destinee.value 0)}}
+            {{#if (gt defender.system.compteurs.destinee.value 0)}}
               <a class='chat-card-button' id='appel-destinee-defense' data-attackerId='{{attackerId}}'
                 data-defenderTokenId='{{defenderTokenId}}'>Utiliser la destinée</a>
               </a>
@@ -38,14 +38,14 @@
           {{#each armes as |arme key|}}
             <a class='chat-card-button' id='parer-button' data-attackerId='{{../attackerId}}' data-defenderTokenId='{{../defenderTokenId}}'
                 data-armeid='{{arme._id}}'>
-              Parer avec {{arme.name}} à {{../diffLibre }}{{#if arme.data.nbUsage}} (Utilisations : {{arme.data.nbUsage}}){{/if}}
+              Parer avec {{arme.name}} à {{../diffLibre }}{{#if arme.system.nbUsage}} (Utilisations : {{arme.system.nbUsage}}){{/if}}
             </a>
             <br>
           {{/each}}
           {{#if mainsNues}}
             <a class='chat-card-button' id='parer-button' data-attackerId='{{attackerId}}' data-defenderTokenId='{{defenderTokenId}}'
-                data-armeid='{{arme._id}}' data-competence='{{arme.data.competence}}'>
+                data-armeid='{{arme._id}}' data-competence='{{arme.system.competence}}'>
-              Parer à mains nues à {{diffLibre}}{{#if arme.data.nbUsage}} (Utilisations : {{arme.data.nbUsage}}){{/if}}
+              Parer à mains nues à {{diffLibre}}{{#if arme.system.nbUsage}} (Utilisations : {{arme.system.nbUsage}}){{/if}}
             </a>
             <br>
           {{/if}}

templates/chat-fabriquer-potion-base.html

@@ -1,6 +1,6 @@
 <img class="chat-icon" src="{{herbe.img}}" alt="fabrication" />
 <h4>
-  {{alias}} a fabriqué une potion de {{herbe.data.categorie}} de {{herbe.name}}, avec {{herbe.nbBrins}} brins.
+  {{alias}} a fabriqué une potion de {{herbe.system.categorie}} de {{herbe.name}}, avec {{herbe.nbBrins}} brins.
 </h4>
 <hr>
 <div>

templates/chat-resultat-chant.html

@@ -1,6 +1,6 @@
-<img class="chat-icon" src="{{competence.img}}" alt="{{oeuvre.data.competence}}" />
+<img class="chat-icon" src="{{competence.img}}" alt="{{oeuvre.system.competence}}" />
 <h4>
-  {{alias}} tente de chanter : {{oeuvre.name}} (niveau {{oeuvre.data.niveau}})
+  {{alias}} tente de chanter : {{oeuvre.name}} (niveau {{oeuvre.system.niveau}})
 </h4>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 <hr>
@@ -12,4 +12,4 @@
   {{/if}}
   {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html"}}
 </div>
-{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" oeuvre.data}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" oeuvre.system}}

templates/chat-resultat-danse.html

@@ -1,6 +1,6 @@
-<img class="chat-icon" src="{{competence.img}}" alt="{{oeuvre.data.competence}}" />
+<img class="chat-icon" src="{{competence.img}}" alt="{{oeuvre.system.competence}}" />
 <h4>
-  {{alias}} tente de danser : {{oeuvre.name}} (niveau {{oeuvre.data.niveau}})
+  {{alias}} tente de danser : {{oeuvre.name}} (niveau {{oeuvre.system.niveau}})
 </h4>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 <hr>
@@ -12,4 +12,4 @@
   {{/if}}
   {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html"}}
 </div>
-{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" oeuvre.data}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" oeuvre.system}}

templates/chat-resultat-jeu.html

@@ -1,4 +1,4 @@
-<img class="chat-icon" src="{{competence.img}}" alt="{{oeuvre.data.competence}}" />
+<img class="chat-icon" src="{{competence.img}}" alt="{{oeuvre.system.competence}}" />
 <h4>
   {{alias}} joue à : {{oeuvre.name}}
 </h4>
@@ -12,4 +12,4 @@
   {{/if}}
   {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html"}}
 </div>
-{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" oeuvre.data}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" oeuvre.system}}

templates/chat-resultat-maitrise-tmr.html

@@ -1,6 +1,11 @@
 <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
 <h4 data-categorie="tmr" data-actor-id="{{actor._id}}">
-  {{alias}} tente de {{maitrise.verbe}} {{le tmr.genre}} {{tmr.label}} ({{tmr.coord}})
+  {{alias}} tente de {{maitrise.verbe}} {{le tmr.genre}}
+  {{#if isTMRCache}}
+    {{caseTmr-type tmr.coord}}
+  {{else}}
+    {{tmr.label}} ({{tmr.coord}})
+  {{/if}}
 </h4>
 {{#if previous}}
   {{#with previous}}
@@ -11,15 +16,20 @@
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 <hr>
 <span>
-{{#if rolled.isSuccess}}
+  {{alias}}
-  {{alias}} parvient à {{maitrise.verbe}} {{le tmr.genre}} {{tmr.label}} !
+  {{#if rolled.isSuccess}}parvient à{{else}}échoue à{{/if}}
+  {{maitrise.verbe}} {{le tmr.genre}}
+  {{#if isTMRCache}}
+    {{caseTmr-type tmr.coord}}
   {{else}}
-  {{alias}} échoue à {{maitrise.verbe}} {{le tmr.genre}} {{tmr.label}}.
+    {{tmr.label}} ({{tmr.coord}})
-  {{alias}} <strong>quitte les Terres Médianes</strong> !
+  {{/if}}!
-  {{#if souffle}}
+  {{#if rolled.isEchec}}
-    <br>De plus, son échec total lui fait subir un Souffle de Dragon : {{souffle.name}}
+    {{alias}} <strong>quitte les Terres Médianes</strong> !
+    {{#if souffle}}
+      <br>De plus, son échec total lui fait subir un Souffle de Dragon : {{souffle.name}}
+    {{/if}}
   {{/if}}
-{{/if}}
 </span>
 {{#if poesie}}
 <hr>

templates/chat-resultat-meditation.html

@@ -6,7 +6,7 @@
 <hr>
 <div>
   {{#if rolled.isSuccess}}
-  {{alias}} aperçoit un signe draconique éphémère, qu'il faut aller lire en <strong>{{typeTmr-name meditation.data.tmr}}</strong>.
+  {{alias}} aperçoit un signe draconique éphémère, qu'il faut aller lire en <strong>{{typeTmr-name meditation.system.tmr}}</strong>.
   {{else}}
   La méditation de {{alias}} ne porte pas ses fruits, il ne distingue aucun signe Draconique.
   {{/if}}

templates/chat-resultat-meteo.html

@@ -0,0 +1,9 @@
+<img class="chat-icon" src="icons/svg/lightning.svg" alt="Météo" />
+<h4>Météo aléatoire</h4>
+<ul>
+  <li>Vent: {{lowerFirst vent.description}} {{apostrophe 'de' vent.direction}}, force {{vent.force}}</li>
+  <li>Mer {{lowerFirst mer.description}}, {{apostrophe 'de' mer.direction}}, force {{mer.force}}</li>
+  <li>Température {{lowerFirst temperature.description}} ({{numberFormat temperature.force decimals=0 sign=true}})</li>
+  <li>Couverture nuageuse: {{lowerFirst nuage.description}}</li>
+  <li>Pluie: {{lowerFirst pluie.description}}</li>
+</div>

templates/chat-resultat-musique.html

@@ -1,6 +1,6 @@
-<img class="chat-icon" src="{{competence.img}}" alt="{{oeuvre.data.competence}}" />
+<img class="chat-icon" src="{{competence.img}}" alt="{{oeuvre.system.competence}}" />
 <h4>
-  {{alias}} tente de jouer le morceau : {{oeuvre.name}} (niveau {{oeuvre.data.niveau}})
+  {{alias}} tente de jouer le morceau : {{oeuvre.name}} (niveau {{oeuvre.system.niveau}})
 </h4>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 <hr>
@@ -12,4 +12,4 @@
   {{/if}}
   {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html"}}
 </div>
-{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" oeuvre.data}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" oeuvre.system}}

templates/chat-resultat-oeuvre.html

@@ -1,8 +1,8 @@
-<h4><img class="chat-icon" src="{{competence.img}}" alt="{{oeuvre.data.competence}}" />
+<h4><img class="chat-icon" src="{{competence.img}}" alt="{{oeuvre.system.competence}}" />
 
-  {{alias}} tente d'interpréter {{oeuvre.name}} (niveau {{oeuvre.data.niveau}})
+  {{alias}} tente d'interpréter {{oeuvre.name}} (niveau {{oeuvre.system.niveau}})
 </h4>
-<br>{{upperFirst oeuvre.data.default_carac}} / {{oeuvre.data.competence}}
+<br>{{upperFirst oeuvre.system.default_carac}} / {{oeuvre.system.competence}}
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 <hr>
 <div>
@@ -13,4 +13,4 @@
   {{/if}}
   {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html"}}
 </div>
-{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" oeuvre.data}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" oeuvre.system}}

templates/chat-resultat-possession.html

@@ -1,40 +1,47 @@
 <img class="chat-icon" src="{{competence.img}}" />
 <h4>
   {{#if (eq mode "possession")}}
-    {{alias}} tente de posséder {{possede}}
+    {{attacker.name}} tente de {{#if isECNIDefender}}conjurer la possession de{{else}}posséder{{/if}} {{defender.name}}
   {{else}}
-    {{alias}} tente de conjurer la possession de {{possesseur}}
+    {{defender.name}} tente de {{#if isECNIDefender}}résister à{{else}}conjurer la possession de{{/if}} {{attacker.name}}
   {{/if}}
 </h4>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 
 <hr>
-
 <div>
   <span class='chat-card-button-area'>
     <br>
     {{#if (eq mode "possession")}}
       {{#if possession.isSuccess}}
-        <a class='defense-possession chat-card-button' data-attackerId='{{attackerId}}'
+        <a class='defense-possession chat-card-button'
-                data-defenderId='{{defenderId}}' data-possessionId='{{possession.data.possessionid}}'>Résister à la possession</a>
+            data-attackerId='{{attacker.id}}'
-              </a>
+            data-defenderId='{{defender.id}}'
+            data-possessionId='{{possession.system.possessionid}}'>
+            {{#if isECNIDefender}}
+            Résister à la conjuration
+            {{else}}
+            Résister à la possession
+            {{/if}}
+        </a>
       {{else}}
-        La Tentative de Possession a échouée !
+        La Tentative de {{#if isECNIDefender}}conjuration{{else}}possession{{/if}} a échoué !
       {{/if}}
     {{else}}
       {{#if rolled.isSuccess}}
-        La Tentative de Possession a été conjurée ! {{alias}} résiste à la tentative de possession.
+        La tentative de {{#if isECNIDefender}}conjuration a été repoussée{{else}}possession a été conjurée{{/if}}!
-      {{else}}
+        {{defender.name}} a résisté.
-        La Tentative de Possession n'a pas pu être conjurée !
+        {{else}}
+        La tentative de {{#if isECNIDefender}}conjuration a réussi{{else}}possession n'a pas pu être conjurée{{/if}}!
       {{/if}}
     {{/if}}
     <br>Points de Possession: {{possession.ptsPossession}}
     <br>Points de Conjuration: {{possession.ptsConjuration}}
 
     {{#if possession.isPosseder}}
-    <br><strong>Vous êtes été possédé par {{possession.data.typepossession}} ! La possession en cours a été supprimée.</strong>
+    <br><strong>Vous êtes été possédé par {{possession.system.typepossession}} ! La possession en cours a été supprimée.</strong>
     {{/if}}
     {{#if possession.isConjurer}}
-    <br><strong>Vous avez conjuré {{possession.data.typepossession}} ! La possession en cours a été supprimée.</strong>
+    <br><strong>Vous avez conjuré {{possession.system.typepossession}} ! La possession en cours a été supprimée.</strong>
     {{/if}}
 </div>

templates/chat-resultat-recettecuisine.html

@@ -1,12 +1,12 @@
-<img class="chat-icon" src="{{competence.img}}" alt="{{oeuvre.data.competence}}" />
+<img class="chat-icon" src="{{competence.img}}" alt="{{oeuvre.system.competence}}" />
 <h4>
-  {{alias}} tente de cuisiner la recette : {{oeuvre.name}} (niveau {{oeuvre.data.niveau}})
+  {{alias}} tente de cuisiner la recette : {{oeuvre.name}} (niveau {{oeuvre.system.niveau}})
 </h4>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 <hr>
 <span>
   <img class="chat-icon" src="{{platCuisine.img}}" alt="{{platCuisine.name}}" />
-  <br>{{alias}} a préparé {{platCuisine.data.quantite}} portions de {{platCuisine.name}}
+  <br>{{alias}} a préparé {{platCuisine.system.quantite}} portions de {{platCuisine.name}}
   {{~#if ajouterEquipement}}, qui ont été ajoutées à son équipement{{/if}}.
   {{#if rolled.isSuccess}}
   Il a réussi la recette, pour un plat de qualité {{qualiteFinale}}
@@ -21,4 +21,4 @@
   {{/if}}
 </span>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html"}}
-{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" oeuvre.data}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" oeuvre.system}}

templates/chat-resultat-reve-de-dragon.html

@@ -15,7 +15,7 @@
   {{alias}} ne parvient pas à vaincre le Rêve de Dragon, et prend un violent coup de queue.
   Il subit {{#if rolled.isETotal}}deux queues{{else}}une queue{{/if}} de dragon!
   {{#each queues as | queue key|}}
-  <br>{{queue.name}}: {{{queue.data.description}}}
+  <br>{{queue.name}}: {{{queue.system.description}}}
   {{/each}}
 {{/if}}
 </span>

templates/chat-resultat-sort.html

@@ -1,10 +1,10 @@
 <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
 <h4>
   {{alias}} {{#if isSortReserve}}met en réserve{{else}}lance{{/if}}
-  le {{#if selectedSort.data.isrituel}}rituel{{else}}sort{{/if}}
+  le {{#if selectedSort.system.isrituel}}rituel{{else}}sort{{/if}}
   {{selectedSort.name}}
 </h4>
-<div>Pour {{selectedSort.data.ptreve_reel}} point{{~#if (gt selectedSort.data.ptreve_reel 1)}}s{{/if}} de rêve en {{tmr.label}} ({{tmr.coord}}).
+<div>Pour {{selectedSort.system.ptreve_reel}} point{{~#if (gt selectedSort.system.ptreve_reel 1)}}s{{/if}} de rêve en {{tmr.label}} ({{tmr.coord}}).
 {{#if show.reveInsuffisant}}
 <span>Pas assez de rêve!</span>
 {{/if}}
@@ -16,7 +16,7 @@
     {{#if rolled.isETotal}}Echec TOTAL
     {{else if rolled.isEchec}}Echec
     {{else}}Réussite{{/if}}
-    du {{#if selectedSort.data.isrituel}}rituel{{else}}sort{{/if}},
+    du {{#if selectedSort.system.isrituel}}rituel{{else}}sort{{/if}},
     {{#if (eq depenseReve 0)}}pas de dépense de rêve
     {{else if (eq depenseReve 1)}}1 point de rêve a été dépensé
     {{else}}{{depenseReve}} points de rêve ont été dépensés
@@ -25,5 +25,5 @@
 </div>
 <hr>
 <div class="poesie-extrait poesie-overflow">
-  {{{selectedSort.data.description}}}
+  {{{selectedSort.system.description}}}
 </div>

templates/chat-resultat-tache.html

@@ -8,11 +8,11 @@
 <div>
   {{alias}} a obtenu {{rolled.ptTache}} point{{~#unless (eq rolled.ptTache 1)}}s{{/unless}} de tâche,
    son avancement est de
-   <span class="rdd-roll-{{#if (gt tache.data.points_de_tache_courant 0)}}norm{{else}}etotal{{/if}}">{{tache.data.points_de_tache_courant}}
+   <span class="rdd-roll-{{#if (gt tache.system.points_de_tache_courant 0)}}norm{{else}}etotal{{/if}}">{{tache.system.points_de_tache_courant}}
-     {{#unless tache.data.cacher_points_de_tache}} sur {{tache.data.points_de_tache}}{{/unless}}</span>
+     {{#unless tache.system.cacher_points_de_tache}} sur {{tache.system.points_de_tache}}{{/unless}}</span>
-   point{{~#unless (eq tache.data.points_de_tache_courant 1)}}s{{/unless}} de tâche
+   point{{~#unless (eq tache.system.points_de_tache_courant 1)}}s{{/unless}} de tâche
-   ({{~#unless (eq tache.data.tentatives 1)}}{{tache.data.tentatives}} tentatives{{else}}première tentative{{/unless~}}).
+   ({{~#unless (eq tache.system.tentatives 1)}}{{tache.system.tentatives}} tentatives{{else}}première tentative{{/unless~}}).
-  {{#if (and tache.data.fatigue appliquerFatigue)}}<br><span>Il s'est fatigué de {{tache.data.fatigue}} case{{~#if (gt tache.data.fatigue 1)}}s{{/if}}.</span>{{/if}}
+  {{#if (and tache.system.fatigue appliquerFatigue)}}<br><span>Il s'est fatigué de {{tache.system.fatigue}} case{{~#if (gt tache.system.fatigue 1)}}s{{/if}}.</span>{{/if}}
   {{#if rolled.isETotal}}<br><span>Son échec total augmente de 1 la difficulté de la tâche!</span>{{/if~}}
   {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html"}}
 </div>

templates/chat-signe-draconique-actor.html

@@ -3,5 +3,5 @@
 </h4>
 <p>Pour le lire ce signe draconique, {{alias}} doit se rendre dans les
   Terres Médianes du Rêve et trouvez une case de résonnance.
-  {{#if signe.data.ephemere}}C'est un signe éphémère, qui ne restera présent que pour {{signe.data.duree}}{{/if}}
+  {{#if signe.system.ephemere}}C'est un signe éphémère, qui ne restera présent que pour {{signe.system.duree}}{{/if}}
 </p>

templates/chat-vente-item.html

@@ -3,7 +3,7 @@
   {{#if item.img}}
   <img class="chat-icon" src="{{item.img}}" title="{{item.name}}" alt="{{item.name}}" />
   {{/if}}
-  <div class="poesie-extrait poesie-overflow card-content">{{{item.data.description}}}</div>
+  <div class="poesie-extrait poesie-overflow card-content">{{{item.system.description}}}</div>
   <p>
     {{#each properties as |property p|}}
     <span>{{{property}}}</span><br>

templates/dialog-create-signedraconique.html

@@ -8,27 +8,27 @@
     </h4>
   </div>
   <div class="form-group">
-    <label for="signe.data.difficulte">Difficulte</label>
+    <label for="signe.system.difficulte">Difficulte</label>
-    <input type="number" name="signe.data.difficulte" value="{{signe.data.difficulte}}" data-dtype="Number" />
+    <input type="number" name="signe.system.difficulte" value="{{signe.system.difficulte}}" data-dtype="Number" />
   </div>
   <div class="form-group">
-    <label for="signe.data.valeur.norm">Expérience en sorts</label>
+    <label for="signe.system.valeur.norm">Expérience en sorts</label>
     <div class="flexrow">
-      <input class="signe-xp-sort" type="number" name="signe.data.valeur.norm" data-typereussite="norm"
+      <input class="signe-xp-sort" type="number" name="signe.system.valeur.norm" data-typereussite="norm"
-        value="{{signe.data.valeur.norm}}" min="1" max="100" data-dtype="Number" />
+        value="{{signe.system.valeur.norm}}" min="1" max="100" data-dtype="Number" />
       <span>Sign.</span>
-      <input class="signe-xp-sort" type="number" name="signe.data.valeur.sign" data-typereussite="sign"
+      <input class="signe-xp-sort" type="number" name="signe.system.valeur.sign" data-typereussite="sign"
-        value="{{signe.data.valeur.sign}}" min="1" max="100" data-dtype="Number" />
+        value="{{signe.system.valeur.sign}}" min="1" max="100" data-dtype="Number" />
       <span>Part.</span>
-      <input class="signe-xp-sort" type="number" name="signe.data.valeur.part" data-typereussite="part"
+      <input class="signe-xp-sort" type="number" name="signe.system.valeur.part" data-typereussite="part"
-        value="{{signe.data.valeur.part}}" min="1" max="100" data-dtype="Number" />
+        value="{{signe.system.valeur.part}}" min="1" max="100" data-dtype="Number" />
     </div>
   </div>
   <div class="form-group flexrow">
-      <label for="signe.data.ephemere">Ephémère</label>
+      <label for="signe.system.ephemere">Ephémère</label>
-      <input class="flex-shrink" type="checkbox" name="signe.data.ephemere" {{#if signe.data.ephemere}}checked{{/if}} />
+      <input class="flex-shrink" type="checkbox" name="signe.system.ephemere" {{#if signe.system.ephemere}}checked{{/if}} />
       <span>
-        <input type="text" name="signe.data.duree" value="{{signe.data.duree}}" data-dtype="String" />
+        <input type="text" name="signe.system.duree" value="{{signe.system.duree}}" data-dtype="String" />
       </span>
   </div>
   <div class="form-group">

templates/dialog-item-achat.html

@@ -47,30 +47,30 @@
 
   {{#if (eq item.type 'nourritureboisson')}}
   <p>
-    Si vous souhaitez {{#if item.data.boisson}}boire{{else}}manger{{/if}}:
+    Si vous souhaitez {{#if item.system.boisson}}boire{{else}}manger{{/if}}:
   </p>
 
-  {{#if item.data.sust}}
+  {{#if item.system.sust}}
-   <p>Cette {{#if item.data.boisson}}boisson{{else}}nourriture{{/if}} vous apportera <span
+   <p>Cette {{#if item.system.boisson}}boisson{{else}}nourriture{{/if}} vous apportera <span
        class="total-sust">{{totalSust}}</span> de sustantation.</p>
    {{/if}}
-   {{#if item.data.boisson}}
+   {{#if item.system.boisson}}
-   <p>{{#if item.data.alcoolise}}
+   <p>{{#if item.system.alcoolise}}
-     C'est une boisson alcoolisée de force {{item.data.force}}, vous effectuerez un jet d'éthylisme.
+     C'est une boisson alcoolisée de force {{item.system.force}}, vous effectuerez un jet d'éthylisme.
      {{/if}}
      Cette boisson vous apportera <span class="total-desaltere">{{totalDesaltere}}</span> unités d'eau.
    </p>
    {{/if}}
-   {{#if (gt item.data.qualite 0)}}
+   {{#if (gt item.system.qualite 0)}}
-   {{#if (gt item.data.qualite cuisine.data.niveau)}}
+   {{#if (gt item.system.qualite cuisine.system.niveau)}}
-   <p>La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.data.qualite decimals=0 sign=true}}
+   <p>La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.system.qualite decimals=0 sign=true}}
      vous permettra un jet de moral heureux.</p>
    {{/if}}
    {{/if}}
    
-   {{#if (or (lt item.data.qualite 0) (lt item.data.exotisme 0))}}
+   {{#if (or (lt item.system.qualite 0) (lt item.system.exotisme 0))}}
    <p>
-     Pour surmonter {{#if (lt item.data.qualite 0)}}le mauvais goût{{else}}l'exotisme{{/if}}, vous devez effectuer un jet de Volonté/Cuisine à {{numberFormat (min item.data.exotisme item.data.qualite) decimals=0 sign=true}}.
+     Pour surmonter {{#if (lt item.system.qualite 0)}}le mauvais goût{{else}}l'exotisme{{/if}}, vous devez effectuer un jet de Volonté/Cuisine à {{numberFormat (min item.system.exotisme item.system.qualite) decimals=0 sign=true}}.
    <br/>
      <input class="attribute-value se-forcer" type="checkbox" name="se-forcer" {{#if choix.seForcer}}checked{{/if}}>
        <label for="se-forcer">En cas d'échec, voulez-vous vous forcer à manger (et subir un jet de moral en situation malheureuse)?</label>

templates/dialog-item-consommer.html

@@ -2,31 +2,31 @@
   <img class="chat-icon" src="{{item.img}}" title="{{item.name}}" alt="{{item.name}}" />
   <h4>{{item.name}}</h4>
   <div class="flexrow">
-    <label class="flex-grow">Quantité à {{#if item.data.boisson}}boire{{else}}manger{{/if}}</label>
+    <label class="flex-grow">Quantité à {{#if item.system.boisson}}boire{{else}}manger{{/if}}</label>
     <input class="attribute-value consommer-doses flex-shrink" type="number" name="doses" value="{{choix.doses}}"
-      min="0" max="{{item.data.quantite}}" data-dtype="Number" />
+      min="0" max="{{item.system.quantite}}" data-dtype="Number" />
   </div>
-  {{#if item.data.sust}}
+  {{#if item.system.sust}}
-  <p>Cette {{#if item.data.boisson}}boisson{{else}}nourriture{{/if}} vous apportera <span
+  <p>Cette {{#if item.system.boisson}}boisson{{else}}nourriture{{/if}} vous apportera <span
       class="total-sust">{{totalSust}}</span> de sustantation.</p>
   {{/if}}
-  {{#if item.data.boisson}}
+  {{#if item.system.boisson}}
-  <p>{{#if item.data.alcoolise}}
+  <p>{{#if item.system.alcoolise}}
-    C'est une boisson alcoolisée de force {{item.data.force}}, vous effectuerez un jet d'éthylisme.
+    C'est une boisson alcoolisée de force {{item.system.force}}, vous effectuerez un jet d'éthylisme.
     {{/if}}
     Cette boisson vous apportera <span class="total-desaltere">{{totalDesaltere}}</span> unités d'eau.
   </p>
   {{/if}}
-  {{#if (gt item.data.qualite 0)}}
+  {{#if (gt item.system.qualite 0)}}
-  {{#if (gt item.data.qualite cuisine.data.niveau)}}
+  {{#if (gt item.system.qualite cuisine.system.niveau)}}
-  <p>La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.data.qualite decimals=0 sign=true}}
+  <p>La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.system.qualite decimals=0 sign=true}}
     vous permettra un jet de moral heureux.</p>
   {{/if}}
   {{/if}}
 
-  {{#if (or (lt item.data.qualite 0) (lt item.data.exotisme 0))}}
+  {{#if (or (lt item.system.qualite 0) (lt item.system.exotisme 0))}}
   <p>
-    Pour surmonter {{#if (lt item.data.qualite 0)}}le mauvais goût{{else}}l'exotisme{{/if}}, vous devez effectuer un jet de Volonté/Cuisine à {{numberFormat (min item.data.exotisme item.data.qualite) decimals=0 sign=true}}.
+    Pour surmonter {{#if (lt item.system.qualite 0)}}le mauvais goût{{else}}l'exotisme{{/if}}, vous devez effectuer un jet de Volonté/Cuisine à {{numberFormat (min item.system.exotisme item.system.qualite) decimals=0 sign=true}}.
   <br/>
     <input class="attribute-value se-forcer" type="checkbox" name="se-forcer" {{#if choix.seForcer}}checked{{/if}}>
       <label for="se-forcer">En cas d'échec, voulez-vous vous forcer à manger (et subir un jet de moral en situation malheureuse)?</label>

templates/dialog-item-split.html

@@ -1,7 +1,7 @@
 <form class="rdddialog">
   <img class="chat-icon" src="{{item.img}}" title="{{item.name}}" alt="{{item.name}}" />
   <h4>{{item.name}}</h4>
-  <label>Quantité totale : {{item.data.quantite}}</label>
+  <label>Quantité totale : {{item.system.quantite}}</label>
   <div class="flexrow">
     <label class="flex-grow">Quantité à séparer</label>
     <input class="attribute-value choix-quantite flex-shrink" type="number" name="choix.quantite" value="{{choix.quantite}}"