v10 WIP

Merge pull request 'Corrections v10' (#550 ) from VincentVk/foundryvtt-reve-de-dragon:v10 into v10
2022-09-07 09:14:42 +02:00 · 2022-09-07 09:01:23 +02:00 · 2022-09-07 08:17:41 +02:00 · 2022-09-07 00:36:52 +02:00 · 2022-09-06 23:52:21 +02:00 · 2022-08-31 22:31:27 +02:00
74 changed files with 429 additions and 412 deletions
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -39,7 +39,6 @@ export class RdDActorSheet extends ActorSheet {
    const objectData = this.object.system
    this.timerRecherche = undefined;
    
-    console.log("New actor", objectData)
    let formData = {
      title: this.title,
      id: this.object.id,
@@ -77,12 +76,11 @@ export class RdDActorSheet extends ActorSheet {
    };

    formData.competences.forEach(item => {
-      item.visible = this.options.recherche
+      item.system.isVisible = this.options.recherche
        ? 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);
    });
@@ -92,7 +90,7 @@ 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.system));
+    formData.esquives = this.actor.getCompetences("Esquive");
    formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.data.carac);

    this.armesList = formData.combat;
@@ -130,8 +128,8 @@ export class RdDActorSheet extends ActorSheet {

  /* -------------------------------------------- */
  async _onDropActor(event, dragData) {
-    console.log("_onDropActor", this.actor.id, dragData);
-    this.actor.addSubActeur(dragData.id || dragData.data._id);
+    const dropActor = fromUuidSync(dragData.uuid);
+    this.actor.addSubActeur(dropActor);
    super._onDropActor(event, dragData);
  }

@@ -332,7 +330,7 @@ export class RdDActorSheet extends ActorSheet {
    });
    // Initiative pour l'arme
    html.find('.arme-initiative a').click(async event => {
-      let combatant = game.combat.data.combatants.find(c => c.actor.data._id == this.actor.data._id);
+      let combatant = game.combat.combatants.find(c => c.actor._id == this.actor._id);
      if (combatant) {
        let action = this._getEventArmeCombat(event);
        RdDCombatManager.rollInitiativeAction(combatant._id, action);
@@ -384,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("system.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("system.carac.", "");
-        //console.log("Value changed :", event, caracName);
        this.actor.updateCaracXP(caracName, parseInt(event.target.value));
      });
      // On competence change
@@ -399,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));
      });
@@ -581,10 +577,10 @@ 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));
-      itemData.data.quantite = split;
+      const itemData = duplicate(item);
+      itemData.system.quantite = split;
      await this.actor.createEmbeddedDocuments('Item', [itemData])
    }
  }
