New v10.0.18 release

Reviewed-on: #556

lang/fr.json

@@ -41,7 +41,8 @@
     "TypeOmbre": "Ombre de Thanatos",
     "TypeSouffle": "Souffle de Dragon",
     "TypeTete": "Tête de Dragon",
-    "TypePossession": "Possession"
+    "TypePossession": "Possession",
+    "TypeSortreserve": "Sort en réserve"
   },
   "EFFECT": {
     "StatusStunned": "Sonné",

module/actor-creature-sheet.js

@@ -30,8 +30,8 @@ export class RdDActorCreatureSheet extends RdDActorSheet {
     let formData = await super.getData()
     //console.log("Creature : ", formData, formData.system)
     formData.calc = {
-      caracTotal: RdDCarac.computeTotal(formData.data.carac),
+      caracTotal: RdDCarac.computeTotal(formData.system.carac),
-      resumeBlessures: this.actor.computeResumeBlessure(formData.data.blessures),
+      resumeBlessures: this.actor.computeResumeBlessure(formData.system.blessures),
       encTotal: await this.actor.computeEncombrementTotalEtMalusArmure(),
       surEncombrementMessage: this.actor.getMessageSurEncombrement()
     }

module/actor-entite-sheet.js

@@ -25,23 +25,21 @@ export class RdDActorEntiteSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = this.object;
     let formData = {
       title: this.title,
-      id: objectData.id,
+      id: this.actor.id,
-      type: objectData.type,
+      type: this.actor.type,
-      img: objectData.img,
+      img: this.actor.img,
-      name: objectData.name,
+      name: this.actor.name,
-      //   actor: this.object,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      data: foundry.utils.deepClone(this.actor.system),
+      system: foundry.utils.deepClone(this.actor.system),
-      effects: this.object.effects.map(e => foundry.utils.deepClone(e)),
+      effects: this.actor.effects.map(e => foundry.utils.deepClone(e)),
       //   items: items,
-      limited: this.object.limited,
+      limited: this.actor.limited,
       options: this.options,
-      owner: this.document.isOwner,
+      owner: this.actor.isOwner,
-      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i))),
+      itemsByType: Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i))),
     };
     
     formData.options.isGM = game.user.isGM;
@@ -141,6 +139,6 @@ export class RdDActorEntiteSheet extends ActorSheet {
   /** @override */
   _updateObject(event, formData) {
     // Update the Actor
-    return this.object.update(formData);
+    return this.actor.update(formData);
   }
 }

module/actor-sheet.js

@@ -15,6 +15,7 @@ import { DialogSplitItem } from "./dialog-split-item.js";
 import { ReglesOptionelles } from "./regles-optionelles.js";
 import { DialogRepos } from "./dialog-repos.js";
 import { RdDSheetUtility } from "./rdd-sheet-utility.js";
+import { STATUSES } from "./status-effects.js";
 
 /* -------------------------------------------- */
 export class RdDActorSheet extends ActorSheet {
@@ -36,23 +37,22 @@ export class RdDActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = this.object.system
     this.timerRecherche = undefined;
     
     let formData = {
       title: this.title,
-      id: this.object.id,
+      id: this.actor.id,
-      type: this.object.type,
+      type: this.actor.type,
-      img: this.object.img,
+      img: this.actor.img,
-      name: this.object.name,
+      name: this.actor.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      data: foundry.utils.deepClone(this.actor.system),
+      system: foundry.utils.deepClone(this.actor.system),
-      effects: this.object.effects.map(e => foundry.utils.deepClone(e)),
+      effects: this.actor.effects.map(e => foundry.utils.deepClone(e)),
-      limited: this.object.limited,
+      limited: this.actor.limited,
       options: this.options,
-      owner: this.document.isOwner,
+      owner: this.actor.isOwner,
-      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i))),
+      itemsByType: Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i))),
     }
     RdDUtility.filterItemsPerTypeForSheet(formData)
   
@@ -65,13 +65,13 @@ export class RdDActorSheet extends ActorSheet {
     formData.calc = {
       comptageArchetype: RdDItemCompetence.computeResumeArchetype(formData.competences),
       competenceXPTotal: RdDItemCompetence.computeTotalXP(formData.competences),
-      caracTotal: RdDCarac.computeTotal(formData.data.carac, formData.data.beaute),
+      caracTotal: RdDCarac.computeTotal(formData.system.carac, formData.system.beaute),
       // Mise à jour de l'encombrement total et du prix de l'équipement
       encTotal: await this.actor.computeEncombrementTotalEtMalusArmure(),
       prixTotalEquipement: this.actor.computePrixTotalEquipement(),
       surprise: RdDBonus.find(this.actor.getSurprise(false)).descr,
-      fatigue: RdDUtility.calculFatigueHtml(formData.data.sante.fatigue.value, formData.data.sante.endurance.max),
+      fatigue: RdDUtility.calculFatigueHtml(formData.system.sante.fatigue.value, formData.system.sante.endurance.max),
-      resumeBlessures: this.actor.computeResumeBlessure(formData.data.blessures),
+      resumeBlessures: this.actor.computeResumeBlessure(formData.system.blessures),
       surEncombrementMessage: this.actor.getMessageSurEncombrement()
     };
 
@@ -79,9 +79,9 @@ export class RdDActorSheet extends ActorSheet {
       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);
+      RdDItemCompetence.levelUp(item, formData.system.compteurs.experience.value);
     });
