81 changed files with 731 additions and 995 deletions
--- a/assets/scenes/9fmf9lcb3L9XO3bJ-thumb.png
+++ b/assets/scenes/9fmf9lcb3L9XO3bJ-thumb.png
--- a/changelog.md
+++ b/changelog.md
@ -1,87 +1,4 @@
-# 12.0
-## 12.0.8 - La quincaillerie d'Astrobazzarh
- le propriétaire est indiqué dans les feuilles d'équipements/compétences/...
- Ecaille d'efficacité
-  - l'écaille d'efficacité est prise en compte même si on n'utilise pas le ciblage en combat
-  - l'écaille d'efficacité est prise en compte pour l'initiative
- Corrections
-  - l'état général est pris en compte pour les initiatives
-  - le tooltip de l'initiative affiche correctement l'initiative
-
-## 12.0.7 - La propriété d'Astrobazzarh
- correction des opérations faites à la création d'un Item:
-  - la durée des queues/rencontres/souffles
-  - les effets draconiques d'un souffle/queue
-  - mise à jour des points de tâche des blessures lors des soins
- pas d'expérience sur les particulières quand aucun MJ n'est connecté
- Le drag&drop d'un acteur depuis la liste des acteurs sur la fiche
-  d'une entité incarnée permet d'accorder le personnage
- Les messages pour résister aux possessions/conjuration sont envoyées
-  au défenseur
- Les messages pour résister aux empoignades sont envoyées au défenseur
- la commande /voyage affiche maintenant le total de fatigue pour chaque voyageur
- la commande /voyage affiche maintenant les compétences liées au terrain
-
-## 12.0.6 - Le bazar d'Astrobazzarh
- Corrections de l'inventaire en bazar:
-  - un problème pouvait survenir en déplaçant les objets 
-    l'inventaire, qui fait qu'un conteneur se retrouve récursivement dans son
-    propre contenu, ce qui empêche d'ouvrir la feuille d'acteur.
-  - un objet non-conteneur pouvait dans certains cas avoir un pseudo contenu
-  - un objet pouvait être considéré comme contenu, sans être présent dans un
-    conteneur (et donc non affiché)
-  - vider les conteneurs supprime correctement toutes les informations liées
-    aux conteneurs/contenus
- Les messages pour les tirages dans le compendium utilisent le "roll mode" 
-  courant pour leur visibilité
- Fix: restaurer la compatibilité Foundry 11
-
-## 12.0.5 - Les mauvais jours d'Astrobazzarh
- Fix: on peut de nouveau ouvrir l'édition de calendrier
- Fix: on ne peut plus ouvrir plusieurs fenêtres de lancer de sort
- Fix: Failed to execute 'getComputedStyle' on 'Window'
-
-## 12.0.4 - La plaie d'Astrobazzarh
- **Support V12**
-  - Fix: les boutons d'encaissement dans le tchat fonctionnent de nouveau
-  - Fix warnings sur "Die" et AudioHelper
-
-## 12.0.3 - L'hémorragie d'Astrobazzarh
- **Support V12**
-  - On peut de nouveau ouvrir un acteur blessé après redémarrage du monde
-  - On peut de nouveau ouvrir les Items avec une rareté par environnement
-  - Le choix de ne plus afficher les demandes de suppression est bien pris en compte
-
-## 12.0.2 - Les pluies d'Astrobazzarh
- **Support V12**
-  - correction des actions techniques déleguées au MJ qui bloquaient les fenêtre de lancer de dés des joueurs (et plein d'autres)
-  - la fenêtre de calendrier s'ouvre correctement
-  - les dés draconiques peuvent de nouveau faire plus que 0
-  - adaptation de la fenêtre de recherche
-  - correction des comparaisons de version pour les migrations automatiques
-  - correction des roll.eveluate: l'option async est maintenant standard
-  - correction des templates liés aux selections
-  - correction de l'ajustement de luminosité de la scène selon l'heure
-  - correction des images d'effets sur les tokens
-  - correction de la vente par le tchat: seul le premier acheteur pouvait acheter
-  - correction d'erreurs intempestives 'User ... lacks permission to update ...'
-
 # 11.2
-## 11.2.21 - Le questionnement d'Akarlikarlikar
- Une confirmation spécifique est demandée pour monter dans les terres médianes en cas de rencontre en attente
- L'expérience en caractéristique sur les jets de chance et rêve actuels est mise dans la caractéristique correspondante
- Les effets s'appliquent correctement sur les créatures
- La date et l'heure (draconiques) sont affichées dans les messages du tchat
-
-## 11.2.20 - Le soulagement d'Akarlikarlikar
- L'option "ajout de la difficulté d'attaque à l'encaissement" est affichée comme un modificateur d'encaissement
- Les options d'encaissement alternatives fonctionnent avec la validation de l'encaissement par le gardien
- La fenêtre d'astrologie du gardien affiche toutes les heures lues par un personnage
- Si aucune expérience n'est gagnée, les autres effets à appliquer (comme la récupération de seuil après avoir vaincu un rêve de Dragon) s'appliquent normalement
- Les tooltips de Foundry sont lisibles
- On n'accorde plus les entités de cauchemar deux fois quand le gardien valide les encaissements
- Les messages de récupération de rêve en cas de Rêve de Dragon sont clarifiés
-
 ## 11.2.19 - Les hémorroïdes d'Akarlikarlikar
 - La validation des jets d'encaissement par le Gardien fonctionne de nouveau

--- a/icons/heures/.directory
+++ b/icons/heures/.directory
@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2024,5,29,20,57,41.954
-Version=4
-VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails
--- a/module/achat-vente/chat-vente.js
+++ b/module/achat-vente/chat-vente.js
@ -1,65 +0,0 @@
-import { SYSTEM_RDD } from "../constants.js";
-import { RdDUtility } from "../rdd-utility.js";
-
-const DETAIL_VENTE = 'detailVente';
-const NB_LOTS = 'nbLotss';
-
-export class ChatVente {
-
-  static getDetailVente(chatMessageId) {
-    const chatMessage = game.messages.get(chatMessageId)
-    if (!chatMessage) {
-      return undefined;
-    }
-    const nbLots = chatMessage.getFlag(SYSTEM_RDD, NB_LOTS)
-    const detail = foundry.utils.duplicate(chatMessage.getFlag(SYSTEM_RDD, DETAIL_VENTE))
-    if (!detail.item) {
-      ui.notifications.warn("Impossible d'acheter: informations sur l'objet manquantes")
-      return undefined;
-    }
-
-    const vendeur = detail.vendeurId ? game.actors.get(detail.vendeurId) : undefined;
-    return foundry.utils.mergeObject(detail,
-      {
-        alias: vendeur?.name ?? game.user.name,
-        vendeur,
-        nbLots: nbLots,
-        chatMessageIdVente: chatMessageId
-      })
-  }
-
-  static getDetailAchatVente(chatMessageId) {
-    const acheteur = RdDUtility.getSelectedActor()
-    const detail = ChatVente.getDetailVente(chatMessageId)
-    if (!acheteur && !detail.vendeur) {
-      ui.notifications.info("Pas d'acheteur ni de vendeur, aucun changement");
-      return undefined;
-    }
-    return foundry.utils.mergeObject(detail, { acheteur })
-  }
-
-  static async diminuerQuantiteAchatVente(chatMessageId, quantite) {
-    const chatMessage = game.messages.get(chatMessageId)
-    const vente = ChatVente.getDetailVente(chatMessageId)
-    vente.nbLots = Math.max(0, vente.nbLots - quantite)
-    await chatMessage.setFlag(SYSTEM_RDD, NB_LOTS, vente.nbLots)
-
-    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', vente);
-    chatMessage.update({ content: html });
-    chatMessage.render(true);
-  }
-
-  static async displayAchatVente(vente) {
-    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', vente);
-    const chatMessage = await ChatMessage.create(RdDUtility.chatDataSetup(html))
-    await chatMessage.setFlag(SYSTEM_RDD, NB_LOTS, vente.nbLots)
-    await chatMessage.setFlag(SYSTEM_RDD, DETAIL_VENTE, {
-      item: vente.item,
-      properties: vente.item.getProprietes(),
-      vendeurId: vente.vendeurId,
-      tailleLot: vente.tailleLot,
-      quantiteIllimite: vente.quantiteIllimite,
-      prixLot: vente.prixLot
-    })
-  }
-}
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@ -16,6 +16,7 @@ import { RdDItem } from "./item.js";
 import { RdDItemBlessure } from "./item/blessure.js";
 import { RdDEmpoignade } from "./rdd-empoignade.js";
 import { RdDBaseActorSangSheet } from "./actor/base-actor-sang-sheet.js";
+import { ChatUtility } from "./chat-utility.js";
 import { RdDCoeur } from "./coeur/rdd-coeur.js";

 /* -------------------------------------------- */
@ -32,20 +33,22 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
      width: 550,
      showCompNiveauBase: false,
      vueArchetype: false,
-    }, { inplace: false });
+    });
  }

  /* -------------------------------------------- */
  async getData() {
    let formData = await super.getData();
-    foundry.utils.mergeObject(formData, {
-      editable: this.isEditable,
-      cssClass: this.isEditable ? "editable" : "locked",
-      limited: this.actor.limited,
-      owner: this.actor.isOwner,
-      biographie: await TextEditor.enrichHTML(this.actor.system.biographie, { async: true }),
-      notes: await TextEditor.enrichHTML(this.actor.system.notes, { async: true }),
-    });
+    foundry.utils.mergeObject(formData,
+      {
+        editable: this.isEditable,
+        cssClass: this.isEditable ? "editable" : "locked",
+        effects: this.actor.effects.map(e => foundry.utils.deepClone(e)),
+        limited: this.actor.limited,
+        owner: this.actor.isOwner,
+        biographie: await TextEditor.enrichHTML(this.actor.system.biographie, { async: true }),
+        notes: await TextEditor.enrichHTML(this.actor.system.notes, { async: true }),
+      });
    foundry.utils.mergeObject(formData.calc, {
      surenc: this.actor.computeMalusSurEncombrement(),
      surprise: RdDBonus.find(this.actor.getSurprise(false)).descr,
@ -77,7 +80,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {

      // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
      const actor = this.actor;
-      formData.combat = foundry.utils.duplicate(formData.armes);
+      formData.combat = duplicate(formData.armes);
      RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
      formData.combat.push(RdDItemArme.mainsNues(actor));
      formData.combat.push(RdDItemArme.empoignade(actor));
@ -210,7 +213,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
        const key = Number(li.data("key") ?? -1);
        await this.actor.deleteExperienceLog(0, key + 1);
      });
-      // Boutons spéciaux MJs
+        // Boutons spéciaux MJs
      this.html.find('.forcer-tmr-aleatoire').click(async event => this.actor.reinsertionAleatoire("Action MJ"))
      this.html.find('.afficher-tmr').click(async event => this.actor.changeTMRVisible())
    }
@ -218,7 +221,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
    // Points de reve actuel
    this.html.find('.ptreve-actuel a').click(async event => this.actor.rollCarac('reve-actuel', true))
    this.html.find('.empoignade-label a').click(async event => RdDEmpoignade.onAttaqueEmpoignadeFromItem(RdDSheetUtility.getItem(event, this.actor)))
-    this.html.find('.arme-label a').click(async event => this.actor.rollArme(foundry.utils.duplicate(this._getEventArmeCombat(event))))
+    this.html.find('.arme-label a').click(async event => this.actor.rollArme(duplicate(this._getEventArmeCombat(event))))

    // Initiative pour l'arme
    this.html.find('.arme-initiative a').click(async event => {
@ -385,7 +388,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
  async _onSplitItem(item, split) {
    if (split >= 1 && split < item.system.quantite) {
      await item.diminuerQuantite(split);
-      const splitItem = foundry.utils.duplicate(item);
+      const splitItem = duplicate(item);
      splitItem.system.quantite = split;
      await this.actor.createEmbeddedDocuments('Item', [splitItem])
    }
--- a/module/actor.js
+++ b/module/actor.js
@ -120,7 +120,7 @@ export class RdDActor extends RdDBaseActorSang {

  /* -------------------------------------------- */
  getActivePoisons() {
-    return foundry.utils.duplicate(this.items.filter(item => item.type == 'poison' && item.system.active))
+    return duplicate(this.items.filter(item => item.type == 'poison' && item.system.active))
  }

  /* -------------------------------------------- */
@ -143,7 +143,7 @@ export class RdDActor extends RdDBaseActorSang {
  /* -------------------------------------------- */
  getDemiReve() { return this.system.reve.tmrpos.coord }
  getDraconicList() { return this.itemTypes[TYPES.competence].filter(it => it.system.categorie == 'draconic') }
-  getBestDraconic() { return foundry.utils.duplicate(this.getDraconicList().sort(Misc.descending(it => it.system.niveau)).find(it => true)) }
+  getBestDraconic() { return duplicate(this.getDraconicList().sort(Misc.descending(it => it.system.niveau)).find(it => true)) }
  getDraconicOuPossession() {
    return [...this.getDraconicList().filter(it => it.system.niveau >= 0),
    super.getDraconicOuPossession()]
@ -347,7 +347,7 @@ export class RdDActor extends RdDBaseActorSang {
    const timestamp = game.system.rdd.calendrier.getTimestamp()
    const blessures = this.filterItems(it => it.system.gravite > 0, TYPES.blessure).sort(Misc.ascending(it => it.system.gravite))

-    await Promise.all(blessures.map(async b => b.recuperationBlessure({
+    await Promise.all(blessures.map(b => b.recuperationBlessure({
      actor: this,
      timestamp,
      message,
@ -429,7 +429,7 @@ export class RdDActor extends RdDBaseActorSang {
      let jetsReve = [];
      let dormi = await this.dormirDesHeures(jetsReve, message, heures, options);
      if (jetsReve.length > 0) {
-        message.content += `Vous récupérez ${jetsReve.map(it => it < 0 ? '0 (réveil)' : it).reduce(Misc.joining("+"))} Points de rêve. `;
+        message.content += `Vous récupérez ${jetsReve.map(it => it < 0 ? '(dragon)' : it).reduce(Misc.joining("+"))} Points de rêve. `;
      }
      if (dormi.etat == 'eveil') {
        await this.reveilReveDeDragon(message, dormi.heures);
@ -450,6 +450,7 @@ export class RdDActor extends RdDBaseActorSang {
  }

  async reveilReveDeDragon(message, heures) {
+    message.content += 'Vous êtes réveillé par un Rêve de Dragon.';
    const restant = Math.max(this.system.sommeil?.heures - heures, 0)
    if (restant > 0) {
      await this.update({ 'system.sommeil': { heures: restant } });
@ -690,7 +691,7 @@ export class RdDActor extends RdDBaseActorSang {
    }
    let carac = this.findCaracByName(caracName);
    if (carac) {
-      carac = foundry.utils.duplicate(carac);
+      carac = duplicate(carac);
      const fromXp = Number(carac.xp);
      const fromValue = Number(carac.value);
      let toXp = fromXp;
@ -826,7 +827,7 @@ export class RdDActor extends RdDBaseActorSang {

  async deleteExperienceLog(from, count) {
    if (from >= 0 && count > 0) {
-      let expLog = foundry.utils.duplicate(this.system.experiencelog);
+      let expLog = duplicate(this.system.experiencelog);
      expLog.splice(from, count);
      await this.update({ [`system.experiencelog`]: expLog });
    }
@ -902,7 +903,7 @@ export class RdDActor extends RdDBaseActorSang {
  async ajouterRefoulement(value = 1, refouler) {
    let refoulement = this.system.reve.refoulement.value + value;
    const roll = new Roll("1d20");
-    await roll.evaluate();
+    await roll.evaluate({ async: true });
    await roll.toMessage({ flavor: `${this.name} refoule ${refouler} pour ${value} points de refoulement (total: ${refoulement})` });
    if (roll.total <= refoulement) {
      refoulement = 0;
@ -991,31 +992,25 @@ export class RdDActor extends RdDBaseActorSang {

  /* -------------------------------------------- */
  buildTMRInnaccessible() {
-    return this.items.filter(it => it.type == TYPES.casetmr).filter(it => EffetsDraconiques.isInnaccessible(it)).map(it => it.system.coord)
+    const tmrInnaccessibles = this.filterItems(it => Draconique.isCaseTMR(it) &&
+      EffetsDraconiques.isInnaccessible(it));
+    return tmrInnaccessibles.map(it => it.system.coord);
  }

  /* -------------------------------------------- */
-  getRencontresTMR() {
-    return this.itemTypes[TYPES.rencontre];
+  getTMRRencontres() {
+    return this.itemTypes['rencontre'];
  }

  /* -------------------------------------------- */
-  async deleteRencontreTMRAtPosition() {
-    const rencontreIds = this.itemTypes[TYPES.rencontre].filter(this.filterRencontreTMRDemiReve()).map(it => it.id)
+  async deleteTMRRencontreAtPosition() {
+    const demiReve = this.getDemiReve()
+    let rencontreIds = this.items.filter(it => it.type == 'rencontre' && it.system.coord == demiReve).map(it => it.id);
    if (rencontreIds.length > 0) {
-      await this.deleteEmbeddedDocuments('Item', rencontreIds)
+      await this.deleteEmbeddedDocuments('Item', rencontreIds);
    }
  }

-  getRencontreTMREnAttente() {
-    return this.itemTypes[TYPES.rencontre].find(this.filterRencontreTMRDemiReve())
-  }
-
-  filterRencontreTMRDemiReve() {
-    const position = this.getDemiReve()
-    return it => it.system.coord == position
-  }
-
  /* -------------------------------------------- */
  async addTMRRencontre(currentRencontre) {
    const toCreate = currentRencontre.toObject();
@ -1146,7 +1141,7 @@ export class RdDActor extends RdDBaseActorSang {
      diffNbDoses: -Number(this.system.compteurs.ethylisme.nb_doses || 0),
      finalLevel: 0,
      diffConditions: 0,
-      ajustementsForce: CONFIG.RDD.difficultesLibres
+      ajustementsForce: CONFIG.RDD.difficultesLibres,
    }
    let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-roll-ethylisme.html', rollData);
    new RdDRollDialogEthylisme(html, rollData, this, r => this.saouler(r.forceAlcool)).render(true);
@ -1317,7 +1312,7 @@ export class RdDActor extends RdDBaseActorSang {

  /* -------------------------------------------- */
  async saouler(forceAlcool, alcool = undefined) {
-    let ethylisme = foundry.utils.duplicate(this.system.compteurs.ethylisme);
+    let ethylisme = duplicate(this.system.compteurs.ethylisme);

    const etat = this.getEtatGeneral({ ethylisme: true });
    const nbDoses = Number(this.system.compteurs.ethylisme.nb_doses || 0);
@ -1338,7 +1333,7 @@ export class RdDActor extends RdDBaseActorSang {
    }

    await RdDResolutionTable.rollData(ethylismeData.jetVie);
-    this._gererExperience(ethylismeData.jetVie);
+    this._appliquerExperienceRollData(ethylismeData.jetVie);
    RollDataAjustements.calcul(ethylismeData.jetVie, this);
    if (ethylismeData.jetVie.rolled.isSuccess) {
      ethylisme.nb_doses++;
@ -1370,7 +1365,7 @@ export class RdDActor extends RdDBaseActorSang {
          finalLevel: Number(ethylisme.value) + Number(this.system.compteurs.moral.value)
        }
        await RdDResolutionTable.rollData(ethylismeData.jetVolonte);
-        this._gererExperience(ethylismeData.jetVolonte);
+        this._appliquerExperienceRollData(ethylismeData.jetVolonte);
        RollDataAjustements.calcul(ethylismeData.jetVolonte, this);
      }
    }
@ -1494,7 +1489,7 @@ export class RdDActor extends RdDBaseActorSang {
      const niveauSuivant = Number(carac.value) + 1;
      let xpNeeded = RdDCarac.getCaracNextXp(niveauSuivant);
      if (carac.xp >= xpNeeded) {
-        carac = foundry.utils.duplicate(carac);
+        carac = duplicate(carac);
        carac.value = niveauSuivant;

        let checkXp = {
@ -1524,7 +1519,7 @@ export class RdDActor extends RdDBaseActorSang {
    if (compData && newXP > 0) {
      let xpNeeded = RdDItemCompetence.getCompetenceNextXp(compData.system.niveau + 1);
      if (newXP >= xpNeeded) {
-        let newCompData = foundry.utils.duplicate(compData);
+        let newCompData = duplicate(compData);
        newCompData.system.niveau += 1;
        newCompData.system.xp = newXP;
        let checkXp = {
@ -1548,16 +1543,13 @@ export class RdDActor extends RdDBaseActorSang {

  /* -------------------------------------------- */
  async appliquerAjoutExperience(rollData, hideChatMessage = 'show') {
-    if (!Misc.firstConnectedGM()){
-      return
-    }
    hideChatMessage = hideChatMessage == 'hide' || (Misc.isRollModeHiddenToPlayer() && !game.user.isGM)
    let xpData = await this._appliquerExperience(rollData.rolled, rollData.selectedCarac.label, rollData.competence, rollData.jetResistance);
    if (xpData.length) {
      const content = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-gain-xp.html`, {
        actor: this,
        xpData
-      })
+      });
      if (hideChatMessage) {
        ChatUtility.blindMessageToGM({ content: content });
      }
@ -1633,14 +1625,14 @@ export class RdDActor extends RdDBaseActorSang {
      return;
    }
    // Duplication car les pts de reve sont modifiés dans le sort
-    let sorts = foundry.utils.duplicate(this.$filterSortList(this.itemTypes['sort'], coord));
+    let sorts = duplicate(this.$filterSortList(this.itemTypes['sort'], coord));
    if (sorts.length == 0) {
      ui.notifications.info(`Aucun sort disponible en ${TMRUtility.getTMR(coord).label} !`);
      return;
    }

    const draconicList = this.computeDraconicAndSortIndex(sorts);
-    const reve = foundry.utils.duplicate(this.system.carac.reve);
+    const reve = duplicate(this.system.carac.reve);

    const dialog = await this.openRollDialog({
      name: 'lancer-un-sort',
@ -1787,13 +1779,13 @@ export class RdDActor extends RdDBaseActorSang {
    };
    RollDataAjustements.calcul(rollData, this);
    await RdDResolutionTable.rollData(rollData);
-    this._gererExperience(rollData);
+    this._appliquerExperienceRollData(rollData);
    await RdDResolutionTable.displayRollData(rollData, this)
    return rollData.rolled;
  }

  /* -------------------------------------------- */
-  _gererExperience(rollData) {
+  _appliquerExperienceRollData(rollData) {
    const callback = this.createCallbackExperience();
    if (callback.condition(rollData)) {
      callback.action(rollData);
@ -1881,7 +1873,7 @@ export class RdDActor extends RdDBaseActorSang {
        diffConditions: 0,
        use: { libre: false, conditions: true },
        carac: {
-          [tacheData.system.carac]: foundry.utils.duplicate(this.system.carac[tacheData.system.carac])
+          [tacheData.system.carac]: duplicate(this.system.carac[tacheData.system.carac])
        }
      },
      callbackAction: r => this._tacheResult(r, options)
@ -1892,7 +1884,7 @@ export class RdDActor extends RdDBaseActorSang {
  async _tacheResult(rollData, options) {
    // Mise à jour de la tache
    rollData.appliquerFatigue = ReglesOptionnelles.isUsing("appliquer-fatigue");
-    rollData.tache = foundry.utils.duplicate(rollData.tache);
+    rollData.tache = duplicate(rollData.tache);
    rollData.tache.system.points_de_tache_courant += rollData.rolled.ptTache;
    if (rollData.rolled.isETotal) {
      rollData.tache.system.difficulte--;
@ -1920,17 +1912,17 @@ export class RdDActor extends RdDBaseActorSang {
      {
        oeuvre: oeuvre,
        art: oeuvre.type,
-        competence: foundry.utils.duplicate(this.getCompetence(artData.compName ?? oeuvre.system.competence ?? artData.art)),
+        competence: duplicate(this.getCompetence(artData.compName ?? oeuvre.system.competence ?? artData.art)),
        diffLibre: - oeuvre.system.niveau,
        diffConditions: 0,
        use: { libre: false, conditions: true, surenc: false },
-        selectedCarac: foundry.utils.duplicate(this.system.carac[selected])
+        selectedCarac: duplicate(this.system.carac[selected])
      },
      { overwrite: false });
    artData.competence.system.defaut_carac = selected;
    if (!artData.forceCarac) {
      artData.forceCarac = {};
-      artData.forceCarac[selected] = foundry.utils.duplicate(this.system.carac[selected]);
+      artData.forceCarac[selected] = duplicate(this.system.carac[selected]);
    }

    await this.openRollDialog({
@ -1954,19 +1946,19 @@ export class RdDActor extends RdDBaseActorSang {
  /* -------------------------------------------- */
  async rollChant(id) {
    const artData = { art: 'chant', verbe: 'Chanter' };
-    const oeuvre = foundry.utils.duplicate(this.getChant(id));
+    const oeuvre = duplicate(this.getChant(id));
    await this._rollArt(artData, "ouie", oeuvre);
  }

  /* -------------------------------------------- */
  async rollDanse(id) {
    const artData = { art: 'danse', verbe: 'Danser', forceCarac: {} };
-    const oeuvre = foundry.utils.duplicate(this.findItemLike(id, artData.art));
+    const oeuvre = duplicate(this.findItemLike(id, artData.art));
    if (oeuvre.system.agilite) {
-      artData.forceCarac['agilite'] = foundry.utils.duplicate(this.system.carac.agilite);
+      artData.forceCarac['agilite'] = duplicate(this.system.carac.agilite);
    }
    if (oeuvre.system.apparence) {
-      artData.forceCarac['apparence'] = foundry.utils.duplicate(this.system.carac.apparence);
+      artData.forceCarac['apparence'] = duplicate(this.system.carac.apparence);
    }
    const selectedCarac = this._getCaracDanse(oeuvre);
    await this._rollArt(artData, selectedCarac, oeuvre);
@ -2069,7 +2061,7 @@ export class RdDActor extends RdDBaseActorSang {
    const artData = {
      art: 'jeu', verbe: 'Jeu',
      use: { libre: true, conditions: true, },
-      competence: foundry.utils.duplicate(this.getCompetence('jeu')),
+      competence: duplicate(this.getCompetence('jeu')),
      forceCarac: {}
    };
    listCarac.forEach(c => artData.forceCarac[c] = this.system.carac[c]);
@ -2080,14 +2072,14 @@ export class RdDActor extends RdDBaseActorSang {

  async rollOeuvre(id) {
    const artData = { art: 'oeuvre', verbe: 'Interpréter' }
-    const oeuvre = foundry.utils.duplicate(this.findItemLike(id, artData.art))
+    const oeuvre = duplicate(this.findItemLike(id, artData.art))
    await this._rollArt(artData, oeuvre.system.default_carac, oeuvre)
  }

  /* -------------------------------------------- */
  async rollMeditation(id) {
-    const meditation = foundry.utils.duplicate(this.getMeditation(id));
-    const competence = foundry.utils.duplicate(this.getCompetence(meditation.system.competence));
+    const meditation = duplicate(this.getMeditation(id));
+    const competence = duplicate(this.getCompetence(meditation.system.competence));
    competence.system.defaut_carac = "intellect"; // Meditation = toujours avec intellect
    let meditationData = {
      competence: competence,
@ -2153,7 +2145,7 @@ export class RdDActor extends RdDBaseActorSang {
    }
    let draconicList = this.getDraconicList()
      .map(draconic => {
-        let draconicLecture = foundry.utils.duplicate(draconic);
+        let draconicLecture = duplicate(draconic);
        draconicLecture.system.defaut_carac = "intellect";
        return draconicLecture;
      });
@ -2277,7 +2269,7 @@ export class RdDActor extends RdDBaseActorSang {
  async _appliquerExperience(rolled, caracName, competence, jetResistance) {
    // Pas d'XP
    if (!rolled.isPart || rolled.finalLevel >= 0) {
-      return []
+      return undefined;
    }
    if (this.checkDesirLancinant()) {
      // Cas de désir lancinant, pas d'expérience sur particulière
@ -2285,7 +2277,7 @@ export class RdDActor extends RdDBaseActorSang {
        content: `Vous souffrez au moins d'un Désir Lancinant, vous ne pouvez pas gagner d'expérience sur une Particulière tant que le désir n'est pas assouvi`,
        whisper: ChatMessage.getWhisperRecipients(this.name)
      });
-      return []
+      return undefined;
    }

    let xp = Math.abs(rolled.finalLevel);
@ -2322,7 +2314,7 @@ export class RdDActor extends RdDBaseActorSang {
  /* -------------------------------------------- */
  async _xpCarac(xpData) {
    if (xpData.xpCarac > 0) {
-      const carac = foundry.utils.duplicate(this.system.carac)
+      const carac = duplicate(this.system.carac)
      const code = RdDBaseActor._findCaracNode(carac, xpData.caracName)
      const selectedCarac = carac[code]
      if (this.isCaracMax(code)) {
@ -2346,7 +2338,7 @@ export class RdDActor extends RdDBaseActorSang {

  async _xpCaracDerivee(xpData) {
    const caracs = RdDActor._getComposantsCaracDerivee(xpData.caracName)
-      .map(c => foundry.utils.mergeObject(this.system.carac[c], { isMax: this.isCaracMax(c) }, { inplace: false }))
+      .map(c => foundry.utils.mergeObject(this.system.carac[c], { isMax: this.isCaracMax(c) }))
    switch (caracs.filter(it => !it.isMax).length) {
      case 0:
        xpData.caracRepartitionManuelle = true;
@ -2362,8 +2354,6 @@ export class RdDActor extends RdDBaseActorSang {

  static _getComposantsCaracDerivee(caracName) {
    switch (Grammar.toLowerCaseNoAccent(caracName)) {
-      case 'reve-actuel': case 'reve actuel': return ['reve']
-      case 'chance-actuelle': case 'chance actuelle': return ['chance']
      case 'vie': return ['constitution']
      case 'tir': return ['vue', 'dexterite']
      case 'lancer': return ['force', 'dexterite', 'vue']
@ -2375,25 +2365,26 @@ export class RdDActor extends RdDBaseActorSang {


  /* -------------------------------------------- */
-  async deleteNombresAstraux() {
+  async resetNombresAstraux() {
    const deletions = this.itemTypes['nombreastral'].map(it => it._id);
    await this.deleteEmbeddedDocuments("Item", deletions);
  }

  /* -------------------------------------------- */
-  async ajouteNombreAstral(date, nbAstral, isValid) {
-    const indexDate = Number.parseInt(date);
+  async ajouteNombreAstral(callData) {
+    const indexDate = Number.parseInt(callData.date);
    // Ajout du nombre astral
    const item = {
      name: "Nombre Astral", type: "nombreastral", system:
      {
-        value: nbAstral,
-        istrue: isValid,
+        value: callData.nbAstral,
+        istrue: callData.isvalid,
        jourindex: indexDate,
        jourlabel: RdDTimestamp.formatIndexDate(indexDate)
      }
    };
    await this.createEmbeddedDocuments("Item", [item]);
+    game.system.rdd.calendrier.notifyChangeNombresAstraux();
  }

  async supprimerAnciensNombresAstraux() {
@ -2434,29 +2425,22 @@ export class RdDActor extends RdDBaseActorSang {
  /* -------------------------------------------- */
  async displayTMR(mode = "normal") {
    if (this.tmrApp) {
-      ui.notifications.warn("Vous êtes déja dans les TMR....")
-      this.tmrApp.forceTMRDisplay()
+      ui.notifications.warn("Vous êtes déja dans les TMR....");
+      this.tmrApp.forceTMRDisplay();
      return
    }
    if (mode != 'visu' && this.getEffect(STATUSES.StatusDemiReve)) {
-      ui.notifications.warn("Les personnage est déjà dans les Terres Médianes, elles s'affichent en visualisation")
+      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
    }
-    if (mode == 'visu') {
-      await this._doDisplayTMR(mode)
-    }
-    else {
-      const rencontre = this.getRencontreTMREnAttente();
-      const settingConfirmer = rencontre ? "confirmation-tmr-rencontre" : "confirmation-tmr";
-      const messageRencontre = rencontre ? `<p>Vous devrez combattre ${rencontre.system.genre == 'f' ? 'la' : 'le'} ${rencontre.name} de ${rencontre.system.force} points de Rêve</p>` : '';
-      RdDConfirm.confirmer({
-        settingConfirmer: settingConfirmer,
-        content: `<p>Voulez vous monter dans les TMR en mode ${mode}?</p>` + messageRencontre,
-        title: 'Confirmer la montée dans les TMR',
-        buttonLabel: 'Monter dans les TMR',
-        onAction: async () => await this._doDisplayTMR(mode)
-      })
-    }
+    RdDConfirm.confirmer({
+      bypass: mode == 'visu',
+      settingConfirmer: "confirmation-tmr",
+      content: `<p>Voulez vous monter dans les TMR en mode ${mode}?</p>`,
+      title: 'Confirmer la montée dans les TMR',
+      buttonLabel: 'Monter dans les TMR',
+      onAction: async () => await this._doDisplayTMR(mode)
+    });
  }

  async _doDisplayTMR(mode) {
@ -2628,13 +2612,13 @@ export class RdDActor extends RdDBaseActorSang {

  /* -------------------------------------------- */
  async resetItemUse() {
+    await this.unsetFlag(SYSTEM_RDD, 'itemUse');
    await this.setFlag(SYSTEM_RDD, 'itemUse', {});
  }

  /* -------------------------------------------- */
  async incDecItemUse(itemId, inc = 1) {
-    const currentItemUse = this.getFlag(SYSTEM_RDD, 'itemUse');
-    let itemUse = currentItemUse ? foundry.utils.duplicate(currentItemUse) : {};
+    let itemUse = duplicate(this.getFlag(SYSTEM_RDD, 'itemUse') ?? {});
    itemUse[itemId] = (itemUse[itemId] ?? 0) + inc;
    await this.setFlag(SYSTEM_RDD, 'itemUse', itemUse);
    console.log("ITEM USE INC", inc, itemUse);
@ -2728,7 +2712,7 @@ export class RdDActor extends RdDBaseActorSang {
  }

  async setPointsCoeur(subActorId, coeurs, options = { immediat: false }) {
-    const newSuivants = foundry.utils.duplicate(this.system.subacteurs.suivants)
+    const newSuivants = duplicate(this.system.subacteurs.suivants)
    const amoureux = newSuivants.find(it => it.id == subActorId);
    if (amoureux) {
      amoureux[options.immediat ? 'coeur' : 'prochainCoeur'] = coeurs
@ -2985,6 +2969,9 @@ export class RdDActor extends RdDBaseActorSang {
    }
  }

+  /* -------------------------------------------- */
+  isEffectAllowed(effectId) { return true }
+
  /* -------------------------------------------- */
  async onPreUpdateItem(item, change, options, id) {
    if (item.isCompetencePersonnage() && item.system.defaut_carac && item.system.xp) {
@ -3079,7 +3066,7 @@ export class RdDActor extends RdDBaseActorSang {

    incarnation.name = 'Réincarnation de ' + incarnation.name
    incarnation.system = {
-      carac: foundry.utils.duplicate(this.system.carac),
+      carac: duplicate(this.system.carac),
      heure: RdDTimestamp.defHeure(await RdDDice.rollTotal("1dh", { rollMode: "selfroll", showDice: SHOW_DICE })).key,
      age: 18,
      biographie: '',
--- a/module/actor/base-actor-reve.js
+++ b/module/actor/base-actor-reve.js
@ -180,7 +180,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
  }

  /* -------------------------------------------- */
-  isEffectAllowed(effectId) { return false }
+  isEffectAllowed(effectId) { return true }

  getEffects(filter = e => true) {
    return this.getEmbeddedCollection("ActiveEffect").filter(filter);
@ -286,12 +286,12 @@ export class RdDBaseActorReve extends RdDBaseActor {

  getCarac() {
    // TODO: le niveau d'une entité de cauchemar devrait être exclu...
-    return foundry.utils.mergeObject(this.system.carac,
+    const carac = foundry.utils.mergeObject(duplicate(this.system.carac),
      {
        'reve-actuel': this.getCaracReveActuel(),
        'chance-actuelle': this.getCaracChanceActuelle()
-      },
-      { inplace: false })
+      });
+    return carac;
  }

  /* -------------------------------------------- */
@ -318,10 +318,10 @@ export class RdDBaseActorReve extends RdDBaseActor {
  }

  /* -------------------------------------------- */
-  async rollCompetence(idOrName, options = { tryTarget: true, arme: undefined }) {
+  async rollCompetence(idOrName, options = { tryTarget: true }) {
    RdDEmpoignade.checkEmpoignadeEnCours(this)
    const competence = this.getCompetence(idOrName);
-    let rollData = { carac: this.system.carac, competence: competence, arme: options.arme }
+    let rollData = { carac: this.system.carac, competence: competence }
    if (competence.type == TYPES.competencecreature) {
      const arme = RdDItemCompetenceCreature.armeCreature(competence)
      if (arme && options.tryTarget && Targets.hasTargets()) {
@ -361,7 +361,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   * @returns 
   */
  rollArme(arme, categorieArme = "competence") {
-    const compToUse = this.$getCompetenceArme(arme, categorieArme)
+    let compToUse = this.$getCompetenceArme(arme, categorieArme)
    if (!RdDItemArme.isArmeUtilisable(arme)) {
      ui.notifications.warn(`Arme inutilisable: ${arme.name} a une résistance de 0 ou moins`)
      return
@ -375,7 +375,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
        title: 'Ne pas utiliser les automatisation de combat',
        buttonLabel: "Pas d'automatisation",
        onAction: async () => {
-          this.rollCompetence(compToUse, { tryTarget: false, arme: arme })
+          this.rollCompetence(compToUse, { tryTarget: false })
        }
      });
      return
@ -421,33 +421,34 @@ export class RdDBaseActorReve extends RdDBaseActor {
  /* -------------------------------------------- */
  async encaisser() { await RdDEncaisser.encaisser(this) }

+  async encaisserDommagesRemote(rollData, attackerId, show) {
+    const attacker = game.actors.get(attackerId);
+    await this.encaisserDommages(rollData, attacker, show)
+  }
  async encaisserDommages(rollData, attacker = undefined, show = undefined) {
    if (attacker && !await attacker.accorder(this, 'avant-encaissement')) {
      return;
    }
-    const armure = await this.computeArmure(rollData);
-    if (ReglesOptionnelles.isUsing('validation-encaissement-gr')){
-      await this.encaisserDommagesValidationGR(rollData, armure, attacker?.id, show);
-    } 
-    else {
-      const jet = await RdDUtility.jetEncaissement(rollData, armure, { showDice: SHOW_DICE });
-      await this.$onEncaissement(jet, show, attacker);
-    }
-  }
-
-  async encaisserDommagesValidationGR(rollData, armure, attackerId, show) {
-    if (!game.user.isGM) {
+    const attackerId = attacker?.id;
+    if (ReglesOptionnelles.isUsing('validation-encaissement-gr') && !game.user.isGM) {
      RdDBaseActor.remoteActorCall({
        tokenId: this.token?.id,
        actorId: this.id,
-        method: 'encaisserDommagesValidationGR',
-        args: [rollData, armure, attackerId, show]
+        method: 'encaisserDommagesRemote',
+        args: [rollData, attackerId, show]
      });
-    } else {
-      const attacker = game.actors.get(attackerId);
+      return;
+    }
+
+    const armure = await this.computeArmure(rollData);
+    if (ReglesOptionnelles.isUsing('validation-encaissement-gr')) {
      DialogValidationEncaissement.validerEncaissement(this, rollData, armure,
        jet => this.$onEncaissement(jet, show, attacker));
    }
+    else {
+      const jet = await RdDUtility.jetEncaissement(rollData, armure, { showDice: SHOW_DICE });
+      await this.$onEncaissement(jet, show, attacker);
+    }
  }

  async $onEncaissement(jet, show, attacker) {
@ -470,7 +471,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
    });

    if (!encaissement.hasPlayerOwner && encaissement.endurance != 0) {
-      encaissement = foundry.utils.duplicate(encaissement);
+      encaissement = duplicate(encaissement);
      encaissement.isGM = true;
      ChatMessage.create({
        whisper: ChatMessage.getWhisperRecipients("GM"),
@ -508,8 +509,8 @@ export class RdDBaseActorReve extends RdDBaseActor {

  isEntiteAccordee(attacker) { return true }

-  async setEntiteReveAccordee(actor) {
-    ui.notifications.error("Impossible de s'accorder à " + this.name + ": ce n'est pas une entité incarnée");
+  async setEntiteReveAccordee(attacker) {
+    ui.notifications.error("Impossible de s'accorder à " + this.name + ": ce n'est pas une entite de cauchemer/rêve");
  }

 }
--- a/module/actor/base-actor-sang.js
+++ b/module/actor/base-actor-sang.js
@ -89,7 +89,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
  /* -------------------------------------------- */

  async onAppliquerJetEncaissement(encaissement, attacker) {
-    const santeOrig = foundry.utils.duplicate(this.system.sante);
+    const santeOrig = duplicate(this.system.sante);
    const blessure = await this.ajouterBlessure(encaissement, attacker); // Will update the result table
    const perteVie = await this.santeIncDec("vie", -encaissement.vie);
    const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance, blessure?.isCritique());
@ -108,7 +108,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
    if (name == 'fatigue' && !ReglesOptionnelles.isUsing("appliquer-fatigue")) {
      return;
    }
-    const sante = foundry.utils.duplicate(this.system.sante)
+    const sante = duplicate(this.system.sante)
    let compteur = sante[name];
    if (!compteur) {
      return;
@ -269,8 +269,6 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
    return this.getEffect(STATUSES.StatusStunned);
  }

-  isEffectAllowed(effectId) { return true }
-
  /* -------------------------------------------- */
  async computeEtatGeneral() { this.system.compteurs.etat.value = this.malusVie() + this.malusFatigue() + this.malusEthylisme() }
  getEtatGeneral(options = { ethylisme: false }) { return this.system.compteurs.etat.value }
--- a/module/actor/base-actor-sheet.js
+++ b/module/actor/base-actor-sheet.js
@ -20,7 +20,7 @@ export class RdDBaseActorSheet extends ActorSheet {
      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }],
      vueDetaillee: false
-    }, { inplace: false })
+    });
  }

  /* -------------------------------------------- */
@ -37,8 +37,7 @@ export class RdDBaseActorSheet extends ActorSheet {
      system: this.actor.system,
      description: await TextEditor.enrichHTML(this.actor.system.description, { async: true }),
      notesmj: await TextEditor.enrichHTML(this.actor.system.notesmj, { async: true }),
-      options: RdDSheetUtility.mergeDocumentRights(this.options, this.actor, this.isEditable),
-      effects: this.actor.effects
+      options: RdDSheetUtility.mergeDocumentRights(this.options, this.actor, this.isEditable)
    }

    RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
@ -313,7 +312,7 @@ export class RdDBaseActorSheet extends ActorSheet {
  async _onSplitItem(item, split) {
    if (split >= 1 && split < item.system.quantite) {
      await item.diminuerQuantite(split);
-      const splitItem = foundry.utils.duplicate(item);
+      const splitItem = duplicate(item);
      splitItem.system.quantite = split;
      await this.actor.createEmbeddedDocuments('Item', [splitItem])
    }
--- a/module/actor/base-actor.js
+++ b/module/actor/base-actor.js
@ -1,4 +1,3 @@
-import { ChatVente } from "../achat-vente/chat-vente.js";
 import { ChatUtility } from "../chat-utility.js";
 import { SYSTEM_SOCKET_ID } from "../constants.js";
 import { Grammar } from "../grammar.js";
@ -9,6 +8,7 @@ import { RdDAudio } from "../rdd-audio.js";
 import { RdDConfirm } from "../rdd-confirm.js";
 import { RdDUtility } from "../rdd-utility.js";
 import { SystemCompendiums } from "../settings/system-compendiums.js";
+import { APP_ASTROLOGIE_REFRESH } from "../sommeil/app-astrologie.js";

 export class RdDBaseActor extends Actor {

@ -16,7 +16,7 @@ export class RdDBaseActor extends Actor {
    return Object.entries(carac)
      .filter(it => Grammar.equalsInsensitive(it[1].label, name))
      .map(it => it[0])
-      .find(it => it)
+      .find(it => it);
  }
  static $findCaracByName(carac, name) {
    const caracList = Object.entries(carac);
@ -32,16 +32,23 @@ export class RdDBaseActor extends Actor {
  }

  static init() {
-    Hooks.on("preUpdateItem", (item, change, options, id) => Misc.documentIfResponsible(item.parent)?.onPreUpdateItem(item, change, options, id))
-    Hooks.on("createItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onCreateItem(item, options, id))
-    Hooks.on("deleteItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onDeleteItem(item, options, id))
-    Hooks.on("updateActor", (actor, change, options, actorId) => Misc.documentIfResponsible(actor)?.onUpdateActor(change, options, actorId))
+    Hooks.on("preUpdateItem", (item, change, options, id) => RdDBaseActor.getParentActor(item)?.onPreUpdateItem(item, change, options, id));
+    Hooks.on("createItem", (item, options, id) => RdDBaseActor.getParentActor(item)?.onCreateItem(item, options, id));
+    Hooks.on("deleteItem", (item, options, id) => RdDBaseActor.getParentActor(item)?.onDeleteItem(item, options, id));
+    Hooks.on("updateActor", (actor, change, options, actorId) => actor.onUpdateActor(change, options, actorId));
  }

  static onSocketMessage(sockmsg) {
    switch (sockmsg.msg) {
      case "msg_remote_actor_call":
        return RdDBaseActor.onRemoteActorCall(sockmsg.data, sockmsg.userId);
+      case "msg_reset_nombre_astral":
+        game.user.character.resetNombresAstraux();
+        game.system.rdd.calendrier.notifyChangeNombresAstraux();
+        return;
+      case "msg_refresh_nombre_astral":
+        Hooks.callAll(APP_ASTROLOGIE_REFRESH);
+        return;
    }
  }

@ -82,6 +89,10 @@ export class RdDBaseActor extends Actor {

  static extractActorMin = (actor) => { return { id: actor?.id, type: actor?.type, name: actor?.name, img: actor?.img }; };

+  static getParentActor(document) {
+    return document?.parent instanceof Actor ? document.parent : undefined
+  }
+
  /**
   * Cette methode surcharge Actor.create() pour ajouter si besoin des Items par défaut:
   * compétences et monnaies.
@ -121,7 +132,6 @@ export class RdDBaseActor extends Actor {
        return new ActorConstructor(docData, context);
      }
    }
-    context.rdd = undefined
    super(docData, context);
  }

@ -232,13 +242,11 @@ export class RdDBaseActor extends Actor {

  /* -------------------------------------------- */
  async cleanupConteneurs() {
-    if (Misc.isOwnerPlayerOrUniqueConnectedGM(this)) {
-      let updates = this.itemTypes['conteneur']
-        .filter(c => c.system.contenu.filter(id => this.getItem(id) == undefined).length > 0)
-        .map(c => { return { _id: c._id, 'system.contenu': c.system.contenu.filter(id => this.getItem(id) != undefined) } });
-      if (updates.length > 0) {
-        await this.updateEmbeddedDocuments("Item", updates)
-      }
+    let updates = this.itemTypes['conteneur']
+      .filter(c => c.system.contenu.filter(id => this.getItem(id) == undefined).length > 0)
+      .map(c => { return { _id: c._id, 'system.contenu': c.system.contenu.filter(id => this.getItem(id) != undefined) } });
+    if (updates.length > 0) {
+      await this.updateEmbeddedDocuments("Item", updates)
    }
  }

@ -360,13 +368,16 @@ export class RdDBaseActor extends Actor {
      ChatUtility.notifyUser(achat.userId, 'warn', `Vous n'avez pas assez d'argent pour payer ${Math.ceil(cout / 100)} sols !`);
      return;
    }
-    await vendeur?.vendre(itemVendu, quantite, cout);
-    await acheteur?.acheter(itemVendu, quantite, cout, achat)
-
+    await this.decrementerVente(vendeur, itemVendu, quantite, cout);
+    if (acheteur) {
+      await acheteur.depenserSols(cout);
+      const createdItemId = await acheteur.creerQuantiteItem(itemVendu, quantite);
+      await acheteur.consommerNourritureAchetee(achat, achat.vente, createdItemId);
+    }
    if (cout > 0) {
      RdDAudio.PlayContextAudio("argent");
    }
-    const chatAchatItem = foundry.utils.duplicate(achat.vente);
+    const chatAchatItem = duplicate(achat.vente);
    chatAchatItem.quantiteTotal = quantite;
    ChatMessage.create({
      user: achat.userId,
@ -376,26 +387,24 @@ export class RdDBaseActor extends Actor {
    });

    if (!achat.vente.quantiteIllimite) {
-      if (achat.vente.nbLots <= achat.choix.nombreLots) {
+      if (achat.vente.quantiteNbLots <= achat.choix.nombreLots) {
        ChatUtility.removeChatMessageId(achat.chatMessageIdVente);
      }
      else if (achat.chatMessageIdVente) {
-        await ChatVente.diminuerQuantiteAchatVente(achat.chatMessageIdVente, achat.choix.nombreLots)
+        achat.vente.properties = itemVendu.getProprietes();
+        achat.vente.quantiteNbLots -= achat.choix.nombreLots;
+        achat.vente.jsondata = JSON.stringify(achat.vente.item);
+        const messageVente = game.messages.get(achat.chatMessageIdVente);
+        messageVente.update({ content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', achat.vente) });
+        messageVente.render(true);
      }
    }
  }

-  async vendre(item, quantite, cout) {
-    await this.ajouterSols(cout);
-    await this.decrementerQuantiteItem(item, quantite);
-  }
-
-  async acheter(item, quantite, cout, achat) {
-    await this.depenserSols(cout)
-    const createdItemId = await this.creerQuantiteItem(item, quantite)
-    if (achat.choix.consommer && item.type == 'nourritureboisson' && createdItemId != undefined) {
-      achat.choix.doses = achat.choix.nombreLots;
-      await this.consommerNourritureboisson(createdItemId, achat.choix, achat.vente.actingUserId);
+  async decrementerVente(vendeur, itemVendu, quantite, cout) {
+    if (vendeur) {
+      await vendeur.ajouterSols(cout);
+      await vendeur.decrementerQuantiteItem(itemVendu, quantite);
    }
  }

@ -408,28 +417,31 @@ export class RdDBaseActor extends Actor {
    return disponible == undefined || disponible >= quantiteDemande;
  }

-  async consommerNourritureboisson(itemId, choix, userId) { }
+  async consommerNourritureAchetee(achat, vente, createdItemId) {
+    if (achat.choix.consommer && vente.item.type == 'nourritureboisson' && createdItemId != undefined) {
+      achat.choix.doses = achat.choix.nombreLots;
+      await this.consommerNourritureboisson(createdItemId, achat.choix, vente.actingUserId);
+    }
+  }
+

  async decrementerQuantiteItem(item, quantite, options = { supprimerSiZero: true }) {
    if (item.isService()) {
      return;
    }
-    const itemId = item.id;
    let resteQuantite = (item.system.quantite ?? 1) - quantite;
    if (resteQuantite <= 0) {
      if (options.supprimerSiZero) {
        await this.deleteEmbeddedDocuments("Item", [item.id]);
      }
      else {
-        await this.updateEmbeddedDocuments("Item", [{ _id: itemId, 'system.quantite': 0 }]);
+        await this.updateEmbeddedDocuments("Item", [{ _id: item.id, 'system.quantite': 0 }]);
      }
      if (resteQuantite < 0) {
        ui.notifications.warn(`La quantité de ${item.name} était insuffisante, l'objet a donc été supprimé`)
      }
    }
    else if (resteQuantite > 0) {
-      const realItem = this.getItem(item.id)
-      realItem.update({ 'system.quantite': resteQuantite });
      await this.updateEmbeddedDocuments("Item", [{ _id: item.id, 'system.quantite': resteQuantite }]);
    }
  }
@ -441,7 +453,7 @@ export class RdDBaseActor extends Actor {
        type: item.type,
        img: item.img,
        name: item.name,
-        system: foundry.utils.mergeObject(item.system, { quantite: isItemEmpilable ? quantite : undefined }, { inplace: false })
+        system: foundry.utils.mergeObject(item.system, { quantite: isItemEmpilable ? quantite : undefined })
      };
      const newItems = isItemEmpilable ? [baseItem] : Array.from({ length: quantite }, (_, i) => baseItem);
      const items = await this.createEmbeddedDocuments("Item", newItems);
@ -557,15 +569,15 @@ export class RdDBaseActor extends Actor {
  /* -------------------------------------------- */
  /** Ajoute un item dans un conteneur, sur la base de leurs ID */
  async ajouterDansConteneur(item, conteneur, onAjouterDansConteneur) {
-    if (conteneur?.isConteneur()) {
+    if (!conteneur) {
+      // TODO: afficher
+      item.estContenu = false;
+    }
+    else if (conteneur.isConteneur()) {
      item.estContenu = true;
      const nouveauContenu = [...conteneur.system.contenu, item.id];
      await conteneur.update({ 'system.contenu': nouveauContenu });
-      onAjouterDansConteneur(item.id, conteneur.id)
-    }
-    else {
-      item.estContenu = false;
-      await conteneur?.update({ 'system.-=contenu': undefined })
+      onAjouterDansConteneur(item.id, conteneur.id);
    }
  }

@ -583,13 +595,8 @@ export class RdDBaseActor extends Actor {
          if (item.estContenu) {
            item.estContenu = undefined;
          }
-          if (item.system.contenu != undefined) {
-            if (item.type == 'conteneur') {
-              corrections.push({ _id: item.id, 'system.contenu': [] });
-            }
-            else {
-              corrections.push({ _id: item.id, 'system.-=contenu': undefined });
-            }
+          if (item.type == 'conteneur' && item.system.contenu.length > 0) {
+            corrections.push({ _id: item.id, 'system.contenu': [] });
          }
        }
        if (corrections.length > 0) {
@ -624,21 +631,15 @@ export class RdDBaseActor extends Actor {
  }

  /* -------------------------------------------- */
-  /**
-   * Supprime un item d'un conteneur, sur la base de leurs ID
-   */
+  /** Supprime un item d'un conteneur, sur la base
+   * de leurs ID */
  async enleverDeConteneur(item, conteneur, onEnleverDeConteneur) {
-    if (conteneur) {
-      if (conteneur.isConteneur()) {
-        const contenu = conteneur.system.contenu.filter(id => id != item.id);
-        await conteneur.update({ 'system.contenu': contenu });
-        onEnleverDeConteneur();
-      }
-      else {
-        await conteneur.update({ 'system.-=contenu': undefined })
-      }
+    if (conteneur?.isConteneur()) {
+      item.estContenu = false;
+      const contenu = conteneur.system.contenu.filter(id => id != item.id);
+      await conteneur.update({ 'system.contenu': contenu });
+      onEnleverDeConteneur();
    }
-    item.estContenu = false;
  }

  /* -------------------------------------------- */
@ -648,7 +649,7 @@ export class RdDBaseActor extends Actor {
    sourceActor.buildSubConteneurObjetList(itemId, itemsList); // Get itemId list

    const itemsDataToCreate = itemsList.map(it => sourceActor.getItem(it.id))
-      .map(it => foundry.utils.duplicate(it))
+      .map(it => duplicate(it))
      .map(it => { it.system.contenu = []; return it; });
    let newItems = await this.createEmbeddedDocuments('Item', itemsDataToCreate);

--- a/module/actor/commerce-sheet.js
+++ b/module/actor/commerce-sheet.js
@ -1,4 +1,4 @@
-import { DialogItemAchat } from "../achat-vente/dialog-item-achat.js";
+import { DialogItemAchat } from "../dialog-item-achat.js";
 import { RdDItem } from "../item.js";
 import { RdDUtility } from "../rdd-utility.js";
 import { RdDBaseActorSheet } from "./base-actor-sheet.js";
@ -15,7 +15,7 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
      template: "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-actor-sheet.html",
      width: 600, height: 720,
      tabs: []
-    }, { inplace: false })
+    });
  }
  get title() {
    if (this.actor.token && this.actor.token != this.actor.prototypeToken) {
--- a/module/actor/commerce.js
+++ b/module/actor/commerce.js
@ -25,7 +25,8 @@ export class RdDCommerce extends RdDBaseActor {
    }
    await super.depenserSols(cout)
  }
-  async consommerNourritureboisson(itemId, choix, userId) { 
+
+  async consommerNourritureAchetee(achat, vente, createdItemId) {
    // ne pas consommer pour un commerce
  }

--- a/module/actor/creature-sheet.js
+++ b/module/actor/creature-sheet.js
@ -12,7 +12,7 @@ export class RdDCreatureSheet extends RdDBaseActorSangSheet {
    return foundry.utils.mergeObject(RdDBaseActorSangSheet.defaultOptions, {
      template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html",
      width: 640, height: 720
-    }, { inplace: false })
+    });
  }

  /* -------------------------------------------- */
--- a/module/actor/creature.js
+++ b/module/actor/creature.js
@ -33,4 +33,31 @@ export class RdDCreature extends RdDBaseActorSang {
    }
  }

+  isEffectAllowed(effectId) {
+    return [STATUSES.StatusComma].includes(effectId);
+  }
+
+  isEntiteAccordee(attacker) {
+    if (this.isEntite([ENTITE_INCARNE])) {
+      let resonnance = this.system.sante.resonnance
+      return (resonnance.actors.find(it => it == attacker.id))
+    }
+    return true
+  }
+
+  /* -------------------------------------------- */
+  async setEntiteReveAccordee(attacker) {
+    if (this.isEntite([ENTITE_INCARNE])) {
+      let resonnance = duplicate(this.system.sante.resonnance);
+      if (resonnance.actors.find(it => it == attacker.id)) {
+        // déjà accordé
+        return;
+      }
+      await this.update({ "system.sante.resonnance": [...resonnance, attacker.id] });
+    }
+    else {
+      super.setEntiteReveAccordee(attacker)
+    }
+  }
+
 }
--- a/module/actor/entite-sheet.js
+++ b/module/actor/entite-sheet.js
@ -9,7 +9,7 @@ export class RdDActorEntiteSheet extends RdDBaseActorReveSheet {
    return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
      template: "systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html",
      width: 640, height: 720,
-    }, { inplace: false })
+    });
  }

  async getData() {
@ -54,12 +54,6 @@ export class RdDActorEntiteSheet extends RdDBaseActorReveSheet {
    });
  }

-  async _onDropActor(event, dragData) {
-    const dropActor = fromUuidSync(dragData.uuid)
-    await this.actor.setEntiteReveAccordee(dropActor)
-    super._onDropActor(event, dragData)
-  }
-
  async deleteSubActeur(actorId) {
    let newResonances = this.actor.system.sante.resonnance.actors.filter(id => id != actorId);
    await this.actor.update({ 'system.sante.resonnance.actors': newResonances }, { renderSheet: false });
--- a/module/actor/entite.js
+++ b/module/actor/entite.js
@ -67,7 +67,7 @@ export class RdDEntite extends RdDBaseActorReve {
    if (this.isNonIncarnee()) {
      return
    }
-    await RdDEncaisser.encaisser(this)
+    await RdDEncaisser.encaisser(this) 
  }

  isEffectAllowed(effectId) {
@ -91,16 +91,20 @@ export class RdDEntite extends RdDBaseActorReve {
  }

  /* -------------------------------------------- */
-  async setEntiteReveAccordee(actor) {
+  async setEntiteReveAccordee(attacker) {
    if (this.isEntite([ENTITE_INCARNE])) {
-      if (this.system.sante.resonnance.actors.find(it => it == actor.id)) {
+      let resonnance = duplicate(this.system.sante.resonnance);
+      if (resonnance.actors.find(it => it == attacker.id)) {
        // déjà accordé
-        return
+        return;
      }
-      await this.update({ "system.sante.resonnance.actors": [...this.system.sante.resonnance.actors, actor.id] })
+      resonnance.actors.push(attacker.id);
+      await this.update({ "system.sante.resonnance": resonnance });
    }
    else {
-      super.setEntiteReveAccordee(actor)
+      super.setEntiteReveAccordee(attacker)
    }
  }
+
+
 }
--- a/module/actor/vehicule-sheet.js
+++ b/module/actor/vehicule-sheet.js
@ -9,7 +9,7 @@ export class RdDActorVehiculeSheet extends RdDBaseActorSheet {
    return foundry.utils.mergeObject(RdDBaseActorSheet.defaultOptions, {
      template: "systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html",
      width: 640, height: 720,
-    }, { inplace: false })
+    });
  }

  /* -------------------------------------------- */
--- a/module/chat-utility.js
+++ b/module/chat-utility.js
@ -1,6 +1,5 @@
 import { Misc } from "./misc.js";
 import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
-import { RdDTimestamp } from "./time/rdd-timestamp.js";


 /**
@ -132,7 +131,7 @@ export class ChatUtility {

  /* -------------------------------------------- */
  static blindMessageToGM(chatOptions) {
-    let chatGM = foundry.utils.duplicate(chatOptions);
+    let chatGM = duplicate(chatOptions);
    chatGM.whisper = ChatUtility.getUsers(user => user.isGM);
    chatGM.content = "Message aveugle de " + game.user.name + "<br>" + chatOptions.content;
    console.log("blindMessageToGM", chatGM);
@ -149,13 +148,14 @@ export class ChatUtility {
  }

  static async setMessageData(chatMessage, key, flag) {
-    if (flag && chatMessage.isAuthor) {
-      await chatMessage.setFlag(SYSTEM_RDD, key, flag)
+    if (flag) {
+      await chatMessage.setFlag(SYSTEM_RDD, key, JSON.stringify(flag));
    }
  }

  static getMessageData(chatMessage, key) {
-    return chatMessage.getFlag(SYSTEM_RDD, key);
+    const json = chatMessage.getFlag(SYSTEM_RDD, key);
+    return json ? JSON.parse(json) : undefined;
  }

  static getChatMessage(event) {
@ -163,19 +163,4 @@ export class ChatUtility {
    return game.messages.get(chatMessageId);
  }

-  static async onRenderChatMessage(chatMessage, html, data) {
-    const rddTimestamp = chatMessage.getFlag(SYSTEM_RDD, 'rdd-timestamp')
-    if (rddTimestamp) {
-      const timestamp = new RdDTimestamp(rddTimestamp);
-      const timestampData = timestamp.toCalendrier();
-      const dateHeure = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/common/date-heure.hbs', timestampData);
-      html.find('header.message-header .message-sender').after(dateHeure)
-    }
-  }
-
-  static async onCreateChatMessage(chatMessage, options, id) {
-    if (chatMessage.isAuthor) {
-      await chatMessage.setFlag(SYSTEM_RDD, 'rdd-timestamp', game.system.rdd.calendrier.getTimestamp());
-    }
-  }
 }
--- a/module/coeur/rdd-coeur.js
+++ b/module/coeur/rdd-coeur.js
@ -69,7 +69,7 @@ export class RdDCoeur {
  }

  static async applyCoeurChateauDormant(actor, message) {
-    const newSuivants = foundry.utils.duplicate(actor.system.subacteurs.suivants)
+    const newSuivants = duplicate(actor.system.subacteurs.suivants)
    let count = 0
    newSuivants.forEach(async link => {
      const suivant = game.actors.get(link.id)
@ -117,8 +117,8 @@ export class RdDCoeur {
    }
    ChatUtility.removeChatMessageId(infoCoeur.chatMessageId)

-    infoCoeur.target.jetTendre = (await (new Roll('1d6').evaluate())).total
-    infoCoeur.source.jetTendre = (await (new Roll('1d6').evaluate())).total
+    infoCoeur.target.jetTendre = (await (new Roll('1d6').evaluate({ async: true }))).total
+    infoCoeur.source.jetTendre = (await (new Roll('1d6').evaluate({ async: true }))).total
    const diff = Math.abs(infoCoeur.source.jetTendre - infoCoeur.target.jetTendre)
    for (let amoureux of [infoCoeur.source, infoCoeur.target]) {
      const actorAmoureux = game.actors.get(amoureux.actor.id);
--- a/module/constants.js
+++ b/module/constants.js
@ -8,46 +8,3 @@ export const SHOW_DICE = 'show';
 export const ENTITE_INCARNE = 'incarne';
 export const ENTITE_NONINCARNE = 'nonincarne';
 export const ENTITE_BLURETTE = 'blurette';
-
-export const RDD_CONFIG = {
-  niveauEthylisme : [
-    {value: "1", label: "Aucun"},
-    {value: "0", label: "Eméché (0)"},
-    {value: "-1", label: "Gris (-1)"},
-    {value: "-2", label: "Pinté (-2)"},
-    {value: "-3", label: "Pas Frais (-3)"},
-    {value: "-4", label: "Ivre (-4)"},
-    {value: "-5", label: "Bu (-5)"},
-    {value: "-6", label: "Complètement fait (-6)"},
-    {value: "-7", label: "Ivre mort (-7)"}
-  ],
-  categorieEntite: {
-    "cauchemar": "Cauchemar",
-    "reve": "Rêve"
-  },
-  typeEntite: {
-    "incarne": "Incarnée",
-    "nonincarne": "Non Incarnée",
-    "blurette": "Blurette"
-  },
-  heuresRdD : [
-    {value : "vaisseau", label: "Vaisseau", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd01.webp"},
-    {value : "sirene", label: "Sirène", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd02.webp"},
-    {value : "faucon", label: "Faucon", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd03.webp"},
-    {value : "couronne", label: "Couronne", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd04.webp"},
-    {value : "dragon", label: "Dragon", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd05.webp"},
-    {value : "epees", label: "Epées", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd06.webp"},
-    {value : "lyre", label: "Lyre", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd07.webp"},
-    {value : "serpent", label: "Serpent", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd08.webp"},
-    {value : "poissonacrobate", label: "Poisson Acrobate", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd09.webp"},
-    {value : "araignee", label: "Araignée", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd10.webp"},
-    {value : "roseau", label: "Roseau", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd11.webp"},
-    {value : "chateaudormant", label: "Chateau Dormant", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd12.webp"}    
-  ],
-  raretes: [
-    {value: "Commune", label: "Commune"},
-    {value: "Frequente", label: "Fréquente"},
-    {value: "Rare", label: "Rare"},
-    {value: "Rarissime", label: "Rarissime"}
-  ]
-}
--- a/module/dialog-fabriquer-potion.js
+++ b/module/dialog-fabriquer-potion.js
@ -21,7 +21,7 @@ export class DialogFabriquerPotion extends Dialog {

  /* -------------------------------------------- */
  static prepareData(actor, item) {
-    let potionData = foundry.utils.duplicate(item)
+    let potionData = duplicate(item)
    potionData.nbBrinsSelect = RdDUtility.buildListOptions(
      DialogFabriquerPotion.nombreBrinsMinimum(item),
      DialogFabriquerPotion.nombreBrinsOptimal(item));
--- a/module/achat-vente/dialog-item-achat.js
+++ b/module/achat-vente/dialog-item-achat.js
@ -1,13 +1,35 @@
-import { Misc } from "../misc.js";
-import { RdDUtility } from "../rdd-utility.js";
-import { ChatVente } from "./chat-vente.js";
+import { Misc } from "./misc.js";
+import { RdDUtility } from "./rdd-utility.js";

 export class DialogItemAchat extends Dialog {

  static preparerAchat(chatButton) {
-    return ChatVente.getDetailAchatVente(RdDUtility.findChatMessageId(chatButton))
+    const vendeurId = chatButton.attributes['data-vendeurId']?.value;
+    const vendeur = vendeurId ? game.actors.get(vendeurId) : undefined;
+    const acheteur = RdDUtility.getSelectedActor();
+    const json = chatButton.attributes['data-jsondata']?.value;
+    if (!acheteur && !vendeur) {
+      ui.notifications.info("Pas d'acheteur ni de vendeur, aucun changement");
+      return undefined;
+    }
+    if (!json) {
+      ui.notifications.warn("Impossible d'acheter: informations sur l'objet manquantes")
+      return undefined;
+    }
+
+    return {
+      item: JSON.parse(json),
+      vendeur,
+      acheteur,
+      nbLots: parseInt(chatButton.attributes['data-quantiteNbLots']?.value),
+      tailleLot: parseInt(chatButton.attributes['data-tailleLot']?.value ?? 1),
+      prixLot: Number(chatButton.attributes['data-prixLot']?.value ?? 0),
+      quantiteIllimite: chatButton.attributes['data-quantiteIllimite']?.value == 'true',
+      chatMessageIdVente: RdDUtility.findChatMessageId(chatButton),
+    };
  }

+
  static async onAcheter({ item, vendeur, acheteur, tailleLot, prixLot, nbLots, quantiteIllimite, chatMessageIdVente }) {
    const venteData = {
      item,
@ -16,21 +38,17 @@ export class DialogItemAchat extends Dialog {
      acheteur,
      tailleLot,
      quantiteIllimite,
-      nbLots,
+      quantiteNbLots: nbLots,
      choix: { seForcer: false, supprimerSiZero: true },
      prixLot,
      isVente: prixLot > 0,
      isConsommable: item.type == 'nourritureboisson' && acheteur?.isPersonnage(),
      chatMessageIdVente
-    }
-    if (venteData.vendeur?.id == venteData.acheteur?.id) {
-      ui.notifications.info("Inutile de se vendre à soi-même")
-      return
-    }
+    };

-    DialogItemAchat.changeNombreLots(venteData, 1)
-    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.html`, venteData)
-    new DialogItemAchat(html, venteData).render(true)
+    DialogItemAchat.changeNombreLots(venteData, 1);
+    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.html`, venteData);
+    new DialogItemAchat(html, venteData).render(true);
  }

  static changeNombreLots(venteData, nombreLots) {
@ -98,18 +116,18 @@ export class DialogItemAchat extends Dialog {
    this.venteData.choix.seForcer = event.currentTarget.checked;
  }

-  setNombreLots(nbLots) {
+  setNombreLots(nombreLots) {

    if (!this.venteData.quantiteIllimite) {
-      if (!this.venteData.quantiteIllimite && nbLots > this.venteData.nbLots) {
-        ui.notifications.warn(`Seulement ${this.venteData.nbLots} lots disponibles, vous ne pouvez pas en prendre ${nbLots}`)
+      if (!this.venteData.quantiteIllimite && nombreLots > this.venteData.quantiteNbLots) {
+        ui.notifications.warn(`Seulement ${this.venteData.quantiteNbLots} lots disponibles, vous ne pouvez pas en prendre ${nombreLots}`)
      }
-      nbLots = Math.min(nbLots, this.venteData.nbLots);
+      nombreLots = Math.min(nombreLots, this.venteData.quantiteNbLots);
    }

-    DialogItemAchat.changeNombreLots(this.venteData, nbLots);
+    DialogItemAchat.changeNombreLots(this.venteData, nombreLots);

-    this.html.find(".nombreLots").val(nbLots);
+    this.html.find(".nombreLots").val(nombreLots);
    this.html.find(".prixTotal").text(this.venteData.prixTotal);
    this.html.find("span.total-sust").text(this.venteData.totalSust);
    this.html.find("span.total-desaltere").text(this.venteData.totalDesaltere);
--- a/module/dialog-item-consommer.js
+++ b/module/dialog-item-consommer.js
@ -47,7 +47,7 @@ export class DialogConsommer extends Dialog {
  /* -------------------------------------------- */
  static prepareData(actor, item) {
    let consommerData = {
-      item: foundry.utils.duplicate(item),
+      item: duplicate(item),
      cuisine: actor.getCompetence('cuisine'),
      choix: {
        doses: 1,
--- a/module/achat-vente/dialog-item-vente.js
+++ b/module/achat-vente/dialog-item-vente.js
@ -1,30 +1,29 @@
-import { HtmlUtility } from "../html-utility.js";
-import { RdDUtility } from "../rdd-utility.js";
-import { ChatVente } from "./chat-vente.js";
+import { HtmlUtility } from "./html-utility.js";

 export class DialogItemVente extends Dialog {

-  static async display({ item, quantiteMax = undefined }) {
+  static async display({ item, callback, quantiteMax = undefined }) {
    const quantite = quantiteMax ?? item.getQuantite() ?? 1;
+    const isOwned = item.parent;
    const venteData = {
      item: item,
      alias: item.actor?.name ?? game.user.name,
-      vendeurId: item.actor.id,
+      vendeurId: item.actor?.id,
      prixOrigine: item.calculerPrixCommercant(),
      prixUnitaire: item.calculerPrixCommercant(),
      prixLot: item.calculerPrixCommercant(),
      tailleLot: 1,
-      nbLots: quantite,
-      maxLots: quantite,
+      quantiteNbLots: quantite,
+      quantiteMaxLots: quantite,
      quantiteMax: quantite,
-      quantiteIllimite: item.isItemCommerce() ? quantiteMax == undefined : !item.parent,
-      isOwned:  item.parent,
-    }
+      quantiteIllimite: item.isItemCommerce() ? quantiteMax == undefined : !isOwned,
+      isOwned: isOwned,
+    };
    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-vente.html`, venteData);
-    return new DialogItemVente(venteData, html).render(true);
+    return new DialogItemVente(venteData, html, callback).render(true);
  }

-  constructor(venteData, html) {
+  constructor(venteData, html, callback) {
    let options = { classes: ["dialogvente"], width: 400, height: 'fit-content', 'z-index': 99999 };

    let conf = {
@ -35,6 +34,7 @@ export class DialogItemVente extends Dialog {
    };

    super(conf, options);
+    this.callback = callback;
    this.venteData = venteData;
  }

@ -43,7 +43,7 @@ export class DialogItemVente extends Dialog {

    this.html = html;
    this.html.find(".tailleLot").change(event => this.setTailleLot(Number(event.currentTarget.value)));
-    this.html.find(".nbLots").change(event => this.setNbLots(Number(event.currentTarget.value)));
+    this.html.find(".quantiteNbLots").change(event => this.setNbLots(Number(event.currentTarget.value)));
    this.html.find(".quantiteIllimite").change(event => this.setQuantiteIllimite(event.currentTarget.checked));
    this.html.find(".prixLot").change(event => this.setPrixLot(Number(event.currentTarget.value)));

@ -52,15 +52,7 @@ export class DialogItemVente extends Dialog {

  async onProposer(it) {
    this.updateVente(this.getChoixVente());
-
-    this.venteData["properties"] = this.venteData.item.getProprietes();
-    if (this.venteData.isOwned) {
-      if (this.venteData.nbLots * this.venteData.tailleLot > this.venteData.quantiteMax) {
-        ui.notifications.warn(`Vous avez ${this.venteData.quantiteMax} ${this.venteData.item.name}, ce n'est pas suffisant pour vendre ${this.venteData.nbLots} de ${this.venteData.tailleLot}`)
-        return;
-      }
-    }
-    await ChatVente.displayAchatVente(this.venteData)
+    this.callback(this.venteData);
  }

  updateVente(update) {
@ -69,7 +61,7 @@ export class DialogItemVente extends Dialog {

  getChoixVente() {
    return {
-      nbLots: Number(this.html.find(".nbLots").val()),
+      quantiteNbLots: Number(this.html.find(".quantiteNbLots").val()),
      tailleLot: Number(this.html.find(".tailleLot").val()),
      quantiteIllimite: this.html.find(".quantiteIllimite").is(':checked'),
      prixLot: Number(this.html.find(".prixLot").val())
@ -85,26 +77,26 @@ export class DialogItemVente extends Dialog {
    const maxLots = Math.floor(this.venteData.quantiteMax / tailleLot);
    this.updateVente({
      tailleLot,
-      nbLots: Math.min(maxLots, this.venteData.nbLots),
-      maxLots: maxLots,
+      quantiteNbLots: Math.min(maxLots, this.venteData.quantiteNbLots),
+      quantiteMaxLots: maxLots,
      prixLot: (tailleLot * this.venteData.prixOrigine).toFixed(2)
    });

    this.html.find(".prixLot").val(this.venteData.prixLot);
-    this.html.find(".nbLots").val(this.venteData.nbLots);
-    this.html.find(".nbLots").attr("max", this.venteData.maxLots)
+    this.html.find(".quantiteNbLots").val(this.venteData.quantiteNbLots);
+    this.html.find(".quantiteNbLots").attr("max", this.venteData.quantiteMaxLots)
  }

  setNbLots(nbLots) {
    this.updateVente({
-      nbLots: this.venteData.isOwned ? Math.max(0, Math.min(nbLots, this.venteData.maxLots)) : nbLots
+      quantiteNbLots: this.venteData.isOwned ? Math.max(0, Math.min(nbLots, this.venteData.quantiteMaxLots)) : nbLots
    })
-    this.html.find(".nbLots").val(this.venteData.nbLots);
+    this.html.find(".quantiteNbLots").val(this.venteData.quantiteNbLots);
  }

  setQuantiteIllimite(checked) {
    this.updateVente({ quantiteIllimite: checked })
    this.html.find(".label-quantiteIllimite").text(this.venteData.quantiteIllimite ? "Illimités" : "disponibles");
-    HtmlUtility.showControlWhen(this.html.find(".nbLots"), !this.venteData.quantiteIllimite)
+    HtmlUtility.showControlWhen(this.html.find(".quantiteNbLots"), !this.venteData.quantiteIllimite)
  }
 }
--- a/module/item-arme.js
+++ b/module/item-arme.js
@ -139,7 +139,7 @@ export class RdDItemArme extends Item {
      const uneOuDeuxMains = armeData.system.unemain && armeData.system.deuxmains;
      const containsSlash = !Number.isInteger(armeData.system.dommages) && armeData.system.dommages.includes("/");
      if (containsSlash) { // Sanity check
-        armeData = foundry.utils.duplicate(armeData);
+        armeData = duplicate(armeData);

        const tableauDegats = armeData.system.dommages.split("/");
        if (aUneMain)
--- a/module/item-competence.js
+++ b/module/item-competence.js
@ -199,7 +199,7 @@ export class RdDItemCompetence extends Item {
    if (idOrName == undefined || idOrName == "") {
      return RdDItemCompetence.sansCompetence();
    }
-    options = foundry.utils.mergeObject(options, { preFilter: it => it.isCompetence(), description: 'compétence' }, { overwrite: false, inplace: false });
+    options = foundry.utils.mergeObject(options, { preFilter: it => it.isCompetence(), description: 'compétence' }, { overwrite: false });
    return RdDItemCompetence.findFirstItem(list, idOrName, options);
  }

@ -257,7 +257,7 @@ export class RdDItemCompetence extends Item {

  /* -------------------------------------------- */
  static computeResumeArchetype(competences) {
-    const computed = foundry.utils.duplicate(limitesArchetypes);
+    const computed = duplicate(limitesArchetypes);
    computed.forEach(it => { it.nombre = 0; it.reste = it.nombreMax; });

    competences.map(it => Math.max(0, it.system.niveau_archetype))
--- a/module/item-competencecreature.js
+++ b/module/item-competencecreature.js
@ -33,7 +33,8 @@ export class RdDItemCompetenceCreature extends Item {
    if (categorieAttaque != undefined) {
      // si c'est un Item compétence: cloner pour ne pas modifier la compétence
      let arme = item.clone();
-      return foundry.utils.mergeObject(arme, {
+      foundry.utils.mergeObject(arme,
+        {
          action: item.isCompetencePossession() ? 'possession' : 'attaque',
          system: {
            competence: arme.name,
@ -47,7 +48,8 @@ export class RdDItemCompetenceCreature extends Item {
            force: 0,
            rapide: true,
          }
-        }, { inplace: false });
+        });
+      return arme;
    }
    return undefined;
  }
--- a/module/item-monnaie.js
+++ b/module/item-monnaie.js
@ -57,7 +57,7 @@ export class Monnaie {
  }

  static creerDeniers(fortune) {
-    const deniers = foundry.utils.duplicate(MONNAIE_ETAIN);
+    const deniers = duplicate(MONNAIE_ETAIN);
    deniers.system.quantite = fortune;
    return deniers;
  }
--- a/module/item-sheet.js
+++ b/module/item-sheet.js
@ -44,7 +44,7 @@ export class RdDItemSheet extends ItemSheet {
      template: RdDItemSheet.defaultTemplate(RdDItemSheet.ITEM_TYPE),
      width: 550,
      height: 550
-    }, { inplace: false });
+    });
  }

  /* -------------------------------------------- */
@ -53,8 +53,7 @@ export class RdDItemSheet extends ItemSheet {
  }

  get title() {
-    const owner = (this.item.parent instanceof Actor) ? `(${this.item.parent.name})` : '';
-    return `${Misc.typeName('Item', this.item.type)}: ${this.item.name} ${owner}`;
+    return `${Misc.typeName('Item', this.item.type)}: ${this.item.name}`;
  }

  /* -------------------------------------------- */
@ -99,7 +98,7 @@ export class RdDItemSheet extends ItemSheet {
      description: await TextEditor.enrichHTML(this.item.system.description, { async: true }),
      descriptionmj: await TextEditor.enrichHTML(this.item.system.descriptionmj, { async: true }),
      isComestible: this.item.getUtilisationCuisine(),
-      options: RdDSheetUtility.mergeDocumentRights(this.options, this.item, this.isEditable),
+      options: RdDSheetUtility.mergeDocumentRights(this.options, this.item, this.isEditable)
    }
    if (this.item.type == TYPES.competencecreature) {
      formData.isparade = RdDItemCompetenceCreature.isParade(this.item)
@ -109,8 +108,8 @@ export class RdDItemSheet extends ItemSheet {
    const competences = await SystemCompendiums.getCompetences('personnage');
    formData.categories = this.item.getCategories()
    if (this.item.type == 'tache' || this.item.type == 'livre' || this.item.type == 'meditation' || this.item.type == 'oeuvre') {
-      formData.caracList = foundry.utils.duplicate(game.model.Actor.personnage.carac)
-      formData.caracList["reve-actuel"] = foundry.utils.duplicate(game.model.Actor.personnage.reve.reve)
+      formData.caracList = duplicate(game.system.model.Actor.personnage.carac)
+      formData.caracList["reve-actuel"] = duplicate(game.system.model.Actor.personnage.reve.reve)
      formData.competences = competences;
    }
    if (this.item.type == 'arme') {
@ -229,7 +228,7 @@ export class RdDItemSheet extends ItemSheet {
      });
    }

-    const updateItemTimestamp = (path, timestamp) => this.item.update({ [path]: foundry.utils.duplicate(timestamp) })
+    const updateItemTimestamp = (path, timestamp) => this.item.update({ [path]: duplicate(timestamp) })

    RdDTimestamp.handleTimestampEditor(this.html, 'system.temporel.debut', updateItemTimestamp);
    RdDTimestamp.handleTimestampEditor(this.html, 'system.temporel.fin', updateItemTimestamp);
--- a/module/item.js
+++ b/module/item.js
@ -1,4 +1,4 @@
-import { DialogItemVente } from "./achat-vente/dialog-item-vente.js";
+import { DialogItemVente } from "./dialog-item-vente.js";
 import { Grammar } from "./grammar.js";
 import { Misc } from "./misc.js";
 import { RdDHerbes } from "./rdd-herbes.js";
@ -177,7 +177,7 @@ export class RdDItem extends Item {

  constructor(docData, context = {}) {
    if (!context.rdd?.ready) {
-      foundry.utils.mergeObject(context, { rdd: { ready: true } });
+      mergeObject(context, { rdd: { ready: true } });
      const ItemConstructor = game.system.rdd.itemClasses[docData.type];
      if (ItemConstructor) {
        if (!docData.img) {
@ -189,7 +189,6 @@ export class RdDItem extends Item {
    if (!docData.img) {
      docData.img = RdDItem.getDefaultImg(docData.type);
    }
-    context.rdd = undefined
    super(docData, context);
  }

@ -234,7 +233,7 @@ export class RdDItem extends Item {
  }

  isCompetenceArme() {
-    return this.isCompetence() && ['melee', 'tir', 'lancer'].includes(this.system.categorie)
+    return this.isCompetence() && [ 'melee','tir', 'lancer'].includes(this.system.categorie)
  }

  isCompetencePossession() { return TYPES.competencecreature == this.type && this.system.categorie == "possession" }
@ -318,8 +317,8 @@ export class RdDItem extends Item {
      const timestampFin = await this.calculerFinPeriodeTemporel(timestampDebut);
      await actor.updateEmbeddedDocuments('Item', [{
        _id: this.id,
-        'system.temporel.debut': foundry.utils.duplicate(timestampDebut),
-        'system.temporel.fin': foundry.utils.duplicate(timestampFin),
+        'system.temporel.debut': duplicate(timestampDebut),
+        'system.temporel.fin': duplicate(timestampFin),
      }])
    }
  }
@ -539,7 +538,7 @@ export class RdDItem extends Item {
          _id: this.id,
          'system.quantite': this.system.quantite * sust,
          'system.encombrement': Misc.keepDecimals(this.system.encombrement / sust, 2),
-          'system.cout': Math.max(0, Misc.keepDecimals(this.system.cout / sust, 2)),
+          'system.cout': Misc.keepDecimals(this.system.cout / sust, 2),
          'system.sust': 1
        }])
      }
@ -622,7 +621,23 @@ export class RdDItem extends Item {
      ui.notifications.warn(`Votre ${this.name} n'est pas vide, pas possible de le proposer`);
      return;
    }
-    await DialogItemVente.display({ item: this, quantiteMax })
+    await DialogItemVente.display({
+      item: this,
+      quantiteMax,
+      callback: async (vente) => {
+        vente["properties"] = this.getProprietes();
+        if (vente.isOwned) {
+          if (vente.quantiteNbLots * vente.tailleLot > vente.quantiteMax) {
+            ui.notifications.warn(`Vous avez ${vente.quantiteMax} ${vente.item.name}, ce n'est pas suffisant pour vendre ${vente.quantiteNbLots} de ${vente.tailleLot}`)
+            return;
+          }
+        }
+        vente.jsondata = JSON.stringify(vente.item);
+
+        let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', vente);
+        ChatMessage.create(RdDUtility.chatDataSetup(html));
+      }
+    });
  }

  /* -------------------------------------------- */
--- a/module/item/blessure.js
+++ b/module/item/blessure.js
@ -39,7 +39,7 @@ export class RdDItemBlessure extends RdDItem {
      ui.notifications.warn(`Pas de tâche de soins pour une blessure ${gravite}`)
      return undefined;
    }
-    return foundry.utils.mergeObject(BASE_TACHE_SOIN_BLESSURE, tache, { inplace: false })
+    return foundry.utils.mergeObject(duplicate(BASE_TACHE_SOIN_BLESSURE), tache)
  }

  static async applyFullBlessure(actor, gravite) {
@ -48,7 +48,7 @@ export class RdDItemBlessure extends RdDItem {
    let lostEndurance = 0
    let lostVie = 0
    if (definition.endurance) {
-      lostEndurance = await new Roll(definition.endurance).roll().total;
+      lostEndurance = new Roll(definition.endurance).roll({async: false}).total;
      actor.santeIncDec("endurance", -Number(lostEndurance));
    }
    if (definition.vie) {
@ -106,12 +106,12 @@ export class RdDItemBlessure extends RdDItem {
  }

  async setSoinsBlessure(systemUpdate = {}) {
-    systemUpdate = foundry.utils.mergeObject(systemUpdate, this.system, { overwrite: false })
-    systemUpdate.soinscomplets.done = systemUpdate.premierssoins.done && systemUpdate.soinscomplets.done
+    systemUpdate = foundry.utils.mergeObject(systemUpdate, this.system, { overwrite: false }),
+      systemUpdate.soinscomplets.done = systemUpdate.premierssoins.done && systemUpdate.soinscomplets.done
    await this.update({
      img: this.getImgSoins(systemUpdate.gravite, systemUpdate.soinscomplets.done),
      system: systemUpdate
-    })
+    });
  }

  async recuperationBlessure({ actor, timestamp, message, isMaladeEmpoisonne, blessures }) {
--- a/module/item/maladie.js
+++ b/module/item/maladie.js
@ -38,7 +38,7 @@ export class RdDItemMaladie extends RdDItem {

      await mal.actor.updateEmbeddedDocuments('Item', [{
        _id: mal.id,
-        'system.temporel.fin': foundry.utils.duplicate(timestampFin),
+        'system.temporel.fin': duplicate(timestampFin),
      }])
    }
  }
--- a/module/item/sheet-base-inventaire.js
+++ b/module/item/sheet-base-inventaire.js
@ -10,7 +10,7 @@ export class RdDItemInventaireSheet extends RdDItemSheet {
  static get defaultOptions() {
    return foundry.utils.mergeObject(RdDItemSheet.defaultOptions, {
      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "informations" }]
-    }, { inplace: false })
+    });
  }

  setPosition(options = {}) {
@ -23,10 +23,9 @@ export class RdDItemInventaireSheet extends RdDItemSheet {

  async getData() {
    const formData = await super.getData();
-    foundry.utils.mergeObject(formData, {
+    return foundry.utils.mergeObject(formData, {
      milieux: await game.system.rdd.environnement.autresMilieux(this.item)
-    })
-    return formData
+    });
  }

  activateListeners(html) {
--- a/module/item/sheet-rencontre.js
+++ b/module/item/sheet-rencontre.js
@ -8,7 +8,7 @@ export class RdDRencontreItemSheet extends RdDItemSheet {
  static get defaultOptions() {
    return foundry.utils.mergeObject(super.defaultOptions, {
      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }]
-    }, { inplace: false })
+    });
  }

  /* -------------------------------------------- */
@ -35,7 +35,7 @@ export class RdDRencontreItemSheet extends RdDItemSheet {
          select: RdDRencontre.mapEffets(this.item.system.echec.effets)
        }
      }
-    })
+    });
    return formData;
  }

--- a/module/migrations.js
+++ b/module/migrations.js
@ -5,7 +5,6 @@ import { Monnaie } from "./item-monnaie.js";
 import { RdDItem, TYPES } from "./item.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
 import { RdDRaretes } from "./item/raretes.js";
-import { RdDCalendrier } from "./time/rdd-calendrier.js";

 class Migration {
  get code() { return "sample"; }
@ -71,17 +70,17 @@ class _10_0_16_MigrationSortsReserve extends Migration {
  get version() { return "10.0.16"; }

  async migrate() {
-    const actors = game.actors.filter((actor) => actor.type == "personnage" && (actor.system.reve?.reserve?.list?.length ?? 0 > 0))
-    Promise.all(actors.map(async it => await this.convertirSortsReserveActeur(it)))
-  }
-
-  async convertirSortsReserveActeur(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': undefined });
+    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': undefined })
+      });
  }

  conversionSortReserve(it) {
@ -508,28 +507,13 @@ class _10_7_19_PossessionsEntiteVictime extends Migration {
  }

  migratePossession(it) {
-    return {
-      _id: it.id,
+    return { _id: it.id,
      'system.entite.actorid': it.system.possesseurid,
      'system.victime.actorid': it.system.possedeid
    }
  }
 }

-class _11_2_20_MigrationAstrologie extends Migration {
-  get code() { return "migration-astrologie" }
-  get version() { return "11.2.20" }
-
-  async migrate() {
-    const nombresAstraux = game.system.rdd.calendrier.getNombresAstraux()
-    nombresAstraux.forEach(na => {
-      na.lectures = na.valeursFausses
-      na.valeursFausses = undefined
-    })
-    await game.system.rdd.calendrier.setNombresAstraux(nombresAstraux)
-  }
-}
-
 export class Migrations {
  static getMigrations() {
    return [
@ -548,7 +532,6 @@ export class Migrations {
      new _10_7_0_MigrationBlessures(),
      new _10_7_19_CategorieCompetenceCreature(),
      new _10_7_19_PossessionsEntiteVictime(),
-      new _11_2_20_MigrationAstrologie(),
    ];
  }

@ -563,18 +546,15 @@ export class Migrations {
  }

  migrate() {
-    let currentVersion = game.settings.get(SYSTEM_RDD, "systemMigrationVersion")
-    if (currentVersion.startsWith("v")) {
-      currentVersion = currentVersion.substring(1)
-    }
-    if (foundry.utils.isNewerVersion(game.system.version, currentVersion)) {
+    const currentVersion = game.settings.get(SYSTEM_RDD, "systemMigrationVersion");
+    if (isNewerVersion(game.system.version, currentVersion)) {
      // if (true) { /* comment previous and uncomment here to test before upgrade  */
-      const migrations = Migrations.getMigrations().filter(m => foundry.utils.isNewerVersion(m.version, currentVersion));
+      const migrations = Migrations.getMigrations().filter(m => isNewerVersion(m.version, currentVersion));
      if (migrations.length > 0) {
        migrations.sort((a, b) => this.compareVersions(a, b));
        migrations.forEach(async (m) => {
          ui.notifications.info(
-            `${LOG_HEAD} Executing migration ${m.code}: version ${currentVersion} is lower than ${m.version}`
+            `Executing migration ${m.code}: version ${currentVersion} is lower than ${m.version}`
          );
          await m.migrate();
        });
@ -582,7 +562,9 @@ export class Migrations {
          `Migrations done, version will change to ${game.system.version}`
        );
      } else {
-        console.log(`${LOG_HEAD} No migration needeed, version will change to ${game.system.version}`
+        console.log(
+          LOG_HEAD +
+          `No migration needeed, version will change to ${game.system.version}`
        );
      }

@ -592,7 +574,7 @@ export class Migrations {
        game.system.version
      );
    } else {
-      console.log(`${LOG_HEAD} No system version changed`);
+      console.log(LOG_HEAD + `No system version changed`);
    }
  }

--- a/module/misc.js
+++ b/module/misc.js
@ -166,47 +166,15 @@ export class Misc {
  }

  static firstConnectedGM() {
-    if (foundry.utils.isNewerVersion(game.release.version, '12.0')) {
-      return game.users.activeGM
-    } 
-    return game.users.find(u => u.isGM && u.active);
+    return game.users.filter(u => u.isGM && u.active).sort(Misc.ascending(u => u.id)).find(u => u.isGM && u.active);
  }

-  static connectedGMs() {
-    return game.users.filter(u => u.isGM && u.active);
+  static isOwnerPlayer(actor, user = undefined) {
+    return actor.testUserPermission(user ?? game.user, CONST.DOCUMENT_PERMISSION_LEVELS.OWNER)
  }

-  /**
-   * This helper method allows to get the docuument, for a single user (either first connected GM, or the owner
-   * if there is no connected GMs), or else return undefined.
-   * 
-   * This allows for example update hooks that should apply modifications to actors to be called only for one
-   * user (preventing the "User ... lacks permission to update Item" that was occuring on hooks when Item updates
-   * were triggering other changes)
-   * 
-   * @param {*} document the Document with is potentially an Actor
-   * @returns the actor if either the game.user is the first connected GM, or if the game.user is the owner
-   *  and there is no connected GM
-   */
-  static documentIfResponsible(document) {
-    if (foundry.utils.isNewerVersion(game.release.version, '12.0')) {
-      if (game.users.activeGM || (Misc.connectedGMs().length == 0 && Misc.isOwnerPlayer(document)))
-      {
-        return document
-      }
-    }
-    else if (Misc.isUniqueConnectedGM() || (Misc.connectedGMs().length == 0 && Misc.isOwnerPlayer(document))) {
-      return document
-    }
-    return undefined
-  }
-
-  static isOwnerPlayer(document) {
-    return document.testUserPermission && document.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)
-  }
-
-  static isOwnerPlayerOrUniqueConnectedGM(actor) {
-    return Misc.isOwnerPlayer(actor) ?? Misc.isUniqueConnectedGM();
+  static isOwnerPlayerOrUniqueConnectedGM(actor, user = undefined) {
+    return Misc.isOwnerPlayer(actor, user) ?? Misc.isUniqueConnectedGM();
  }

  /**
--- a/module/rdd-audio.js
+++ b/module/rdd-audio.js
@ -15,7 +15,7 @@ export class RdDAudio {
      if ( audioData ) {
        let audioPath = "systems/foundryvtt-reve-de-dragon/sounds/" + audioData.file;
        console.log(`foundryvtt-reve-de-dragon | Playing Sound: ${audioPath}`)
-        foundry.audio.AudioHelper.play({ src: audioPath }, audioData.isGlobal);
+        AudioHelper.play({ src: audioPath }, audioData.isGlobal);
      }
    }
  }
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@ -75,12 +75,6 @@ export class RdDCombatManager extends Combat {
      }
    }
  }
-  static calculAjustementInit(actor, arme) {
-    const efficacite = (arme?.system.magique) ? arme.system.ecaille_efficacite : 0
-    const etatGeneral = actor.getEtatGeneral() ?? 0
-    return efficacite + etatGeneral
-
-  }

  /************************************************************************************/
  async rollInitiative(ids, formula = undefined, messageOptions = {}) {
@ -90,14 +84,12 @@ export class RdDCombatManager extends Combat {
    // calculate initiative
    for (let cId = 0; cId < ids.length; cId++) {
      const combatant = this.combatants.get(ids[cId]);
-      const ajustement = RdDCombatManager.calculAjustementInit(combatant.actor, undefined);
-      let rollFormula = formula ?? RdDCombatManager.formuleInitiative(2, 10, 0, ajustement);
-
+      let rollFormula = formula ?? RdDCombatManager.formuleInitiative(2, 10, 0, 0);
      if (!formula) {
        if (combatant.actor.type == 'creature' || combatant.actor.type == 'entite') {
          const competence = combatant.actor.items.find(it => RdDItemCompetenceCreature.isCompetenceAttaque(it))
          if (competence) {
-            rollFormula = RdDCombatManager.formuleInitiative(2, competence.system.carac_value, competence.system.niveau, etatGeneral);
+            rollFormula = RdDCombatManager.formuleInitiative(2, competence.system.carac_value, competence.system.niveau, 0);
          }
        } else {
          const armeCombat = combatant.actor.itemTypes['arme'].find(it => it.system.equipe)
@ -117,9 +109,8 @@ export class RdDCombatManager extends Combat {
          if (competence && competence.system.defaut_carac) {
            const carac = combatant.actor.system.carac[competence.system.defaut_carac].value;
            const niveau = competence.system.niveau;
-
-            const ajustement = RdDCombatManager.calculAjustementInit(combatant.actor, armeCombat)
-            rollFormula = RdDCombatManager.formuleInitiative(2, carac, niveau, ajustement);
+            const bonusEcaille = (armeCombat?.system.magique) ? armeCombat.system.ecaille_efficacite : 0;
+            rollFormula = RdDCombatManager.formuleInitiative(2, carac, niveau, bonusEcaille);
          } else {
            ui.notifications.warn(`Votre arme ${armeCombat.name} n'a pas de compétence renseignée`);
          }
@ -128,7 +119,7 @@ export class RdDCombatManager extends Combat {
      //console.log("Combatat", c);
      const roll = combatant.getInitiativeRoll(rollFormula);
      if (!roll.total) {
-        await roll.evaluate();
+        roll.evaluate({ async: false });
      }
      const total = Math.max(roll.total, 0.00);
      console.log("Compute init for", rollFormula, roll, total, combatant);
@ -137,17 +128,21 @@ export class RdDCombatManager extends Combat {

      // Send a chat message
      let rollMode = messageOptions.rollMode || game.settings.get("core", "rollMode");
-      let messageData = foundry.utils.mergeObject({
-        speaker: {
-          scene: canvas.scene._id,
-          actor: combatant.actor?._id,
-          token: combatant.token._id,
-          alias: combatant.token.name,
-          sound: CONFIG.sounds.dice,
+      let messageData = foundry.utils.mergeObject(
+        {
+          speaker: {
+            scene: canvas.scene._id,
+            actor: combatant.actor?._id,
+            token: combatant.token._id,
+            alias: combatant.token.name,
+            sound: CONFIG.sounds.dice,
+          },
+          flavor: `${combatant.token.name} a fait son jet d'Initiative (${messageOptions.initInfo})
+          <br>
+          `,
        },
-        flavor: `${combatant.token.name} a fait son jet d'Initiative (${messageOptions.initInfo})<br>`,
-      },
-        messageOptions);
+        messageOptions
+      );
      roll.toMessage(messageData, { rollMode, create: true });

      RdDCombatManager.processPremierRoundInit();
@ -223,16 +218,13 @@ export class RdDCombatManager extends Combat {

  static $prepareAttaqueArme(infoAttaque) {
    const comp = infoAttaque.competences.find(c => c.name == infoAttaque.competence);
-    const arme = infoAttaque.arme;
-    const attaque = foundry.utils.duplicate(arme);
+    const attaque = duplicate(infoAttaque.arme);
    attaque.action = 'attaque';
    attaque.system.competence = infoAttaque.competence;
    attaque.system.dommagesReels = infoAttaque.dommagesReel;
    attaque.system.infoMain = infoAttaque.infoMain;
    attaque.system.niveau = comp.system.niveau;
-
-    const ajustement = (arme?.parent?.getEtatGeneral() ?? 0) + (arme?.system.magique) ? arme.system.ecaille_efficacite : 0;
-    attaque.system.initiative = RdDCombatManager.calculInitiative(comp.system.niveau, infoAttaque.carac[comp.system.defaut_carac].value, ajustement);
+    attaque.system.initiative = RdDCombatManager.calculInitiative(comp.system.niveau, infoAttaque.carac[comp.system.defaut_carac].value);
    return attaque;
  }

@ -347,6 +339,7 @@ export class RdDCombatManager extends Combat {
      ui.notifications.warn(`Le combatant ${combatant.name} n'est pas associé à un acteur, impossible de déterminer ses actions de combat!`)
      return [];
    }
+
    let initInfo = "";
    let initOffset = 0;
    let caracForInit = 0;
@ -381,9 +374,9 @@ export class RdDCombatManager extends Combat {
      initOffset = RdDCombatManager._baseInitOffset(compData.system.categorie, action);
    }

+    let malus = combatant.actor.getEtatGeneral(); // Prise en compte état général 
    // Cas des créatures et entités vs personnages
-    const ajustement = RdDCombatManager.calculAjustementInit(combatant.actor, action)
-    let rollFormula = RdDCombatManager.formuleInitiative(initOffset, caracForInit, compNiveau, ajustement);
+    let rollFormula = RdDCombatManager.formuleInitiative(initOffset, caracForInit, compNiveau, malus);
    // Garder la trace de l'arme/compétence utilisée pour l'iniative
    combatant.initiativeData = { arme: action } // pour reclasser l'init au round 0
    game.combat.rollInitiative(combatantId, rollFormula, { initInfo: initInfo });
@ -798,7 +791,7 @@ export class RdDCombat {
  /* -------------------------------------------- */
  _prepareAttaque(competence, arme) {
    let rollData = {
-      passeArme: foundry.utils.randomID(16),
+      passeArme: randomID(16),
      mortalite: arme?.system.mortalite,
      competence: competence,
      surprise: this.attacker.getSurprise(true),
@ -897,7 +890,7 @@ export class RdDCombat {

    // # utilisation esquive
    const corpsACorps = this.defender.getCompetenceCorpsACorps({ onMessage: it => console.info(it, this.defender) });
-    const esquives = foundry.utils.duplicate(this.defender.getCompetencesEsquive())
+    const esquives = duplicate(this.defender.getCompetencesEsquive())
    esquives.forEach(e => e.system.nbUsage = e?._id ? this.defender.getItemUse(e._id) : 0);

    const paramChatDefense = {
--- a/module/rdd-confirm.js
+++ b/module/rdd-confirm.js
@ -1,28 +1,32 @@
+import { Grammar } from "./grammar.js";
 import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";

 export class RdDConfirm {
  /* -------------------------------------------- */
  static confirmer(options, autresActions) {
-    if (options.settingConfirmer && !ReglesOptionnelles.isSet(options.settingConfirmer)) {
-      return options.onAction()
+    options.bypass = options.bypass || !(options.settingConfirmer == undefined || ReglesOptionnelles.isUsing(options.settingConfirmer));
+    if (options.bypass) {
+      options.onAction();
    }
-    let buttons = {
-      "action": RdDConfirm._createButtonAction(options),
-      "cancel": RdDConfirm._createButtonCancel()
-    };
-    if (options.settingConfirmer) {
-      buttons = foundry.utils.mergeObject(RdDConfirm._createButtonActionSave(options), buttons);
+    else {
+      let buttons = {
+        "action": RdDConfirm._createButtonAction(options),
+        "cancel": RdDConfirm._createButtonCancel()
+      };
+      if (options.settingConfirmer) {
+        buttons = foundry.utils.mergeObject(RdDConfirm._createButtonActionSave(options), buttons);
+      }
+      if (autresActions) {
+        buttons = foundry.utils.mergeObject(autresActions, buttons);
+      }
+      const dialogDetails = {
+        title: options.title,
+        content: options.content,
+        default: "cancel",
+        buttons: buttons
+      };
+      new Dialog(dialogDetails, { width: 150 * Object.keys(buttons).length }).render(true);
    }
-    if (autresActions) {
-      buttons = foundry.utils.mergeObject(autresActions, buttons, { inplace: false });
-    }
-    const dialogDetails = {
-      title: options.title,
-      content: options.content,
-      default: "cancel",
-      buttons: buttons
-    };
-    new Dialog(dialogDetails, { width: 150 * Object.keys(buttons).length }).render(true);
  }

  static _createButtonCancel() {
--- a/module/rdd-dice.js
+++ b/module/rdd-dice.js
@ -36,8 +36,8 @@ export class DeTMR extends Die {
    super(termData);
  }

-  async evaluate(options) {
-    await super.evaluate(options);
+  async evaluate() {
+    super.evaluate();
    this.explode("x=8");
    return this;
  }
@ -73,8 +73,8 @@ export class DeDraconique extends Die {
    super(termData);
  }

-  async evaluate(options) {
-    await super.evaluate(options);
+  async evaluate() {
+    super.evaluate();
    this.explode("x=7");
    return this;
  }
@ -138,7 +138,7 @@ export class RdDDice {

  static async roll(formula, options = { showDice: SHOW_DICE, rollMode: undefined }) {
    const roll = new Roll(RdDDice._formulaOrFake(formula, options));
-    await roll.evaluate();
+    await roll.evaluate({ async: true });
    await this.showDiceSoNice(roll, options);
    return roll;
  }
@ -216,7 +216,7 @@ export class RdDDice {

  static async fakeD10(faces) {
    let roll = new Roll(`1d${faces}`);
-    await roll.evaluate();
+    await roll.evaluate({ async: true });
    return roll.total;
  }

--- a/module/rdd-empoignade.js
+++ b/module/rdd-empoignade.js
@ -98,7 +98,7 @@ export class RdDEmpoignade {
  /* -------------------------------------------- */
  static getEmpoignadeById(actor, id) {
    let emp = actor.itemTypes[TYPES.empoignade].find(it => it.system.empoignadeid == id)
-    return emp && foundry.utils.duplicate(emp) || undefined;
+    return emp && duplicate(emp) || undefined;
  }

  /* -------------------------------------------- */
@ -108,7 +108,7 @@ export class RdDEmpoignade {
      (it.system.empoigneurid == defender.id && it.system.empoigneid == attacker.id)
    )
    if (emp) {
-      return foundry.utils.duplicate(emp);
+      return duplicate(emp);
    }
    return undefined;
  }
@ -248,7 +248,7 @@ export class RdDEmpoignade {
    if (rollData.rolled.isPart) {
      rollData.particuliere = "finesse";
    }
-    let msg = await RdDResolutionTable.displayRollData(rollData, defender, 'chat-empoignade-resultat.html');
+    let msg = await RdDResolutionTable.displayRollData(rollData, attacker, 'chat-empoignade-resultat.html');
    RdDEmpoignade.$storeRollEmpoignade(msg, rollData);
  }

@ -267,7 +267,7 @@ export class RdDEmpoignade {
      return
    }

-    empoignade = foundry.utils.duplicate(empoignade)
+    empoignade = duplicate(empoignade)
    let defenderRoll = {
      mode, attacker, defender, empoignade, attackerRoll,
      diffLibre: attackerRoll.diffLibre,
@ -427,7 +427,7 @@ export class RdDEmpoignade {
      name: "Empoignade en cours de " + attacker.name + ' sur ' + defender.name,
      type: 'empoignade',
      img: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp",
-      system: { description: "", empoignadeid: foundry.utils.randomID(16), compteempoigne: 0, empoigneurid: attacker.id, empoigneid: defender.id, ptsemp: 0, empoigneurname: attacker.name, empoignename: defender.name }
+      system: { description: "", empoignadeid: randomID(16), compteempoigne: 0, empoigneurid: attacker.id, empoigneid: defender.id, ptsemp: 0, empoigneurname: attacker.name, empoignename: defender.name }
    },
      {
        temporary: true
--- a/module/rdd-main.js
+++ b/module/rdd-main.js
@ -1,4 +1,4 @@
-import { SYSTEM_RDD, SYSTEM_SOCKET_ID, RDD_CONFIG } from "./constants.js";
+import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
 import { Migrations } from './migrations.js';

 import { RdDUtility } from "./rdd-utility.js";
@ -71,16 +71,15 @@ import { RdDTMRDialog } from "./rdd-tmr-dialog.js";
 * Software License: GNU GPLv3
 */
 export class SystemReveDeDragon {
-  
+
  static start() {
    const system = new SystemReveDeDragon()
    Hooks.once('init', async () => await system.onInit())
    Hooks.once('diceSoNiceReady', (dice3d) => RdDDice.diceSoNiceReady(dice3d))
    Hooks.once('ready', () => system.onReady())
  }
-  
+
  constructor() {
-    this.config = RDD_CONFIG; 
    this.RdDUtility = RdDUtility;
    this.RdDHotbar = RdDHotbar;
    this.itemClasses = {
@ -109,7 +108,7 @@ export class SystemReveDeDragon {
  /* -------------------------------------------- */
  async onInit() {
    game.system.rdd = this;
-    this.AppAstrologie = AppAstrologie;    
+    this.AppAstrologie = AppAstrologie;


    console.log(`Initializing Reve de Dragon System`);
--- a/module/rdd-meteo.js
+++ b/module/rdd-meteo.js
@ -56,7 +56,7 @@ const temperatures = [
 export class RdDMeteo {
  static async getForce() {
    const roll = new Roll(`1dr`);
-    await roll.evaluate();
+    await roll.evaluate({ async: true });
    return roll.total;
  }

@ -67,14 +67,14 @@ export class RdDMeteo {
  static async getTemperature() {
    const degre = await RdDMeteo.getForce();
    const rollChaudFroid = new Roll('1d2');
-    await rollChaudFroid.evaluate();
+    await rollChaudFroid.evaluate({ async: true });
    const chaudFroid = rollChaudFroid.total == 1;
    return chaudFroid.total ? degre : -degre;
  }

  static async getDirection(direction) {
    const roll = new Roll(`1d16`);
-    await roll.evaluate();
+    await roll.evaluate({ async: true });
    switch (roll.total % 16) {
      case 0: return 'Nord';
      case 1: return 'Nord Nord Est';
--- a/module/rdd-possession.js
+++ b/module/rdd-possession.js
@ -24,7 +24,7 @@ export class RdDPossession {
    if (!poss) {
      poss = defender.items.find(poss => poss.type == TYPES.possession && poss.system.victime.actorid == defender.id);
    }
-    return poss && foundry.utils.duplicate(poss) || undefined;
+    return poss && duplicate(poss) || undefined;
  }

  /* -------------------------------------------- */
@ -52,7 +52,7 @@ export class RdDPossession {

  /* -------------------------------------------- */
  static async onConjurerPossession(attacker, possession) {
-    possession = foundry.utils.duplicate(possession);
+    possession = duplicate(possession);
    RdDPossession.$updateEtatPossession(possession)

    const defender = game.actors.get(possession.system.entite.actorid);
@ -80,7 +80,7 @@ export class RdDPossession {
      ui.notifications.warn("Une erreur s'est produite : Aucune possession trouvée !!")
      return
    }
-    possession = foundry.utils.duplicate(possession)
+    possession = duplicate(possession)
    // Update for draconic roll
    let rollData = {
      mode: "defense",
@ -131,7 +131,7 @@ export class RdDPossession {
    }
    const possession = (rollData.isECNIDefender ? rollData.attacker : rollData.defender).getPossession(rollData.possession.system.possessionid)
    RdDPossession.storePossessionAttaque(possession, rollData)
-    await RdDResolutionTable.displayRollData(rollData, rollData.defender, 'chat-resultat-possession.html');
+    await RdDResolutionTable.displayRollData(rollData, rollData.attacker, 'chat-resultat-possession.html');
  }

  /* -------------------------------------------- */
@ -171,7 +171,7 @@ export class RdDPossession {
    rollData.possession = possession
    RdDPossession.$updateEtatPossession(rollData.possession)

-    await RdDResolutionTable.displayRollData(rollData, rollData.attacker, 'chat-resultat-possession.html')
+    await RdDResolutionTable.displayRollData(rollData, rollData.defender, 'chat-resultat-possession.html')
    if (rollData.possession.isPosseder || rollData.possession.isConjurer) {
      // conjuration
      victime.deleteEmbeddedDocuments("Item", [rollData.possession._id])
@ -230,7 +230,7 @@ export class RdDPossession {
      system: {
        description: "", typepossession: attacker.name,
        possede: false,
-        possessionid: foundry.utils.randomID(16),
+        possessionid: randomID(16),
        entite: { actorid: attacker.id },
        victime: { actorid: defender.id },
        compteur: 0
--- a/module/rdd-resolution-table.js
+++ b/module/rdd-resolution-table.js
@ -97,7 +97,7 @@ export class RdDResolutionTable {
  }

  static actorChatName(actor) {
-    return actor?.name ?? game.user.name;
+    return actor?.userName ?? game.user.name;
  }

  /* -------------------------------------------- */
@ -114,7 +114,7 @@ export class RdDResolutionTable {

  /* -------------------------------------------- */
  static async roll(caracValue, finalLevel, rollData = {}) {
-    let chances = foundry.utils.duplicate(this.computeChances(caracValue, finalLevel));
+    let chances = duplicate(this.computeChances(caracValue, finalLevel));
    this._updateChancesWithBonus(chances, rollData.bonus, finalLevel);
    this._updateChancesFactor(chances, rollData.diviseurSignificative);
    chances.showDice = rollData.showDice;
--- a/module/rdd-sheet-utility.js
+++ b/module/rdd-sheet-utility.js
@ -76,7 +76,7 @@ export class RdDSheetUtility {
  static async _onSplitItem(item, split, actor) {
    if (split >= 1 && split < item.system.quantite) {
      await item.diminuerQuantite(split);
-      const splitItem = foundry.utils.duplicate(item);
+      const splitItem = duplicate(item);
      // todo: ajouter dans le même conteneur?
      splitItem.system.quantite = split;
      await actor.createEmbeddedDocuments('Item', [splitItem])
--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@ -70,7 +70,7 @@ export class RdDTMRDialog extends Dialog {
      'z-index': 40
    }
    super(dialogConf, dialogOptions);
-    this.tmrdata = foundry.utils.duplicate(tmrData);
+    this.tmrdata = duplicate(tmrData);
    this.actor = actor;
    this.actor.tmrApp = this; // reference this app in the actor structure
    this.viewOnly = tmrData.mode == "visu"
@ -129,7 +129,7 @@ export class RdDTMRDialog extends Dialog {
    this.html.find('form.tmr-dialog *').click(event => this.subdialog?.bringToTop());

    // Roll Sort
-    this.html.find('.lancer-sort').click(event => this.lancerUnSort());
+    this.html.find('.lancer-sort').click(event => this.actor.rollUnSort(this._getCoordActor()));
    this.html.find('.lire-signe-draconique').click(event => this.actor.rollLireSigneDraconique(this._getCoordActor()));

    this.html.find('img.tmr-move').click(event => this.deplacementTMR(this.html.find(event.currentTarget)?.data('move')));
@ -142,13 +142,6 @@ export class RdDTMRDialog extends Dialog {
    this.updateValuesDisplay();
  }

-  lancerUnSort() {
-    if (this.subdialog) {
-      return this.forceTMRContinueAction();
-    }
-    return this.actor.rollUnSort(this._getCoordActor());
-  }
-
  async onDeplacement() {
    await this.manageRencontre(TMRUtility.getTMR(this._getCoordActor()));
  }
@ -171,25 +164,23 @@ export class RdDTMRDialog extends Dialog {
  async forceTMRDisplay() {
    if (this.rendered) {
      this.bringToTop()
-      this.bringSubDialogToTop();
-    }
-  }
-
-  bringSubDialogToTop() {
-    if (this.subdialog?.bringToTop && this.subdialog?.element[0]) {
-      this.subdialog.bringToTop();
+      if (this.subdialog?.bringToTop) {
+        this.subdialog.bringToTop();
+      }
    }
  }

  async restoreTMRAfterAction() {
    this.subdialog = undefined
-    await this.maximize()
-    this.bringToTop()
+    await this.maximize();
+    this.bringToTop();
  }

  forceTMRContinueAction() {
    ui.notifications.warn('Vous devez finir votre action avant de continuer dans les TMR');
-    this.bringSubDialogToTop();
+    if (this.subdialog?.bringToTop) {
+      this.subdialog.bringToTop();
+    }
    return;
  }

@ -221,7 +212,7 @@ export class RdDTMRDialog extends Dialog {

  /* -------------------------------------------- */
  loadRencontres() {
-    this.rencontresExistantes = this.actor.getRencontresTMR();
+    this.rencontresExistantes = this.actor.getTMRRencontres();
  }

  /* -------------------------------------------- */
@ -311,7 +302,7 @@ export class RdDTMRDialog extends Dialog {
    }
    const coord = this._getCoordActor();
    HtmlUtility.showControlWhen(this.html.find(".lire-signe-draconique"), this.actor.isResonanceSigneDraconique(coord));
-
+    
    let ptsreve = document.getElementById("tmr-pointsreve-value");
    ptsreve.innerHTML = this.actor.system.reve.reve.value;

@ -391,7 +382,7 @@ export class RdDTMRDialog extends Dialog {
  async refouler() {
    console.log("-> refouler", this.currentRencontre);
    await this.actor.ajouterRefoulement(this.currentRencontre.system.refoulement, `${this.currentRencontre.system.genre == 'f' ? 'une' : 'un'} ${this.currentRencontre.name}`);
-    await this.actor.deleteRencontreTMRAtPosition()
+    await this.actor.deleteTMRRencontreAtPosition(); // Remove the stored rencontre if necessary
    this.updateTokens();
    this.updateValuesDisplay();
    this.nettoyerRencontre();
@ -401,7 +392,7 @@ export class RdDTMRDialog extends Dialog {
  async ignorerRencontre() {
    console.log("-> ignorer", this.currentRencontre);
    this._tellToGM(this.actor.name + " a ignoré: " + this.currentRencontre.name);
-    await this.actor.deleteRencontreTMRAtPosition()
+    await this.actor.deleteTMRRencontreAtPosition(); // Remove the stored rencontre if necessary
    this.updateTokens();
    this.updateValuesDisplay();
    this.nettoyerRencontre();
@ -416,7 +407,7 @@ export class RdDTMRDialog extends Dialog {

  /* -------------------------------------------- */
  $marquerCasesTMR(listCoordTMR) {
-    this.currentRencontre.locList = foundry.utils.duplicate(listCoordTMR); // And track of allowed location
+    this.currentRencontre.locList = duplicate(listCoordTMR); // And track of allowed location
    this.currentRencontre.graphics = listCoordTMR.map(coordTMR => this.pixiTMR.addMarkTMR(coordTMR))
  }

@ -455,7 +446,7 @@ export class RdDTMRDialog extends Dialog {
  async maitriserRencontre() {
    console.log("-> maitriser", this.currentRencontre);

-    await this.actor.deleteRencontreTMRAtPosition()
+    await this.actor.deleteTMRRencontreAtPosition();
    this.updateTokens();

    let rencontreData = {
@ -688,7 +679,7 @@ export class RdDTMRDialog extends Dialog {
    if (this.isCaseHumide(tmr)) {
      let rollData = {
        actor: this.actor,
-        competence: foundry.utils.duplicate(this.actor.getBestDraconic()),
+        competence: duplicate(this.actor.getBestDraconic()),
        tmr: tmr,
        canClose: false,
        diffLibre: -7,
@ -813,7 +804,7 @@ export class RdDTMRDialog extends Dialog {
  async _conquerir(tmr, options) {
    let rollData = {
      actor: this.actor,
-      competence: foundry.utils.duplicate(this.actor.getBestDraconic()),
+      competence: duplicate(this.actor.getBestDraconic()),
      tmr: tmr,
      canClose: options.canClose ?? false,
      diffLibre: options.difficulte ?? -7,
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@ -4,7 +4,7 @@ import { RdDCombat } from "./rdd-combat.js";
 import { Misc } from "./misc.js";
 import { Grammar } from "./grammar.js";
 import { TMRUtility } from "./tmr-utility.js";
-import { DialogItemAchat } from "./achat-vente/dialog-item-achat.js";
+import { DialogItemAchat } from "./dialog-item-achat.js";
 import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 import { RdDDice } from "./rdd-dice.js";
 import { RdDItem } from "./item.js";
@ -18,8 +18,6 @@ import { RdDRaretes } from "./item/raretes.js";
 import { RdDEmpoignade } from "./rdd-empoignade.js";
 import { ExperienceLog } from "./actor/experience-log.js";
 import { RdDCoeur } from "./coeur/rdd-coeur.js";
-import { APP_ASTROLOGIE_REFRESH } from "./sommeil/app-astrologie.js";
-import { RDD_CONFIG } from "./constants.js";

 /* -------------------------------------------- */
 // This table starts at 0 -> niveau -10
@ -33,7 +31,7 @@ function _buildAllSegmentsFatigue(max) {
  const cycle = [5, 2, 4, 1, 3, 0];
  const fatigue = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]];
  for (let i = 0; i <= max; i++) {
-    const ligneFatigue = foundry.utils.duplicate(fatigue[i]);
+    const ligneFatigue = duplicate(fatigue[i]);
    const caseIncrementee = cycle[i % 6];
    ligneFatigue[caseIncrementee]++;
    ligneFatigue[caseIncrementee + 6]++;
@ -47,7 +45,7 @@ function _buildAllSegmentsFatigue(max) {
 function _cumulSegmentsFatigue(matrix) {
  let cumulMatrix = [];
  for (let line of matrix) {
-    let cumul = foundry.utils.duplicate(line);
+    let cumul = duplicate(line);

    for (let i = 1; i < 12; i++) {
      cumul[i] += cumul[i - 1];
@ -100,9 +98,8 @@ export class RdDUtility {
  static afficheContenu = {}
  /* -------------------------------------------- */
  static async init() {
-    Hooks.on("renderChatMessage", async (app, html, msg) => await ChatUtility.onRenderChatMessage(app, html, msg))
-    Hooks.on("createChatMessage", async (chatMessage, options, id) => await ChatUtility.onCreateChatMessage(chatMessage, options, id))
-    Hooks.on('renderChatLog', (log, html, chatLog) => RdDUtility.chatListeners(html))
+    Hooks.on("renderChatMessage", async (app, html, msg) => RdDUtility.onRenderChatMessage(app, html, msg));
+    Hooks.on('renderChatLog', (log, html, chatLog) => RdDUtility.chatListeners(html));
  }

  /* -------------------------------------------- */
@ -208,7 +205,6 @@ export class RdDUtility {
      'systems/foundryvtt-reve-de-dragon/templates/voyage/fatigue-actor.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/voyage/option-vitesse-fatigue.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/common/timestamp.hbs',
-      'systems/foundryvtt-reve-de-dragon/templates/common/date-heure.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/common/periodicite.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/common/enum-duree.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/common/compendium-link.hbs',
@ -263,6 +259,8 @@ export class RdDUtility {
    ];

    Handlebars.registerHelper('either', (a, b) => a ?? b);
+    Handlebars.registerHelper('computeResolutionScore', (row, col) => RdDResolutionTable.computePercentage(row, col));
+    Handlebars.registerHelper('computeResolutionChances', (row, col) => RdDResolutionTable.computeChances(row, col));
    Handlebars.registerHelper('upperFirst', str => Misc.upperFirst(str ?? 'Null'));
    Handlebars.registerHelper('lowerFirst', str => Misc.lowerFirst(str ?? 'Null'));
    Handlebars.registerHelper('upper', str => str?.toUpperCase() ?? '');
@ -271,10 +269,6 @@ export class RdDUtility {
    Handlebars.registerHelper('apostrophe', (article, str) => Grammar.apostrophe(article, str));
    Handlebars.registerHelper('un', str => Grammar.articleIndetermine(str));
    Handlebars.registerHelper('accord', (genre, ...args) => Grammar.accord(genre, args));
-
-    Handlebars.registerHelper('RDD_CONFIG', path => RDD_CONFIG[path])
-    Handlebars.registerHelper('computeResolutionScore', (row, col) => RdDResolutionTable.computePercentage(row, col));
-    Handlebars.registerHelper('computeResolutionChances', (row, col) => RdDResolutionTable.computeChances(row, col));
    Handlebars.registerHelper('buildLigneInventaire', (item, options) => { return new Handlebars.SafeString(RdDUtility.buildLigneInventaire(item, options)); });
    Handlebars.registerHelper('buildInventaireConteneur', (actorId, itemId, options) => { return new Handlebars.SafeString(RdDUtility.buildInventaireConteneur(actorId, itemId, options)); });
    Handlebars.registerHelper('buildContenuConteneur', (item, options) => { return new Handlebars.SafeString(RdDUtility.buildContenuConteneur(item, options)); });
@ -303,14 +297,6 @@ export class RdDUtility {
    Handlebars.registerHelper('plusMoins', diff => (diff > 0 ? '+' : '') + Math.round(diff))
    Handlebars.registerHelper('experienceLog-topic', topic => ExperienceLog.labelTopic(topic));

-    // Handle v12 removal of this helper
-    Handlebars.registerHelper('select', function (selected, options) {
-      const escapedValue = RegExp.escape(Handlebars.escapeExpression(selected));
-      const rgx = new RegExp(' value=[\"\']' + escapedValue + '[\"\']');
-      const html = options.fn(this);
-      return html.replace(rgx, "$& selected");
-    });
-
    return loadTemplates(templatePaths);
  }

@ -358,15 +344,13 @@ export class RdDUtility {
    let objetVersConteneur = {};
    // Attribution des objets aux conteneurs
    for (let conteneur of conteneurs) {
-      if (conteneur.isConteneur()) {
-        conteneur.subItems = [];
-        for (let id of conteneur.system.contenu ?? []) {
-          let objet = inventaires.find(objet => (id == objet._id));
-          if (objet) {
-            objet.estContenu = true;
-            objetVersConteneur[id] = conteneur._id;
-            conteneur.subItems.push(objet);
-          }
+      conteneur.subItems = [];
+      for (let id of conteneur.system.contenu ?? []) {
+        let objet = inventaires.find(objet => (id == objet._id));
+        if (objet) {
+          objet.estContenu = true; // Permet de filtrer ce qui est porté dans le template
+          objetVersConteneur[id] = conteneur._id;
+          conteneur.subItems.push(objet);
        }
      }
    }
@ -565,54 +549,49 @@ export class RdDUtility {

  /* -------------------------------------------- */
  static async jetEncaissement(rollData, armure, options = { showDice: HIDE_DICE }) {
-    const diff = Math.abs(rollData.diffLibre);
-    let formula = RdDUtility.formuleEncaissement(diff, options)
-    const roll = await RdDDice.roll(formula, options);
+    let formula = "2d10";

-    RdDUtility.remplaceDeMinParDifficulte(roll, diff, options);
+    // Chaque dé fait au minmum la difficulté libre
+    if (ReglesOptionnelles.isUsing('degat-minimum-malus-libre')) {
+      if (rollData.diffLibre < 0) {
+        let valeurMin = Math.abs(rollData.diffLibre);
+        formula += "min" + valeurMin;
+      }
+    }
+    // Chaque dé fait au minmum la difficulté libre
+    if (ReglesOptionnelles.isUsing('degat-ajout-malus-libre')) {
+      if (rollData.diffLibre < 0) {
+        let valeurMin = Math.abs(rollData.diffLibre);
+        formula += "+" + valeurMin;
+      }
+    }
+
+    let roll = await RdDDice.roll(formula, options);
+
+    // 1 dé fait au minmum la difficulté libre
+    if (ReglesOptionnelles.isUsing('degat-minimum-malus-libre-simple')) {
+      if (rollData.diffLibre < 0) {
+        let valeurMin = Math.abs(rollData.diffLibre);
+        if (roll.terms[0].results[0].result < valeurMin) {
+          roll.terms[0].results[0].result = valeurMin;
+        } else if (roll.terms[0].results[1].result < valeurMin) {
+          roll.terms[0].results[1].result = valeurMin;
+        }
+        roll._total = roll.terms[0].results[0].result + roll.terms[0].results[1].result;
+      }
+    }

    return await RdDUtility.prepareEncaissement(rollData, roll, armure);
  }

-  static remplaceDeMinParDifficulte(roll, diff, options) {
-    if (!ReglesOptionnelles.isUsing('degat-minimum-malus-libre-simple')) {
-      return
-    }
-    // 1 dé fait au minmum la difficulté libre
-    const total = options.forceDiceResult?.total;
-    if (total) {
-      const reste = Math.max(total - diff, 1)
-      roll.terms[0].number = reste + diff
-    }
-    else {
-      if (roll.terms[0].results[0].result < diff) {
-        roll.terms[0].results[0].result = diff;
-      } else if (roll.terms[0].results[1].result < diff) {
-        roll.terms[0].results[1].result = diff;
-      }
-      roll._total = roll.terms[0].results[0].result + roll.terms[0].results[1].result;
-    }
-  }
-
-  static formuleEncaissement(diff, options) {
-    // Chaque dé fait au minimum la difficulté libre
-    if (ReglesOptionnelles.isUsing('degat-minimum-malus-libre')) {
-      return `2d10min${diff}`
-    }
-    return '2d10'
-  }
-
  /* -------------------------------------------- */
  static async prepareEncaissement(rollData, roll, armure) {
-    // La difficulté d'ataque s'ajoute aux dégâts
-    const bonusDegatsDiffLibre = ReglesOptionnelles.isUsing('degat-ajout-malus-libre') ? Math.abs(rollData.diffLibre ?? 0) : 0
-    const jetTotal = roll.total + rollData.dmg.total - armure + bonusDegatsDiffLibre
-    const encaissement = RdDUtility._selectEncaissement(jetTotal, rollData.dmg.mortalite);
-    const over20 = Math.max(jetTotal - 20, 0);
+    const jetTotal = roll.total + rollData.dmg.total - armure;
+    let encaissement = RdDUtility._selectEncaissement(jetTotal, rollData.dmg.mortalite);
+    let over20 = Math.max(jetTotal - 20, 0);
    encaissement.dmg = rollData.dmg;
    encaissement.dmg.loc = rollData.dmg.loc ?? await RdDUtility.getLocalisation(this.type);
    encaissement.dmg.loc.label = encaissement.dmg.loc.label ?? 'Corps;';
-    encaissement.dmg.bonusDegatsDiffLibre = bonusDegatsDiffLibre
    encaissement.roll = roll;
    encaissement.armure = armure;
    encaissement.penetration = rollData.arme?.system.penetration ?? 0;
@ -628,28 +607,34 @@ export class RdDUtility {
    for (let encaissement of table) {
      if ((encaissement.minimum === undefined || encaissement.minimum <= degats)
        && (encaissement.maximum === undefined || degats <= encaissement.maximum)) {
-        return foundry.utils.duplicate(encaissement);
+        return duplicate(encaissement);
      }
    }
-    return foundry.utils.duplicate(table[0]);
+    return duplicate(table[0]);
  }

  /* -------------------------------------------- */
  static async _evaluatePerte(formula, over20) {
    let perte = new Roll(formula, { over20: over20 });
-    await perte.evaluate();
+    await perte.evaluate({ async: true });
    return perte.total;
  }

+  /* -------------------------------------------- */
+  static async responseNombreAstral(callData) {
+    let actor = game.actors.get(callData.id);
+    actor.ajouteNombreAstral(callData);
+  }
+
  /* -------------------------------------------- */
  static onSocketMessage(sockmsg) {
    switch (sockmsg.msg) {
      case "msg_gm_chat_message":
        return ChatUtility.handleGMChatMessage(sockmsg.data);
-      case "msg_app_astrologie_refresh":
-        return Hooks.callAll(APP_ASTROLOGIE_REFRESH);
      case "msg_request_nombre_astral":
        return game.system.rdd.calendrier.requestNombreAstral(sockmsg.data);
+      case "msg_response_nombre_astral":
+        return RdDUtility.responseNombreAstral(sockmsg.data);
      case "msg_tmr_move":
        let actor = game.actors.get(sockmsg.data.actorId);
        if (actor.isOwner || game.user.isGM) {
@ -769,7 +754,7 @@ export class RdDUtility {
  /* -------------------------------------------- */
  static createMonnaie(name, cout, img = "", enc = 0.01) {
    let piece = {
-      name: name, type: 'monnaie', img: img, _id: foundry.utils.randomID(16),
+      name: name, type: 'monnaie', img: img, _id: randomID(16),
      dasystemta: {
        quantite: 0,
        cout: cout,
@ -905,4 +890,10 @@ export class RdDUtility {
    }
  }

+  /*-------------------------------------------- */
+  static async onRenderChatMessage(app, html, msg) {
+    // TODO 
+    //console.log(app, html, msg);
+  }
+
 }
--- a/module/rolldata-ajustements.js
+++ b/module/rolldata-ajustements.js
@ -111,7 +111,7 @@ export const referenceAjustements = {
    isVisible: (rollData, actor) => rollData.arme?.system.magique && Number(rollData.arme?.system.ecaille_efficacite) > 0,
    isUsed: (rollData, actor) => rollData.arme?.system.magique && Number(rollData.arme?.system.ecaille_efficacite) > 0,
    getLabel: (rollData, actor) => "Ecaille d'Efficacité: ",
-    getValue: (rollData, actor) => rollData.arme?.system.magique ? Math.max(Number(rollData.arme?.system.ecaille_efficacite), 0) : 0,
+    getValue: (rollData, actor) => Math.max(Number(rollData.arme?.system.ecaille_efficacite), 0),
  },
  finesse: {
    isUsed: (rollData, actor) => RdDBonus.isDefenseAttaqueFinesse(rollData),
--- a/module/settings/regles-optionnelles.js
+++ b/module/settings/regles-optionnelles.js
@ -26,7 +26,6 @@ const listeReglesOptionnelles = [
  
  { group: 'Confirmations', name: 'confirmer-combat-sans-cible',         descr: "Confirmer avant une attaque sans cible", scope: "client"},
  { group: 'Confirmations', name: 'confirmation-tmr',                    descr: "Confirmer pour monter dans les TMR", scope: "client"},
-  { group: 'Confirmations', name: 'confirmation-tmr-rencontre',          descr: "Confirmer pour monter dans les TMR avec rencontre en attente", scope: "client"},
  { group: 'Confirmations', name: 'confirmation-refouler',               descr: "Confirmer avant de refouler", scope: "client"},
  { group: 'Confirmations', name: 'confirmation-vider',                  descr: "Confirmer pour vider l'équipement", scope: "client"},
  { group: 'Confirmations', name: 'confirmation-supprimer-lien-acteur',  descr: "Confirmer pour détacher un animal/suivant/véhicule", scope: "client"},
@ -71,7 +70,8 @@ export class ReglesOptionnelles extends FormApplication {
  }

  static get defaultOptions() {
-    return foundry.utils.mergeObject(super.defaultOptions, {
+    const options = super.defaultOptions;
+    foundry.utils.mergeObject(options, {
      id: "regles-optionnelles",
      template: "systems/foundryvtt-reve-de-dragon/templates/settings/regles-optionnelles.html",
      height: 650,
@ -79,13 +79,14 @@ export class ReglesOptionnelles extends FormApplication {
      minimizable: false,
      closeOnSubmit: true,
      title: "Règles optionnelles"
-    }, { inplace: false })
+    });
+    return options;
  }

  getData() {
    let formData = super.getData();
    const regles = listeReglesOptionnelles.filter(it => game.user.isGM || it.scope == "client").map(it => {
-      it = foundry.utils.duplicate(it);
+      it = duplicate(it);
      it.id = ReglesOptionnelles._getIdRegle(it.name);
      it.active = ReglesOptionnelles.isSet(it.name);
      return it;
--- a/module/settings/status-effects.js
+++ b/module/settings/status-effects.js
@ -18,8 +18,8 @@ const rddStatusEffects = [
  { 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/empoignade.webp' },
-  { rdd: true, id: STATUSES.StatusGrappled, tint: '#ff9900', label: 'EFFECT.StatusGrappled', icon: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.webp' },
+  { rdd: true, id: STATUSES.StatusGrappling, tint: '#33cc33', label: 'EFFECT.StatusGrappling', icon: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.svg' },
+  { rdd: true, id: STATUSES.StatusGrappled, tint: '#ff9900', label: 'EFFECT.StatusGrappled', icon: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.svg' },
  { 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' },
@ -65,7 +65,7 @@ export class StatusEffects extends FormApplication {

  static valeurSurprise(effect, isCombat) {
    if (statusSurpriseTotale.intersects(effect.statuses)) {
-      return 2
+      return 2;
    }
    if (statusDemiSurprise.intersects(effect.statuses)) {
      return 1
@ -94,7 +94,7 @@ export class StatusEffects extends FormApplication {
  static prepareActiveEffect(effectId) {
    let status = rddStatusEffects.find(it => it.id == effectId)
    if (status) {
-      status = foundry.utils.duplicate(status)
+      status = duplicate(status)
      status.statuses = [effectId]
    }
    return status;
@ -110,7 +110,7 @@ export class StatusEffects extends FormApplication {

  static get defaultOptions() {
    const options = super.defaultOptions;
-    foundry.utils.mergeObject(options, {
+    mergeObject(options, {
      id: "status-effects",
      template: "systems/foundryvtt-reve-de-dragon/templates/settings/status-effects.html",
      height: 800,
@ -125,7 +125,7 @@ export class StatusEffects extends FormApplication {
  getData() {
    const used = StatusEffects._getUseStatusEffects();
    let formData = super.getData();
-    formData.effects = foundry.utils.duplicate(CONFIG.RDD.allEffects);
+    formData.effects = duplicate(CONFIG.RDD.allEffects);
    formData.effects.forEach(it => it.active = used.includes(it.id))
    return formData;
  }
--- a/module/settings/system-compendiums.js
+++ b/module/settings/system-compendiums.js
@ -1,4 +1,3 @@
-import { ChatUtility } from "../chat-utility.js";
 import { HIDE_DICE, SYSTEM_RDD } from "../constants.js";
 import { RdDItem } from "../item.js";
 import { Misc } from "../misc.js";
@ -153,7 +152,7 @@ export class SystemCompendiums extends FormApplication {

  getData() {
    const systemCompendiums = Object.values(CONFIGURABLE_COMPENDIUMS)
-      .map(it => foundry.utils.mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }, { inplace: false }))
+      .map(it => foundry.utils.mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }));
    const availableCompendiums = game.packs.map(pack => {
      return {
        name: pack.collection,
@ -164,7 +163,7 @@ export class SystemCompendiums extends FormApplication {
    return foundry.utils.mergeObject(super.getData(), {
      systemCompendiums: systemCompendiums,
      availableCompendiums: availableCompendiums
-    }, { inplace: false })
+    });
  }

  activateListeners(html) {
@ -291,7 +290,7 @@ export class CompendiumTableHelpers {
      sound: CONFIG.sounds.dice,
      content: flavorContent
    };
-    await ChatUtility.createChatWithRollMode(game.user.id, messageData)
+    ChatMessage.create(messageData, { rollMode: "gmroll" });
  }

  /* -------------------------------------------- */
@ -307,7 +306,7 @@ export class CompendiumTableHelpers {
      whisper: game.user.id,
      content: flavorContent
    };
-    await ChatUtility.createChatWithRollMode(game.user.id, messageData)
+    ChatMessage.create(messageData, { rollMode: "gmroll" });
  }

 }
--- a/module/sommeil/app-astrologie.js
+++ b/module/sommeil/app-astrologie.js
@ -25,12 +25,13 @@ export class AppAstrologie extends Application {
      classes: ['calendar-astrologie'],
      popOut: true,
      resizable: false
-    }, { inplace: false })
+    });
  }

  constructor(actor, options = {}) {
    super(options);
    this.actor = actor;
+    this.hookReference = Hooks.on(APP_ASTROLOGIE_REFRESH, () => this.refreshAstrologie());
  }

  getData(options) {
@ -49,7 +50,7 @@ export class AppAstrologie extends Application {
        signeNaissance: RdDTimestamp.definition(0)
      }
    })
-    return this.appData
+    return this.appData;
  }

  getActorAstrologie() {
@ -84,10 +85,9 @@ export class AppAstrologie extends Application {
      const nbAstral = calendrier.getNombreAstral()
      const heures = RdDTimestamp.heures();
      return {
-        ajustementsActors: game.actors.filter(actor => actor.isPersonnageJoueur())
+        ajustementsActors:game.actors.filter(actor => actor.isPersonnageJoueur())
          .map(actor => this.getAjustementActor(actor, nbAstral, heures)),
-        nombresAstraux: game.system.rdd.calendrier.getNombresAstraux()
-          .map(na => this.getDetailNombreAstral(na))
+        nombresAstraux: calendrier.getNombresAstraux().map(na => this.getDetailNombreAstral(na))
      }
    }
    return {}
@ -104,18 +104,15 @@ export class AppAstrologie extends Application {
  }

  getDetailNombreAstral(nombreAstral) {
-    const detail = foundry.utils.duplicate(nombreAstral);
+    const detail = duplicate(nombreAstral);
    const timestamp = new RdDTimestamp({ indexDate: nombreAstral.index });
    detail.date = { mois: timestamp.mois, jour: timestamp.jour + 1 };
-    detail.lectures.forEach(lecture => lecture.actorName = game.actors.get(lecture.actorId).name ?? "Inconnu");
+    detail.valeursFausses.forEach(fausse => fausse.actorName = game.actors.get(fausse.actorId).name ?? "Inconnu");
    return detail;
  }

  /* -------------------------------------------- */
  activateListeners(html) {
-    if (!this.hookReference){
-      this.hookReference = Hooks.on(APP_ASTROLOGIE_REFRESH, () => this.refreshAstrologie());
-    }
    super.activateListeners(html);
    this.html = html;
    this.html.find('select[name="signe-astral"]').change(event => {
@ -148,7 +145,8 @@ export class AppAstrologie extends Application {

  /* -------------------------------------------- */
  async onRebuild() {
-    await game.system.rdd.calendrier.resetNombresAstraux();
+    game.system.rdd.calendrier.resetNombresAstraux();
+
    await game.system.rdd.calendrier.rebuildNombresAstraux();
  }

@ -197,8 +195,6 @@ export class AppAstrologie extends Application {
  }

  refreshAstrologie() {
-    this.count = (this.count ?? 0)+1
-    console.log(`Refreshing ${this.count}`);
    this.render(true)
  }

--- a/module/time/auto-adjust-darkness.js
+++ b/module/time/auto-adjust-darkness.js
@ -17,7 +17,7 @@ export class AutoAdjustDarkness {
  static async adjust(darkness) {
    if (AutoAdjustDarkness.isAuto()) {
      const scene = game.scenes.viewed;
-      if (scene?.environment?.globalLight?.enabled && scene?.tokenVision) {
+      if (scene?.globalLight && scene?.tokenVision) {
        await scene.update({ darkness });
      }
    }
--- a/module/time/rdd-calendrier-editor.js
+++ b/module/time/rdd-calendrier-editor.js
@ -61,7 +61,7 @@ export class RdDCalendrierEditor extends Dialog {

  /* -------------------------------------------- */
  updateData(calendrierData) {
-    this.calendrierData = foundry.utils.duplicate(calendrierData);
+    this.calendrierData = duplicate(calendrierData);
  }

 }
--- a/module/time/rdd-calendrier.js
+++ b/module/time/rdd-calendrier.js
@ -43,7 +43,7 @@ export class RdDCalendrier extends Application {
      resizable: false,
      width: 'fit-content',
      height: 'fit-content',
-    }, { inplace: false })
+    });
  }

  constructor() {
@ -51,6 +51,7 @@ export class RdDCalendrier extends Application {
    this.timestamp = RdDTimestamp.getWorldTime();
    if (Misc.isUniqueConnectedGM()) { // Uniquement si GM
      RdDTimestamp.setWorldTime(this.timestamp);
+      this.nombresAstraux = this.getNombresAstraux();
      this.rebuildNombresAstraux(); // Ensure always up-to-date
    }
    Hooks.on('updateSetting', async (setting, update, options, id) => this.onUpdateSetting(setting, update, options, id));
@ -107,10 +108,7 @@ export class RdDCalendrier extends Application {
      this.timestamp = RdDTimestamp.getWorldTime();
      this.positionAiguilles()
      this.render(false);
-      Hooks.callAll(APP_ASTROLOGIE_REFRESH)
-    }
-    if (setting.key == SYSTEM_RDD + '.' + "liste-nombre-astral") {
-      Hooks.callAll(APP_ASTROLOGIE_REFRESH)
+      Hooks.callAll(APP_ASTROLOGIE_REFRESH);
    }
  }

@ -123,9 +121,9 @@ export class RdDCalendrier extends Application {
  /* -------------------------------------------- */
  fillCalendrierData(formData = {}) {
    foundry.utils.mergeObject(formData, this.timestamp.toCalendrier());
-    formData.isGM = game.user.isGM
+    formData.isGM = game.user.isGM;
    formData.heures = RdDTimestamp.definitions()
-    formData.horlogeAnalogique = this.horlogeAnalogique
+    formData.horlogeAnalogique = this.horlogeAnalogique;
    formData.autoDarkness = AutoAdjustDarkness.isAuto()
    return formData;
  }
@ -169,11 +167,7 @@ export class RdDCalendrier extends Application {

  /* -------------------------------------------- */
  getNombresAstraux() {
-    return game.settings.get(SYSTEM_RDD, "liste-nombre-astral") ?? []
-  }
-
-  async setNombresAstraux(nombresAstraux) {
-    await game.settings.set(SYSTEM_RDD, "liste-nombre-astral", nombresAstraux)
+    return game.settings.get(SYSTEM_RDD, "liste-nombre-astral") ?? [];
  }

  /* -------------------------------------------- */
@ -231,15 +225,20 @@ export class RdDCalendrier extends Application {
    const nombreAstral = await RdDDice.rollTotal("1dh", { showDice: HIDE_DICE, rollMode: "selfroll" });
    return {
      nombreAstral: nombreAstral,
-      lectures: [],
+      valeursFausses: [],
      index: indexDate
    }
  }

  /* -------------------------------------------- */
-  async resetNombresAstraux() {
-    await Promise.all(game.actors.filter(it => it.type == "personnage").map(async it => await it.deleteNombresAstraux()))
-    await this.setNombresAstraux([])
+  resetNombresAstraux() {
+    this.nombresAstraux = [];
+    game.settings.set(SYSTEM_RDD, "liste-nombre-astral", []);
+
+    game.socket.emit(SYSTEM_SOCKET_ID, {
+      msg: "msg_reset_nombre_astral",
+      data: {}
+    });
  }

  /**
@ -252,30 +251,39 @@ export class RdDCalendrier extends Application {
    if (indexDate == undefined) {
      indexDate = this.timestamp.indexDate;
    }
-    const nombresAstraux = this.getNombresAstraux()
-    let astralData = nombresAstraux.find(it => it.index == indexDate);
+    this.nombresAstraux = this.getNombresAstraux();
+    let astralData = this.nombresAstraux.find((nombreAstral, i) => nombreAstral.index == indexDate);
    return astralData?.nombreAstral ?? 0;
  }

  /* -------------------------------------------- */
  async rebuildNombresAstraux() {
    if (Misc.isUniqueConnectedGM()) {
-      const nombresAstraux = this.getNombresAstraux()
-      let newNombresAstraux = [];
+      let newList = [];
      for (let i = 0; i < MAX_NOMBRE_ASTRAL; i++) {
        let dayIndex = this.timestamp.indexDate + i;
-        let na = nombresAstraux.find(it => it.index == dayIndex);
+        let na = this.nombresAstraux.find(n => n.index == dayIndex);
        if (na) {
-          newNombresAstraux[i] = na;
+          newList[i] = na;
        } else {
-          newNombresAstraux[i] = await this.ajouterNombreAstral(dayIndex);
+          newList[i] = await this.ajouterNombreAstral(dayIndex);
        }
      }
+      this.nombresAstraux = newList;
+      game.settings.set(SYSTEM_RDD, "liste-nombre-astral", newList);
      game.actors.filter(it => it.isPersonnage()).forEach(actor => actor.supprimerAnciensNombresAstraux());
-      await this.setNombresAstraux(newNombresAstraux);
+      this.notifyChangeNombresAstraux();
    }
  }

+  notifyChangeNombresAstraux() {
+    Hooks.callAll(APP_ASTROLOGIE_REFRESH);
+    game.socket.emit(SYSTEM_SOCKET_ID, {
+      msg: "msg_refresh_nombre_astral",
+      data: {}
+    });
+  }
+
  /* -------------------------------------------- */
  async setNewTimestamp(newTimestamp) {
    const oldTimestamp = this.timestamp;
@ -365,22 +373,25 @@ export class RdDCalendrier extends Application {
        request.nbAstral = await RdDDice.rollTotal("1dhr" + request.nbAstral, {
          rollMode: "selfroll", showDice: HIDE_DICE
        });
+        // Mise à jour des nombres astraux du joueur
+        this.addNbAstralIncorect(request.id, request.date, request.nbAstral);
+      }
+
+      if (Misc.getActiveUser(request.userId)?.isGM) {
+        RdDUtility.responseNombreAstral(request);
+      } else {
+        game.socket.emit(SYSTEM_SOCKET_ID, {
+          msg: "msg_response_nombre_astral",
+          data: request
+        });
      }
-      // Mise à jour des nombres astraux du joueur
-      await this.addNbAstralJoueur(actor, request.date, request.nbAstral, request.isValid)
-      Hooks.callAll(APP_ASTROLOGIE_REFRESH)
-      game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_app_astrologie_refresh", data: {} })
    }
  }

-  async addNbAstralJoueur(actor, date, nbAstral, isValid) {
-    const nombresAstraux = this.getNombresAstraux()
-    const astralData = nombresAstraux.find(it => it.index == date)
-    if (astralData) {
-      astralData.lectures.push({ actorId: actor.id, nombreAstral: nbAstral });
-      await this.setNombresAstraux(nombresAstraux);
-      await actor.ajouteNombreAstral(date, nbAstral, isValid);
-    }
+  addNbAstralIncorect(actorId, date, nbAstral) {
+    const astralData = this.nombresAstraux.find((nombreAstral, i) => nombreAstral.index == date);
+    astralData.valeursFausses.push({ actorId: actorId, nombreAstral: nbAstral });
+    game.settings.set(SYSTEM_RDD, "liste-nombre-astral", this.nombresAstraux);
  }

  /* -------------------------------------------- */
--- a/module/time/rdd-timestamp.js
+++ b/module/time/rdd-timestamp.js
@ -202,7 +202,7 @@ export class RdDTimestamp {
  }

  static setWorldTime(timestamp) {
-    game.settings.set(SYSTEM_RDD, WORLD_TIMESTAMP_SETTING, foundry.utils.duplicate(timestamp));
+    game.settings.set(SYSTEM_RDD, WORLD_TIMESTAMP_SETTING, duplicate(timestamp));
  }

  /** construit un RdDTimestamp à partir de l'année/mois/jour/heure?/minute? */
@ -231,7 +231,6 @@ export class RdDTimestamp {

  get annee() { return Math.floor(this.indexDate / RDD_JOURS_PAR_AN) }
  get mois() { return Math.floor(Misc.modulo(this.indexDate, RDD_JOURS_PAR_AN) / RDD_JOURS_PAR_MOIS) }
-  get nomMois() { return Math.floor(Misc.modulo(this.indexDate, RDD_JOURS_PAR_AN) / RDD_JOURS_PAR_MOIS) }
  get jour() { return Misc.modulo(Misc.modulo(this.indexDate, RDD_JOURS_PAR_AN), RDD_JOURS_PAR_MOIS) }
  get heure() { return Math.floor(this.indexMinute / RDD_MINUTES_PAR_HEURES) }
  get minute() { return Misc.modulo(this.indexMinute, RDD_MINUTES_PAR_HEURES) }
--- a/module/tirage/fenetre-recherche-tirage.js
+++ b/module/tirage/fenetre-recherche-tirage.js
@ -125,7 +125,7 @@ export class FenetreRechercheTirage extends Application {
      popOut: true,
      dragDrop: [{ dragSelector: "a.content-link" }],
      resizable: true
-    }, { inplace: false })
+    });
  }

  static async create() {
@ -133,7 +133,7 @@ export class FenetreRechercheTirage extends Application {
    const parameters = {
      milieux: milieux,
      filterMilieux: $filterMilieux(milieux),
-      filterGroups: foundry.utils.duplicate(FILTER_GROUPS).filter(it => it.group),
+      filterGroups: duplicate(FILTER_GROUPS).filter(it => it.group),
    }
    const options = {}
    $loadFilters(parameters);
--- a/module/tmr/rencontre.js
+++ b/module/tmr/rencontre.js
@ -16,7 +16,7 @@ export class Rencontre extends Draconique {
    return pixiTMR.sprite(this.code(), {
      zIndex: tmrTokenZIndex.rencontre,
      decallage: pixiTMR.sizes.decallage(0, 0),
-      taille: () => pixiTMR.sizes.full,
+      taille: () => pixiTMR.sizes.twoThird,
    })
  }
 }
--- a/module/voyage/dialog-fatigue-voyage.js
+++ b/module/voyage/dialog-fatigue-voyage.js
@ -1,7 +1,6 @@
 import { TYPES } from "../item.js"
 import { RdDItemCompetence } from "../item-competence.js"
 import { ChatUtility } from "../chat-utility.js"
-import { Misc } from "../misc.js"

 const CODES_COMPETENCES_VOYAGE = ['Extérieur', 'Forêt', 'Montagne', 'Marais', 'Glace', 'Equitation']
 const TABLEAU_FATIGUE_MARCHE = [
@ -37,7 +36,7 @@ export class DialogFatigueVoyage extends Dialog {
      const parameters = {
        tableauFatigueMarche: TABLEAU_FATIGUE_MARCHE,
        playerActors: game.actors.filter(actor => actor.isPersonnageJoueur())
-          .map(actor => DialogFatigueVoyage.prepareActorParameters(actor)),
+          .map(actor => DialogFatigueVoyage.prepareActor(actor)),
        nombreHeures: 1,
      }
      DialogFatigueVoyage.setModeDeplacement(parameters, undefined, undefined)
@ -54,37 +53,21 @@ export class DialogFatigueVoyage extends Dialog {
    parameters.typeTerrain = ligneFatigueMarche
    parameters.vitesseDeplacement = rythme.vitesse
    parameters.fatigueHoraire = rythme.fatigue
-    parameters.playerActors.forEach(voyageur =>
-      DialogFatigueVoyage.selectSurvie(voyageur, parameters.typeTerrain.code)
-    )
  }

-  static prepareActorParameters(actor) {
-    const actorParameters = {
-      id: actor.id,
+  static prepareActor(actor) {
+    const competencesVoyage = {}
+    CODES_COMPETENCES_VOYAGE.forEach(codeSurvie =>
+      competencesVoyage[codeSurvie] = RdDItemCompetence.findCompetence(actor.itemTypes[TYPES.competence], codeSurvie, { onMessage: () => { } })
+    )
+    return {
      actor: actor,
      selected: true,
      ajustementFatigue: 0,
-      survies: {}
+      competencesVoyage: competencesVoyage
    }
-    const competencesVoyage = {}
-    CODES_COMPETENCES_VOYAGE.forEach(codeSurvie => {
-      competencesVoyage[codeSurvie] = RdDItemCompetence.findCompetence(actor.itemTypes[TYPES.competence], codeSurvie, { onMessage: () => { } })
-    })
-    TABLEAU_FATIGUE_MARCHE.forEach(terrain => {
-      actorParameters.survies[terrain.code] = Misc.join(
-        terrain.survies.map(survie => {
-          const niveau = competencesVoyage[survie]?.system.niveau
-          return `${survie}: ${niveau}`
-        }),
-        ', ')
-    })
-    return actorParameters
  }

-  static selectSurvie(actorParameters, code) {
-    actorParameters.survieCourante = actorParameters.survies[code]
-  }

  constructor(html, parameters) {
    const options = {
@ -114,7 +97,6 @@ export class DialogFatigueVoyage extends Dialog {
    this.html.find('select[name="code-terrain"]').change(event => this.changeParameters())
    this.html.find('select[name="vitesse-deplacement"]').change(event => this.changeParameters())
    this.html.find('input[name="nombre-heures"]').change(event => this.changeParameters())
-    this.html.find('.list-item input[name="ajustement-fatigue"]').change(event => this.changeParameters())
    this.html.find('button[name="appliquer-fatigue"]').click(event => this.appliquerFatigue())
  }

@ -136,10 +118,6 @@ export class DialogFatigueVoyage extends Dialog {
        selectVitesseDeplacement.append(await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/voyage/option-vitesse-fatigue.hbs', rythme))
      })
      selectVitesseDeplacement.val(this.parameters.vitesseDeplacement).change()
-
-      Promise.all(this.getActorRows()
-        .map(async row => row.find('label.voyage-liste-survies').text(this.$extractActorParameters(row).survieCourante)
-        ))
    }
  }

@ -154,61 +132,44 @@ export class DialogFatigueVoyage extends Dialog {
  }

  async setFatigue() {
-    const baseFatigue = this.parameters.nombreHeures * this.parameters.fatigueHoraire
-    this.html.find('input[name="base-fatigue"]').val(baseFatigue)
-    this.updateActorTotalFatigue(baseFatigue)
-  }
-
-  async updateActorTotalFatigue(baseFatigue) {
-    Promise.all(this.getActorRows()
-      .map(async row => {
-        const actor = this.$extractActorParameters(row)
-        row.find('input[name="total-fatigue"]').val(actor.ajustement + baseFatigue)
-      }))
+    this.html.find('input[name="base-fatigue"]').val(this.parameters.nombreHeures * this.parameters.fatigueHoraire)
  }

  async appliquerFatigue() {
    const fatigueBase = parseInt(this.html.find('input[name="base-fatigue"]').val() ?? 0)
-    this.getActorRows()
-      .map(row => this.$extractActorParameters(row))
-      .filter(it => it.selected)
-      .forEach(async it => {
+    const actors = jQuery.map(
+      this.html.find('div.fatigue-actors-list li.list-item'),
+      it => this.$extractActor(this.html.find(it))
+    )
+    actors.filter(it => it.selected)
+    .forEach(async it => {
        const perteFatigue = fatigueBase + it.ajustement
        ChatMessage.create({
          whisper: ChatUtility.getWhisperRecipientsAndGMs(it.actor.name),
          content: await renderTemplate(
-            'systems/foundryvtt-reve-de-dragon/templates/voyage/chat-fatigue_voyage.hbs',
-            foundry.utils.mergeObject(it,
+            'systems/foundryvtt-reve-de-dragon/templates/voyage/chat-fatigue_voyage.hbs', foundry.utils.mergeObject(it,
              {
                parameters: this.parameters,
                fatigueBase: fatigueBase,
                perteFatigue: perteFatigue,
                isVoyage: fatigueBase == this.parameters.nombreHeures * this.parameters.fatigueHoraire
-              }, { inplace: false })
+              })
          ),
        })
        await it.actor.santeIncDec("fatigue", perteFatigue)
      })
  }

-  getActorRows() {
-    return jQuery.map(
-      this.html.find('div.fatigue-actors-list li.list-item'),
-      it => this.html.find(it))
-  }
-
-
-  $extractActorParameters(actorRow) {
-    const actorId = actorRow.data('actor-id')
-    const actorParameters = this.parameters.playerActors.find(it => it.id == actorId)
-    const actor = game.actors.get(actorId)
+  $extractActor(actorRow) {
+    const actor = game.actors.get(actorRow.data('actor-id'))
    if (!actor) {
      ui.notifications.warn(`Acteur ${it.actorId} introuvable`)
-      return {}
    }
-    actorParameters.ajustement = parseInt(actorRow.find('input[name="ajustement-fatigue"]').val() ?? 0)
-    actorParameters.selected = actor && actorRow.find('input[name="selectionner-acteur"]').is(':checked')
-    return actorParameters
+    return {
+      actor: actor,
+      ajustement: parseInt(actorRow.find('input[name="ajustement-fatigue"]').val() ?? 0),
+      selected: actor && actorRow.find('input[name="selectionner-acteur"]').is(':checked')
+    }
  }

  async close() {
--- a/styles/simple.css
+++ b/styles/simple.css
@ -92,8 +92,6 @@
  --background-custom-button-hover: linear-gradient(to bottom, rgb(128, 0, 0) 5%, rgb(62, 1, 1) 100%);
  --background-control-selected: linear-gradient(to bottom, hsla(0, 100%, 25%, 0.5) 5%, hsla(0, 100%, 12%, 0.5) 100%);
  --background-tooltip: hsla(60, 12%, 85%, 0.95);
-  --color-tooltip:hsla(282, 47%, 33%, 0.9);
-  --color-tooltip-faint:hsla(282, 47%, 66%, 0.5);
  --background-error:hsla(16, 100%, 50%, 0.8);
  --color-profile-border: hsla(0, 0%, 80%, 0.05);
 }
@ -1374,7 +1372,7 @@ table.table-nombres-astraux tr:hover {
  flex-direction: column;
  position: absolute;
  top: 4.6rem;
-  left: -19rem;
+  right: 3.5rem;
 }
 .token-hud-ext.soins {
  flex-direction: column;
@ -1527,11 +1525,6 @@ div.control-icon.token-hud-icon {
  font-size: 1rem;
 }

-.chat-message header.message-header .heure-rdd {
-  font-size: 0.7rem;
-  flex-grow: 3;
-}
-
 .chat-message.whisper {
  background: rgba(220,220,210,0.75);
  border: 2px solid #545469;
@ -1950,7 +1943,7 @@ div.calendar-timestamp-edit select.calendar-signe-heure {
  padding: 3px;
 }

-aside#tooltip {
+aside#tooltip{
  background: var(--background-tooltip);
  color: var(--color-text-dark-primary);
  font-size: 1rem;
@ -1958,15 +1951,6 @@ aside#tooltip {
  padding: 0.4rem;
 }

-aside#tooltip span.reference {
-  color: var(--color-tooltip);
-  border: 1px solid var(--color-tooltip-faint);
-}
-
-aside#tooltip .toolclip p.faint {
-  color: var(--color-tooltip-faint);
-}
-
 .tooltip :is(.ttt-xp,.ttt-levelup) {
  width: 250px;
  background: var(--background-tooltip) !important;
--- a/system.json
+++ b/system.json
@ -1,13 +1,13 @@
 {
  "id": "foundryvtt-reve-de-dragon",
  "title": "Rêve de Dragon",
-  "version": "12.0.8",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-12.0.8.zip",
+  "version": "11.2.19",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.2.19.zip",
  "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v11/system.json",
  "changelog": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v11/changelog.md",
  "compatibility": {
    "minimum": "11",
-    "verified": "12"
+    "verified": "11"
  },
  "description": "Rêve de Dragon RPG for FoundryVTT",
  "authors": [
--- a/templates/actor/carac-derivee.html
+++ b/templates/actor/carac-derivee.html
@ -55,7 +55,9 @@
  <li class="caracteristique flexrow list-item"  data-tooltip="Niveau d'éthylisme">
    <label class="derivee-label" for="system.compteurs.ethylisme.value">{{system.compteurs.ethylisme.label}}</label>
    <select class="derivee-value" name="system.compteurs.ethylisme.value" data-dtype="Number">
-      {{selectOptions (RDD_CONFIG 'niveauEthylisme')  selected=system.compteurs.ethylisme.value valueAttr="value" nameAttr="value" labelAttr="label"}} 
+      {{#select system.compteurs.ethylisme.value}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/enum-niveau-ethylisme.html"}}
+      {{/select}}
    </select>  
  </li>  

--- a/templates/actor/carac-entitee.html
+++ b/templates/actor/carac-entitee.html
@ -2,13 +2,20 @@
  <li class="caracteristique flexrow list-item">
    <span class="carac-label" name="catEntite">Catégorie : </span>
    <select name="system.definition.categorieentite" value="{{system.definition.categorieentite}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}>
-      {{selectOptions (RDD_CONFIG 'categorieEntite') selected=system.definition.categorieentite}}
+      {{#select system.definition.categorieentite}}
+      <option value="cauchemar">Cauchemar</option>
+      <option value="reve">Rêve</option>
+      {{/select}}
    </select>
  </li>
  <li class="caracteristique flexrow list-item">
    <span class="carac-label" name="typeEntite">Type d'entité : </span>
    <select name="system.definition.typeentite" value="{{system.definition.typeentite}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}>
-      {{selectOptions (RDD_CONFIG 'typeEntite') selected=system.definition.typeentite}}
+      {{#select system.definition.typeentite}}
+      <option value="incarne">Incarnée</option>
+      <option value="nonincarne">Non Incarnée</option>
+      <option value="blurette">Blurette</option>
+      {{/select}}
    </select>
  </li>
  {{#each system.attributs as |attr key|}}
--- a/templates/actor/combat.html
+++ b/templates/actor/combat.html
@ -25,7 +25,7 @@
    <span class="competence-value">{{plusMoins arme.system.niveau}}</span>
    <span class="competence-value">{{plusMoins arme.system.dommagesReels}}</span>
    <span class="competence-value"></span>
-    <span class="initiative-value arme-initiative"><a data-tooltip="{{arme.name}}: initiative {{arme.system.initiative}}">{{arme.system.initiative}}</a></span>
+    <span class="initiative-value arme-initiative"><a data-tooltip="{{arme.name}}: initiative {{plusMoins arme.system.initiative}}">{{arme.system.initiative}}</a></span>
  </li>
  {{/each}}
  {{#each esquives as |esq key|}}
--- a/templates/actor/header-effects.html
+++ b/templates/actor/header-effects.html
@ -2,7 +2,7 @@
  {{#if effects}}
    {{#each effects as |effect key|}}
    <span class="active-effect" data-effect="{{effect.id}}">
-      <img class="button-effect-img {{#if @root.options.isGM}}delete-active-effect{{/if}}" src="{{effect.img}}" data-tooltip="{{localize effect.name}}" width="24" height="24" />
+      <img class="button-effect-img {{#if @root.options.isGM}}delete-active-effect{{/if}}" src="{{effect.icon}}" data-tooltip="{{localize effect.name}}" width="24" height="24" />
    </span>
    {{/each}}
    {{#if calc.surprise}}<span>{{calc.surprise}}!</span>{{/if}}
--- a/templates/chat-vente-item.html
+++ b/templates/chat-vente-item.html
@ -1,4 +1,3 @@
-{{log 'chat-vente-item' this}}
 <div class="post-item" data-transfer="{{transfer}}">
  <h3>{{#if alias}}{{alias}} propose: {{else}}Acheter {{/if}}{{item.name}}</h3>
  {{#if item.img}}
@ -13,7 +12,7 @@
  <hr>
  <p>
    {{#unless quantiteIllimite}}
-    <span>Lots disponibles: {{nbLots}}</span><br>
+    <span>Lots disponibles: <span class="quantiteNbLots">{{quantiteNbLots}}</span></span><br>
    {{/unless}}
    {{#if (gt tailleLot 1)}}
    <span>Lots de: <span class="tailleLot">{{tailleLot}}</span></span><br>
@ -23,9 +22,15 @@
      <span class="prixLot">{{numberFormat prixLot decimals=2 sign=false}}</span> Sols</strong></span><br>
    {{/if}}
  </p>
-  {{#if (or (gt nbLots 0) quantiteIllimite)}}
+  {{#if (or (gt quantiteNbLots 0) quantiteIllimite)}}
  <span class="chat-card-button-area">
-    <a class="button-acheter chat-card-button">
+    <a class="button-acheter chat-card-button"
+      data-jsondata='{{jsondata}}'
+      {{#if vendeurId}}data-vendeurId='{{vendeurId}}'{{/if}}
+      data-tailleLot="{{tailleLot}}"
+      data-quantiteNbLots="{{quantiteNbLots}}"
+      data-quantiteIllimite="{{#if quantiteIllimite}}true{{else}}false{{/if}}"
+      data-prixLot="{{prixLot}}">
    {{#if (eq prixLot 0)}}Prendre{{else}}Acheter{{/if}}</a>
  </span>
  {{/if}}
--- a/templates/common/compendium-link.hbs
+++ b/templates/common/compendium-link.hbs
@ -1,20 +1,22 @@
-<span draggable="true">
-  <a class="{{#if pack}}content-link{{else}}rdd-world-content-link{{/if}}"
-    data-id="{{id}}"
-    data-link=""
-    {{#if doctype}}
-    data-doctype="{{doctype}}"
-    data-type="{{doctype}}"
-    {{/if}}
-    {{#if pack}}
-    data-pack="{{pack}}"
+  <span draggable="true">
+  {{#if pack}}
+  {{!-- draggable="true"  --}}
+  <a class="content-link"
    data-uuid="Compendium.{{pack}}.{{id}}" 
-    {{/if}} >
-    {{#if img}}
-    <img class="in-text-img" src="{{img}}" data-tooltip="{{name}}" />
-    {{else}}
-    <i class="fas fa-suitcase"></i>
-    {{/if}}
-    {{name}}
-  </a>
+    data-pack="{{pack}}" 
+    {{#if doctype}}data-doctype="{{doctype}}"{{/if}}
+    data-id="{{id}}"
+  >
+  {{else}}
+  <a class="rdd-world-content-link"
+    {{#if doctype}}data-doctype="{{doctype}}"{{/if}}
+    data-id="{{id}}"
+  >
+  {{/if}}
+  {{#if img}}
+  <img class="in-text-img" src="{{img}}" data-tooltip="{{name}}" />
+  {{else}}
+  <i class="fas fa-suitcase"></i>
+  {{/if}}
+  {{name}}</a>
 </span>
--- a/templates/common/date-heure.hbs
+++ b/templates/common/date-heure.hbs
@ -1,3 +0,0 @@
-<span class="message-metadata heure-rdd">
-  {{this.jourDuMois}} {{this.mois.label}} - {{timestamp-imgSigne this.heure}}
-</span>
--- a/templates/common/periodicite.hbs
+++ b/templates/common/periodicite.hbs
@ -2,6 +2,8 @@
 <div class="flexrow">
  <input type="number" name="{{path}}.nombre" value="{{nombre}}" data-dtype="Number"/>
  <select name="{{path}}.unite" data-dtype="String" >
-    {{selectOptions (timestamp-formulesPeriode) selected=unite labelAttr="label" nameAttr="code" valueAttr="code"}}
+    {{#select unite}}
+    {{>"systems/foundryvtt-reve-de-dragon/templates/enum-periode.html"}}
+    {{/select}}
  </select>
 </div>
--- a/templates/common/timestamp.hbs
+++ b/templates/common/timestamp.hbs
@ -6,7 +6,9 @@
        type="number" data-dtype="Number" min="1" max="28"
        name="{{path}}.jourDuMois" value="{{jourDuMois}}" />
    <select {{#if disabled}}{{disabled}}{{/if}} name="{{path}}.mois" class="calendar-signe-heure" data-dtype="String">
-    {{selectOptions (RDD_CONFIG 'heuresRdD') selected=mois.key labelAttr="label" nameAttr="value" valueAttr="value"}}
+      {{#select mois.key}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/enum-heures.html"}}
+      {{/select}}
    </select>
    {{timestamp-imgSigne mois}}
    <input {{#if disabled}}{{disabled}}{{/if}} type="number" class="number-x2" name="{{path}}.annee" value="{{annee}}" data-dtype="Number"/>
@ -15,7 +17,9 @@
    <label></label>
    <label>heure</label>
    <select {{#if disabled}}{{disabled}}{{/if}} name="{{path}}.heure" class="calendar-signe-heure" data-dtype="String">
-    {{selectOptions (RDD_CONFIG 'heuresRdD') selected=heure.key labelAttr="label" nameAttr="value" valueAttr="value"}}
+      {{#select heure.key}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/enum-heures.html"}}
+      {{/select}}
    </select>
    {{timestamp-imgSigne heure}}
    <input {{#if disabled}}{{disabled}}{{/if}} type="number" class="number-x2" name="{{path}}.minute" value="{{minute}}" data-dtype="Number"/>
--- a/templates/dialog-item-achat.html
+++ b/templates/dialog-item-achat.html
@ -31,7 +31,7 @@
    <label>{{#if quantiteIllimite}}
      pas de limite
      {{else}}
-      {{nbLots}}
+      {{quantiteNbLots}}
      {{/if}}</label>
  </div>
  <div class="flexrow flex-group-left">
@ -41,7 +41,7 @@
    </label>
    <div class="flexrow">
      <input name="nombreLots" class="nombreLots flex-shrink number-x2" type="number" min="1"
-        {{#unless quantiteIllimite}} max="{{nbLots}}" {{/unless}}
+        {{#unless quantiteIllimite}} max="{{quantiteNbLots}}" {{/unless}}
        value="{{choix.nombreLots}}"
        data-dtype="Number" />
    </div>
--- a/templates/dialog-item-vente.html
+++ b/templates/dialog-item-vente.html
@ -18,8 +18,8 @@
          quantiteIllimite}}checked{{/if}} />
        <label class="label-quantiteIllimite flex-shrink">disponibles</label>
        {{/unless}}
-        <input name="nbLots" class="nbLots flex-shrink number-x2" type="number" min="1"
-          max="{{maxLots}}" value="{{nbLots}}" data-dtype="Number" />
+        <input name="quantiteNbLots" class="quantiteNbLots flex-shrink number-x2" type="number" min="1"
+          max="{{quantiteMaxLots}}" value="{{quantiteNbLots}}" data-dtype="Number" />
      </div>
    </div>
    <div class="flexrow flex-group-left">
--- a/templates/dialog-validation-encaissement.html
+++ b/templates/dialog-validation-encaissement.html
@ -15,36 +15,33 @@
        <label class="encaissement-total">{{encaissement.total}}</label>
        <div class="tooltiptext ttt-ajustements">
          <div>Armure: {{encaissement.armure}}</div>
-          {{#if encaissement.dmg.penetration}}
-          <div>Pénétration: -{{encaissement.dmg.penetration}}</div>
+          {{#if rollData.dmg.penetration}}
+          <div>Pénétration: -{{rollData.dmg.penetration}}</div>
          {{/if}}
          <hr>
          {{#if encaissement.dmg.total}}
-          <div>+dom encaissement: {{plusMoins encaissement.dmg.total}}</div>
+          <div>+dom encaissement: {{plusMoins rollData.dmg.total}}</div>
          {{/if}}
-          {{#if encaissement.dmg.dmgArme}}
-          <div>+dom arme: {{plusMoins encaissement.dmg.dmgArme}}</div>
+          {{#if rollData.dmg.dmgArme}}
+          <div>+dom arme: {{plusMoins rollData.dmg.dmgArme}}</div>
          {{/if}}
-          {{#if encaissement.dmg.dmgActor}}
-          <div>+dom attaquant: {{plusMoins encaissement.dmg.dmgActor}}</div>
+          {{#if rollData.dmg.dmgActor}}
+          <div>+dom attaquant: {{plusMoins rollData.dmg.dmgActor}}</div>
          {{/if}}
-          {{#if encaissement.dmg.dmgParticuliere}}
-          <div>+dom particulière: {{plusMoins encaissement.dmg.dmgParticuliere}}</div>
+          {{#if rollData.dmg.dmgParticuliere}}
+          <div>+dom particulière: {{plusMoins rollData.dmg.dmgParticuliere}}</div>
          {{/if}}
-          {{#if encaissement.dmg.dmgTactique}}
-          <div>+dom tactique: {{plusMoins encaissement.dmg.dmgTactique}}</div>
+          {{#if rollData.dmg.dmgTactique}}
+          <div>+dom tactique: {{plusMoins rollData.dmg.dmgTactique}}</div>
          {{/if}}
-          {{#if encaissement.dmg.dmgSurprise}}
-          <div>+dom surprise: {{plusMoins encaissement.dmg.dmgSurprise}}</div>
-          {{/if}}
-          {{#if encaissement.dmg.bonusDegatsDiffLibre}}
-          <div>+dom attaque: {{plusMoins encaissement.dmg.bonusDegatsDiffLibre}}</div>
+          {{#if rollData.dmg.dmgSurprise}}
+          <div>+dom surprise: {{plusMoins rollData.dmg.dmgSurprise}}</div>
          {{/if}}
        </div>
      </span>
    </li>
    <li class="flexrow flex-group-left">
-      <label>Blessure ({{encaissement.dmg.mortalite}})</label>
+      <label>Blessure ({{rollData.dmg.mortalite}})</label>
      <label class="encaissement-blessure">{{encaissement.blessures}}</label>
    </li>
  </ul>
--- a/templates/item/partial-environnement.html
+++ b/templates/item/partial-environnement.html
@ -18,7 +18,6 @@
      <a class="milieu-add"><i class="fas fa-plus-circle"></i></a>
    </span>
  </div>
-  
  {{#each system.environnement as |env key|}}
  <div class="form-group environnement-milieu" data-milieu="{{env.milieu}}">
    <label>
@ -27,7 +26,9 @@
    </label>
    <span class="flexrow">
      <select name="milieu-{{key}}-rarete" class="environnement-rarete flex-shrink" data-dtype="String">
-        {{selectOptions (RDD_CONFIG 'raretes') selected=env.rarete labelAttr="label" valueAttr="value" nameAttr="value"}}
+        {{#select env.rarete}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}}
+        {{/select}}
      </select>
      {{rangePicker name="milieu-{{key}}-frequence" value=env.frequence min=(rarete-getChamp env.rarete 'min') max=(rarete-getChamp env.rarete 'max') step=1}}
      <label>[{{rarete-getChamp env.rarete 'min'}}-{{rarete-getChamp env.rarete 'max'}}]</label>
--- a/templates/settings/status-effects.html
+++ b/templates/settings/status-effects.html
@ -7,7 +7,7 @@
      {{else}}
      <input class="resource-content select-effect" type="checkbox" name="{{effect.id}}" {{#if effect.active}}checked{{/if}}/>
      {{/if}}
-      <img class="button-effect-img" height="16" width="16" src="{{effect.img}}" data-tooltip="{{localize effect.name}}" />
+      <img class="button-effect-img" height="16" width="16" src="{{effect.icon}}" data-tooltip="{{localize effect.name}}" />
      <label>{{localize effect.name}}</label>
    </li>
    {{/each}}
--- a/templates/settings/system-compendiums.html
+++ b/templates/settings/system-compendiums.html
@ -3,7 +3,7 @@
    {{#each systemCompendiums as |definition key|}}
    <li class="flexrow">
      <label>{{definition.label}}</label>
-      <select data-dtype="String" class="system-compendium-setting flex-grow-2" data-compendium="{{definition.compendium}}" >        
+      <select data-dtype="String" class="system-compendium-setting flex-grow-2" data-compendium="{{definition.compendium}}" >
        {{#select definition.value}}
        {{#each @root.availableCompendiums as |available key|}}
        {{#if (eq available.type definition.type)}}
--- a/templates/sommeil/astrologie-gardien.hbs
+++ b/templates/sommeil/astrologie-gardien.hbs
@ -15,8 +15,8 @@
      <td class="nombre-astral" data-nombre-astral="{{nba.nombreAstral}}">
        <ol>
        <b>{{nba.nombreAstral}}</b>
-        {{#each nba.lectures as |lecture|}}
-        <li>{{lecture.actorName}} - {{lecture.nombreAstral}}</li>
+        {{#each nba.valeursFausses as |fausse|}}
+        <li>{{fausse.actorName}} - {{fausse.nombreAstral}}</li>
        {{/each}}
        </ol>
      </td>
--- a/templates/sommeil/astrologie-joueur.hbs
+++ b/templates/sommeil/astrologie-joueur.hbs
@ -1,11 +1,19 @@
 <div>
  <label>Conditions</label>
  <select name="diffConditions" data-dtype="Number">
-    {{selectOptions actorAstrologie.ajustements selected='0'}}
+    {{#select '0'}}
+    {{#each actorAstrologie.ajustements as |ajustement|}}
+    <option value={{ajustement}}>{{ajustement}}</option>
+    {{/each}}
+    {{/select}}
  </select>
  <label>&nbsp;&nbsp;Jours</label>
  <select name="joursAstrologie" data-dtype="Number">
-    {{selectOptions dates selected='' labelAttr='label' valueAttr='index' nameAttr='index'}}
+    {{#select ''}}
+    {{#each dates as |date|}}
+    <option value={{date.index}}>{{date.label}}</option>
+    {{/each}}
+    {{/select}}
  </select>
  <label>
    &nbsp;&nbsp;Etat Général: {{actorAstrologie.etat}}
--- a/templates/voyage/dialog-fatigue-voyage.hbs
+++ b/templates/voyage/dialog-fatigue-voyage.hbs
@ -42,8 +42,7 @@
        <li class="competence-header flexrow">
          <span class="flex-grow-2">Personnage</span>
          <span class="flex-grow-2">Survies</span>
-          <span class="flex-grow-1" data-tooltip="Ajustements à appliquer (par exemple, repos à cheval)">Ajustements</span>
-          <span class="flex-grow-1" data-tooltip="Total de fatigue pour le voyageur">Total</span>
+          <span class="flex-grow-1" data-tooltip="Ajustements à appliquer pour les personnages se reposant (par exemple, à cheval)">Ajustements</span>
        </li>
        {{#each playerActors as |selected|}}
        {{>'systems/foundryvtt-reve-de-dragon/templates/voyage/fatigue-actor.hbs' voyageur=selected survies=@root.typeTerrain.survies}}
--- a/templates/voyage/fatigue-actor.hbs
+++ b/templates/voyage/fatigue-actor.hbs
@ -8,13 +8,16 @@
  </span>
  <span class="flex-grow-2">
    <div class="flexcol ">
-      <label class="voyage-liste-survies">{{voyageur.survieCourante}}</label>
+      <label class="voyage-liste-survies">
+      {{#each voyageur.competencesVoyage as |comp key|}}
+      {{#if (array-includes ../survies key)}}
+        {{key}} {{comp.system.niveau}},
+      {{/if}}
+      {{/each}}
+      </label>
    </div>
  </span>
  <span class="flex-grow-1">
    <input type="number" name="ajustement-fatigue" class="number-x2 ajustement-fatigue" data-dtype="Number" value="{{voyageur.ajustementFatigue}}" min="-6" max="6"/>
  </span>
-  <span class="flex-grow-1">
-    <input type="number" name="total-fatigue" class="number-x2 total-fatigue" data-dtype="Number" value="1" min="0" max="24" disabled/>
-  </span>
 </li>