--- a/module/actor.js
+++ b/module/actor.js
@@ -182,7 +182,7 @@ export class RdDActor extends Actor {
  async cleanupConteneurs() {
    let updates = this.listItemsData('conteneur')
      .filter(c => c.system.contenu.filter(id => this.getObjet(id) == undefined).length > 0)
-      .map(c => { return { _id: c._id, 'data.contenu': c.system.contenu.filter(id => this.getObjet(id) != undefined) } });
+      .map(c => { return { _id: c._id, 'system.contenu': c.system.contenu.filter(id => this.getObjet(id) != undefined) } });
    if (updates.length > 0) {
      await this.updateEmbeddedDocuments("Item", updates)
    }
@@ -402,7 +402,7 @@ export class RdDActor extends Actor {
      if (!potion.system.prpermanent) {
        console.log(potion);
        let newPr = (potion.system.pr > 0) ? potion.system.pr - 1 : 0;
-        let update = { _id: potion._id, 'data.pr': newPr };
+        let update = { _id: potion._id, 'system.pr': newPr };
        const updated = await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity  

        let messageData = {
@@ -609,7 +609,6 @@ export class RdDActor extends Actor {
      whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
      content: "Remise à neuf de " + this.name
    };
-    const actorData = Misc.data(this);
    if (this.isEntite([ENTITE_NONINCARNE])) {
      return;
    }
@@ -1004,7 +1003,7 @@ export class RdDActor extends Actor {
    if (competence) {
      if (isNaN(newXp) || typeof (newXp) != 'number') newXp = 0;
      this.checkCompetenceXP(idOrName, newXp);
-      const update = { _id: competence.id, 'data.xp': newXp };
+      const update = { _id: competence.id, 'system.xp': newXp };
      await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
      this.updateExperienceLog("XP", newXp, "XP modifié en " + competence.name);
    } else {
@@ -1041,7 +1040,6 @@ export class RdDActor extends Actor {
  /* -------------------------------------------- */
  async updateExperienceLog(modeXP, valeurXP, raisonXP = 'Inconnue') {
    let d = new Date();
-    console.log(modeXP, valeurXP, raisonXP);
    let expLog = duplicate(this.system.experiencelog);
    expLog.push({
      mode: Misc.upperFirst(modeXP), valeur: valeurXP, raison: Misc.upperFirst(raisonXP),
@@ -2170,7 +2168,7 @@ export class RdDActor extends Actor {
  createCallbackExperience() {
    return {
      condition: r => r.rolled.isPart && r.finalLevel < 0 && game.settings.get("core", "rollMode") != 'selfroll',
-      action: r => this.appliquerAjoutExperience(r, (game.settings.get("core", "rollMode") != 'blindroll' && !game.user.isGM))
+      action: r => this.appliquerAjoutExperience(r)
    };
  }

@@ -2242,10 +2240,11 @@ export class RdDActor extends Actor {
  }

  /* -------------------------------------------- */
-  async appliquerAjoutExperience(rollData, display) {
+  async appliquerAjoutExperience(rollData, hideChatMessage = 'show') {
    if (!this.isPersonnage()) return;
+    hideChatMessage = hideChatMessage == 'hide' || (game.settings.get("core", "rollMode") != 'blindroll' && !game.user.isGM)
    let xpData = await this._appliquerExperience(rollData.rolled, rollData.selectedCarac.label, rollData.competence);
-    if (xpData && display) {
+    if (xpData && !hideChatMessage) {
      ChatMessage.create({
        whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
        content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-gain-xp.html`, xpData)
@@ -2842,7 +2841,7 @@ export class RdDActor extends Actor {

  /* -------------------------------------------- */
  _meditationEPart(meditationRoll) {
-    this.updateEmbeddedDocuments('Item', [{ _id: meditationRoll.meditation._id, 'data.malus': meditationRoll.meditation.system.malus - 1 }]);
+    this.updateEmbeddedDocuments('Item', [{ _id: meditationRoll.meditation._id, 'system.malus': meditationRoll.meditation.system.malus - 1 }]);
  }


@@ -3036,7 +3035,7 @@ export class RdDActor extends Actor {
      let update = { _id: xpData.competence._id, 'system.xp': newXp };
      await this.updateEmbeddedDocuments('Item', [update]);
      xpData.checkComp = await this.checkCompetenceXP(xpData.competence.name, undefined, false);
-      this.updateExperienceLog("XP", xpData.xp, "XP gagné en " + xpData.competence.name);
+      this.updateExperienceLog("XP", xpData.xpCompetence, "XP gagné en " + xpData.competence.name);
    }
  }

@@ -3068,7 +3067,7 @@ export class RdDActor extends Actor {
    // Gestion expérience (si existante)
    data.competence = this.getCompetence("astrologie")
    data.selectedCarac = this.system.carac["vue"];
-    this.appliquerAjoutExperience(data, false);
+    this.appliquerAjoutExperience(data, 'hide');

    // Ajout du nombre astral
    const item = {
@@ -3891,19 +3890,21 @@ export class RdDActor extends Actor {
  }

  /* -------------------------------------------- */
-  addSubActeur(subActorId) {
-    let subActor = game.actors.get(subActorId);
-    //console.log("Ajout acteur : ", actor, this);
-    if (subActor && !subActor.owner) {
-      if (subActortype == 'vehicule') {
+  addSubActeur(subActor) {
+    if(subActor?.id == this.id){
+      ui.notifications.warn("Vous ne pouvez pas attacher un acteur à lui même")
+    }
+    else if (!subActor?.isOwner) {
+      ui.notifications.warn("Vous n'avez pas les droits sur l'acteur que vous attachez.")
+    }
+    else {
+      if (subActor.type == 'vehicule') {
        this.pushSubacteur(subActor, this.system.subacteurs.vehicules, 'system.subacteurs.vehicules', 'Ce Véhicule');
      } else if (subActor.type == 'creature') {
        this.pushSubacteur(subActor, this.system.subacteurs.montures, 'system.subacteurs.montures', 'Cette Monture');
      } else if (subActor.type == 'personnage') {
        this.pushSubacteur(subActor, this.system.subacteurs.suivants, 'system.subacteurs.suivants', 'Ce Suivant');
      }
-    } else {
-      ui.notifications.warn("Vous n'avez pas les droits sur l'acteur que vous attachez.")
    }
  }

--- a/module/chat-utility.js
+++ b/module/chat-utility.js
@@ -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);
  }

  /* -------------------------------------------- */
--- a/module/dialog-create-signedraconique.js
+++ b/module/dialog-create-signedraconique.js
@@ -10,7 +10,7 @@ export class DialogCreateSigneDraconique extends Dialog {
    const signe = await RdDItemSigneDraconique.randomSigneDraconique({ephemere: true});
    let dialogData = {
      signe: signe,
-      tmrs: TMRUtility.listSelectedTMR(signe.data.typesTMR ?? []),
+      tmrs: TMRUtility.listSelectedTMR(signe.system.typesTMR ?? []),
      actors: game.actors.filter(actor => actor.isHautRevant()).map(actor => {
        let actorData = duplicate(actor);
        actorData.selected = actor.hasPlayerOwner;
@@ -38,7 +38,7 @@ export class DialogCreateSigneDraconique extends Dialog {
  }

  async _onCreerSigneActeurs() {
-    await $("[name='signe.data.ephemere']").change();
+    await $("[name='signe.system.ephemere']").change();
    await $(".signe-xp-sort").change();
    this.validerSigne();
    this.dialogData.actors.filter(it => it.selected).map(it => game.actors.get(it._id))
@@ -58,21 +58,21 @@ export class DialogCreateSigneDraconique extends Dialog {

  validerSigne() {
    this.dialogData.signe.name = $("[name='signe.name']").val();
-    this.dialogData.signe.data.valeur.norm = $("[name='signe.data.valeur.norm']").val();
-    this.dialogData.signe.data.valeur.sign = $("[name='signe.data.valeur.sign']").val();
-    this.dialogData.signe.data.valeur.part = $("[name='signe.data.valeur.part']").val();
-    this.dialogData.signe.data.difficulte = $("[name='signe.data.difficulte']").val();
-    this.dialogData.signe.data.ephemere = $("[name='signe.data.ephemere']").prop("checked");
-    this.dialogData.signe.data.duree = $("[name='signe.data.duree']").val();
-    this.dialogData.signe.data.typesTMR = $(".select-tmr").val();
+    this.dialogData.signe.system.valeur.norm = $("[name='signe.system.valeur.norm']").val();
+    this.dialogData.signe.system.valeur.sign = $("[name='signe.system.valeur.sign']").val();
+    this.dialogData.signe.system.valeur.part = $("[name='signe.system.valeur.part']").val();
+    this.dialogData.signe.system.difficulte = $("[name='signe.system.difficulte']").val();
+    this.dialogData.signe.system.ephemere = $("[name='signe.system.ephemere']").prop("checked");
+    this.dialogData.signe.system.duree = $("[name='signe.system.duree']").val();
+    this.dialogData.signe.system.typesTMR = $(".select-tmr").val();
  }

  /* -------------------------------------------- */
  activateListeners(html) {
    super.activateListeners(html);
-    this.setEphemere(this.dialogData.signe.data.ephemere);
+    this.setEphemere(this.dialogData.signe.system.ephemere);
    html.find(".signe-aleatoire").click(event => this.setSigneAleatoire());
-    html.find("[name='signe.data.ephemere']").change((event) => this.setEphemere(event.currentTarget.checked));
+    html.find("[name='signe.system.ephemere']").change((event) => this.setEphemere(event.currentTarget.checked));
    html.find(".select-actor").change((event) => this.onSelectActor(event));
    html.find(".signe-xp-sort").change((event) => this.onValeurXpSort(event));
  }
@@ -81,18 +81,18 @@ export class DialogCreateSigneDraconique extends Dialog {
    const newSigne = await RdDItemSigneDraconique.randomSigneDraconique({ephemere: true});

    $("[name='signe.name']").val(newSigne.name);
-    $("[name='signe.data.valeur.norm']").val(newSigne.data.valeur.norm);
-    $("[name='signe.data.valeur.sign']").val(newSigne.data.valeur.sign);
-    $("[name='signe.data.valeur.part']").val(newSigne.data.valeur.part);
-    $("[name='signe.data.difficulte']").val(newSigne.data.difficulte);
-    $("[name='signe.data.duree']").val(newSigne.data.duree);
-    $("[name='signe.data.ephemere']").prop("checked", newSigne.data.ephemere);
-    $(".select-tmr").val(newSigne.data.typesTMR);
-    this.setEphemere(newSigne.data.ephemere);
+    $("[name='signe.system.valeur.norm']").val(newSigne.system.valeur.norm);
+    $("[name='signe.system.valeur.sign']").val(newSigne.system.valeur.sign);
+    $("[name='signe.system.valeur.part']").val(newSigne.system.valeur.part);
+    $("[name='signe.system.difficulte']").val(newSigne.system.difficulte);
+    $("[name='signe.system.duree']").val(newSigne.system.duree);
+    $("[name='signe.system.ephemere']").prop("checked", newSigne.system.ephemere);
+    $(".select-tmr").val(newSigne.system.typesTMR);
+    this.setEphemere(newSigne.system.ephemere);
  }

  async setEphemere(ephemere) {
-    this.dialogData.signe.data.ephemere = ephemere;
+    this.dialogData.signe.system.ephemere = ephemere;
    HtmlUtility._showControlWhen($(".signe-data-duree"), ephemere);
  }

@@ -111,8 +111,8 @@ export class DialogCreateSigneDraconique extends Dialog {
  onValeurXpSort(event) {
    const codeReussite = event.currentTarget.attributes['data-typereussite']?.value ?? 0;
    const xp = Number(event.currentTarget.value);
-    const oldValeur = this.dialogData.signe.data.valeur;
-    this.dialogData.signe.data.valeur = RdDItemSigneDraconique.calculValeursXpSort(codeReussite, xp, oldValeur);
+    const oldValeur = this.dialogData.signe.system.valeur;
+    this.dialogData.signe.system.valeur = RdDItemSigneDraconique.calculValeursXpSort(codeReussite, xp, oldValeur);
  }

 }
--- a/module/dialog-fabriquer-potion.js
+++ b/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,
    };
@@ -25,8 +25,8 @@ export class DialogFabriquerPotion extends Dialog {
  /* -------------------------------------------- */
  static prepareData(actor, item) {
    let potionData = duplicate(item)
-    potionData.nbBrinsSelect = RdDUtility.buildListOptions(1, potionData.data.quantite);
-    potionData.nbBrins = Math.min(potionData.data.quantite, DialogFabriquerPotion.getNombreBrinOptimal(potionData));
+    potionData.nbBrinsSelect = RdDUtility.buildListOptions(1, potionData.system.quantite);
+    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 ?? '') {
-      case "Soin": return 12 - herbeData.data.niveau;
-      case "Repos": return 7 - herbeData.data.niveau;
+    switch (herbeData.system.categorie ?? '') {
+      case "Soin": return 12 - herbeData.system.niveau;
+      case "Repos": return 7 - herbeData.system.niveau;
    }
    return 1;
  }
--- a/module/dialog-item-achat.js
+++ b/module/dialog-item-achat.js
@@ -34,7 +34,7 @@ export class DialogItemAchat extends Dialog {
    const actionAchat = venteData.prixLot > 0 ? "Acheter" : "Prendre";
    const buttons = {};
    if (isConsommable) {
-      buttons["consommer"] = { label: venteData.item.data.boisson ? "Boire" : "Manger", callback: it => { this.onAchatConsommer(); } }
+      buttons["consommer"] = { label: venteData.item.system.boisson ? "Boire" : "Manger", callback: it => { this.onAchatConsommer(); } }
    }
    buttons[actionAchat] = { label: actionAchat, callback: it => { this.onAchat(); } };
    buttons["decliner"] = { label: "Décliner", callback: it => { } };
--- a/module/dialog-item-consommer.js
+++ b/module/dialog-item-consommer.js
@@ -49,8 +49,8 @@ export class DialogConsommer extends Dialog {
    }
    switch (itemData.type) {
      case 'nourritureboisson':
-        consommerData.title = itemData.data.boisson ? `${itemData.name}: boire une dose` : `${itemData.name}: manger une portion`;
-        consommerData.buttonName = itemData.data.boisson ? "Boire" : "Manger";
+        consommerData.title = itemData.system.boisson ? `${itemData.name}: boire une dose` : `${itemData.name}: manger une portion`;
+        consommerData.buttonName = itemData.system.boisson ? "Boire" : "Manger";
        break;
      case 'potion':
        consommerData.title = `${itemData.name}: boire la potion`;
@@ -63,9 +63,9 @@ export class DialogConsommer extends Dialog {

  static calculDoses(consommerData) {
    const doses = consommerData.choix.doses;
-    consommerData.totalSust = Misc.keepDecimals(doses * (consommerData.item.data.sust ?? 0), 2);
-    consommerData.totalDesaltere = consommerData.item.data.boisson
-      ? Misc.keepDecimals(doses * (consommerData.item.data.desaltere ?? 0), 2)
+    consommerData.totalSust = Misc.keepDecimals(doses * (consommerData.item.system.sust ?? 0), 2);
+    consommerData.totalDesaltere = consommerData.item.system.boisson
+      ? Misc.keepDecimals(doses * (consommerData.item.system.desaltere ?? 0), 2)
      : 0;
  }

--- a/module/dialog-split-item.js
+++ b/module/dialog-split-item.js
@@ -6,7 +6,7 @@ export class DialogSplitItem extends Dialog {
    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)
--- a/module/item-arme.js
+++ b/module/item-arme.js
@@ -168,7 +168,6 @@ export class RdDItemArme extends Item {
    let corpsACorps = competences.find(it => it.name == 'Corps à corps') ?? { system: { niveau: -6 } };
    let init = RdDCombatManager.calculInitiative(corpsACorps.system.niveau, carac['melee'].value);
    armes.push(RdDItemArme.mainsNues({ niveau: corpsACorps.system.niveau, initiative: init }));
-    //armes.push(RdDItemArme.empoignade({ niveau: corpsACorps.data.niveau, initiative: init }));
  }

  static corpsACorps(actorData) {
--- a/module/item-competence.js
+++ b/module/item-competence.js
@@ -183,20 +183,20 @@ export class RdDItemCompetence extends Item {
  }

  /* -------------------------------------------- */
-  static levelUp(itemData, stressTransforme) {
-    itemData.system.xpNext = RdDItemCompetence.getCompetenceNextXp(itemData.system.niveau);
-    const xpManquant = itemData.system.xpNext - itemData.system.xp;
-    itemData.system.isLevelUp = xpManquant <= 0;
-    itemData.system.isStressLevelUp = (xpManquant > 0 && stressTransforme >= xpManquant && itemData.system.niveau < itemData.system.niveau_archetype);
-    itemData.system.stressXpMax = 0;
-    if (xpManquant > 0 && stressTransforme > 0 && itemData.system.niveau < itemData.system.niveau_archetype) {
-        itemData.system.stressXpMax = Math.min(xpManquant , stressTransforme);
+  static levelUp(item, stressTransforme) {
+    item.system.xpNext = RdDItemCompetence.getCompetenceNextXp(item.system.niveau);
+    const xpManquant = item.system.xpNext - item.system.xp;
+    item.system.isLevelUp = xpManquant <= 0;
+    item.system.isStressLevelUp = (xpManquant > 0 && stressTransforme >= xpManquant && item.system.niveau < item.system.niveau_archetype);
+    item.system.stressXpMax = 0;
+    if (xpManquant > 0 && stressTransforme > 0 && item.system.niveau < item.system.niveau_archetype) {
+        item.system.stressXpMax = Math.min(xpManquant , stressTransforme);
    }
  }

  /* -------------------------------------------- */
  static isVisible(itemData) {
-    return Number(itemData.data.niveau) != RdDItemCompetence.getNiveauBase(itemData.data.categorie);
+    return Number(itemData.system.niveau) != RdDItemCompetence.getNiveauBase(itemData.system.categorie);
  }

  static nomContientTexte(itemData, texte) {
--- a/module/item-monnaie.js
+++ b/module/item-monnaie.js
@@ -4,22 +4,22 @@ 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: "" }
  }
 ]

--- a/module/item-sheet.js
+++ b/module/item-sheet.js
@@ -92,7 +92,7 @@ export class RdDItemSheet extends ItemSheet {
      console.log(formData.competences)
    }
    if (formData.type == 'recettealchimique') {
-      RdDAlchimie.processManipulation(objectData, this.actor && this.actor.id);
+      RdDAlchimie.processManipulation(this.object, this.actor && this.actor.id);
    }
    if (formData.type == 'gemme') {
      formData.gemmeTypeList = RdDGemme.getGemmeTypeOptionList();
@@ -105,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);
@@ -145,8 +145,8 @@ export class RdDItemSheet extends ItemSheet {
    html.find(".categorie").change(event => this._onSelectCategorie(event));

    html.find('.sheet-competence-xp').change((event) => {
-      if (this.object.data.type == 'competence') {
-        RdDUtility.checkThanatosXP(this.object.data.name);
+      if (this.object.type == 'competence') {
+        RdDUtility.checkThanatosXP(this.object.name);
      }
    });

@@ -252,7 +252,7 @@ export class RdDItemSheet extends ItemSheet {
    const dragData = {
      actorId: this.actor.id,
      type: "Item",
-      data: item.data
+      data: item
    };

    event.dataTransfer.setData("text/plain", JSON.stringify(dragData));
--- a/module/item-signedraconique.js
+++ b/module/item-signedraconique.js
@@ -24,7 +24,7 @@ export class RdDItemSigneDraconique {
      type: "signedraconique",
      img: meditation.img,
      data: {
-        typesTMR: [TMRUtility.typeTmrName(meditation.data.tmr)],
+        typesTMR: [TMRUtility.typeTmrName(meditation.system.tmr)],
        difficulte: rolled.isSuccess ? RdDItemSigneDraconique.getDiffSigneMeditation(rolled.code) : DIFFICULTE_LECTURE_SIGNE_MANQUE,
        ephemere: true,
        duree: "1 round",
--- a/module/item-sort.js
+++ b/module/item-sort.js
@@ -7,12 +7,12 @@ export class RdDItemSort extends Item {

  /* -------------------------------------------- */
  static isDifficulteVariable(sort) {
-    return sort && (sort.data.difficulte.toLowerCase() == "variable");
+    return sort && (sort.system.difficulte.toLowerCase() == "variable");
  }

  /* -------------------------------------------- */
  static isCoutVariable(sort) {
-    return sort && (sort.data.ptreve.toLowerCase() == "variable" || sort.data.ptreve.indexOf("+") >= 0);
+    return sort && (sort.system.ptreve.toLowerCase() == "variable" || sort.system.ptreve.indexOf("+") >= 0);
  }
 
  /* -------------------------------------------- */
@@ -25,7 +25,7 @@ export class RdDItemSort extends Item {
  /* -------------------------------------------- */
  static getDifficulte(sort, variable) {
    if (sort && !RdDItemSort.isDifficulteVariable(sort)) {
-       return Misc.toInt(sort.data.difficulte);
+       return Misc.toInt(sort.system.difficulte);
    }
    return variable;
  }
@@ -54,7 +54,7 @@ export class RdDItemSort extends Item {
  static getBonusCaseList( item, newCase = false ) {
    // Gestion spéciale case bonus
    if ( item.type == 'sort') {
-      return this.buildBonusCaseList(item.data.bonuscase, newCase );
+      return this.buildBonusCaseList(item.system.bonuscase, newCase );
    }
    return undefined;
  }
@@ -87,7 +87,7 @@ export class RdDItemSort extends Item {
  
  /* -------------------------------------------- */
  static incrementBonusCase( actor, sort, coord ) {
-      let bonusCaseList = this.buildBonusCaseList(sort.data.bonuscase, false);
+      let bonusCaseList = this.buildBonusCaseList(sort.system.bonuscase, false);
      //console.log("ITEMSORT", sort, bonusCaseList);
      
      let found = false;
@@ -111,7 +111,7 @@ export class RdDItemSort extends Item {
  
  /* -------------------------------------------- */
  static getCaseBonus( sort, coord) {
-    let bonusCaseList = this.buildBonusCaseList(sort.data.bonuscase, false);
+    let bonusCaseList = this.buildBonusCaseList(sort.system.bonuscase, false);
    for( let bc of bonusCaseList) {
      if (bc.case == coord) { // Case existante
        return Number(bc.bonus);
--- a/module/item.js
+++ b/module/item.js
@@ -117,7 +117,7 @@ export class RdDItem extends Item {
      if (this.isPotion()) {
        this.prepareDataPotion()
      }
-      this.actionPrincipale = this.getActionPrincipale({ warnIfNot: false });
+      this.system.actionPrincipale = this.getActionPrincipale({ warnIfNot: false });
    }
  }

@@ -192,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 = this
-    const otherData = other
-    const tplData = this
-    const otherTplData = other
    if (!this.isEquipement()) return false;
-    if (itemData.type != otherData.type) return false;
-    if (itemData.name != otherData.name) return false;
-    if (tplData.quantite == undefined) return false;
-
-    const differences = Object.entries(tplData).filter(([key, value]) => !['quantite', 'encTotal', 'prixTotal', 'cout'].includes(key))
-      .filter(([key, value]) => value != otherTplData[key]);
-    if (differences.length > 0) {
-      let message = `Impossible de regrouper les ${itemData.type} ${itemData.name}: `;
-      for (const [key, value] of differences) {
-        message += `<br>${key}: ${value} vs ${otherTplData[key]}`;
+    let message = undefined;
+    if (this.type != other.type) {
+      message = `Impossible de regrouper ${this.type} avec ${other.type}`;
+    }
+    else if (this.name != other.name) {
+      message = `Impossible de regrouper ${this.name} avec ${other.name}`;
+    }
+    else if (this.system.quantite == undefined) {
+      message = `Impossible de regrouper des ${this.type}, ils ne sont pas empilables`;
+    } 
+    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;
    }
--- a/module/rdd-alchimie.js
+++ b/module/rdd-alchimie.js
@@ -7,9 +7,9 @@ const matchOperationTerms = new RegExp(/@(\w*){([\w\-]+)}/i);
 export class RdDAlchimie {

  /* -------------------------------------------- */
-  static processManipulation(recetteData, actorId = undefined) {
+  static processManipulation(recette, actorId = undefined) {
    //console.log("CALLED", recette, recette.isOwned, actorId );
-    let manip = recetteData.data.manipulation;
+    let manip = recette.system.manipulation;
    let matchArray = manip.match(matchOperations);
    if (matchArray) {
      for (let matchStr of matchArray) {
@@ -22,7 +22,7 @@ export class RdDAlchimie {
        }
      }
    }
-    recetteData.data.manipulation_update = manip;
+    recetteData.recette.manipulation_update = manip;
  }

  /* -------------------------------------------- */
--- a/module/rdd-calendrier.js
+++ b/module/rdd-calendrier.js
@@ -223,9 +223,9 @@ export class RdDCalendrier extends Application {
  checkMaladie( periode) {
    for (let actor of game.actors) {
      if (actor.type == 'personnage') {
-        let maladies = actor.filterItems( item => (item.type == 'maladie' || (item.type == 'poison' && item.data.active) ) && item.data.periodicite.toLowerCase().includes(periode) );
+        let maladies = actor.filterItems( item => (item.type == 'maladie' || (item.type == 'poison' && item.system.active) ) && item.system.periodicite.toLowerCase().includes(periode) );
        for (let maladie of maladies) {
-          if ( maladie.data.identifie) {            
+          if ( maladie.system.identifie) {            
            ChatMessage.create({ content: `${actor.name} souffre de ${maladie.name} (${maladie.type}): vérifiez que les effets ne se sont pas aggravés !` });
          } else {
            ChatMessage.create({ content: `${actor.name} souffre d'un mal inconnu (${maladie.type}): vérifiez que les effets ne se sont pas aggravés !` });
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@@ -66,7 +66,7 @@ export class RdDCombatManager extends Combat {

  /* -------------------------------------------- */
  async finDeRound(options = { terminer: false }) {
-    for (let combatant of this.data.combatants) {
+    for (let combatant of this.combatants) {
      if (combatant.actor) {
        await combatant.actor.finDeRound(options);
      }
@@ -78,7 +78,7 @@ export class RdDCombatManager extends Combat {

  /************************************************************************************/
  async rollInitiative(ids, formula = undefined, messageOptions = {}) {
-    console.log(`${game.data.system.data.title} | Combat.rollInitiative()`, ids, formula, messageOptions);
+    console.log(`${game.system.title} | Combat.rollInitiative()`, ids, formula, messageOptions);
    // Structure input data
    ids = typeof ids === "string" ? [ids] : ids;
    const currentId = this.combatant._id;
@@ -99,7 +99,7 @@ export class RdDCombatManager extends Combat {
          if (competence) {
            const carac = combatant.actor.system.carac[competence.system.defaut_carac].value;
            const niveau = competence.system.niveau;
-            const bonusEcaille = (armeCombat?.data.magique) ? armeCombat.system.ecaille_efficacite : 0;
+            const bonusEcaille = (armeCombat?.system.magique) ? armeCombat.system.ecaille_efficacite : 0;
            rollFormula = RdDCombatManager.formuleInitiative(2,  carac, niveau, bonusEcaille);
          }
        }
@@ -155,14 +155,14 @@ export class RdDCombatManager extends Combat {
    // Gestion des armes 1/2 mains
    let actionsArme = [];
    for (const arme of armes) {
-      let action = duplicate(Misc.data(arme));
+      let action = duplicate(arme)
      if (action.system.equipe) {
        let compData = competences.find(c => c.name == action.system.competence)

        actionsArme.push(action);
        action.action = 'attaque';
        action.system.dommagesReels = Number(action.system.dommages);
-        action.system.niveau = compData.data.niveau;
+        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 (action.system.unemain && !action.system.deuxmains) {
@@ -204,7 +204,7 @@ export class RdDCombatManager extends Combat {
          action: 'conjurer',
          data: {
            competence: p.name,
-            possessionid: p.data.data.possessionid,
+            possessionid: p.system.possessionid,
          }
        }
      }));
@@ -228,9 +228,9 @@ export class RdDCombatManager extends Combat {
        .concat(RdDItemArme.mainsNues());

      let competences = items.filter(it => it.type == 'competence');
-      actions = actions.concat(RdDCombatManager.listActionsArmes(armes, competences, actor.data.data.carac));
+      actions = actions.concat(RdDCombatManager.listActionsArmes(armes, competences, actor.system.carac));

-      if (actor.data.data.attributs.hautrevant.value) {
+      if (actor.system.attributs.hautrevant.value) {
        actions.push({ name: "Draconic", action: 'haut-reve', data: { initOnly: true, competence: "Draconic" } });
      }
    }
@@ -249,14 +249,14 @@ export class RdDCombatManager extends Combat {
  static processPremierRoundInit() {
    // Check if we have the whole init !
    if (Misc.isUniqueConnectedGM() && game.combat.current.round == 1) {
-      let initMissing = game.combat.data.combatants.find(it => !it.initiative);
+      let initMissing = game.combat.combatants.find(it => !it.initiative);
      if (!initMissing) { // Premier round !
-        for (let combatant of game.combat.data.combatants) {
+        for (let combatant of game.combat.combatants) {
          let action = combatant.initiativeData?.arme;
          //console.log("Parsed !!!", combatant, initDone, game.combat.current, arme);
          if (action && action.type == "arme") {
            for (let initData of premierRoundInit) {
-              if (Grammar.toLowerCaseNoAccentNoSpace(action.data.initpremierround).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>
@@ -329,10 +329,10 @@ export class RdDCombatManager extends Combat {
    } else {
      compData = RdDItemCompetence.findCompetence(combatant.actor.items, arme.system.competence);
      compNiveau = compData.system.niveau;
-        initInfo = action.name + " / " + action.data.competence;
+        initInfo = action.name + " / " + action.system.competence;
         
        if (combatant.actor.type == 'creature' || combatant.actor.type == 'entite') {
-          caracForInit = compData.data.carac_value;
+          caracForInit = compData.system.carac_value;
          if (compData.system.categorie == "lancer") {
            initOffset = 7;
          }
@@ -361,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;
    }
@@ -384,7 +384,7 @@ export class RdDCombatManager extends Combat {
      let menuItems = [];
      for (let action of actions) {
        menuItems.push({
-          name: action.data.competence,
+          name: action.system.competence,
          icon: "<i class='fas fa-dice-d6'></i>",
          callback: target => { RdDCombatManager.rollInitiativeAction(combatantId, action) }
        });
@@ -415,7 +415,7 @@ export class RdDCombat {

  /* -------------------------------------------- */
  static onUpdateCombat(combat, change, options, userId) {
-    if (combat.data.round != 0 && combat.turns && combat.data.active) {
+    if (combat.round != 0 && combat.turns && combat.active) {
      RdDCombat.combatNouveauTour(combat);
    }
  }
--- a/module/rdd-herbes.js
+++ b/module/rdd-herbes.js
@@ -27,7 +27,7 @@ export class RdDHerbes extends Item {
    for ( let herbe of listHerbes) {
      let herbeData = herbe.system
      let brins = max - herbeData.niveau;
-      list[herbe.data.name] = `${herbe.data.name} (Bonus: ${herbeData.niveau}, Brins: ${brins})`;
+      list[herbe.name] = `${herbe.name} (Bonus: ${herbeData.niveau}, Brins: ${brins})`;
    }
    list['Autre'] = 'Autre (Bonus: variable, Brins: variable)'
    return list;
--- a/module/rdd-hotbar-drop.js
+++ b/module/rdd-hotbar-drop.js
@@ -2,83 +2,99 @@ import { Misc } from "./misc.js";

 export class RdDHotbar {

+  static async createMacro(item, command) {
+    let macro = await Macro.create({
+      name: item.name,
+      type: "script",
+      img: item.img,
+      command: command
+    }, { displaySheet: false })
+    return macro
+  }
+
  /**
   * Create a macro when dropping an entity on the hotbar
   * Item      - open roll dialog for item
   * Actor     - open actor sheet
   * Journal   - open journal sheet
   */
-  static initDropbar( ) {
+  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" )
-        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) {
-        macro = await Macro.create({
-          name: item.name,
-          type: "script",
-          img: item.img,
-          command: command
-        }, { displaySheet: false })
+    Hooks.on("hotbarDrop", (bar, documentData, slot) => {
+
+      // Create item macro if rollable item - weapon, spell, prayer, trait, or skill
+      if (documentData.type == "Item") {
+        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 true
+        }
+        let command = `game.system.rdd.RdDHotbar.rollMacro("${item.name}", "${item.type}");`;
+        let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command));
+        if (!macro) {
+          macro = this.createMacro(item, command)
+        }
+        game.user.assignHotbarMacro(macro, slot);
+        return false
      }
-      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") {
+
+          // Create a macro to open the actor sheet of the actor dropped on the hotbar
+    /*else if (documentData.type == "Actor") {
      let actor = game.actors.get(documentData.id);
      let command = `game.actors.get("${documentData.id}").sheet.render(true)`
      let macro = game.macros.contents.find(m => (m.name === actor.name) && (m.command === command));
      if (!macro) {
        macro = await Macro.create({
-          name: actor.data.name,
+          name: actor.name,
          type: "script",
-          img: actor.data.img,
+          img: actor.img,
          command: command
        }, { displaySheet: false })
        game.user.assignHotbarMacro(macro, slot);
      }
    }
+
    // Create a macro to open the journal sheet of the journal dropped on the hotbar
    else if (documentData.type == "JournalEntry") {
-      let journal = 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
        }, { displaySheet: false })
        game.user.assignHotbarMacro(macro, slot);
      }
-    }
-    return false;
+    }*/
+    return true;
  });
-  }
+}

  /** Roll macro */
  static rollMacro(itemName, itemType, bypassData) {
-    const speaker = ChatMessage.getSpeaker();
-    let actor;
-    if (speaker.token) actor = game.actors.tokens[speaker.token];
-    if (!actor) actor = game.actors.get(speaker.actor);
+  const speaker = ChatMessage.getSpeaker();
+  let actor;
+  if (speaker.token) actor = game.actors.tokens[speaker.token];
+  if (!actor) actor = game.actors.get(speaker.actor);

-    let item = Misc.data(actor?.items.find(it => it.name === itemName && it.type == itemType));
-    if (!item) return ui.notifications.warn(`Impossible de trouver l'objet de cette macro`);
-
-    // Trigger the item roll
-    switch (item.type) {
-      case "arme":
-        return actor.rollArme(item);
-      case "competence":
-        return actor.rollCompetence( itemName );
-    }
+  let item = actor?.items.find(it => it.name === itemName && it.type == itemType) ?? undefined;
+  if (!item) {
+    return ui.notifications.warn(`Impossible de trouver l'objet de cette macro`);
  }

+  // Trigger the item roll
+  switch (item.type) {
+    case "arme":
+      return actor.rollArme(item);
+    case "competence":
+      return actor.rollCompetence(itemName);
+  }
+}
+
 }
--- a/module/rdd-main.js
+++ b/module/rdd-main.js
@@ -292,8 +292,8 @@ async function migrationPngWebp_1_5_34() {
    await Item.updateDocuments(itemsUpdates);
    await Actor.updateDocuments(actorsUpdates);
    game.actors.forEach(actor => {
-      if (actor.data.token?.img && actor.data.token.img.match(regexOldPngJpg)) {
-        actor.update({ "token.img": convertImgToWebp(actor.data.token.img) });
+      if (actor.token?.img && actor.token.img.match(regexOldPngJpg)) {
+        actor.update({ "token.img": convertImgToWebp(actor.token.img) });
      }
      const actorItemsToUpdate = prepareDocumentsImgUpdate(actor.items);
      actor.updateEmbeddedDocuments('Item', actorItemsToUpdate);
--- a/module/rdd-possession.js
+++ b/module/rdd-possession.js
@@ -84,7 +84,7 @@ export class RdDPossession {
      attacker: attacker,
      defender: defender,
      competence: defender.getDraconicOuPossession(),
-      selectedCarac: defender.system.data.carac.reve,
+      selectedCarac: defender.system.carac.reve,
      forceCarac: { 'reve-actuel': { label: "Rêve Actuel", value: defender.getReveActuel() } }
    }
    rollData.competence.system.defaut_carac = 'reve-actuel'
--- a/module/rdd-resolution-table.js
+++ b/module/rdd-resolution-table.js
@@ -166,7 +166,7 @@ export class RdDResolutionTable {
    if (rollData.selectedCarac?.label.toLowerCase().includes('chance')) {
      return true;
    }
-    if (rollData.selectedSort?.data.isrituel) {
+    if (rollData.selectedSort?.system.isrituel) {
      return true;
    }
    return false;
--- a/module/rdd-roll.js
+++ b/module/rdd-roll.js
@@ -165,7 +165,7 @@ 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 = rollData.competence.system.defaut_carac
@@ -221,7 +221,7 @@ export class RdDRoll extends Dialog {
    });
    html.find('#ptreve-variable').change((event) => {
      let ptreve = Misc.toInt(event.currentTarget.value);
-      this.rollData.selectedSort.data.ptreve_reel = ptreve;
+      this.rollData.selectedSort.system.ptreve_reel = ptreve;
      console.log("RdDRollSelectDialog - Cout reve", ptreve);
      this.updateRollResult();
    });
@@ -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));
  }

@@ -348,10 +348,10 @@ export class RdDRoll extends Dialog {
  /* -------------------------------------------- */
  _computeDiffCompetence(rollData) {
    if (rollData.competence) {
-      return Misc.toInt(rollData.competence.data.niveau);
+      return Misc.toInt(rollData.competence.system.niveau);
    }
    if (rollData.draconicList) {
-      return Misc.toInt(rollData.competence.data.niveau);
+      return Misc.toInt(rollData.competence.system.niveau);
    }
    return 0;
  }
--- a/module/rdd-sheet-utility.js
+++ b/module/rdd-sheet-utility.js
@@ -29,7 +29,7 @@ export class RdDSheetUtility {
      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; }
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -239,7 +239,7 @@ export class RdDUtility {
    Handlebars.registerHelper('typeTmr-name', coord => TMRUtility.typeTmrName(coord));
    Handlebars.registerHelper('min', (...args) => Math.min(...args.slice(0, -1)));

-    Handlebars.registerHelper('filtreTriCompetences', competences => competences.filter(it => it.visible)
+    Handlebars.registerHelper('filtreTriCompetences', competences => competences.filter(it => it.system.isVisible)
      .sort((a, b) => {
        if (a.name.startsWith("Survie") && b.name.startsWith("Survie")) {
          if (a.name.includes("Cité")) return -1;
@@ -248,7 +248,7 @@ export class RdDUtility {
          if (b.name.includes("Extérieur")) return 1;
          return a.name.localeCompare(b.name);
        }
-        if (a.data.categorie.startsWith("melee") && b.data.categorie.startsWith("melee")) {
+        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;
@@ -475,7 +475,7 @@ export class RdDUtility {
    objet.niveau = profondeur;
    const isConteneur = objet.type == 'conteneur';
    const isOuvert = isConteneur && this.getAfficheContenu(objet._id);
-    const isVide = isConteneur && Misc.templateData(objet).contenu.length == 0;
+    const isVide = isConteneur && objet.system.contenu.length == 0;
    const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html']({
      item: objet,
      vide: isVide,
@@ -753,7 +753,7 @@ export class RdDUtility {
  static getSelectedActor(msgPlayer = undefined) {
    if (canvas.tokens.controlled.length == 1) {
      let token = canvas.tokens.controlled[0];
-      if (token.actor && token.data.actorLink) {
+      if (token.actor && token.actorLink) {
        return token.actor;
      }
      if (msgPlayer != undefined) {
@@ -831,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,
@@ -881,8 +881,7 @@ export class RdDUtility {
        label: "Annuler"
      }
    }
-    const docData = objet
-    if (docData.type == 'conteneur' && docData.data.contenu.length > 0) {
+    if (objet.type == 'conteneur' && objet.system.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>',
--- a/module/rolldata-ajustements.js
+++ b/module/rolldata-ajustements.js
@@ -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 ?? rollData.competence?.data.default_diffLibre ?? 0
+      : rollData.diffLibre ?? rollData.competence?.system.default_diffLibre ?? 0
  },
  diffConditions: {
    isUsed: (rollData, actor) => rollData.diffConditions != undefined,
--- a/module/tmr-rencontres.js
+++ b/module/tmr-rencontres.js
@@ -486,7 +486,7 @@ export class TMRRencontres {
  /* -------------------------------------------- */
  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);
  }
--- a/module/tmr/sort-reserve.js
+++ b/module/tmr/sort-reserve.js
@@ -13,7 +13,7 @@ export class SortReserve extends Draconique {
  async onActorCreateOwned(actor, item) { }

  code() { return 'sort' }
-  tooltip(sort) { return `${sort.name}, r${sort.data.ptreve_reel}` }
+  tooltip(sort) { return `${sort.name}, r${sort.system.ptreve_reel}` }
  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/scroll.webp' }

  createSprite(pixiTMR) {
--- a/module/tmr/urgence-draconique.js
+++ b/module/tmr/urgence-draconique.js
@@ -37,7 +37,7 @@ export class UrgenceDraconique extends Draconique {
  }

  async onActorDeleteCaseTmr(actor, casetmr) {
-    await actor.deleteEmbeddedDocuments('Item', [casetmr.data.sourceid]);
+    await actor.deleteEmbeddedDocuments('Item', [casetmr.system.sourceid]);
  }

  code() { return 'urgence' }
--- a/system.json
+++ b/system.json
@@ -34,7 +34,7 @@
  ],
  "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/",
  "license": "LICENSE.txt",
-  "version": "10.0.7",
+  "version": "10.0.11",
  "compatibility": {
    "minimum": "10"
  },
@@ -332,7 +332,7 @@
  ],
  "socket": true,
  "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.7.zip",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.11.zip",
  "gridDistance": 1,
  "gridUnits": "m",
  "primaryTokenAttribute": "sante.vie",
--- a/templates/actor-creature-sheet.html
+++ b/templates/actor-creature-sheet.html
@@ -68,7 +68,7 @@
            </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="system.sante.vie.value" value="{{data.sante.vie.value}}" data-dtype="Number" /> / 
                <input type="text" name="system.sante.vie.max" value="{{data.sante.vie.max}}" data-dtype="Number" />
--- a/templates/actor-entite-sheet.html
+++ b/templates/actor-entite-sheet.html
@@ -35,12 +35,12 @@
            {{#each data.carac as |carac 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}}
@@ -52,7 +52,7 @@
          <ol class="carac-list alterne-list">
            <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>
@@ -61,7 +61,7 @@
            </li>
            <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>
@@ -71,16 +71,16 @@
            </li>
            {{#each data.attributs as |attr key|}}
            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label flexrow" name="data.attributs.{{key}}.label">{{attr.label}} : </span>
-              <span><input class="attribut-value flexrow" type="text" name="data.attributs.{{key}}.value"
+              <span class="carac-label flexrow" name="system.attributs.{{key}}.label">{{attr.label}} : </span>
+              <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="caracteristique flexrow list-item" data-attribute="endurance">
-              <span class="competence-label flexrow" name="data.sante.endurance.label">Endurance : </span>
-              <span><input class="sante-value flexrow" type="text" name="data.sante.endurance.value"
+              <span class="competence-label flexrow" name="system.sante.endurance.label">Endurance : </span>
+              <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>
@@ -98,11 +98,11 @@
              <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-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>
--- a/templates/actor-sheet-competence-partial.html
+++ b/templates/actor-sheet-competence-partial.html
@@ -1,4 +1,4 @@
-{{#if visible}}
+{{#if system.isVisible}}
  <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}}"/>
--- a/templates/actor-sheet-inventaire-item.html
+++ b/templates/actor-sheet-inventaire-item.html
@@ -21,27 +21,27 @@
    <span>{{item.name}}</span>
    {{/if}}
  </span>
-  <span class="equipement-detail">{{item.data.quantite}}
-    {{#if (gt item.data.quantite 1)}}
+  <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.data.encTotal decimals=2}}</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.data.equipe}}<i class="fas fa-hand-rock"></i>{{else}}<i class="far fa-hand-paper"></i>{{/if}}</a>
+    <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.data.quantite)}}
+    {{#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.data.actionPrincipale}}
-    <a class="item-action">{{item.data.actionPrincipale}}</a>
+    {{#if item.actionPrincipale}}
+    <a class="item-action">{{item.actionPrincipale}}</a>
    {{/if}}
  </span>
 </li>
--- a/templates/actor-sheet-inventaire-monnaie.html
+++ b/templates/actor-sheet-inventaire-monnaie.html
@@ -16,7 +16,7 @@

    <!-- <span class="equipement-detail">
      <span class="flex-shrink"><a class="monnaie-moins"><i class="fas fa-minus-square"></i></a></span>
-      <span>{{piece.data.quantite}}</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/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -13,7 +13,7 @@
              <label class="compteur">
                <a class="jet-vie">Vie</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"><i class="fas fa-plus-square"></i></a>
              </label>
@@ -22,7 +22,7 @@
              <label class="compteur">
                <a class="jet-endurance">Endurance</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"><i class="fas fa-plus-square"></i></a>
              </label>
@@ -32,7 +32,7 @@
                <span class="tooltiptext ttt-fatigue">{{{calc.fatigue.html}}}</span>
                Fatigue
                <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"><i class="fas fa-plus-square"></i></a>
              </label>
@@ -41,7 +41,7 @@
              <label class="compteur">
                <span class="ptreve-actuel"><a>Rêve</a></span>
                <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"><i class="fas fa-plus-square"></i></a>
              </label>
@@ -107,27 +107,27 @@
                    <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>
-                      <input class="carac-value" type="text" name="data.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+                      <span class="carac-label" name="system.carac.{{key}}.label">{{carac.label}}</span>
+                      <input class="carac-value" type="text" name="system.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
                      <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}}
@@ -149,17 +149,17 @@
              <ul class="carac-list">
                <li class="caracteristique flexrow list-item">
                  <span class="carac-label" name="beaute">Beauté&nbsp;:</span>
-                  <input class="description-value" type="text" name="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="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>
@@ -179,7 +179,7 @@
                    <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}}
@@ -300,7 +300,7 @@
              </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}}"/>
@@ -309,7 +309,7 @@
                </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}}
@@ -332,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
@@ -340,8 +340,8 @@
              </span>
              <span class="competence-label">{{maladie.type}}</span>
              <span class="competence-label">
-                {{#if (or @root.options.isGM maladie.data.remedesconnus)}} 
-                  {{maladie.data.remedes}}
+                {{#if (or @root.options.isGM maladie.system.remedesconnus)}} 
+                  {{maladie.system.remedes}}
                {{else}}
                  Remèdes Inconnus
                {{/if}}
@@ -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}}
@@ -569,7 +569,7 @@
              {{#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>
+                <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>
@@ -677,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}}
@@ -715,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>
--- a/templates/actor-vehicule-sheet.html
+++ b/templates/actor-vehicule-sheet.html
@@ -27,7 +27,7 @@
          <ol class="carac-list alterne-list">
            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
              <span class="carac-label flexrow" name="categorie">Catégorie</span>
-              <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}}
@@ -35,31 +35,31 @@
            </li>
            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
              <span class="carac-label flexrow" name="categorie">Résistance</span>
-              <input class="competence-value flexrow" type="text" name="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="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="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="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="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="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="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>
--- a/templates/chat-demande-attaque-etotal.html
+++ b/templates/chat-demande-attaque-etotal.html
@@ -8,7 +8,7 @@
      </a>
      <br>
    {{/unless}}
-    {{#if (gt attacker.data.compteurs.destinee.value 0)}}
+    {{#if (gt attacker.system.compteurs.destinee.value 0)}}
      <a class='chat-card-button' id='appel-destinee-attaque' data-attackerId='{{attackerId}}'
        data-defenderTokenId='{{defenderTokenId}}'>Utiliser la destinée</a>
      </a>
--- a/templates/chat-demande-defense.html
+++ b/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}}'>
-              Parer à mains nues à {{diffLibre}}{{#if arme.data.nbUsage}} (Utilisations : {{arme.data.nbUsage}}){{/if}}
+                data-armeid='{{arme._id}}' data-competence='{{arme.system.competence}}'>
+              Parer à mains nues à {{diffLibre}}{{#if arme.system.nbUsage}} (Utilisations : {{arme.system.nbUsage}}){{/if}}
            </a>
            <br>
          {{/if}}
--- a/templates/chat-resultat-oeuvre.html
+++ b/templates/chat-resultat-oeuvre.html
@@ -2,7 +2,7 @@

  {{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>
--- a/templates/chat-resultat-recettecuisine.html
+++ b/templates/chat-resultat-recettecuisine.html
@@ -6,7 +6,7 @@
 <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}}
--- a/templates/chat-resultat-reve-de-dragon.html
+++ b/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>
--- a/templates/chat-resultat-sort.html
+++ b/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}}
--- a/templates/chat-signe-draconique-actor.html
+++ b/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>
--- a/templates/dialog-create-signedraconique.html
+++ b/templates/dialog-create-signedraconique.html
@@ -8,27 +8,27 @@
    </h4>
  </div>
  <div class="form-group">
-    <label for="signe.data.difficulte">Difficulte</label>
-    <input type="number" name="signe.data.difficulte" value="{{signe.data.difficulte}}" data-dtype="Number" />
+    <label for="signe.system.difficulte">Difficulte</label>
+    <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"
-        value="{{signe.data.valeur.norm}}" min="1" max="100" data-dtype="Number" />
+      <input class="signe-xp-sort" type="number" name="signe.system.valeur.norm" data-typereussite="norm"
+        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"
-        value="{{signe.data.valeur.sign}}" min="1" max="100" data-dtype="Number" />
+      <input class="signe-xp-sort" type="number" name="signe.system.valeur.sign" data-typereussite="sign"
+        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"
-        value="{{signe.data.valeur.part}}" min="1" max="100" data-dtype="Number" />
+      <input class="signe-xp-sort" type="number" name="signe.system.valeur.part" data-typereussite="part"
+        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>
-      <input class="flex-shrink" type="checkbox" name="signe.data.ephemere" {{#if signe.data.ephemere}}checked{{/if}} />
+      <label for="signe.system.ephemere">Ephémère</label>
+      <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">
--- a/templates/dialog-item-achat.html
+++ b/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}}
-   <p>Cette {{#if item.data.boisson}}boisson{{else}}nourriture{{/if}} vous apportera <span
+  {{#if item.system.sust}}
+   <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}}
-   <p>{{#if item.data.alcoolise}}
-     C'est une boisson alcoolisée de force {{item.data.force}}, vous effectuerez un jet d'éthylisme.
+   {{#if item.system.boisson}}
+   <p>{{#if item.system.alcoolise}}
+     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.data.qualite cuisine.data.niveau)}}
-   <p>La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.data.qualite decimals=0 sign=true}}
+   {{#if (gt item.system.qualite 0)}}
+   {{#if (gt item.system.qualite cuisine.system.niveau)}}
+   <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>
--- a/templates/dialog-item-consommer.html
+++ b/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}}
-  <p>Cette {{#if item.data.boisson}}boisson{{else}}nourriture{{/if}} vous apportera <span
+  {{#if item.system.sust}}
+  <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}}
-  <p>{{#if item.data.alcoolise}}
-    C'est une boisson alcoolisée de force {{item.data.force}}, vous effectuerez un jet d'éthylisme.
+  {{#if item.system.boisson}}
+  <p>{{#if item.system.alcoolise}}
+    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.data.qualite cuisine.data.niveau)}}
-  <p>La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.data.qualite decimals=0 sign=true}}
+  {{#if (gt item.system.qualite 0)}}
+  {{#if (gt item.system.qualite cuisine.system.niveau)}}
+  <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>
--- a/templates/dialog-item-split.html
+++ b/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}}"
--- a/templates/dialog-roll-alchimie.html
+++ b/templates/dialog-roll-alchimie.html
@@ -6,7 +6,7 @@
      <div class="grid grid-2col">
        <label>{{alchimie.tache}}:</label><label class="flex-grow">{{alchimie.texte}}</label>
        <label>Caractéristique: </label><label class="flex-grow">{{selectedCarac.label}}</label>
-        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.data.niveau decimals=0 sign=true}}</label></label>
+        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label></label>
      </div>
    </div>
    <div class="flex-group-left">
--- a/templates/dialog-roll-chant.html
+++ b/templates/dialog-roll-chant.html
@@ -6,9 +6,9 @@
      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
      <div class="grid grid-2col">
        <label>Caractéristique: </label><label class="flex-grow">{{selectedCarac.label}}</label>
-        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.data.niveau decimals=0 sign=true}}</label></label>
+        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label></label>
      </div>
-      {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.system}}
    </div>
    <div class="flex-group-left">
      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
--- a/templates/dialog-roll-competence.html
+++ b/templates/dialog-roll-competence.html
@@ -43,9 +43,9 @@
      {{#if arme}}
        {{#unless attackerRoll}}
        <div class="flexrow">
-          {{#if (eq arme.data.mortalite 'non-mortel')}}
+          {{#if (eq arme.system.mortalite 'non-mortel')}}
          <label>D&eacute;gats:</label><label class="dmg-arme-actor"></label>
-          {{else if (eq arme.data.mortalite 'empoignade')}}
+          {{else if (eq arme.system.mortalite 'empoignade')}}
          <label>D&eacute;gats:</label><label>Empoignade</label>
          {{else}}
          <label>D&eacute;gats:</label>
--- a/templates/dialog-roll-danse.html
+++ b/templates/dialog-roll-danse.html
@@ -6,9 +6,9 @@
      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
      <div class="grid grid-2col">
        <label for="carac">Caractéristique:</label>{{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}}
-        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.data.niveau decimals=0 sign=true}}</label></label>
+        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label></label>
      </div>
-      {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.system}}
    </div>
    <div class="flex-group-left">
      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
--- a/templates/dialog-roll-maitrise-tmr.html
+++ b/templates/dialog-roll-maitrise-tmr.html
@@ -10,7 +10,7 @@
      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
      <div class="grid grid-2col">
        <label for="carac">Rêve actuel:</label><label class="flex-grow" name="carac">{{selectedCarac.value}}</label>
-        <label for="draconic">{{competence.name}}:</label><label class="flex-grow" name="draconic">{{numberFormat competence.data.niveau decimals=0 sign=true}}</label>
+        <label for="draconic">{{competence.name}}:</label><label class="flex-grow" name="draconic">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label>
      </div>
    </div>
    <div class="flex-group-left">
--- a/templates/dialog-roll-recettecuisine.html
+++ b/templates/dialog-roll-recettecuisine.html
@@ -9,10 +9,10 @@
          <label>Caractéristique: </label><label>{{selectedCarac.label}}</label>
        </div>
        <div class="flexrow">
-          <label>{{competence.name}}: </label><label>{{numberFormat competence.data.niveau decimals=0 sign=true}}</label></label>
+          <label>{{competence.name}}: </label><label>{{numberFormat competence.system.niveau decimals=0 sign=true}}</label></label>
        </div>
        <div class="flexrow">
-          <label>Exotisme: </label><label>{{oeuvre.data.exotisme}}</label>
+          <label>Exotisme: </label><label>{{oeuvre.system.exotisme}}</label>
        </div>
        <div class="flexrow">
          <label for="proportions">Proportions: </label>
--- a/templates/dialog-roll-reve-de-dragon.html
+++ b/templates/dialog-roll-reve-de-dragon.html
@@ -5,7 +5,7 @@
      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
      <div class="grid grid-2col">
        <label for="carac">Rêve actuel:</label><label class="flex-grow" name="carac">{{selectedCarac.value}}</label>
-        <label for="competence">{{competence.name}}:</label><label class="flex-grow" name="competence">{{numberFormat competence.data.niveau decimals=0 sign=true}}</label>
+        <label for="competence">{{competence.name}}:</label><label class="flex-grow" name="competence">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label>
      </div>
    </div>
    <div class="flex-group-left">
--- a/templates/dialog-roll-signedraconique.html
+++ b/templates/dialog-roll-signedraconique.html
@@ -24,7 +24,7 @@
        <select name="competence" class="roll-draconic" data-dtype="String">
          {{#select draconic}}
          {{#each draconicList as |draconic key|}}
-          <option value={{key}}>{{draconic.name}} : {{numberFormat draconic.data.niveau decimals=0 sign=true}}
+          <option value={{key}}>{{draconic.name}} : {{numberFormat draconic.system.niveau decimals=0 sign=true}}
          </option>
          {{/each}}
          {{/select}}
--- a/templates/dialog-roll-sort.html
+++ b/templates/dialog-roll-sort.html
@@ -1,10 +1,10 @@
 <form class="dialog-roll-sort">
-  <h2>Lancer le <span class="sort-ou-rituel">{{#if sort.data.isrituel}}rituel{{else}}sort{{/if}}</span>:
+  <h2>Lancer le <span class="sort-ou-rituel">{{#if sort.system.isrituel}}rituel{{else}}sort{{/if}}</span>:
    <select name="sort" class="roll-sort flex-grow" data-dtype="String">
      {{#select sort}}
      {{#each sortList as |sort key|}}
-      <option value={{key}}>{{this.name}} - {{#if this.data.caseTMRspeciale}} {{this.data.caseTMRspeciale}}
-        {{else}}{{this.data.caseTMR}}{{/if}} / R{{this.data.difficulte}} r {{sort.data.ptreve}} ({{sort.data.draconic}})
+      <option value={{key}}>{{this.name}} - {{#if this.system.caseTMRspeciale}} {{this.system.caseTMRspeciale}}
+        {{else}}{{this.system.caseTMR}}{{/if}} / R{{this.system.difficulte}} r {{sort.system.ptreve}} ({{sort.system.draconic}})
      </option>
      {{/each}}
      {{/select}}
@@ -28,7 +28,7 @@
          {{/each}}
          {{/select}}
        </select>
-        <label class="div-sort-ptreve-fixe">{{selectedSort.data.ptreve}}</select>
+        <label class="div-sort-ptreve-fixe">{{selectedSort.system.ptreve}}</select>
      </div>
      <div class="flexrow div-sort-non-rituel">
        <label>Mettre en réserve</label>
@@ -41,7 +41,7 @@
        <select name="competence" class="roll-draconic" data-dtype="String">
          {{#select draconic}}
          {{#each draconicList as |draconic key|}}
-          <option value={{key}}>{{draconic.name}} : {{numberFormat draconic.data.niveau decimals=0 sign=true}}
+          <option value={{key}}>{{draconic.name}} : {{numberFormat draconic.system.niveau decimals=0 sign=true}}
          </option>
          {{/each}}
          {{/select}}
@@ -56,7 +56,7 @@
          {{/each}}
          {{/select}}
        </select>
-        <label class="div-sort-difficulte-fixe">{{numberFormat selectedSort.data.difficulte decimals=0 sign=true}}</label>
+        <label class="div-sort-difficulte-fixe">{{numberFormat selectedSort.system.difficulte decimals=0 sign=true}}</label>
      </div>
      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
--- a/templates/hud-actor-attaque.html
+++ b/templates/hud-actor-attaque.html
@@ -2,12 +2,12 @@
  <img class="rdd-hud-togglebutton" src="systems/foundryvtt-reve-de-dragon/icons/heures/hd06.svg" width="36" height="36" title="Attaque"/>
  <div class="rdd-hud-list tokenhudext left">
    {{#each actions as |action key|}}
-    {{#unless action.data.initOnly}}
+    {{#unless action.system.initOnly}}
    <div class="control-icon tokenhudicon rdd-hud-menu rdd-attaque"
        data-combatant-id="{{../combatant.id}}"
        data-action-index="{{action.index}}"
        title="{{action.name}}">
-      <label>{{action.name}}  {{action.data.mainInfo}}</label>
+      <label>{{action.name}}  {{action.system.mainInfo}}</label>
    </div>
    {{/unless}}
    {{/each}}
--- a/templates/hud-actor-init.html
+++ b/templates/hud-actor-init.html
@@ -6,7 +6,7 @@
        data-combatant-id="{{../combatant.id}}"
        data-action-index="{{action.index}}"
        title="{{action.name}}">
-      <label>init: {{action.name}} {{action.data.mainInfo}}</label>
+      <label>init: {{action.name}} {{action.system.mainInfo}}</label>
    </div>
    {{/each}}
    {{#each commandes as |commande key|}}
--- a/templates/item-competence-sheet.html
+++ b/templates/item-competence-sheet.html
@@ -16,7 +16,7 @@
    <section class="sheet-body">
      <div class="form-group">
        <label>Catégorie </label>
-        <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-competence.html"}}
              {{/select}}
@@ -24,16 +24,16 @@
      </div>
      <div class="form-group">
        <label for="niveau">Niveau </label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.niveau" value="{{data.niveau}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="xp">XP </label>
-        <input class="attribute-value sheet-competence-xp" type="text" name="data.xp" value="{{data.xp}}" data-dtype="Number"/>
+        <input class="attribute-value sheet-competence-xp" type="text" name="system.xp" value="{{data.xp}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="base">Niveau de base </label>
        {{#if isGM}}
-        <select name="data.base" id="base" data-dtype="Number">
+        <select name="system.base" id="base" data-dtype="Number">
                {{#select data.base}}
                {{>"systems/foundryvtt-reve-de-dragon/templates/competence-base.html"}}
                {{/select}}
@@ -44,7 +44,7 @@
      </div>
      <div class="form-group">
        <label for="defaut_carac">Caractéristique par défaut </label>
-        <select name="data.defaut_carac" id="defaut_carac" data-dtype="String">
+        <select name="system.defaut_carac" id="defaut_carac" data-dtype="String">
          {{#select data.defaut_carac}}
          {{>"systems/foundryvtt-reve-de-dragon/templates/competence-carac-defaut.html"}}
          {{/select}}
@@ -52,17 +52,17 @@
      </div>
      <div class="form-group">
        <label for="default_diffLibre">Difficulté libre par défaut</label>
-        <input class="attribute-value" type="text" name="data.default_diffLibre" value="{{data.default_diffLibre}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.default_diffLibre" value="{{data.default_diffLibre}}" data-dtype="Number"/>
      </div>
      {{#if (eq data.categorie 'draconic')}}
      <div class="form-group">
        <label for="xp">XP Sort </label>
-        <input class="attribute-value" type="text" name="data.xp_sort" value="{{data.xp_sort}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.xp_sort" value="{{data.xp_sort}}" data-dtype="Number"/>
      </div>
      {{/if}}
      <div class="form-group">
        <label for="niveau_archetype">Niveau d'Archetype</label>
-        <input class="attribute-value" type="text" name="data.niveau_archetype" value="{{data.niveau_archetype}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.niveau_archetype" value="{{data.niveau_archetype}}" data-dtype="Number"/>
      </div>

      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
--- a/templates/item-competencecreature-sheet.html
+++ b/templates/item-competencecreature-sheet.html
@@ -10,31 +10,31 @@
    <section class="sheet-body">
      <div class="form-group">
        <label for="niveau">Niveau </label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.niveau" value="{{data.niveau}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="niveau">Valeur de Caractéristique </label>
-        <input class="attribute-value" type="text" name="data.carac_value" value="{{data.carac_value}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.carac_value" value="{{data.carac_value}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="default_diffLibre">Difficulté libre par défaut</label>
-        <input class="attribute-value" type="text" name="data.default_diffLibre" value="{{data.default_diffLibre}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.default_diffLibre" value="{{data.default_diffLibre}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="xp">Arme ? </label>
-        <input class="attribute-value" type="checkbox" name="data.iscombat"  {{#if data.iscombat}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="system.iscombat"  {{#if data.iscombat}}checked{{/if}}/>
      </div>
      <div class="form-group">
        <label for="xp">Parade ? </label>
-        <input class="attribute-value" type="checkbox" name="data.isparade"  {{#if data.isparade}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="system.isparade"  {{#if data.isparade}}checked{{/if}}/>
      </div>
      <div class="form-group">
        <label for="xp">Possession ? </label>
-        <input class="attribute-value" type="checkbox" name="data.ispossession"  {{#if data.ispossession}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="system.ispossession"  {{#if data.ispossession}}checked{{/if}}/>
      </div>
      <div class="form-group">
        <label>Catégorie parade </label>
-        <select name="data.categorie_parade" id="categorie_parade" data-dtype="String">
+        <select name="system.categorie_parade" id="categorie_parade" data-dtype="String">
          {{#select data.categorie_parade}}
          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html"}}
          {{/select}}
@@ -42,7 +42,7 @@
      </div>
      <div class="form-group">
        <label for="niveau">Dommages (+dom), si applicable </label>
-        <input class="attribute-value" type="text" name="data.dommages" value="{{data.dommages}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.dommages" value="{{data.dommages}}" data-dtype="Number"/>
      </div>

      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
--- a/templates/item-conteneur-sheet.html
+++ b/templates/item-conteneur-sheet.html
@@ -10,19 +10,19 @@
    <section class="sheet-body">
      <div class="form-group">
        <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="xp">Capacite (points d'Encombrement portable)</label>
-        <input class="attribute-value" type="text" name="data.capacite" value="{{data.capacite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.capacite" value="{{data.capacite}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="xp">Qualité</label>
-        <input class="attribute-value" type="text" name="data.qualite" value="{{data.qualite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.qualite" value="{{data.qualite}}" data-dtype="Number"/>
      </div>
      <div class="form-group item-cout">
        <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.cout" value="{{data.cout}}" data-dtype="Number"/>
      </div>
      {{#if isOwned}}
      <div class="flexcol">
--- a/templates/item-danse-sheet.html
+++ b/templates/item-danse-sheet.html
@@ -10,7 +10,7 @@
    <section class="sheet-body">
      <div class="form-group">
        <label class="alchimie-title" for="xp">Type</label>
-        <select name="data.type" data-dtype="String">
+        <select name="system.type" data-dtype="String">
          {{#select data.type}}
          <option value="recreative">Récréative</option>
          <option value="soliste">Soliste</option>
@@ -19,19 +19,19 @@
      </div>
      <div class="form-group">
        <label class="alchimie-title" for="xp">Agilité ?</label>
-        <input class="attribute-value" type="checkbox" name="data.agilite" {{#if data.agilite}}checked{{/if}}/>    
+        <input class="attribute-value" type="checkbox" name="system.agilite" {{#if data.agilite}}checked{{/if}}/>    
      </div>
      <div class="form-group">
          <label class="alchimie-title" for="xp">Apparence ?</label>
-        <input class="attribute-value" type="checkbox" name="data.apparence"  {{#if data.apparence}}checked{{/if}}/>    
+        <input class="attribute-value" type="checkbox" name="system.apparence"  {{#if data.apparence}}checked{{/if}}/>    
      </div>
      <div class="form-group">
        <label class="alchimie-title" for="xp">Niveau</label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.niveau" value="{{data.niveau}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="data.reference" value="{{data.reference}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.reference" value="{{data.reference}}" data-dtype="String"/>
      </div>

      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
--- a/templates/item-gemme-sheet.html
+++ b/templates/item-gemme-sheet.html
@@ -10,7 +10,7 @@
  <section class="sheet-body">
    <div class="form-group">
      <label>Type</label>
-      <select name="data.type" id="type" data-dtype="String">
+      <select name="system.type" id="type" data-dtype="String">
        {{#select data.type}}
        {{{gemmeTypeList}}}
        {{/select}}
@@ -18,35 +18,35 @@
    </div>
    <div class="form-group">
      <label>Taille</label>
-      <input class="attribute-value" type="text" name="data.taille" value="{{data.taille}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="system.taille" value="{{data.taille}}" data-dtype="Number" />
    </div>
    <div class="form-group">
      <label>Pureté</label>
-      <input class="attribute-value" type="text" name="data.purete" value="{{data.purete}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="system.purete" value="{{data.purete}}" data-dtype="Number" />
    </div>
    <div class="form-group">
      <label>Qualité</label>
-      <input class="attribute-value" type="text" name="data.qualite" value="{{data.qualite}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="system.qualite" value="{{data.qualite}}" data-dtype="Number" />
    </div>
    <div class="form-group">
      <label>Encombrement</label>
-      <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="system.encombrement" value="{{data.encombrement}}" data-dtype="Number" />
    </div>
    <div class="form-group">
      <label>Quantité</label>
-      <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="system.quantite" value="{{data.quantite}}" data-dtype="Number" />
    </div>
    <div class="form-group">
      <label>Inertie</label>
-      <input class="attribute-value" type="text" name="data.inertie" value="{{data.inertie}}" data-dtype="Number" disabled/>
+      <input class="attribute-value" type="text" name="system.inertie" value="{{data.inertie}}" data-dtype="Number" disabled/>
    </div>
    <div class="form-group">
      <label>Enchantabilité</label>
-      <input class="attribute-value" type="text" name="data.enchantabilite" value="{{data.enchantabilite}}" data-dtype="Number" disabled/>
+      <input class="attribute-value" type="text" name="system.enchantabilite" value="{{data.enchantabilite}}" data-dtype="Number" disabled/>
    </div>
    <div class="form-group">
      <label>Prix</label>
-      <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number" disabled/>
+      <input class="attribute-value" type="text" name="system.cout" value="{{data.cout}}" data-dtype="Number" disabled/>
    </div>

    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
--- a/templates/item-herbe-sheet.html
+++ b/templates/item-herbe-sheet.html
@@ -16,23 +16,23 @@
    <div class="flexcol">
      <div class="form-group">
        <label>Niveau (si applicable)</label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.niveau" value="{{data.niveau}}" data-dtype="Number" />
      </div>
      <div class="form-group">
        <label>Quantité (Pépins ou Brins)</label>
-        <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.quantite" value="{{data.quantite}}" data-dtype="Number" />
      </div>
      <div class="form-group item-cout">
        <label>Prix (sols)</label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.cout" value="{{data.cout}}" data-dtype="Number" />
      </div>
      <div class="form-group">
        <label>Milieu</label>
-        <input class="attribute-value" type="text" name="data.milieu" value="{{data.milieu}}" data-dtype="String" />
+        <input class="attribute-value" type="text" name="system.milieu" value="{{data.milieu}}" data-dtype="String" />
      </div>
      <div class="form-group">
        <label>Fréquence</label>
-        <select name="data.rarete" class="rarete" data-dtype="String">
+        <select name="system.rarete" class="rarete" data-dtype="String">
          {{#select data.rarete}}
          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}}
          {{/select}}
@@ -40,7 +40,7 @@
      </div>
      <div class="form-group">
        <label>Catégorie</label>
-        <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-ingredient.html"}}
          {{/select}}
--- a/templates/item-ingredient-sheet.html
+++ b/templates/item-ingredient-sheet.html
@@ -11,28 +11,28 @@
    <div class="flexcol">
      <div class="form-group">
        <label>Niveau (si applicable) </label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.niveau" value="{{data.niveau}}" data-dtype="Number" />
      </div>
      <div class="form-group">
        <label>Quantité (Pépins ou Brins)</label>
-        <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.quantite" value="{{data.quantite}}" data-dtype="Number" />
      </div>
      <div class="form-group">
        <label>Encombrement</label>
-        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.encombrement" value="{{data.encombrement}}" data-dtype="Number" />
      </div>
      <div class="form-group item-cout">
        <label>Prix (sols)</label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.cout" value="{{data.cout}}" data-dtype="Number" />
      </div>
    </div>
    <div class="form-group">
      <label>Milieu</label>
-      <input class="attribute-value" type="text" name="data.milieu" value="{{data.milieu}}" data-dtype="String" />
+      <input class="attribute-value" type="text" name="system.milieu" value="{{data.milieu}}" data-dtype="String" />
    </div>
    <div class="form-group">
      <label>Fréquence</label>
-      <select name="data.rarete" class="rarete" data-dtype="String">
+      <select name="system.rarete" class="rarete" data-dtype="String">
        {{#select data.rarete}}
        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}}
        {{/select}}
@@ -40,7 +40,7 @@
    </div>
    <div class="form-group">
      <label>Catégorie</label>
-      <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-ingredient.html"}}
        {{/select}}
--- a/templates/item-jeu-sheet.html
+++ b/templates/item-jeu-sheet.html
@@ -10,7 +10,7 @@
    <section class="sheet-body">
      <div class="form-group">
        <label class="alchimie-title" for="xp">Type</label>
-        <select name="data.type" data-dtype="String">
+        <select name="system.type" data-dtype="String">
          {{#select data.type}}
          <option value="adressehasard">Adresse/Hasard</option>
          <option value="de">Dés</option>
@@ -21,15 +21,15 @@
      </div>
      <div class="form-group">
        <label class="alchimie-title" for="xp">Base</label>
-        <input class="attribute-value" type="text" name="data.base" value="{{data.base}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.base" value="{{data.base}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label class="alchimie-title" for="xp">Caractéristique/Compétence</label>
-        <input class="attribute-value" type="text" name="data.caraccomp" value="{{data.caraccomp}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.caraccomp" value="{{data.caraccomp}}" data-dtype="String"/>
      </div>
      <div class="form-group">
        <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="data.reference" value="{{data.reference}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.reference" value="{{data.reference}}" data-dtype="String"/>
      </div>

      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
--- a/templates/item-livre-sheet.html
+++ b/templates/item-livre-sheet.html
@@ -15,11 +15,11 @@
    <section class="sheet-body">
      <div class="form-group">
        <label for="xp">Auteur</label>
-        <input class="attribute-value" type="text" name="data.auteur" value="{{data.auteur}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.auteur" value="{{data.auteur}}" data-dtype="String"/>
      </div>
      <div class="form-group">
        <label for="xp">Compétence</label>
-        <select name="data.competence" id="competenceselect" data-dtype="String">
+        <select name="system.competence" id="competenceselect" data-dtype="String">
          {{#select data.competence}}
          {{#each competences as |competence key|}}
          <option value="{{competence.name}}">{{competence.name}}</option>
@@ -29,35 +29,35 @@
      </div>
      <div class="form-group">
        <label for="xp">Difficulté</label>
-        <input class="attribute-value" type="number" name="data.difficulte" value="{{data.difficulte}}" data-dtype="Number"/>
+        <input class="attribute-value" type="number" name="system.difficulte" value="{{data.difficulte}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="xp">Points de tâches</label>
-        <input class="attribute-value" type="number" name="data.points_de_tache" value="{{data.points_de_tache}}" data-dtype="Number"/>
+        <input class="attribute-value" type="number" name="system.points_de_tache" value="{{data.points_de_tache}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="xp">Expérience</label>
-        <input class="attribute-value" type="number" name="data.xp" value="{{data.xp}}" data-dtype="Number"/>
+        <input class="attribute-value" type="number" name="system.xp" value="{{data.xp}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="xp">Niveau minimum</label>
-        <input class="attribute-value" type="text" name="data.niveau_minimum" value="{{data.niveau_minimum}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.niveau_minimum" value="{{data.niveau_minimum}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="xp">Niveau maximum</label>
-        <input class="attribute-value" type="text" name="data.niveau_maximum" value="{{data.niveau_maximum}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.niveau_maximum" value="{{data.niveau_maximum}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="number" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+        <input class="attribute-value" type="number" name="system.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label>Quantité </label>
-        <input class="attribute-value" type="number" name="data.quantite" value="{{data.quantite}}" data-dtype="Number" />
+        <input class="attribute-value" type="number" name="system.quantite" value="{{data.quantite}}" data-dtype="Number" />
      </div>
      <div class="form-group item-cout">
        <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="number" name="data.cout" value="{{data.cout}}" data-dtype="Number"/>
+        <input class="attribute-value" type="number" name="system.cout" value="{{data.cout}}" data-dtype="Number"/>
      </div>

      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
--- a/templates/item-maladie-sheet.html
+++ b/templates/item-maladie-sheet.html
@@ -15,28 +15,28 @@
      {{#if (or isGM data.identifie)}}
      <div class="form-group">
        <label for="xp">Identifiée ? </label>
-        <input class="attribute-value" type="checkbox" name="data.identifie"  {{#if data.identifie}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="system.identifie"  {{#if data.identifie}}checked{{/if}}/>
      </div>
      <div class="form-group">
        <label for="xp">Malignité </label>
-        <input class="attribute-value" type="text" name="data.malignite" value="{{data.malignite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.malignite" value="{{data.malignite}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="xp">Périodicité</label>
-        <input class="attribute-value" type="text" name="data.periodicite" value="{{data.periodicite}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.periodicite" value="{{data.periodicite}}" data-dtype="String"/>
      </div>
      <div class="form-group">
        <label for="xp">Dommages</label>
-        <input class="attribute-value" type="text" name="data.dommages" value="{{data.dommages}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.dommages" value="{{data.dommages}}" data-dtype="String"/>
      </div>
      <div class="form-group">
        <label for="xp">Remedes Connus ? </label>
-        <input class="attribute-value" type="checkbox" name="data.remedesconnus"  {{#if data.remedesconnus}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="system.remedesconnus"  {{#if data.remedesconnus}}checked{{/if}}/>
      </div>
      {{#if (or isGM data.remedesconnus)}}
      <div class="form-group">
        <label for="xp">Remèdes </label>
-        <input class="attribute-value" type="text" name="data.remedes" value="{{data.remedes}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.remedes" value="{{data.remedes}}" data-dtype="String"/>
      </div>
      {{/if}}
      {{/if}}
--- a/templates/item-meditation-sheet.html
+++ b/templates/item-meditation-sheet.html
@@ -10,7 +10,7 @@
    <section class="sheet-body">
      <div class="form-group">
        <label for="xp">Compétence</label>
-        <select name="data.competence" id="competenceselect" data-dtype="String">
+        <select name="system.competence" id="competenceselect" data-dtype="String">
          {{#select data.competence}}
          {{#each competences as |competence key|}}
          <option value="{{competence.name}}">{{competence.name}}</option>
@@ -20,15 +20,15 @@
      </div>
      <div class="form-group">
        <label for="xp">Thème</label>
-        <input class="attribute-value" type="text" name="data.theme" value="{{data.theme}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.theme" value="{{data.theme}}" data-dtype="String"/>
      </div>
      <div class="form-group">
        <label for="xp">Support</label>
-        <input class="attribute-value" type="text" name="data.support" value="{{data.support}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.support" value="{{data.support}}" data-dtype="String"/>
      </div>
      <div class="form-group">
        <label for="xp">Heure</label>
-        <select name="data.heure" id="heure" data-dtype="String">
+        <select name="system.heure" id="heure" data-dtype="String">
          {{#select data.heure}}
          {{>"systems/foundryvtt-reve-de-dragon/templates/heures-select-option.html"}}
          {{/select}}
@@ -36,19 +36,19 @@
      </div>
      <div class="form-group">
        <label for="xp">Purification</label>
-        <input class="attribute-value" type="text" name="data.purification" value="{{data.purification}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.purification" value="{{data.purification}}" data-dtype="String"/>
      </div>
      <div class="form-group">
        <label for="xp">Vêture</label>
-        <input class="attribute-value" type="text" name="data.veture" value="{{data.veture}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.veture" value="{{data.veture}}" data-dtype="String"/>
      </div>
      <div class="form-group">
        <label for="xp">Comportement</label>
-        <input class="attribute-value" type="text" name="data.comportement" value="{{data.comportement}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.comportement" value="{{data.comportement}}" data-dtype="String"/>
      </div>
      <div class="form-group">
        <label for="xp">Case TMR</label>
-        <select name="data.tmr" id="tmr" data-dtype="String">
+        <select name="system.tmr" id="tmr" data-dtype="String">
          {{#select data.tmr}}
          {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}}
          {{/select}}
@@ -57,7 +57,7 @@
      <div class="form-group">
        <label for="xp">Malus</label>
        {{#if isGM}}
-        <select name="data.malus" id="malus" data-dtype="Number">
+        <select name="system.malus" id="malus" data-dtype="Number">
          {{#select data.malus}}
          <option value="0">0</option>
          <option value="-1">-1</option>
--- a/templates/item-poison-sheet.html
+++ b/templates/item-poison-sheet.html
@@ -14,7 +14,7 @@
  <section class="sheet-body">
    <div class="form-group">
      <label for="xp">Actif ? </label>
-      <input class="attribute-value" type="checkbox" name="datsystema.active"  {{#if data.active}}checked{{/if}}/>
+      <input class="attribute-value" type="checkbox" name="system.active"  {{#if data.active}}checked{{/if}}/>
    </div>
    {{#if (or isGM data.identifie)}}
    <div class="form-group">
--- a/templates/item-sort-sheet.html
+++ b/templates/item-sort-sheet.html
@@ -18,7 +18,7 @@
      </div>      
      <div class="form-group">
        <label for="xp">Case TMR </label>
-        <select name="data.caseTMR" id="caseTMR" data-dtype="String">
+        <select name="system.caseTMR" id="caseTMR" data-dtype="String">
          {{#select data.caseTMR}}
          {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}}
          <option value="special">Case spéciale TMR (saisie ci-dessous)</option>
--- a/templates/partial-description-sort.html
+++ b/templates/partial-description-sort.html
@@ -1,10 +1,10 @@
 <div class="flex-group-left details-sort">
-  {{#if sort.data.cible}}<label><strong>Cible</strong>: {{sort.data.cible}}&nbsp;&nbsp;</label>{{/if}}
-  {{#if sort.data.JR}}<label><strong>JR</strong>: {{sort.data.JR}}&nbsp;&nbsp;</label>{{/if}}
-  {{#if sort.data.portee}}<label><strong>Portée</strong>: {{sort.data.portée}}&nbsp;&nbsp;</label>{{/if}}
-  {{#if sort.data.duree}}<label><strong>Durée</strong>: {{sort.data.duree}}&nbsp;&nbsp;</label>{{/if}}
-  {{#if sort.data.coutseuil}}<label><strong>Coût de seuil</strong>: {{sort.data.coutseuil}}</label>{{/if}}
+  {{#if sort.system.cible}}<label><strong>Cible</strong>: {{sort.system.cible}}&nbsp;&nbsp;</label>{{/if}}
+  {{#if sort.system.JR}}<label><strong>JR</strong>: {{sort.system.JR}}&nbsp;&nbsp;</label>{{/if}}
+  {{#if sort.system.portee}}<label><strong>Portée</strong>: {{sort.system.portee}}&nbsp;&nbsp;</label>{{/if}}
+  {{#if sort.system.duree}}<label><strong>Durée</strong>: {{sort.system.duree}}&nbsp;&nbsp;</label>{{/if}}
+  {{#if sort.system.coutseuil}}<label><strong>Coût de seuil</strong>: {{sort.system.coutseuil}}</label>{{/if}}
 </div>
 <div class="details-sort">
-  {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" sort.data}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" sort.system}}
 </div>
Author	SHA1	Message	Date
sladecraven	5cd9fb3a1c	v10 WIP	2022-09-07 09:14:42 +02:00
sladecraven	336767c19e	v10 WIP	2022-09-07 09:01:23 +02:00
uberwald	5a32cf26dc	Merge pull request 'Corrections v10' (#550 ) from VincentVk/foundryvtt-reve-de-dragon:v10 into v10 Reviewed-on: #550	2022-09-07 08:17:41 +02:00
Vincent Vandemeulebrouck	67b0555b11	Corrections v10 Il y en avait partout dans des dialogues, des options, le drag&drop d'acteur sur acteur, l'empilage d'objet...	2022-09-07 00:36:52 +02:00
sladecraven	59613c3bf8	Sync	2022-09-06 23:52:21 +02:00
sladecraven	e257b6fbee	v10 sync	2022-08-31 22:31:27 +02:00