-    Object.values(formData.data.carac).forEach(c => {
+    Object.values(formData.system.carac).forEach(c => {
       RdDCarac.levelUp(c);
     });
 
@@ -89,9 +89,9 @@ export class RdDActorSheet extends ActorSheet {
     // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
     formData.combat = duplicate(formData.armes ?? []);
     RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
-    RdDItemArme.ajoutCorpsACorps(formData.combat, formData.competences, formData.data.carac);
+    RdDItemArme.ajoutCorpsACorps(formData.combat, formData.competences, formData.system.carac);
     formData.esquives = this.actor.getCompetences("Esquive");
-    formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.data.carac);
+    formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.system.carac);
 
     this.armesList = formData.combat;
 
@@ -100,9 +100,8 @@ export class RdDActorSheet extends ActorSheet {
     formData.difficultesLibres = CONFIG.RDD.difficultesLibres;
 
     formData.hautreve = {
-      isDemiReve: this.actor.getEffectByLabel("Demi-rêve"),
+      isDemiReve: this.actor.getEffect(STATUSES.StatusDemiReve),
-      sortsReserve: formData.data.reve.reserve.list,
+      rencontres: duplicate(formData.system.reve.rencontre.list),
-      rencontres: duplicate(formData.data.reve.rencontre.list),
       casesTmr: formData.itemsByType.casetmr,
       cacheTMR: this.actor.isTMRCache()
     }
@@ -181,7 +180,8 @@ export class RdDActorSheet extends ActorSheet {
     });
     html.find('.item-delete').click(async event => {
       const li = RdDSheetUtility.getEventElement(event);
-      RdDUtility.confirmerSuppression(this, li);
+      const item = this.actor.getObjet(li.data("item-id"));
+      RdDUtility.confirmerSuppressionItem(this, item, li);
     });
     html.find('.item-vendre').click(async event => {
       const item = RdDSheetUtility.getItem(event, this.actor);
@@ -198,7 +198,11 @@ export class RdDActorSheet extends ActorSheet {
     });
     html.find('.subacteur-delete').click(async event => {
       const li = RdDSheetUtility.getEventElement(event);
-      RdDUtility.confirmerSuppressionSubacteur(this, li);
+      const actorId = li.data("actor-id");
+      if (actorId) {
+        const subActor = game.actors.get(actorId);
+        RdDUtility.confirmerSuppressionSubacteur(this, subActor, li);
+      }
     });
 
     html.find('.encaisser-direct').click(async event => {
@@ -330,7 +334,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);
@@ -357,11 +361,15 @@ export class RdDActorSheet extends ActorSheet {
       await DialogRepos.create(this.actor);
     });
     html.find('.delete-active-effect').click(async event => {
-      let id = $(event.currentTarget).parents(".active-effect").data('id');
+      if (game.user.isGM) {
-      this.actor.enleverActiveEffectById(id);
+        let effect = $(event.currentTarget).parents(".active-effect").data('effect');
+        this.actor.removeEffect(effect);
+      }
     });
     html.find('.enlever-tous-effets').click(async event => {
-      this.actor.enleverTousLesEffets();
+      if (game.user.isGM) {
+        await this.actor.removeEffects();
+      }
     });
     html.find('.conteneur-name a').click(async event => {
       RdDUtility.toggleAfficheContenu(RdDSheetUtility.getItemId(event));
@@ -381,11 +389,11 @@ export class RdDActorSheet extends ActorSheet {
     if (this.options.editCaracComp) {
       // On carac change
       html.find('.carac-value').change(async event => {
-        let caracName = event.currentTarget.name.replace(".value", "").replace("data.carac.", "");
+        let caracName = event.currentTarget.name.replace(".value", "").replace("system.carac.", "");
         this.actor.updateCarac(caracName, parseInt(event.target.value));
       });
       html.find('input.carac-xp').change(async event => {
-        let caracName = event.currentTarget.name.replace(".xp", "").replace("data.carac.", "");
+        let caracName = event.currentTarget.name.replace(".xp", "").replace("system.carac.", "");
         this.actor.updateCaracXP(caracName, parseInt(event.target.value));
       });
       // On competence change
@@ -451,7 +459,7 @@ export class RdDActorSheet extends ActorSheet {
     // On pts de reve change
     html.find('.pointsreve-value').change(async event => {
       let reveValue = event.currentTarget.value;
-      this.actor.update({ "data.reve.reve.value": reveValue });
+      this.actor.update({ "system.reve.reve.value": reveValue });
     });
 
     // On seuil de reve change
@@ -568,7 +576,7 @@ export class RdDActorSheet extends ActorSheet {
   /** @override */
   _updateObject(event, formData) {
     // Update the Actor
-    return this.object.update(formData);
+    return this.actor.update(formData);
   }
 
   async splitItem(item) {
@@ -579,9 +587,9 @@ export class RdDActorSheet extends ActorSheet {
   async _onSplitItem(item, split) {
     if (split >= 1 && split < item.system.quantite) {
       await item.diminuerQuantite(split);
-      const itemData = duplicate(item.system);
+      const splitItem = duplicate(item);
-      itemData.data.quantite = split;
+      splitItem.system.quantite = split;
-      await this.actor.createEmbeddedDocuments('Item', [itemData])
+      await this.actor.createEmbeddedDocuments('Item', [splitItem])
     }
   }
 

module/actor-vehicule-sheet.js

@@ -27,21 +27,20 @@ export class RdDActorVehiculeSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = this.object
     let formData = {
       title: this.title,
-      id: objectData.id,
+      id: this.actor.id,
-      type: objectData.type,
+      type: this.actor.type,
-      img: objectData.img,
+      img: this.actor.img,
-      name: objectData.name,
+      name: this.actor.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      data: foundry.utils.deepClone(this.object.system),
+      system: foundry.utils.deepClone(this.actor.system),
-      effects: this.object.effects.map(e => foundry.utils.deepClone(e)),
+      effects: this.actor.effects.map(e => foundry.utils.deepClone(e)),
-      limited: this.object.limited,
+      limited: this.actor.limited,
       options: this.options,
-      owner: this.document.isOwner,
+      owner: this.actor.isOwner,
-      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i))),
+      itemsByType: Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i))),
     };
 
     RdDUtility.filterItemsPerTypeForSheet(formData);
@@ -105,7 +104,8 @@ export class RdDActorVehiculeSheet extends ActorSheet {
     // Delete Inventory Item
     html.find('.item-delete').click(async event => {
       const li = RdDSheetUtility.getEventElement(event);
-      RdDUtility.confirmerSuppression(this, li);
+      const item = this.actor.getObjet(li.data("item-id"));
+      RdDUtility.confirmerSuppressionItem(this, item, li);
     });
     html.find('.item-vendre').click(async event => {
       const item = RdDSheetUtility.getItem(event, this.actor);
@@ -160,6 +160,6 @@ export class RdDActorVehiculeSheet extends ActorSheet {
   /** @override */
   _updateObject(event, formData) {
     // Update the Actor
-    return this.object.update(formData);
+    return this.actor.update(formData);
   }
 }

module/actor.js

@@ -17,7 +17,7 @@ import { RdDAudio } from "./rdd-audio.js";
 import { RdDItemCompetence } from "./item-competence.js";
 import { RdDItemArme } from "./item-arme.js";
 import { RdDAlchimie } from "./rdd-alchimie.js";
-import { StatusEffects } from "./status-effects.js";
+import { STATUSES, StatusEffects } from "./status-effects.js";
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
 import { RdDItemSigneDraconique } from "./item-signedraconique.js";
 import { ReglesOptionelles } from "./regles-optionelles.js";
@@ -35,7 +35,16 @@ import { RdDItem } from "./item.js";
 import { RdDPossession } from "./rdd-possession.js";
 import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
 
+const POSSESSION_SANS_DRACONIC = {
+  img: 'systems/foundryvtt-reve-de-dragon/icons/entites/possession.webp',
+  name: 'Sans draconic',
+  system: {
+    niveau: 0,
+    defaut_carac: "reve",
+  }
+};
 
+const PAS_DE_BLESSURE = { "active": false, "psdone": false, "scdone": false, "premiers_soins": 0, "soins_complets": 0, "jours": 0, "loc": "" };
 /* -------------------------------------------- */
 /**
  * Extend the base Actor entity by defining a custom roll data structure which is ideal for the Simple system.
@@ -44,8 +53,6 @@ import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE, SYSTEM_RDD, SYSTEM_
 export class RdDActor extends Actor {
   /* -------------------------------------------- */
   static init() {
-    Hooks.on("deleteActiveEffect", (effect, options, userId) => RdDActor.getParentActor(effect)?.onDeleteActiveEffect(effect, options));
-
     Hooks.on("preUpdateItem", (item, change, options, id) => RdDActor.getParentActor(item)?.onPreUpdateItem(item, change, options, id));
     Hooks.on("createItem", (item, options, id) => RdDActor.getParentActor(item)?.onCreateItem(item, options, id));
     Hooks.on("deleteItem", (item, options, id) => RdDActor.getParentActor(item)?.onDeleteItem(item, options, id));
@@ -63,23 +70,23 @@ export class RdDActor extends Actor {
     }
   }
 
-  static remoteActorCall(data, canExecuteLocally = () => Misc.isUniqueConnectedGM()) {
+  static remoteActorCall(callData, canExecuteLocally = () => Misc.isUniqueConnectedGM()) {
     if (canExecuteLocally()) {
-      RdDActor.onRemoteActorCall(data);
+      RdDActor.onRemoteActorCall(callData);
       return false;
     }
     else {
-      game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_remote_actor_call", data: data });
+      game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_remote_actor_call", data: callData });
       return true;
     }
   }
 
-  static onRemoteActorCall(data) {
+  static onRemoteActorCall(callData) {
-    const actor = game.actors.get(data?.actorId);
+    const actor = game.actors.get(callData?.actorId);
     if (Misc.isOwnerPlayerOrUniqueConnectedGM(actor)) { // Seul le joueur choisi effectue l'appel: le joueur courant si propriétaire de l'actor, ou le MJ sinon
-      const args = data.args;
+      const args = callData.args;
-      console.info(`RdDActor.onRemoteActorCall: pour l'Actor ${data.actorId}, appel de RdDActor.${data.method}(`, ...args, ')');
+      console.info(`RdDActor.onRemoteActorCall: pour l'Actor ${callData.actorId}, appel de RdDActor.${callData.method}(`, ...args, ')');
-      actor[data.method](...args);
+      actor[callData.method](...args);
     }
   }
 
@@ -95,8 +102,8 @@ export class RdDActor extends Actor {
    * This overrided create() function adds initial items
    * Namely: Basic skills, money,
    *
-   * @param {Object} actorData        Barebones actor data which this function adds onto.
+   * @param {Object} actorData Barebones actor template data which this function adds onto.
-   * @param {Object} options     (Unused) Additional options which customize the creation workflow.
+   * @param {Object} options   Additional options which customize the creation workflow.
    *
    */
   static async create(actorData, options) {
@@ -110,7 +117,7 @@ export class RdDActor extends Actor {
     if (actorData.items) {
       let actor = await super.create(actorData, options);
       if (isPersonnage) {
-        await actor.checkMonnaiePresence(actorData.items);
+        await actor.checkMonnaiePresence();
       }
       return actor;
     }
@@ -175,24 +182,23 @@ export class RdDActor extends Actor {
     this.computePrixTotalEquipement();
     this.computeEtatGeneral();
     // Sanity check
-    await this.checkMonnaiePresence(actorData.items);
+    await this.checkMonnaiePresence();
   }
 
   /* -------------------------------------------- */
   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)
     }
   }
 
   /* -------------------------------------------- */
-  async checkMonnaiePresence(items) { // Ajout opportuniste si les pièces n'existent pas.
+  async checkMonnaiePresence() { // Ajout opportuniste si les pièces n'existent pas.
-    if (!items) return; // Sanity check during import
+    if (!this.items) return; // Sanity check during import
-    let manquantes = Monnaie.monnaiesManquantes(items);
+    let manquantes = Monnaie.monnaiesManquantes(this);
-    //console.log("Manque : ", manquantes);
     if (manquantes.length > 0) {
       await this.createEmbeddedDocuments('Item', manquantes, { renderSheet: false });
     }
@@ -313,13 +319,11 @@ export class RdDActor extends Actor {
   }
 
   listItemsData(type) {
-    return this.filterItemsData(it => it.type == type);
+    return this.itemTypes[type];
-  }
-  filterItemsData(filter) {
-    return this.items.map(it => it).filter(filter)
   }
+
   filterItems(filter) {
-    return this.items.filter(it => filter(it))
+    return this.items.filter(filter);
   }
 
   getItemOfType(idOrName, type) {
@@ -358,32 +362,26 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   getDraconicList() {
     return this.items.filter(it => it.type == 'competence' && it.system.categorie == 'draconic')
-      .sort(Misc.descending(it => it.system.niveau))
   }
   /* -------------------------------------------- */
   getBestDraconic() {
     const list = this.getDraconicList()
+      .sort(Misc.descending(it => it.system.niveau))
     return duplicate(list[0])
   }
+
   getDraconicOuPossession() {
     const possessions = this.items.filter(it => it.type == 'competencecreature' && it.system.ispossession)
       .sort(Misc.descending(it => it.system.niveau));
     if (possessions.length > 0) {
       return duplicate(possessions[0]);
     }
-    const draconics = this.getDraconicList().filter(it => it.system.niveau >= 0);
+    const draconics = [...this.getDraconicList().filter(it => it.system.niveau >= 0),
-    if (draconics.length > 0) {
+       POSSESSION_SANS_DRACONIC]
+       .sort(Misc.descending(it => it.system.niveau));
     return duplicate(draconics[0]);
   }
-    return {
+
-      img: 'systems/foundryvtt-reve-de-dragon/icons/entites/possession.webp',
-      name: 'Sans draconic',
-      data: {
-        niveau: 0,
-        defaut_carac: "reve",
-      }
-    };
-  }
   getPossession(possessionId) {
     return this.items.find(it => it.type == 'possession' && it.system.possessionid == possessionId);
   }
@@ -397,12 +395,12 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async verifierPotionsEnchantees() {
-    let potionsEnchantees = this.filterItemsData(it => it.type == 'potion' && it.system.categorie.toLowerCase().includes('enchant'));
+    let potionsEnchantees = this.filterItems(it => it.type == 'potion' && it.system.categorie.toLowerCase().includes('enchant'));
     for (let potion of potionsEnchantees) {
       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 = {
@@ -419,23 +417,9 @@ export class RdDActor extends Actor {
     }
   }
 
-  /* -------------------------------------------- */
-  async deleteSortReserve(sortReserve) {
-    let reserve = duplicate(this.system.reve.reserve);
-    let tmr = TMRUtility.getTMR(sortReserve.coord);
-    let index = reserve.list.findIndex(tmr.type == 'fleuve'
-      ? sort => (TMRUtility.getTMR(sort.coord).type == 'fleuve' && sort.sort.name == sortReserve.sort.name)
-      : sort => (sort.coord == sortReserve.coord && sort.sort.name == sortReserve.sort.name)
-    );
-    if (index >= 0) {
-      reserve.list.splice(index, 1);
-      await this.update({ "system.reve.reserve": reserve });
-    }
-  }
-
   /* -------------------------------------------- */
   getSurprise(isCombat = undefined) {
-    let niveauSurprise = this.getActiveEffects()
+    let niveauSurprise = this.getEffects()
       .map(effect => StatusEffects.valeurSurprise(effect, isCombat))
       .reduce(Misc.sum(), 0);
     if (niveauSurprise > 1) {
@@ -562,7 +546,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   _supprimerBlessure(blessure) {
-    mergeObject(blessure, { "active": false, "psdone": false, "scdone": false, "premiers_soins": 0, "soins_complets": 0, "jours": 0, "loc": "" });
+    mergeObject(blessure, PAS_DE_BLESSURE);
   }
 
   /* -------------------------------------------- */
@@ -605,39 +589,30 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async remiseANeuf() {
-    let message = {
-      whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
-      content: "Remise à neuf de " + this.name
-    };
     if (this.isEntite([ENTITE_NONINCARNE])) {
       return;
     }
-    if (this.isEntite([ENTITE_INCARNE, ENTITE_BLURETTE])) {
+    ChatMessage.create({
-      await this.santeIncDec("endurance", this.system.sante.endurance.max - this.system.sante.endurance.value);
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
-    }
+      content: 'Remise à neuf de ' + this.name
-    else {
+    });
-
+    const updates = {
+      'system.sante.endurance.value' : this.system.sante.endurance.max
+    };
+    if (!this.isEntite([ENTITE_INCARNE, ENTITE_BLURETTE])) {
       if (this.system.blessures) {
-        const blessures = duplicate(this.system.blessures);
+        updates['system.blessures.legeres.liste'] = [PAS_DE_BLESSURE, PAS_DE_BLESSURE, PAS_DE_BLESSURE, PAS_DE_BLESSURE, PAS_DE_BLESSURE];
-        for (let listeBlessures of [blessures.legeres.liste, blessures.graves.liste, blessures.critiques.liste]) {
+        updates['system.blessures.graves.liste'] =  [PAS_DE_BLESSURE, PAS_DE_BLESSURE];
-          for (let blessure of listeBlessures) {
+        updates['system.blessures.critiques.liste'] = [PAS_DE_BLESSURE];
-            this._supprimerBlessure(blessure);
-          }
-        }
-        await this.update({ "system.blessures": blessures });
       }
+      updates['system.sante.vie.value'] = this.system.sante.vie.max;
+      updates['system.sante.fatigue.value'] = 0;
       if (this.isPersonnage()) {
-        await this.setEthylisme(1);
+        updates['system.compteurs.ethylisme'] = { value:1, nb_doses: 0, jet_moral: false};
-      }
-
-      await this.santeIncDec("vie", this.system.sante.vie.max - this.system.sante.vie.value);
-      await this.santeIncDec("endurance", this.system.sante.endurance.max - this.system.sante.endurance.value);
-      if (ReglesOptionelles.isUsing("appliquer-fatigue") && this.system.sante.fatigue) {
-        await this.update({ "system.sante.fatigue.value": 0 });
       }
     }
-    ChatMessage.create(message);
+    await this.update(updates);
-    this.sheet.render(true);
+    await this.removeEffects(e => e.flags.core.statusId !== STATUSES.StatusDemiReve);
   }
 
   /* -------------------------------------------- */
@@ -849,10 +824,13 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  async sortMisEnReserve(rollData, sort) {
+  async sortMisEnReserve(sort, draconic, coord, ptreve) {
-    let reserve = duplicate(this.system.reve.reserve.list);
+    await this.createEmbeddedDocuments("Item", [{
-    reserve.push({ coord: rollData.tmr.coord, sort: sort, draconic: duplicate(rollData.competence) });
+        type: 'sortreserve',
-    await this.update({ "system.reve.reserve.list": reserve });
+        name: sort.name,
+        img: sort.img,
+        system: { sortid: sort.id, draconic: (draconic ?? sort.system.draconic), ptreve: ptreve, coord: coord, heurecible: 'Vaisseau' } }],
+        { renderSheet: false});
     this.currentTMR.updateTokens();
   }
 
@@ -882,8 +860,6 @@ export class RdDActor extends Actor {
     if (caracName == 'Taille') {
       return;
     }
-    // if ( isNaN(caracXP)  || typeof(caracXP) != 'number') caracXP = 0;
-    //await this.update({ [`data.carac.${caracName}.xp`]: caracXP });
     this.checkCaracXP(caracName);
   }
 
@@ -931,26 +907,27 @@ export class RdDActor extends Actor {
     if (!competence) {
       return;
     }
+    const stress = this.system.compteurs.experience.value;
     const niveau = Number(competence.system.niveau);
-    const stressTransforme = this.system.compteurs.experience.value;
+    const xpSuivant = RdDItemCompetence.getCompetenceNextXp(niveau);
-    const xpRequis = RdDItemCompetence.getCompetenceNextXp(niveau) - competence.system.xp;
+    const xpRequis = xpSuivant - competence.system.xp;
-    if (stressTransforme <= 0 || niveau >= competence.system.niveau_archetype || xpRequis <= 0) {
+    if (stress <= 0 || niveau >= competence.system.niveau_archetype) {
       ui.notifications.info(`La compétence ne peut pas augmenter!
-          stress disponible: ${stressTransforme}
+          stress disponible: ${stress}
           expérience requise: ${xpRequis}
           niveau : ${niveau}
           archétype : ${competence.system.niveau_archetype}`);
       return;
     }
-    const xpUtilise = Math.min(stressTransforme, xpRequis);
+    const xpUtilise = Math.max(0, Math.min(stress, xpRequis));
-    const gainNiveau = xpUtilise >= xpRequis ? 1 : 0;
+    const gainNiveau = (xpUtilise >= xpRequis || xpRequis <=0) ? 1 : 0;
     const nouveauNiveau = niveau + gainNiveau;
-    const nouveauXp = gainNiveau > 0 ? Math.max(competence.system.xp - xpRequis, 0) : (competence.system.xp + xpUtilise);
+    const nouveauXp = gainNiveau > 0 ? Math.max(competence.system.xp - xpSuivant, 0) : (competence.system.xp + xpUtilise);
     await competence.update({
       "system.xp": nouveauXp,
       "system.niveau": nouveauNiveau,
     });
-    const stressTransformeRestant = Math.max(0, stressTransforme - xpUtilise);
+    const stressTransformeRestant = Math.max(0, stress - xpUtilise);
     await this.update({ "system.compteurs.experience.value": stressTransformeRestant });
     this.updateExperienceLog('Dépense stress', xpUtilise, `Stress en ${competence.name} ${gainNiveau ? "pour passer à " + nouveauNiveau : ""}`);
   }
@@ -1003,7 +980,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 {
@@ -1134,11 +1111,11 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  async deleteAllConteneur(itemId) {
+  async deleteAllConteneur(itemId, options) {
     let list = [];
     list.push({ id: itemId, conteneurId: undefined }); // Init list
     this.buildSubConteneurObjetList(itemId, list);
-    await this.deleteEmbeddedDocuments('Item', list.map(it => it.id));
+    await this.deleteEmbeddedDocuments('Item', list.map(it => it.id), options);
   }
 
   /* -------------------------------------------- */
@@ -1181,7 +1158,7 @@ export class RdDActor extends Actor {
         item.estContenu = undefined;
       }
       if (item.type == 'conteneur' && item.system.contenu.length > 0) {
-        corrections.push({ _id: itemData._id, 'system.contenu': [] });
+        corrections.push({ _id: item.id, 'system.contenu': [] });
       }
     }
     if (corrections.length > 0) {
@@ -1352,7 +1329,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async computeMalusArmure() {
-    const newMalusArmure = this.filterItemsData(it => it.type == 'armure' && it.system.equipe)
+    const newMalusArmure = this.filterItems(it => it.type == 'armure' && it.system.equipe)
       .map(it => it.system.malus ?? 0)
       .reduce(Misc.sum(), 0);
     // Mise à jour éventuelle du malus armure
@@ -1364,7 +1341,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   computePrixTotalEquipement() {
-    this.prixTotalEquipement = this.filterItemsData(it => it.system.prixTotal)
+    this.prixTotalEquipement = this.filterItems(it => it.system.prixTotal)
       .map(it => it.system.prixTotal ?? 0)
       .reduce(Misc.sum(), 0);
     // Mise à jour valeur totale de l'équipement
@@ -1374,6 +1351,9 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   computeResumeBlessure(blessures = undefined) {
     blessures = blessures ?? this.system.blessures;
+    if (!blessures) {
+      return "Pas de blessures possibles";
+    }
     let nbLegeres = this.countBlessures(blessures.legeres.liste);
     let nbGraves = this.countBlessures(blessures.graves.liste);
     let nbCritiques = this.countBlessures(blessures.critiques.liste);
@@ -1393,11 +1373,11 @@ export class RdDActor extends Actor {
           resume += ",";
         resume += " une CRITIQUE !";
       }
+      return resume;
     }
     else {
-      resume = "Aucune blessure";
+      return "Aucune blessure";
     }
-    return resume;
   }
 
   /* -------------------------------------------- */
@@ -1423,6 +1403,15 @@ export class RdDActor extends Actor {
     }
   }
 
+  /* -------------------------------------------- */
+  async actionRefoulement(item) {
+    const refoulement = item?.system.refoulement ?? 0;
+    if (refoulement>0){
+      await this.ajouterRefoulement(refoulement);
+      await item.delete();
+    }
+  }
+
   /* -------------------------------------------- */
   async ajouterRefoulement(value = 1) {
     let refoulement = this.system.reve.refoulement.value + value;
@@ -1515,7 +1504,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   buildTMRInnaccessible() {
-    const tmrInnaccessibles = this.filterItemsData(it => Draconique.isCaseTMR(it) &&
+    const tmrInnaccessibles = this.filterItems(it => Draconique.isCaseTMR(it) &&
       EffetsDraconiques.isInnaccessible(it));
     return tmrInnaccessibles.map(it => it.system.coord);
   }
@@ -1588,12 +1577,12 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   getSonne() {
-    return this.getEffectByLabel("EFFECT.StatusStunned");
+    return this.getEffect(STATUSES.StatusStunned);
   }
 
   /* -------------------------------------------- */
   async finDeRound(options = { terminer: false }) {
-    for (let effect of this.getActiveEffects()) {
+    for (let effect of this.getEffects()) {
       if (effect.duration.type !== 'none' && (effect.duration.remaining <= 0 || options.terminer)) {
         if (effect.system.origin) {
           await effect.update({ 'disabled': true });
@@ -1622,7 +1611,7 @@ export class RdDActor extends Actor {
       ui.notifications.info("Le personnage est hors combat, il ne reste donc pas sonné");
       return;
     }
-    await this.setStatusEffect("EFFECT.StatusStunned", sonne);
+    await this.setEffect(STATUSES.StatusStunned, sonne);
   }
 
   /* -------------------------------------------- */
@@ -1648,9 +1637,12 @@ export class RdDActor extends Actor {
   }
 
   countBlessuresNonSoigneeByName(name) {
+    if (this.system.blessures) {
       let blessures = this.system.blessures[name].liste;
       return blessures.filter(b => b.active && !b.psdone).length;
     }
+    return 0;
+  }
 
   /* -------------------------------------------- */
   async testSiSonne(endurance) {
@@ -1766,14 +1758,13 @@ export class RdDActor extends Actor {
       }
     }
     compteur.value = result.newValue;
-    //console.log(name, inc, data.value, result.newValue, minValue, data.max);
     // If endurance lost, then the same amount of fatigue cannot be recovered
     if (ReglesOptionelles.isUsing("appliquer-fatigue") && sante.fatigue && fatigue > 0) {
       sante.fatigue.value = Math.max(sante.fatigue.value + fatigue, this._computeFatigueMin());
     }
     await this.update({ "system.sante": sante })
     if (this.isDead()) {
-      await this.setStatusEffect("EFFECT.StatusComma", true);
+      await this.setEffect(STATUSES.StatusComma, true);
     }
     return result;
   }
@@ -1921,6 +1912,7 @@ export class RdDActor extends Actor {
         }
         return;
       }
+      case 'queue': case 'ombre': return await this.actionRefoulement(item);
     }
   }
 
@@ -1948,15 +1940,16 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async consommerNourritureboisson(item, choix = { doses: 1, seForcer: false, supprimerSiZero: false }) {
-    if (itemData.type != 'nourritureboisson') {
+
+    if (item.type != 'nourritureboisson') {
       return;
     }
-    if (choix.doses > itemData.system.quantite) {
+    if (choix.doses > item.system.quantite) {
-      ui.notifications.warn(`Il n'y a pas assez de ${itemData.name} pour manger ${choix.doses}`)
+      ui.notifications.warn(`Il n'y a pas assez de ${item.name} pour manger ${choix.doses}`)
       return;
     }
-    if (!this._apprecierCuisine(itemData, choix.seForcer)) {
+    if (!this._apprecierCuisine(item, choix.seForcer)) {
-      ui.notifications.info(`${this.name} ne n'arrive pas à manger de ${itemData.name}`)
+      ui.notifications.info(`${this.name} ne n'arrive pas à manger de ${item.name}`)
       return;
     }
     await this.manger(item, choix.doses, { diminuerQuantite: false });
@@ -1964,10 +1957,10 @@ export class RdDActor extends Actor {
     await item.diminuerQuantite(choix.doses, choix);
   }
 
-  async _apprecierCuisine(itemData, seForcer) {
+  async _apprecierCuisine(item, seForcer) {
-    const surmonteExotisme = await this._surmonterExotisme(itemData, seForcer);
+    const surmonteExotisme = await this._surmonterExotisme(item, seForcer);
     if (surmonteExotisme) {
-      await this.apprecier('gout', 'cuisine', itemData.system.qualite, itemData.system.boisson ? "apprécie la boisson" : "apprécie le plat");
+      await this.apprecier('gout', 'cuisine', item.system.qualite, item.system.boisson ? "apprécie la boisson" : "apprécie le plat");
     }
     else if (seForcer) {
       await this.jetDeMoral('malheureux');
@@ -1979,10 +1972,10 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  async _surmonterExotisme(itemData) {
+  async _surmonterExotisme(item) {
-    const exotisme = Math.min(itemData.system.exotisme, itemData.system.qualite, 0);
+    const exotisme = Math.min(item.system.exotisme, item.system.qualite, 0);
     if (exotisme < 0) {
-      const rolled = await this.rollCaracCompetence('volonte', 'cuisine', exotisme, { title: `tente de surmonter l'exotisme de ${itemData.name}` });
+      const rolled = await this.rollCaracCompetence('volonte', 'cuisine', exotisme, { title: `tente de surmonter l'exotisme de ${item.name}` });
       return rolled.isSuccess;
     }
     return true;
@@ -2007,14 +2000,13 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async boire(item, doses, options = { diminuerQuantite: true }) {
-    const itemData = item;
+    const desaltere = item.system.desaltere;
-    const desaltere = itemData.system.desaltere;
     if (desaltere > 0) {
       await this.updateCompteurValue('eau', Misc.keepDecimals(this.system.compteurs.eau.value + desaltere * doses, 1));
     }
     if (item.isAlcool()) {
       for (let i = 0; i < doses; i++) {
-        await this.saouler(itemData.system.force, item);
+        await this.saouler(item.system.force, item);
       }
     }
     await item.diminuerQuantite(doses, options);
@@ -2268,7 +2260,6 @@ export class RdDActor extends Actor {
     let tmr = TMRUtility.getTMR(coord);
     let letfilteredList = []
     for (let sort of sortList) {
-      //console.log(sort.name, sort.data.caseTMR.toLowerCase(), sort.data.caseTMRspeciale.toLowerCase(), coord.toLowerCase() );
       if (sort.system.caseTMR.toLowerCase().includes('variable')) {
         letfilteredList.push(sort);
       } else if (sort.system.caseTMRspeciale.toLowerCase().includes('variable')) {
@@ -2433,7 +2424,7 @@ export class RdDActor extends Actor {
         RdDItemSort.incrementBonusCase(this, selectedSort, rollData.tmr.coord);
 
         if (rollData.isSortReserve) {
-          await this.sortMisEnReserve(rollData, selectedSort);
+          await this.sortMisEnReserve(selectedSort, rollData.competence, rollData.tmr.coord, Number(selectedSort.system.ptreve_reel));
         }
       }
       else {
@@ -2445,6 +2436,7 @@ export class RdDActor extends Actor {
       if (rolled.isETotal) { // Echec total !
         rollData.depenseReve = Math.min(reveActuel, Math.floor(rollData.depenseReve * 1.5))
         // TODO: mise en réserve d'un échec total...
+        // await dialog mse en réserve, pour traitement échec total
       } else {
         rollData.depenseReve = 0
       }
@@ -2575,8 +2567,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async creerTacheDepuisLivre(item, options = { renderSheet: true }) {
-    const itemData = item
+    const nomTache = "Lire " + item.name;
-    const nomTache = "Lire " + itemData.name;
     const filterTacheLecture = it => it.type == 'tache' && it.name == nomTache;
     let tachesExistantes = this.filterItems(filterTacheLecture);
     if (tachesExistantes.length == 0) {
@@ -2585,12 +2576,12 @@ export class RdDActor extends Actor {
         system: {
           carac: 'intellect',
           competence: 'Ecriture',
-          difficulte: itemData.system.difficulte,
+          difficulte: item.system.difficulte,
           periodicite: "60 minutes",
           fatigue: 2,
-          points_de_tache: itemData.system.points_de_tache,
+          points_de_tache: item.system.points_de_tache,
           points_de_tache_courant: 0,
-          description: "Lecture du livre " + item.name + " - XP : " + itemData.system.xp + " - Compétences : " + itemData.system.competence
+          description: "Lecture du livre " + item.name + " - XP : " + item.system.xp + " - Compétences : " + item.system.competence
         }
       }
       await this.createEmbeddedDocuments('Item', [tache], options);
@@ -2841,7 +2832,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 }]);
   }
 
 
@@ -2870,8 +2861,11 @@ export class RdDActor extends Actor {
     if (this.currentTMR) this.currentTMR.minimize(); // Hide
 
     let draconicList = this.getDraconicList()
-      .map(draconic => duplicate(draconic))
+      .map(draconic => {
-      .map(draconic => { draconic.system.defaut_carac = "intellect"; return draconic; });
+        let draconicLecture = duplicate(draconic);
+        draconicLecture.system.defaut_carac = "intellect";
+        return draconicLecture;
+      });
 
     const intellect = this.system.carac.intellect;
     let rollData = {
@@ -2989,7 +2983,7 @@ export class RdDActor extends Actor {
   }
   /* -------------------------------------------- */
   checkDesirLancinant() {
-    let queue = this.filterItemsData(it => it.type == 'queue' || it.type == 'ombre')
+    let queue = this.filterItems(it => it.type == 'queue' || it.type == 'ombre')
       .filter(it => Grammar.toLowerCaseNoAccent(it.name).includes('desir lancinant'));
     return (queue.length > 0);
   }
@@ -3056,23 +3050,23 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  async resetNombreAstral(data) {
+  async resetNombreAstral() {
     let toDelete = this.listItemsData('nombreastral');
     const deletions = toDelete.map(it => it._id);
     await this.deleteEmbeddedDocuments("Item", deletions);
   }
 
   /* -------------------------------------------- */
-  async ajouteNombreAstral(data) {
+  async ajouteNombreAstral(callData) {
     // Gestion expérience (si existante)
-    data.competence = this.getCompetence("astrologie")
+    callData.competence = this.getCompetence("astrologie")
-    data.selectedCarac = this.system.carac["vue"];
+    callData.selectedCarac = this.system.carac["vue"];
-    this.appliquerAjoutExperience(data, 'hide');
+    this.appliquerAjoutExperience(callData, 'hide');
 
     // Ajout du nombre astral
     const item = {
-      name: "Nombre Astral", type: "nombreastral", data:
+      name: "Nombre Astral", type: "nombreastral", system:
-        { value: data.nbAstral, istrue: data.isvalid, jourindex: Number(data.date), jourlabel: game.system.rdd.calendrier.getDateFromIndex(Number(data.date)) }
+        { value: callData.nbAstral, istrue: callData.isvalid, jourindex: Number(callData.date), jourlabel: game.system.rdd.calendrier.getDateFromIndex(Number(callData.date)) }
     };
     await this.createEmbeddedDocuments("Item", [item]);
 
@@ -3154,8 +3148,7 @@ export class RdDActor extends Actor {
       ui.notifications.warn("Vous êtes déja dans les TMR....");
       return
     }
-    let demiReve = this.getActiveEffects(it => it.label == "Demi-rêve");
+    if (mode != 'visu' &&  this.getEffect(STATUSES.StatusDemiReve)) {
-    if (mode != 'visu' && demiReve.length > 0) {
       ui.notifications.warn("Le joueur ou le MJ est déja dans les Terres Médianes avec ce personnage ! Visualisation uniquement");
       mode = "visu"; // bascule le mode en visu automatiquement
     }
@@ -3170,7 +3163,7 @@ export class RdDActor extends Actor {
         });
         return;
       }
-      await this.setStatusEffect("EFFECT.StatusDemiReve", true);
+      await this.setEffect(STATUSES.StatusDemiReve, true);
     }
 
     const fatigue = this.system.sante.fatigue.value;
@@ -3218,15 +3211,15 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   getArmeParade(armeParadeId) {
     const item = armeParadeId ? this.getEmbeddedDocument('Item', armeParadeId) : undefined;
-    return RdDItemArme.getArmeData(item);
+    return RdDItemArme.getArme(item);
   }
 
   /* -------------------------------------------- */
-  verifierForceMin(itemData) {
+  verifierForceMin(item) {
-    if (itemData.type == 'arme' && itemData.system.force > this.system.carac.force.value) {
+    if (item.type == 'arme' && item.system.force > this.system.carac.force.value) {
       ChatMessage.create({
-        content: `<strong>${this.name} s'est équipé(e) de l'arme ${itemData.name}, mais n'a pas une force suffisante pour l'utiliser normalement </strong>
+        content: `<strong>${this.name} s'est équipé(e) de l'arme ${item.name}, mais n'a pas une force suffisante pour l'utiliser normalement </strong>
-                             (${itemData.system.force} nécessaire pour une Force de ${this.system.carac.force.value})`
+                  (${item.system.force} nécessaire pour une Force de ${this.system.carac.force.value})`
       });
     }
   }
@@ -3251,10 +3244,10 @@ export class RdDActor extends Actor {
     let armeData = attackerRoll.arme;
     let protection = 0;
     const armures = this.items.filter(it => it.type == "armure" && it.system.equipe);
-    for (const itemData of armures) {
+    for (const armure of armures) {
-      protection += await RdDDice.rollTotal(itemData.system.protection.toString());
+      protection += await RdDDice.rollTotal(armure.system.protection.toString());
       if (dmg > 0) {
-        this._deteriorerArmure(itemData, dmg);
+        this._deteriorerArmure(armure, dmg);
         dmg = 0;
       }
     }
@@ -3273,39 +3266,39 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  _deteriorerArmure(item, dmg) {
+  _deteriorerArmure(armure, dmg) {
-    let itemData = duplicate(item);
+    armure = duplicate(armure);
-    if (!ReglesOptionelles.isUsing('deteriorationArmure') || itemData.system.protection == '0') {
+    if (!ReglesOptionelles.isUsing('deteriorationArmure') || armure.system.protection == '0') {
       return;
     }
-    itemData.system.deterioration = (itemData.system.deterioration ?? 0) + dmg;
+    armure.system.deterioration = (armure.system.deterioration ?? 0) + dmg;
-    if (itemData.system.deterioration >= 10) {
+    if (armure.system.deterioration >= 10) {
-      itemData.system.deterioration -= 10;
+      armure.system.deterioration -= 10;
-      let res = /(\d+)?d(\d+)(\-\d+)?/.exec(itemData.system.protection);
+      let res = /(\d+)?d(\d+)(\-\d+)?/.exec(armure.system.protection);
       if (res) {
         let malus = Misc.toInt(res[3]) - 1;
         let armure = Misc.toInt(res[2]);
         if (armure + malus <= 0) {
-          itemData.system.protection = 0;
+          armure.system.protection = 0;
         } else {
-          itemData.system.protection = '' + (res[1] ?? '1') + 'd' + armure + malus;
+          armure.system.protection = '' + (res[1] ?? '1') + 'd' + armure + malus;
         }
       }
-      else if (/\d+/.exec(itemData.system.protection)) {
+      else if (/\d+/.exec(armure.system.protection)) {
-        itemData.system.protection = "1d" + itemData.system.protection;
+        armure.system.protection = "1d" + armure.system.protection;
       }
       else {
-        ui.notifications.warn(`La valeur d'armure de votre ${item.name} est incorrecte`);
+        ui.notifications.warn(`La valeur d'armure de votre ${armure.name} est incorrecte`);
       }
-      ChatMessage.create({ content: "Votre armure s'est détériorée, elle protège maintenant de " + itemData.system.protection });
+      ChatMessage.create({ content: "Votre armure s'est détériorée, elle protège maintenant de " + armure.system.protection });
     }
-    this.updateEmbeddedDocuments('Item', [itemData]);
+    this.updateEmbeddedDocuments('Item', [armure]);
   }
 
   /* -------------------------------------------- */
   async encaisser() {
-    let data = { ajustementsEncaissement: RdDUtility.getAjustementsEncaissement() };
+    let dialogData = { ajustementsEncaissement: RdDUtility.getAjustementsEncaissement() };
-    let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-roll-encaisser.html', data);
+    let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-roll-encaisser.html', dialogData);
     new RdDEncaisser(html, this).render(true);
   }
 
@@ -3460,7 +3453,7 @@ export class RdDActor extends Actor {
         count--;
       } else {
         // TODO: status effect dead
-        this.setStatusEffect("EFFECT.StatusComma", true);
+        this.setEffect(STATUSES.StatusComma, true);
         ChatMessage.create({
           content: `<img class="chat-icon" src="icons/svg/skull.svg" alt="charge" />
           <strong>${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !</strong>`
@@ -3486,8 +3479,8 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   /** @override */
   getRollData() {
-    const data = super.getRollData();
+    const rollData = super.getRollData();
-    return data;
+    return rollData;
   }
 
   /* -------------------------------------------- */
@@ -3550,7 +3543,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   isEntite(typeentite = []) {
-    return this.type == 'entite' && (typeentite.length == 0 || typeentite.includes(this.system.typeentite));
+    return this.type == 'entite' && (typeentite.length == 0 || typeentite.includes(this.system.definition.typeentite));
   }
 
   /* -------------------------------------------- */
@@ -3578,20 +3571,19 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   getFortune() {
-    let monnaies = Monnaie.filtrerMonnaies(this.items);
+    let monnaies = this.itemTypes['monnaie'];
     if (monnaies.length < 4) {
       ui.notifications.error("Problème de monnaies manquantes, impossible de payer correctement!")
       throw "Problème de monnaies manquantes, impossible de payer correctement!";
     }
-    return monnaies.map(m => this.system)
+    return monnaies.map(m => Number(m.system.valeur_deniers) * Number(m.system.quantite))
-      .map(tpl => tpl.valeur_deniers * Number(tpl.quantite))
       .reduce(Misc.sum(), 0);
   }
 
   /* -------------------------------------------- */
   async optimizeArgent(fortuneTotale) {
-    let monnaies = Monnaie.filtrerMonnaies(this.items);
+    let monnaies =  this.itemTypes['monnaie'];
-    let parValeur = Misc.classifyFirst(monnaies, it => this.system.valeur_deniers);
+    let parValeur = Misc.classifyFirst(monnaies, it => it.system.valeur_deniers);
     let nouvelleFortune = {
       1000: Math.floor(fortuneTotale / 1000), // or
       100: Math.floor(fortuneTotale / 100) % 10, // argent
@@ -3716,7 +3708,7 @@ export class RdDActor extends Actor {
     const buttonAcheter = html.find(".button-acheter")[0];
     const vente = DialogItemAchat.prepareVenteData(buttonAcheter, achat.vendeurId, vendeur, acheteur);
     const itemId = vente.item._id;
-    const isItemEmpilable = "quantite" in vente.item.data;
+    const isItemEmpilable = "quantite" in vente.item.system;
 
     const coutDeniers = Math.floor((achat.prixTotal ?? 0) * 100);
     achat.quantiteTotal = (achat.choix.nombreLots ?? 1) * (vente.tailleLot);
@@ -3748,7 +3740,7 @@ export class RdDActor extends Actor {
         type: vente.item.type,
         img: vente.item.img,
         name: vente.item.name,
-        data: mergeObject(vente.item.system, { quantite: isItemEmpilable ? achat.quantiteTotal : undefined }),
+        system: mergeObject(vente.item.system, { quantite: isItemEmpilable ? achat.quantiteTotal : undefined }),
       }
       let listeAchat = isItemEmpilable ? [achatData] : Array.from({ length: achat.quantiteTotal }, (_, i) => achatData)
       let items = await acheteur.createEmbeddedDocuments("Item", listeAchat)
@@ -3913,9 +3905,9 @@ export class RdDActor extends Actor {
     let newVehicules = this.system.subacteurs.vehicules.filter(function (obj, index, arr) { return obj.id != actorId });
     let newSuivants = this.system.subacteurs.suivants.filter(function (obj, index, arr) { return obj.id != actorId });
     let newMontures = this.system.subacteurs.montures.filter(function (obj, index, arr) { return obj.id != actorId });
-    await this.update({ 'system.subacteurs.vehicules': newVehicules });
+    await this.update({ 'system.subacteurs.vehicules': newVehicules }, { renderSheet: false });
-    await this.update({ 'system.subacteurs.suivants': newSuivants });
+    await this.update({ 'system.subacteurs.suivants': newSuivants }, { renderSheet: false });
-    await this.update({ 'system.subacteurs.montures': newMontures });
+    await this.update({ 'system.subacteurs.montures': newMontures }, { renderSheet: false });
   }
 
   /* -------------------------------------------- */
@@ -4096,61 +4088,47 @@ export class RdDActor extends Actor {
   async onUpdateActor(update, options, actorId) {
     const updatedEndurance = update?.system?.sante?.endurance
     if (updatedEndurance && options.diff) {
-      await this.setStatusEffect("EFFECT.StatusUnconscious", updatedEndurance.value == 0)
+      await this.setEffect(STATUSES.StatusUnconscious, updatedEndurance.value == 0)
     }
   }
 
   /* -------------------------------------------- */
-  async onDeleteActiveEffect(effect, options) {
+  getEffects(filter = e => true) {
-    switch (effect.label) {
+    return this.getEmbeddedCollection("ActiveEffect").filter(filter);
-      case 'EFFECT.StatusStunned':
-        return;
-    }
   }
 
   /* -------------------------------------------- */
-  getActiveEffects(matching = it => true) {
+  getEffect(statusId) {
-    return Array.from(this.getEmbeddedCollection("ActiveEffect").values()).filter(it => matching(it));
+    return this.getEmbeddedCollection("ActiveEffect").find(it => it.flags?.core?.statusId == statusId);
   }
 
   /* -------------------------------------------- */
-  getEffectByLabel(label) {
+  async setEffect(statusId, status) {
-    return this.getActiveEffects().find(it => it.system?.label == label);
-  }
-
-  /* -------------------------------------------- */
-  getEffectById(id) {
-    return this.getActiveEffects().find(it => it.id == id);
-  }
-
-  /* -------------------------------------------- */
-  async setStatusEffect(label, status, updates = {}) {
     if (this.isEntite() || this.type == 'vehicule') {
       return;
     }
-    console.log("setStatusEffect", label, status, updates)
+    console.log("setEffect", statusId, status)
-    const existing = this.getEffectByLabel(label);
+    const effect = this.getEffect(statusId);
-    if (existing) {
+    if (!status && effect){
-      existing.delete();
+      await this.deleteEmbeddedDocuments('ActiveEffect', [effect.id]);
     }
-    if (status) {
+    if (status && !effect ) {
-      const statusEffect = mergeObject(duplicate(StatusEffects.status(label)), updates);
+      await this.createEmbeddedDocuments("ActiveEffect", [StatusEffects.status(statusId)]);
-      await this.createEmbeddedDocuments("ActiveEffect", [statusEffect]);
     }
   }
 
-  enleverActiveEffectById(id) {
+  async removeEffect(statusId) {
-    if (game.user.isGM) {
+    const effect = this.getEffect(statusId);
-      const existing = this.getEffectById(id);
+    if (effect) {
-      if (existing) {
+      await this.deleteEmbeddedDocuments('ActiveEffect', [effect.id]);
-        existing.delete();
-      }
     }
   }
+
   /* -------------------------------------------- */
-  enleverTousLesEffets() {
+  async removeEffects(filter = e => true) {
     if (game.user.isGM) {
-      this.deleteEmbeddedDocuments('ActiveEffect', this.getActiveEffects().map(it => it.id));
+      const ids = this.getEffects(filter).map(it => it.id);
+      await this.deleteEmbeddedDocuments('ActiveEffect', ids);
     }
   }
 

module/chat-utility.js

@@ -1,7 +1,6 @@
 import { Misc } from "./misc.js";
 import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
 
-export const MESSAGE_DATA = 'message-data';
 
 /**
  * Class providing helper methods to get the list of users, and 
@@ -19,61 +18,50 @@ export class ChatUtility {
   
   /* -------------------------------------------- */
   static notifyUser(userId, level = 'info', message) {
-    const data = {
+    const socketData = {
       userId: userId, level: level, message: message
     };
     if (game.user.id == userId) {
-      ChatUtility.onNotifyUser(data);
+      ChatUtility.onNotifyUser(socketData);
     }
     else {
       game.socket.emit(SYSTEM_SOCKET_ID, {
-        msg: "msg_user_ui_notifications", data: data
+        msg: "msg_user_ui_notifications", data: socketData
       });
     }
   }
 
-  static onNotifyUser(data) {
+  static onNotifyUser(socketData) {
-    if (game.user.id == data.userId) {
+    if (game.user.id == socketData.userId) {
-      switch (data.level) {
+      switch (socketData.level) {
-        case 'warn': ui.notifications.warn(data.message); break;
+        case 'warn': ui.notifications.warn(socketData.message); break;
-        case 'error': ui.notifications.error(data.message); break;
+        case 'error': ui.notifications.error(socketData.message); break;
-        default: ui.notifications.info(data.message); break;
+        default: ui.notifications.info(socketData.message); break;
       }
     }
   }
 
   /* -------------------------------------------- */
-  static onRemoveMessages(data) {
+  static onRemoveMessages(socketData) {
     if (Misc.isUniqueConnectedGM()) {
-      if (data.part) {
+      if (socketData.part) {
-        const toDelete = game.messages.filter(it => it.data.content.includes(data.part));
+        const toDelete = game.messages.filter(it => it.content.includes(socketData.part));
         toDelete.forEach(it => it.delete());
       }
-      if (data.messageId) {
+      if (socketData.messageId) {
-        game.messages.get(data.messageId)?.delete();
+        game.messages.get(socketData.messageId)?.delete();
       }
     }
   }
 
-  static onRemoveMessages(data) {
-    if (Misc.isUniqueConnectedGM()) {
-      if (data.part) {
-        const toDelete = game.messages.filter(it => it.content.includes(data.part));
-        toDelete.forEach(it => it.delete());
-      }
-      if (data.messageId) {
-        game.messages.get(data.messageId)?.delete();
-      }
-    }
-  }
   /* -------------------------------------------- */
 
-  static removeMessages(data) {
+  static removeMessages(socketData) {
     if (Misc.isUniqueConnectedGM()) {
-      ChatUtility.onRemoveMessages(data);
+      ChatUtility.onRemoveMessages(socketData);
     }
     else {
-      game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_delete_chat_message", data: data });
+      game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_delete_chat_message", data: socketData });
     }
   }
 
@@ -154,17 +142,17 @@ export class ChatUtility {
   }
 
   /* -------------------------------------------- */
-  static handleGMChatMessage(data) {
+  static handleGMChatMessage(socketData) {
-    console.log("blindMessageToGM", data);
+    console.log("blindMessageToGM", socketData);
     if (game.user.isGM) { // message privé pour GM only
-      data.user = game.user.id;
+      socketData.user = game.user.id;
-      ChatMessage.create(data);
+      ChatMessage.create(socketData);
     }
   }
 
-  static async setMessageData(chatMessage, key, data) {
+  static async setMessageData(chatMessage, key, flag) {
-    if (data) {
+    if (flag) {
-      await chatMessage.setFlag(SYSTEM_RDD, key, JSON.stringify(data));
+      await chatMessage.setFlag(SYSTEM_RDD, key, JSON.stringify(flag));
     }
   }
 

module/constants.js

@@ -1,5 +1,6 @@
 export const SYSTEM_RDD = 'foundryvtt-reve-de-dragon';
 export const SYSTEM_SOCKET_ID = 'system.foundryvtt-reve-de-dragon';
+export const LOG_HEAD = 'RdD | ';
 
 export const HIDE_DICE = 'hide';
 export const SHOW_DICE = 'show';

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.system.valeur.norm = $("[name='signe.system.valeur.norm']").val();
-    this.dialogData.signe.data.valeur.sign = $("[name='signe.data.valeur.sign']").val();
+    this.dialogData.signe.system.valeur.sign = $("[name='signe.system.valeur.sign']").val();
-    this.dialogData.signe.data.valeur.part = $("[name='signe.data.valeur.part']").val();
+    this.dialogData.signe.system.valeur.part = $("[name='signe.system.valeur.part']").val();
-    this.dialogData.signe.data.difficulte = $("[name='signe.data.difficulte']").val();
+    this.dialogData.signe.system.difficulte = $("[name='signe.system.difficulte']").val();
-    this.dialogData.signe.data.ephemere = $("[name='signe.data.ephemere']").prop("checked");
+    this.dialogData.signe.system.ephemere = $("[name='signe.system.ephemere']").prop("checked");
-    this.dialogData.signe.data.duree = $("[name='signe.data.duree']").val();
+    this.dialogData.signe.system.duree = $("[name='signe.system.duree']").val();
-    this.dialogData.signe.data.typesTMR = $(".select-tmr").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,19 +81,19 @@ 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.system.valeur.norm']").val(newSigne.system.valeur.norm);
-    $("[name='signe.data.valeur.sign']").val(newSigne.data.valeur.sign);
+    $("[name='signe.system.valeur.sign']").val(newSigne.system.valeur.sign);
-    $("[name='signe.data.valeur.part']").val(newSigne.data.valeur.part);
+    $("[name='signe.system.valeur.part']").val(newSigne.system.valeur.part);
-    $("[name='signe.data.difficulte']").val(newSigne.data.difficulte);
+    $("[name='signe.system.difficulte']").val(newSigne.system.difficulte);
-    $("[name='signe.data.duree']").val(newSigne.data.duree);
+    $("[name='signe.system.duree']").val(newSigne.system.duree);
-    $("[name='signe.data.ephemere']").prop("checked", newSigne.data.ephemere);
+    $("[name='signe.system.ephemere']").prop("checked", newSigne.system.ephemere);
-    $(".select-tmr").val(newSigne.data.typesTMR);
+    $(".select-tmr").val(newSigne.system.typesTMR);
-    this.setEphemere(newSigne.data.ephemere);
+    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);
+    HtmlUtility._showControlWhen($(".signe-system-duree"), ephemere);
   }
 
   async onSelectActor(event) {
@@ -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;
+    const oldValeur = this.dialogData.signe.system.valeur;
-    this.dialogData.signe.data.valeur = RdDItemSigneDraconique.calculValeursXpSort(codeReussite, xp, oldValeur);
+    this.dialogData.signe.system.valeur = RdDItemSigneDraconique.calculValeursXpSort(codeReussite, xp, oldValeur);
   }
 
 }

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 => { } };

module/dialog-item-consommer.js

@@ -38,22 +38,22 @@ export class DialogConsommer extends Dialog {
 
   /* -------------------------------------------- */
   static prepareData(actor, item) {
-    const itemData = duplicate(item);
+    item = duplicate(item);
     let consommerData = {
-      item: itemData,
+      item: item,
       cuisine: actor.getCompetence('cuisine'),
       choix: {
         doses: 1,
         seForcer: false,
       }
     }
-    switch (itemData.type) {
+    switch (item.type) {
       case 'nourritureboisson':
-        consommerData.title = itemData.data.boisson ? `${itemData.name}: boire une dose` : `${itemData.name}: manger une portion`;
+        consommerData.title = item.system.boisson ? `${item.name}: boire une dose` : `${item.name}: manger une portion`;
-        consommerData.buttonName = itemData.data.boisson ? "Boire" : "Manger";
+        consommerData.buttonName = item.system.boisson ? "Boire" : "Manger";
         break;
       case 'potion':
-        consommerData.title = `${itemData.name}: boire la potion`;
+        consommerData.title = `${item.name}: boire la potion`;
         consommerData.buttonName = "Boire";
         break;
     }
@@ -61,11 +61,11 @@ export class DialogConsommer extends Dialog {
     return consommerData;
   }
 
-  static calculDoses(consommerData) {
+  static calculDoses(consommer) {
-    const doses = consommerData.choix.doses;
+    const doses = consommer.choix.doses;
-    consommerData.totalSust = Misc.keepDecimals(doses * (consommerData.item.data.sust ?? 0), 2);
+    consommer.totalSust = Misc.keepDecimals(doses * (consommer.item.system.sust ?? 0), 2);
-    consommerData.totalDesaltere = consommerData.item.data.boisson
+    consommer.totalDesaltere = consommer.item.system.boisson
-      ? Misc.keepDecimals(doses * (consommerData.item.data.desaltere ?? 0), 2)
+      ? Misc.keepDecimals(doses * (consommer.item.system.desaltere ?? 0), 2)
       : 0;
   }
 

module/dialog-item-vente.js

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

module/dialog-split-item.js

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

module/hook-renderChatLog.js

@@ -1,9 +0,0 @@
-/* -------------------------------------------- */
-import { RdDUtility } from "./rdd-utility.js";
-
-/* -------------------------------------------- */
-// Activate chat listeners defined 
-// Hooks.on('renderChatLog', (log, html, data) => {
-//   RdDUtility.chatListeners(html);
-// });
-

module/item-arme.js

@@ -19,18 +19,16 @@ const nomCategorieParade = {
 /* -------------------------------------------- */
 export class RdDItemArme extends Item {
 
-  static isArme(itemData) {
+  static isArme(item) {
-    itemData = itemData
+    return (item.type == 'competencecreature' && item.system.iscombat) || item.type == 'arme';
-    return (itemData.type == 'competencecreature' && itemData.system.iscombat) || itemData.type == 'arme';
   }
 
   /* -------------------------------------------- */
-  static getArmeData(armeData) {
+  static getArme(arme) {
-    armeData = armeData
+    switch (arme ? arme.type : '') {
-    switch (armeData ? armeData.type : '') {
+      case 'arme': return arme;
-      case 'arme': return armeData;
       case 'competencecreature':
-        return RdDItemCompetenceCreature.toActionArme(armeData);
+        return RdDItemCompetenceCreature.toActionArme(arme);
     }
     return RdDItemArme.mainsNues();
   }
@@ -160,18 +158,18 @@ export class RdDItemArme extends Item {
     return armeData;
   }
 
-  static isArmeUtilisable(itemData) {
+  static isArmeUtilisable(arme) {
-    return itemData.type == 'arme' && itemData.system.equipe && (itemData.system.resistance > 0 || itemData.system.portee_courte > 0);
+    return arme.type == 'arme' && arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0);
   }
 
   static ajoutCorpsACorps(armes, competences, carac) {
     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 }));
+    //armes.push(RdDItemArme.empoignade({ niveau: corpsACorps.system.niveau, initiative: init }));
   }
 
-  static corpsACorps(actorData) {
+  static corpsACorps(mainsNuesActor) {
     const corpsACorps = {
       name: 'Corps à corps',
       img: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp',
@@ -186,20 +184,20 @@ export class RdDItemArme extends Item {
         categorie_parade: 'sans-armes'
       }
     };
-    mergeObject(corpsACorps.system, actorData ?? {}, { overwrite: false });
+    mergeObject(corpsACorps.system, mainsNuesActor ?? {}, { overwrite: false });
     return corpsACorps;
   }
 
-  static mainsNues(actorData) {
+  static mainsNues(mainsNuesActor) {
-    const mainsNues = RdDItemArme.corpsACorps(actorData)
+    const mainsNues = RdDItemArme.corpsACorps(mainsNuesActor)
     mainsNues.name = 'Mains nues'
     mainsNues.system.cac = 'pugilat'
     mainsNues.system.baseInit = 4
     return mainsNues;
   }
   
-  static empoignade(actorData) {
+  static empoignade(mainsNuesActor) {
-    const empoignade = RdDItemArme.corpsACorps(actorData)
+    const empoignade = RdDItemArme.corpsACorps(mainsNuesActor)
     empoignade.name = 'Empoignade'
     empoignade.system.cac = 'empoignade'
     empoignade.system.baseInit = 3

module/item-competence.js

@@ -195,17 +195,17 @@ export class RdDItemCompetence extends Item {
   }
 
   /* -------------------------------------------- */
-  static isVisible(itemData) {
+  static isVisible(item) {
-    return Number(itemData.data.niveau) != RdDItemCompetence.getNiveauBase(itemData.data.categorie);
+    return Number(item.system.niveau) != RdDItemCompetence.getNiveauBase(item.system.categorie);
   }
 
-  static nomContientTexte(itemData, texte) {
+  static nomContientTexte(item, texte) {
-    return Grammar.toLowerCaseNoAccent(itemData.name).includes(Grammar.toLowerCaseNoAccent(texte))
+    return Grammar.toLowerCaseNoAccent(item.name).includes(Grammar.toLowerCaseNoAccent(texte))
   }
 
   /* -------------------------------------------- */
-  static isNiveauBase(itemData) {
+  static isNiveauBase(item) {
-    return Number(itemData.system.niveau) == RdDItemCompetence.getNiveauBase(itemData.system.categorie);
+    return Number(item.system.niveau) == RdDItemCompetence.getNiveauBase(item.system.categorie);
   }
 
   /* -------------------------------------------- */

module/item-competencecreature.js

@@ -1,4 +1,5 @@
 import { Misc } from "./misc.js";
+import { RdDCombatManager } from "./rdd-combat.js";
 
 /* -------------------------------------------- */
 export class RdDItemCompetenceCreature extends Item {
@@ -16,36 +17,37 @@ export class RdDItemCompetenceCreature extends Item {
   }
 
   /* -------------------------------------------- */
-  static toActionArme(item) {
+  static toActionArme(competencecreature) {
-    if (RdDItemCompetenceCreature.isCompetenceAttaque(item)) {
+    if (RdDItemCompetenceCreature.isCompetenceAttaque(competencecreature)) {
       // si c'est un Item compétence: cloner pour ne pas modifier lma compétence
-      let arme = (item instanceof Item) ? item.clone():  item;
+      let arme = (competencecreature instanceof Item) ? competencecreature.clone():  competencecreature;
       mergeObject(arme.system,
         {
           competence: arme.name,
-          resistance: 100,
+          initiative: RdDCombatManager.calculInitiative(competencecreature.system.niveau, competencecreature.system.carac_value),
+          niveau: competencecreature.system.niveau,
           equipe: true,
+          resistance: 100,
           dommagesReels: arme.system.dommages,
           penetration: 0,
           force: 0,
           rapide: true,
+          cac: competencecreature.system.isnaturelle ? "naturelle" : "",
           action: 'attaque'
         });
       return arme;
     }
-    console.error("RdDItemCompetenceCreature.toActionArme(", item, ") : impossible de transformer l'Item en arme");
+    console.error("RdDItemCompetenceCreature.toActionArme(", competencecreature, ") : impossible de transformer l'Item en arme");
     return undefined;
   }
 
   /* -------------------------------------------- */
-  static isCompetenceAttaque(itemData) {
+  static isCompetenceAttaque(item) {
-    itemData = itemData
+    return item.type == 'competencecreature' && item.system.iscombat;
-    return itemData.type == 'competencecreature' && itemData.system.iscombat;
   }
   
   /* -------------------------------------------- */
-  static isCompetenceParade(itemData) {
+  static isCompetenceParade(item) {
-    itemData = itemData
+    return item.type == 'competencecreature' && item.system.categorie_parade !== "";
-    return itemData.type == 'competencecreature' && itemData.system.isparade;
   }
 }  

module/item-monnaie.js

@@ -1,6 +1,7 @@
 import { Misc } from "./misc.js";
+import { LOG_HEAD, SYSTEM_RDD } from "./constants.js";
 
-const monnaiesData = [
+const MONNAIES_STANDARD = [
   {
     name: "Etain (1 denier)", type: 'monnaie',
     img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp",
@@ -22,31 +23,36 @@ const monnaiesData = [
     system: { quantite: 0, valeur_deniers: 1000, encombrement: 0.004, description: "" }
   }
 ]
+const VALEURS_STANDARDS = MONNAIES_STANDARD.map(it =>it.system.valeur_deniers);
 
 export class Monnaie {
 
-  static isSystemMonnaie(item) {
+  static isSystemMonnaie(item, items) {
-    let present = monnaiesData.find(monnaie => monnaie.system.valeur_deniers == item?.system?.valeur_deniers);
+    if (item.type == 'monnaie')    {
-    return present;
+      const valeur = item.system.valeur_deniers;
+      if (VALEURS_STANDARDS.includes(valeur)) {
+        const monnaiesDeValeur = items.filter(it => it.type == 'monnaie' && it.system.valeur_deniers == valeur)
+        return monnaiesDeValeur.length<=1;
+      }
+    }
+    return false;
   }
 
   static monnaiesData() {
-    return monnaiesData;
+    return MONNAIES_STANDARD;
   }
 
-  static filtrerMonnaies(items) {
+  static monnaiesManquantes(actor) {
-    return items.filter(it => it.type == 'monnaie');
+    const disponibles = actor.itemTypes['monnaie'];
+    const manquantes = MONNAIES_STANDARD.filter(standard => !disponibles.find(disponible => Monnaie.deValeur(disponible, standard.system?.valeur_deniers)));
+    if (manquantes.length > 0) {
+      console.error(`${LOG_HEAD} monnaiesManquantes pour ${actor.name}`, manquantes, ' avec monnaies', disponibles, MONNAIES_STANDARD);
+    }
+    return manquantes;
   }
 
-  static monnaiesManquantes(items) {
+  static deValeur(monnaie, valeur) {
-    const valeurs = Monnaie.filtrerMonnaies(items)
+    return valeur == monnaie.system.valeur_deniers
-      .map(it => it.system.valeur_deniers);
-    const manquantes = monnaiesData.filter(monnaie => !valeurs.find(v => v != monnaie.system?.valeur_deniers))
-    return []; //manquantes;
-  }
-
-  static deValeur(monnaie, v) {
-    return v != monnaie.system.valeur_deniers
   }
 
   static arrondiDeniers(sols) {

module/item-sheet.js

@@ -32,7 +32,7 @@ export class RdDItemSheet extends ItemSheet {
     let buttons = super._getHeaderButtons();
     // Add "Post to chat" button
     // We previously restricted this to GM and editable items only. If you ever find this comment because it broke something: eh, sorry!
-    if ("cout" in this.object.system && this.object.isVideOuNonConteneur()) {
+    if ("cout" in this.item.system && this.item.isVideOuNonConteneur()) {
       buttons.unshift({
         class: "vendre",
         icon: "fas fa-comments-dollar",
@@ -61,53 +61,59 @@ export class RdDItemSheet extends ItemSheet {
   /* -------------------------------------------- */
   async getData() {
     let formData = {
-      id: this.object.id,
+      id: this.item.id,
-      title: this.object.name,
+      title: this.item.name,
-      type: this.object.type,
+      type: this.item.type,
-      img: this.object.img,
+      img: this.item.img,
-      name: this.object.name,
+      name: this.item.name,
-      data: this.object.system,
+      system: this.item.system,
+      // TODO: v10 remove
+      data: this.item.system,
       isGM: game.user.isGM,
       actorId: this.actor?.id,
-      owner: this.document.isOwner,
+      owner: this.item.isOwner,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
       isSoins: false
     }
     if (this.actor) {
       formData.isOwned = true;
-      if (this.object.type == 'conteneur') {
+      if (this.item.type == 'conteneur') {
         this.prepareConteneurData(formData);
       }
     }
 
     formData.categorieCompetences = RdDItemCompetence.getCategorieCompetences()
-    if (formData.type == 'tache' || formData.type == 'livre' || formData.type == 'meditation' || formData.type == 'oeuvre') {
+    if (this.item.type == 'tache' || this.item.type == 'livre' || this.item.type == 'meditation' || this.item.type == 'oeuvre') {
       formData.caracList = duplicate(game.system.model.Actor.personnage.carac)
       formData.caracList["reve-actuel"] = duplicate(game.system.model.Actor.personnage.reve.reve)
       formData.competences = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.competences')
     }
-    if (formData.type == 'arme') {
+    if (this.item.type == 'arme') {
       formData.competences = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.competences', it => RdDItemCompetence.isCompetenceArme(it));
       console.log(formData.competences)
     }
-    if (formData.type == 'recettealchimique') {
+    if (this.item.type == 'recettealchimique') {
-      RdDAlchimie.processManipulation(objectData, this.actor && this.actor.id);
+      RdDAlchimie.processManipulation(this.item, this.actor && this.actor.id);
     }
-    if (formData.type == 'gemme') {
+    if (this.item.type == 'gemme') {
       formData.gemmeTypeList = RdDGemme.getGemmeTypeOptionList();
-      RdDGemme.calculDataDerivees(formData.data);
+      RdDGemme.calculDataDerivees(this.item);
     }
-    if (formData.type == 'potion') {
+    if (this.item.type == 'potion') {
       if (this.dateUpdated) {
-        formData.data.prdate = this.dateUpdated;
+        formData.system.prdate = this.dateUpdated;
         this.dateUpdated = undefined;
       }
       RdDHerbes.updatePotionData(formData);
     }
-    if (formData.isOwned && formData.type == 'herbe' && (formData.system.categorie == 'Soin' || formData.system.categorie == 'Repos')) {
+    if (formData.isOwned && this.item.type == 'herbe' && (formData.system.categorie == 'Soin' || formData.system.categorie == 'Repos')) {
       formData.isIngredientPotionBase = true;
     }
+    if (this.item.type == 'sortreserve') {
+      const sortId = this.item.system.sortid;
+      formData.sort = formData.isOwned ? this.item.actor.items.get(sortId) : game.items.get(sortId);
+    }
     formData.bonusCaseList = RdDItemSort.getBonusCaseList(formData, true);
 
     return formData;
@@ -119,7 +125,7 @@ export class RdDItemSheet extends ItemSheet {
     RdDUtility.filterEquipementParType(formData)
 
     this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
-    formData.subItems = formData.conteneurs.find(it => it._id == this.object.id)?.subItems;
+    formData.subItems = formData.conteneurs.find(it => it._id == this.item.id)?.subItems;
 
   }
 
@@ -128,15 +134,15 @@ export class RdDItemSheet extends ItemSheet {
   activateListeners(html) {
     super.activateListeners(html);
 
-    if (this.object.type == 'conteneur') {
+    if (this.item.type == 'conteneur') {
       this.form.ondragstart = (event) => this._onDragStart(event);
       this.form.ondrop = (event) => this._onDrop(event);
     }
 
     let itemSheetDialog = this;
 
-    HtmlUtility._showControlWhen($(".item-cout"), ReglesOptionelles.isUsing('afficher-prix-joueurs') || game.user.isGM || !this.object.isOwned);
+    HtmlUtility._showControlWhen($(".item-cout"), ReglesOptionelles.isUsing('afficher-prix-joueurs') || game.user.isGM || !this.item.isOwned);
-    HtmlUtility._showControlWhen($(".item-magique"), this.object.isMagique());
+    HtmlUtility._showControlWhen($(".item-magique"), this.item.isMagique());
 
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
@@ -145,8 +151,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') {
+      if (this.item.type == 'competence') {
-        RdDUtility.checkThanatosXP(this.object.data.name);
+        RdDUtility.checkThanatosXP(this.item.name);
       }
     });
 
@@ -195,7 +201,8 @@ export class RdDItemSheet extends ItemSheet {
     });
     html.find('.item-delete').click(async event => {
       const li = RdDSheetUtility.getEventElement(event);
-      RdDUtility.confirmerSuppression(this, li);
+      const item = this.actor.getObjet(li.data("item-id"));
+      RdDUtility.confirmerSuppressionItem(this, item, li);
     });
     html.find('.item-vendre').click(async event => {
       const item = RdDSheetUtility.getItem(event, this.actor);
@@ -219,16 +226,16 @@ export class RdDItemSheet extends ItemSheet {
   async _onSelectCategorie(event) {
     event.preventDefault();
 
-    if (this.object.isCompetence()) {
+    if (this.item.isCompetence()) {
       let level = RdDItemCompetence.getNiveauBase(event.currentTarget.value);
-      this.object.system.base = level;
+      this.item.system.base = level;
       $("#base").val(level);
     }
   }
 
   /* -------------------------------------------- */
   get template() {
-    let type = this.object.type
+    let type = this.item.type
     return `systems/foundryvtt-reve-de-dragon/templates/item-${type}-sheet.html`;
   }
 
@@ -239,7 +246,7 @@ export class RdDItemSheet extends ItemSheet {
     // Données de bonus de cases ?
     formData = RdDItemSort.buildBonusCaseStringFromFormData(formData);
 
-    return this.object.update(formData);
+    return this.item.update(formData);
   }
 
   async _onDragStart(event) {
@@ -252,28 +259,28 @@ export class RdDItemSheet extends ItemSheet {
     const dragData = {
       actorId: this.actor.id,
       type: "Item",
-      data: item.data
+      data: item.system
     };
 
     event.dataTransfer.setData("text/plain", JSON.stringify(dragData));
   }
 
   async _onDrop(event) {
-    // Try to extract the data
+    // Try to extract the dragData
-    let data;
+    let dragData;
     try {
-      data = JSON.parse(event.dataTransfer.getData('text/plain'));
+      dragData = JSON.parse(event.dataTransfer.getData('text/plain'));
     } catch (err) {
       return false;
     }
 
-    const allowed = Hooks.call("dropActorSheetData", this.actor, this, data);
+    const allowed = Hooks.call("dropActorSheetData", this.actor, this, dragData);
     if (allowed === false) return;
 
-    // Handle different data types
+    // Handle different dragData types
-    switch (data.type) {
+    switch (dragData.type) {
       case "Item":
-        return this._onDropItem(event, data);
+        return this._onDropItem(event, dragData);
     }
     return super._onDrop(event);
   }
@@ -281,7 +288,7 @@ export class RdDItemSheet extends ItemSheet {
   /* -------------------------------------------- */
   async _onDropItem(event, dragData) {
     if (this.actor) {
-      const dropParams = RdDSheetUtility.prepareItemDropParameters(this.object.id, this.actor.id, dragData, this.objetVersConteneur);
+      const dropParams = RdDSheetUtility.prepareItemDropParameters(this.item.id, this.actor.id, dragData, this.objetVersConteneur);
       await this.actor.processDropItem(dropParams);
       await this.render(true);
     }

module/item-signedraconique-sheet.js

@@ -40,17 +40,17 @@ export class RdDSigneDraconiqueItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const formData = duplicate(this.object);
+    const formData = duplicate(this.item);
     mergeObject(formData, {
       title: formData.name,
       isGM: game.user.isGM,
-      owner: this.document.isOwner,
+      owner: this.actor.isOwner,
       isOwned: this.actor ? true : false,
       actorId: this.actor?.id,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
     });
-    formData.tmrs = TMRUtility.listSelectedTMR(formData.data.typesTMR ?? []);
+    formData.tmrs = TMRUtility.listSelectedTMR(formData.system.typesTMR ?? []);
     return formData;
   }
 
@@ -68,21 +68,21 @@ export class RdDSigneDraconiqueItemSheet extends ItemSheet {
 
   async setSigneAleatoire() {
     const newSigne = await RdDItemSigneDraconique.randomSigneDraconique();
-    this.object.update(newSigne);
+    this.item.update(newSigne);
   }
 
   async onSelectTmr(event) {
     event.preventDefault();
     const selectedTMR = $(".select-tmr").val();
-    this.object.update({ 'data.typesTMR': selectedTMR });
+    this.item.update({ 'system.typesTMR': selectedTMR });
   }
 
   async onValeurXpSort(event) {
     const codeReussite = event.currentTarget.attributes['data-typereussite']?.value ?? 0;
     const xp = Number(event.currentTarget.value);
-    const oldValeur = this.object.system.valeur;
+    const oldValeur = this.item.system.valeur;
     const newValeur = RdDItemSigneDraconique.calculValeursXpSort(codeReussite, xp, oldValeur);
-    await this.object.update({ 'data.valeur': newValeur });
+    await this.item.update({ 'system.valeur': newValeur });
   }
 
   /* -------------------------------------------- */

module/item-signedraconique.js

@@ -18,13 +18,12 @@ const DIFFICULTE_LECTURE_SIGNE_MANQUE = +11;
 export class RdDItemSigneDraconique {
 
   static prepareSigneDraconiqueMeditation(meditation, rolled) {
-    meditation = meditation
     return {
       name: "de la " + meditation.name,
       type: "signedraconique",
       img: meditation.img,
-      data: {
+      system: {
-        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",
@@ -75,7 +74,7 @@ export class RdDItemSigneDraconique {
       name: await RdDItemSigneDraconique.randomSigneDescription(),
       type: "signedraconique",
       img: defaultItemImg.signedraconique,
-      data: {
+      system: {
         typesTMR: await RdDItemSigneDraconique.randomTmrs(modele.nbCases),
         ephemere: options?.ephemere == undefined ? RdDDice.rollTotal("1d2") == 2 : options.ephemere,
         duree: "1 round",

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;
   }
@@ -80,14 +80,14 @@ export class RdDItemSort extends Item {
       }
       formData.bonusValue = undefined; 
       formData.caseValue  = undefined; 
-        formData['data.bonuscase'] = list.toString(); // Reset
+      formData.system.bonuscase = list.toString(); // Reset
     }
     return formData;
   }
   
   /* -------------------------------------------- */
   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;
@@ -106,12 +106,12 @@ export class RdDItemSort extends Item {
       // Sauvegarde/update
       let bonuscase = StringList.toString();
       //console.log("Bonus cae :", bonuscase);
-      actor.updateEmbeddedDocuments('Item', [{ _id: sort._id, 'data.bonuscase': bonuscase }] );
+      actor.updateEmbeddedDocuments('Item', [{ _id: sort._id, 'system.bonuscase': bonuscase }] );
   }
   
   /* -------------------------------------------- */
   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);

module/item.js

@@ -1,6 +1,7 @@
 import { DialogItemVente } from "./dialog-item-vente.js";
 import { Grammar } from "./grammar.js";
 import { Misc } from "./misc.js";
+import { RdDHerbes } from "./rdd-herbes.js";
 import { RdDUtility } from "./rdd-utility.js";
 
 const typesObjetsEquipement = ["objet", "arme", "armure", "gemme", "conteneur", "herbe", "ingredient", "livre", "potion", "munition", "nourritureboisson", "monnaie"]
@@ -35,17 +36,18 @@ export const defaultItemImg = {
   nourritureboisson: "systems/foundryvtt-reve-de-dragon/icons/objets/provision_crue.webp",
   signedraconique: "systems/foundryvtt-reve-de-dragon/icons/tmr/signe_draconique.webp",
   gemme: "systems/foundryvtt-reve-de-dragon/icons/gemmes/almaze.webp",
-  possession: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp"
+  possession: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp",
+  sortreserve: "systems/foundryvtt-reve-de-dragon/icons/competence_oniros.webp",
 }
 
 /* -------------------------------------------- */
 export class RdDItem extends Item {
 
-  constructor(data, context) {
+  constructor(itemData, context) {
-    if (!data.img) {
+    if (!itemData.img) {
-      data.img = defaultItemImg[data.type];
+      itemData.img = defaultItemImg[itemData.type];
     }
-    super(data, context);
+    super(itemData, context);
   }
 
   static getTypeObjetsEquipement() {
@@ -126,7 +128,8 @@ export class RdDItem extends Item {
     this.system.magique = categorie.includes('enchante');
     if (this.system.magique) {
       if (categorie.includes('soin') || categorie.includes('repos')) {
-        this.system.puissance = this.system.herbebonus * this.system.pr;
+        // TODO: utiliser calculePointsRepos / calculePointsGuerison
+        this.system.puissance = RdDHerbes.calculePuissancePotion(this);
       }
     }
   }
@@ -143,24 +146,28 @@ export class RdDItem extends Item {
   }
 
   getActionPrincipale(options = { warnIfNot: true }) {
-    if (!this.isConteneur() && (this.system.quantite ?? 0) <= 0) {
+    const warn = options.warnIfNot;
-      if (options.warnIfNot) {
+    switch (this.type) {
+      case 'nourritureboisson': return this._actionOrWarnQuantiteZero(this.boisson ? 'Boire' : 'Manger', warn);
+      case 'potion': return this._actionOrWarnQuantiteZero('Boire', warn);
+      case 'livre': return this._actionOrWarnQuantiteZero('Lire', warn);
+      case 'conteneur': return this._actionOrWarnQuantiteZero('Ouvrir', warn);
+      case 'herbe':  return this.isHerbeAPotion() ? this._actionOrWarnQuantiteZero('Décoction', warn) : undefined;
+      case 'queue': case 'ombre': return this.system.refoulement>0 ? 'Refouler' : undefined;
+    }
+    return undefined;
+  }
+
+  _actionOrWarnQuantiteZero(actionName, warn){
+    if ((this.system.quantite ?? 0) <= 0) {
+      if (warn) {
         ui.notifications.warn(`Vous n'avez plus de ${this.name}.`);
       }
       return undefined;
     }
-    switch (this.type) {
+    else {
-      case 'nourritureboisson': return this.boisson ? 'Boire' : 'Manger';
+      return actionName;
-      case 'potion': return 'Boire';
-      case 'livre': return 'Lire';
-      case 'conteneur': return 'Ouvrir';
     }
-    if (this.isHerbeAPotion()) { return 'Décoction'; }
-    if (options.warnIfNot) {
-      ui.notifications.warn(`Impossible d'utiliser un ${this.name}, aucune action associée définie.`);
-    }
-
-    return undefined;
   }
 
   async diminuerQuantite(nombre, options = { diminuerQuantite: true, supprimerSiZero: false }) {
@@ -180,11 +187,11 @@ export class RdDItem extends Item {
         }
         else {
           ui.notifications.notify(`Il ne vous reste plus de ${this.name}, vous pouvez le supprimer de votre équipement, ou trouver un moyen de vous en procurer.`);
-          await this.update({ "data.quantite": 0 });
+          await this.update({ "system.quantite": 0 });
         }
       }
       else {
-        await this.update({ "data.quantite": reste });
+        await this.update({ "system.quantite": reste });
       }
     }
   }

module/migrations.js

@@ -0,0 +1,141 @@
+import { LOG_HEAD, SYSTEM_RDD } from "./constants.js";
+import { Grammar } from "./grammar.js";
+
+class Migration {
+  get code() { return "sample"; }
+  get version() { return "0.0.0"; }
+  async migrate() { }
+
+  async applyItemsUpdates(computeUpdates) {
+    await game.actors.forEach(async (actor) => {
+      const actorItemUpdates = computeUpdates(actor.items);
+      if (actorItemUpdates.length > 0) {
+        console.log(
+          this.code,
+          `Applying updates on actor ${actor.name} items`,
+          actorItemUpdates
+        );
+        await actor.updateEmbeddedDocuments("Item", actorItemUpdates);
+      }
+    });
+
+    const itemUpdates = computeUpdates(game.items);
+    if (itemUpdates.length > 0) {
+      console.log(this.code, "Applying updates on items", itemUpdates);
+      await Item.updateDocuments(itemUpdates);
+    }
+  }
+
+}
+
+class _10_0_16_MigrationSortsReserve extends Migration {
+  get code() { return "creation-item-sort-reserve"; }
+  get version() { return "10.0.16"; }
+
+  async migrate() {
+    await game.actors
+      .filter((actor) => actor.type == "personnage")
+      .filter((actor) => actor.system.reve?.reserve?.list?.length ?? 0 > 0)
+      .forEach(async (actor) => {
+        const sortsReserve = actor.system.reve.reserve.list.map(this.conversionSortReserve);
+        console.log(`${LOG_HEAD} Migration des sorts en réserve de ${actor.name}`, sortsReserve);
+        await actor.createEmbeddedDocuments("Item", sortsReserve, {
+          renderSheet: false,
+        });
+        await actor.update({ 'system.reve.reserve.list': [] })
+      });
+  }
+
+  conversionSortReserve(it) {
+    return {
+      type: 'sortreserve',
+      name: it.sort.name,
+      img: it.sort.img,
+      system: {
+        // ATTENTION, utilisation de data / _id possibles, encore présents pour les anciens sorts en réserve
+        sortid: it.sort._id,
+        draconic: it.sort.draconic,
+        ptreve: (it.sort.system ?? it.sort.data).ptreve_reel,
+        coord: it.coord,
+        heurecible: 'Vaisseau',
+      },
+    };
+  }
+}
+
+class _10_0_17_MigrationCompetenceCreature extends Migration {
+  get code() { return "competences-creature-parade"; }
+  get version() { return "10.0.17"; }
+
+  async migrate() {
+    await this.applyItemsUpdates(items => items
+      .filter(it => it.type == "competencecreature" && it.system.isparade && it.system.categorie_parade == "")
+      .map(it => { return { _id: it.id, "system.categorie_parade": "armes-naturelles" } }));
+
+    await this.applyItemsUpdates(items => items
+      .filter(it => it.type == "competencecreature" && it.system.iscombat)
+      .map(it => { return { _id: it.id, "system.categorie": (Grammar.includesLowerCaseNoAccent(it.name, "lancee") ? "lancer" : "melee") } })
+    );
+
+  }
+}
+
+export class Migrations {
+  static getMigrations() {
+    return [
+      new _10_0_16_MigrationSortsReserve(),
+      new _10_0_17_MigrationCompetenceCreature()
+    ];
+  }
+
+  constructor() {
+    game.settings.register(SYSTEM_RDD, "systemMigrationVersion", {
+      name: "System Migration Version",
+      scope: "world",
+      config: false,
+      type: String,
+      default: "0.0.0",
+    });
+  }
+
+  migrate() {
+    const currentVersion = game.settings.get(
+      SYSTEM_RDD,
+      "systemMigrationVersion"
+    );
+    if (isNewerVersion(game.system.version, currentVersion)) {
+      const migrations = Migrations.getMigrations().filter(m => isNewerVersion(m.version, currentVersion));
+      if (migrations.length > 0) {
+        migrations.sort((a, b) =>
+          isNewerVersion(a.version, b.version)
+            ? 1
+            : isNewerVersion(b.version, a.version)
+              ? -1
+              : 0
+        );
+        migrations.forEach(async (m) => {
+          ui.notifications.info(
+            `Executing migration ${m.code}: version ${currentVersion} is lower than ${m.version}`
+          );
+          await m.migrate();
+        });
+        ui.notifications.info(
+          `Migrations done, version will change to ${game.system.version}`
+        );
+      } else {
+        console.log(
+          LOG_HEAD +
+          `No migration needeed, version will change to ${game.system.version}`
+        );
+      }
+
+      game.settings.set(
+        SYSTEM_RDD,
+        "systemMigrationVersion",
+        game.system.version
+      );
+    } else {
+      console.log(LOG_HEAD + `No system version changed`);
+    }
+  }
+}

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) {
@@ -17,12 +17,12 @@ export class RdDAlchimie {
         //console.log("RESULT ", result);
         if (result[1] && result[2]) {
           let commande = Misc.upperFirst(result[1]);
-          let replacement = this[`_alchimie${commande}`](recetteData, result[2], actorId);
+          let replacement = this[`_alchimie${commande}`](recette, result[2], actorId);
           manip = manip.replace(result[0], replacement);
         }
       }
     }
-    recetteData.data.manipulation_update = manip;
+    recette.system.manipulation_update = manip;
   }
 
   /* -------------------------------------------- */

module/rdd-astrologie-joueur.js

@@ -12,23 +12,23 @@ export class RdDAstrologieJoueur extends Dialog {
   /* -------------------------------------------- */
   static async create(actor, dialogConfig) {
 
-    let data = {
+    let dialogData = {
       nombres: this.organizeNombres(actor),
       dates: game.system.rdd.calendrier.getJoursSuivants(10),
       etat: actor.getEtatGeneral(),
       ajustementsConditions: CONFIG.RDD.ajustementsConditions,
       astrologie: RdDItemCompetence.findCompetence(actor.items, 'Astrologie')
     }
-    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-astrologie-joueur.html', data);
+    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-astrologie-joueur.html', dialogData);
     let options = { classes: ["rdddialog"], width: 600, height: 500, 'z-index': 99999 };
     if (dialogConfig.options) {
       mergeObject(options, dialogConfig.options, { overwrite: true });
     }
-    return new RdDAstrologieJoueur(html, actor, data);
+    return new RdDAstrologieJoueur(html, actor, dialogData);
   }
 
   /* -------------------------------------------- */
-  constructor(html, actor, data) {
+  constructor(html, actor, dialogData) {
 
     let myButtons = {
       saveButton: { label: "Fermer", callback: html => this.quitDialog() }
@@ -41,7 +41,7 @@ export class RdDAstrologieJoueur extends Dialog {
     super(dialogConf, dialogOptions);
 
     this.actor = actor;
-    this.dataNombreAstral = duplicate(data);
+    this.dataNombreAstral = duplicate(dialogData);
   }
 
   /* -------------------------------------------- */
@@ -63,7 +63,7 @@ export class RdDAstrologieJoueur extends Dialog {
 
   /* -------------------------------------------- */
   requestJetAstrologie() {
-    let data = {
+    let socketData = {
       id: this.actor.id,
       carac_vue: this.actor.system.carac['vue'].value,
       etat: this.dataNombreAstral.etat,
@@ -73,11 +73,11 @@ export class RdDAstrologieJoueur extends Dialog {
       userId: game.user.id
     }
     if (Misc.isUniqueConnectedGM()) {
-      game.system.rdd.calendrier.requestNombreAstral(data);
+      game.system.rdd.calendrier.requestNombreAstral(socketData);
     } else {
       game.socket.emit(SYSTEM_SOCKET_ID, {
         msg: "msg_request_nombre_astral",
-        data: data
+        data: socketData
       });
     }
     this.close();

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.items.find( 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 !` });
@@ -444,9 +444,9 @@ export class RdDCalendrier extends Application {
 
   /* -------------------------------------------- */
   updateDisplay() {
-    let data = this.fillCalendrierData();
+    let calendrier = this.fillCalendrierData();
-    // Rebuild data
+    // Rebuild text du calendrier
-    let dateHTML = `Jour ${data.jourMois} de ${data.nomMois} (${data.nomSaison})`
+    let dateHTML = `Jour ${calendrier.jourMois} de ${calendrier.nomMois} (${calendrier.nomSaison})`
     if (game.user.isGM) {
       dateHTML = dateHTML + " - NA: " + (this.getCurrentNombreAstral() ?? "indéterminé");
     }
@@ -454,13 +454,13 @@ export class RdDCalendrier extends Application {
       handle.innerHTML = dateHTML;
     }
     for (let heure of document.getElementsByClassName("calendar-heure-texte")) {
-      heure.innerHTML = data.nomHeure;
+      heure.innerHTML = calendrier.nomHeure;
     }
     for (const minute of document.getElementsByClassName("calendar-time-disp")) {
-      minute.innerHTML = `${data.minutesRelative} minutes`;
+      minute.innerHTML = `${calendrier.minutesRelative} minutes`;
     }
     for (const heureImg of document.getElementsByClassName("calendar-heure-img")) {
-      heureImg.src = data.iconHeure;
+      heureImg.src = calendrier.iconHeure;
     }
   }
 

module/rdd-carac.js

@@ -101,35 +101,35 @@ export class RdDCarac {
   }
 
   /* -------------------------------------------- */
-  static computeCarac(data) {
+  static computeCarac(system) {
-    data.carac.force.value = Math.min(data.carac.force.value, parseInt(data.carac.taille.value) + 4);
+    system.carac.force.value = Math.min(system.carac.force.value, parseInt(system.carac.taille.value) + 4);
 
-    data.carac.derobee.value = Math.floor(parseInt(((21 - data.carac.taille.value)) + parseInt(data.carac.agilite.value)) / 2);
+    system.carac.derobee.value = Math.floor(parseInt(((21 - system.carac.taille.value)) + parseInt(system.carac.agilite.value)) / 2);
-    let bonusDomKey = Math.floor((parseInt(data.carac.force.value) + parseInt(data.carac.taille.value)) / 2);
+    let bonusDomKey = Math.floor((parseInt(system.carac.force.value) + parseInt(system.carac.taille.value)) / 2);
     bonusDomKey = Math.min(Math.max(bonusDomKey, 0), 32); // Clamp de securite
 
     let tailleData = tableCaracDerivee[bonusDomKey];
-    data.attributs.plusdom.value = tailleData.plusdom;
+    system.attributs.plusdom.value = tailleData.plusdom;
 
-    data.attributs.sconst.value = RdDCarac.calculSConst(data.carac.constitution.value);
+    system.attributs.sconst.value = RdDCarac.calculSConst(system.carac.constitution.value);
-    data.attributs.sust.value = tableCaracDerivee[Number(data.carac.taille.value)].sust;
+    system.attributs.sust.value = tableCaracDerivee[Number(system.carac.taille.value)].sust;
 
-    data.attributs.encombrement.value = (parseInt(data.carac.force.value) + parseInt(data.carac.taille.value)) / 2;
+    system.attributs.encombrement.value = (parseInt(system.carac.force.value) + parseInt(system.carac.taille.value)) / 2;
-    data.carac.melee.value = Math.floor((parseInt(data.carac.force.value) + parseInt(data.carac.agilite.value)) / 2);
+    system.carac.melee.value = Math.floor((parseInt(system.carac.force.value) + parseInt(system.carac.agilite.value)) / 2);
-    data.carac.tir.value = Math.floor((parseInt(data.carac.vue.value) + parseInt(data.carac.dexterite.value)) / 2);
+    system.carac.tir.value = Math.floor((parseInt(system.carac.vue.value) + parseInt(system.carac.dexterite.value)) / 2);
-    data.carac.lancer.value = Math.floor((parseInt(data.carac.tir.value) + parseInt(data.carac.force.value)) / 2);
+    system.carac.lancer.value = Math.floor((parseInt(system.carac.tir.value) + parseInt(system.carac.force.value)) / 2);
 
-    data.sante.vie.max = Math.ceil((parseInt(data.carac.taille.value) + parseInt(data.carac.constitution.value)) / 2);
+    system.sante.vie.max = Math.ceil((parseInt(system.carac.taille.value) + parseInt(system.carac.constitution.value)) / 2);
 
-    data.sante.vie.value = Math.min(data.sante.vie.value, data.sante.vie.max)
+    system.sante.vie.value = Math.min(system.sante.vie.value, system.sante.vie.max)
-    data.sante.endurance.max = Math.max(parseInt(data.carac.taille.value) + parseInt(data.carac.constitution.value), parseInt(data.sante.vie.max) + parseInt(data.carac.volonte.value));
+    system.sante.endurance.max = Math.max(parseInt(system.carac.taille.value) + parseInt(system.carac.constitution.value), parseInt(system.sante.vie.max) + parseInt(system.carac.volonte.value));
-    data.sante.endurance.value = Math.min(data.sante.endurance.value, data.sante.endurance.max);
+    system.sante.endurance.value = Math.min(system.sante.endurance.value, system.sante.endurance.max);
-    data.sante.fatigue.max = data.sante.endurance.max * 2;
+    system.sante.fatigue.max = system.sante.endurance.max * 2;
-    data.sante.fatigue.value = Math.min(data.sante.fatigue.value, data.sante.fatigue.max);
+    system.sante.fatigue.value = Math.min(system.sante.fatigue.value, system.sante.fatigue.max);
 
     //Compteurs
-    data.reve.reve.max = data.carac.reve.value;
+    system.reve.reve.max = system.carac.reve.value;
-    data.compteurs.chance.max = data.carac.chance.value;
+    system.compteurs.chance.max = system.carac.chance.value;
   }
 
 

module/rdd-combat.js

@@ -10,6 +10,7 @@ import { RdDResolutionTable } from "./rdd-resolution-table.js";
 import { RdDRoll } from "./rdd-roll.js";
 import { RdDRollTables } from "./rdd-rolltables.js";
 import { ReglesOptionelles } from "./regles-optionelles.js";
+import { STATUSES } from "./status-effects.js";
 
 /* -------------------------------------------- */
 const premierRoundInit = [
@@ -66,7 +67,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,8 +79,8 @@ 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;
     // calculate initiative
@@ -93,7 +94,7 @@ export class RdDCombatManager extends Combat {
             rollFormula = RdDCombatManager.formuleInitiative(2, competence.system.carac_value, competence.system.niveau, 0);
           }
         } else {
-          const armeCombat = combatant.actor.items.find(it => it.type == 'arme' && itemData.system.equipe)
+          const armeCombat = combatant.actor.itemTypes['arme'].find(it => it.system.equipe)
           const compName = (armeCombat == undefined) ? "Corps à corps" : armeCombat.system.competence;
           const competence = RdDItemCompetence.findCompetence(combatant.actor.items, compName);
           if (competence) {
@@ -196,13 +197,18 @@ export class RdDCombatManager extends Combat {
     return actionsArme.sort(Misc.ascending(armeData => armeData.name + (armeData.system.mainInfo ?? '')));
   }
 
+  static listActionsCreature(competences) {
+    return competences.filter(it => RdDItemCompetenceCreature.isCompetenceAttaque(it))
+      .map(it => RdDItemCompetenceCreature.toActionArme(it));
+  }
+
   static listActionsPossessions(actor) {
     return RdDCombatManager._indexActions(actor.getPossessions().map(p =>
       {
         return {
           name: p.name,
           action: 'conjurer',
-          data: {
+          system: {
             competence: p.name,
             possessionid: p.system.possessionid,
           }
@@ -217,21 +223,19 @@ export class RdDCombatManager extends Combat {
     if (actions.length>0) {
       return actions;
     }
-    let items = actor.items;
     if (actor.isCreature()) {
-      actions = actions.concat(items.filter(it => RdDItemCompetenceCreature.isCompetenceAttaque(it))
+      actions = actions.concat(RdDCombatManager.listActionsCreature(actor.itemTypes['competencecreature']));
-        .map(competence => RdDItemCompetenceCreature.toActionArme(competence)));
     } else {
       // Recupération des items 'arme'
-      let armes = items.filter(it => RdDItemArme.isArmeUtilisable(it))
+      const armes = actor.itemTypes['arme'].filter(it => RdDItemArme.isArmeUtilisable(it))
         //.concat(RdDItemArme.empoignade())
         .concat(RdDItemArme.mainsNues());
 
-      let competences = items.filter(it => it.type == 'competence');
+      const competences = actor.itemTypes['competence'];
       actions = actions.concat(RdDCombatManager.listActionsArmes(armes, competences, actor.system.carac));
 
       if (actor.system.attributs.hautrevant.value) {
-        actions.push({ name: "Draconic", action: 'haut-reve', data: { initOnly: true, competence: "Draconic" } });
+        actions.push({ name: "Draconic", action: 'haut-reve', system: { initOnly: true, competence: "Draconic" } });
       }
     }
 
@@ -249,9 +253,9 @@ 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") {
@@ -327,22 +331,16 @@ export class RdDCombatManager extends Combat {
       initOffset = 9;
       initInfo = "Draconic"
     } else {
-      compData = RdDItemCompetence.findCompetence(combatant.actor.items, arme.system.competence);
+      compData = RdDItemCompetence.findCompetence(combatant.actor.items, action.system.competence);
       compNiveau = compData.system.niveau;
       initInfo = action.name + " / " + action.system.competence;
         
       if (combatant.actor.type == 'creature' || combatant.actor.type == 'entite') {
         caracForInit = compData.system.carac_value;
-          if (compData.system.categorie == "lancer") {
-            initOffset = 7;
-          }
-          else {
-            initOffset = 5;
-          }
       } else {
         caracForInit = combatant.actor.system.carac[compData.system.defaut_carac].value;
-          initOffset = RdDCombatManager._baseInitOffset(compData.system.categorie, action);
       }
+      initOffset = RdDCombatManager._baseInitOffset(compData.system.categorie, action);
     }
 
     let malus = combatant.actor.getEtatGeneral(); // Prise en compte état général 
@@ -360,10 +358,12 @@ export class RdDCombatManager extends Combat {
     if (categorie == "lancer") { // Offset de principe pour les armes de jet
       return 7;
     }
-    // Offset de principe pour les armes de jet
     switch (arme.system.cac) {
-      case "empoignade": return 3;
+      case "empoignade":
-      case "pugilat": return 4;
+        return 3;
+      case "pugilat": 
+      case "naturelle":
+        return 4;
     }
     return 5;
   }
@@ -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);
     }
   }
@@ -833,7 +833,7 @@ export class RdDCombat {
     // # utilisation esquive
     const corpsACorps = this.defender.getCompetence("Corps à corps", { onMessage: it => console.info(it, this.defender) });
     const esquives = duplicate(this.defender.getCompetences("esquive", { onMessage: it => console.info(it, this.defender) }))
-    esquives.forEach(e => e.usages = e?.id ? this.defender.getItemUse(e.id) : 0);
+    esquives.forEach(e => e.system.nbUsage = e?._id ? this.defender.getItemUse(e._id) : 0);
 
     const paramChatDefense = {
       passeArme: attackerRoll.passeArme,
@@ -892,8 +892,7 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   _filterArmesParade(defender, competence) {
-    let items = defender.items;
+    let items = defender.items.filter(it => RdDItemArme.isArmeUtilisable(it) || RdDItemCompetenceCreature.isCompetenceParade(it))
-    items = items.filter(it => RdDItemArme.isArmeUtilisable(it) || RdDItemCompetenceCreature.isCompetenceParade(it))
     for (let item of items) {
       item.system.nbUsage = defender.getItemUse(item.id); // Ajout du # d'utilisation ce round  
     }
@@ -960,10 +959,10 @@ export class RdDCombat {
   async parade(attackerRoll, armeParadeId) {
     const arme = this.defender.getArmeParade(armeParadeId);
     console.log("RdDCombat.parade >>>", attackerRoll, armeParadeId, arme);
-    const competence = this.system?.competence;
+    const competence = arme?.system?.competence;
     if (competence == undefined)
     {
-      console.error("Pas de compétence de parade associée à ", arme) ;
+      console.error("Pas de compétence de parade associée à ", arme?.name, armeParadeId) ;
       return;
     }
 
@@ -1144,7 +1143,7 @@ export class RdDCombat {
               resistance -= perteResistance;
               defenderRoll.show.deteriorationArme = resistance <= 0 ? 'brise' : 'perte';
               defenderRoll.show.perteResistance = perteResistance;
-              this.defender.updateEmbeddedDocuments('Item', [{ _id: defenderRoll.arme._id, 'data.resistance': resistance }]);
+              this.defender.updateEmbeddedDocuments('Item', [{ _id: defenderRoll.arme._id, 'system.resistance': resistance }]);
             }
           }
         } else {
@@ -1160,7 +1159,7 @@ export class RdDCombat {
             resistance -= dmg;
             defenderRoll.show.deteriorationArme = resistance <= 0 ? 'brise' : 'perte';
             defenderRoll.show.perteResistance = dmg;
-            this.defender.updateEmbeddedDocuments('Item', [{ _id: defenderRoll.arme._id, 'data.resistance': resistance }]);
+            this.defender.updateEmbeddedDocuments('Item', [{ _id: defenderRoll.arme._id, 'system.resistance': resistance }]);
           }
         }
         // Si l'arme de parade n'est pas un bouclier, jet de désarmement (p.132)
@@ -1186,7 +1185,7 @@ export class RdDCombat {
         defenderRoll.show.recul = 'encaisse';
       } else if (rollRecul.rolled.isETotal || this._isReculCauseChute(impact)) {
         defenderRoll.show.recul = 'chute';
-        await this.defender.setStatusEffect("EFFECT.StatusProne", true);
+        await this.defender.setEffect(STATUSES.StatusProne, true);
       }
       else {
         defenderRoll.show.recul = 'recul';
@@ -1274,7 +1273,7 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   static async displayActorCombatStatus(combat, actor) {
-    let data = {
+    let formData = {
       combatId: combat._id,
       alias: actor.name,
       etatGeneral: actor.getEtatGeneral(),
@@ -1286,13 +1285,13 @@ export class RdDCombat {
       isCritique: false
     }
     if (actor.countBlessuresNonSoigneeByName("critiques") > 0) { // Pour éviter le cumul grave + critique
-      data.isCritique = true;
+      formData.isCritique = true;
     } else if (actor.countBlessuresNonSoigneeByName("graves") > 0) {
-      data.isGrave = true;
+      formData.isGrave = true;
     }
 
     ChatUtility.createChatWithRollMode(actor.name, {
-      content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-summary.html`, data)
+      content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-summary.html`, formData)
     });
   }
 }

module/rdd-commands.js

@@ -358,7 +358,7 @@ export class RdDCommands {
 
   async supprimerSignesDraconiquesEphemeres() {
     game.actors.forEach(actor => {
-      const ephemeres = actor.filterItems(item => item.type = 'signedraconique' && item.system.ephemere)
+      const ephemeres = actor.items.find(item => item.type = 'signedraconique' && item.system.ephemere)
         .map(item => item.id);
       if (ephemeres.length > 0) {
         actor.deleteEmbeddedDocuments("Item", ephemeres);

module/rdd-compendium-organiser.js

@@ -3,11 +3,11 @@ import { Misc } from "./misc.js";
 
 export class RddCompendiumOrganiser {
   static init() {
-    Hooks.on('renderCompendium', async (pack, html, data) => RddCompendiumOrganiser.onRenderCompendium(pack, html, data))
+    Hooks.on('renderCompendium', async (pack, html, compendiumData) => RddCompendiumOrganiser.onRenderCompendium(pack, html, compendiumData))
   }
 
-  static async onRenderCompendium(compendium, html, data) {
+  static async onRenderCompendium(compendium, html, compendiumData) {
-    console.log('onRenderCompendium', compendium, html, data);
+    console.log('onRenderCompendium', compendium, html, compendiumData);
     const pack = compendium.collection
     if (pack.metadata.system === SYSTEM_RDD) {
       html.find('.directory-item').each((i, element) => {

module/rdd-gemme.js

@@ -18,18 +18,19 @@ const tableGemmes = {
 export class RdDGemme extends Item {
 
   static getGemmeTypeOptionList() {
+    // TODO: look how to map object key-value pairs
     let options = ""
     for (let gemmeKey in tableGemmes) {
-      let gemmeData = tableGemmes[gemmeKey];
+      options += `<option value="${gemmeKey}">${tableGemmes[gemmeKey].label}</option>`
-      options += `<option value="${gemmeKey}">${gemmeData.label}</option>`
     }
     return options;
   }
 
-  static calculDataDerivees(data) {
+
-    data.cout = (data.taille * data.purete) + data.qualite;
+  static calculDataDerivees(gemme) {
-    data.inertie = 7 - data.purete;
+    gemme.system.cout = (gemme.system.taille * gemme.system.purete) + gemme.system.qualite;
-    data.enchantabilite = data.taille - data.inertie;
+    gemme.system.inertie = 7 - gemme.system.purete;
+    gemme.system.enchantabilite = gemme.system.taille - gemme.system.inertie;
   }
 
 }

module/rdd-herbes.js

@@ -1,6 +1,4 @@
-/* -------------------------------------------- */
 import { RdDUtility } from "./rdd-utility.js";
-import { Misc } from "./misc.js";
 import { RdDCalendrier } from "./rdd-calendrier.js";
 
 /* -------------------------------------------- */
@@ -22,12 +20,11 @@ export class RdDHerbes extends Item {
   }
 
   /* -------------------------------------------- */
-  static buildHerbesList(listHerbes, max) {
+  static buildHerbesList(listeHerbes, max) {
     let list = {}
-    for ( let herbe of listHerbes) {
+    for ( let herbe of listeHerbes) {
-      let herbeData = herbe.system
+      let brins = max - herbe.system.niveau;
-      let brins = max - herbeData.niveau;
+      list[herbe.system.name] = `${herbe.system.name} (Bonus: ${herbe.system.niveau}, Brins: ${brins})`;
-      list[herbe.data.name] = `${herbe.data.name} (Bonus: ${herbeData.niveau}, Brins: ${brins})`;
     }
     list['Autre'] = 'Autre (Bonus: variable, Brins: variable)'
     return list;
@@ -39,36 +36,39 @@ export class RdDHerbes extends Item {
     formData.herbesRepos = this.buildHerbesList(this.herbesRepos, 7);
     formData.jourMoisOptions = RdDCalendrier.buildJoursMois();
     formData.dateActuelle = game.system.rdd.calendrier.getDateFromIndex();
-    formData.splitDate = game.system.rdd.calendrier.getNumericDateFromIndex(formData.data.prdate);
+    formData.splitDate = game.system.rdd.calendrier.getNumericDateFromIndex(formData.system.prdate);
 
-    if (formData.data.categorie.includes('Soin') ) {
+    if (formData.system.categorie.includes('Soin') ) {
       formData.isHerbe = true;
       this.computeHerbeBonus(formData, this.herbesSoins, 12);
-    } else if (formData.data.categorie.includes('Repos')) {
+    } else if (formData.system.categorie.includes('Repos')) {
       formData.isRepos = true;
       this.computeHerbeBonus(formData, this.herbesRepos, 7);
     }
   }
 
   /* -------------------------------------------- */
-  static calculePointsRepos( data ) {
+  static calculePuissancePotion( potion ) {
-    return data.herbebonus * data.pr;
+    return potion.system.herbebonus * potion.system.pr;
   }
 
   /* -------------------------------------------- */
-  static calculePointsGuerison( data ){
+  static calculePointsRepos( potion ) {
-    return data.herbebonus * data.pr;
+    return potion.system.herbebonus * potion.system.pr;
+  }
+
+  /* -------------------------------------------- */
+  static calculePointsGuerison( potion ){
+    return potion.system.herbebonus * potion.system.pr;
   }
 
   /* -------------------------------------------- */
   static computeHerbeBonus( formData, herbesList, max) {
-    if ( Number(formData.data.herbebrins) ) {
+    if ( Number(formData.system.herbebrins) ) {
-    let herbe = herbesList.find(item => item.name.toLowerCase() == formData.data.herbe.toLowerCase() );
+    let herbe = herbesList.find(item => item.name.toLowerCase() == formData.system.herbe.toLowerCase() );
       if( herbe ) {
-        let herbeData = herbe.system;
+        let brinsBase = max - herbe.system.niveau;
-        let brinsBase = max - herbeData.niveau;
+        formData.system.herbebonus = Math.max(herbe.system.niveau - Math.max(brinsBase - formData.system.herbebrins, 0), 0);
-        //console.log(herbeData, brinsBase, formData.data.herbebrins);
-        formData.data.herbebonus = Math.max(herbeData.niveau - Math.max(brinsBase - formData.data.herbebrins, 0), 0);
       }
     }
   }  

module/rdd-hotbar-drop.js

@@ -2,6 +2,16 @@ 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
@@ -10,8 +20,7 @@ export class RdDHotbar {
    */
   static initDropbar() {
 
-    Hooks.on("hotbarDrop", async (bar, documentData, slot) => {
+    Hooks.on("hotbarDrop", (bar, documentData, slot) => {
-
 
       // Create item macro if rollable item - weapon, spell, prayer, trait, or skill
       if (documentData.type == "Item") {
@@ -21,23 +30,19 @@ export class RdDHotbar {
         }
         console.log("DROP", documentData, item)
         if (!item || (item.type != "arme" && item.type != "competence")) {
-        return
+          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 = await Macro.create({
+          macro = this.createMacro(item, command)
-          name: item.name,
-          type: "script",
-          img: item.img,
-          command: command
-        }, { displaySheet: false })
         }
         game.user.assignHotbarMacro(macro, slot);
+        return false
       }
 
           // Create a macro to open the actor sheet of the actor dropped on the hotbar
-    else if (documentData.type == "Actor") {
+    /*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));
@@ -45,12 +50,13 @@ export class RdDHotbar {
         macro = await Macro.create({
           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 = fromUuidSync(documentData.uuid)
@@ -65,8 +71,8 @@ export class RdDHotbar {
         }, { displaySheet: false })
         game.user.assignHotbarMacro(macro, slot);
       }
-    }
+    }*/
-    return false;
+    return true;
   });
 }
 

module/rdd-main.js

@@ -35,6 +35,7 @@ import { RdDDice } from "./rdd-dice.js";
 import { RdDPossession } from "./rdd-possession.js";
 import { RdDSigneDraconiqueItemSheet } from "./item-signedraconique-sheet.js";
 import { Misc } from "./misc.js";
+import { Migrations } from './migrations.js';
 
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
@@ -183,7 +184,7 @@ Hooks.once("init", async function () {
   Items.registerSheet(SYSTEM_RDD, RdDItemSheet, {
     types: ["arme", "armure", "objet", "arme", "armure", "conteneur", "competence", "sort", "herbe", "ingredient", "livre", "potion", "munition", "rencontresTMR", "queue", "ombre", "souffle",
       "tete", "competencecreature", "tarot", "monnaie", "nombreastral", "tache", "meditation", "casetmr", "recettealchimique", "gemme",
-      "musique", "chant", "danse", "jeu", "recettecuisine", "maladie", "poison", "oeuvre", "nourritureboisson", "possession"], makeDefault: true
+      "musique", "chant", "danse", "jeu", "recettecuisine", "maladie", "poison", "oeuvre", "nourritureboisson", "possession", "sortreserve"], makeDefault: true
   });
   CONFIG.Combat.documentClass = RdDCombatManager;
 
@@ -245,6 +246,9 @@ function registerUsageCount( registerKey ) {
 /* -------------------------------------------- */
 Hooks.once("ready", async function () {
   await migrationPngWebp_1_5_34()
+  if (Misc.isUniqueConnectedGM()) {
+    new Migrations().migrate();
+  }
 
   StatusEffects.onReady();
   RdDHerbes.initializeHerbes();
@@ -292,8 +296,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)) {
+      if (actor.token?.img && actor.token.img.match(regexOldPngJpg)) {
-        actor.update({ "token.img": convertImgToWebp(actor.data.token.img) });
+        actor.update({ "token.img": convertImgToWebp(actor.token.img) });
       }
       const actorItemsToUpdate = prepareDocumentsImgUpdate(actor.items);
       actor.updateEmbeddedDocuments('Item', actorItemsToUpdate);

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'
@@ -159,7 +159,7 @@ export class RdDPossession {
     let possessionData = {
       name: "Possession en cours de " + attacker.name, type: 'possession',
       img: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp",
-      data: { description: "", typepossession: attacker.name, possede: false, possessionid: randomID(16), possesseurid: attacker.id, possedeid: defender.id, date: 0, compteur: 0 }
+      system: { description: "", typepossession: attacker.name, possede: false, possessionid: randomID(16), possesseurid: attacker.id, possedeid: defender.id, date: 0, compteur: 0 }
     }
     // Creates only the possession on the personnage side
     let poss = await defender.createEmbeddedDocuments('Item', [possessionData])

module/rdd-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;

module/rdd-roll.js

@@ -166,7 +166,7 @@ export class RdDRoll extends Dialog {
     function onLoad() {
       let rollData = dialog.rollData;
       console.log('Ouverture RdDRoll', rollData);
-      // Update html, according to data
+      // Update html, according to rollData
       if (rollData.competence) {
         const defaut_carac = rollData.competence.system.defaut_carac
         // Set the default carac from the competence item
@@ -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();
     });
@@ -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;
   }

module/rdd-rolltables.js

@@ -25,7 +25,7 @@ export class RdDRollTables {
   /* -------------------------------------------- */
   static async drawTextFromRollTable(tableName, toChat) {
     const drawResult = await RdDRollTables.genericGetTableResult(tableName, toChat);
-    return drawResult.system.text;
+    return drawResult.data.text;
   }
 
   /* -------------------------------------------- */

module/rdd-sheet-utility.js

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

module/rdd-tmr-dialog.js

@@ -1,4 +1,3 @@
-import { SYSTEM_SOCKET_ID } from "./constants.js";
 import { RollDataAjustements } from "./rolldata-ajustements.js";
 import { RdDUtility } from "./rdd-utility.js";
 import { TMRUtility } from "./tmr-utility.js";
@@ -16,6 +15,7 @@ import { Misc } from "./misc.js";
 import { HtmlUtility } from "./html-utility.js";
 import { ReglesOptionelles } from "./regles-optionelles.js";
 import { RdDDice } from "./rdd-dice.js";
+import { STATUSES } from "./status-effects.js";
 /* -------------------------------------------- */
 
 export class RdDTMRDialog extends Dialog {
@@ -55,7 +55,6 @@ export class RdDTMRDialog extends Dialog {
     this.fatigueParCase = this.viewOnly || !ReglesOptionelles.isUsing("appliquer-fatigue") ? 0 : this.actor.getTMRFatigue();
     this.cumulFatigue = 0;
     this.loadRencontres();
-    this.loadSortsReserve();
     this.loadCasesSpeciales();
     this.allTokens = [];
     this.rencontreState = 'aucune';
@@ -81,9 +80,16 @@ export class RdDTMRDialog extends Dialog {
     this.casesSpeciales = this.actor.items.filter(item => Draconique.isCaseTMR(item));
   }
 
-  /* -------------------------------------------- */
+  get sortsReserve() {
-  loadSortsReserve() {
+    return this.actor.itemTypes['sortreserve'];
-    this.sortsReserves = this.actor.system.reve.reserve.list;
+  }
+
+  getSortsReserve(coord) {
+    return this.actor.itemTypes['sortreserve'].filter(// Reserve sur une case fleuve ou normale
+      TMRUtility.getTMR(coord).type == 'fleuve'
+        ? it => TMRUtility.getTMR(it.system.coord).type == 'fleuve'
+        : it => it.system.coord == coord
+      );
   }
 
   /* -------------------------------------------- */
@@ -117,7 +123,6 @@ export class RdDTMRDialog extends Dialog {
   updateTokens() {
     this._removeTokens(t => true);
     this.loadRencontres();
-    this.loadSortsReserve();
     this.loadCasesSpeciales();
     this._createTokens();
   }
@@ -136,7 +141,7 @@ export class RdDTMRDialog extends Dialog {
     return this.rencontresExistantes.map(it => this._tokenRencontre(it));
   }
   _getTokensSortsReserve() {
-    return this.sortsReserves.map(it => this._tokenSortEnReserve(it));
+    return this.actor.itemTypes['sortreserve'].map(it => this._tokenSortEnReserve(it));
   }
 
   /* -------------------------------------------- */
@@ -148,8 +153,8 @@ export class RdDTMRDialog extends Dialog {
     const draconique = Draconique.get(caseData.system.specific);
     return draconique?.token(this.pixiTMR, caseData, () => caseData.system.coord);
   }
-  _tokenSortEnReserve(sortEnReserve) {
+  _tokenSortEnReserve(sortReserve) {
-    return EffetsDraconiques.sortReserve.token(this.pixiTMR, sortEnReserve.sort, () => sortEnReserve.coord);
+    return EffetsDraconiques.sortReserve.token(this.pixiTMR, sortReserve, () => sortReserve.system.coord);
   }
 
   _tokenDemiReve() {
@@ -209,24 +214,12 @@ export class RdDTMRDialog extends Dialog {
       this.actor.rollLireSigneDraconique(this._getActorCoord());
     });
 
-    html.find('#dir-top').click((event) => {
+    html.find('#dir-top').click((event) => this.moveFromKey("top"));
-      this.moveFromKey("top");
+    html.find('#dir-top-left').click((event) => this.moveFromKey("top-left"));
-    });
+    html.find('#dir-top-right').click((event) => this.moveFromKey("top-right"));
-    html.find('#dir-top-left').click((event) => {
+    html.find('#dir-bottom-left').click((event) => this.moveFromKey("bottom-left"));
-      this.moveFromKey("top-left");
+    html.find('#dir-bottom-right').click((event) => this.moveFromKey("bottom-right"));
-    });
+    html.find('#dir-bottom').click((event) => this.moveFromKey("bottom"));
-    html.find('#dir-top-right').click((event) => {
-      this.moveFromKey("top-right");
-    });
-    html.find('#dir-bottom-left').click((event) => {
-      this.moveFromKey("bottom-left");
-    });
-    html.find('#dir-bottom-right').click((event) => {
-      this.moveFromKey("bottom-right");
-    });
-    html.find('#dir-bottom').click((event) => {
-      this.moveFromKey("bottom");
-    });
 
     // Gestion du cout de montée en points de rêve
     let reveCout = ((this.tmrdata.isRapide && !EffetsDraconiques.isDeplacementAccelere(this.actor)) ? -2 : -1) - this.actor.countMonteeLaborieuse();
@@ -238,13 +231,14 @@ export class RdDTMRDialog extends Dialog {
     // Le reste...
     this.updateValuesDisplay();
     let tmr = TMRUtility.getTMR(this._getActorCoord());
-    await this.manageRencontre(tmr, () => {
+    await this.manageRencontre(tmr);
-      this.postRencontre(tmr);
-    });
   }
 
   /* -------------------------------------------- */
   async updateValuesDisplay() {
+    if (!this.rendered) {
+      return;
+    }
     const coord = this._getActorCoord();
 
     HtmlUtility._showControlWhen($(".lire-signe-draconique"), this.actor.isResonanceSigneDraconique(coord));
@@ -254,9 +248,9 @@ export class RdDTMRDialog extends Dialog {
 
     let tmrpos = document.getElementById("tmr-pos");
     if (this.isDemiReveCache()) {
-      tmrpos.innerHTML = '?? (' + TMRUtility.getTMRType(coord) + ')';
+      tmrpos.innerHTML = `?? ( ${ TMRUtility.getTMRType(coord)})`;
     } else {
-      tmrpos.innerHTML = coord + " (" + TMRUtility.getTMRLabel(coord) + ")";
+      tmrpos.innerHTML = `${coord} ( ${TMRUtility.getTMRLabel(coord)})`;
     }
 
     let etat = document.getElementById("tmr-etatgeneral-value");
@@ -267,21 +261,22 @@ export class RdDTMRDialog extends Dialog {
 
     if (ReglesOptionelles.isUsing("appliquer-fatigue")) {
       let fatigueItem = document.getElementById("tmr-fatigue-table");
-      //console.log("Refresh : ", actorData.data.sante.fatigue.value);
       fatigueItem.innerHTML = "<table class='table-fatigue'>" + RdDUtility.makeHTMLfatigueMatrix(this.actor.system.sante.fatigue.value, this.actor.system.sante.endurance.max).html() + "</table>";
     }
   }
 
   /* -------------------------------------------- */
-  close() {
+  async close() {
+    this.descenteTMR = true;
     if (this.actor.tmrApp) {
       this.actor.tmrApp = undefined; // Cleanup reference
       if (!this.viewOnly) {
-        this.actor.setStatusEffect("EFFECT.StatusDemiReve", false);
+        await this.actor.setEffect(STATUSES.StatusDemiReve, false)
         this._tellToGM(this.actor.name + " a quitté les terres médianes");
       }
-      this.actor.santeIncDec("fatigue", this.cumulFatigue).then(super.close()); // moving 1 cell costs 1 fatigue
+      await this.actor.santeIncDec("fatigue", this.cumulFatigue)
     }
+    await super.close(); // moving 1 cell costs 1 fatigue
   }
 
   /* -------------------------------------------- */
@@ -317,11 +312,11 @@ export class RdDTMRDialog extends Dialog {
     this.currentRencontre.graphics = []; // Keep track of rectangles to delete it
     this.currentRencontre.locList = duplicate(listCoordTMR); // And track of allowed location
     for (let coordTMR of listCoordTMR) {
-      let rect = this._getCaseRectangleCoord(coordTMR);
+      const rect = this._getCaseRectangleCoord(coordTMR);
-      var rectDraw = new PIXI.Graphics();
+      const rectDraw = new PIXI.Graphics();
-      rectDraw.beginFill(0xFFFF00, 0.3);
+      rectDraw.beginFill(0xffff00, 0.3);
       // set the line style to have a width of 5 and set the color to red
-      rectDraw.lineStyle(5, 0xFF0000);
+      rectDraw.lineStyle(5, 0xff0000);
       // draw a rectangle
       rectDraw.drawRect(rect.x, rect.y, rect.w, rect.h);
       this.pixiApp.stage.addChild(rectDraw);
@@ -337,19 +332,13 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   async choisirCasePortee(coord, portee) {
-    if (this.actor.isTMRCache())
-    {
-      return;
-    }
     // Récupère la liste des cases à portées
-    let locList = TMRUtility.getTMRPortee(coord, portee);
+    this.colorierZoneRencontre(TMRUtility.getTMRPortee(coord, portee));
-    this.colorierZoneRencontre(locList);
   }
 
   /* -------------------------------------------- */
   async choisirCaseType(type) {
-    const locList = TMRUtility.filterTMR(it => it.type == type).map(it => it.coord);
+    this.colorierZoneRencontre(TMRUtility.filterTMR(it => it.type == type).map(it => it.coord));
-    this.colorierZoneRencontre(locList);
   }
 
   /* -------------------------------------------- */
@@ -484,12 +473,13 @@ export class RdDTMRDialog extends Dialog {
   }
 
   /* -------------------------------------------- */
-  async manageRencontre(tmr, postRencontre) {
+  async manageRencontre(tmr) {
     if (this.viewOnly) {
       return;
     }
+    this.descenteTMR = false;
     this.currentRencontre = undefined;
-    if (this._presentCite(tmr, postRencontre)) {
+    if (this._presentCite(tmr)) {
       return;
     }
     let rencontre = await this._jetDeRencontre(tmr);
@@ -499,27 +489,27 @@ export class RdDTMRDialog extends Dialog {
       console.log("manageRencontre", rencontre);
       this.currentRencontre = duplicate(rencontre);
 
-      let dialog = new RdDTMRRencontreDialog("", this, this.currentRencontre, postRencontre);
+      let dialog = new RdDTMRRencontreDialog(this, this.currentRencontre, () => this.postRencontre(tmr));
       dialog.render(true);
     }
     else {
-      postRencontre();
+      this.postRencontre(tmr);
     }
   }
 
   /* -------------------------------------------- */
-  _presentCite(tmr, postRencontre) {
+  _presentCite(tmr) {
     const presentCite = this.casesSpeciales.find(c => EffetsDraconiques.presentCites.isCase(c, tmr.coord));
     if (presentCite) {
       this.minimize();
       const caseData = presentCite;
-      EffetsDraconiques.presentCites.choisirUnPresent(caseData, (type => this._utiliserPresentCite(presentCite, type, tmr, postRencontre)));
+      EffetsDraconiques.presentCites.choisirUnPresent(caseData, (type => this._utiliserPresentCite(presentCite, type, tmr)));
     }
     return presentCite;
   }
 
   /* -------------------------------------------- */
-  async _utiliserPresentCite(presentCite, typeRencontre, tmr, postRencontre) {
+  async _utiliserPresentCite(presentCite, typeRencontre, tmr) {
     this.currentRencontre = TMRRencontres.getRencontre(typeRencontre);
     await TMRRencontres.evaluerForceRencontre(this.currentRencontre);
     await EffetsDraconiques.presentCites.ouvrirLePresent(this.actor, presentCite);
@@ -538,7 +528,7 @@ export class RdDTMRDialog extends Dialog {
     await this._tentativeMaitrise(rencontreData);
 
     this.maximize();
-    postRencontre();
+    this.postRencontre(tmr);
   }
 
   /* -------------------------------------------- */
@@ -574,6 +564,9 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   async manageTmrInnaccessible(tmr) {
+    if (!tmr) {
+      return await this.actor.reinsertionAleatoire('Sortie de carte');
+    }
     const caseTmrInnaccessible = this.casesSpeciales.find(c => EffetsDraconiques.isInnaccessible(c, tmr.coord));
     if (caseTmrInnaccessible) {
       return await this.actor.reinsertionAleatoire(caseTmrInnaccessible.name);
@@ -606,7 +599,6 @@ export class RdDTMRDialog extends Dialog {
 
   async _resultatMaitriseCaseHumide(rollData) {
     await this.souffleSiEchecTotal(rollData);
-    this.toclose = rollData.rolled.isEchec;
     if (rollData.rolled.isSuccess && rollData.double) {
       rollData.previous = { rolled: rollData.rolled, ajustements: rollData.ajustements };
       rollData.double = undefined;
@@ -619,7 +611,7 @@ export class RdDTMRDialog extends Dialog {
       content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-resultat-maitrise-tmr.html`, rollData)
     });
     if (rollData.rolled.isEchec) {
-      this.close();
+      await this.close();
     }
   }
 
@@ -729,8 +721,6 @@ export class RdDTMRDialog extends Dialog {
     if (rollData.rolled.isETotal) {
       rollData.souffle = await this.actor.ajouterSouffle({ chat: false });
     }
-    this.toclose = rollData.rolled.isEchec;
-
     rollData.poesie = await Poetique.getExtrait();
     ChatMessage.create({
       whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
@@ -775,9 +765,8 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   async declencheSortEnReserve(coord) {
-
+    let sorts = this.getSortsReserve(coord);
-    let sortsEnCoord = TMRUtility.getSortsReserve(this.sortsReserves, coord);
+    if (sorts.length > 0) {
-    if (sortsEnCoord.length > 0) {
       if (EffetsDraconiques.isSortReserveImpossible(this.actor)) {
         ui.notifications.error("Une queue ou un souffle vous empèche de déclencher de sort!");
         return;
@@ -785,8 +774,8 @@ export class RdDTMRDialog extends Dialog {
       if (!EffetsDraconiques.isUrgenceDraconique(this.actor) &&
         (EffetsDraconiques.isReserveEnSecurite(this.actor) || this.isReserveExtensible(coord))) {
         let msg = "Vous êtes sur une case avec un Sort en Réserve. Grâce à votre Tête <strong>Reserve en Sécurité</strong> ou <strong>Réserve Exensible</strong>, vous pouvez contrôler le déclenchement. Cliquez si vous souhaitez le déclencher : <ul>";
-        for (let sortReserve of sortsEnCoord) {
+        for (let sort of sorts) {
-          msg += "<li><a class='chat-card-button' id='sort-reserve' data-actor-id='" + this.actor._id + "' data-tmr-coord='" + coord + "' data-sort-id='" + sortReserve.sort._id + "'>" + sortReserve.sort.name + "</a></li>";
+          msg += `<li><a class="chat-card-button declencher-sort-reserve" data-actor-id="${this.actor.id}" data-tmr-coord="${coord}" data-sort-id='${sort.id}">${sort.name}</a></li>`;
         }
         msg += "</ol>";
         ChatMessage.create({
@@ -795,33 +784,35 @@ export class RdDTMRDialog extends Dialog {
         });
         return;
       }
-      await this.processSortReserve(sortsEnCoord[0]);
+      await this.processSortReserve(sorts[0]);
     }
   }
 
   /* -------------------------------------------- */
   lancerSortEnReserve(coord, sortId) {
-    let sortEnCoord = TMRUtility.getSortsReserve(this.sortsReserves, coord);
+    let sorts = this.getSortsReserve(coord);
-    let sortReserve = sortEnCoord.find(sortReserve => sortReserve.sort._id == sortId);
+    let sort = sorts.find(it => it.id == sortId);
-    if (sortReserve) {
+    if (sort) {
-      this.processSortReserve(sortReserve);
+      this.processSortReserve(sort);
     } else {
       ChatMessage.create({
-        content: "Une erreur est survenue : impossible de récupérer le sort en réserve demandé.",
+        content:
-        whisper: ChatMessage.getWhisperRecipients(game.user.name)
+          "Une erreur est survenue : impossible de récupérer le sort en réserve demandé.",
+        whisper: ChatMessage.getWhisperRecipients(game.user.name),
       });
     }
   }
 
   /* -------------------------------------------- */
   async processSortReserve(sortReserve) {
-    await this.actor.deleteSortReserve(sortReserve);
+    await this.actor.deleteEmbeddedDocuments('Item', [sortReserve.id]);
-    //this.updateSortReserve();
+    console.log("declencheSortEnReserve", sortReserve);
-    console.log("declencheSortEnReserve", sortReserve)
+    this._tellToUserAndGM(`Vous avez déclenché 
-    this._tellToUserAndGM(`Vous avez déclenché le sort en réserve <strong> ${sortReserve.sort.name}</strong>
+        ${sortReserve.system.echectotal ? "<strong>l'échec total!</strong>" : "le sort"}
-        avec ${sortReserve.sort.system.ptreve_reel} points de Rêve
+        en réserve <strong>${sortReserve.name}</strong>
-        en ${sortReserve.coord} (${TMRUtility.getTMRLabel(sortReserve.coord)})
+        avec ${sortReserve.system.ptreve} points de Rêve
-        `);
+        en ${sortReserve.system.coord} (${TMRUtility.getTMRLabel(sortReserve.system.coord)}).
+        L'heure ciblée est ${sortReserve.system.heurecible}`);
     this.close();
   }
 
@@ -873,7 +864,6 @@ export class RdDTMRDialog extends Dialog {
     if (this.viewOnly) {
       return;
     }
-
     let clickOddq = RdDTMRDialog._computeEventOddq(event.data.originalEvent);
     await this._onClickTMRPos(clickOddq); // Vérifier l'état des compteurs reve/fatigue/vie
   }
@@ -928,7 +918,7 @@ export class RdDTMRDialog extends Dialog {
 
     const isInArea = this.rencontreState == 'aucune'
       ? (this.isTerreAttache(targetCoord) || this.isConnaissanceFleuve(currentCoord, targetCoord) || TMRUtility.distanceOddq(fromOddq, toOddq) <= 1)
-      : this.currentRencontre?.locList.find(coord => coord == targetCoord) ?? false
+      : this.currentRencontre?.locList?.find(coord => coord == targetCoord) ?? false
     if (isInArea) {
       switch (this.rencontreState) {
         case 'aucune': return 'normal';
@@ -977,7 +967,7 @@ export class RdDTMRDialog extends Dialog {
     this.actor.notifyRefreshTMR();
 
     if (deplacementType == 'normal') { // Pas de rencontres après un saut de type passeur/changeur/...
-      await this.manageRencontre(tmr, () => this.postRencontre(tmr));
+      await this.manageRencontre(tmr);
     }
     else {
       await this.postRencontre(tmr);
@@ -996,13 +986,14 @@ export class RdDTMRDialog extends Dialog {
   /* -------------------------------------------- */
   async postRencontre(tmr) {
     if (!(this.viewOnly || this.currentRencontre)) {
-      await this.manageCaseHumide(tmr);
+      // TODO: vérifier que la méthode s'arrête en cas de non-maîtrise
-      await this.conquerirCiteFermee(tmr);
+      if (!this.descenteTMR) await this.manageCaseHumide(tmr);
-      await this.purifierPeriple(tmr);
+      if (!this.descenteTMR) await this.conquerirCiteFermee(tmr);
-      await this.conquerirTMR(tmr);
+      if (!this.descenteTMR) await this.purifierPeriple(tmr);
-      await this.validerVisite(tmr);
+      if (!this.descenteTMR) await this.conquerirTMR(tmr);
-      await this.declencheSortEnReserve(tmr.coord);
+      if (!this.descenteTMR) await this.validerVisite(tmr);
-      await this.actor.checkSoufflePeage(tmr);
+      if (!this.descenteTMR) await this.declencheSortEnReserve(tmr.coord);
+      if (!this.descenteTMR) await this.actor.checkSoufflePeage(tmr);
     }
   }
 
@@ -1021,7 +1012,7 @@ export class RdDTMRDialog extends Dialog {
     let x = origEvent.clientX - canvasRect.left;
     let y = origEvent.clientY - canvasRect.top;
     let col = Math.floor(x / tmrConstants.cellw); //  [From 0 -> 12]
-    y -= (col % 2 == 0) ? tmrConstants.col1_y : tmrConstants.col2_y;
+    y -= col % 2 == 0 ? tmrConstants.col1_y : tmrConstants.col2_y;
     let row = Math.floor(y / tmrConstants.cellh); //  [From 0 -> 14]
     return { col: col, row: row };
   }

module/rdd-tmr-rencontre-dialog.js

@@ -2,7 +2,7 @@
 export class RdDTMRRencontreDialog extends Dialog {
 
   /* -------------------------------------------- */
-  constructor(html, tmrApp, rencontre, postRencontre) {
+  constructor(tmrApp, rencontre, postRencontre) {
     const dialogConf = {
       title: "Rencontre en TMR!",
       content: "Vous rencontrez un " + rencontre.name + " de force " + rencontre.force + "<br>",

module/rdd-token-hud.js

@@ -8,7 +8,7 @@ export class RdDTokenHud {
 
   static init() {
     // Integration du TokenHUD
-    Hooks.on('renderTokenHUD', (app, html, data) => { RdDTokenHud.addTokenHudExtensions(app, html, data._id) });
+    Hooks.on('renderTokenHUD', (app, html, token) => { RdDTokenHud.addTokenHudExtensions(app, html, token._id) });
   }
 
   /* -------------------------------------------- */
@@ -63,7 +63,7 @@ export class RdDTokenHud {
         const actionIndex = event.currentTarget.attributes['data-action-index']?.value;
         const action = actionsCombat[actionIndex];
         if (action.action == 'conjurer') {
-          actor.conjurerPossession(actor.getPossession(action.data.possessionid));
+          actor.conjurerPossession(actor.getPossession(action.system.possessionid));
         }
         else {
           actor.rollArme(action);
@@ -76,7 +76,7 @@ export class RdDTokenHud {
       case 'inc': return RdDCombatManager.incDecInit(combatantId, 0.01);
       case 'dec': return RdDCombatManager.incDecInit(combatantId, -0.01);
       case 'autre': return RdDCombatManager.rollInitiativeAction(combatantId, 
-        { name: "Autre action", action: 'autre', data: { initOnly: true, competence: "Autre action" } });
+        { name: "Autre action", action: 'autre', system: { initOnly: true, competence: "Autre action" } });
     }
   }
 

module/rdd-utility.js

@@ -104,7 +104,7 @@ export class RdDUtility {
   /* -------------------------------------------- */
   static async init() {
     Hooks.on("renderChatMessage", async (app, html, msg) => RdDUtility.onRenderChatMessage(app, html, msg));
-    Hooks.on('renderChatLog', (log, html, data) => RdDUtility.chatListeners(html));
+    Hooks.on('renderChatLog', (log, html, chatLog) => RdDUtility.chatListeners(html));
   }
 
   /* -------------------------------------------- */
@@ -121,8 +121,10 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html',
       // Conteneur/item in Actor sheet
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-item-queue.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html',
       "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html",
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html',
@@ -130,6 +132,7 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html',
       //Items
+      'systems/foundryvtt-reve-de-dragon/templates/header-item.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-competence-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-competencecreature-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-arme-sheet.html',
@@ -390,6 +393,7 @@ export class RdDUtility {
     formData.possessions = this.arrayOrEmpty(formData.itemsByType['possession']);
     formData.maladiesPoisons = formData.maladies.concat(formData.poisons);
     formData.competences = (formData.itemsByType.competence ?? []).concat(formData.itemsByType.competencecreature ?? []);
+    formData.sortsReserve = this.arrayOrEmpty(formData.itemsByType['sortreserve']);
   }
 
   static filterEquipementParType(formData) {
@@ -445,16 +449,16 @@ export class RdDUtility {
 
   /* -------------------------------------------- */
   static calculEncContenu(conteneur, objets) {
-    const contenuDatas = (conteneur.system.contenu ?? []).filter(id => id != undefined)
+    const contenus = (conteneur.system.contenu ?? []).filter(id => id != undefined)
-      .map(id => objets.find(it => (id == it._id)))
+      .map(id => objets.find(it => (id == it.id)))
       .filter(it => it);
     let enc = Number(conteneur.system.encombrement ?? 0) * Number(conteneur.system.quantite ?? 1);
-    for (let itemData of contenuDatas) {
+    for (let contenu of contenus) {
-      if (itemData.type == 'conteneur') {
+      if (contenu.type == 'conteneur') {
-        enc += RdDUtility.calculEncContenu(itemData, objets);
+        enc += RdDUtility.calculEncContenu(contenu, objets);
       }
       else {
-        enc += Number(itemData.system.encombrement ?? 0) * Number(itemData.system.quantite ?? 1)
+        enc += Number(contenu.system.encombrement ?? 0) * Number(contenu.system.quantite ?? 1)
       }
     }
     return enc
@@ -653,9 +657,9 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static async responseNombreAstral(data) {
+  static async responseNombreAstral(callData) {
-    let actor = game.actors.get(data.id);
+    let actor = game.actors.get(callData.id);
-    actor.ajouteNombreAstral(data);
+    actor.ajouteNombreAstral(callData);
   }
 
   /* -------------------------------------------- */
@@ -690,12 +694,13 @@ export class RdDUtility {
       actor.tmrApp.positionnerDemiReve(coord);
     });
     // Gestion spécifique des sorts en réserve multiples (ie têtes)
-    html.on("click", '#sort-reserve', event => {
+    html.on("click", '.declencher-sort-reserve', event => {
       let coord = event.currentTarget.attributes['data-tmr-coord'].value;
       let sortId = event.currentTarget.attributes['data-sort-id'].value;
       let actorId = event.currentTarget.attributes['data-actor-id'].value;
       let actor = game.actors.get(actorId);
       actor.tmrApp.lancerSortEnReserve(coord, sortId);
+      // TODO: supprimer le message?
     });
 
     // gestion bouton tchat Possession
@@ -753,7 +758,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) {
         return token.actor;
       }
       if (msgPlayer != undefined) {
@@ -776,7 +781,7 @@ export class RdDUtility {
   static createMonnaie(name, valeur_deniers, img = "", enc = 0.01) {
     let piece = {
       name: name, type: 'monnaie', img: img, _id: randomID(16),
-      data: {
+      dasystemta: {
         quantite: 0,
         valeur_deniers: valeur_deniers,
         encombrement: enc,
@@ -828,21 +833,17 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static confirmerSuppressionSubacteur(actorSheet, li) {
+  static confirmerSuppression(sheet, htmlToDelete, options) {
-    let actorId = li.data("actor-id");
+    const d = new Dialog({
-    let actor = game.actors.get(actorId);
+      title: options.title ?? 'Confirmer la suppression',
-    let msgTxt = "<p>Etes vous certain de vouloir supprimer le lien vers ce véhicule/monture/suivant : " + actor.name + " ?</p>";
+      content: `<p>Etes vous certain de vouloir supprimer ${options.supprimer ?? 'cet objet'} ?</p>`,
-    let d = new Dialog({
-      title: "Confirmer la suppression du lien",
-      content: msgTxt,
       buttons: {
         delete: {
           icon: '<i class="fas fa-check"></i>',
-          label: "Supprimer le lien",
+          label: options.deleteLabel ?? 'Supprimer',
           callback: () => {
-            console.log("Delete : ", actorId);
+            options.onDelete();
-            actorSheet.actor.removeSubacteur(actorId);
+            RdDUtility.slideOnDelete(sheet, htmlToDelete);
-            li.slideUp(200, () => actorSheet.render(false));
           }
         },
         cancel: {
@@ -856,11 +857,21 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static async confirmerSuppression(actorSheet, li) {
+  static confirmerSuppressionSubacteur(sheet, subActor, htmlToDelete) {
-    let itemId = li.data("item-id");
+    RdDUtility.confirmerSuppression(sheet, htmlToDelete,{
-    let objet = actorSheet.actor.getObjet(itemId);
+      supprimer: "le lien vers le véhicule/monture/suivant : " + subActor.name,
+      deleteLabel: "Supprimer le lien",
+      onDelete:  () => {
+       console.log("Delete : ", subActor.id);
+        sheet.actor.removeSubacteur(subActor.id);
+      }
+    })
+  }
 
-    if (objet.type == 'monnaie' && Monnaie.isSystemMonnaie(objet)) {
+  /* -------------------------------------------- */
+  static async confirmerSuppressionItem(sheet, item, htmlToDelete) {
+    const itemId = item.id;
+    if (Monnaie.isSystemMonnaie(item, sheet.actor.items)) {
       ui.notifications.warn("Suppression des monnaies de base impossible");
       return;
     }
@@ -872,8 +883,8 @@ export class RdDUtility {
         label: "Supprimer l'objet",
         callback: () => {
           console.log("Delete : ", itemId);
-          actorSheet.actor.deleteEmbeddedDocuments('Item', [itemId]);
+          sheet.actor.deleteEmbeddedDocuments('Item', [itemId], { renderSheet: false });
-          li.slideUp(200, () => actorSheet.render(false));
+          RdDUtility.slideOnDelete(sheet, htmlToDelete);
         }
       },
       cancel: {
@@ -881,15 +892,15 @@ export class RdDUtility {
         label: "Annuler"
       }
     }
-    if (objet.type == 'conteneur' && objet.system.contenu.length > 0) {
+    if (item.type == 'conteneur' && item.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>',
         label: "Supprimer le conteneur et tout son contenu",
         callback: () => {
           console.log("Delete : ", itemId);
-          actorSheet.actor.deleteAllConteneur(itemId);
+          sheet.actor.deleteAllConteneur(itemId, { renderSheet: false });
-          li.slideUp(200, () => actorSheet.render(false));
+          RdDUtility.slideOnDelete(sheet, htmlToDelete);
         }
       }
     }
@@ -903,6 +914,10 @@ export class RdDUtility {
     d.render(true);
   }
 
+  static slideOnDelete(sheet, htmlToDelete) {
+    return htmlToDelete.slideUp(200, () => sheet.render(false)); 
+  }
+
   /* -------------------------------------------- */
   static afficherHeuresChanceMalchance(heureNaissance) {
     if (game.user.isGM) {

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,

module/status-effects.js

@@ -1,26 +1,41 @@
 import { SYSTEM_RDD } from "./constants.js";
 
-const rddStatusEffects = [
+export const STATUSES = {
-  { rdd: true, id: 'stun', label: 'EFFECT.StatusStunned', icon: 'icons/svg/stoned.svg', "duration.rounds": 1 },
+  StatusStunned : 'stun',
-  { rdd: true, id: 'bleeding', label: 'EFFECT.StatusBleeding', icon: 'icons/svg/blood.svg' },
+  StatusBleeding: 'bleeding',
-  { rdd: true, id: 'prone', label: 'EFFECT.StatusProne', icon: 'icons/svg/falling.svg' },
+  StatusProne: 'prone',
-  { rdd: true, id: 'grappling', tint: '#33cc33', label: 'EFFECT.StatusGrappling', icon: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp' },
+  StatusGrappling: 'grappling',
-  { rdd: true, id: 'grappled', tint: '#ff9900', label: 'EFFECT.StatusGrappled', icon: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp' },
+  StatusGrappled: 'grappled',
-  { rdd: true, id: 'restrain', label: 'EFFECT.StatusRestrained', icon: 'icons/svg/net.svg' },
+  StatusRestrained: 'restrain',
-  { rdd: true, id: 'unconscious', label: 'EFFECT.StatusUnconscious', icon: 'icons/svg/unconscious.svg' },
+  StatusUnconscious: 'unconscious', 
-  { rdd: true, id: 'blind', label: 'EFFECT.StatusBlind', icon: 'icons/svg/blind.svg' },
+  StatusBlind: 'blind',
-  { rdd: true, id: 'comma', label: 'EFFECT.StatusComma', icon: 'icons/svg/skull.svg' },
+  StatusComma: 'comma',
-  { rdd: true, id: 'dead', label: 'EFFECT.StatusDead', icon: 'icons/svg/skull.svg' },
+  StatusDead: 'dead',
-  { rdd: true, id: 'demi-reve', label: 'EFFECT.StatusDemiReve', icon: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd12.svg' }
+  StatusDemiReve: 'demi-reve',
-];
+}
-const demiReveStatusEffect = rddStatusEffects.find(it => it.label == 'EFFECT.StatusDemiReve');
 
-const statusDemiSurprise = new Set(['EFFECT.StatusStunned', 'EFFECT.StatusProne', 'EFFECT.StatusRestrain']);
+const rddStatusEffects = [
-const statusSurpriseTotale = new Set(['EFFECT.StatusUnconscious', 'EFFECT.StatusBlind', 'EFFECT.StatusComma']);
+  { rdd: true, id: STATUSES.StatusStunned, label: 'EFFECT.StatusStunned', icon: 'icons/svg/stoned.svg', "duration.rounds": 1 },
+  { rdd: true, id: STATUSES.StatusBleeding, label: 'EFFECT.StatusBleeding', icon: 'icons/svg/blood.svg' },
+  { rdd: true, id: STATUSES.StatusProne, label: 'EFFECT.StatusProne', icon: 'icons/svg/falling.svg' },
+  { rdd: true, id: STATUSES.StatusGrappling, tint: '#33cc33', label: 'EFFECT.StatusGrappling', icon: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp' },
+  { rdd: true, id: STATUSES.StatusGrappled, tint: '#ff9900', label: 'EFFECT.StatusGrappled', icon: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp' },
+  { rdd: true, id: STATUSES.StatusRestrained, label: 'EFFECT.StatusRestrained', icon: 'icons/svg/net.svg' },
+  { rdd: true, id: STATUSES.StatusUnconscious, label: 'EFFECT.StatusUnconscious', icon: 'icons/svg/unconscious.svg' },
+  { rdd: true, id: STATUSES.StatusBlind, label: 'EFFECT.StatusBlind', icon: 'icons/svg/blind.svg' },
+  { rdd: true, id: STATUSES.StatusComma, label: 'EFFECT.StatusComma', icon: 'icons/svg/skull.svg' },
+  { rdd: true, id: STATUSES.StatusDead, label: 'EFFECT.StatusDead', icon: 'icons/svg/skull.svg' },
+  { rdd: true, id: STATUSES.StatusDemiReve, label: 'EFFECT.StatusDemiReve', icon: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd12.svg' }
+];
+const demiReveStatusEffect = rddStatusEffects.find(it => it.id == STATUSES.StatusDemiReve);
+
+const statusDemiSurprise = [STATUSES.StatusStunned, STATUSES.StatusProne, STATUSES.StatusRestrained];
+const statusSurpriseTotale = [STATUSES.StatusUnconscious, STATUSES.StatusBlind, STATUSES.StatusComma];
 
 export class StatusEffects {
   static onReady() {
     const rddStatusIds = rddStatusEffects.map(it => it.id);
+    rddStatusEffects.forEach(it => it.flags = { core: { statusId: it.id } });
     const defaultStatusEffectIds = CONFIG.statusEffects.map(it => it.id);
     game.settings.register(SYSTEM_RDD, "use-status-effects", {
       name: "use-status-effects",
@@ -47,40 +62,36 @@ export class StatusEffects {
 
   static valeurSurprise(effect, isCombat) {
     // const id = StatusEffects.statusId(effect);
-    if (statusSurpriseTotale.has(effect.label)) {
+    if (statusSurpriseTotale.includes(effect.flags?.core?.statusId)) {
       return 2;
     }
-    return statusDemiSurprise.has(effect.label) || (isCombat && effect.label == demiReveStatusEffect.label) ? 1 : 0;
+    return statusDemiSurprise.includes(effect.flags?.core?.statusId) || (isCombat && effect.flags?.core?.statusId == STATUSES.StatusDemiReve) ? 1 : 0;
-  }
-
-  static setMandatoryRdd() {
-    CONFIG.statusEffects.filter(it => statusDemiSurprise.has(it.id) || statusSurpriseTotale.has(it.id))
-      .forEach(it => it.rdd = true);
   }
 
   static _getUseStatusEffects() {
     const setting = game.settings.get(SYSTEM_RDD, "use-status-effects");
-    return setting ? new Set(setting.split(',')) : new Set();
+    return setting ? setting.split(',') : [];
   }
 
-  static _setUseStatusEffects(useStatusEffects) {
+  static _setUseStatusEffects(statusIds) {
     if (game.user.isGM) {
-      game.settings.set(SYSTEM_RDD, "use-status-effects", StatusEffects._toSetting(useStatusEffects));
+      game.settings.set(SYSTEM_RDD, "use-status-effects", StatusEffects._toSetting(statusIds));
     }
 
     for (let effect of CONFIG.RDD.allEffects) {
-      effect.active = effect.rdd || useStatusEffects.has(effect.id);
+      effect.active = effect.rdd || statusIds.includes(effect.flags?.core?.statusId);
     }
     CONFIG.statusEffects = CONFIG.RDD.allEffects.filter(it => it.active);
   }
 
-  static _toSetting(useStatusEffects) {
+  static _toSetting(statusIds) {
-    return Array.from(useStatusEffects).join();
+    return statusIds.join();
   }
 
-  static status(label) {
+  static status(statusId) {
-    return rddStatusEffects.find(it => it.label == label) ?? { label: label };
+    return rddStatusEffects.find(it => it.flags?.core?.statusId == statusId);
   }
+
   static demiReve() {
     return demiReveStatusEffect;
   }
@@ -106,8 +117,10 @@ class StatusEffectsSettings extends FormApplication {
   }
 
   getData() {
+    const used = StatusEffects._getUseStatusEffects();
     let formData = super.getData();
-    formData.effects = CONFIG.RDD.allEffects;
+    formData.effects = duplicate(CONFIG.RDD.allEffects);
+    formData.effects.forEach(it => it.active = used.includes(it.id))
     return formData;
   }
 
@@ -118,10 +131,10 @@ class StatusEffectsSettings extends FormApplication {
         let selected = StatusEffects._getUseStatusEffects();
         let isChecked = event.currentTarget.checked;
         if (isChecked) {
-          selected.add(id);
+          selected.push(id);
         }
         else {
-          selected.delete(id);
+          selected = selected.filter(it => it != id)
         }
         StatusEffects._setUseStatusEffects(selected);
       }

module/tmr-rencontres.js

@@ -433,9 +433,9 @@ export class TMRRencontres {
 
   /* -------------------------------------------- */
   static async msgEchecPasseurFou(tmrData) {
-    tmrData.sortReserve = tmrData.actor.system.reve.reserve.list[0];
+    tmrData.sortReserve = RdDDice.rollOneOf(tmrData.actor.itemTypes['sortreserve']);
     if (tmrData.sortReserve) {
-      // Passeur fou positionne sur la case d'un ort en réserve // TODO : Choisir le sort le plus loin ou au hasard
+      // Passeur fou positionne sur la case d'un sort en réserve
       tmrData.newTMR = TMRUtility.getTMR(tmrData.sortReserve.coord);
     } else {
       // Déplacement aléatoire de la force du Passeur Fou
@@ -468,10 +468,10 @@ export class TMRRencontres {
   }
 
   /* -------------------------------------------- */
-  static async onPostEchecTourbillonRouge(tmrDialog, data) {
+  static async onPostEchecTourbillonRouge(tmrDialog, rencontre) {
-    await data.actor.reveActuelIncDec(-2); // -2 pts de Reve a chaque itération
+    await rencontre.actor.reveActuelIncDec(-2); // -2 pts de Reve a chaque itération
-    TMRRencontres._toubillonner(tmrDialog, data.actor, 4);
+    TMRRencontres._toubillonner(tmrDialog, rencontre.actor, 4);
-    await data.actor.santeIncDec("vie", -1); // Et -1 PV
+    await rencontre.actor.santeIncDec("vie", -1); // Et -1 PV
   }
 
   /* -------------------------------------------- */

module/tmr-utility.js

@@ -379,18 +379,6 @@ export class TMRUtility {
     return await RdDDice.rollOneOf(TMRUtility.filterTMR(filter))
   }
 
-  /* -------------------------------------------- */
-  static getSortsReserve(reserveList, coord) {
-    // TODO : Gérer les têtes spéciales réserve!
-    let tmrDescr = this.getTMR(coord);
-    //console.log("Sort réserve : ", tmrDescr);
-    if (tmrDescr.type == 'fleuve') { // Gestion de la reserve en Fleuve
-      return reserveList.filter(it => TMRUtility.getTMR(it.coord).type == 'fleuve');
-    }
-    // Reserve sur un case "normale"
-    return reserveList.filter(it => it.coord == coord);
-  }
-
   /* -------------------------------------------- */
   /** Returns a list of case inside a given distance
    * 

module/tmr/conquete.js

@@ -1,5 +1,4 @@
 import { Grammar } from "../grammar.js";
-import { Misc } from "../misc.js";
 import { RdDDice } from "../rdd-dice.js";
 import { TMRUtility } from "../tmr-utility.js";
 import { tmrConstants, tmrColors, tmrTokenZIndex } from "../tmr-constants.js";

module/tmr/draconique.js

@@ -9,11 +9,11 @@ const registeredEffects = [
  * Définition des informations d'une "draconique" (queue, ombre, tête, souffle) qui influence les TMR
  */
 export class Draconique {
-  static isCaseTMR(itemData) { return itemData.type == 'casetmr'; }
+  static isCaseTMR(item) { return item.type == 'casetmr'; }
-  static isQueueDragon(itemData) { return itemData.type == 'queue' || itemData.type == 'ombre'; }
+  static isQueueDragon(item) { return item.type == 'queue' || item.type == 'ombre'; }
-  static isSouffleDragon(itemData) { return itemData.type == 'souffle'; }
+  static isSouffleDragon(item) { return item.type == 'souffle'; }
-  static isTeteDragon(itemData) { return itemData.type == 'tete'; }
+  static isTeteDragon(item) { return item.type == 'tete'; }
-  static isQueueSouffle(itemData) { return Draconique.isQueueDragon(itemData) || Draconique.isSouffleDragon(itemData); }
+  static isQueueSouffle(item) { return Draconique.isQueueDragon(item) || Draconique.isSouffleDragon(item); }
 
   tmrLabel(linkData) { return TMRUtility.getTMRLabel(linkData.system.coord); }
 
@@ -38,8 +38,7 @@ export class Draconique {
    * @returns true si l'item correspond
    */
   match(item) {
-    const itemData = item;
+    return Draconique.isQueueDragon(item) || Draconique.isSouffleDragon(item) || Draconique.isTeteDragon(item);
-    return Draconique.isQueueDragon(itemData) || Draconique.isSouffleDragon(itemData) || Draconique.isTeteDragon(itemData);
   }
 
   /**

module/tmr/effets-draconiques.js

@@ -112,7 +112,7 @@ export class EffetsDraconiques {
   }
 
   static filterItems(actor, filter, name) {
-    return actor.filter(filter)
+    return actor.filterItems(filter)
       .filter(it => Grammar.includesLowerCaseNoAccent(it.name, name));
   }
 

module/tmr/pixi-tmr.js

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

module/tmr/sort-reserve.js

@@ -12,8 +12,8 @@ export class SortReserve extends Draconique {
   manualMessage() { return false }
   async onActorCreateOwned(actor, item) { }
 
-  code() { return 'sort' }
+  code() { return 'sortreserve' }
-  tooltip(sort) { return `${sort.name}, r${sort.data.ptreve_reel}` }
+  tooltip(sort) { return `${sort.name}, r${sort.system.ptreve}` }
   img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/scroll.webp' }
 
   createSprite(pixiTMR) {

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' }

packs/competences-creatures.db

@@ -1,27 +1,29 @@
-{"_id":"0zRL8bOpCXNQnIR4","name":"Ruade","permission":{"default":0,"Q2G6GTdrotKzYGUC":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":4,"description":null,"categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-pietinement.webp","effects":[]}
+{"_id":"0zRL8bOpCXNQnIR4","name":"Ruade","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.0zRL8bOpCXNQnIR4"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-pietinement.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":4,"description":null,"descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702692,"modifiedTime":1663625011172,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"4GmpkphbsmQjvVVK","name":"Escalade","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_escalade.webp","effects":[]}
+{"_id":"4GmpkphbsmQjvVVK","name":"Escalade","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.4GmpkphbsmQjvVVK"}},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_escalade.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":false,"isparade":false,"ispossession":false,"dommages":0,"description":"","descriptionmj":""},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702692,"modifiedTime":1663625011172,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"6DK46pyO0hzEuuUg","name":"Morsure","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":1,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-morsure.webp","effects":[]}
+{"_id":"6DK46pyO0hzEuuUg","name":"Morsure","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.6DK46pyO0hzEuuUg"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-morsure.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":1,"description":"","descriptionmj":"","categorie":"generale","isnaturelle":true},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702692,"modifiedTime":1663625011172,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"BjqRrGtHtTzuNpZB","name":"Griffes et Crocs","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":1,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-griffes.webp","effects":[]}
+{"name":"Possession","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-entites.c0I93Q53i4ZmxpyT"}},"img":"systems/foundryvtt-reve-de-dragon/icons/entites/possession.webp","effects":[],"system":{"categorie_parade":"","niveau":2,"default_diffLibre":0,"carac_value":14,"iscombat":true,"isparade":false,"ispossession":true,"dommages":0,"description":"<p>L'entit&eacute; tente de prendre possession du corps de sa victime.</p>","descriptionmj":"","categorie":"melee"},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624948267,"modifiedTime":1663625011162,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"_id":"9u16zxXRurCtxuOX","folder":null,"sort":0,"ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3}}
-{"_id":"CYpxxf1uTa78NWR9","name":"Esquive","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"dommages":0,"iscombat":false,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_esquive.webp","effects":[]}
+{"_id":"BjqRrGtHtTzuNpZB","name":"Griffes et Crocs","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.BjqRrGtHtTzuNpZB"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-griffes.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":1,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702692,"modifiedTime":1663625011172,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"JTuBQCPdumw3DfxH","name":"Crête","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"dommages":3,"iscombat":true,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-crete.webp","effects":[]}
+{"_id":"CYpxxf1uTa78NWR9","name":"Esquive","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.CYpxxf1uTa78NWR9"}},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_esquive.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":false,"isparade":false,"ispossession":false,"dommages":0,"description":"","descriptionmj":""},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702692,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"Kt7WlB5Ui97X211z","name":"Vol","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"dommages":0,"iscombat":false,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-vol.webp","effects":[]}
+{"_id":"JTuBQCPdumw3DfxH","name":"Crête","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.JTuBQCPdumw3DfxH"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-crete.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":3,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702693,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"LWQHz5ymNBzh6ZEr","name":"Cornes","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":2,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-corne.webp","effects":[]}
+{"_id":"Kt7WlB5Ui97X211z","name":"Vol","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.Kt7WlB5Ui97X211z"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-vol.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":false,"isparade":false,"ispossession":false,"dommages":0,"description":"","descriptionmj":""},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702693,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"NctG7suzvGE7ZZzj","name":"Bras-bouches","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":2,"description":"","categorie_parade":"epees-lourdes","isparade":true,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-brasbouche.webp","effects":[]}
+{"_id":"LWQHz5ymNBzh6ZEr","name":"Cornes","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.LWQHz5ymNBzh6ZEr"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-corne.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":2,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702693,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"OzHBowOMADRwcVXR","name":"Pierre Tenue","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":2,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-pierretenue.webp","effects":[]}
+{"_id":"NctG7suzvGE7ZZzj","name":"Bras-bouches","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.NctG7suzvGE7ZZzj"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-brasbouche.webp","effects":[],"system":{"categorie_parade":"epees-lourdes","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":true,"ispossession":false,"dommages":2,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702693,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"PCwbR6lghjydTj93","name":"Grande morsure","permission":{"default":0,"Q2G6GTdrotKzYGUC":3},"type":"competencecreature","data":{"categorie_parade":"","niveau":0,"carac_value":0,"iscombat":true,"isparade":false,"dommages":2,"description":"","default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-morsure.webp","effects":[]}
+{"_id":"OzHBowOMADRwcVXR","name":"Pierre Tenue","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.OzHBowOMADRwcVXR"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-pierretenue.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":2,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":false},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702693,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"PrVuVpwuYaZtwRUi","name":"Piétinement","permission":{"default":0,"Q2G6GTdrotKzYGUC":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":4,"description":null,"categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-pietinement.webp","effects":[]}
+{"_id":"PCwbR6lghjydTj93","name":"Grande morsure","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.PCwbR6lghjydTj93"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-morsure.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":2,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702693,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"RAnasKnoA3OQgwfv","name":"Pinces","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":3,"description":"","categorie_parade":"epees-lourdes","isparade":true,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-pinces.webp","effects":[]}
+{"_id":"PrVuVpwuYaZtwRUi","name":"Piétinement","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.PrVuVpwuYaZtwRUi"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-pietinement.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":4,"description":null,"descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702693,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"XgfRxSj8Ty1d3JFM","name":"Mandibules","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":2,"description":"","carac-value":null,"categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-mandibules.webp","effects":[]}
+{"_id":"RAnasKnoA3OQgwfv","name":"Pinces","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.RAnasKnoA3OQgwfv"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-pinces.webp","effects":[],"system":{"categorie_parade":"epees-lourdes","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":true,"ispossession":false,"dommages":3,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702694,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"Zpl2Bi451vB3r91W","name":"Coup de pied","permission":{"default":0,"Q2G6GTdrotKzYGUC":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":3,"description":null,"categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-coup_de_pied.webp","effects":[]}
+{"_id":"XgfRxSj8Ty1d3JFM","name":"Mandibules","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.XgfRxSj8Ty1d3JFM"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-mandibules.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":2,"description":"","descriptionmj":"","carac-value":null,"categorie":"generale","isnaturelle":true},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702694,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"efl1HdDSKpBfImQ1","name":"Pierre Lancée","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":1,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-pierrelancee.webp","effects":[]}
+{"_id":"Zpl2Bi451vB3r91W","name":"Coup de pied","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.Zpl2Bi451vB3r91W"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-coup_de_pied.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":3,"description":null,"descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702694,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"h9ASt4vrvEgxfj7j","name":"Tronçonneuse","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":10,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-tronconneuse.webp","effects":[]}
+{"name":"Possession","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-entites.c0I93Q53i4ZmxpyT"}},"img":"systems/foundryvtt-reve-de-dragon/icons/entites/possession.webp","effects":[],"system":{"categorie_parade":"","niveau":2,"default_diffLibre":0,"carac_value":14,"iscombat":true,"isparade":false,"ispossession":true,"dommages":0,"description":"<p>L'entit&eacute; tente de prendre possession du corps de sa victime.</p>","descriptionmj":"","categorie":"draconic"},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624976822,"modifiedTime":1663625011162,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"_id":"duVgxI3Cdko0KzAj","folder":null,"sort":0,"ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3}}
-{"_id":"jhua9kkCs55OV7Yl","name":"Grandes griffes","permission":{"default":0,"Q2G6GTdrotKzYGUC":3},"type":"competencecreature","data":{"categorie_parade":"sans-armes","niveau":0,"carac_value":0,"iscombat":true,"isparade":true,"dommages":2,"description":"","default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-griffes.webp","effects":[]}
+{"_id":"efl1HdDSKpBfImQ1","name":"Pierre Lancée","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.efl1HdDSKpBfImQ1"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-pierrelancee.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":1,"description":"","descriptionmj":"","categorie":"lancer","isnaturelle":false},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702694,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"lzEdMrKXbOYrWG5S","name":"Vigilance","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_vigilance.webp","effects":[]}
+{"_id":"h9ASt4vrvEgxfj7j","name":"Tronçonneuse","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.h9ASt4vrvEgxfj7j"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-tronconneuse.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":10,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702694,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"ndNshntOYb1JFNqi","name":"Serres","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":2,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-serres.webp","effects":[]}
+{"_id":"jhua9kkCs55OV7Yl","name":"Grandes griffes","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.jhua9kkCs55OV7Yl"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-griffes.webp","effects":[],"system":{"categorie_parade":"sans-armes","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":true,"ispossession":false,"dommages":2,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702694,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"os88Rsp7mBkahqmh","name":"Bec","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-beak.webp","effects":[]}
+{"_id":"lzEdMrKXbOYrWG5S","name":"Vigilance","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.lzEdMrKXbOYrWG5S"}},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_vigilance.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":false,"isparade":false,"ispossession":false,"dommages":0,"description":"","descriptionmj":""},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702694,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"qilRzXpVaGceNmQp","name":"Dague","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":1,"description":"","categorie_parade":"dagues","isparade":true,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_dague.webp","effects":[]}
+{"_id":"ndNshntOYb1JFNqi","name":"Serres","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.ndNshntOYb1JFNqi"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-serres.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":2,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702694,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"qrd9AoZzFgyzFBxz","name":"Griffes","permission":{"default":0,"Q2G6GTdrotKzYGUC":3},"type":"competencecreature","data":{"categorie_parade":"sans-armes","niveau":0,"carac_value":0,"iscombat":true,"isparade":true,"dommages":1,"description":"","default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-griffes.webp","effects":[]}
+{"_id":"os88Rsp7mBkahqmh","name":"Bec","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.os88Rsp7mBkahqmh"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-beak.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":false,"ispossession":false,"dommages":0,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702695,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"sUdXhpuVVOAlcVpo","name":"Pickpocket","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_pickpocket.webp","effects":[]}
+{"_id":"qilRzXpVaGceNmQp","name":"Dague","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.qilRzXpVaGceNmQp"}},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_dague.webp","effects":[],"system":{"categorie_parade":"dagues","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":true,"ispossession":false,"dommages":1,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":false},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702695,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"shsUV8UpU18c0RJK","name":"Course","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_course.webp","effects":[]}
+{"_id":"qrd9AoZzFgyzFBxz","name":"Griffes","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.qrd9AoZzFgyzFBxz"}},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-griffes.webp","effects":[],"system":{"categorie_parade":"sans-armes","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":true,"isparade":true,"ispossession":false,"dommages":1,"description":"","descriptionmj":"","categorie":"melee","isnaturelle":true},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702695,"modifiedTime":1663625011173,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"yBUVTjTXYfwvzusb","name":"Saut","permission":{"default":0,"Q2G6GTdrotKzYGUC":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_saut.webp","effects":[]}
+{"_id":"sUdXhpuVVOAlcVpo","name":"Pickpocket","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.sUdXhpuVVOAlcVpo"}},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_pickpocket.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":false,"isparade":false,"ispossession":false,"dommages":0,"description":"","descriptionmj":""},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702695,"modifiedTime":1663625011174,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"yDHZfK4RmwQW4YaW","name":"Discrétion","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":"","categorie_parade":"","isparade":false,"default_diffLibre":0},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_discretion.webp","effects":[]}
+{"_id":"shsUV8UpU18c0RJK","name":"Course","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.shsUV8UpU18c0RJK"}},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_course.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":false,"isparade":false,"ispossession":false,"dommages":0,"description":"","descriptionmj":""},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702695,"modifiedTime":1663625011174,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"yBUVTjTXYfwvzusb","name":"Saut","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.yBUVTjTXYfwvzusb"}},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_saut.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":false,"isparade":false,"ispossession":false,"dommages":0,"description":"","descriptionmj":"","categorie":"generale"},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702695,"modifiedTime":1663625011174,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"yDHZfK4RmwQW4YaW","name":"Discrétion","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-creatures.yDHZfK4RmwQW4YaW"}},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_discretion.webp","effects":[],"system":{"categorie_parade":"","niveau":0,"default_diffLibre":0,"carac_value":0,"iscombat":false,"isparade":false,"ispossession":false,"dommages":0,"description":"","descriptionmj":""},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.16","coreVersion":"10.285","createdTime":1663624702695,"modifiedTime":1663625011174,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}

styles/simple.css

@@ -1146,9 +1146,16 @@ ul, li {
 
 }
 
-#sidebar #sidebar-tabs i.fa-comments:before, #sidebar #sidebar-tabs i.fa-fist-raised:before, #sidebar #sidebar-tabs i.fa-users:before, #sidebar #sidebar-tabs i.fa-map:before, #sidebar #sidebar-tabs i.fa-suitcase:before, #sidebar #sidebar-tabs i.fa-book-open:before, #sidebar #sidebar-tabs i.fa-th-list:before, #sidebar #sidebar-tabs i.fa-music:before, #sidebar #sidebar-tabs i.fa-atlas:before, #sidebar #sidebar-tabs i.fa-cogs:before {content: "";}
+#sidebar #sidebar-tabs i:is(
+  .fa-comments, .fa-fist-raised, .fa-swords,
+  .fa-users, .fa-user, .fa-map, .fa-suitcase,
+  .fa-book-open, .fa-th-list, .fa-music,
+  .fa-atlas,.fa-cogs
+):before {content: "";}
 #sidebar #sidebar-tabs i.fa-comments {background: url("img/ui/icon_sidebar_chat.svg") no-repeat;}
 #sidebar #sidebar-tabs i.fa-fist-raised {background: url("img/ui/icon_sidebar_fight.svg") no-repeat;}
+#sidebar #sidebar-tabs i.fa-swords {background: url("img/ui/icon_sidebar_fight.svg") no-repeat;}
+#sidebar #sidebar-tabs i.fa-user {background: url("img/ui/icon_sidebar_actor.svg") no-repeat;}
 #sidebar #sidebar-tabs i.fa-users {background: url("img/ui/icon_sidebar_actor.svg") no-repeat;}
 #sidebar #sidebar-tabs i.fa-map {background: url("img/ui/icon_sidebar_scene.svg") no-repeat;}
 #sidebar #sidebar-tabs i.fa-suitcase {background: url("img/ui/icon_sidebar_item.svg") no-repeat;}

system.json

@@ -34,9 +34,10 @@
   ],
   "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
-  "version": "10.0.9",
+  "version": "10.0.18",
   "compatibility": {
-    "minimum": "10"
+    "minimum": "10",
+    "verified": "10.286"
   },
   "esmodules": [
     "module/rdd-main.js"
@@ -332,7 +333,7 @@
   ],
   "socket": true,
   "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.8.zip",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.18.zip",
   "gridDistance": 1,
   "gridUnits": "m",
   "primaryTokenAttribute": "sante.vie",

template.json

@@ -576,7 +576,7 @@
   "types": ["objet", "arme", "armure", "conteneur", "competence", "sort", "herbe", "ingredient", "livre", "potion", "munition", "rencontresTMR", "queue", "ombre", "souffle", 
             "tete", "competencecreature", "tarot", "monnaie", "nombreastral", "tache", "meditation", "casetmr", "recettealchimique", 
             "musique", "chant", "danse", "jeu", "recettecuisine", "maladie", "poison", "oeuvre", "nourritureboisson", "signedraconique", "gemme", 
-            "possession" ],
+            "possession", "sortreserve" ],
   "possession": {
     "typepossession": "",
     "possede": false,
@@ -679,9 +679,10 @@
     "categorie_parade": "",
     "niveau": 0,
     "default_diffLibre": 0,
+    "categorie": "",
     "carac_value": 0,
     "iscombat": false,
-    "isparade": false,
+    "isnaturelle": true,
     "ispossession": false,
     "dommages": 0,
     "description": "Compétence : ...",
@@ -943,6 +944,14 @@
     },
     "description": "",
     "descriptionmj": ""
+  },
+  "sortreserve": {
+    "sortid" : "",
+    "draconic": "",
+    "coord": "",
+    "ptreve": 0,
+    "heurecible": "",
+    "echectotal": false
   }
 }
 }

templates/actor-creature-sheet.html

@@ -41,7 +41,7 @@
       <div class="grid grid-2col">
         <div class="flex-group-left flexcol">
           <ol class="carac-list alterne-list">
-            {{#each data.carac as |carac key|}}
+            {{#each system.carac as |carac key|}}
             <li class="flexrow list-item" data-attribute="{{key}}">
               {{#if (eq key 'taille')}}
               <span class="carac-label flexrow" name="system.carac.{{key}}.label">{{carac.label}}</span>
@@ -61,7 +61,7 @@
         </div>
         <div class="flex-group-left flexcol">
           <ol class="carac-list alterne-list">
-            {{#each data.attributs as |attr key|}}
+            {{#each system.attributs as |attr key|}}
             <li class="flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label" name="system.attributs.{{key}}.label">{{attr.label}}</span>
               <input type="text" name="system.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="{{attr.type}}" />
@@ -70,20 +70,20 @@
             <li class="flexrow list-item" data-attribute="vie">
               <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.value" value="{{system.sante.vie.value}}" data-dtype="Number" /> / 
-                <input type="text" name="system.sante.vie.max" value="{{data.sante.vie.max}}" data-dtype="Number" />
+                <input type="text" name="system.sante.vie.max" value="{{system.sante.vie.max}}" data-dtype="Number" />
               </span>
             </li>
             <li class="flexrow list-item" data-attribute="endurance">
               <span class="competence-label" name="system.sante.endurance.label">Endurance</span>
               <span class="flexrow" >
-                <input type="text" name="system.sante.endurance.value" value="{{data.sante.endurance.value}}" data-dtype="Number" /> / 
+                <input type="text" name="system.sante.endurance.value" value="{{system.sante.endurance.value}}" data-dtype="Number" /> / 
-                <input type="text" name="system.sante.endurance.max" value="{{data.sante.endurance.max}}" data-dtype="Number" />
+                <input type="text" name="system.sante.endurance.max" value="{{system.sante.endurance.max}}" data-dtype="Number" />
               </span>
             </li>
             <li class="flexrow list-item" data-attribute="etat">
               <span class="competence-label" name="system.compteurs.etat.label">Etat Général</span>
-              <input type="text" value="{{data.compteurs.etat.value}}" disabled />
+              <input type="text" value="{{system.compteurs.etat.value}}" disabled />
             </li>
           </ol>
         </div>
@@ -134,12 +134,12 @@
 
       <div class="form-group">
         <span class="item-name"><h4>Race</h4></span>
-        <input type="text" name="system.race" value="{{data.race}}" data-dtype="String" />
+        <input type="text" name="system.race" value="{{system.race}}" data-dtype="String" />
       </div>
 
       <div class="form-group editor">        
         <span class="item-name"><h4>Description</h4>          
-        {{editor data.description target="system.description" button=true owner=owner editable=true}}
+        {{editor system.description target="system.description" button=true owner=owner editable=true}}
       </div>
 
       {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}

templates/actor-entite-sheet.html

@@ -32,7 +32,7 @@
       <div class="grid grid-2col">
         <div class="flex-group-left flexcol">
           <ol class="carac-list alterne-list">
-            {{#each data.carac as |carac key|}}
+            {{#each system.carac as |carac key|}}
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
               {{#if (eq key 'taille')}}
               <span class="carac-label flexrow" name="system.carac.{{key}}.label">{{carac.label}}</span>
@@ -52,8 +52,8 @@
           <ol class="carac-list alterne-list">
             <li class="caracteristique flexrow list-item">
               <span class="carac-label flexrow" name="catEntite">Catégorie : </span>
-              <select name="system.definition.categorieentite" value="{{data.definition.categorieentite}}" data-dtype="String">
+              <select name="system.definition.categorieentite" value="{{system.definition.categorieentite}}" data-dtype="String">
-                {{#select data.definition.categorieentite}}
+                {{#select system.definition.categorieentite}}
                 <option value="cauchemar">Cauchemar</option>
                 <option value="reve">Rêve</option>
                 {{/select}}
@@ -61,15 +61,15 @@
             </li>
             <li class="caracteristique flexrow list-item">
               <span class="carac-label flexrow" name="typeEntite">Type d'entité : </span>
-              <select name="system.definition.typeentite" value="{{data.definition.typeentite}}" data-dtype="String">
+              <select name="system.definition.typeentite" value="{{system.definition.typeentite}}" data-dtype="String">
-                {{#select data.definition.typeentite}}
+                {{#select system.definition.typeentite}}
                 <option value="incarne">Incarnée</option>
                 <option value="nonincarne">Non Incarnée</option>
-                <option value="blurette">Blurete</option>
+                <option value="blurette">Blurette</option>
                 {{/select}}
               </select>
             </li>
-            {{#each data.attributs as |attr key|}}
+            {{#each system.attributs as |attr key|}}
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
               <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"
@@ -79,9 +79,9 @@
             <li class="caracteristique flexrow list-item" data-attribute="endurance">
               <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>
+                  value="{{system.sante.endurance.value}}" data-dtype="Number" /></span><span>/ </span>
               <span><input class="sante-value flexrow" type="text" name="system.sante.endurance.max"
-                  value="{{data.sante.endurance.max}}" data-dtype="Number" /></span>
+                  value="{{system.sante.endurance.max}}" data-dtype="Number" /></span>
             </li>
           </ol>
         </div>
@@ -131,7 +131,7 @@
     {{!-- Biography Tab --}}
     <div class="tab description" data-group="primary" data-tab="description">
       <div class="form-group editor">
-        {{editor data.description target="system.description" button=true owner=owner editable=true}}
+        {{editor system.description target="system.description" button=true owner=owner editable=true}}
       </div>
       {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
     </div>

templates/actor-liste-blessures-partial.html

@@ -13,15 +13,15 @@
   </thead>
   <tbody>
     <tr class="table-row alterne-row" ><td/><td colspan="4">Légères</td></tr>
-    {{#each data.blessures.legeres.liste as |bless key|}}
+    {{#each system.blessures.legeres.liste as |bless key|}}
     {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="legere" title="Légère"}}
     {{/each}}
     <tr class="table-row alterne-row"><td/><td colspan="4">Graves</td></tr>
-    {{#each data.blessures.graves.liste as |bless key|}}
+    {{#each system.blessures.graves.liste as |bless key|}}
     {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="grave" title="Grave"}}
     {{/each}}
     <tr class="table-row alterne-row"><td/><td colspan="4">Critiques</td></tr>
-    {{#each data.blessures.critiques.liste as |bless key|}}
+    {{#each system.blessures.critiques.liste as |bless key|}}
     {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="critique" title="Critique"}}
     {{/each}}
   </tbody>

templates/actor-sheet-effects-partial.html

@@ -1,7 +1,7 @@
 {{#if calc.surprise}}{{calc.surprise}}! {{/if}}
 {{#if effects}}
 {{#each effects as |effect key|}}
-<span class="active-effect" data-id="{{effect._id}}">
+<span class="active-effect" data-effect="{{effect.flags.core.statusId}}">
   <img class="button-effect-img delete-active-effect" src="{{effect.icon}}" alt="{{localize effect.label}}" width="24" height="24" />
 </span>
 {{/each}}

templates/actor-sheet-inventaire.html

@@ -1,7 +1,7 @@
 {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}}
 
 <span class="item-name"><h4>Equipement</h4></span>
-<span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.attributs.encombrement.value}} <b>{{calc.surEncombrementMessage}}</b></span> - 
+<span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{system.attributs.encombrement.value}} <b>{{calc.surEncombrementMessage}}</b></span> - 
 <span class="item-name"><a class="creer-un-objet">Créer un objet</a></span>
 {{#if options.isGM}}
 <span class="item-name"> - <a id="nettoyer-conteneurs">Vider tout les conteneurs</a></span>

templates/actor-sheet-item-queue.html

@@ -0,0 +1,15 @@
+<li class="item flexrow" data-attribute={{key}} data-item-id="{{queue._id}}">
+  <img class="sheet-competence-img" src="{{queue.img}}" />
+  <span class="display-label flex-grow">
+    {{#if (eq queue.type 'ombre')}}
+    <img class="sheet-competence-img" src="systems/foundryvtt-reve-de-dragon/icons/competence_thanatos.webp" />
+    {{/if}}
+    <a>{{queue.name}}</a>
+  </span>
+  <div class="item-controls">
+    <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    {{#if queue.system.refoulement}}
+    <a class="item-action">Refouler</a>
+    {{/if}}
+  </div>
+</li>

templates/actor-sheet-oeuvre-partial.html

@@ -1,4 +1,5 @@
 <li class="item flexrow list-item" data-item-id="{{oeuvre._id}}">
+  <img class="sheet-competence-img" src="{{oeuvre.img}}" />
   <span>{{upperFirst typeOeuvre}}</span>
   <span class="competence-title {{classOeuvre}}">
     <a>{{oeuvre.name}} (niveau {{oeuvre.system.niveau}})</a>

templates/actor-sheet-queues.html

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

templates/actor-sheet.html

@@ -13,8 +13,8 @@
               <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="system.sante.vie.value" value="{{data.sante.vie.value}}" data-dtype="Number"/>
+                <input class="resource-content" type="text" name="system.sante.vie.value" value="{{system.sante.vie.value}}" data-dtype="Number"/>
-                <span>/ {{data.sante.vie.max}}</span>
+                <span>/ {{system.sante.vie.max}}</span>
                 <a class="vie-plus"><i class="fas fa-plus-square"></i></a>
               </label>
             </li>
@@ -22,8 +22,8 @@
               <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="system.sante.endurance.value" value="{{data.sante.endurance.value}}" data-dtype="Number"/>
+                <input class="resource-content" type="text" name="system.sante.endurance.value" value="{{system.sante.endurance.value}}" data-dtype="Number"/>
-                <span>/ {{data.sante.endurance.max}}</span>
+                <span>/ {{system.sante.endurance.max}}</span>
                 <a class="endurance-plus"><i class="fas fa-plus-square"></i></a>
               </label>
             </li>
@@ -32,8 +32,8 @@
                 <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="system.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="{{system.sante.fatigue.value}}" data-dtype="Number" />
-                <span>/ {{data.sante.fatigue.max}}</span>
+                <span>/ {{system.sante.fatigue.max}}</span>
                 <a class="fatigue-plus"><i class="fas fa-plus-square"></i></a>
               </label>
             </li>
@@ -41,8 +41,8 @@
               <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="system.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="{{system.reve.reve.value}}" data-dtype="Number" />
-                <span>/ {{data.reve.seuil.value}}</span>
+                <span>/ {{system.reve.seuil.value}}</span>
                 <a class="ptreve-actuel-plus"><i class="fas fa-plus-square"></i></a>
               </label>
             </li>
@@ -52,7 +52,7 @@
               <span class="encaisser-direct"><a title="Encaisser des dommages"><img class="button-img" src="icons/svg/bones.svg" alt="Encaisser des dommages"/></a></span>
               <span class="gm-only remise-a-neuf"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
               <span class="repos"><a title="Repos"><img class="button-img" src="icons/svg/sleep.svg" alt="Se reposer"/></a></span>
-              {{#if data.attributs.hautrevant.value}}
+              {{#if system.attributs.hautrevant.value}}
               <span class="monte-tmr"><a title="Montée dans les Terres M&eacute;dianes !" {{#if hautreve.isDemiReve}}disabled{{/if}}><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-normal.svg" alt="Montée dans les Terres M&eacute;dianes !"/></a></span>
               <span class="monte-tmr-rapide"><a title="Montée accélérée dans les Terres M&eacute;dianes !"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-rapide.svg" alt="Montée accélérée dans les Terres M&eacute;dianes !"/></a></span>
               <span class="visu-tmr"><a title="Regarder les Terres M&eacute;dianes"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-view.svg" alt="Regarder les Terres M&eacute;dianes"/></a></span>
@@ -65,8 +65,8 @@
               <span>{{calc.resumeBlessures}}</span>
             </div>
             <div class="flexrow">
-              <span>{{data.compteurs.etat.label}}: {{data.compteurs.etat.value}}</span>
+              <span>{{system.compteurs.etat.label}}: {{system.compteurs.etat.value}}</span>
-              <span>{{data.compteurs.surenc.label}}: {{data.compteurs.surenc.value}}</span>
+              <span>{{system.compteurs.surenc.label}}: {{system.compteurs.surenc.value}}</span>
             </div>
             <div class="flexrow">
               {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-effects-partial.html"}}
@@ -100,7 +100,7 @@
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol">
               <ul class="carac-list alterne-list">
-                {{#each data.carac as |carac key|}}
+                {{#each system.carac as |carac key|}}
                     {{#if carac.isLevelUp}}
                     <li class="caracteristique flexrow item-list xp-level-up" data-attribute="{{key}}">
                     {{else}}
@@ -149,10 +149,10 @@
               <ul class="carac-list">
                 <li class="caracteristique flexrow list-item">
                   <span class="carac-label" name="beaute">Beauté&nbsp;:</span>
-                  <input class="description-value" type="text" name="system.beaute" value="{{data.beaute}}" data-dtype="String" {{#unless @root.options.editCaracComp}}disabled{{/unless}}/>
+                  <input class="description-value" type="text" name="system.beaute" value="{{system.beaute}}" data-dtype="String" {{#unless @root.options.editCaracComp}}disabled{{/unless}}/>
                   <label class="carac-xp"/>
                 </li>
-                {{#each data.attributs as |attr key|}}
+                {{#each system.attributs as |attr key|}}
                 {{#unless (eq key 'hautrevant')}}
                 <li class="caracteristique flexrow  list-item" data-attribute="{{key}}">
                   <span class="carac-label" name="system.attributs.{{key}}.label">{{attr.label}}&nbsp;:</span>
@@ -169,10 +169,10 @@
               <ul class="carac-list alterne-list">
                 <li class="caracteristique flexrow list-item">
                   <span class="attribut-label chance-actuelle"><a>Chance actuelle</a></span>
-                  <input class="description-value compteur-edit" type="text" name="chance" value="{{data.compteurs.chance.value}}" data-dtype="number"/>
+                  <input class="description-value compteur-edit" type="text" name="chance" value="{{system.compteurs.chance.value}}" data-dtype="number"/>
                   <span class="utiliser-attribut" style="padding-left: 5px"><a class="chance-appel">Utiliser</a></span>
                 </li>
-                {{#each data.compteurs as |compteur key|}}
+                {{#each system.compteurs as |compteur key|}}
                   {{#if (eq compteur.label 'Chance')}}
                   {{else if (eq compteur.label 'Experience')}}
                   {{else if compteur.isInput}}
@@ -240,7 +240,7 @@
               {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.tir) categorie="Compétences de Tir"}}
               {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.lancer) categorie="Compétences de Lancer"}}
               {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.connaissance) categorie="Connaissances"}}
-              {{#if (or data.attributs.hautrevant.value options.vueDetaillee)}}
+              {{#if (or system.attributs.hautrevant.value options.vueDetaillee)}}
               {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.draconic) categorie="Draconic"}}
               {{/if}}
 
@@ -248,7 +248,7 @@
                 <ul class="item-list">
                   <li class="item flexrow">
                     <span class="generic-label">Stress transformé</span>
-                    <input class="compteur-edit" type="text" name="experience" value="{{data.compteurs.experience.value}}" data-dtype="number" size="3"/>
+                    <input class="compteur-edit" type="text" name="experience" value="{{system.compteurs.experience.value}}" data-dtype="number" size="3"/>
                   </li>
 
                   <li class="item flexrow">
@@ -384,7 +384,9 @@
         <h3>Tâches</h3><a class='creer-tache'>Créer une nouvelle Tâche</a>
         <ul class="item-list alterne-list">
           {{#each taches as |tache id|}}
-          <li class="item flexrow list-item" data-item-id="{{tache._id}}"><span class="competence-title tache-label"><a>{{tache.name}}
+          <li class="item flexrow list-item" data-item-id="{{tache._id}}">
+            <img class="sheet-competence-img" src="{{tache.img}}" />
+            <span class="competence-title tache-label"><a>{{tache.name}}
             ({{tache.system.points_de_tache_courant}}{{#if
                (or @root.options.isGM (not tache.system.cacher_points_de_tache))
             }}/{{tache.system.points_de_tache}}{{/if}})</a></span>
@@ -444,13 +446,13 @@
       {{!-- hautreve Tab --}}
       <div class="tab hautreve " data-group="primary" data-tab="hautreve" style="height:200px">
         <div>
-          {{#if data.attributs.hautrevant.value}}
+          {{#if system.attributs.hautrevant.value}}
           <h3>Haut rêvant</h3>
           {{else}}
           <h3>Vous n'avez pas le don de haut-rêve! Il faut attribuer la Tête de Dragon 'Don de Haut Rêve' si votre personnage est ou devient Haut-Rêvant.</h3>
           {{/if}}
           <ul class="item-list">
-            {{#if data.attributs.hautrevant.value}}
+            {{#if system.attributs.hautrevant.value}}
             {{#if options.isGM}}
             <li class="item flexrow">
               <span>
@@ -462,37 +464,30 @@
             </li>
             {{/if}}
             <li class="item flexrow">
+              <span class="competence-label flex-shrink">Demi rêve :
               {{#if options.isGM}}
-              <span class="competence-label flex-shrink">Demi rêve :
+                {{caseTmr-label system.reve.tmrpos.coord}}
-                <span>{{caseTmr-label data.reve.tmrpos.coord}}</span>
+              </span><span>
-              </span> 
+                <input class="competence-value" type="text" name="system.reve.tmrpos.coord" value="{{system.reve.tmrpos.coord}}" data-dtype="String"/>
-              <span>
+              {{else if hautreve.cacheTMR}}
-                <input class="competence-value" type="text" name="system.reve.tmrpos.coord" value="{{data.reve.tmrpos.coord}}" data-dtype="String"/>
+                {{caseTmr-type system.reve.tmrpos.coord}}
-              </span> 
+              </span><span>
-              
-              {{else}}
-              <span class="competence-label flex-shrink">Demi rêve :
-                {{#unless hautreve.cacheTMR}}
-                <span>{{caseTmr-label data.reve.tmrpos.coord}}</span>
-                {{/unless}}
-              </span> 
-              <span>
-                {{#if hautreve.cacheTMR}}
                 ??
               {{else}}
-                {{data.reve.tmrpos.coord}}
+                {{caseTmr-label system.reve.tmrpos.coord}}
+              </span><span>
+                {{system.reve.tmrpos.coord}}
               {{/if}}
               </span> 
-              {{/if}}
             </li>
             {{/if}}
             <li class="item flexrow">
               <span class="competence-label">Seuil de Rêve :</span>
               <span>
               {{#if options.isGM}}
-                <input class="seuil-reve-value" type="text" name="system.reve.seuil.value" value="{{data.reve.seuil.value}}" data-dtype="Number"/>
+                <input class="seuil-reve-value" type="text" name="system.reve.seuil.value" value="{{system.reve.seuil.value}}" data-dtype="Number"/>
               {{else}}
-                {{data.reve.seuil.value}}
+                {{system.reve.seuil.value}}
               {{/if}}
               </span>
             </li>
@@ -500,9 +495,9 @@
               <span class="competence-label">Refoulement : </span>
               <span>
               {{#if options.isGM}}
-                <input class="competence-value" type="text" name="system.reve.refoulement.value" value="{{data.reve.refoulement.value}}" data-dtype="Number"/>
+                <input class="competence-value" type="text" name="system.reve.refoulement.value" value="{{system.reve.refoulement.value}}" data-dtype="Number"/>
               {{else}}
-                {{data.reve.refoulement.value}}
+                {{system.reve.refoulement.value}}
               {{/if}}
               </span>
             </li>
@@ -510,38 +505,14 @@
         </div>
         <hr>
         {{!-- Queues, Souffles, Tetes, Ombre --}}
-        {{#if queues.length}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html"}}
-        <h3>Queues:</h3>
-        <ul class="flex-group-left">
-          {{#each queues as |queue key|}}
-          <li class="item flexrow" data-attribute={{key}} data-item-id="{{queue._id}}">
-            <span class="display-label flex-grow"><a data-item-id="{{queue._id}}">{{queue.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        {{/if}}
-        {{#if ombres.length}}
-        <h3>Ombres de Thanatos:</h3>
-        <ul class="item-list">
-          {{#each ombres as |ombre key|}}
-          <li class="item flexrow" data-attribute={{key}} data-item-id="{{ombre._id}}">
-            <span class="display-label flex-grow"><a data-item-id="{{ombre._id}}">{{ombre.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        {{/if}}
         {{#if souffles.length}}
         <h3>Souffles:</h3>
         <ul class="item-list">
           {{#each souffles as |souffle key|}}
           <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}">
-            <span class="display-label flex-grow"><a data-item-id="{{souffle._id}}">{{souffle.name}}</a></span>
+            <img class="sheet-competence-img" src="{{souffle.img}}" />
+            <span class="display-label flex-grow"><a>{{souffle.name}}</a></span>
             <div class="item-controls flex-shrink">
               <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
@@ -554,7 +525,8 @@
         <ul class="item-list">
           {{#each tetes as |tete key|}}
           <li class="item flexrow" data-attribute={{key}} data-item-id="{{tete._id}}">
-            <span class="display-label flex-grow"><a data-item-id="{{tete._id}}">{{tete.name}}</a></span>
+            <img class="sheet-competence-img" src="{{tete.img}}" />
+            <span class="display-label flex-grow"><a>{{tete.name}}</a></span>
             <div class="item-controls flex-shrink">
               <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
@@ -562,13 +534,14 @@
           {{/each}}
         </ul>
         {{/if}}
-        {{#if data.attributs.hautrevant.value}}
+        {{#if system.attributs.hautrevant.value}}
         {{#if (and options.isGM signesdraconiques.length)}}
         <h3>Signes draconiques</h3>
         <ul class="item-list alterne-list">
           {{#each signesdraconiques as |signe key|}}
             <li class="item list-item flexrow" data-item-id="{{signe._id}}" data-attribute="{{key}}">
-                <span class="display-label flex-grow"> <a data-item-id="{{signe._id}}">{{signe.name}}</a></span> 
+                <img class="sheet-competence-img" src="{{signe.img}}" />
+                <span class="display-label flex-grow"><a>{{signe.name}}</a></span> 
                 <span class="flex-shrink">{{signe.system.difficulte}}</span>
                 <div class="item-controls flex-shrink">
                   <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
@@ -595,16 +568,26 @@
               {{/each}}
             </ul>
             {{/if}}
-          {{#if hautreve.sortsReserve.length}}
+            {{#if sortsReserve.length}}
             <h3>Sorts en Réserve:</h3>
             <ul class="item-list alterne-list">
+              {{#each sortsReserve as |sort key|}}
+              <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
+                <img class="sheet-competence-img" src="{{sort.img}}" />
+                <span class="display-label"><a>{{#if sort.system.echectotal}}Echec total: {{/if}}{{sort.name}} r{{sort.system.ptreve}}</a></span> 
+                <span>{{sort.system.coord}} - {{caseTmr-label sort.system.coord}}</span> 
+                <div class="item-controls flex-shrink">
+                  <a class="item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
+                </div>
+              </li>
+              {{/each}}
               {{#each hautreve.sortsReserve as |reserve key|}}
-              <li class="item list-item flexrow" data-item-id="{{reserve._id}}" data-attribute="{{key}}">
+              <li class="item list-item flexrow" data-index="{{key}}">
-                <img class="sheet-competence-img" src="{{reserve.sort.img}}" />
+                <img class="sheet-competence-img" src="{{reserve.img}}" />
                 <span class="display-label">{{reserve.sort.name}} r{{reserve.sort.system.ptreve_reel}}</span> 
                 <span>{{reserve.coord}} - {{caseTmr-label reserve.coord}}</span> 
                 <div class="item-controls flex-shrink">
-                  <a class="item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
+                  <a class="delete-sort-reserve flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
                 </div>
               </li>
               {{/each}}
@@ -617,6 +600,7 @@
           <ul class="item-list alterne-list">
             {{#each sorts as |sort key|}}
             <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
+              <img class="sheet-competence-img" src="{{sort.img}}" />
               <span class="display-label flex-grow">
                 <a data-item-id="{{sort._id}}">{{sort.name}}
                   - {{#if sort.system.caseTMRspeciale}}{{sort.system.caseTMRspeciale}}{{else}}{{upperFirst sort.system.caseTMR}}{{/if}}
@@ -634,6 +618,7 @@
           <ul class="item-list">
             {{#each meditations as |meditation key|}}
             <li class="item flexrow" data-item-id="{{meditation._id}}" data-attribute="{{key}}">
+              <img class="sheet-competence-img" src="{{meditation.img}}" />
               <span class="meditation-label flex-grow"><a data-item-id="{{meditation._id}}">{{meditation.name}} - {{meditation.system.competence}}</a></span> 
               <div class="item-controls flex-shrink">
                 <a class="item-edit" title="Editer"><i class="fas fa-edit"></i></a>
@@ -648,6 +633,7 @@
             <ul class="item-list">
               {{#each hautreve.casesTmr as |casetmr key|}}
               <li class="item flexrow" data-item-id="{{casetmr._id}}" data-attribute="{{key}}">
+                <img class="sheet-competence-img" src="{{casetmr.img}}" />
                 <span class="display-label"><a data-item-id="{{casetmr._id}}">{{casetmr.name}}</a></span>
                 <span>{{casetmr.system.coord}} - {{caseTmr-label casetmr.system.coord}}</span> 
                 <div class="item-controls flex-shrink">
@@ -676,50 +662,50 @@
         <article class="flexrow">
           <ul class="item-list alterne-list">
             <li class="item flexrow list-item">
-              <label for="data.race">Race :</label>
+              <label for="system.race">Race :</label>
-              <input class="flex-grow" type="text" name="system.race" value="{{data.race}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.race" value="{{system.race}}" data-dtype="String"/>
             </li>
             <li class="item flexrow list-item">
-              <label for="data.sexe">Sexe :</label>
+              <label for="system.sexe">Sexe :</label>
-              <input class="flex-grow" type="text" name="system.sexe" value="{{data.sexe}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.sexe" value="{{system.sexe}}" data-dtype="String"/>
             </li>
             <li class="item flexrow list-item">
-              <label for="data.age">Age :</label>
+              <label for="system.age">Age :</label>
-              <input class="flex-grow" type="text" name="system.age" value="{{data.age}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.age" value="{{system.age}}" data-dtype="String"/>
             </li>
             <li class="item flexrow list-item">
-              <label for="data.poids">Poids :</label>
+              <label for="system.poids">Poids :</label>
-              <input class="flex-grow" type="text" name="system.poids" value="{{data.poids}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.poids" value="{{system.poids}}" data-dtype="String"/>
             </li>
             <li class="item flexrow list-item">
-              <label for="data.taille">Taille :</label>
+              <label for="system.taille">Taille :</label>
-              <input class="flex-grow" type="text" name="system.taille" value="{{data.taille}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.taille" value="{{system.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>
+              <label for="system.main">Main directrice :</label>
-              <input type="text" name="system.main" value="{{data.main}}" data-dtype="String"/>
+              <input type="text" name="system.main" value="{{system.main}}" data-dtype="String"/>
             </li>
             <li class="item flexrow list-item">
-              <label for="data.heure">Heure de naissance :</label>
+              <label for="system.heure">Heure de naissance :</label>
-              <select type="text" name="system.heure" value="{{data.heure}}" data-dtype="String">
+              <select type="text" name="system.heure" value="{{system.heure}}" data-dtype="String">
-                {{#select data.heure}}
+                {{#select system.heure}}
                 {{>"systems/foundryvtt-reve-de-dragon/templates/heures-select-option.html"}}
                 {{/select}}
               </select>
             </li>
             <li class="item flexrow list-item">
               <label>Beauté :</label>
-              <input type="text" value="{{data.beaute}}" data-dtype="String" disabled/>
+              <input type="text" value="{{system.beaute}}" data-dtype="String" disabled/>
             </li>
             <li class="item flexrow list-item">
-              <label for="data.cheveux">Cheveux :</label>
+              <label for="system.cheveux">Cheveux :</label>
-              <input class="flex-grow" type="text" name="system.cheveux" value="{{data.cheveux}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.cheveux" value="{{system.cheveux}}" data-dtype="String"/>
             </li>
             <li class="item flexrow list-item">
-              <label for="data.yeux">Yeux :</label>
+              <label for="system.yeux">Yeux :</label>
-              <input class="flex-grow" type="text" name="system.yeux" value="{{data.yeux}}" data-dtype="String"/>
+              <input class="flex-grow" type="text" name="system.yeux" value="{{system.yeux}}" data-dtype="String"/>
             </li>
           </ul>
         </article>
@@ -727,16 +713,16 @@
         <article class="flexcol">
           <h3>Biographie : </h3>
           <div class="form-group editor">
-            {{editor data.biographie target="system.biographie" button=true owner=owner editable=editable}}
+            {{editor system.biographie target="system.biographie" button=true owner=owner editable=editable}}
           </div>
           <h3>Notes : </h3>
           <div class="form-group editor">
-            {{editor data.notes target="system.notes" button=true owner=owner editable=editable}}
+            {{editor system.notes target="system.notes" button=true owner=owner editable=editable}}
           </div>
           <h3>Journal d'Experience</h3>
           <div class="form-group editor">
             <ul class="item-list alterne-list">
-              {{#each data.experiencelog as |xp key|}}
+              {{#each system.experiencelog as |xp key|}}
               <li class="item flexrow list-item">
                 <label class="flex-shrink">{{xp.mode}} </label>
                 <label class="flex-grow">{{xp.valeur}} {{xp.raison}} </label>

templates/actor-vehicule-sheet.html

@@ -28,38 +28,38 @@
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Catégorie</span>
               <select name="system.categorie" class="categorie" data-dtype="String">
-                {{#select data.categorie}}
+                {{#select system.categorie}}
                 {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-vehicule.html"}}
                 {{/select}}
               </select>
             </li>
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Résistance</span>
-              <input class="competence-value flexrow" type="text" name="system.resistance" value="{{data.resistance}}" data-dtype="Number" />
+              <input class="competence-value flexrow" type="text" name="system.resistance" value="{{system.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="system.structure" value="{{data.structure}}" data-dtype="Number" />
+              <input class="competence-value flexrow" type="text" name="system.structure" value="{{system.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="system.vitesse" value="{{data.vitesse}}" data-dtype="String" />
+              <input class="competence-value flexrow" type="text" name="system.vitesse" value="{{system.vitesse}}" data-dtype="String" />
             </li>
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Bonus</span>
-              <input class="competence-value flexrow" type="text" name="system.bonus" value="{{data.bonus}}" data-dtype="String" />
+              <input class="competence-value flexrow" type="text" name="system.bonus" value="{{system.bonus}}" data-dtype="String" />
             </li>
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Manoeuvrabilité</span>
-              <input class="competence-value flexrow" type="text" name="system.manoeuvrabilite" value="{{data.manoeuvrabilite}}" data-dtype="String" />
+              <input class="competence-value flexrow" type="text" name="system.manoeuvrabilite" value="{{system.manoeuvrabilite}}" data-dtype="String" />
             </li>
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Equipage</span>
-              <input class="competence-value flexrow" type="text" name="system.equipage" value="{{data.equipage}}" data-dtype="Number" />
+              <input class="competence-value flexrow" type="text" name="system.equipage" value="{{system.equipage}}" data-dtype="Number" />
             </li>
             <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Capacité d'Encombrement</span>
-              <input class="competence-value flexrow" type="text" name="system.capacite_encombrement" value="{{data.capacite_encombrement}}" data-dtype="Number" />
+              <input class="competence-value flexrow" type="text" name="system.capacite_encombrement" value="{{system.capacite_encombrement}}" data-dtype="Number" />
             </li>
           </ol>
         </div>
@@ -75,7 +75,7 @@
     {{!-- Biography Tab --}}
     <div class="tab description" data-group="primary" data-tab="description">
       <div class="form-group editor">
-        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        {{editor content=system.description target="system.description" button=true owner=owner editable=editable}}
       </div>
       {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
     </div>

templates/calendar-editor-template.html

@@ -34,7 +34,7 @@
       </select>
     </div>
     <div class="form-group">
-      <label for="xp">Minutes</label>
+      <label for="minutesRelative">Minutes</label>
       <select name="minutesRelative" id="minutesRelative" data-dtype="String">
         {{#select minutesRelative}}
         {{#each minutesOptions as |key|}}

templates/chat-achat-item.html

@@ -6,4 +6,4 @@
   {{#if vendeur}}à {{vendeur.name}}{{/if}}:
   {{quantiteTotal}} {{item.name}} pour {{prixTotal}} sols.
 </p>
-{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" item.data}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/chat-description.html" item.system}}

templates/chat-consommer-potion-generique.html

@@ -1,16 +1,16 @@
 <img class="chat-icon" src="{{img}}" alt="potion de repos" />
 <h4>
-  {{alias}} a bu une <strong>{{name}}{{#if data.magique}} enchantée{{/if}}</strong>
+  {{alias}} a bu une <strong>{{name}}{{#if system.magique}} enchantée{{/if}}</strong>
 </h4>
 <hr>
 <div>
-  {{#if data.magique}}
+  {{#if system.magique}}
     Le Jet de Résistance est {{#if rolled.isSuccess}}réussi{{else}}échoué{{/if}}.
     {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
   {{/if}}
   <br>Les effets de la potions sont à gérer manuellement, en fonction de sa nature
-  {{#if data.magique}}
+  {{#if system.magique}}
-    {{#if rolled.isEchec}}et de son enchantement ({{data.pr}} Points de Rêve)
+    {{#if rolled.isEchec}}et de son enchantement ({{system.pr}} Points de Rêve)
     {{else}}son enchantement n'a pas d'effet
     {{/if}}
   {{/if}}.

templates/chat-consommer-potion-repos.html

@@ -1,27 +1,27 @@
 <img class="chat-icon" src="{{img}}" alt="potion de repos" />
 <h4>
-  {{alias}} a bu une <strong>{{name}}{{#if data.magique}} enchantée{{/if}}</strong>
+  {{alias}} a bu une <strong>{{name}}{{#if system.magique}} enchantée{{/if}}</strong>
 </h4>
 <hr>
 <div>
-  {{#if data.magique}}
+  {{#if system.magique}}
     Le Jet de Résistance est {{#if rolled.isSuccess}}réussi{{else}}échoué{{/if}}.
     {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
     {{#if rolled.isEchec}}
     <br>La potion fait effet !
       {{alias}} a perdu 1 point de rêve et s'endort pour {{guerisonDureeValue}} {{guerisonDureeUnite}} et
       se récupère {{caseFatigueReel}} cases de fatigue.<br>
-      {{#if data.reposalchimique}}
+      {{#if system.reposalchimique}}
         De plus, la potion étant alchimique, {{alias}} est en aphasie pendant cette durée.
         {{#if aphasiePermanente}}
         Malheureusement, l'aphasie est permanente tant que {{alias}} ne réussit pas un jet de VOLONTE à 0 à Chateau Dormant (le moral compte).
         {{/if}}
       {{/if}}
     {{else}}
-    <br>La potion ne fait pas effet ! Elle vous octroie tout de même un bonus de {{data.herbebonus}} segments de fatigue récupérés en plus à la fin de Chateau Dormant (à gérer manuellement).
+    <br>La potion ne fait pas effet ! Elle vous octroie tout de même un bonus de {{system.herbebonus}} segments de fatigue récupérés en plus à la fin de Chateau Dormant (à gérer manuellement).
     {{/if}}
   {{else}}
-    Une fois consommée (vers fin Lyre), elle vous octroie un bonus de {{data.herbebonus}} segments de fatigue récupérés en plus à la fin de Chateau Dormant (à gérer manuellement).
+    Une fois consommée (vers fin Lyre), elle vous octroie un bonus de {{system.herbebonus}} segments de fatigue récupérés en plus à la fin de Chateau Dormant (à gérer manuellement).
   {{/if}}
   <br>La potion a été supprimée de l'équipement.
 </div>

templates/chat-consommer-potion-soin.html

@@ -1,10 +1,10 @@
 <img class="chat-icon" src="{{img}}" alt="potion de soin" />
 <h4>
-  {{alias}} a bu une <strong>{{name}}{{#if data.magique}} enchantée{{/if}}</strong>
+  {{alias}} a bu une <strong>{{name}}{{#if system.magique}} enchantée{{/if}}</strong>
 </h4>
 <hr>
 <div>
-  {{#if data.magique}}
+  {{#if system.magique}}
     Le Jet de Résistance est {{#if rolled.isSuccess}}réussi{{else}}échoué{{/if}}.
     {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
     {{#if rolled.isEchec}}
@@ -16,10 +16,10 @@
         {{/each}}
       </ul>
     {{else}}
-      <br>La potion ne fait pas effet ! Lors de votre prochain jet de récupération à Chateau Dormant, vous bénéficierez d'un bonus de {{data.herbebonus}} (appliqué automatiquement).
+      <br>La potion ne fait pas effet ! Lors de votre prochain jet de récupération à Chateau Dormant, vous bénéficierez d'un bonus de {{system.herbebonus}} (appliqué automatiquement).
     {{/if}}
   {{else}}
-    Lors de votre prochain jet de récupération à Chateau Dormant, vous bénéficierez d'un bonus de {{data.herbebonus}} (appliqué automatiquement).
+    Lors de votre prochain jet de récupération à Chateau Dormant, vous bénéficierez d'un bonus de {{system.herbebonus}} (appliqué automatiquement).
   {{/if}}
   <br>La potion a été supprimée de l'équipement.
 </div>

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>

templates/chat-demande-defense.html

@@ -50,10 +50,11 @@
             <br>
           {{/if}}
           {{#if (ne attaqueCategorie 'tir')}}
-            {{#each esquives as |esq key|}}
+            {{#each esquives as |esquive key|}}
             <a class='chat-card-button' id='esquiver-button' data-attackerId='{{../attackerId}}' data-defenderTokenId='{{../defenderTokenId}}'
-                data-compid='{{esq._id}}'  data-competence='{{esq.name}}'>
+                data-compid='{{esquive._id}}'  data-competence='{{esquive.name}}'>
-              {{esq.name}} à {{../diffLibre}} {{#if esq.usage}} (Utilisations : {{esq.usage}}){{/if}}
+                {{log 'esquive' esquive}}
+              {{esquive.name}} à {{../diffLibre}} {{#if esquive.system.nbUsage}} (Utilisations : {{esquive.system.nbUsage}}){{/if}}
             </a>
             <br>
             {{/each}}

templates/dialog-fabriquer-potion-base.html

@@ -1,6 +1,6 @@
 <form class="skill-roll-dialog">
   <div class="form-group">
-    <label>Fabriquer une potion de {{data.categorie}} de {{name}}</label>
+    <label>Fabriquer une potion de {{system.categorie}} de {{name}}</label>
   </div>
 
   <div class="form-group">

templates/dialog-roll-jeu.html

@@ -19,7 +19,7 @@
       <div id="tableAjustements" class="flexrow"></div>
     </div>
   </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 id="tableResolution"></div>
   <div id="tableProbaReussite"></div>

templates/dialog-roll-musique.html

@@ -8,7 +8,7 @@
         <label>Caractéristique: </label><label class="flex-grow">{{selectedCarac.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"}}

templates/dialog-roll-recettecuisine.html

@@ -32,7 +32,7 @@
       <div id="tableAjustements" class="flexrow"></div>
     </div>
   </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 id="tableResolution"></div>
   <div id="tableProbaReussite"></div>
 </form>

templates/dialog-roll-sort.html

@@ -1,6 +1,6 @@
 <form class="dialog-roll-sort">
-  <h2>Lancer le <span class="sort-ou-rituel">{{#if sort.system.isrituel}}rituel{{else}}sort{{/if}}</span>:
+  <h2 class="flexrow">Lancer le {{#if sort.system.isrituel}}rituel{{else}}sort{{/if}}:
-    <select name="sort" class="roll-sort flex-grow" data-dtype="String">
+    <select name="sort" class="roll-sort" data-dtype="String">
       {{#select sort}}
       {{#each sortList as |sort key|}}
       <option value={{key}}>{{this.name}} - {{#if this.system.caseTMRspeciale}} {{this.system.caseTMRspeciale}}

templates/header-item.html

@@ -0,0 +1,6 @@
+<header class="sheet-header">
+    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+    <div class="header-fields">
+        <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+    </div>
+</header>

templates/item-arme-sheet.html

@@ -1,93 +1,88 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+    {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
     
     {{!-- Sheet Body --}}
     <section class="sheet-body">
       <div class="form-group">
-        <label for="data.competence">Compétence associée</label>
+        <label for="system.competence">Compétence associée</label>
-        <select name="data.competence" id="competence" data-dtype="String">
+        <select name="system.competence" id="competence" data-dtype="String">
-          {{#select data.competence}}
+          {{#select system.competence}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/enum-competence.html"}}
           {{/select}}
         </select>
       </div>
       <div class="form-group">
-        <label for="data.dommages">Dommages </label>
+        <label for="system.dommages">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="{{system.dommages}}" data-dtype="String"/>
       </div>
       <div class="form-group">
-        <label for="data.resistance">Résistance </label>
+        <label for="system.resistance">Résistance </label>
-        <input class="attribute-value" type="text" name="data.resistance" value="{{data.resistance}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.resistance" value="{{system.resistance}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
-        <label for="data.categorie_parade">Catégorie parade </label>
+        <label for="system.categorie_parade">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}}
+          {{#select system.categorie_parade}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html"}}
           {{/select}}
         </select>
       </div>
       <div class="form-group">
-        <label for="data.encombrement">Encombrement </label>
+        <label for="system.encombrement">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="{{system.encombrement}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
-        <label for="data.force">Force min. </label>
+        <label for="system.force">Force min. </label>
-        <input class="attribute-value" type="text" name="data.force" value="{{data.force}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.force" value="{{system.force}}" data-dtype="String"/>
       </div>
       <div class="form-group">
-        <label for="data.rapide">Arme rapide ? </label>
+        <label for="system.rapide">Arme rapide ? </label>
-        <input class="attribute-value" type="checkbox" name="data.rapide"  {{#if data.rapide}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="system.rapide"  {{#if system.rapide}}checked{{/if}}/>
       </div>
       <div class="form-group">
-        <label for="data.unemain">A Une main ? </label>
+        <label for="system.unemain">A Une main ? </label>
-        <input class="attribute-value" type="checkbox" name="data.unemain"  {{#if data.unemain}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="system.unemain"  {{#if system.unemain}}checked{{/if}}/>
       </div>
       <div class="form-group">
-        <label for="data.deuxmains">A Deux mains ? </label>
+        <label for="system.deuxmains">A Deux mains ? </label>
-        <input class="attribute-value" type="checkbox" name="data.deuxmains"  {{#if data.deuxmains}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="system.deuxmains"  {{#if system.deuxmains}}checked{{/if}}/>
       </div>
       <div class="form-group">
-        <label for="data.portee_courte">Portée courte </label>
+        <label for="system.portee_courte">Portée courte </label>
-        <input class="attribute-value" type="text" name="data.portee_courte" value="{{data.portee_courte}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.portee_courte" value="{{system.portee_courte}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
-        <label for="data.portee_moyenne">Portée moyenne </label>
+        <label for="system.portee_moyenne">Portée moyenne </label>
-        <input class="attribute-value" type="text" name="data.portee_moyenne" value="{{data.portee_moyenne}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.portee_moyenne" value="{{system.portee_moyenne}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
-        <label for="data.portee_extreme">Portée extrême </label>
+        <label for="system.portee_extreme">Portée extrême </label>
-        <input class="attribute-value" type="text" name="data.portee_extreme" value="{{data.portee_extreme}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.portee_extreme" value="{{system.portee_extreme}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
-        <label for="data.penetration">Pénétration </label>
+        <label for="system.penetration">Pénétration </label>
-        <input class="attribute-value" type="text" name="data.penetration" value="{{data.penetration}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.penetration" value="{{system.penetration}}" data-dtype="Number"/>
       </div>
       <div class="form-group item-cout">
-        <label for="data.cout">Prix (sols) </label>
+        <label for="system.cout">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="{{system.cout}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
-        <label for="data.magique">Magique ? </label>
+        <label for="system.magique">Magique ? </label>
-        <input class="attribute-value" type="checkbox" name="data.magique"  {{#if data.magique}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="system.magique"  {{#if system.magique}}checked{{/if}}/>
       </div>
       <div class="form-group item-magique">
-        <label for="data.resistance_magique">Résistance magique </label>
+        <label for="system.resistance_magique">Résistance magique </label>
-        <input class="attribute-value" type="text" name="data.resistance_magique" value="{{data.resistance_magique}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.resistance_magique" value="{{system.resistance_magique}}" data-dtype="Number"/>
       </div>
       <div class="form-group item-magique">
-        <label for="data.ecaille_efficacite">Nombre d'Ecailles d'Efficacité </label>
+        <label for="system.ecaille_efficacite">Nombre d'Ecailles d'Efficacité </label>
-        <input class="attribute-value" type="text" name="data.ecaille_efficacite" value="{{data.ecaille_efficacite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.ecaille_efficacite" value="{{system.ecaille_efficacite}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
-        <label for="data.initpremierround">Classe d'initiative au premier round (mêlée seulement) </label>
+        <label for="system.initpremierround">Classe d'initiative au premier round (mêlée seulement) </label>
-        <select name="data.initpremierround" id="initpremierround" data-dtype="String">
+        <select name="system.initpremierround" id="initpremierround" data-dtype="String">
-          {{#select data.initpremierround}}
+          {{#select system.initpremierround}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/enum-initpremierround.html"}}
           {{/select}}
         </select>

templates/item-armure-sheet.html

@@ -1,35 +1,29 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
 
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
       <label for="xp">Protection</label>
-        <input class="attribute-value" type="text" name="data.protection" value="{{data.protection}}" data-dtype="String"/>
+      <input class="attribute-value" type="text" name="system.protection" value="{{system.protection}}" data-dtype="String"/>
     </div>
     <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="{{system.encombrement}}" data-dtype="Number"/>
     </div>
     <div class="form-group">
       <label for="xp">Détérioration</label>
-        <input class="attribute-value" type="text" name="data.deterioration" value="{{data.deterioration}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.deterioration" value="{{system.deterioration}}" data-dtype="Number"/>
     </div>
     <div class="form-group">
       <label for="xp">Malus Armure </label>
-        <input class="attribute-value" type="text" name="data.malus" value="{{data.malus}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.malus" value="{{system.malus}}" 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="{{system.cout}}" data-dtype="Number"/>
     </div>
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
   </section>
-    
 </form>

templates/item-casetmr-sheet.html

@@ -1,21 +1,15 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
       <label for="niveau">Coordonnées TMR </label>
-        <input class="attribute-value" type="text" name="data.coord" value="{{data.coord}}" data-dtype="String"/>
+      <input class="attribute-value" type="text" name="system.coord" value="{{system.coord}}" data-dtype="String"/>
     </div>
     <div class="form-group">
       <label for="niveau">Mode spécifique</label>
-        <select name="data.specific" id="specific" data-dtype="String">
+      <select name="system.specific" id="specific" data-dtype="String">
-          {{#select data.specific}}
+        {{#select system.specific}}
         {{>"systems/foundryvtt-reve-de-dragon/templates/casetmr-specific-list.html"}}
         {{/select}}
     </select>
@@ -23,5 +17,4 @@
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
   </section>
-    
 </form>

templates/item-chant-sheet.html

@@ -1,24 +1,16 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <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="{{system.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="{{system.reference}}" data-dtype="String"/>
     </div>
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-      
   </section>
-    
 </form>

templates/item-competence-sheet.html

@@ -17,52 +17,52 @@
       <div class="form-group">
         <label>Catégorie </label>
         <select name="system.categorie" class="categorie" data-dtype="String">
-              {{#select data.categorie}}
+              {{#select system.categorie}}
               {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-competence.html"}}
               {{/select}}
         </select>
       </div>
       <div class="form-group">
         <label for="niveau">Niveau </label>
-        <input class="attribute-value" type="text" name="system.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">XP </label>
-        <input class="attribute-value sheet-competence-xp" type="text" name="system.xp" value="{{data.xp}}" data-dtype="Number"/>
+        <input class="attribute-value sheet-competence-xp" type="text" name="system.xp" value="{{system.xp}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="base">Niveau de base </label>
         {{#if isGM}}
         <select name="system.base" id="base" data-dtype="Number">
-                {{#select data.base}}
+                {{#select system.base}}
                 {{>"systems/foundryvtt-reve-de-dragon/templates/competence-base.html"}}
                 {{/select}}
         </select>
         {{else}}
-        <label id="base">{{data.base}}</label>
+        <label id="base">{{system.base}}</label>
         {{/if}}
       </div>
       <div class="form-group">
         <label for="defaut_carac">Caractéristique par défaut </label>
         <select name="system.defaut_carac" id="defaut_carac" data-dtype="String">
-          {{#select data.defaut_carac}}
+          {{#select system.defaut_carac}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/competence-carac-defaut.html"}}
           {{/select}}
         </select>        
       </div>
       <div class="form-group">
         <label for="default_diffLibre">Difficulté libre par défaut</label>
-        <input class="attribute-value" type="text" name="system.default_diffLibre" value="{{data.default_diffLibre}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.default_diffLibre" value="{{system.default_diffLibre}}" data-dtype="Number"/>
       </div>
-      {{#if (eq data.categorie 'draconic')}}
+      {{#if (eq system.categorie 'draconic')}}
       <div class="form-group">
         <label for="xp">XP Sort </label>
-        <input class="attribute-value" type="text" name="system.xp_sort" value="{{data.xp_sort}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.xp_sort" value="{{system.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="system.niveau_archetype" value="{{data.niveau_archetype}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.niveau_archetype" value="{{system.niveau_archetype}}" data-dtype="Number"/>
       </div>
 
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}

templates/item-competencecreature-sheet.html

@@ -1,52 +1,56 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
-        <label for="niveau">Niveau </label>
+      <label for="system.categorie">Catégorie</label>
-        <input class="attribute-value" type="text" name="system.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+      <select name="system.categorie" class="categorie" data-dtype="String">
-      </div>
+          {{#select system.categorie}}
-      <div class="form-group">
+          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-competence.html"}}
-        <label for="niveau">Valeur de Caractéristique </label>
-        <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="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="system.iscombat"  {{#if data.iscombat}}checked{{/if}}/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Parade ? </label>
-        <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="system.ispossession"  {{#if data.ispossession}}checked{{/if}}/>
-      </div>
-      <div class="form-group">
-        <label>Catégorie parade </label>
-        <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}}
       </select>
     </div>
     <div class="form-group">
-        <label for="niveau">Dommages (+dom), si applicable </label>
+      <label for="niveau">Valeur de Caractéristique </label>
-        <input class="attribute-value" type="text" name="system.dommages" value="{{data.dommages}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.carac_value" value="{{system.carac_value}}" data-dtype="Number"/>
     </div>
+    <div class="form-group">
+      <label for="niveau">Niveau </label>
+      <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" 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="system.default_diffLibre" value="{{system.default_diffLibre}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="system.ispossession">Attaque de possession</label>
+      <input class="attribute-value" type="checkbox" name="system.ispossession" {{#if system.ispossession}}checked{{/if}}/>
+    </div>
+    {{#unless system.ispossession}}
+    <div class="form-group">
+        <label for="system.iscombat">Compétence d'attaque</label>
+        <input class="attribute-value" type="checkbox" name="system.iscombat" {{#if system.iscombat}}checked{{/if}}/>
+      </div>
+      {{#if system.iscombat}}
+      <div class="form-group">
+        <label for="system.isnaturelle">Arme naturelle</label>
+        <input class="attribute-value" type="checkbox" name="system.isnaturelle" {{#if system.isnaturelle}}checked{{/if}}/>
+      </div>
+      <div class="form-group">
+        <label for="niveau">Dommages (+dom)</label>
+        <input class="attribute-value" type="text" name="system.dommages" value="{{system.dommages}}" data-dtype="Number"/>
+      </div>
+      {{/if}}
+      <div class="form-group">
+        <label>Catégorie parade </label>
+        <select name="system.categorie_parade" id="categorie_parade" data-dtype="String">
+          {{#select system.categorie_parade}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html"}}
+          {{/select}}
+        </select>
+      </div>
+    {{/unless}}
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
     </section>
-    
 </form>

templates/item-conteneur-sheet.html

@@ -1,28 +1,22 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
       <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="system.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.encombrement" value="{{system.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="system.capacite" value="{{data.capacite}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.capacite" value="{{system.capacite}}" data-dtype="Number"/>
     </div>
     <div class="form-group">
       <label for="xp">Qualité</label>
-        <input class="attribute-value" type="text" name="system.qualite" value="{{data.qualite}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.qualite" value="{{system.qualite}}" data-dtype="Number"/>
     </div>
     <div class="form-group item-cout">
       <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="system.cout" value="{{data.cout}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number"/>
     </div>
     {{#if isOwned}}
     <div class="flexcol">
@@ -41,7 +35,5 @@
 
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
   </section>
-    
 </form>

templates/item-danse-sheet.html

@@ -1,17 +1,11 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
       <label class="alchimie-title" for="xp">Type</label>
       <select name="system.type" data-dtype="String">
-          {{#select data.type}}
+        {{#select system.type}}
         <option value="recreative">Récréative</option>
         <option value="soliste">Soliste</option>
         {{/select}}    
@@ -19,23 +13,21 @@
     </div>
     <div class="form-group">
       <label class="alchimie-title" for="xp">Agilité ?</label>
-        <input class="attribute-value" type="checkbox" name="system.agilite" {{#if data.agilite}}checked{{/if}}/>    
+      <input class="attribute-value" type="checkbox" name="system.agilite" {{#if system.agilite}}checked{{/if}}/>    
     </div>
     <div class="form-group">
         <label class="alchimie-title" for="xp">Apparence ?</label>
-        <input class="attribute-value" type="checkbox" name="system.apparence"  {{#if data.apparence}}checked{{/if}}/>    
+      <input class="attribute-value" type="checkbox" name="system.apparence"  {{#if system.apparence}}checked{{/if}}/>    
     </div>
     <div class="form-group">
       <label class="alchimie-title" for="xp">Niveau</label>
-        <input class="attribute-value" type="text" name="system.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
     </div>
     <div class="form-group">
       <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="system.reference" value="{{data.reference}}" data-dtype="String"/>
+      <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
     </div>
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
   </section>
-    
 </form>

templates/item-gemme-sheet.html

@@ -1,56 +1,48 @@
 <form class="{{cssClass}}" autocomplete="off">
-  <header class="sheet-header">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
-    <div class="header-fields">
-      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-    </div>
-  </header>
-
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
       <label>Type</label>
       <select name="system.type" id="type" data-dtype="String">
-        {{#select data.type}}
+        {{#select system.type}}
         {{{gemmeTypeList}}}
         {{/select}}
       </select>
     </div>
     <div class="form-group">
       <label>Taille</label>
-      <input class="attribute-value" type="text" name="system.taille" value="{{data.taille}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="system.taille" value="{{system.taille}}" data-dtype="Number" />
     </div>
     <div class="form-group">
       <label>Pureté</label>
-      <input class="attribute-value" type="text" name="system.purete" value="{{data.purete}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="system.purete" value="{{system.purete}}" data-dtype="Number" />
     </div>
     <div class="form-group">
       <label>Qualité</label>
-      <input class="attribute-value" type="text" name="system.qualite" value="{{data.qualite}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="system.qualite" value="{{system.qualite}}" data-dtype="Number" />
     </div>
     <div class="form-group">
       <label>Encombrement</label>
-      <input class="attribute-value" type="text" name="system.encombrement" value="{{data.encombrement}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number" />
     </div>
     <div class="form-group">
       <label>Quantité</label>
-      <input class="attribute-value" type="text" name="system.quantite" value="{{data.quantite}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="system.quantite" value="{{system.quantite}}" data-dtype="Number" />
     </div>
     <div class="form-group">
       <label>Inertie</label>
-      <input class="attribute-value" type="text" name="system.inertie" value="{{data.inertie}}" data-dtype="Number" disabled/>
+      <input class="attribute-value" type="text" name="system.inertie" value="{{system.inertie}}" data-dtype="Number" disabled/>
     </div>
     <div class="form-group">
       <label>Enchantabilité</label>
-      <input class="attribute-value" type="text" name="system.enchantabilite" value="{{data.enchantabilite}}" data-dtype="Number" disabled/>
+      <input class="attribute-value" type="text" name="system.enchantabilite" value="{{system.enchantabilite}}" data-dtype="Number" disabled/>
     </div>
     <div class="form-group">
       <label>Prix</label>
-      <input class="attribute-value" type="text" name="system.cout" value="{{data.cout}}" data-dtype="Number" disabled/>
+      <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number" disabled/>
     </div>
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
   </section>
-
 </form>

templates/item-herbe-sheet.html

@@ -16,24 +16,24 @@
     <div class="flexcol">
       <div class="form-group">
         <label>Niveau (si applicable)</label>
-        <input class="attribute-value" type="text" name="system.niveau" value="{{data.niveau}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number" />
       </div>
       <div class="form-group">
         <label>Quantité (Pépins ou Brins)</label>
-        <input class="attribute-value" type="text" name="system.quantite" value="{{data.quantite}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.quantite" value="{{system.quantite}}" data-dtype="Number" />
       </div>
       <div class="form-group item-cout">
         <label>Prix (sols)</label>
-        <input class="attribute-value" type="text" name="system.cout" value="{{data.cout}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number" />
       </div>
       <div class="form-group">
         <label>Milieu</label>
-        <input class="attribute-value" type="text" name="system.milieu" value="{{data.milieu}}" data-dtype="String" />
+        <input class="attribute-value" type="text" name="system.milieu" value="{{system.milieu}}" data-dtype="String" />
       </div>
       <div class="form-group">
         <label>Fréquence</label>
         <select name="system.rarete" class="rarete" data-dtype="String">
-          {{#select data.rarete}}
+          {{#select system.rarete}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}}
           {{/select}}
         </select>
@@ -41,7 +41,7 @@
       <div class="form-group">
         <label>Catégorie</label>
         <select name="system.categorie" class="categorie" data-dtype="String">
-          {{#select data.categorie}}
+          {{#select system.categorie}}
           {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-ingredient.html"}}
           {{/select}}
         </select>

templates/item-ingredient-sheet.html

@@ -1,39 +1,34 @@
 <form class="{{cssClass}}" autocomplete="off">
-  <header class="sheet-header">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
-    <div class="header-fields">
-      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-    </div>
-  </header>
 
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="flexcol">
       <div class="form-group">
         <label>Niveau (si applicable) </label>
-        <input class="attribute-value" type="text" name="system.niveau" value="{{data.niveau}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number" />
       </div>
       <div class="form-group">
         <label>Quantité (Pépins ou Brins)</label>
-        <input class="attribute-value" type="text" name="system.quantite" value="{{data.quantite}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.quantite" value="{{system.quantite}}" data-dtype="Number" />
       </div>
       <div class="form-group">
         <label>Encombrement</label>
-        <input class="attribute-value" type="text" name="system.encombrement" value="{{data.encombrement}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number" />
       </div>
       <div class="form-group item-cout">
         <label>Prix (sols)</label>
-        <input class="attribute-value" type="text" name="system.cout" value="{{data.cout}}" data-dtype="Number" />
+        <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number" />
       </div>
     </div>
     <div class="form-group">
       <label>Milieu</label>
-      <input class="attribute-value" type="text" name="system.milieu" value="{{data.milieu}}" data-dtype="String" />
+      <input class="attribute-value" type="text" name="system.milieu" value="{{system.milieu}}" data-dtype="String" />
     </div>
     <div class="form-group">
       <label>Fréquence</label>
       <select name="system.rarete" class="rarete" data-dtype="String">
-        {{#select data.rarete}}
+        {{#select system.rarete}}
         {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}}
         {{/select}}
       </select>
@@ -41,14 +36,12 @@
     <div class="form-group">
       <label>Catégorie</label>
       <select name="system.categorie" class="categorie" data-dtype="String">
-        {{#select data.categorie}}
+        {{#select system.categorie}}
         {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-ingredient.html"}}
         {{/select}}
       </select>
     </div>
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
   </section>
-
 </form>

templates/item-jeu-sheet.html

@@ -1,17 +1,12 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
 
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
       <label class="alchimie-title" for="xp">Type</label>
       <select name="system.type" data-dtype="String">
-          {{#select data.type}}
+        {{#select system.type}}
         <option value="adressehasard">Adresse/Hasard</option>
         <option value="de">Dés</option>
         <option value="carte">Cartes</option>
@@ -21,19 +16,17 @@
     </div>
     <div class="form-group">
       <label class="alchimie-title" for="xp">Base</label>
-        <input class="attribute-value" type="text" name="system.base" value="{{data.base}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.base" value="{{system.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="system.caraccomp" value="{{data.caraccomp}}" data-dtype="String"/>
+      <input class="attribute-value" type="text" name="system.caraccomp" value="{{system.caraccomp}}" data-dtype="String"/>
     </div>
     <div class="form-group">
       <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="system.reference" value="{{data.reference}}" data-dtype="String"/>
+      <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
     </div>
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
   </section>
-    
 </form>

templates/item-livre-sheet.html

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

templates/item-maladie-sheet.html

@@ -2,7 +2,7 @@
     <header class="sheet-header">
         <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
         <div class="header-fields">
-          {{#if (or isGM data.identifie)}}
+          {{#if (or isGM system.identifie)}}
             <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
           {{else}}
             <h1 class="charname">Inconnue</h1>
@@ -12,31 +12,31 @@
     
     {{!-- Sheet Body --}}
     <section class="sheet-body">
-      {{#if (or isGM data.identifie)}}
+      {{#if (or isGM system.identifie)}}
       <div class="form-group">
         <label for="xp">Identifiée ? </label>
-        <input class="attribute-value" type="checkbox" name="system.identifie"  {{#if data.identifie}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="system.identifie"  {{#if system.identifie}}checked{{/if}}/>
       </div>
       <div class="form-group">
         <label for="xp">Malignité </label>
-        <input class="attribute-value" type="text" name="system.malignite" value="{{data.malignite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="system.malignite" value="{{system.malignite}}" data-dtype="Number"/>
       </div>
       <div class="form-group">
         <label for="xp">Périodicité</label>
-        <input class="attribute-value" type="text" name="system.periodicite" value="{{data.periodicite}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.periodicite" value="{{system.periodicite}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Dommages</label>
-        <input class="attribute-value" type="text" name="system.dommages" value="{{data.dommages}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.dommages" value="{{system.dommages}}" data-dtype="String"/>
       </div>
       <div class="form-group">
         <label for="xp">Remedes Connus ? </label>
-        <input class="attribute-value" type="checkbox" name="system.remedesconnus"  {{#if data.remedesconnus}}checked{{/if}}/>
+        <input class="attribute-value" type="checkbox" name="system.remedesconnus"  {{#if system.remedesconnus}}checked{{/if}}/>
       </div>
-      {{#if (or isGM data.remedesconnus)}}
+      {{#if (or isGM system.remedesconnus)}}
       <div class="form-group">
         <label for="xp">Remèdes </label>
-        <input class="attribute-value" type="text" name="system.remedes" value="{{data.remedes}}" data-dtype="String"/>
+        <input class="attribute-value" type="text" name="system.remedes" value="{{system.remedes}}" data-dtype="String"/>
       </div>
       {{/if}}
       {{/if}}

templates/item-meditation-sheet.html

@@ -1,17 +1,11 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
       <label for="xp">Compétence</label>
       <select name="system.competence" id="competenceselect" data-dtype="String">
-          {{#select data.competence}}
+        {{#select system.competence}}
         {{#each competences as |competence key|}}
         <option value="{{competence.name}}">{{competence.name}}</option>
         {{/each}}
@@ -20,36 +14,36 @@
     </div>
     <div class="form-group">
       <label for="xp">Thème</label>
-        <input class="attribute-value" type="text" name="system.theme" value="{{data.theme}}" data-dtype="String"/>
+      <input class="attribute-value" type="text" name="system.theme" value="{{system.theme}}" data-dtype="String"/>
     </div>
     <div class="form-group">
       <label for="xp">Support</label>
-        <input class="attribute-value" type="text" name="system.support" value="{{data.support}}" data-dtype="String"/>
+      <input class="attribute-value" type="text" name="system.support" value="{{system.support}}" data-dtype="String"/>
     </div>
     <div class="form-group">
       <label for="xp">Heure</label>
       <select name="system.heure" id="heure" data-dtype="String">
-          {{#select data.heure}}
+        {{#select system.heure}}
         {{>"systems/foundryvtt-reve-de-dragon/templates/heures-select-option.html"}}
         {{/select}}
       </select>        
     </div>
     <div class="form-group">
       <label for="xp">Purification</label>
-        <input class="attribute-value" type="text" name="system.purification" value="{{data.purification}}" data-dtype="String"/>
+      <input class="attribute-value" type="text" name="system.purification" value="{{system.purification}}" data-dtype="String"/>
     </div>
     <div class="form-group">
       <label for="xp">Vêture</label>
-        <input class="attribute-value" type="text" name="system.veture" value="{{data.veture}}" data-dtype="String"/>
+      <input class="attribute-value" type="text" name="system.veture" value="{{system.veture}}" data-dtype="String"/>
     </div>
     <div class="form-group">
       <label for="xp">Comportement</label>
-        <input class="attribute-value" type="text" name="system.comportement" value="{{data.comportement}}" data-dtype="String"/>
+      <input class="attribute-value" type="text" name="system.comportement" value="{{system.comportement}}" data-dtype="String"/>
     </div>
     <div class="form-group">
       <label for="xp">Case TMR</label>
       <select name="system.tmr" id="tmr" data-dtype="String">
-          {{#select data.tmr}}
+        {{#select system.tmr}}
         {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}}
         {{/select}}
       </select>
@@ -58,7 +52,7 @@
       <label for="xp">Malus</label>
       {{#if isGM}}
       <select name="system.malus" id="malus" data-dtype="Number">
-          {{#select data.malus}}
+        {{#select system.malus}}
         <option value="0">0</option>
         <option value="-1">-1</option>
         <option value="-2">-2</option>
@@ -73,12 +67,10 @@
         {{/select}}
       </select>
       {{else}}
-        <label>>{{data.malus}}</label>
+      <label>>{{system.malus}}</label>
       {{/if}}
     </div>
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
   </section>
-    
 </form>

templates/item-monnaie-sheet.html

@@ -1,32 +1,24 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
       <label for="xp">Quantité</label>
-        <input class="attribute-value" type="text" name="system.quantite" value="{{data.quantite}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.quantite" value="{{system.quantite}}" data-dtype="Number"/>
     </div>
     <div class="form-group">
       <label for="xp">Valeur en Deniers</label>
       {{#if isGM}}
-        <input class="attribute-value" type="text" name="system.valeur_deniers" value="{{data.valeur_deniers}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.valeur_deniers" value="{{system.valeur_deniers}}" data-dtype="Number"/>
       {{else}}
-        <label for="xp">{{data.valeur_deniers}}</label>
+      <label for="xp">{{system.valeur_deniers}}</label>
       {{/if}}
     </div>
     <div class="form-group">
       <label for="xp">Encombrement</label>
-        <input class="attribute-value" type="text" name="system.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number"/>
     </div>
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
   </section>
-    
 </form>

templates/item-munition-sheet.html

@@ -1,32 +1,24 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
       <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="system.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number"/>
     </div>
     <div class="form-group">
       <label>Quantité </label>
-        <input class="attribute-value" type="text" name="system.quantite" value="{{data.quantite}}" data-dtype="Number" />
+      <input class="attribute-value" type="text" name="system.quantite" value="{{system.quantite}}" data-dtype="Number" />
     </div>      
     <div class="form-group">
       <label for="xp">Qualité</label>
-        <input class="attribute-value" type="text" name="system.qualite" value="{{data.qualite}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.qualite" value="{{system.qualite}}" data-dtype="Number"/>
     </div>
     <div class="form-group item-cout">
       <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="system.cout" value="{{data.cout}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number"/>
     </div>
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
   </section>
-    
 </form>