Merge pull request 'v11.1.6 - Les dissections de Werther de Zloth' (#682 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11

Reviewed-on: #682
Version 11.1.6
2023-11-12 22:15:26 +01:00 · 2023-11-12 21:18:52 +01:00 · 2023-11-12 21:18:07 +01:00 · 2023-11-12 21:17:38 +01:00 · 2023-11-12 16:35:40 +01:00 · 2023-11-12 15:06:58 +01:00
65 changed files with 376 additions and 302 deletions
--- a/changelog.md
+++ b/changelog.md
@ -1,4 +1,36 @@
 # v11.0
+## v11.1.6 - Les dissections de Werther de Zloth
+- Fix: on peut de nouveau donner des compétences aux créatures
+- Fix: le délai de guérison d'une blessure rétrogradée est correctement appliqué
+- Fix: l'encaissement à valider par le MJ fonctionne de nouveau
+
+## v11.1.5 - Werther de Zloth l'Onirique
+- Fixes:
+  - la demande de défense ne marchait plus
+  - la tête réserve extensible crée bien une case de réserve extensible (à modifier)
+  - le souffle trou noir ajoute bien une case de trou noir
+  - la queue urgence draconique ne se transforme plus en idée fixe s'il y a des sorts en réserve
+  - l'ajout d'une nouvelle queue ne supprime plus l'insomnie
+- Amélioration des jets de vie
+  - un 1 sur le jet de vie est une réussite même si le personnage est dans le coma
+  - le temps avant le prochain jet est calculé et affiché
+  - un 20 sur le jet de vie signifie la mort immédiate
+  - si on dépasse le S.Const, le personnage est bien indiqué comme mort
+  - pas de jets de vie pour les morts
+
+## v11.1.4 - Werther de Zloth l'Onirique
+- Ajout du facteur de significative à côté du pourcentage dans le résultat des jets de dés pour rappeler que le pourcentage n'est pas diviasé
+- Fix: dans les TMRs, les tooltips affichent bien les informations de tous les effets sur la case
+- Fix: la fatigue et l'éthylisme sont de nouveau pris en compte dans le calcul de l'éthylisme
+- Fix: Le MJ peut correctement masquer les points de tâche requis
+- Fix: le jet d'appréciation n'utilise pas la compétence
+- Fix: la qualité négative n'est pas exotique, elle est juste mauvaise: on n'utilise pas la cuisine pour se retenir de jeter l'assiette
+- Esthétique: ne pas afficher "+0" pour les ajustements de jets/encaissement
+
+## v11.1.2 - Les vertèbres de Werther de Zloth
+- Fix: les jets d'encaissement fonctionnent de nouveau normalement
+- Macro "Mon personnage" permettant au joueur d'accéder à sa feuille de personnage depuis la barre de macros
+
 ## v11.1.1 - Les fumebols de Werther de Zloth
 - Fix: on peut de nouveau afficher les vues détaillées
 - Fix: on peut ouvrir les sacs et contenants portés par les véhicules et créatures
--- a/icons/voyageurs/personnage.webp
+++ b/icons/voyageurs/personnage.webp
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@ -348,7 +348,7 @@ export class RdDActorSheet extends RdDBaseActorReveSheet {
    });

    this.html.find('.jet-vie').click(async event => {
-      this.actor.jetVie();
+      this.actor.jetDeVie();
    });
    this.html.find('.jet-endurance').click(async event => {
      await this.jetEndurance();
--- a/module/actor.js
+++ b/module/actor.js
@ -109,10 +109,10 @@ export class RdDActor extends RdDBaseActorSang {

  /* -------------------------------------------- */
  getEtatGeneral(options = { ethylisme: false }) {
-    let etatGeneral = Misc.toInt(this.system.compteurs.etat?.value)
+    const etatGeneral = Misc.toInt(this.system.compteurs.etat?.value)
    if (options.ethylisme) {
-      // Pour les jets d'Ethylisme, on ignore le degré d'éthylisme (p.162)
-      etatGeneral -= Math.min(0, this.system.compteurs.ethylisme.value)
+      // Pour les jets d'Ethylisme, on retire le malus d'éthylisme (p.162)
+      return etatGeneral - this.malusEthylisme()
    }
    return etatGeneral
  }
@ -256,7 +256,7 @@ export class RdDActor extends RdDBaseActorSang {
    const isMaladeEmpoisonne = maladiesPoisons.length > 0;
    this._messageRecuperationMaladiePoisons(maladiesPoisons, message);

-    await this._recuperationBlessures(message, isMaladeEmpoisonne);
+    await this._recupererBlessures(message, isMaladeEmpoisonne);
    await this._recupererVie(message, isMaladeEmpoisonne);
  }

@ -323,7 +323,9 @@ export class RdDActor extends RdDBaseActorSang {
  }

  async setInfoSommeilInsomnie() {
-    await this.update({ 'system.sommeil.insomnie': EffetsDraconiques.isSujetInsomnie(this) });
+    if (EffetsDraconiques.isSujetInsomnie(this)) {
+      await this.update({ 'system.sommeil.insomnie': true });
+    }
  }

  async setInfoSommeilMoral(situationMoral) {
@ -365,7 +367,7 @@ export class RdDActor extends RdDBaseActorSang {
  }

  /* -------------------------------------------- */
-  async _recuperationBlessures(message, isMaladeEmpoisonne) {
+  async _recupererBlessures(message, isMaladeEmpoisonne) {
    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))

@ -533,7 +535,7 @@ export class RdDActor extends RdDBaseActorSang {
      message.content += `Vous dégrisez un peu (${RdDUtility.getNomEthylisme(value)}). `;
    }
    await this.update({
-      "system.compteurs.ethylisme": {
+      'system.compteurs.ethylisme': {
        nb_doses: 0,
        jet_moral: false,
        value: value
@ -659,7 +661,7 @@ export class RdDActor extends RdDBaseActorSang {
  /* -------------------------------------------- */
  async sortMisEnReserve(sort, draconic, coord, ptreve) {
    await this.createEmbeddedDocuments("Item", [{
-      type: 'sortreserve',
+      type: TYPES.sortreserve,
      name: sort.name,
      img: sort.img,
      system: { sortid: sort._id, draconic: (draconic?.name ?? sort.system.draconic), ptreve: ptreve, coord: coord, heurecible: 'Vaisseau' }
@ -1178,17 +1180,6 @@ export class RdDActor extends RdDBaseActorSang {
    return 0;
  }

-  /* -------------------------------------------- */
-  async setEthylisme(degre) {
-    let ethylisme = duplicate(this.system.compteurs.ethylisme);
-    ethylisme.value = degre;
-    ethylisme.nb_doses = 0;
-    if (degre == 1) {
-      ethylisme.jet_moral = false;
-    }
-    await this.update({ "system.compteurs.ethylisme": ethylisme });
-  }
-
  /* -------------------------------------------- */
  async jetEthylisme() {
    let rollData = {
@ -1207,7 +1198,7 @@ export class RdDActor extends RdDBaseActorSang {
  async actionPrincipale(item, onActionItem = async () => { }) {
    let result = await super.actionPrincipale(item, onActionItem)
    if (result) { return result }
-    
+
    result = await this.actionNourritureboisson(item, onActionItem)
    if (result) { return result }

@ -1314,17 +1305,26 @@ export class RdDActor extends RdDBaseActorSang {

  /* -------------------------------------------- */
  async _surmonterExotisme(item) {
-    const exotisme = Math.min(item.system.exotisme, item.system.qualite, 0);
-    if (exotisme < 0) {
-      const rolled = await this.doRollCaracCompetence('volonte', 'cuisine', exotisme, { title: `tente de surmonter l'exotisme de ${item.name}` });
-      return rolled.isSuccess;
+    const qualite = Math.min(item.system.qualite, 0)
+    const exotisme = item.system.exotisme
+    if (exotisme < 0 || qualite < 0) {
+      const competence = qualite > 0 ? 'cuisine' : undefined
+      const difficulte = Math.min(exotisme, qualite)
+      const rolled = await this.doRollCaracCompetence('volonte', competence,  difficulte, { title: `tente de surmonter l'exotisme de ${item.name}` })
+      return rolled.isSuccess
    }
    return true;
  }

  /* -------------------------------------------- */
  async apprecier(carac, compName, qualite, title) {
-    const rolled = await this.doRollCaracCompetence(carac, compName, qualite, { title: title, apprecier: true });
+    const competence = this.getCompetence(compName);
+    const minQualite = Math.max(1, competence?.system.niveau ?? 0);
+    if (qualite <= minQualite) {
+      ui.notifications.info(`${this.name} a un niveau ${competence.system.niveau} en ${competence.name}, trop élevé pour apprécier la qualité de ${qualite}`)
+      return;
+    }
+    const rolled = await this.doRollCaracCompetence(carac, undefined, 0, { title });
    if (rolled?.isSuccess) {
      await this.jetDeMoral('heureux');
    }
@ -1801,20 +1801,13 @@ export class RdDActor extends RdDBaseActorSang {
   * @param {*} options 
   * @returns 
   */
-  async doRollCaracCompetence(caracName, compName, diff, options = { title: "", apprecier: false }) {
+  async doRollCaracCompetence(caracName, compName, diff, options = { title: "" }) {
    const carac = this.getCaracByName(caracName);
    if (!carac) {
      ui.notifications.warn(`${this.name} n'a pas de caractéristique correspondant à ${caracName}`)
      return;
    }
    const competence = this.getCompetence(compName);
-    if (options.apprecier && competence) {
-      const minQualite = Math.max(0, competence.system.niveau);
-      if (diff <= minQualite) {
-        ui.notifications.info(`${this.name} a un niveau ${competence.system.niveau} en ${competence.name}, trop élevé pour apprécier la qualité de ${diff}`)
-        return;
-      }
-    }
    let rollData = {
      alias: this.name,
      caracValue: Number(carac.value),
--- a/module/actor/base-actor-reve.js
+++ b/module/actor/base-actor-reve.js
@ -17,7 +17,7 @@ import { Targets } from "../targets.js";
 import { RdDPossession } from "../rdd-possession.js";
 import { RdDCombat } from "../rdd-combat.js";
 import { RdDConfirm } from "../rdd-confirm.js";
-import { ENTITE_INCARNE, SYSTEM_RDD } from "../constants.js";
+import { ENTITE_INCARNE, SHOW_DICE, SYSTEM_RDD } from "../constants.js";
 import { RdDItemArme } from "../item-arme.js";

 const POSSESSION_SANS_DRACONIC = {
@ -427,7 +427,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
      RdDBaseActor.remoteActorCall({
        tokenId: this.token?.id,
        actorId: this.id,
-        method: 'appliquerEncaissement',
+        method: 'encaisserDommages',
        args: [rollData, show, attackerId]
      });
      return;
--- a/module/actor/base-actor-sang.js
+++ b/module/actor/base-actor-sang.js
@ -60,13 +60,21 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
    return this.system.sante.vie.value < -this.getSConst()
  }

+  nbBlessuresLegeres() {
+    return this.itemTypes[TYPES.blessure].filter(it => it.isLegere()).length;
+  }
+  nbBlessuresGraves() {
+    return this.itemTypes[TYPES.blessure].filter(it => it.isGrave()).length;
+  }
+  nbBlessuresCritiques() {
+    return this.itemTypes[TYPES.blessure].filter(it => it.isCritique()).length;
+  }
+
  /* -------------------------------------------- */
  computeResumeBlessure() {
-    const blessures = this.filterItems(it => it.system.gravite > 0, 'blessure')
-
-    const nbLegeres = blessures.filter(it => it.isLegere()).length;
-    const nbGraves = blessures.filter(it => it.isGrave()).length;
-    const nbCritiques = blessures.filter(it => it.isCritique()).length;
+    const nbLegeres = this.nbBlessuresLegeres()
+    const nbGraves = this.nbBlessuresGraves()
+    const nbCritiques = this.nbBlessuresCritiques()

    if (nbLegeres + nbGraves + nbCritiques == 0) {
      return "Aucune blessure";
@ -206,26 +214,36 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
  }

  /* -------------------------------------------- */
-  async jetVie() {
-    let roll = await RdDDice.roll("1d20");
-    let msgText = "Jet de Vie : " + roll.total + " / " + this.system.sante.vie.value + "<br>";
-    if (roll.total <= this.system.sante.vie.value) {
-      msgText += "Jet réussi, pas de perte de point de vie (prochain jet dans 1 round pour 1 critique, SC minutes pour une grave)";
-      if (roll.total == 1) {
-        msgText += "La durée entre 2 jets de vie est multipliée par 20 (20 rounds pour une critique, SCx20 minutes pour une grave)";
-      }
-    } else {
-      msgText += "Jet échoué, vous perdez 1 point de vie";
-      await this.santeIncDec("vie", -1);
-      if (roll.total == 20) {
-        msgText += "Votre personnage est mort !!!!!";
-      }
+  async jetDeVie() {
+    if (this.isDead()) {
+      ChatMessage.create({ content: `Jet de Vie: ${this.name} est déjà mort, ce n'est pas la peine d'en rajouter !!!!!`, whisper: ChatMessage.getWhisperRecipients(this.name) });
+      return
    }
-    const message = {
-      content: msgText,
-      whisper: ChatMessage.getWhisperRecipients(this.name)
-    };
-    ChatMessage.create(message);
+    const jetDeVie = await RdDDice.roll("1d20");
+
+    const sConst = this.getSConst();
+    const vie = this.system.sante.vie.value;
+    const isCritique = this.nbBlessuresCritiques() > 0;
+    const isGrave = this.nbBlessuresGraves();
+    const isEchecTotal = jetDeVie.total == 20;
+    const isSuccess = jetDeVie.total == 1 || jetDeVie.total <= vie;
+    const perte = isSuccess ? 0 : 1 + (isEchecTotal ? vie + sConst : 0)
+    const prochainJet = (jetDeVie.total == 1 && vie > 0 ? 20 : 1) * (isCritique ? 1 : isGrave > 0 ? sConst : 0)
+
+    let msgText = `Jet de Vie: <strong>${jetDeVie.total} / ${vie}</strong>`
+    if (isSuccess) {
+      msgText += "<br>Réussi, pas de perte de point de vie."
+    } else {
+      msgText += `<br>Echoué, perte ${perte} point de vie`;
+      await this.santeIncDec("vie", -perte);
+    }
+    if (this.isDead()) {
+      msgText += `<br><strong>${this.name} est mort !!!!</strong>`;
+    }
+    else if (prochainJet > 0) {
+      msgText += `<br>Prochain jet de vie dans ${prochainJet} ${isCritique ? 'round' : 'minute'}${prochainJet > 1 ? 's' : ''} ${isCritique ? '(état critique)' : '(état grave)'}`
+    }
+    ChatMessage.create({ content: msgText, whisper: ChatMessage.getWhisperRecipients(this.name) });
  }

  /* -------------------------------------------- */
@ -238,7 +256,6 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
    return { jetEndurance, sonne }
  }

-
  async finDeRoundBlessures() {
    const nbGraves = this.filterItems(it => it.isGrave(), 'blessure').length;
    if (nbGraves > 0) {
@ -269,7 +286,6 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
  }

  malusEthylisme() { return 0 }
-  malusFatigue() { return 0 }


 }
--- a/module/actor/creature.js
+++ b/module/actor/creature.js
@ -1,4 +1,5 @@
 import { ENTITE_INCARNE } from "../constants.js";
+import { TYPES } from "../item.js";
 import { STATUSES } from "../settings/status-effects.js";
 import { RdDBaseActorSang } from "./base-actor-sang.js";

--- a/module/item-sheet.js
+++ b/module/item-sheet.js
@ -196,6 +196,7 @@ export class RdDItemSheet extends ItemSheet {
    this.html.find('.creer-tache-livre').click((event) => this._getEventActor(event).creerTacheDepuisLivre(this.item));
    this.html.find('.consommer-potion').click((event) => this._getEventActor(event).consommerPotion(this.item, this.getActionRenderItem()));
    this.html.find('.creer-potion-base').click((event) => this._getEventActor(event).actionHerbe(this.item));
+    this.html.find('input[name="system.cacher_points_de_tache"]').change(async event => await this.item.update({ 'system.cacher_points_de_tache': event.currentTarget.checked }));

    this.html.find('.alchimie-tache a').click((event) => {
      let actor = this._getEventActor(event);
@ -256,7 +257,7 @@ export class RdDItemSheet extends ItemSheet {

    if (this.item.isCompetence()) {
      const categorie = event.currentTarget.value;
-      const level =  RdDItemCompetence.getNiveauBase(categorie, this.item.getCategories());
+      const level = RdDItemCompetence.getNiveauBase(categorie, this.item.getCategories());
      this.item.system.base = level;
      this.html.find('[name="system.base"]').val(level);
    }
--- a/module/item.js
+++ b/module/item.js
@ -797,7 +797,7 @@ export class RdDItem extends Item {
      `<b>Périodicité</b>: ${this.system.periodicite}`,
      `<b>Fatigue</b>: ${this.system.fatigue}`,
      `<b>Difficulté</b>: ${this.system.difficulte}`,
-      RdDItem.propertyIfDefined('Points de Tâche', this.system.points_de_tache, this.system.cacher_points_de_tache),
+      RdDItem.propertyIfDefined('Points de Tâche', this.system.points_de_tache, !this.system.cacher_points_de_tache),
      `<b>Points de Tâche atteints</b>: ${this.system.points_de_tache_courant}`]
  }
  /* -------------------------------------------- */
@ -806,7 +806,7 @@ export class RdDItem extends Item {
      `<b>Compétence</b>: ${this.system.competence}`,
      `<b>Auteur</b>: ${this.system.auteur}`,
      `<b>Difficulté</b>: ${this.system.difficulte}`,
-      RdDItem.propertyIfDefined('Points de Tâche', this.system.points_de_tache, this.system.cacher_points_de_tache),
+      RdDItem.propertyIfDefined('Points de Tâche', this.system.points_de_tache, !this.system.cacher_points_de_tache),
      ...this._inventaireTemplateChatData()
    ]
  }
--- a/module/item/blessure.js
+++ b/module/item/blessure.js
@ -115,7 +115,10 @@ export class RdDItemBlessure extends RdDItem {
        if (!isMaladeEmpoisonne && rolled.isSuccess && this.peutRetrograder(graviteMoindre, moindres)) {
          message.content += ` -- une blessure ${label} cicatrise`;
          mergeObject(update, {
-            system: { gravite: graviteMoindre, fin: { indexDate: timestamp.addJours(graviteMoindre).indexDate } }
+            system: {
+              gravite: graviteMoindre,
+              temporel: { fin: { indexDate: timestamp.addJours(graviteMoindre).indexDate } }
+            }
          });
        }
        else {
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@ -518,7 +518,7 @@ export class RdDCombat {
    let token = canvas.tokens.placeables.find(t => t.id == tokenId)
    const actor = token?.actor ?? game.actors.get(actorId);
    if (actor?.isOwner) {
-      actor.jetVie();
+      actor.jetDeVie();
    }
  }

--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@ -16,6 +16,7 @@ import { RdDDice } from "./rdd-dice.js";
 import { STATUSES } from "./settings/status-effects.js";
 import { RdDRencontre } from "./item/rencontre.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
+import { TYPES } from "./item.js";

 /* -------------------------------------------- */

@ -62,8 +63,8 @@ export class RdDTMRDialog extends Dialog {
    this.loadCasesSpeciales();
    this.allTokens = [];
    this.rencontreState = 'aucune';
-    this.pixiApp = new PIXI.Application({ width: 720, height: 860 });
-    this.pixiTMR = new PixiTMR(this, this.pixiApp);
+    this.pixiTMR = new PixiTMR(this);
+
    this.subdialog = undefined

    this.callbacksOnAnimate = [];
@ -110,11 +111,11 @@ export class RdDTMRDialog extends Dialog {
  }

  get sortsReserve() {
-    return this.actor.itemTypes['sortreserve'];
+    return this.actor.itemTypes[TYPES.sortreserve];
  }

  getSortsReserve(coord) {
-    return this.actor.itemTypes['sortreserve'].filter(// Reserve sur une case fleuve ou normale
+    return this.actor.itemTypes[TYPES.sortreserve].filter(// Reserve sur une case fleuve ou normale
      TMRUtility.getTMR(coord).type == 'fleuve'
        ? it => TMRUtility.getTMR(it.system.coord).type == 'fleuve'
        : it => it.system.coord == coord
@ -128,7 +129,7 @@ export class RdDTMRDialog extends Dialog {

  /* -------------------------------------------- */
  createPixiSprites() {
-    EffetsDraconiques.carteTmr.createSprite(this.pixiTMR);
+    this.pixiTMR.setup()
    this.updateTokens();
    this.forceDemiRevePositionView();
  }
@ -139,13 +140,9 @@ export class RdDTMRDialog extends Dialog {
      this.demiReve = this._tokenDemiReve();
      this._trackToken(this.demiReve);
    }
-    let tokens = this._getTokensCasesTmr()
-      .concat(this._getTokensRencontres())
-      .concat(this._getTokensSortsReserve());
-
-    for (let t of tokens) {
-      this._trackToken(t);
-    }
+    this._getTokensCasesTmr().forEach(t => this._trackToken(t))
+    this._getTokensRencontres().forEach(t => this._trackToken(t))
+    this._getTokensSortsReserve().forEach(t => this._trackToken(t))
  }

  /* -------------------------------------------- */
@ -170,7 +167,7 @@ export class RdDTMRDialog extends Dialog {
    return this.rencontresExistantes.map(it => this._tokenRencontre(it));
  }
  _getTokensSortsReserve() {
-    return this.actor.itemTypes['sortreserve'].map(it => this._tokenSortEnReserve(it));
+    return this.actor.itemTypes[TYPES.sortreserve].map(it => this._tokenSortEnReserve(it));
  }

  /* -------------------------------------------- */
@ -204,6 +201,7 @@ export class RdDTMRDialog extends Dialog {
    if (this.subdialog) {
      return this.forceTMRContinueAction();
    }
+
    let oddq = TMRUtility.coordTMRToOddq(this._getActorCoord());

    if (move == 'top') oddq.row -= 1;
@ -230,7 +228,8 @@ export class RdDTMRDialog extends Dialog {

    document.getElementsByClassName("tmr-row")
      .item(0)
-      .insertCell(0).append(this.pixiApp.view);
+      .insertCell(0)
+      .append(this.pixiTMR.view);

    if (this.viewOnly) {
      this.html.find('.lancer-sort').remove();
@ -241,24 +240,17 @@ export class RdDTMRDialog extends Dialog {
    HtmlUtility.showControlWhen(this.html.find(".appliquerFatigue"), ReglesOptionnelles.isUsing("appliquer-fatigue"));
    HtmlUtility.showControlWhen(this.html.find(".lire-signe-draconique"), this.actor.isResonanceSigneDraconique(this._getActorCoord()));

-    this.html.find('tr.tmr-row *').click((event) => {
-      this.subdialog?.bringToTop();
-    });
+    this.html.find('tr.tmr-row *').click(event => this.subdialog?.bringToTop());

    // Roll Sort
-    this.html.find('.lancer-sort').click((event) => {
-      this.actor.rollUnSort(this._getActorCoord());
-    });
-    this.html.find('.lire-signe-draconique').click((event) => {
-      this.actor.rollLireSigneDraconique(this._getActorCoord());
-    });
-
-    this.html.find('#dir-top').click((event) => this.moveFromKey("top"));
-    this.html.find('#dir-top-left').click((event) => this.moveFromKey("top-left"));
-    this.html.find('#dir-top-right').click((event) => this.moveFromKey("top-right"));
-    this.html.find('#dir-bottom-left').click((event) => this.moveFromKey("bottom-left"));
-    this.html.find('#dir-bottom-right').click((event) => this.moveFromKey("bottom-right"));
-    this.html.find('#dir-bottom').click((event) => this.moveFromKey("bottom"));
+    this.html.find('.lancer-sort').click(event => this.actor.rollUnSort(this._getActorCoord()));
+    this.html.find('.lire-signe-draconique').click(event => this.actor.rollLireSigneDraconique(this._getActorCoord()));
+    this.html.find('#dir-top').click(event=> this.moveFromKey("top"));
+    this.html.find('#dir-top-left').click(event=> this.moveFromKey("top-left"));
+    this.html.find('#dir-top-right').click(event=> this.moveFromKey("top-right"));
+    this.html.find('#dir-bottom-left').click(event=> this.moveFromKey("bottom-left"));
+    this.html.find('#dir-bottom-right').click(event=> this.moveFromKey("bottom-right"));
+    this.html.find('#dir-bottom').click(event=> this.moveFromKey("bottom"));

    // Gestion du cout de montée en points de rêve
    let reveCout = ((this.tmrdata.isRapide && !EffetsDraconiques.isDeplacementAccelere(this.actor)) ? -2 : -1) - this.actor.countMonteeLaborieuse();
@ -382,19 +374,8 @@ export class RdDTMRDialog extends Dialog {

  /* -------------------------------------------- */
  $marquerCasesTMR(listCoordTMR) {
-    this.currentRencontre.graphics = []; // Keep track of rectangles to delete it
    this.currentRencontre.locList = duplicate(listCoordTMR); // And track of allowed location
-    for (let coordTMR of listCoordTMR) {
-      const rect = this._getCaseRectangleCoord(coordTMR);
-      const rectDraw = new PIXI.Graphics();
-      rectDraw.beginFill(0xffff00, 0.3);
-      // set the line style to have a width of 5 and set the color to red
-      rectDraw.lineStyle(5, 0xff0000);
-      // draw a rectangle
-      rectDraw.drawRect(rect.x, rect.y, rect.w, rect.h);
-      this.pixiApp.stage.addChild(rectDraw);
-      this.currentRencontre.graphics.push(rectDraw); // garder les objets pour gestion post-click
-    }
+    this.currentRencontre.graphics = listCoordTMR.map(coordTMR => this.pixiTMR.addMarkTMR(coordTMR))
  }

  /* -------------------------------------------- */
@ -907,15 +888,11 @@ export class RdDTMRDialog extends Dialog {

  /* -------------------------------------------- */
  nettoyerRencontre() {
-    if (!this.currentRencontre) return; // Sanity check
-    if (this.currentRencontre.graphics) {
-      for (let drawRect of this.currentRencontre.graphics) {
-        // Suppression des dessins des zones possibles
-        this.pixiApp.stage.removeChild(drawRect);
-      }
-    }
-    this.currentRencontre = undefined; // Nettoyage de la structure
-    this.rencontreState = 'aucune'; // Et de l'état
+    // Suppression des dessins des zones possibles
+    this.currentRencontre?.graphics?.forEach(graphic => this.pixiTMR.removeGraphic(graphic))
+    // Nettoyage de la structureet de l'état
+    this.currentRencontre = undefined;
+    this.rencontreState = 'aucune';
  }

  /* -------------------------------------------- */
@ -1106,18 +1083,10 @@ export class RdDTMRDialog extends Dialog {
    await this.postRencontre(tmr);
    return tmr;
  }
-  /* -------------------------------------------- */
-  /** Retourne les coordonnées x, h, w, h du rectangle d'une case donnée */
-  _getCaseRectangleCoord(coord) {
-    return this.pixiTMR.getCaseRectangle(TMRUtility.coordTMRToOddq(coord));
-  }

  /* -------------------------------------------- */
  _removeTokens(filter) {
-    const tokensToRemove = this.allTokens.filter(filter);
-    for (let token of tokensToRemove) {
-      this.pixiApp.stage.removeChild(token.sprite);
-    }
+    this.allTokens.filter(filter).forEach(token => this.pixiTMR.removeToken(token))
  }

  /* -------------------------------------------- */
@ -1125,7 +1094,9 @@ export class RdDTMRDialog extends Dialog {
    if (this.demiReve === token && this.isDemiReveCache()) {
      return;
    }
-    this.pixiTMR.setPosition(token.sprite, TMRUtility.coordTMRToOddq(token.coordTMR()));
-    this.allTokens.push(token);
+    this.pixiTMR.positionToken(token);
+    if (!this.allTokens.includes(token)) {
+      this.allTokens.push(token);
+    }
  }
 }
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@ -289,7 +289,8 @@ export class RdDUtility {
    Handlebars.registerHelper('uniteQuantite', (itemId, actorId) => RdDUtility.getItem(itemId, actorId)?.getUniteQuantite());
    Handlebars.registerHelper('isFieldInventaireModifiable', (type, field) => RdDItem.isFieldInventaireModifiable(type, field));
    Handlebars.registerHelper('rarete-getChamp', (rarete, field) => RdDRaretes.getChamp(rarete, field));
-
+    
+    Handlebars.registerHelper('plusMoins', diff => (diff > 0 ? '+' : '') + Math.round(diff))
    Handlebars.registerHelper('experienceLog-topic', topic => ExperienceLog.labelTopic(topic));

    return loadTemplates(templatePaths);
--- 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.globalLight && scene.tokenVision) {
+      if (scene?.globalLight && scene?.tokenVision) {
        await scene.update({ darkness });
      }
    }
--- a/module/tmr/carte-tmr.js
+++ b/module/tmr/carte-tmr.js
@ -1,3 +1,4 @@
+import { TMRUtility } from "../tmr-utility.js";
 import { Draconique } from "./draconique.js";
 import { PixiTMR } from "./pixi-tmr.js";

@ -16,7 +17,6 @@ export class CarteTmr extends Draconique {
  img() { return 'systems/foundryvtt-reve-de-dragon/styles/img/ui/tmr.webp' }

  createSprite(pixiTMR) {
-
    const img = PixiTMR.getImgFromCode(this.code())
    const sprite = new PIXI.Sprite(PIXI.utils.TextureCache[img]);
    // Setup the position of the TMR
@ -28,10 +28,12 @@ export class CarteTmr extends Draconique {
    sprite.anchor.set(0);
    sprite.buttonMode = true;
    sprite.tmrObject = pixiTMR;
-
-    pixiTMR.addTooltip(sprite, (e,s) => this.computeTooltip(e,s));
-    pixiTMR.pixiApp.stage.addChild(sprite);
    return sprite;
  }

+  computeTooltip(coordTMR) {
+    const tmr = TMRUtility.getTMR(coordTMR)
+    return tmr? TMRUtility.getTMRLabel(coordTMR) : '';
+  }
+
 }
--- a/module/tmr/draconique.js
+++ b/module/tmr/draconique.js
@ -86,15 +86,13 @@ export class Draconique {
   * @param {*} pixiTMR instance de PixiTMR qui gère les tooltips, les méthodes de création de sprite standard, les clicks.
  */
  token(pixiTMR, linkData, coordTMR, type = undefined) {
+    const tooltip = this.tooltip(linkData);
    const token = {
      sprite: this.createSprite(pixiTMR),
-      coordTMR: coordTMR
+      coordTMR: coordTMR,
+      tooltip: tooltip
    };
    token[type ?? this.code()] = linkData;
-    this.linkData = linkData;
-    if (this.tooltip(linkData)) {
-      pixiTMR.addTooltip(token.sprite, (e, s) => this.computeTooltip(e, s));
-    }
    return token;
  }

--- a/module/tmr/pixi-tmr.js
+++ b/module/tmr/pixi-tmr.js
@ -1,6 +1,8 @@
+import { Misc } from "../misc.js";
 import { RdDTMRDialog } from "../rdd-tmr-dialog.js";
 import { tmrConstants, tmrTokenZIndex } from "../tmr-constants.js";
 import { TMRUtility } from "../tmr-utility.js";
+import { EffetsDraconiques } from "./effets-draconiques.js";

 export const tooltipStyle = new PIXI.TextStyle({
  fontFamily: 'CaslonAntique',
@ -15,11 +17,35 @@ export class PixiTMR {

  static textures = []

-  constructor(tmrObject, pixiApp) {
-    this.tmrObject = tmrObject;
-    this.pixiApp = pixiApp ?? tmrObject.pixiApp;
-    this.pixiApp.stage.sortableChildren = true;
+  constructor(tmrDialog) {
+    this.tmrDialog = tmrDialog;
+
    this.callbacksOnAnimate = [];
+
+    this.pixiApp = new PIXI.Application({ width: 720, height: 860 });
+    this.pixiApp.eventMode = 'static';
+    this.pixiApp.stage.sortableChildren = true;
+    this.tooltip = new PIXI.Text('', tooltipStyle);
+    this.tooltip.zIndex = 1000
+
+    this.pixiApp.stage.addChild(this.tooltip);
+
+  }
+
+  get view() {
+    return this.pixiApp.view
+  }
+
+  setup() {
+    this.carteTMR = EffetsDraconiques.carteTmr.createSprite(this);
+    this.pixiApp.stage.addChild(this.carteTMR);
+    this.carteTMR.isOver = false;
+    this.carteTMR.eventMode = 'static';
+    this.carteTMR
+      .on('pointermove', event => this.onPointerMove(event))
+      .on('pointerdown', event => this.onClickBackground(event))
+      .on('pointerover', event => this.onShowTooltip(event))
+      .on('pointerout', event => this.onHideTooltip(event));
  }

  async load(onLoad = (loader, resources) => { }) {
@ -46,6 +72,22 @@ export class PixiTMR {
    this.callbacksOnAnimate.push(() => animation(this.pixiApp));
  }

+  addMarkTMR(coordTMR) {
+    const rect = this.getCaseRectangle(TMRUtility.coordTMRToOddq(coordTMR))
+    const markTMR = new PIXI.Graphics();
+    markTMR.beginFill(0xffff00, 0.3);
+    // set the line style to have a width of 5 and set the color to red
+    markTMR.lineStyle(5, 0xff0000);
+    // draw a rectangle
+    markTMR.drawRect(rect.x, rect.y, rect.w, rect.h);
+    this.pixiApp.stage.addChild(markTMR);
+    return markTMR
+  }
+
+  removeGraphic(graphic) {
+    this.pixiApp.stage.removeChild(graphic);
+  }
+
  sprite(code, options = {}) {
    let img = PixiTMR.getImgFromCode(code)
    const texture = PIXI.utils.TextureCache[img];
@ -67,7 +109,7 @@ export class PixiTMR {
    return sprite;
  }

-  circle(name, options = {}) {
+  circle(code, options = {}) {
    let sprite = new PIXI.Graphics();
    sprite.beginFill(options.color, options.opacity);
    sprite.drawCircle(0, 0, (options.taille ?? 12) / 2);
@ -77,63 +119,76 @@ export class PixiTMR {
    return sprite;
  }

-  addTooltip(sprite, computeTooltip) {
-    sprite.tooltip = new PIXI.Text('', tooltipStyle);
-    sprite.tooltip.zIndex = tmrTokenZIndex.tooltip;
-    sprite.isOver = false;
-    sprite.eventMode = 'static';
-    sprite
-      .on('pointermove', event => this.onPointerMove(event, sprite, computeTooltip))
-      .on('pointerdown', event => this.onClickBackground(event))
-      .on('pointerover', event => this.onShowTooltip(event, sprite))
-      .on('pointerout', event => this.onHideTooltip(event, sprite));
-  }
-
  onClickBackground(event) {
    if (!this.viewOnly) {
-      this.tmrObject.onClickTMR(event)
+      this.tmrDialog.onClickTMR(event)
    }
  }

-  onPointerMove(event, sprite, computeTooltip) {
-    if (sprite.isOver && sprite.tooltip) {
-      var { x, y } = TMRUtility.computeEventPosition(event);
-      const oddq = TMRUtility.computeOddq(x, y);
+  onPointerMove(event) {
+    if (this.carteTMR.isOver) {
+      this.setTooltipPosition(event);
+      this.tooltip.text = this.computeTooltip(event);
+    }
+  }
+  
+  onShowTooltip(event) {
+    if (!this.carteTMR.isOver) {
+      this.setTooltipPosition(event);
+      this.pixiApp.stage.addChild(this.tooltip);
+      this.tooltip.text = this.computeTooltip(event);
+    }
+    this.carteTMR.isOver = true;
+  }

-      sprite.tooltip.x = x + (oddq.col > 8 ? - 3 * tmrConstants.full : tmrConstants.half)
-      sprite.tooltip.y = y + (oddq.row > 10 ? - tmrConstants.half : tmrConstants.half)
-      sprite.tooltip.text = computeTooltip(event, sprite);
+  onHideTooltip(event) {
+    if (this.carteTMR.isOver) {
+      this.pixiApp.stage.removeChild(this.tooltip);
+    }
+    this.carteTMR.isOver = false;
+  }
+
+  computeTooltip(event) {
+    const oddq = TMRUtility.computeEventOddq(event);
+    const coordTMR = TMRUtility.oddqToCoordTMR(oddq);
+    const tmr = TMRUtility.getTMR(coordTMR)
+    if (tmr) {
+      const labelTMR = TMRUtility.getTMRLabel(coordTMR);
+      const tokenTooltips = this.tmrDialog.allTokens
+        .filter(token => token.coordTMR() == coordTMR)
+        .map(token => token.tooltip);
+      const tmrTooltip = `${coordTMR}: ${labelTMR}`;
+      return [tmrTooltip, ...tokenTooltips].reduce(Misc.joining('\n'))
    }
  }

-  onShowTooltip(event, sprite) {
-    if (sprite.tooltip) {
-      if (!sprite.isOver) {
-        sprite.tooltip.x = sprite.x;
-        sprite.tooltip.y = sprite.y;
-        this.pixiApp.stage.addChild(sprite.tooltip);
-      }
-      sprite.isOver = true;
+  setTooltipPosition(event) {
+    var { x, y } = TMRUtility.computeEventPosition(event);
+    const oddq = TMRUtility.computeOddq(x, y);
+
+    this.tooltip.x = x + (oddq.col > 8 ? -3 * tmrConstants.full : tmrConstants.half);
+    this.tooltip.y = y + (oddq.row > 10 ? -tmrConstants.half : tmrConstants.half);
+  }
+
+  positionToken(token) {
+    if (token.sprite) {
+      const sprite = token.sprite;
+      const oddq = TMRUtility.coordTMRToOddq(token.coordTMR());
+
+      const decallagePairImpair = (oddq.col % 2 == 0) ? tmrConstants.col1_y : tmrConstants.col2_y;
+      const dx = (sprite.decallage == undefined) ? 0 : sprite.decallage.x;
+      const dy = (sprite.decallage == undefined) ? 0 : sprite.decallage.y;
+      sprite.x = tmrConstants.gridx + (oddq.col * tmrConstants.cellw) + dx;
+      sprite.y = tmrConstants.gridy + (oddq.row * tmrConstants.cellh) + dy + decallagePairImpair;
    }
  }

-  onHideTooltip(event, sprite) {
-    if (sprite.tooltip) {
-      if (sprite.isOver) {
-        this.pixiApp.stage.removeChild(sprite.tooltip);
-      }
-      sprite.isOver = false;
+  removeToken(token) {
+    if (token.sprite) {
+      this.pixiApp.stage.removeChild(token.sprite)
    }
  }

-  setPosition(sprite, oddq) {
-    let decallagePairImpair = (oddq.col % 2 == 0) ? tmrConstants.col1_y : tmrConstants.col2_y;
-    let dx = (sprite.decallage == undefined) ? 0 : sprite.decallage.x;
-    let dy = (sprite.decallage == undefined) ? 0 : sprite.decallage.y;
-    sprite.x = tmrConstants.gridx + (oddq.col * tmrConstants.cellw) + dx;
-    sprite.y = tmrConstants.gridy + (oddq.row * tmrConstants.cellh) + dy + decallagePairImpair;
-  }
-
  getCaseRectangle(oddq) {
    let decallagePairImpair = (oddq.col % 2 == 0) ? tmrConstants.col1_y : tmrConstants.col2_y;
    let x = tmrConstants.gridx + (oddq.col * tmrConstants.cellw) - (tmrConstants.cellw / 2);
--- a/module/tmr/reserve-extensible.js
+++ b/module/tmr/reserve-extensible.js
@ -13,8 +13,8 @@ export class ReserveExtensible extends Draconique {
  manualMessage() { return "Vous pouvez re-configurer votre Réserve extensible" }
  async onActorCreateOwned(actor, tete) {
    const existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
-    const tmr = await TMRUtility.getTMRAleatoire(it => !(it.type == 'fleuve' || existants.includes(it.system.coord)));
-    await this.createCaseTmr(actor, "Nouvelle Réserve extensible", tmr, tete.id);
+    const selectedTMR = await TMRUtility.getTMRAleatoire(tmr => !(tmr.type == 'fleuve' || existants.includes(tmr.coord)));
+    await this.createCaseTmr(actor, "Nouvelle Réserve extensible", selectedTMR, tete.id);
  }

  code() { return 'reserve_extensible' }
--- a/module/tmr/trou-noir.js
+++ b/module/tmr/trou-noir.js
@ -14,8 +14,8 @@ export class TrouNoir extends Draconique {

  async onActorCreateOwned(actor, souffle) {
    const existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
-    const tmr = await TMRUtility.getTMRAleatoire(it => !(TMRUtility.isCaseHumide(it) || existants.includes(it.system.coord)));
-    await this.createCaseTmr(actor, 'Trou noir: ' + tmr.label, tmr, souffle.id);
+    const selectedTMR = await TMRUtility.getTMRAleatoire(tmr => !(TMRUtility.isCaseHumide(tmr) || existants.includes(tmr.coord)));
+    await this.createCaseTmr(actor, 'Trou noir: ' + selectedTMR.label, selectedTMR, souffle.id);
  }

  code() { return 'trounoir' }
--- a/module/tmr/urgence-draconique.js
+++ b/module/tmr/urgence-draconique.js
@ -8,15 +8,11 @@ import { Draconique } from "./draconique.js";

 export class UrgenceDraconique extends Draconique {

-  constructor() {
-    super();
-  }
-
  type() { return 'queue' }
  match(item) { return Draconique.isQueueDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('urgence draconique'); }
  manualMessage() { return false }
  async onActorCreateOwned(actor, queue) {
-    const coordSortsReserve = (actor.system.reve.reserve?.list.map(it => it.coord)) ?? [];
+    const coordSortsReserve = actor.itemTypes[TYPES.sortreserve].map(it => it.system.coord) ?? [];
    if (coordSortsReserve.length == 0) {
      // La queue se transforme en idée fixe
      const ideeFixe = await RdDRollTables.getIdeeFixe();
@ -26,7 +22,6 @@ export class UrgenceDraconique extends Draconique {
      });
      await actor.createEmbeddedDocuments('Item', [ideeFixe]);
      await actor.deleteEmbeddedDocuments('Item', [queue.id]);
-      return;
    }
    else {
      const demiReve = actor.getDemiReve();
--- a/packs/invocations.db
+++ b/packs/invocations.db
--- a/packs/macros.db
+++ b/packs/macros.db
@ -1,13 +1,14 @@
-{"name":"Jet de moral","type":"script","author":"Hp9ImM4o9YRTSdfu","img":"icons/magic/control/mouth-smile-deception-purple.webp","scope":"global","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (!selected) {\n  ui.notifications.info('Pas de personnage sélectionné');\n  return;\n}\n\nconst dialogMoral = new Dialog({\n  title: `Jet de moral`,\n  content: `Jet de moral en situation`,\n  buttons: {\n    malheureuse: { label: `malheureuse`, icon: \"<i class='fa-regular fa-face-frown'></i>\", callback: () => selected.jetDeMoral('malheureuse') },\n    neutre: { label: `neutre`, icon: \"<i class='fa-regular fa-face-meh'></i>\", callback: () => selected.jetDeMoral('neutre') },\n    heureuse: { label: `heureuse`, icon: \"<i class='fa-regular fa-face-smile'></i>\", callback: () => selected.jetDeMoral('heureuse') }\n  },\n});\n\ndialogMoral.render(true)","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.aJ0QGnXAXT0WiXbk"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.15","coreVersion":"10.291","createdTime":1671235038906,"modifiedTime":1671236054480,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"2VvH2rmxV33jGjMU"}
-{"name":"Repos","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"icons/svg/sleep.svg","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (selected) {\n  selected.repos();\n}\nelse {\n  ui.notifications.info('Pas de personnage sélectionné');\n}","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.XHNbjnGKXaCiCadq"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.15","coreVersion":"10.291","createdTime":1671220038331,"modifiedTime":1671234271278,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"6LRZ8DOVfqotIEsi"}
-{"name":"Météo marine","type":"chat","author":"Hp9ImM4o9YRTSdfu","img":"icons/magic/air/wind-weather-sailing-ship.webp","scope":"global","command":"/meteo","flags":{"core":{"sourceId":"Macro.EPhCYk7PFMPlIFhS"}},"ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.15","coreVersion":"10.291","createdTime":1671237060687,"modifiedTime":1671237060687,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"9mYZfKoi4ZYHydxa"}
-{"name":"Chuchoter aux joueurs","type":"script","author":"Hp9ImM4o9YRTSdfu","img":"icons/svg/deaf.svg","scope":"global","command":"/** \n * Provides a dialog to whisper specific players. If you have tokens selected, it will automatically default to try and whisper those players.\n * @Author: Nelson#3570\n */\n\nlet applyChanges = false;\n\nlet users = game.users.filter(user => user.active);\nlet checkOptions = \"\"\nlet playerTokenIds = users.map(u => u.character?.id).filter(id => id !== undefined);\nlet selectedPlayerIds = canvas.tokens.controlled.map(token => {\n  if (playerTokenIds.includes(token.actor.id)) return token.actor.id;\n});\n\n// Build checkbox list for all active players\nusers.forEach(user => {\n  let checked = !!user.character && selectedPlayerIds.includes(user.character.id) && 'checked';\n  checkOptions+=`\n    <br>\n    <input type=\"checkbox\" name=\"${user.id}\" id=\"${user.id}\" value=\"${user.name}\" ${checked}>\\n\n    <label for=\"${user.id}\">${user.name}</label>\n  `\n});\n\nnew Dialog({\n  title:\"Whisper\",\n  content:`Whisper To: ${checkOptions} <br>\n    <label for=\"message\">Message:</label>\n    <textarea id=\"message\" name=\"message\" rows=\"4\" cols=\"50\"></textarea><br>`,\n  buttons:{\n    whisper:{   \n      label:\"Whisper\",\n      callback: (html) => createMessage(html)\n    }\n  }\n}).render(true);\n\nfunction createMessage(html) {\n  var targets = [];\n  // build list of selected players ids for whispers target\n  for ( let user of users ) {\n    if (html.find('[name=\"'+user.id+'\"]')[0].checked){\n      applyChanges=true;\n      targets.push(user.id);\n    }\n    var messageText = html.find('[name=\"message\"]')[0].value\n  }\nif(!applyChanges)return;\n  ChatMessage.create({\n    content: messageText,\n    whisper: targets\n  });\n}","flags":{"core":{"sourceId":"Compendium.foundry_community_macros.community-macros-misc.QTDeg4HOYCAmr4dK"}},"ownership":{"default":2,"Hp9ImM4o9YRTSdfu":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.15","coreVersion":"10.291","createdTime":1671237211578,"modifiedTime":1671237211578,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"ALAVJEEP3iJosOoi"}
-{"name":"Terres médianes du rêve","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-normal.svg","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (!selected) {\n  ui.notifications.info('Pas de personnage sélectionné');\n  return;\n}\nif (!selected.isHautRevant()) {\n  ui.notifications.info(`Le personnage ${selected.name} n'a pas le don de haut-rêve`);\n  return;\n}\n\nconst dialogMoral = new Dialog({\n  title: `Monter dans les TMR`,\n  content: `Monter dans les TMR`,\n  buttons: {\n    normale: { label: `normale`, icon: `<img class=\"button-img\" src=\"systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-normal.svg\" alt=\"Montée dans les Terres M&eacute;dianes !\"/>`, callback: () => selected.displayTMR(\"normal\") },\n    rapide: { label: `rapide`, icon: `<img class=\"button-img\" src=\"systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-rapide.svg\" alt=\"Montée accélérée dans les Terres M&eacute;dianes !\"/>`, callback: () => selected.displayTMR(\"rapide\") },\n  },\n});\n\ndialogMoral.render(true)","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.zCAQxg2duk0j3s5r"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.15","coreVersion":"10.291","createdTime":1669250715114,"modifiedTime":1671236057731,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"ERsBfwsodzH6UX4x"}
-{"name":"Signe draconique","type":"chat","author":"Hp9ImM4o9YRTSdfu","img":"systems/foundryvtt-reve-de-dragon/icons/tmr/signe_draconique.webp","scope":"global","command":"/signe +","flags":{"core":{"sourceId":"Macro.RmOLbONUNnINcqCO"}},"ownership":{"default":0,"klwAm8zAKxw8YBLf":3,"Hp9ImM4o9YRTSdfu":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.15","coreVersion":"10.291","createdTime":1671237375774,"modifiedTime":1671237375774,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"MJByzsEdneZ64P56"}
-{"name":"Appel à la chance","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"icons/commodities/flowers/clover.webp","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (selected) {\n   selected.rollAppelChance();\n}\nelse {\n  ui.notifications.info('Pas de personnage sélectionné');\n}","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.XHNbjnGKXaCiCadq"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.15","coreVersion":"10.291","createdTime":1671220038331,"modifiedTime":1671233849101,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"UzAWljmFq5sY702w"}
-{"name":"Encaissement","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"icons/svg/bones.svg","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (selected) {\n   selected.encaisser();\n}\nelse {\n  ui.notifications.info('Pas de personnage sélectionné');\n}","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.XHNbjnGKXaCiCadq"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.15","coreVersion":"10.291","createdTime":1671220038331,"modifiedTime":1671234017623,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"WD6T8AdRbX2Ylxqe"}
-{"name":"Jet quelconque","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"icons/sundries/gaming/dice-runed-tan.webp","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (selected) {\n   selected.roll();\n}\nelse {\n  ui.notifications.info('Pas de personnage sélectionné');\n}","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.XHNbjnGKXaCiCadq"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.15","coreVersion":"10.291","createdTime":1671220038331,"modifiedTime":1671233500655,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"bnJnbKDHpbqY8Pr9"}
+{"name":"Jet de moral","type":"script","author":"Hp9ImM4o9YRTSdfu","img":"icons/magic/control/mouth-smile-deception-purple.webp","scope":"global","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (!selected) {\n  ui.notifications.info('Pas de personnage sélectionné');\n  return;\n}\n\nconst dialogMoral = new Dialog({\n  title: `Jet de moral`,\n  content: `Jet de moral en situation`,\n  buttons: {\n    malheureuse: { label: `malheureuse`, icon: \"<i class='fa-regular fa-face-frown'></i>\", callback: () => selected.jetDeMoral('malheureuse') },\n    neutre: { label: `neutre`, icon: \"<i class='fa-regular fa-face-meh'></i>\", callback: () => selected.jetDeMoral('neutre') },\n    heureuse: { label: `heureuse`, icon: \"<i class='fa-regular fa-face-smile'></i>\", callback: () => selected.jetDeMoral('heureuse') }\n  },\n});\n\ndialogMoral.render(true)","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.aJ0QGnXAXT0WiXbk"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"11.1.0","coreVersion":"10.291","createdTime":1671235038906,"modifiedTime":1671236054480,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"2VvH2rmxV33jGjMU"}
+{"name":"Repos","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"icons/svg/sleep.svg","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (selected) {\n  selected.repos();\n}\nelse {\n  ui.notifications.info('Pas de personnage sélectionné');\n}","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.XHNbjnGKXaCiCadq"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"11.1.0","coreVersion":"10.291","createdTime":1671220038331,"modifiedTime":1671234271278,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"6LRZ8DOVfqotIEsi"}
+{"name":"Météo marine","type":"chat","author":"Hp9ImM4o9YRTSdfu","img":"icons/magic/air/wind-weather-sailing-ship.webp","scope":"global","command":"/meteo","flags":{"core":{"sourceId":"Macro.EPhCYk7PFMPlIFhS"}},"ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"11.1.0","coreVersion":"10.291","createdTime":1671237060687,"modifiedTime":1671237060687,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"9mYZfKoi4ZYHydxa"}
+{"name":"Chuchoter aux joueurs","type":"script","author":"Hp9ImM4o9YRTSdfu","img":"icons/svg/deaf.svg","scope":"global","command":"/** \n * Provides a dialog to whisper specific players. If you have tokens selected, it will automatically default to try and whisper those players.\n * @Author: Nelson#3570\n */\n\nlet applyChanges = false;\n\nlet users = game.users.filter(user => user.active);\nlet checkOptions = \"\"\nlet playerTokenIds = users.map(u => u.character?.id).filter(id => id !== undefined);\nlet selectedPlayerIds = canvas.tokens.controlled.map(token => {\n  if (playerTokenIds.includes(token.actor.id)) return token.actor.id;\n});\n\n// Build checkbox list for all active players\nusers.forEach(user => {\n  let checked = !!user.character && selectedPlayerIds.includes(user.character.id) && 'checked';\n  checkOptions+=`\n    <br>\n    <input type=\"checkbox\" name=\"${user.id}\" id=\"${user.id}\" value=\"${user.name}\" ${checked}>\\n\n    <label for=\"${user.id}\">${user.name}</label>\n  `\n});\n\nnew Dialog({\n  title:\"Whisper\",\n  content:`Whisper To: ${checkOptions} <br>\n    <label for=\"message\">Message:</label>\n    <textarea id=\"message\" name=\"message\" rows=\"4\" cols=\"50\"></textarea><br>`,\n  buttons:{\n    whisper:{   \n      label:\"Whisper\",\n      callback: (html) => createMessage(html)\n    }\n  }\n}).render(true);\n\nfunction createMessage(html) {\n  var targets = [];\n  // build list of selected players ids for whispers target\n  for ( let user of users ) {\n    if (html.find('[name=\"'+user.id+'\"]')[0].checked){\n      applyChanges=true;\n      targets.push(user.id);\n    }\n    var messageText = html.find('[name=\"message\"]')[0].value\n  }\nif(!applyChanges)return;\n  ChatMessage.create({\n    content: messageText,\n    whisper: targets\n  });\n}","flags":{"core":{"sourceId":"Compendium.foundry_community_macros.community-macros-misc.QTDeg4HOYCAmr4dK"}},"ownership":{"default":2,"Hp9ImM4o9YRTSdfu":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"11.1.0","coreVersion":"10.291","createdTime":1671237211578,"modifiedTime":1671237211578,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"ALAVJEEP3iJosOoi"}
+{"name":"Terres médianes du rêve","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-normal.svg","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (!selected) {\n  ui.notifications.info('Pas de personnage sélectionné');\n  return;\n}\nif (!selected.isHautRevant()) {\n  ui.notifications.info(`Le personnage ${selected.name} n'a pas le don de haut-rêve`);\n  return;\n}\n\nconst dialogMoral = new Dialog({\n  title: `Monter dans les TMR`,\n  content: `Monter dans les TMR`,\n  buttons: {\n    normale: { label: `normale`, icon: `<img class=\"button-img\" src=\"systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-normal.svg\" alt=\"Montée dans les Terres M&eacute;dianes !\"/>`, callback: () => selected.displayTMR(\"normal\") },\n    rapide: { label: `rapide`, icon: `<img class=\"button-img\" src=\"systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-rapide.svg\" alt=\"Montée accélérée dans les Terres M&eacute;dianes !\"/>`, callback: () => selected.displayTMR(\"rapide\") },\n  },\n});\n\ndialogMoral.render(true)","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.zCAQxg2duk0j3s5r"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"11.1.0","coreVersion":"10.291","createdTime":1669250715114,"modifiedTime":1671236057731,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"ERsBfwsodzH6UX4x"}
+{"name":"Signe draconique","type":"chat","author":"Hp9ImM4o9YRTSdfu","img":"systems/foundryvtt-reve-de-dragon/icons/tmr/signe_draconique.webp","scope":"global","command":"/signe +","flags":{"core":{"sourceId":"Macro.RmOLbONUNnINcqCO"}},"ownership":{"default":0,"klwAm8zAKxw8YBLf":3,"Hp9ImM4o9YRTSdfu":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"11.1.0","coreVersion":"10.291","createdTime":1671237375774,"modifiedTime":1671237375774,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"MJByzsEdneZ64P56"}
+{"name":"Appel à la chance","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"icons/commodities/flowers/clover.webp","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (selected) {\n   selected.rollAppelChance();\n}\nelse {\n  ui.notifications.info('Pas de personnage sélectionné');\n}","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.XHNbjnGKXaCiCadq"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"11.1.0","coreVersion":"10.291","createdTime":1671220038331,"modifiedTime":1671233849101,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"UzAWljmFq5sY702w"}
+{"name":"Encaissement","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"icons/svg/bones.svg","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (selected) {\n   selected.encaisser();\n}\nelse {\n  ui.notifications.info('Pas de personnage sélectionné');\n}","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.XHNbjnGKXaCiCadq"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"11.1.0","coreVersion":"10.291","createdTime":1671220038331,"modifiedTime":1671234017623,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"WD6T8AdRbX2Ylxqe"}
+{"name":"Jet quelconque","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"icons/sundries/gaming/dice-runed-tan.webp","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (selected) {\n   selected.roll();\n}\nelse {\n  ui.notifications.info('Pas de personnage sélectionné');\n}","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.XHNbjnGKXaCiCadq"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"11.1.0","coreVersion":"10.291","createdTime":1671220038331,"modifiedTime":1671233500655,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"bnJnbKDHpbqY8Pr9"}
 {"name":"Recherche et tirage","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"icons/tools/scribal/magnifying-glass.webp","command":"game.system.rdd.commands.tirage()","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.ZFWPNdQBjQs9z0YW"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.5.4","coreVersion":"10.291","createdTime":1673472449426,"modifiedTime":1673655461651,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"iVZnxOxhCMpkvYh3"}
 {"name":"Thème astral","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"icons/magic/nature/symbol-moon-stars-white.webp","command":"game.system.rdd.AppAstrologie.create()","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.oA0HPFeFK6YMspAX"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.19","coreVersion":"10.291","createdTime":1678127868791,"modifiedTime":1678237392810,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"koqhiDJSGP4gQ4vf"}
-{"name":"Jet d'éthylisme","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"icons/consumables/drinks/alcohol-beer-stein-wooden-metal-brown.webp","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (selected) {\n   selected.jetEthylisme();\n}\nelse {\n  ui.notifications.info('Pas de personnage sélectionné');\n}","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.XHNbjnGKXaCiCadq"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.15","coreVersion":"10.291","createdTime":1671220038331,"modifiedTime":1671233646086,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"mvub1dRHNFmWjRr7"}
-{"name":"Tirer le tarot","type":"chat","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"systems/foundryvtt-reve-de-dragon/icons/tarots/dos-tarot.webp","command":"/tirer tarot","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.HBZSKR9OHCQbLcTC"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.15","coreVersion":"10.291","createdTime":1669469547231,"modifiedTime":1671237401618,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"vTfJTFYYiRu8X5LM"}
+{"name":"Jet d'éthylisme","type":"script","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"icons/consumables/drinks/alcohol-beer-stein-wooden-metal-brown.webp","command":"const selected = game.system.rdd.RdDUtility.getSelectedActor();\nif (selected) {\n   selected.jetEthylisme();\n}\nelse {\n  ui.notifications.info('Pas de personnage sélectionné');\n}","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.XHNbjnGKXaCiCadq"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"11.1.0","coreVersion":"10.291","createdTime":1671220038331,"modifiedTime":1671233646086,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"mvub1dRHNFmWjRr7"}
+{"name":"Tirer le tarot","type":"chat","scope":"global","author":"Hp9ImM4o9YRTSdfu","img":"systems/foundryvtt-reve-de-dragon/icons/tarots/dos-tarot.webp","command":"/tirer tarot","ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"flags":{"core":{"sourceId":"Macro.HBZSKR9OHCQbLcTC"}},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"11.1.0","coreVersion":"10.291","createdTime":1669469547231,"modifiedTime":1671237401618,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"vTfJTFYYiRu8X5LM"}
+{"name": "Mon personnage","type": "script","author": "Hp9ImM4o9YRTSdfu","img": "systems/foundryvtt-reve-de-dragon/icons/voyageurs/token_hr_dilettante.webp","scope": "global","command": "if (game.user.isGM) {\n  ui.notifications.warn(\"En tant que gardien, vous n'avez pas de personnage attitré\")\n  return\n}\nconst actor = game.users.get(game.userId)?.character\nif (!actor) {\n  ui.notifications.warn(\"Vous n'avez pas de personnage attitré\")\n  return\n}\nactor.sheet.render(true)","folder": null,"flags": {"core": {},"exportSource": {"world": "graine","system": "foundryvtt-reve-de-dragon","coreVersion": "11.313","systemVersion": "11.1.1"}},"_stats": {"systemId": "foundryvtt-reve-de-dragon","systemVersion": "11.1.1","coreVersion": "11.313","createdTime": 1699477824379,"modifiedTime": 1699485023429,"lastModifiedBy": "Hp9ImM4o9YRTSdfu"}}
--- a/packs/taches-courantes.db
+++ b/packs/taches-courantes.db
@ -1,3 +0,0 @@
-{"_id":"dlvK5Lks7WoSZ1Ko","name":"1er soins - Blessure critique","type":"tache","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.taches-courantes.dlvK5Lks7WoSZ1Ko"}},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_chirurgie.webp","effects":[],"system":{"description":"<p><span class=\"fontstyle0\">Effectuer les premiers soins consiste &agrave; obtenir le nombre de points de t&acirc;che demand&eacute; par la blessure. Un minimum de mat&eacute;riel est n&eacute;cessaire : de l&rsquo;eau, des chiffons propres pour servir de pansements.</span></p>\n<p>&nbsp;</p>","descriptionmj":"","carac":"dexterite","competence":"Chirurgie","periodicite":"1 round","fatigue":0,"difficulte":-6,"points_de_tache":6,"points_de_tache_courant":0,"nb_jet_echec":0,"nb_jet_succes":0,"cacher_points_de_tache":false},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.13","coreVersion":"10.291","createdTime":1671050458426,"modifiedTime":1671050514673,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"lHdfav9mvs68yj7J","name":"1er soins - Blessure légère","type":"tache","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.taches-courantes.lHdfav9mvs68yj7J"}},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_chirurgie.webp","effects":[],"system":{"description":"<p><span class=\"fontstyle0\">Effectuer les premiers soins consiste &agrave; obtenir le nombre de points de t&acirc;che demand&eacute; par la blessure. Un minimum de mat&eacute;riel est n&eacute;cessaire : de l&rsquo;eau, des chiffons propres pour servir de pansements.</span></p>\n<p>&nbsp;</p>","descriptionmj":"","carac":"dexterite","competence":"Chirurgie","periodicite":"1 round","fatigue":0,"difficulte":-2,"points_de_tache":2,"points_de_tache_courant":0,"nb_jet_echec":0,"nb_jet_succes":0,"cacher_points_de_tache":false},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.13","coreVersion":"10.291","createdTime":1671050458426,"modifiedTime":1671050514673,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"nbkuXbhgSxHwXD4t","name":"1er soins - Blessure grave","type":"tache","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.taches-courantes.nbkuXbhgSxHwXD4t"}},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_chirurgie.webp","effects":[],"system":{"description":"<p><span class=\"fontstyle0\">Effectuer les premiers soins consiste &agrave; obtenir le nombre de points de t&acirc;che demand&eacute; par la blessure. Un minimum de mat&eacute;riel est n&eacute;cessaire : de l&rsquo;eau, des chiffons propres pour servir de pansements.</span></p>\n<p>&nbsp;</p>","descriptionmj":"","carac":"dexterite","competence":"Chirurgie","periodicite":"1 round","fatigue":0,"difficulte":-4,"points_de_tache":4,"points_de_tache_courant":0,"nb_jet_echec":0,"nb_jet_succes":0,"cacher_points_de_tache":false},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"folder":null,"sort":0,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.3.13","coreVersion":"10.291","createdTime":1671050458427,"modifiedTime":1671050514673,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
--- a/styles/simple.css
+++ b/styles/simple.css
@ -776,7 +776,7 @@ input:is(.blessure-premiers_soins, .blessure-soins_complets) {
 }
 .rdd-diviseur{
  border-radius: 6px; padding: 3px;
-  background: var(--gradient-silver-light);
+  background: var(--gradient-red);
 }

 .rdd-niveau-requis{
--- a/system.json
+++ b/system.json
@ -1,8 +1,8 @@
 {
  "id": "foundryvtt-reve-de-dragon",
  "title": "Rêve de Dragon",
-  "version": "11.1.2",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.1.2.zip",
+  "version": "11.1.6",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.1.6.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": {
--- a/templates/actor/archetype.hbs
+++ b/templates/actor/archetype.hbs
@ -12,7 +12,7 @@

        <li class="item flexrow">
          <label class="generic-label">
-              Niveaux {{numberFormat archetype.niveau decimals=0 sign=true}} : {{archetype.nombre}} / {{archetype.nombreMax}} 
+              Niveaux {{plusMoins archetype.niveau}} : {{archetype.nombre}} / {{archetype.nombreMax}} 
          </label>
        </li>
      {{/each}}
--- a/templates/actor/carac-derivee.html
+++ b/templates/actor/carac-derivee.html
@ -68,7 +68,7 @@
  </li>  
  <li class="caracteristique flexrow list-item" >
    <label class="carac-label">Bonus dom.</label>
-    <input class="derivee-value" type="text" disabled value="{{numberFormat system.attributs.plusdom.value decimals=0 sign=true}}"/>
+    <input class="derivee-value" type="text" disabled value="{{plusMoins system.attributs.plusdom.value}}"/>
  </li>  
  <li class="caracteristique flexrow list-item" >
    <label class="carac-label">Malus armure</label>
--- a/templates/actor/combat.html
+++ b/templates/actor/combat.html
@ -20,8 +20,8 @@
      </a>
      ({{arme.system.competence}})
    </span>
-    <span class="competence-value">{{numberFormat arme.system.niveau decimals=0 sign=true}}</span>
-    <span class="competence-value">{{numberFormat arme.system.dommagesReels decimals=0 sign=true}}</span>
+    <span class="competence-value">{{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>{{arme.system.initiative}}</a></span>
  </li>
@ -34,7 +34,7 @@
        <span>{{esq.name}}</span>
      </a>
    </span>
-    <span class="competence-value">{{numberFormat esq.system.niveau decimals=0 sign=true}}</span>
+    <span class="competence-value">{{plusMoins esq.system.niveau}}</span>
    <span class="competence-value"></span>
    <span class="competence-value"></span>
    <span class="initiative-value"></span>
--- a/templates/actor/comp-creature.html
+++ b/templates/actor/comp-creature.html
@ -11,13 +11,13 @@
      {{#unless @root.options.vueDetaillee}}disabled{{/unless}}/>
    <input class="competence-value creature-niveau" type="text" data-dtype="number"
      compname="{{comp.name}}" name="{{comp._id}}.niveau"
-      value="{{numberFormat comp.system.niveau decimals=0 sign=true}}" 
+      value="{{plusMoins comp.system.niveau}}" 
      {{#unless @root.options.vueDetaillee}}disabled{{/unless}}
      />
    <input class="competence-damage creature-dommages" type="text" data-dtype="number" 
      {{#if comp.isdommages}}
        compname="{{comp.name}}" name="{{comp._id}}.dommages"
-        value="{{numberFormat comp.system.dommages decimals=0 sign=true}}" 
+        value="{{plusMoins comp.system.dommages}}" 
        {{#unless @root.options.vueDetaillee}}disabled{{/unless}}
      {{else}}disabled{{/if}}
      />
--- a/templates/actor/competence.html
+++ b/templates/actor/competence.html
@ -13,7 +13,7 @@
    {{/if}}

    <input class="competence-value" type="text" compname="{{name}}" name="comp-value-{{name}}"
-          value="{{numberFormat system.niveau decimals=0 sign=true}}" data-dtype="number"
+          value="{{plusMoins system.niveau}}" data-dtype="number"
          {{#if (or (not @root.options.vueDetaillee) @root.options.vueArchetype)}}disabled{{/if}} />

    {{#if @root.options.vueDetaillee}}
@ -42,7 +42,7 @@
      <i class="far fa-circle"></i>
      {{/if}}
      <input class="competence-archetype niveau-archetype" type="text" compname="{{name}}" name="comp-archetype-{{name}}"
-            value="{{numberFormat system.niveau_archetype decimals=0 sign=true}}" data-dtype="number"
+            value="{{plusMoins system.niveau_archetype}}" data-dtype="number"
            {{#if (not @root.options.vueArchetype)}}disabled{{/if}} />
      <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
      {{#if @root.options.isGM}}
--- a/templates/actor/header-effects.html
+++ b/templates/actor/header-effects.html
@ -2,11 +2,11 @@
  {{#if effects}}
    {{#each effects as |effect key|}}
    <span class="active-effect" data-effect="{{effect.flags.core.statusId}}">
-      <img class="button-effect-img {{#if @root.options.isGM}}delete-active-effect{{/if}}" src="{{effect.icon}}" alt="{{localize effect.label}}" width="24" height="24" />
+      <img class="button-effect-img {{#if @root.options.isGM}}delete-active-effect{{/if}}" src="{{effect.icon}}" alt="{{localize effect.name}}" width="24" height="24" />
    </span>
    {{/each}}
    {{#if calc.surprise}}<span>{{calc.surprise}}!</span>{{/if}}
-  {{else}}
+    {{else}}
    Aucun effet actif
  {{/if}}
 </div>
--- a/templates/chat-demande-defense.html
+++ b/templates/chat-demande-defense.html
@ -63,11 +63,10 @@
      {{/unless}}
    <a class='chat-card-button' id='encaisser-button' data-attackerId='{{attackerId}}'
      data-defenderTokenId='{{defenderTokenId}}'>
-      Encaisser à {{#if (eq dmg.mortalite 'non-mortel')~}}
-      ({{numberFormat dmg.total decimals=0 sign=true}})
-      {{~else~}}
-      {{numberFormat dmg.total decimals=0 sign=true}}
-      {{~/if}} !
+      Encaisser à {{plusMoins dmg.total}}
+      {{#if (eq dmg.mortalite 'non-mortel')~}}
+      (non-mortel) !
+      {{/if}}
    </a>
  </span>
 </div>
--- a/templates/chat-infojet.html
+++ b/templates/chat-infojet.html
@ -1,6 +1,6 @@
 <div>
  <span {{#if ajustements}}class="tooltip tooltip-dotted" {{/if}}>
-    {{rolled.caracValue}} à {{numberFormat rolled.finalLevel decimals=0 sign=true}}
+    {{rolled.caracValue}} à {{plusMoins rolled.finalLevel}}
    {{#if ajustements}}
    <div class="tooltiptext ttt-ajustements">
      {{#each ajustements as |item key|}}
@ -9,7 +9,7 @@
        {{#if item.descr}}
        {{{item.descr}}}
        {{else}}
-        {{item.label}}: {{numberFormat item.value decimals=0 sign=true}}
+        {{item.label}}: {{plusMoins item.value}}
        {{/if}}
      </div>
      {{/if}}
@ -19,10 +19,13 @@
    {{#if rolled.factorHtml}}<span class="rdd-diviseur">&times;{{{rolled.factorHtml}}}</span>{{/if}}
  </span>
  <span>= {{rolled.score}}%</span>
+  {{#if rolled.factorHtml}}
+  <span class="rdd-diviseur">&times;{{{rolled.factorHtml}}}</span>
+  {{/if}}
 </div>
 <div>
  <span>{{rolled.roll}} : </span><span class="rdd-roll-{{rolled.code}} strong-text">{{rolled.quality}}</span>
  {{#if rolled.ajustementNecessaire}}
-  <span class="rdd-niveau-requis">(Réussite si {{numberFormat rolled.niveauNecessaire decimals=0 sign=true}} / avec niveau {{numberFormat rolled.ajustementNecessaire decimals=0 sign=true}}) </span>
+  <span class="rdd-niveau-requis">(Réussite si {{plusMoins rolled.niveauNecessaire}} / avec niveau {{plusMoins rolled.ajustementNecessaire}}) </span>
  {{/if}}
 </div>
--- a/templates/chat-resultat-attaque.html
+++ b/templates/chat-resultat-attaque.html
@ -20,11 +20,11 @@
 {{#if rolled.isSuccess}}
  <span><strong>{{show.cible}}</strong> doit se défendre à <strong>{{diffLibre}}</strong>, ou encaisser à
    {{~#if (eq dmg.mortalite 'non-mortel')}}
-    <span class="rdd-roll-norm">({{numberFormat dmg.total decimals=0 sign=true}})</span> (dommages non-mortel)
+    <span class="rdd-roll-norm">({{plusMoins dmg.total}})</span> (non-mortel)
    {{else if (eq dmg.mortalite 'mortel')}}
-    <span class="rdd-roll-echec">{{numberFormat dmg.total decimals=0 sign=true}}</span>
+    <span class="rdd-roll-echec">{{plusMoins dmg.total}}</span>
    {{else}}
-    <span class="rdd-roll-etotal">{{numberFormat dmg.total decimals=0 sign=true}}</span> (entités de cauchemar)
+    <span class="rdd-roll-etotal">{{plusMoins dmg.total}}</span> (entités de cauchemar)
    {{~/if}}.
    {{#if show.isRecul}}Si votre adversaire n'esquive pas, il devra résister à l'impact ou reculer sous le choc!{{/if}}
  </span>
--- a/templates/chat-resultat-competence.html
+++ b/templates/chat-resultat-competence.html
@ -10,7 +10,7 @@
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 <hr>
 <div>
-  <span>{{#if rolled.ptTache}}{{rolled.ptTache}} points de tâche{{/if}}{{#if rolled.ptQualite}}{{#if rolled.ptTache}},{{/if}} Qualité ajustée de {{numberFormat rolled.ptQualite decimals=0 sign=true}}{{/if}}</span>
+  <span>{{#if rolled.ptTache}}{{rolled.ptTache}} points de tâche{{/if}}{{#if rolled.ptQualite}}{{#if rolled.ptTache}},{{/if}} Qualité ajustée de {{rolled.ptQualite}}{{/if}}</span>
 </div>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html"}}
 {{~#if show.explications}}
--- a/templates/chat-resultat-encaissement.html
+++ b/templates/chat-resultat-encaissement.html
@ -10,7 +10,7 @@
 {{else}}
 <h4>{{alias}} encaisse à
  <span>
-    {{numberFormat dmg.total decimals=0 sign=true}}
+    {{plusMoins dmg.total}}
    {{#if (eq dmg.mortalite 'non-mortel')~}}(coups non mortels)
    {{~else if (eq dmg.mortalite 'entiteincarnee')}}(entité incarnée)
    {{~/if}}
--- a/templates/chat-resultat-general.html
+++ b/templates/chat-resultat-general.html
@ -5,13 +5,13 @@
  {{alias}} {{#if show.title}}{{show.title}}: {{/if}}
  {{#if selectedCarac}}{{selectedCarac.label}}
    {{#if competence}}{{#unless (eq selectedCarac.label competence.name)}} / {{competence.name}}{{/unless}}{{/if}}
-    à {{diffLibre}}
+    à {{plusMoins diffLibre}}
  {{/if}}
 </h4>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 <hr>
 <div>
-  <span>{{#if rolled.ptTache}}{{rolled.ptTache}} points de tâche{{/if}}{{#if rolled.ptQualite}}{{#if rolled.ptTache}},{{/if}} ajustement Qualité {{numberFormat rolled.ptQualite decimals=0 sign=true}}{{/if}}</span>
+  <span>{{#if rolled.ptTache}}{{rolled.ptTache}} points de tâche{{/if}}{{#if rolled.ptQualite}}{{#if rolled.ptTache}},{{/if}} ajustement Qualité {{rolled.ptQualite}}{{/if}}</span>
  {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html"}}
 </div>
 {{~#if show.explications}}
--- a/templates/chat-resultat-meteo.html
+++ b/templates/chat-resultat-meteo.html
@ -3,7 +3,7 @@
 <ul>
  <li>Vent: {{lowerFirst vent.description}} {{apostrophe 'de' vent.direction}}, force {{vent.force}}</li>
  <li>Mer {{lowerFirst mer.description}}, {{apostrophe 'de' mer.direction}}, force {{mer.force}}</li>
-  <li>Température {{lowerFirst temperature.description}} ({{numberFormat temperature.force decimals=0 sign=true}})</li>
+  <li>Température {{lowerFirst temperature.description}} ({{plusMoins temperature.force}})</li>
  <li>Couverture nuageuse: {{lowerFirst nuage.description}}</li>
  <li>Pluie: {{lowerFirst pluie.description}}</li>
 </div>
--- a/templates/dialog-item-achat.html
+++ b/templates/dialog-item-achat.html
@ -64,14 +64,17 @@
    {{/if}}
    {{#if (gt item.system.qualite 0)}}
      {{#if (gt item.system.qualite cuisine.system.niveau)}}
-      <p>La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.system.qualite decimals=0 sign=true}}
-        vous permettra un jet de moral heureux.</p>
+      <p>La qualité du plat est telle qu'un jet de Goût réussi vous permettra un jet de moral heureux.</p>
      {{/if}}
    {{/if}}
    
    {{#if (or (lt item.system.qualite 0) (lt item.system.exotisme 0))}}
      <p>
-        Pour surmonter {{#if (lt item.system.qualite 0)}}le mauvais goût{{else}}l'exotisme{{/if}}, vous devez effectuer un jet de Volonté/Cuisine à {{numberFormat (min item.system.exotisme item.system.qualite) decimals=0 sign=true}}.
+        {{#if (lt item.system.qualite 0)}}
+        Pour surmonter le mauvais goût, vous devez effectuer un jet de Volonté à {{plusMoins (min item.system.exotisme item.system.qualite)}}.
+        {{else}}
+        Pour surmonter l'exotisme, vous devez effectuer un jet de Volonté/Cuisine à {{plusMoins (min item.system.exotisme)}}.
+        {{/if}}
      <br/>
        <input class="attribute-value se-forcer" type="checkbox" name="se-forcer" {{#if choix.seForcer}}checked{{/if}}>
          <label for="se-forcer">En cas d'échec, voulez-vous vous forcer à manger (et subir un jet de moral en situation malheureuse)?</label>
--- a/templates/dialog-item-consommer.html
+++ b/templates/dialog-item-consommer.html
@ -19,14 +19,17 @@
  {{/if}}
  {{#if (gt item.system.qualite 0)}}
  {{#if (gt item.system.qualite cuisine.system.niveau)}}
-  <p>La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.system.qualite decimals=0 sign=true}}
-    vous permettra un jet de moral heureux.</p>
+  <p>La qualité du plat est telle qu'un jet de Goût vous permettra un jet de moral heureux.</p>
  {{/if}}
  {{/if}}

  {{#if (or (lt item.system.qualite 0) (lt item.system.exotisme 0))}}
  <p>
-    Pour surmonter {{#if (lt item.system.qualite 0)}}le mauvais goût{{else}}l'exotisme{{/if}}, vous devez effectuer un jet de Volonté/Cuisine à {{numberFormat (min item.system.exotisme item.system.qualite) decimals=0 sign=true}}.
+    {{#if (lt item.system.qualite 0)}}
+    Pour surmonter le mauvais goût, vous devez effectuer un jet de Volonté à {{plusMoins (min item.system.exotisme item.system.qualite)}}.
+    {{else}}
+    Pour surmonter l'exotisme, vous devez effectuer un jet de Volonté/Cuisine à {{plusMoins (min item.system.exotisme)}}.
+    {{/if}}
  <br/>
    <input class="attribute-value se-forcer" type="checkbox" name="se-forcer" {{#if choix.seForcer}}checked{{/if}}>
      <label for="se-forcer">En cas d'échec, voulez-vous vous forcer à manger (et subir un jet de moral en situation malheureuse)?</label>
--- a/templates/dialog-roll-alchimie.html
+++ b/templates/dialog-roll-alchimie.html
@ -6,7 +6,7 @@
      <div class="grid grid-2col">
        <label>{{alchimie.tache}}:</label><label class="flex-grow">{{alchimie.texte}}</label>
        <label>Caractéristique: </label><label class="flex-grow">{{selectedCarac.label}}</label>
-        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label></label>
+        <label>{{competence.name}}:</label><label class="flex-grow">{{plusMoins competence.system.niveau}}</label></label>
      </div>
    </div>
    <div class="flex-group-left">
--- a/templates/dialog-roll-chant.html
+++ b/templates/dialog-roll-chant.html
@ -6,7 +6,7 @@
      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
      <div class="grid grid-2col">
        <label>Caractéristique: </label><label class="flex-grow">{{selectedCarac.label}}</label>
-        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label></label>
+        <label>{{competence.name}}:</label><label class="flex-grow">{{plusMoins competence.system.niveau}}</label></label>
      </div>
      {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.system}}
    </div>
--- a/templates/dialog-roll-danse.html
+++ b/templates/dialog-roll-danse.html
@ -6,7 +6,7 @@
      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
      <div class="grid grid-2col">
        <label for="carac">Caractéristique:</label>{{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}}
-        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label></label>
+        <label>{{competence.name}}:</label><label class="flex-grow">{{plusMoins competence.system.niveau}}</label></label>
      </div>
      {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.system}}
    </div>
--- a/templates/dialog-roll-defense-empoignade.html
+++ b/templates/dialog-roll-defense-empoignade.html
@ -7,7 +7,7 @@
      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
      <div class="grid grid-2col">
        <label for="carac">{{selectedCarac.label}}:</label><label class="flex-grow" name="carac">{{selectedCarac.value}}</label>
-        <label for="competence">{{competence.name}}:</label><label class="flex-grow" name="competence">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label>
+        <label for="competence">{{competence.name}}:</label><label class="flex-grow" name="competence">{{plusMoins competence.system.niveau}}</label>
      </div>
    </div>
    <div class="flex-group-left">
--- a/templates/dialog-roll-defense-possession.html
+++ b/templates/dialog-roll-defense-possession.html
@ -9,7 +9,7 @@
      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
      <div class="grid grid-2col">
        <label for="carac">Rêve actuel:</label><label class="flex-grow" name="carac">{{selectedCarac.value}}</label>
-        <label for="competence">{{competence.name}}:</label><label class="flex-grow" name="competence">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label>
+        <label for="competence">{{competence.name}}:</label><label class="flex-grow" name="competence">{{plusMoins competence.system.niveau}}</label>
      </div>
    </div>
    <div class="flex-group-left">
--- a/templates/dialog-roll-encaisser.html
+++ b/templates/dialog-roll-encaisser.html
@ -4,7 +4,7 @@
    <select class="competence-value flex-shrink" name="modificateurDegats" data-dtype="number">
      {{#select modificateurDegats}}
      {{#each ajustementsEncaissement as |key|}}
-      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
+      <option value={{key}}>{{plusMoins key}}</option>
      {{/each}}
      {{/select}}
    </select>
--- a/templates/dialog-roll-jeu.html
+++ b/templates/dialog-roll-jeu.html
@ -7,7 +7,7 @@
      <div class="grid grid-2col">
        <label>Type:</label><label class="flex-grow">{{oeuvre.system.type}}</label>
        <label for="carac">Caractéristique:</label>{{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}}
-        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.system.niveauReel decimals=0 sign=true}}</label></label>
+        <label>{{competence.name}}:</label><label class="flex-grow">{{plusMoins competence.system.niveauReel}}</label></label>
        <label>Niveau de base:</label><label class="flex-grow">{{oeuvre.system.base}}</label>
      </div>
    </div>
--- a/templates/dialog-roll-maitrise-tmr.html
+++ b/templates/dialog-roll-maitrise-tmr.html
@ -10,7 +10,7 @@
      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
      <div class="grid grid-2col">
        <label for="carac">Rêve actuel:</label><label class="flex-grow" name="carac">{{selectedCarac.value}}</label>
-        <label for="draconic">{{competence.name}}:</label><label class="flex-grow" name="draconic">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label>
+        <label for="draconic">{{competence.name}}:</label><label class="flex-grow" name="draconic">{{plusMoins competence.system.niveau}}</label>
      </div>
    </div>
    <div class="flex-group-left">
--- a/templates/dialog-roll-meditation.html
+++ b/templates/dialog-roll-meditation.html
@ -11,7 +11,7 @@
        <label>Durée: 60 minutes</label>
        <hr>
        <label>Intellect / {{competence.name}}:
-          {{numberFormat carac.intellect.value decimals=0 sign=false}} / {{numberFormat competence.system.niveau decimals=0 sign=true}}</label>
+          {{numberFormat carac.intellect.value decimals=0 sign=false}} / {{plusMoins competence.system.niveau}}</label>
      </div>
    </div>
    <div class="flex-group-left">
--- a/templates/dialog-roll-musique.html
+++ b/templates/dialog-roll-musique.html
@ -6,7 +6,7 @@
      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
      <div class="grid grid-2col">
        <label>Caractéristique: </label><label class="flex-grow">{{selectedCarac.label}}</label>
-        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label></label>
+        <label>{{competence.name}}:</label><label class="flex-grow">{{plusMoins competence.system.niveau}}</label></label>
      </div>
      {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.system}}
    </div>
--- a/templates/dialog-roll-oeuvre.html
+++ b/templates/dialog-roll-oeuvre.html
@ -7,7 +7,7 @@
      <div class="grid grid-2col">
        <label>Caractéristique: </label><label class="flex-grow">{{selectedCarac.label}}
        </label>
-        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label></label>
+        <label>{{competence.name}}:</label><label class="flex-grow">{{plusMoins competence.system.niveau}}</label></label>
      </div>
      {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.system}}
    </div>
--- a/templates/dialog-roll-recettecuisine.html
+++ b/templates/dialog-roll-recettecuisine.html
@ -9,7 +9,7 @@
          <label>Caractéristique: </label><label>{{selectedCarac.label}}</label>
        </div>
        <div class="flexrow">
-          <label>{{competence.name}}: </label><label>{{numberFormat competence.system.niveau decimals=0 sign=true}}</label></label>
+          <label>{{competence.name}}: </label><label>{{plusMoins competence.system.niveau}}</label></label>
        </div>
        <div class="flexrow">
          <label>Exotisme: </label><label>{{oeuvre.system.exotisme}}</label>
--- a/templates/dialog-roll-reve-de-dragon.html
+++ b/templates/dialog-roll-reve-de-dragon.html
@ -5,7 +5,7 @@
      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
      <div class="grid grid-2col">
        <label for="carac">Rêve actuel:</label><label class="flex-grow" name="carac">{{selectedCarac.value}}</label>
-        <label for="competence">{{competence.name}}:</label><label class="flex-grow" name="competence">{{numberFormat competence.system.niveau decimals=0 sign=true}}</label>
+        <label for="competence">{{competence.name}}:</label><label class="flex-grow" name="competence">{{plusMoins competence.system.niveau}}</label>
      </div>
    </div>
    <div class="flex-group-left">
--- a/templates/dialog-roll-signedraconique.html
+++ b/templates/dialog-roll-signedraconique.html
@ -24,7 +24,7 @@
        <select name="competence" class="roll-draconic" data-dtype="String">
          {{#select draconic}}
          {{#each draconicList as |draconic key|}}
-          <option value={{key}}>{{draconic.name}} : {{numberFormat draconic.system.niveau decimals=0 sign=true}}
+          <option value={{key}}>{{draconic.name}} : {{plusMoins draconic.system.niveau}}
          </option>
          {{/each}}
          {{/select}}
--- a/templates/dialog-roll-sort.html
+++ b/templates/dialog-roll-sort.html
@ -43,7 +43,7 @@
        <select name="competence" class="roll-draconic" data-dtype="String">
          {{#select draconic}}
          {{#each draconicList as |draconic key|}}
-          <option value={{key}}>{{draconic.name}} : {{numberFormat draconic.system.niveau decimals=0 sign=true}}
+          <option value={{key}}>{{draconic.name}} : {{plusMoins draconic.system.niveau}}
          </option>
          {{/each}}
          {{/select}}
@ -54,11 +54,11 @@
        <select name="diffLibre" class="div-sort-difficulte-var" data-dtype="number">
          {{#select diffLibre}}
          {{#each difficultesLibres as |key|}}
-          <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
+          <option value={{key}}>{{plusMoins key}}</option>
          {{/each}}
          {{/select}}
        </select>
-        <label class="div-sort-difficulte-fixe">{{numberFormat selectedSort.system.difficulte decimals=0 sign=true}}</label>
+        <label class="div-sort-difficulte-fixe">{{plusMoins selectedSort.system.difficulte}}</label>
      </div>
      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
--- a/templates/dialog-validation-encaissement.html
+++ b/templates/dialog-validation-encaissement.html
@ -20,22 +20,22 @@
          {{/if}}
          <hr>
          {{#if encaissement.dmg.total}}
-          <div>+dom encaissement: {{numberFormat rollData.dmg.total decimals=0 sign=true}}</div>
+          <div>+dom encaissement: {{plusMoins rollData.dmg.total}}</div>
          {{/if}}
          {{#if rollData.dmg.dmgArme}}
-          <div>+dom arme: {{numberFormat rollData.dmg.dmgArme decimals=0 sign=true}}</div>
+          <div>+dom arme: {{plusMoins rollData.dmg.dmgArme}}</div>
          {{/if}}
          {{#if rollData.dmg.dmgActor}}
-          <div>+dom attaquant: {{numberFormat rollData.dmg.dmgActor decimals=0 sign=true}}</div>
+          <div>+dom attaquant: {{plusMoins rollData.dmg.dmgActor}}</div>
          {{/if}}
          {{#if rollData.dmg.dmgParticuliere}}
-          <div>+dom particulière: {{numberFormat rollData.dmg.dmgParticuliere decimals=0 sign=true}}</div>
+          <div>+dom particulière: {{plusMoins rollData.dmg.dmgParticuliere}}</div>
          {{/if}}
          {{#if rollData.dmg.dmgTactique}}
-          <div>+dom tactique: {{numberFormat rollData.dmg.dmgTactique decimals=0 sign=true}}</div>
+          <div>+dom tactique: {{plusMoins rollData.dmg.dmgTactique}}</div>
          {{/if}}
          {{#if rollData.dmg.dmgSurprise}}
-          <div>+dom surprise: {{numberFormat rollData.dmg.dmgSurprise decimals=0 sign=true}}</div>
+          <div>+dom surprise: {{plusMoins rollData.dmg.dmgSurprise}}</div>
          {{/if}}
        </div>
      </span>
--- a/templates/item-tache-sheet.html
+++ b/templates/item-tache-sheet.html
@ -3,7 +3,7 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">
    <div class="form-group">
-      <label for="xp">Caractéristique</label>
+      <label for="system.carac">Caractéristique</label>
      <select name="system.carac" data-dtype="String">
      {{#select system.carac}}
      {{#each caracList  as |carac key|}}
@ -13,7 +13,7 @@
      </select>
    </div>
    <div class="form-group">
-      <label for="xp">Compétence</label>
+      <label for="system.competence">Compétence</label>
      <select name="system.competence" data-dtype="String">
      {{#select system.competence}}
      <option value="">Sans compétence</option>
@ -22,47 +22,47 @@
    </select>
  </div>
    <div class="form-group">
-      <label for="xp">Difficulté</label>
+      <label for="system.difficulte">Difficulté</label>
      <input class="attribute-value" type="text" name="system.difficulte" value="{{system.difficulte}}" data-dtype="Number"/>
    </div>
    <div class="form-group">
-      <label for="xp">Périodicité</label>
+      <label for="system.periodicite">Périodicité</label>
      <input class="attribute-value" type="text" name="system.periodicite" value="{{system.periodicite}}" data-dtype="String"/>
    </div>
    <div class="form-group">
-      <label for="xp">Fatigue</label>
+      <label for="system.fatigue">Fatigue</label>
      <input class="attribute-value" type="text" name="system.fatigue" value="{{system.fatigue}}" data-dtype="Number"/>
    </div>
    {{#if options.isGM}}
    <div class="form-group">
-      <label for="xp">Cacher les Points de Tâches nécessaires au joueur</label>
-      <input class="attribute-value" type="checkbox" name="system.cacher_points_de_tache" value="{{system.cacher_points_de_tache}}" {{checked system.cacher_points_de_tache}}/>
+      <label for="system.cacher_points_de_tache">Cacher les Points de Tâches nécessaires au joueur</label>
+      <input class="attribute-value" ²type="checkbox" name="system.cacher_points_de_tache" {{checked system.cacher_points_de_tache}}/>
    </div>
    <div class="form-group">
-      <label for="xp">Points de tâches nécessaires</label>
+      <label for="system.points_de_tache">Points de tâches nécessaires (MJ)</label>
      <input class="attribute-value" type="text" name="system.points_de_tache" value="{{system.points_de_tache}}" data-dtype="Number"/>
    </div>
    {{else}}
-      <div class="form-group">
-        <label for="xp">Points de tâches nécessaires</label>
-        {{#if system.cacher_points_de_tache}}
-        <input class="attribute-value" type="text" value="?????" data-dtype="Number" disabled/>
-        {{else}}
-        <input class="attribute-value" type="text" name="system.points_de_tache" value="{{system.points_de_tache}}" data-dtype="Number"/>
-        {{/if}}
-      </div>
+    <div class="form-group">
+      {{#if system.cacher_points_de_tache}}
+      <label for="system.points_de_tache">Points de tâches nécessaires inconnus</label>
+      {{else}}
+      <label for="system.points_de_tache">Points de tâches nécessaires</label>
+      <input class="attribute-value" type="text" name="system.points_de_tache" value="{{system.points_de_tache}}" data-dtype="Number"/>
+      {{/if}}
+    </div>
    {{/if}}
    <hr>
    <div class="form-group">
-      <label for="xp">Points de tâches obtenus</label>
+      <label for="system.points_de_tache_courant">Points de tâches obtenus</label>
      <input class="attribute-value" type="text" name="system.points_de_tache_courant" value="{{system.points_de_tache_courant}}" data-dtype="Number"/>
    </div>
    <div class="form-group">
-      <label for="xp">Nombre de Succès</label>
+      <label for="system.nb_jet_succes">Nombre de Succès</label>
      <input class="attribute-value" type="text" name="system.nb_jet_succes" value="{{system.nb_jet_succes}}" data-dtype="Number" {{#if options.isGM}}{{else}}disabled{{/if}}/>
    </div>
    <div class="form-group">
-      <label for="xp">Nombre d'Echecs</label>
+      <label for="system.nb_jet_echec">Nombre d'Echecs</label>
      <input class="attribute-value" type="text" name="system.nb_jet_echec" value="{{system.nb_jet_echec}}" data-dtype="Number" {{#if options.isGM}}{{else}}disabled{{/if}}/>
    </div>

--- a/templates/partial-roll-ajustements.html
+++ b/templates/partial-roll-ajustements.html
@ -1,7 +1,7 @@
 <div class="table-ajustement">
  <span class="tooltip tooltip-dotted">
    <span>Ajustement Final:</span>
-    <span class="roll-param-resolution">{{selectedCarac.value}} / {{numberFormat finalLevel decimals=0 sign=true}}</span>
+    <span class="roll-param-resolution">{{selectedCarac.value}} / {{plusMoins finalLevel}}</span>
    <div class="tooltiptext ttt-ajustements">
      {{#each ajustements as |item key|}}
      {{#if item.used}}
@ -9,7 +9,7 @@
        {{#if item.descr}}
        {{{item.descr}}}
        {{else}}
-        {{item.label}}: {{numberFormat item.value decimals=0 sign=true}}
+        {{item.label}}: {{plusMoins item.value}}
        {{/if}}
      </div>
      {{/if}}
--- a/templates/partial-roll-diffCondition.html
+++ b/templates/partial-roll-diffCondition.html
@ -2,8 +2,8 @@
  <label for="diffConditions">Conditions</label>
  <select name="diffConditions" data-dtype="number" {{#unless use.conditions}}disabled{{/unless}}>
      {{#select diffConditions}}
-      {{#each ajustementsConditions  as |key|}}
-      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
+      {{#each ajustementsConditions as |key|}}
+      <option value={{key}}>{{plusMoins key}}</option>
      {{/each}}
      {{/select}}
  </select>
--- a/templates/partial-roll-diffFixe.html
+++ b/templates/partial-roll-diffFixe.html
@ -1,4 +1,4 @@
 <div class="flexrow">
  <label>Difficulté imposée</label>
-  <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
+  <label>{{plusMoins diffLibre}}</label>
 </div>
--- a/templates/partial-roll-diffLibre.html
+++ b/templates/partial-roll-diffLibre.html
@ -3,7 +3,7 @@
  <select name="diffLibre" data-dtype="number" {{#unless use.libre}}disabled{{/unless}}>
    {{#select diffLibre}}
    {{#each difficultesLibres as |key|}}
-    <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
+    <option value={{key}}>{{plusMoins key}}</option>
    {{/each}}
    {{/select}}
  </select>
--- a/templates/resolution-table.html
+++ b/templates/resolution-table.html
@ -7,7 +7,7 @@
    <th class="table-resolution-level">...</th>
    {{/if}}
    {{#each cols as |col|}}
-    <th class="table-resolution-level">{{numberFormat col decimals=0 sign=true}}</th>
+    <th class="table-resolution-level">{{plusMoins col}}</th>
    {{/each}}
  </tr>
  {{#each rows as |row|}}
--- a/templates/roll/explain.hbs
+++ b/templates/roll/explain.hbs
@ -5,7 +5,7 @@
  </strong> sur {{rolled.score}}%
 {{#if (and rolled.caracValue rolled.finalLevel)}}
 ({{#if (gt rolled.diviseurSignificative 1)}}1/{{rolled.diviseurSignificative}}{{/if}}
- de {{rolled.caracValue}} à {{numberFormat rolled.finalLevel decimals=0 sign=true}})
+ de {{rolled.caracValue}} à {{plusMoins rolled.finalLevel}})
 {{/if}}
 <strong>{{rolled.quality}}</strong>
 </p>
--- a/templates/settings/status-effects.html
+++ b/templates/settings/status-effects.html
@ -7,8 +7,8 @@
      {{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.icon}}" alt="{{localize effect.label}}" />
-      <label>{{localize effect.label}}</label>
+      <img class="button-effect-img" height="16" width="16" src="{{effect.icon}}" alt="{{localize effect.name}}" />
+      <label>{{localize effect.name}}</label>
    </li>
    {{/each}}
  </ul>
--- a/templates/sommeil/astrologie-gardien.hbs
+++ b/templates/sommeil/astrologie-gardien.hbs
@ -43,7 +43,7 @@
      {{#each ajustementActeur.ajustements as |ajustement|}}
      <td>{{#if (ne ajustement.ajustement 0)}}
        <strong>
-          {{numberFormat ajustement.ajustement decimals=0 sign=true}}
+          {{plusMoins ajustement.ajustement}}
        </strong>
        {{else}}
        <div class="dimmed">
Author	SHA1	Message	Date
uberwald	9ff68884ce	Merge pull request 'v11.1.6 - Les dissections de Werther de Zloth' (#682 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 Reviewed-on: #682	2023-11-12 22:15:26 +01:00
Vincent Vandemeulebrouck	09986115b8	Version 11.1.6	2023-11-12 21:18:52 +01:00
Vincent Vandemeulebrouck	511ee5f241	Fix: encaissement joueur à valider par MJ	2023-11-12 21:18:07 +01:00
Vincent Vandemeulebrouck	306d7c2150	Fix: délai de guérison après rétrogradation Lorsqu'une blessure critique/grave rétrograde naturellement, le délai avant le jet de récupération suivant est correctement augmenté.	2023-11-12 21:17:38 +01:00
uberwald	5624bb1bf3	Merge pull request 'Fix: ajout de compétences aux créatures' (#681 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 Reviewed-on: #681	2023-11-12 16:35:40 +01:00
Vincent Vandemeulebrouck	b588c5f7f8	Fix: ajout de compétences aux créatures	2023-11-12 15:06:58 +01:00
LeRatierBretonnien	6de34178b3	Sync version	2023-11-12 00:35:51 +01:00
uberwald	0c90fba346	Merge pull request 'Préparation 11.1.5' (#680 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 Reviewed-on: #680	2023-11-12 00:35:06 +01:00
Vincent Vandemeulebrouck	f43b7ac651	Préparation Changelog 11.1.5	2023-11-12 00:33:25 +01:00
Vincent Vandemeulebrouck	ac436bbb25	Fix: Recevoir une queue annulait l'insomnie	2023-11-12 00:24:42 +01:00
Vincent Vandemeulebrouck	9093eadb23	Fix: urgence draconique	2023-11-12 00:22:29 +01:00
Vincent Vandemeulebrouck	5821fc611f	Fix: case pour trou noir	2023-11-11 22:33:51 +01:00
Vincent Vandemeulebrouck	381242c8d0	Fix: le jet de vie indique la mort Jusque là, le 20 indiquait la mort, mais ne diminuait pas la vie en dessous de - SConst Désormais: - la vie passe à -SConst - 1 sur 20 au jet de vie - Le message indique que le personnage est mort si sa vie est inférieure à -SConst - le jet de vie n'est pas fait si le personnage est déjà mort	2023-11-11 21:30:25 +01:00
Vincent Vandemeulebrouck	3ca33e85b7	Fix case pour réserve extensible	2023-11-11 21:30:02 +01:00
LeRatierBretonnien	01399e922a	Suppression de certains warnings	2023-11-11 20:38:16 +01:00
LeRatierBretonnien	c6afb8d445	Fix demande defense	2023-11-11 20:23:07 +01:00
LeRatierBretonnien	4d68318d85	Fix release	2023-11-11 09:07:28 +01:00
uberwald	7811eae728	Merge pull request 'v11.1.3 - Werther de Zloth l'Onirique' (#679 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 Reviewed-on: #679	2023-11-11 09:06:00 +01:00
Vincent Vandemeulebrouck	2e74ccd1fe	Fix: tooltip TMR par dessus les autres sprites	2023-11-11 00:52:57 +01:00
Vincent Vandemeulebrouck	f98ece4ffd	Version 11.1.3	2023-11-11 00:44:45 +01:00
Vincent Vandemeulebrouck	ed068a8ddd	Affichage du facteur significative	2023-11-11 00:44:11 +01:00
Vincent Vandemeulebrouck	c938778267	Fix: afficher "0" au lieu de "+0"	2023-11-11 00:44:08 +01:00
Vincent Vandemeulebrouck	9056514951	Fix: un plat raté est mauvais, pas exotique	2023-11-11 00:33:20 +01:00
Vincent Vandemeulebrouck	1047720c24	Fix: jet d'appréciation sans compétence	2023-11-10 23:23:28 +01:00
Vincent Vandemeulebrouck	43bcf1c336	Fix: afficher/masquer points de tâche	2023-11-10 23:22:45 +01:00
Vincent Vandemeulebrouck	14d4638e56	Fix: error dans les logs si aucune scène active	2023-11-10 19:56:25 +01:00
Vincent Vandemeulebrouck	c761aeceb3	Fix: calcul de l'état général	2023-11-10 19:54:32 +01:00
Vincent Vandemeulebrouck	1759e6d1c3	Fix: tooltips sorts TMRs	2023-11-10 03:39:35 +01:00
Vincent Vandemeulebrouck	ecb47addba	Fix changelog	2023-11-10 01:27:52 +01:00
uberwald	b18f93fbfb	Merge pull request 'v11.1.2' (#678 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 Reviewed-on: #678	2023-11-09 17:02:31 +01:00
Vincent Vandemeulebrouck	93e44bb982	Version 11.1.2	2023-11-09 00:53:03 +01:00
Vincent Vandemeulebrouck	12df910b3a	Macro "Mon Personnage" pour les joueurs	2023-11-09 00:53:03 +01:00
Vincent Vandemeulebrouck	2a3989ac2e	Fix: les jets d'encaissement	2023-11-09 00:53:03 +01:00