Merge pull request '11.2.19 - Les hémorroïdes d'Akarlikarlikar' (#697 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11

Reviewed-on: #697
Version 11.2.19
2024-05-01 08:59:34 +02:00 · 2024-05-01 01:12:28 +02:00 · 2024-05-01 01:08:50 +02:00 · 2024-03-21 15:51:07 +01:00 · 2024-03-20 21:57:02 +01:00 · 2024-03-20 21:55:18 +01:00
81 changed files with 709 additions and 339 deletions
--- a/changelog.md
+++ b/changelog.md
@ -1,4 +1,41 @@
 # 11.2
+## 11.2.19 - Les hémorroïdes d'Akarlikarlikar
+- La validation des jets d'encaissement par le Gardien fonctionne de nouveau
+
+## 11.2.18 - Le bourrichon d'Akarlikarlikar
+- Les différentes listes de la feuille de personnage ont maintenant le bouton pour envoyer dans le tchat
+
+## 11.2.17 - Le cache-oeil d'Akarlikarlikar
+- Le titre des fenêtre d'objet affiche de nouveau le type traduit
+- Les tooltips des boutons edit/delete sont maintenant en Français
+- La case à cocher "Cacher les points de tâches" fonctionne de nouveau
+- Les personnages non-liés ne sont plus dans les liste de personnages joueurs pour le repos, le stress, la fatigue
+- L'utilisation de Thanatos est visible dans l'onglet Haut-Rêve pour indiquer que la prochaine queue est une ombre
+- La fenêtre des TMRs ne devrait plus afficher une zone noire au lieu de la carte.
+
+## 11.2.16 - Le Tri d'Akarlikarlikar
+- Tri alphabétique des items dans la fenêtre de création
+- Mise à jour comptage de monde
+
+## 11.2.15 - La Table d'Akarlikarlikar
+- Tirage automatique de la foce d'une rencontre (via la commande /tmrr)
+- Ajout de boutons pour ajouter des blessures "complètes" (ie avec perte d'endurance/vie)
+
+## 11.2.14 - Les petits pas d'Akarlikarlikar
+- Correction sur la gestion de la surprise
+- Ordre des messages sur les cases humides
+
+## 11.2.13 - Les cent pas d'Akarlikarlikar
+- Ajout de la commande /voyage pour gérer la fatigue de marche des voyageurs
+
+## 11.2.12 - Le somnifère  d'Akarlikarlikar
+- Fix: les potions enchantées n'empêchent plus de finir correctement Château Dormant
+
+## 11.2.11 - Le miroir d'Akarlikarlikar
+- Changement des images de compétence de créatures morsure/pinces pour être dans le thème
+- Suppression de la bordure autour des portraits d'acteurs, remplacés par un légèr éclaircissement du fond
+- Fix: le refoulement ajoute correctement un souffle et revient à 0 en cas d'échec
+
 ## 11.2.10 - Les expériences d'Akarlikarlikar
 - En cas d'expérience des caractéristiques dérivées,
  - si plusieurs caractéristiques pourraient recevoir l'expérience, une fenêtre demande au joueur
--- a/icons/compcreature-mandibules.webp
+++ b/icons/compcreature-mandibules.webp
--- a/icons/compcreature-morsure.webp
+++ b/icons/compcreature-morsure.webp
--- a/icons/empoignade.svg
+++ b/icons/empoignade.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,3)" style=""><path d="M243.512 23.29c-27.105 18.337-53.533 32.92-82.274 45.337-2.843 17.364-3.948 34.497-4.05 51.584 28.913 15.41 56.096 32.85 83.33 49.634l7.045 4.344-3.432 7.482c-12.12 26.572-24.33 47.087-46.245 70.3l-5.184 5.512-6.46-3.904c-32.974-19.974-74.472-38.724-113.373-53.95l6.826-17.374c36.79 14.4 75.11 32.32 108.153 51.504 15.396-17.198 25.326-33.354 34.713-52.89-43.44-26.91-86.13-53.51-134.69-70.632-23.012 20.357-37.705 45.243-51.942 70.74 8.324 25.495 6.596 53.376-6.596 77.46 48.58-.593 97.994 2.23 150.666 10.26l5.658.837 1.787 5.44c8.85 26.46 11.79 54.41 8.325 83.588l-.987 8.432-8.466-.187c-40.508-.864-80.175-2.138-118.17.234 1.634 15.94-2.31 30.972-7.724 45.025 13.427 28.54 27.38 55.8 48.29 79.39 41.27-19.05 73.564-31.288 115.93-42.85-3.407-13.72-6.918-26.36-11.097-33.62-5.122-8.9-10.207-13.057-17.85-15.256-15.284-4.4-44.533 2.293-92.894 19.454l-6.243-17.594c48.907-17.354 79.702-26.894 104.283-19.82 9.133 2.628 16.884 8.004 23.066 15.46 14.487-7.627 28.415-16.79 42.053-26.996 12.34-45.92 37.29-81.42 66.626-112.107-7.226-13.52-13.208-27.204-20.563-40.613l-3.394-6.168 5-4.965c23.275-23.13 47.34-40.157 71.87-52.487l8.395 16.716c-20.952 10.53-41.503 25.913-61.795 45.152 12.41 23.91 22.263 45.5 39.457 64.826 37.488-27.124 74.943-51.39 116.84-74.938-13.96-30.473-31.345-58.357-56.286-79.462-32.2 13.38-62.527 17.39-92.61 12.29-14.223 13.25-30.094 22.23-48.756 23.337-29.017 1.722-60.74-15.74-99.174-57.672l6.858-6.295.017-.028.006.006 6.88-6.314c36.702 40.043 63.74 52.87 84.32 51.65 18.514-1.1 35.03-14.95 51.684-35.406-28.827-31.81-64.174-59.94-97.822-84.465zM39.324 277.884c-6.06.022-12.104.098-18.142.223 1.673 26.288 5.512 51.288 14.052 73.732 45.88-5.82 93.308-4.96 141.15-3.87 1.518-21.27-.253-41.69-6.058-61.212-45.528-6.565-88.59-9.03-131.002-8.873z" fill="#ffffff" fill-opacity="1" transform="translate(51.2, 51.2) scale(0.8, 0.8) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/lang/fr.json
+++ b/lang/fr.json
@ -1,55 +1,56 @@
 {
  "TYPES": {
    "Actor": { 
-      "Personnage": "Personnage",
-      "Creature": "Créature",
-      "Entite": "Entité de cauchemar",
-      "Commerce": "Commerce",
-      "Vehicule": "Véhicule"
+      "personnage": "Personnage",
+      "creature": "Créature",
+      "entite": "Entité de cauchemar",
+      "commerce": "Commerce",
+      "vehicule": "Véhicule"
    },
    "Item": {
-      "Arme": "Arme",
-      "Armure": "Armure",
-      "Blessure": "Blessure",
-      "Casetmr": "TMR spéciale",
-      "Chant": "Chant",
-      "Competence": "Compétence",
-      "Competencecreature": "Compétence de créature",
-      "Conteneur": "Conteneur",
-      "Danse": "Danse",
-      "Extraitpoetique": "Extrait poetique",
-      "Faune": "Faune",
-      "Gemme": "Gemme",
-      "Herbe": "Herbe",
-      "Ingredient": "Ingrédient",
-      "Jeu": "Jeu",
-      "Livre": "Livre",
-      "Maladie": "Maladie",
-      "Meditation": "Méditation",
-      "Monnaie": "Monnaie",
-      "Munition": "Munition",
-      "Musique": "Musique",
-      "Nombreastral": "Nombre astral",
-      "Nourritureboisson": "Nourriture & boisson",
-      "Objet": "Objet",
-      "Oeuvre": "Oeuvre",
-      "Ombre": "Ombre de Thanatos",
-      "Plante": "Plante",
-      "Poison": "Poison",
-      "Possession": "Possession",
-      "Potion": "Potion",
-      "Queue": "Queue de Dragon",
-      "Recettealchimique": "Recette alchimique",
-      "Recettecuisine": "Recette de cuisine",
-      "Rencontre": "Rencontre TMR",
-      "Service": "Service",
-      "Signedraconique": "Signe draconique",
-      "Sort": "Sort",
-      "Sortreserve": "Sort en réserve",
-      "Souffle": "Souffle de Dragon",
-      "Tache": "Tâche",
-      "Tarot": "Carte de tarot",
-      "Tete": "Tête de Dragon"
+      "arme": "Arme",
+      "armure": "Armure",
+      "blessure": "Blessure",
+      "casetmr": "Case TMR spéciale",
+      "chant": "Chant",
+      "competence": "Compétence",
+      "competencecreature": "Compétence de créature",
+      "conteneur": "Conteneur",
+      "danse": "Danse",
+      "empoignade": "Empoignade",
+      "extraitpoetique": "Extrait poetique",
+      "faune": "Faune",
+      "gemme": "Gemme",
+      "herbe": "Herbe",
+      "ingredient": "Ingrédient",
+      "jeu": "Jeu",
+      "livre": "Livre",
+      "maladie": "Maladie",
+      "meditation": "Méditation",
+      "monnaie": "Monnaie",
+      "munition": "Munition",
+      "musique": "Musique",
+      "nombreastral": "Nombre astral",
+      "nourritureboisson": "Nourriture & boisson",
+      "objet": "Objet",
+      "oeuvre": "Oeuvre",
+      "ombre": "Ombre de Thanatos",
+      "plante": "Plante",
+      "poison": "Poison",
+      "possession": "Possession",
+      "potion": "Potion",
+      "queue": "Queue de Dragon",
+      "recettealchimique": "Recette alchimique",
+      "recettecuisine": "Recette de cuisine",
+      "rencontre": "Rencontre TMR",
+      "service": "Service",
+      "signedraconique": "Signe draconique",
+      "sort": "Sort",
+      "sortreserve": "Sort en réserve",
+      "souffle": "Souffle de Dragon",
+      "tache": "Tâche",
+      "tarot": "Carte de tarot",
+      "tete": "Tête de Dragon"
    }
  },
  "EFFECT": {
--- a/module/actor.js
+++ b/module/actor.js
@ -95,25 +95,27 @@ export class RdDActor extends RdDBaseActorSang {
    return ![TYPES.competencecreature, TYPES.tarot, TYPES.service].includes(item.type)
  }

+  isPersonnageJoueur() {
+    return this.hasPlayerOwner && this.prototypeToken.actorLink
+  }
+
  isPersonnage() { return true }
  isHautRevant() { return this.system.attributs.hautrevant.value != "" }

  /* -------------------------------------------- */
-  getAgilite() { return Number(this.system.carac.agilite?.value ?? 0) }
-  getChance() { return Number(this.system.carac.chance?.value ?? 0) }
+  getAgilite() { return this.system.carac.agilite?.value ?? 0 }
+  getChance() { return this.system.carac.chance?.value ?? 0 }

-  getReveActuel() { return Misc.toInt(this.system.reve?.reve?.value ?? this.carac.reve.value) }
-  getChanceActuel() { return Misc.toInt(this.system.compteurs.chance?.value ?? 10) }
-  getMoralTotal() { return Number(this.system.compteurs.moral?.value ?? 0) }
+  getReveActuel() { return this.system.reve?.reve?.value ?? this.carac.reve.value ?? 0 }
+  getChanceActuel() { return this.system.compteurs.chance?.value ?? 10 }
+  getMoralTotal() { return this.system.compteurs.moral?.value ?? 0 }

  /* -------------------------------------------- */
  getEtatGeneral(options = { ethylisme: false }) {
-    const etatGeneral = Misc.toInt(this.system.compteurs.etat?.value)
-    if (options.ethylisme) {
-      // Pour les jets d'Ethylisme, on retire le malus d'éthylisme (p.162)
-      return etatGeneral - this.malusEthylisme()
-    }
-    return etatGeneral
+    const etatGeneral = this.system.compteurs.etat?.value ?? 0
+    // Pour les jets d'Ethylisme, on retire le malus d'éthylisme (p.162)
+    const annuleMalusEthylisme = options.ethylisme ? this.malusEthylisme() : 0
+    return etatGeneral - annuleMalusEthylisme
  }

  /* -------------------------------------------- */
@ -152,23 +154,26 @@ export class RdDActor extends RdDBaseActorSang {
  /* -------------------------------------------- */
  async $perteRevePotionsEnchantees() {
    let potions = this.itemTypes[TYPES.potion]
-      .filter(it => it.system.categorie.toLowerCase().includes('enchant') && !potion.system.prpermanent)
+      .filter(it => Grammar.includesLowerCaseNoAccent(it.system.categorie, 'enchanté') && !it.system.prpermanent)

-    const potionUpdates = await Promise.all(potions.map(async potion => {
-      console.log(potion)
-      let nouveauReve = (potion.system.pr > 0) ? potion.system.pr - 1 : 0;
-      const message = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-potionenchantee-chateaudormant.html`, {
-        pr: nouveauReve,
-        alias: this.name,
-        potionName: potion.name,
-        potionImg: potion.img
-      })
+    const potionUpdates = await Promise.all(potions.map(async it => {
+      const nouveauReve = Math.max(it.system.pr - 1, 0)
      ChatMessage.create({
        whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
-        content: message
-      });
-      return { _id: potion._id, 'system.pr': nouveauReve };
+        content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-potionenchantee-chateaudormant.html`, {
+          pr: nouveauReve,
+          alias: this.name,
+          potionName: it.name,
+          potionImg: it.img
+        })
+      })
+      return {
+        _id: it._id,
+        'system.pr': nouveauReve,
+        'system.quantite': nouveauReve > 0 ? it.system.quantite : 0
+      }
    }))
+
    await this.updateEmbeddedDocuments('Item', potionUpdates);
  }

@ -896,7 +901,7 @@ export class RdDActor extends RdDBaseActorSang {

  /* -------------------------------------------- */
  async ajouterRefoulement(value = 1, refouler) {
-    const refoulement = this.system.reve.refoulement.value + value;
+    let refoulement = this.system.reve.refoulement.value + value;
    const roll = new Roll("1d20");
    await roll.evaluate({ async: true });
    await roll.toMessage({ flavor: `${this.name} refoule ${refouler} pour ${value} points de refoulement (total: ${refoulement})` });
--- a/module/actor/base-actor-reve.js
+++ b/module/actor/base-actor-reve.js
@ -421,6 +421,10 @@ export class RdDBaseActorReve extends RdDBaseActor {
  /* -------------------------------------------- */
  async encaisser() { await RdDEncaisser.encaisser(this) }

+  async encaisserDommagesRemote(rollData, attackerId, show) {
+    const attacker = game.actors.get(attackerId);
+    await this.encaisserDommages(rollData, attacker, show)
+  }
  async encaisserDommages(rollData, attacker = undefined, show = undefined) {
    if (attacker && !await attacker.accorder(this, 'avant-encaissement')) {
      return;
@ -430,8 +434,8 @@ export class RdDBaseActorReve extends RdDBaseActor {
      RdDBaseActor.remoteActorCall({
        tokenId: this.token?.id,
        actorId: this.id,
-        method: 'encaisserDommages',
-        args: [rollData, show, attackerId]
+        method: 'encaisserDommagesRemote',
+        args: [rollData, attackerId, show]
      });
      return;
    }
--- a/module/actor/base-actor-sang-sheet.js
+++ b/module/actor/base-actor-sang-sheet.js
@ -21,6 +21,11 @@ export class RdDBaseActorSangSheet extends RdDBaseActorReveSheet {
    this.html.find('.creer-blessure-grave').click(async event => RdDItemBlessure.createBlessure(this.actor, 4));
    this.html.find('.creer-blessure-critique').click(async event => RdDItemBlessure.createBlessure(this.actor, 6));

+    this.html.find('.subir-blessure-contusion').click(async event => RdDItemBlessure.applyFullBlessure(this.actor, 2));
+    this.html.find('.subir-blessure-legere').click(async event => RdDItemBlessure.applyFullBlessure(this.actor, 2));
+    this.html.find('.subir-blessure-grave').click(async event => RdDItemBlessure.applyFullBlessure(this.actor, 4));
+    this.html.find('.subir-blessure-critique').click(async event => RdDItemBlessure.applyFullBlessure(this.actor, 6));
+
    this.html.find('.jet-vie').click(async event => this.actor.jetDeVie())
    this.html.find('.jet-endurance').click(async event => await this.jetEndurance())

--- a/module/actor/base-actor.js
+++ b/module/actor/base-actor.js
@ -85,6 +85,8 @@ export class RdDBaseActor extends Actor {
    return game.actors.get(actorId)
  }

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

  static getParentActor(document) {
--- a/module/actor/experience-log.js
+++ b/module/actor/experience-log.js
@ -12,7 +12,7 @@ export const XP_TOPIC = {
 export class ExperienceLog {

  static async add(actor, topic, from, to, raison, manuel = false) {
-    if (!actor.hasPlayerOwner || !actor.isPersonnage()) {
+    if (!actor.isPersonnageJoueur()) {
      return
    }
    if (from == to) {
--- a/module/item/blessure.js
+++ b/module/item/blessure.js
@ -1,6 +1,7 @@
 import { RdDItem } from "../item.js";
 import { Misc } from "../misc.js";
 import { RdDTimestamp } from "../time/rdd-timestamp.js";
+import { ChatUtility } from "../chat-utility.js";

 const BASE_TACHE_SOIN_BLESSURE = {
  type: "tache",
@ -14,10 +15,10 @@ const TACHES_SOIN_BLESSURE = {
 }

 const definitionsBlessures = [
-  { type: "contusion", gravite: 0, label: 'Contusion/éraflure', max: 100, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/eraflure.webp" },
-  { type: "legere", gravite: 2, label: 'Légère', max: 5, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
-  { type: "grave", gravite: 4, label: 'Grave', max: 2, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
-  { type: "critique", gravite: 6, label: 'Critique', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+  { type: "contusion", gravite: 0, endurance: "1d4", vie: 0, label: 'Contusion/éraflure', max: 100, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/eraflure.webp" },
+  { type: "legere", gravite: 2, endurance: "1d6", vie: 0, label: 'Légère', max: 5, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+  { type: "grave", gravite: 4, endurance: "2d6", vie: -2, label: 'Grave', max: 2, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+  { type: "critique", gravite: 6, endurance: "-100", vie: -4, label: 'Critique', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
  { type: "mort", gravite: 8, label: 'Mort', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/mort.webp" }
 ]

@ -40,6 +41,32 @@ export class RdDItemBlessure extends RdDItem {
    }
    return mergeObject(duplicate(BASE_TACHE_SOIN_BLESSURE), tache)
  }
+
+  static async applyFullBlessure(actor, gravite) {
+    const definition = RdDItemBlessure.getDefinition(gravite)
+    
+    let lostEndurance = 0
+    let lostVie = 0
+    if (definition.endurance) {
+      lostEndurance = new Roll(definition.endurance).roll({async: false}).total;
+      actor.santeIncDec("endurance", -Number(lostEndurance));
+    }
+    if (definition.vie) {
+      lostVie = definition.vie
+      actor.santeIncDec("vie", definition.vie)
+    }
+    
+    await this.createBlessure(actor, gravite)
+
+    ChatMessage.create({
+      content: `Blessure ${definition.label} appliquée à ${actor.name}`+
+        `<br>Perte d'endurance : ${lostEndurance}`+
+        `<br>Perte de Vie : ${lostVie}`,
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(actor.name)
+    });
+
+  }
+
  static async createBlessure(actor, gravite, localisation = '', attacker) {
    const definition = RdDItemBlessure.getDefinition(gravite)
    const blessure = {
--- a/module/misc.js
+++ b/module/misc.js
@ -46,7 +46,7 @@ export class Misc {
  }

  static typeName(type, subType) {
-    return subType ? game.i18n.localize(`TYPES.${type}.${Misc.upperFirst(subType)}`)
+    return subType ? game.i18n.localize(`TYPES.${type}.${subType}`)
      : '';
  }

--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@ -1282,7 +1282,7 @@ export class RdDCombat {
      attackerRoll.defenderTokenId = defenderTokenId;

      await this.computeRecul(defenderRoll);
-      this.defender.encaisserDommages(attackerRoll, this.attacker, defenderRoll?.show);
+      await this.defender.encaisserDommages(attackerRoll, this.attacker, defenderRoll?.show);
    }
    else { // envoi à un GM: les joueurs n'ont pas le droit de modifier les personnages qu'ils ne possèdent pas
      game.socket.emit(SYSTEM_SOCKET_ID, {
@ -1307,6 +1307,7 @@ export class RdDCombat {
      blessuresStatus: actor.computeResumeBlessure(),
      SConst: actor.getSConst(),
      actorId: actor.id,
+      actor: actor,
      tokenId: tokenId,
      isGrave: actor.countBlessures(it => it.isGrave()) > 0,
      isCritique: actor.countBlessures(it => it.isCritique()) > 0
--- a/module/rdd-commands.js
+++ b/module/rdd-commands.js
@ -16,6 +16,7 @@ import { RdDRollTables } from "./rdd-rolltables.js";
 import { RdDUtility } from "./rdd-utility.js";
 import { FenetreRechercheTirage } from "./tirage/fenetre-recherche-tirage.js";
 import { TMRUtility } from "./tmr-utility.js";
+import { DialogFatigueVoyage } from "./voyage/dialog-fatigue-voyage.js";

 const rddRollNumeric = /^(\d+)\s*([\+\-]?\d+)?\s*(s)?/;

@ -76,6 +77,7 @@ export class RdDCommands {
    this.registerCommand({ path: ["/tirer", "desir"], func: (content, msg, params) => RdDRollTables.getDesirLancinant('chat'), descr: "Tire un Désir Lancinant" });
    this.registerCommand({ path: ["/tirer", "rencontre"], func: (content, msg, params) => this.getRencontreTMR(params), descr: `Détermine une rencontre dans les TMR (synonyme de "/tmrr")` });
    this.registerCommand({ path: ["/tirage"], func: (content, msg, params) => this.tirage(), descr: "Ouvre la fenêtre de recherche et tirage" });
+    this.registerCommand({ path: ["/voyage"], func: (content, msg, params) => this.voyage(msg, params), descr: "Gérer le voyage" });

    this.registerCommand({ path: ["/sommeil"], func: (content, msg, params) => this.sommeil(msg, params), descr: "Prépare le passage de journée pour chateau dormant" });
    this.registerCommand({ path: ["/meteo"], func: (content, msg, params) => this.getMeteo(msg, params), descr: "Propose une météo marine" });
@ -298,7 +300,7 @@ export class RdDCommands {
  async getRencontreTMR(params) {
    if (params.length == 1 || params.length == 2) {
      return game.system.rdd.rencontresTMR.rollRencontre(params[0], params[1])
-    }
+    }    
    return false;
  }

@ -461,14 +463,13 @@ export class RdDCommands {

      let motif = params.slice(1, params.length - 2);
      let name = params[params.length - 1];
+      const personnages = game.actors.filter(actor => actor.isPersonnageJoueur());
      if (name == undefined) {
-        for (let actor of game.actors) {
-          // TODO: ne plus stresser les entités de cauchemar!
+        for (let actor of personnages) {
          await actor.distribuerStress('stress', stress, motif);
        }
      } else {
-        //console.log(stressValue, nomJoueur);
-        let actor = Misc.findActor(name, game.actors.filter(it => it.hasPlayerOwner)) ?? Misc.findPlayer(name)?.character
+        let actor = Misc.findActor(name, personnages) ?? Misc.findPlayer(name)?.character
        if (actor) {
          await actor.distribuerStress('stress', stress, motif);
        }
@ -485,10 +486,13 @@ export class RdDCommands {
  }

  async tirage() {
-    FenetreRechercheTirage.create();
+    FenetreRechercheTirage.create()
+  }
+  async voyage() {
+    DialogFatigueVoyage.create()
  }
  async sommeil() {
-    DialogChateauDormant.create();
+    DialogChateauDormant.create()
  }
 }

--- a/module/rdd-main.js
+++ b/module/rdd-main.js
@ -266,16 +266,16 @@ export class SystemReveDeDragon {
    /* -------------------------------------------- */
    /*  Foundry VTT Initialization                  */
    /* -------------------------------------------- */
-    // CSS patch for v9
-    if (game.version) {
-      let sidebar = document.getElementById("sidebar");
-      sidebar.style.width = "min-content";
-    }
    game.system.rdd.calendrier = new RdDCalendrier();
    if (Misc.isUniqueConnectedGM()) {
      new Migrations().migrate();
      this.messageDeBienvenue();
-      this.registerUsageCount(SYSTEM_RDD);
+      import("https://www.uberwald.me/fvtt_appcount/count-class-ready.js").then(moduleCounter=>{
+        console.log("ClassCounter loaded", moduleCounter)
+        moduleCounter.ClassCounter.registerUsageCount()
+      }).catch(err=>
+        console.log("No stats available, giving up.")
+      )    
    }

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

 SystemReveDeDragon.start();
--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@ -44,16 +44,15 @@ export class RdDTMRDialog extends Dialog {
      type: Number,
      range: TMR_DISPLAY_SIZE.range
    })
-    await PixiTMR.init()
  }

  static async create(actor, tmrData) {
+    await PixiTMR.init()
    let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-tmr.html', tmrData);
-
    if (tmrData.mode != 'visu' && !game.user.isGM) {
      ChatMessage.create({ content: actor.name + " est monté dans les TMR en mode : " + tmrData.mode, whisper: ChatMessage.getWhisperRecipients("GM") });
    }
-    return new RdDTMRDialog(html, actor, tmrData);
+    return new RdDTMRDialog(html, actor, tmrData)
  }

  /* -------------------------------------------- */
@ -298,13 +297,12 @@ export class RdDTMRDialog extends Dialog {

  /* -------------------------------------------- */
  async updateValuesDisplay() {
-    if (!this.rendered) {
+    if (this.viewOnly || !this.rendered) {
      return;
    }
    const coord = this._getCoordActor();
-
    HtmlUtility.showControlWhen(this.html.find(".lire-signe-draconique"), this.actor.isResonanceSigneDraconique(coord));
-
+    
    let ptsreve = document.getElementById("tmr-pointsreve-value");
    ptsreve.innerHTML = this.actor.system.reve.reve.value;

@ -700,7 +698,6 @@ export class RdDTMRDialog extends Dialog {
  }

  async _resultatMaitriseCaseHumide(rollData) {
-    await this.souffleSiEchecTotal(rollData);
    if (rollData.rolled.isSuccess && rollData.double) {
      rollData.previous = { rolled: rollData.rolled, ajustements: rollData.ajustements };
      rollData.double = undefined;
@ -715,6 +712,7 @@ export class RdDTMRDialog extends Dialog {
    if (rollData.rolled.isEchec) {
      await this.close();
    }
+    await this.souffleSiEchecTotal(rollData);
  }

  /* -------------------------------------------- */
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@ -63,12 +63,6 @@ const cumulFatigueMatrix = _cumulSegmentsFatigue(fatigueMatrix);
 const fatigueMalus = [0, 0, 0, -1, -1, -1, -2, -3, -4, -5, -6, -7]; // Provides the malus for each segment of fatigue
 const fatigueLineSize = [3, 6, 7, 8, 9, 10, 11, 12];
 const fatigueLineMalus = [0, -1, -2, -3, -4, -5, -6, -7];
-const fatigueMarche = {
-  "aise": { "4": 1, "6": 2, "8": 3, "10": 4, "12": 6 },
-  "malaise": { "4": 2, "6": 3, "8": 4, "10": 6 },
-  "difficile": { "4": 3, "6": 4, "8": 6 },
-  "tresdifficile": { "4": 4, "6": 6 }
-}

 /* -------------------------------------------- */
 const nomEthylisme = ["Emeché", "Gris", "Pinté", "Pas frais", "Ivre", "Bu", "Complètement fait", "Ivre mort"];
@ -208,6 +202,8 @@ export class RdDUtility {
      'systems/foundryvtt-reve-de-dragon/templates/coeur/afficher-coeur.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/tirage/liste-resultats-recherche.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/time/horloge.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/voyage/fatigue-actor.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/voyage/option-vitesse-fatigue.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/common/timestamp.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/common/periodicite.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/common/enum-duree.hbs',
@ -288,6 +284,7 @@ export class RdDUtility {
    Handlebars.registerHelper('timestamp-formulesDuree', () => RdDTimestamp.formulesDuree());
    Handlebars.registerHelper('timestamp-formulesPeriode', () => RdDTimestamp.formulesPeriode());

+    Handlebars.registerHelper('array-includes', (array, value) => array.includes(value));
    Handlebars.registerHelper('min', (...args) => Math.min(...args.slice(0, -1)));
    Handlebars.registerHelper('regle-optionnelle', (option) => ReglesOptionnelles.isUsing(option));
    Handlebars.registerHelper('trier', list => list.sort((a, b) => a.name.localeCompare(b.name)));
--- a/module/settings/status-effects.js
+++ b/module/settings/status-effects.js
@ -70,7 +70,7 @@ export class StatusEffects extends FormApplication {
    if (statusDemiSurprise.intersects(effect.statuses)) {
      return 1
    }
-    if (isCombat && effect.statuses.includes(STATUSES.StatusDemiReve)) {
+    if (isCombat && effect.statuses.find(e => e == STATUSES.StatusDemiReve)) {
      return 1
    }
    return 0
--- a/module/sommeil/app-astrologie.js
+++ b/module/sommeil/app-astrologie.js
@ -85,7 +85,7 @@ export class AppAstrologie extends Application {
      const nbAstral = calendrier.getNombreAstral()
      const heures = RdDTimestamp.heures();
      return {
-        ajustementsActors: game.actors.filter(it => it.isPersonnage() && it.hasPlayerOwner)
+        ajustementsActors:game.actors.filter(actor => actor.isPersonnageJoueur())
          .map(actor => this.getAjustementActor(actor, nbAstral, heures)),
        nombresAstraux: calendrier.getNombresAstraux().map(na => this.getDetailNombreAstral(na))
      }
@ -116,10 +116,10 @@ export class AppAstrologie extends Application {
    super.activateListeners(html);
    this.html = html;
    this.html.find('select[name="signe-astral"]').change(event => {
-      this.selectNombreAstral(this.html.find('select[name="signe-astral"]').val());
+      this.selectNombreAstral(event.currentTarget.value);
    })
    this.html.find('select[name="signe-naissance"]').change(event => {
-      this.selectHeureNaissance(this.html.find('select[name="signe-naissance"]').val());
+      this.selectHeureNaissance(event.currentTarget.value);
    })
    this.html.find('td.nombre-astral').click(event => {
      this.selectNombreAstral(Number.parseInt(event.currentTarget.attributes['data-nombre-astral'].value) - 1);
--- a/module/sommeil/dialog-chateau-dormant.js
+++ b/module/sommeil/dialog-chateau-dormant.js
@ -3,10 +3,8 @@ export class DialogChateauDormant extends Dialog {

  static async create() {
    const date = game.system.rdd.calendrier.dateCourante();
-    const actors = game.actors.filter(actor => actor.hasPlayerOwner && actor.isPersonnage());
-
    const dialogData = {
-      actors: actors,
+      actors: game.actors.filter(actor => actor.isPersonnageJoueur()),
      date: date,
      motifStress: `Nuit du ${date}`,
      finChateauDormant: game.system.rdd.calendrier.getTimestampFinChateauDormant()
--- a/module/sommeil/dialog-repos.js
+++ b/module/sommeil/dialog-repos.js
@ -21,7 +21,7 @@ export class DialogRepos extends Dialog {
  }

  constructor(html, actor) {
-    let options = { classes: ["DialogCreateSigneDraconiqueActorsActors"], width: 400, height: 'fit-content', 'z-index': 99999 };
+    let options = { classes: ["dialog-repos"], width: 400, height: 'fit-content', 'z-index': 99999 };
    let conf = {
      title: "Se reposer",
      content: html,
--- a/module/sommeil/dialog-stress.js
+++ b/module/sommeil/dialog-stress.js
@ -6,7 +6,7 @@ export class DialogStress extends Dialog {
      motif: "Motif",
      stress: 10,
      immediat: false,
-      actors: game.actors.filter(actor => actor.hasPlayerOwner && actor.isPersonnage())
+      actors: game.actors.filter(actor => actor.isPersonnageJoueur())
        .map(actor => ({
            id: actor.id,
            name: actor.name,
--- a/module/tmr-rencontres.js
+++ b/module/tmr-rencontres.js
@ -39,6 +39,8 @@ export class TMRRencontres {
    const frequence = it => it.system.frequence[codeTerrain];
    const row = await this.table.getRandom(frequence, filtreMauvaise, forcedRoll);
    if (row) {
+      console.log("DORM", row);
+      //row.document.system.computedForce = new Roll(row.document.system.formula).roll({async: false}).total; 
      await CompendiumTableHelpers.tableRowToChatMessage(row);
    }

--- a/module/tmr/pixi-tmr.js
+++ b/module/tmr/pixi-tmr.js
@ -1,4 +1,3 @@
-import { SYSTEM_RDD } from "../constants.js";
 import { Misc } from "../misc.js";
 import { TMRConstants, tmrTokenZIndex } from "../tmr-constants.js";
 import { TMRUtility } from "../tmr-utility.js";
@ -14,12 +13,12 @@ export class PixiTMR {
  static register(name, img) {
    PixiTMR.textures[name] = img;
  }
+
  static async init() {
    await Promise.all(
      Object.values(PixiTMR.textures)
-        .filter(img => img != undefined)
-        .map(async img => PIXI.Sprite.from(await PIXI.Assets.load(img)))
-    )
+        .filter(img => img != undefined && !PIXI.utils.TextureCache[img])
+        .map(async img => PIXI.Sprite.from(await PIXI.Assets.load(img))))
  }

  constructor(tmrDialog, displaySize) {
@ -106,8 +105,9 @@ export class PixiTMR {

  sprite(code, options = {}) {
    let img = PixiTMR.getImgFromCode(code)
-    const texture = PIXI.utils.TextureCache[img]
+    let texture = PIXI.utils.TextureCache[img]
    if (!texture) {
+      // TODO: charger la texture
      console.error("Texture manquante", code, PIXI.utils.TextureCache)
      return;
    }
--- a/module/voyage/dialog-fatigue-voyage.js
+++ b/module/voyage/dialog-fatigue-voyage.js
@ -0,0 +1,181 @@
+import { TYPES } from "../item.js"
+import { RdDItemCompetence } from "../item-competence.js"
+import { ChatUtility } from "../chat-utility.js"
+
+const CODES_COMPETENCES_VOYAGE = ['Extérieur', 'Forêt', 'Montagne', 'Marais', 'Glace', 'Equitation']
+const TABLEAU_FATIGUE_MARCHE = [
+  {
+    code: "aise", label: "Aisé", description: "Route ou chemin",
+    survies: ['Extérieur', 'Equitation'],
+    vitesses: [{ vitesse: 4, fatigue: 1 }, { vitesse: 6, fatigue: 2 }, { vitesse: 8, fatigue: 3 }, { vitesse: 10, fatigue: 4 }, { vitesse: 12, fatigue: 6 }],
+  },
+  {
+    code: "malaise", label: "Malaisé", description: "Hors piste (herbes et buissons)",
+    survies: ['Extérieur', 'Equitation'],
+    vitesses: [{ vitesse: 4, fatigue: 2 }, { vitesse: 6, fatigue: 3 }, { vitesse: 8, fatigue: 4 }, { vitesse: 10, fatigue: 6 }],
+  },
+  {
+    code: "difficile", label: "Difficile", description: "Hors piste (collines, forêt)",
+    survies: ['Extérieur', 'Forêt', 'Glace', 'Equitation'],
+    vitesses: [{ vitesse: 4, fatigue: 3 }, { vitesse: 6, fatigue: 4 }, { vitesse: 8, fatigue: 6 }],
+  },
+  {
+    code: "tresdifficile", label: "Très difficile", description: "Hors piste (montagne, jungle, marais)",
+    survies: ['Forêt', 'Montagne', 'Marais', 'Glace'],
+    vitesses: [{ vitesse: 4, fatigue: 4 }, { vitesse: 6, fatigue: 6 }],
+  },
+]
+
+export class DialogFatigueVoyage extends Dialog {
+  static dialog = undefined
+  static async create() {
+    if (!game.user.isGM) {
+      return
+    }
+    if (!DialogFatigueVoyage.dialog) {
+      const parameters = {
+        tableauFatigueMarche: TABLEAU_FATIGUE_MARCHE,
+        playerActors: game.actors.filter(actor => actor.isPersonnageJoueur())
+          .map(actor => DialogFatigueVoyage.prepareActor(actor)),
+        nombreHeures: 1,
+      }
+      DialogFatigueVoyage.setModeDeplacement(parameters, undefined, undefined)
+
+      const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/voyage/dialog-fatigue-voyage.hbs", parameters);
+      DialogFatigueVoyage.dialog = new DialogFatigueVoyage(html, parameters);
+    }
+    DialogFatigueVoyage.dialog.render(true);
+  }
+
+  static setModeDeplacement(parameters, code, vitesse) {
+    const ligneFatigueMarche = TABLEAU_FATIGUE_MARCHE.find(it => it.code == code) ?? TABLEAU_FATIGUE_MARCHE[0]
+    const rythme = ligneFatigueMarche.vitesses.find(it => it.vitesse == vitesse) ?? ligneFatigueMarche.vitesses[0]
+    parameters.typeTerrain = ligneFatigueMarche
+    parameters.vitesseDeplacement = rythme.vitesse
+    parameters.fatigueHoraire = rythme.fatigue
+  }
+
+  static prepareActor(actor) {
+    const competencesVoyage = {}
+    CODES_COMPETENCES_VOYAGE.forEach(codeSurvie =>
+      competencesVoyage[codeSurvie] = RdDItemCompetence.findCompetence(actor.itemTypes[TYPES.competence], codeSurvie, { onMessage: () => { } })
+    )
+    return {
+      actor: actor,
+      selected: true,
+      ajustementFatigue: 0,
+      competencesVoyage: competencesVoyage
+    }
+  }
+
+
+  constructor(html, parameters) {
+    const options = {
+      classes: ["dialog-fatigue-voyage"],
+      width: 600,
+      height: 'fit-content',
+      'max-height': 900,
+      'z-index': 99999
+    }
+    const conf = {
+      title: "Fatigue de voyage",
+      content: html,
+      buttons: {}
+    }
+    super(conf, options);
+    this.parameters = parameters
+    this.controls = {}
+  }
+
+  activateListeners(html) {
+    if (this.html == undefined) {
+      html.find('select[name="code-terrain"]').trigger("focus")
+    }
+    this.html = html;
+    super.activateListeners(html);
+
+    this.html.find('select[name="code-terrain"]').change(event => this.changeParameters())
+    this.html.find('select[name="vitesse-deplacement"]').change(event => this.changeParameters())
+    this.html.find('input[name="nombre-heures"]').change(event => this.changeParameters())
+    this.html.find('button[name="appliquer-fatigue"]').click(event => this.appliquerFatigue())
+  }
+
+  changeParameters() {
+    this.changeTerrain(this.html.find('select[name="code-terrain"]').val())
+    this.changeVitesse(this.html.find('select[name="vitesse-deplacement"]').val())
+    this.changeNombreHeures(this.html.find('input[name="nombre-heures"]').val())
+    this.setFatigue()
+  }
+
+  async changeTerrain(codeTerrain) {
+    if (this.parameters.typeTerrain.code != codeTerrain) {
+      const selectVitesseDeplacement = this.html.find('select[name="vitesse-deplacement"]')
+      const vitesse = selectVitesseDeplacement.val()
+      selectVitesseDeplacement.empty()
+
+      DialogFatigueVoyage.setModeDeplacement(this.parameters, codeTerrain, vitesse)
+      this.parameters.typeTerrain.vitesses.forEach(async rythme => {
+        selectVitesseDeplacement.append(await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/voyage/option-vitesse-fatigue.hbs', rythme))
+      })
+      selectVitesseDeplacement.val(this.parameters.vitesseDeplacement).change()
+    }
+  }
+
+  async changeVitesse(vitesse) {
+    if (this.parameters.vitesseDeplacement != vitesse) {
+      DialogFatigueVoyage.setModeDeplacement(this.parameters, this.parameters.typeTerrain.code, vitesse)
+    }
+  }
+
+  async changeNombreHeures(nombreHeures) {
+    this.parameters.nombreHeures = parseInt(nombreHeures)
+  }
+
+  async setFatigue() {
+    this.html.find('input[name="base-fatigue"]').val(this.parameters.nombreHeures * this.parameters.fatigueHoraire)
+  }
+
+  async appliquerFatigue() {
+    const fatigueBase = parseInt(this.html.find('input[name="base-fatigue"]').val() ?? 0)
+    const actors = jQuery.map(
+      this.html.find('div.fatigue-actors-list li.list-item'),
+      it => this.$extractActor(this.html.find(it))
+    )
+    actors.filter(it => it.selected)
+    .forEach(async it => {
+        const perteFatigue = fatigueBase + it.ajustement
+        ChatMessage.create({
+          whisper: ChatUtility.getWhisperRecipientsAndGMs(it.actor.name),
+          content: await renderTemplate(
+            'systems/foundryvtt-reve-de-dragon/templates/voyage/chat-fatigue_voyage.hbs', mergeObject(it,
+              {
+                parameters: this.parameters,
+                fatigueBase: fatigueBase,
+                perteFatigue: perteFatigue,
+                isVoyage: fatigueBase == this.parameters.nombreHeures * this.parameters.fatigueHoraire
+              })
+          ),
+        })
+        await it.actor.santeIncDec("fatigue", perteFatigue)
+      })
+  }
+
+  $extractActor(actorRow) {
+    const actor = game.actors.get(actorRow.data('actor-id'))
+    if (!actor) {
+      ui.notifications.warn(`Acteur ${it.actorId} introuvable`)
+    }
+    return {
+      actor: actor,
+      ajustement: parseInt(actorRow.find('input[name="ajustement-fatigue"]').val() ?? 0),
+      selected: actor && actorRow.find('input[name="selectionner-acteur"]').is(':checked')
+    }
+  }
+
+  async close() {
+    DialogFatigueVoyage.dialog = undefined
+    await super.close()
+  }
+
+
+}
--- a/styles/simple.css
+++ b/styles/simple.css
@ -93,6 +93,7 @@
  --background-control-selected: linear-gradient(to bottom, hsla(0, 100%, 25%, 0.5) 5%, hsla(0, 100%, 12%, 0.5) 100%);
  --background-tooltip: hsla(60, 12%, 85%, 0.95);
  --background-error:hsla(16, 100%, 50%, 0.8);
+  --color-profile-border: hsla(0, 0%, 80%, 0.05);
 }

 /*@import url("https://fonts.googleapis.com/css2?family=Martel:wght@400;800&family=Roboto:wght@300;400;500&display=swap");*/
@ -195,11 +196,10 @@ i:is(.fas, .far, .fa-solid, .fa-regular, .fa-sharp ) {
  flex: 0 0 110px;
  height: 110px;
  width: 110px;
-  margin-right: 0.5rem;
-  object-fit: scale-down;
-  object-position: 50% 0;
-  margin: 0.1rem;
+  padding: 0.2rem;
  object-fit: contain;
+  background-color: var(--color-profile-border);
+  border: 1px solid var(--color-profile-border);
 }

 .system-foundryvtt-reve-de-dragon .rdd-item-sheet-tarot img.profile-img {
@ -433,6 +433,7 @@ table {border: 1px solid #7a7971;}
 }
 .flex-shrink {
  flex: 'flex-shrink' ;
+  flex-shrink: 2;
 }
 :is(.flex-grow, .flex-grow-3) {
  flex-grow: 3;
@ -440,7 +441,19 @@ table {border: 1px solid #7a7971;}
 .flex-grow-2 {
  flex-grow: 2;
 }
+.flex-grow-1 {
+  flex-grow: 1;
+}
+.flex-grow-0-5 {
+  flex-grow: 0.5;
+}
+.voyage-liste-survies {
+  max-width: 12rem;
+}
 /* Styles limited to foundryvtt-reve-de-dragon sheets */
+.texte-dans-liste {
+  text-align: left;
+}
 .equipement-nom {
  flex-grow : 4;
  margin: 0;
@ -963,12 +976,6 @@ section.sheet-body {
  padding: 0.25rem 0.5rem;
 }

-.sheet header.sheet-header :is(.profile-img, .profile-img-token) {
-  object-fit: scale-down;
-  object-position: 50% 0;
-  margin: 0.5rem 0 0.5rem  0.5rem;
-  padding: 0;
-}
 .sheet header.sheet-header h1 {
  flex: 3;
 }
@ -1174,7 +1181,7 @@ ul.chat-list li:nth-child(odd) {
  border-radius: 0.25rem;
  padding: 0.1rem;
  flex: 1 1 1.5rem;
-  display: flex !important;
+  display: flex;
  align-items: center !important;
 }

@ -1315,10 +1322,7 @@ div.competence-column div.categorie-competence{
  margin-right: 0.2rem;
  margin-left: 0.2rem;
 }
-.blessures-title { 
-  font-weight: bold;
-}
-.alchimie-title { 
+.item-label { 
  font-weight: bold;
 }
 .pointsreve-value {
--- a/system.json
+++ b/system.json
@ -1,8 +1,8 @@
 {
  "id": "foundryvtt-reve-de-dragon",
  "title": "Rêve de Dragon",
-  "version": "11.2.10",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.2.10.zip",
+  "version": "11.2.19",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.2.19.zip",
  "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v11/system.json",
  "changelog": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v11/changelog.md",
  "compatibility": {
--- a/template.json
+++ b/template.json
@ -525,15 +525,11 @@
  },
  "Item": {
    "types": [
-        "competence", "competencecreature",
-        "recettealchimique", "musique", "chant", "danse", "jeu", "recettecuisine", "oeuvre",
-        "objet", "arme", "armure", "conteneur", "herbe", "plante", "ingredient", "faune", "livre", "potion", "munition",
-        "monnaie", "nourritureboisson", "gemme",
-        "service",
-        "meditation", "rencontre", "queue", "ombre", "souffle", "tete", "casetmr", "signedraconique", "sort", "sortreserve",
-        "nombreastral", "tache", "blessure", "maladie", "poison", "possession",
-        "tarot", "extraitpoetique", "empoignade"
-    ],
+        "arme", "armure", "blessure", "casetmr", "chant", "competence", "competencecreature", "conteneur", "danse", 
+        "empoignade", "extraitpoetique", "faune", "gemme", "herbe", "ingredient", "jeu", "livre", "maladie", "meditation",
+        "monnaie", "munition", "musique", "nombreastral", "nourritureboisson", "objet", "oeuvre", "ombre", "plante", "possession", 
+        "poison", "potion", "queue", "recettealchimique", "recettecuisine", "rencontre", 
+        "service" ,"signedraconique", "sort", "sortreserve", "souffle", "tarot", "tache", "tete" ],
    "templates": {
      "description": {
        "description": "",
--- a/templates/actor/alchimie.html
+++ b/templates/actor/alchimie.html
@ -3,10 +3,12 @@
 <ul class="item-list alterne-list">
  {{#each (trier recettesAlchimiques) as |recette id|}}
  <li class="item flexrow list-item" data-item-id="{{recette._id}}"><span class="competence-title recette-label item-edit"><a>{{recette.name}}</a></span>
-    <div class="item-controls flex-shrink">
-      <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
-      <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
-    </div>
+    <div class="item-controls">
+      <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+      &nbsp;
+      <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
+  </div>
  </li>
  {{/each}}
 </ul>
--- a/templates/actor/blessure.hbs
+++ b/templates/actor/blessure.hbs
@ -36,6 +36,7 @@
  <span class="item-controls">
    <a class="item-edit" data-tooltip="Editer"><i class="fas fa-edit"></i></a>
    <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+    &nbsp;
    <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
  </span>
 </li>
--- a/templates/actor/blessures.html
+++ b/templates/actor/blessures.html
@ -1,8 +1,14 @@
-<h4>blessures</h4>
+<h4>Blessures</h4>
 <div>
-  <a class="chat-card-button creer-blessure-legere" data-tooltip="Ajouter une blessure légère"><i class="fas fa-plus-circle"></i> légère</a>
-  <a class="chat-card-button creer-blessure-grave" data-tooltip="Ajouter une blessure grave"><i class="fas fa-plus-circle"></i> grave</a>
-  <a class="chat-card-button creer-blessure-critique" data-tooltip="Ajouter une blessure critque"><i class="fas fa-plus-circle"></i> critique</a>
+  <a class="chat-card-button creer-blessure-legere" data-tooltip="Ajouter une légère"><i class="fas fa-plus-circle"></i> légère</a>
+  <a class="chat-card-button creer-blessure-grave" data-tooltip="Ajouter une grave"><i class="fas fa-plus-circle"></i> grave</a>
+  <a class="chat-card-button creer-blessure-critique" data-tooltip="Ajouter une critique"><i class="fas fa-plus-circle"></i> critique</a>
+</div>
+<div>
+  <a class="chat-card-button subir-blessure-contusion" data-tooltip="Subir une contusion (avec perte d'Endurance)"><i class="fas fa-swords"></i> contusion</a>
+  <a class="chat-card-button subir-blessure-legere" data-tooltip="Subir une légère (avec perte d'Endurance)"><i class="fas fa-swords"></i> légère</a>
+  <a class="chat-card-button subir-blessure-grave" data-tooltip="Subir une grave (avec perte d'Endurance/Vie)"><i class="fas fa-swords"></i> grave</a>
+  <a class="chat-card-button subir-blessure-critique" data-tooltip="Subir une critique (avec perte d'Endurance/Vie)"><i class="fas fa-swords"></i> critique</a>
 </div>

 <ul class="item-list alterne-list">
--- a/templates/actor/chirurgie.html
+++ b/templates/actor/chirurgie.html
@ -12,9 +12,11 @@
      <img class="sheet-competence-img" src="{{tache.img}}"/>
      <span class="competence-title tache-label"><a>{{tache.name}}
        ({{tache.system.points_de_tache_courant}}/{{tache.system.points_de_tache}})</a></span>
-      <div class="item-controls flex-shrink">
-        <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
-        <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+      <div class="item-controls">
+        <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
+        <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+        &nbsp;
+        <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
      </div>
    </li>
    {{/if}}
--- a/templates/actor/combat.html
+++ b/templates/actor/combat.html
@ -64,8 +64,8 @@
    </span>
    <span class="competence-value">{{emp.system.pointsemp}}</span>
    <div class="item-controls">
-      <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
-      <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+      <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
    </div>
  </li>
  {{/each}}
--- a/templates/actor/comp-creature.html
+++ b/templates/actor/comp-creature.html
@ -23,8 +23,8 @@
      />
    {{#if @root.options.vueDetaillee}}
    <div class="item-controls">
-      <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
-      <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+      <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
    </div>
    {{/if}}
  </li>
--- a/templates/actor/comp-possession.html
+++ b/templates/actor/comp-possession.html
@ -6,8 +6,8 @@
      <img class="sheet-competence-img" src="{{possession.img}}" data-tooltip="{{possession.name}}"/>
      <span class="competence-label">{{possession.name}}</span>
      <div class="item-controls">
-        <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
-        <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+        <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
+        <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
      </div>
    </li>
    {{/each}}
--- a/templates/actor/competence.html
+++ b/templates/actor/competence.html
@ -48,7 +48,9 @@
      {{#if @root.options.isGM}}
      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
      {{/if}}
-    </div>
+      &nbsp;
+      <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
+  </div>
    {{/if}}
  </li>
 {{/unless}}
--- a/templates/actor/dragon-queue.html
+++ b/templates/actor/dragon-queue.html
@ -8,7 +8,8 @@
    <a>{{queue.name}}</a>
  </span>
  <div class="item-controls">
-    <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+    <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+    <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
    {{#if queue.system.refoulement}}
    <a class="item-action">Refouler</a>
    {{/if}}
--- a/templates/actor/dragon-souffles.html
+++ b/templates/actor/dragon-souffles.html
@ -5,8 +5,9 @@
  <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}" data-tooltip="Souffle: {{souffle.name}}">
    <img class="sheet-competence-img" src="{{souffle.img}}"/>
    <span class="item-edit flex-grow"><a>{{souffle.name}}</a></span>
-    <div class="item-controls flex-shrink">
-      <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+    <div class="item-controls">
+      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+      <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
    </div>
  </li>
  {{/each}}
--- a/templates/actor/dragon-tetes.html
+++ b/templates/actor/dragon-tetes.html
@ -5,8 +5,9 @@
  <li class="item flexrow" data-attribute={{key}} data-item-id="{{tete._id}}" data-tooltip="Tête: {{tete.name}}">
    <img class="sheet-competence-img" src="{{tete.img}}"/>
    <span class="item-edit flex-grow"><a>{{tete.name}}</a></span>
-    <div class="item-controls flex-shrink">
-      <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+    <div class="item-controls">
+      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+      <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
    </div>
  </li>
  {{/each}}
--- a/templates/actor/hr-casestmr.html
+++ b/templates/actor/hr-casestmr.html
@ -6,8 +6,10 @@
      <img class="sheet-competence-img" src="{{casetmr.img}}"/>
      <span class="item-edit"><a>{{casetmr.name}}</a></span>
      <span>{{casetmr.system.coord}} - {{caseTmr-label casetmr.system.coord}}</span> 
-      <div class="item-controls flex-shrink">
+      <div class="item-controls">
        <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+        &nbsp;
+        <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
      </div>
    </li>
    {{/each}}
--- a/templates/actor/hr-meditations.html
+++ b/templates/actor/hr-meditations.html
@ -5,9 +5,11 @@
  <li class="item flexrow" data-item-id="{{meditation._id}}" data-attribute="{{key}}" data-tooltip="Méditation: {{meditation.name}}">
    <img class="sheet-competence-img" src="{{meditation.img}}"/>
    <span class="meditation-label flex-grow"><a data-item-id="{{meditation._id}}">{{meditation.name}} - {{meditation.system.competence}}</a></span> 
-    <div class="item-controls flex-shrink">
+    <div class="item-controls">
      <a class="item-edit" data-tooltip="Editer"><i class="fas fa-edit"></i></a>
      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+      &nbsp;
+      <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
    </div>
  </li>
  {{/each}}
--- a/templates/actor/hr-rencontres.html
+++ b/templates/actor/hr-rencontres.html
@ -10,7 +10,7 @@
    {{#if rencontre.system.date}}
    <span class="flex-shrink">{{upperFirst rencontre.system.heure}}, le {{rencontre.system.date}}</span> 
    {{/if}}
-    <div class="item-controls flex-shrink">
+    <div class="item-controls">
      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
    </div>
  </li>
--- a/templates/actor/hr-signes-draconiques.html
+++ b/templates/actor/hr-signes-draconiques.html
@ -6,7 +6,7 @@
      <img class="sheet-competence-img" src="{{signe.img}}"/>
      <span class="item-edit flex-grow"><a>{{signe.name}}</a></span> 
      <span class="flex-shrink">{{signe.system.difficulte}}</span>
-      <div class="item-controls flex-shrink">
+      <div class="item-controls">
        <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
      </div>
    </li>
--- a/templates/actor/hr-sorts-reserve.html
+++ b/templates/actor/hr-sorts-reserve.html
@ -7,7 +7,7 @@
    <img class="sheet-competence-img" src="{{sort.img}}"/>
    <span class="item-edit"><a>{{#if sort.system.echectotal}}Echec total: {{/if}}{{sort.name}} r{{sort.system.ptreve}}</a></span> 
    <span>{{sort.system.coord}} - {{caseTmr-label sort.system.coord}}</span> 
-    <div class="item-controls flex-shrink">
+    <div class="item-controls">
      <a class="item-delete flex-shrink" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
    </div>
  </li>
--- a/templates/actor/hr-sorts.html
+++ b/templates/actor/hr-sorts.html
@ -4,15 +4,16 @@
  {{#each (trier sorts) as |sort key|}}
  <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}"  data-tooltip="{{#if sort.system.isrituel}}Rituel{{else}}Sort{{/if}}: {{sort.name}}">
    <img class="sheet-competence-img" src="{{sort.img}}"/>
-    <span class="item-edit flex-grow-2">
+    <span class="item-edit flex-grow-3">
      <a data-item-id="{{sort._id}}">{{sort.name}}
        - {{#if sort.system.caseTMRspeciale}}{{sort.system.caseTMRspeciale}}{{else}}{{upperFirst sort.system.caseTMR}}{{/if}}
      </a>
    </span>
-    <span>{{#if sort.system.isrituel}}Rituel{{/if}}</span>
-    <span>{{sort.system.draconic}} / {{sort.system.difficulte}}</span>
+    <span class="flex-grow-0-5">{{#if sort.system.isrituel}}Rituel{{/if}}</span>
+    <span class="flex-grow-2">{{sort.system.draconic}}/{{sort.system.difficulte}}</span>
    <div class="item-controls flex-shrink">
      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+      <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
    </div>
  </li>
  {{/each}}
--- a/templates/actor/jeux.html
+++ b/templates/actor/jeux.html
@ -4,9 +4,11 @@
  {{#each jeux as |jeu id|}}
  <li class="item flexrow list-item" data-item-id="{{jeu._id}}">
    <span class="competence-title jeu-label"><a>{{jeu.name}} (base {{jeu.system.base}})</a></span>
-    <div class="item-controls flex-shrink">
-      <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
-      <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+    <div class="item-controls">
+      <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+      &nbsp;
+      <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
    </div>
  </li>
  {{/each}}
--- a/templates/actor/liens-suivants.hbs
+++ b/templates/actor/liens-suivants.hbs
@ -22,7 +22,7 @@
        {{/if}}
      </span>
    {{/if}}
-    <div class="item-controls flex-shrink">
+    <div class="item-controls">
      <a class="subacteur-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
    </div>
  </li>
--- a/templates/actor/maladies-poisons.html
+++ b/templates/actor/maladies-poisons.html
@ -1,5 +1,5 @@
 {{#if maladiesPoisons.length}}
-<h3 class="blessures-title">Maladies & Poisons:</h3>
+<h3 class="item-label">Maladies & Poisons:</h3>
 <ul class="item-list alterne-list">
  <li class="competence-header flexrow">
    <span class="competence-title flex-grow competence-label">Nom</span>
--- a/templates/actor/non-haut-revant.html
+++ b/templates/actor/non-haut-revant.html
@ -12,13 +12,21 @@
  <li class="item flexrow" >
    <span class="competence-label">Refoulement : </span>
    <span>
-    {{#if options.isGM}}
+      {{#if options.isGM}}
      <input class="competence-value" type="text" name="system.reve.refoulement.value" value="{{system.reve.refoulement.value}}" data-dtype="Number"/>
-    {{else}}
+      {{else}}
      {{system.reve.refoulement.value}}
-    {{/if}}
+      {{/if}}
    </span>
  </li>
+  {{#if system.reve.reve.thanatosused}}
+  <li class="item flexrow" >
+    <span class="competence-label">La prochaine queue est une Ombre</span>
+    <span>
+      <img class="sheet-competence-img" src="systems/foundryvtt-reve-de-dragon/icons/competence_thanatos.webp"/>
+    </span>
+  </li>
+  {{/if}}
 </ul>
 <hr>
 {{> "systems/foundryvtt-reve-de-dragon/templates/actor/dragon-queues.html"}}
--- a/templates/actor/oeuvre.html
+++ b/templates/actor/oeuvre.html
@ -5,8 +5,10 @@
    <a>{{oeuvre.name}} (niveau {{oeuvre.system.niveau}})</a>
  </span>
  <div class="item-controls">
-    <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
-    <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+    <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
+    <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+    &nbsp;
+    <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
  </div>
 </li>

--- a/templates/actor/possessions.html
+++ b/templates/actor/possessions.html
@ -1,6 +1,6 @@
 {{#if possessions.length}}
 {{!-- Possession --}}
-<h3 class="blessures-title">Possession:</h3>
+<h3 class="item-label">Possession:</h3>
 <ul class="item-list alterne-list">
  <li class="competence-header flexrow">
    <span class="competence-title flex-grow competence-label">Nom</span>
@ -15,7 +15,9 @@
      <div class="item-controls">
        <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
        <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
-      </div>          
+        &nbsp;
+        <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
+      </div>
  </li>
  {{/each}}
  </ul>
--- a/templates/actor/taches.html
+++ b/templates/actor/taches.html
@ -8,9 +8,11 @@
        ({{tache.system.points_de_tache_courant}}{{#if
          (or @root.options.isGM (not tache.system.cacher_points_de_tache))
        }}/{{tache.system.points_de_tache}}{{/if}})</a></span>
-      <div class="item-controls flex-shrink">
-        <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
-        <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+      <div class="item-controls">
+        <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
+        <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+        &nbsp;
+        <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
      </div>
    </li>
    {{/unless}}
--- a/templates/chat-actor-turn-acteur.hbs
+++ b/templates/chat-actor-turn-acteur.hbs
@ -1 +1,2 @@
+<img class="chat-icon" src="{{actor.img}}" data-tooltip="{{actor.name}}" />
 <h4>C'est au tour de {{alias}} !</h4>
--- a/templates/chat-actor-turn-sante.hbs
+++ b/templates/chat-actor-turn-sante.hbs
@ -1,3 +1,4 @@
+<img class="chat-icon" src="{{actor.img}}" data-tooltip="{{actor.name}}" />
 <h4>Résumé de santé pour {{alias}}</h4>
 <div data-combatid="{{combatId}}" data-combatmessage="actor-turn-summary">{{blessuresStatus}}</div>
 <div>Son état général est de : {{etatGeneral}} {{#if isSonne}} et est <strong>sonné</strong>{{/if}}</div>
--- a/templates/chat-compendium-table-roll.html
+++ b/templates/chat-compendium-table-roll.html
@ -5,6 +5,11 @@
 <div>
  <img class="chat-icon" src="{{document.img}}" data-tooltip="{{document.name}}" />
  <p>{{linkCompendium document.pack document.id document.name}}</p>
+  {{#if document.system.formule}}
+  <div class="poesie-extrait">
+    [[/r {{document.system.formule}}]]
+  </div>
+  {{/if}}
  {{#if document.system.description}}
  <div class="poesie-extrait">
    {{{document.system.description}}}
--- a/templates/dialog-tmr.html
+++ b/templates/dialog-tmr.html
@ -21,49 +21,48 @@
      </div>
      {{else}}
        {{#if (and isGM hasPlayerOwner)}}
-      <div class="flex-group-center flex-shrink">
-          <h4>Le gardien gére les TMR du joueur, le joueur ne peut pas monter dans les TMR!</h4>
-        </div>
+          <div class="flex-group-center flex-shrink">
+            <h4>Le gardien gére les TMR du joueur, le joueur ne peut pas monter dans les TMR!</h4>
+          </div>
        {{/if}}
-      <div class="flex-group-center flex-shrink">
-        <img class="small-button-direction tmr-move" data-move="topleft" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-topleft.svg">
-        <img class="small-button-direction tmr-move" data-move="top" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-top.svg">
-        <img class="small-button-direction tmr-move" data-move="topright" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-topright.svg">
-      </div>
-      <div class="flex-group-center flex-shrink">
-        <label>Coordonnées : </label><span id="tmr-pos">0</span>
-      </div>
-      <div class="flex-group-center flex-shrink">
-        <img class="small-button-direction tmr-move" data-move="bottomleft" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottomleft.svg">        
-        <img class="small-button-direction tmr-move" data-move="bottom" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottom.svg">
-        <img class="small-button-direction tmr-move" data-move="bottomright" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottomright.svg">
-      </div>
-      <div class="flex-group-center flex-shrink lire-signe-draconique">
-        <a>Lire un signe draconique</a>
-      </div>
-      <div class="flex-group-center flex-shrink lancer-sort">
-        <a>Lancer un Sort</a>
-      </div>
-      <hr>
-      <div class="flex-group-center flex-shrink">
-        <label>Carac. Rêve : </label><label>{{caracReve}}</label>
-      </div>
-      <div class="flex-group-center flex-shrink">
-        <label>Rêve actuel : </label><span id="tmr-pointsreve-value">0</span>
-      </div>
-      <div class="flex-group-center flex-shrink">
-        <label>Etat général : </label><span id="tmr-etatgeneral-value">0</span>
-      </div>
-      <div class="flex-group-center flex-shrink">
-        <label>Refoulement : </label><span id="tmr-refoulement-value">0</span>
-      </div>
-      <div class="flex-group-center flex-actions-bar appliquerFatigue">
-        Fatigue 
-        <span id="tmr-fatigue-table">{{{fatigue.html}}}</span>
-      </div>
+        <div class="flex-group-center flex-shrink">
+          <img class="small-button-direction tmr-move" data-move="topleft" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-topleft.svg">
+          <img class="small-button-direction tmr-move" data-move="top" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-top.svg">
+          <img class="small-button-direction tmr-move" data-move="topright" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-topright.svg">
+        </div>
+        <div class="flex-group-center flex-shrink">
+          <label>Coordonnées : </label><span id="tmr-pos">0</span>
+        </div>
+        <div class="flex-group-center flex-shrink">
+          <img class="small-button-direction tmr-move" data-move="bottomleft" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottomleft.svg">        
+          <img class="small-button-direction tmr-move" data-move="bottom" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottom.svg">
+          <img class="small-button-direction tmr-move" data-move="bottomright" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottomright.svg">
+        </div>
+        <div class="flex-group-center flex-shrink lire-signe-draconique">
+          <a>Lire un signe draconique</a>
+        </div>
+        <div class="flex-group-center flex-shrink lancer-sort">
+          <a>Lancer un Sort</a>
+        </div>
+        <hr>
+        <div class="flex-group-center flex-shrink">
+          <label>Carac. Rêve : </label><label>{{caracReve}}</label>
+        </div>
+        <div class="flex-group-center flex-shrink">
+          <label>Rêve actuel : </label><span id="tmr-pointsreve-value">0</span>
+        </div>
+        <div class="flex-group-center flex-shrink">
+          <label>Etat général : </label><span id="tmr-etatgeneral-value">0</span>
+        </div>
+        <div class="flex-group-center flex-shrink">
+          <label>Refoulement : </label><span id="tmr-refoulement-value">0</span>
+        </div>
+        <div class="flex-group-center flex-actions-bar appliquerFatigue">
+          Fatigue 
+          <span id="tmr-fatigue-table">{{{fatigue.html}}}</span>
+        </div>
      {{/if}}
-      <div class="flex-group-center flex-grow">
-      </div>
+      <div class="flex-group-center flex-grow"></div>
    </div>
  </div>
 </form>
--- a/templates/item-arme-sheet.html
+++ b/templates/item-arme-sheet.html
@ -8,7 +8,7 @@
    <div class="tab items flexcol" data-group="primary" data-tab="informations">
      <div class="form-group">
        <label for="system.competence">Compétence de mêlée</label>
-        <select name="system.competence" id="competence" data-dtype="String">
+        <select name="system.competence" data-dtype="String">
          {{#select system.competence}}
          <option value="">- impossible -</option>
          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-competence.html" categorie='melee'}}
@ -26,7 +26,7 @@
      </div>
      <div class="form-group">
        <label for="system.tir">Compétence de tir</label>
-        <select name="system.tir" id="tir" data-dtype="String">
+        <select name="system.tir" data-dtype="String">
          {{#select system.tir}}
          <option value="">- impossible -</option>
          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-competence.html" categorie='tir'}}
@ -52,7 +52,7 @@
      </div>
      <div class="form-group">
        <label for="system.categorie_parade">Catégorie parade </label>
-        <select name="system.categorie_parade" id="categorie_parade" data-dtype="String">
+        <select name="system.categorie_parade" data-dtype="String">
          {{#select system.categorie_parade}}
          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html"}}
          {{/select}}
@ -104,7 +104,7 @@
      </div>
      <div class="form-group">
        <label for="system.initpremierround">Classe d'initiative au premier round (mêlée seulement) </label>
-        <select name="system.initpremierround" id="initpremierround" data-dtype="String">
+        <select name="system.initpremierround" data-dtype="String">
          {{#select system.initpremierround}}
          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-initpremierround.html"}}
          {{/select}}
--- a/templates/item-casetmr-sheet.html
+++ b/templates/item-casetmr-sheet.html
@ -7,8 +7,8 @@
      <input class="attribute-value" type="text" name="system.coord" value="{{system.coord}}" data-dtype="String"/>
    </div>
    <div class="form-group">
-      <label for="niveau">Mode spécifique</label>
-      <select name="system.specific" id="specific" data-dtype="String">
+      <label for="system.specific">Mode spécifique</label>
+      <select name="system.specific" data-dtype="String">
        {{#select system.specific}}
        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-tmr-effet.html"}}
        {{/select}}
--- a/templates/item-chant-sheet.html
+++ b/templates/item-chant-sheet.html
@ -3,11 +3,11 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">
    <div class="form-group">
-      <label class="alchimie-title" for="xp">Niveau</label>
+      <label class="item-label" for="system.niveau">Niveau</label>
      <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
    </div>
    <div class="form-group">
-      <label>Référence / Auteur</label>
+      <label for="system.reference">Référence / Auteur</label>
      <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
    </div>

--- a/templates/item-competencecreature-sheet.html
+++ b/templates/item-competencecreature-sheet.html
@ -38,8 +38,8 @@
    {{/if}}
    {{#if isparade}}
      <div class="form-group">
-        <label>Catégorie parade</label>
-        <select name="system.categorie_parade" id="categorie_parade" data-dtype="String">
+        <label for="system.categorie_parade">Catégorie parade</label>
+        <select name="system.categorie_parade" data-dtype="String">
          {{#select system.categorie_parade}}
          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html"}}
          {{/select}}
--- a/templates/item-conteneur-sheet.html
+++ b/templates/item-conteneur-sheet.html
@ -9,7 +9,7 @@
  <section class="sheet-body">
    <div class="tab items flexcol" data-group="primary" data-tab="informations">
      <div class="form-group">
-        <label for="xp">Capacite (points d'Enc.)</label>
+        <label for="system.capacite">Capacite (points d'Enc.)</label>
        <input class="attribute-value" type="text" name="system.capacite" value="{{system.capacite}}" data-dtype="Number"/>
      </div>
      {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-inventaire.html"}}
--- a/templates/item-danse-sheet.html
+++ b/templates/item-danse-sheet.html
@ -3,7 +3,7 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">
    <div class="form-group">
-      <label class="alchimie-title" for="xp">Type</label>
+      <label class="item-label" for="system.type">Type</label>
      <select name="system.type" data-dtype="String">
        {{#select system.type}}
        <option value="recreative">Récréative</option>
@ -12,19 +12,19 @@
      </select>
    </div>
    <div class="form-group">
-      <label class="alchimie-title" for="xp">Agilité ?</label>
+      <label class="item-label" for="system.agilite">Agilité ?</label>
      <input class="attribute-value" type="checkbox" name="system.agilite" {{#if system.agilite}}checked{{/if}}/>    
    </div>
    <div class="form-group">
-        <label class="alchimie-title" for="xp">Apparence ?</label>
+        <label class="item-label" for="system.apparence">Apparence ?</label>
      <input class="attribute-value" type="checkbox" name="system.apparence"  {{#if system.apparence}}checked{{/if}}/>    
    </div>
    <div class="form-group">
-      <label class="alchimie-title" for="xp">Niveau</label>
+      <label class="item-label" for="system.niveau">Niveau</label>
      <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
    </div>
    <div class="form-group">
-      <label>Référence / Auteur</label>
+      <label for="system.reference">Référence / Auteur</label>
      <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
    </div>

--- a/templates/item-empoignade-sheet.html
+++ b/templates/item-empoignade-sheet.html
@ -3,7 +3,7 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">
      <div class="form-group">
-        <label for="xp">Points d'Empoignade </label>
+        <label for="system.pointsemp">Points d'Empoignade </label>
        <input class="attribute-value" type="text" name="system.pointsemp" value="{{system.pointsemp}}" data-dtype="Number"/>
      </div>
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
--- a/templates/item-gemme-sheet.html
+++ b/templates/item-gemme-sheet.html
@ -7,8 +7,8 @@
  <section class="sheet-body">
    <div class="tab items flexcol" data-group="primary" data-tab="informations">
      <div class="form-group">
-        <label>Type</label>
-        <select name="system.type" id="type" data-dtype="String">
+        <label for="system.type">Type</label>
+        <select name="system.type" data-dtype="String">
          {{#select system.type}}
          {{{gemmeTypeList}}}
          {{/select}}
--- a/templates/item-jeu-sheet.html
+++ b/templates/item-jeu-sheet.html
@ -4,26 +4,26 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">
    <div class="form-group">
-      <label class="alchimie-title" for="xp">Type</label>
+      <label class="item-label" for="system.type">Type</label>
      <select name="system.type" data-dtype="String">
        {{#select system.type}}
        <option value="adressehasard">Adresse/Hasard</option>
        <option value="de">Dés</option>
        <option value="carte">Cartes</option>
        <option value="reflexion">Reflexion</option>
-        {{/select}}    
+        {{/select}}
      </select>
    </div>
    <div class="form-group">
-      <label class="alchimie-title" for="xp">Base</label>
+      <label class="item-label" for="system.base">Base</label>
      <input class="attribute-value" type="text" name="system.base" value="{{system.base}}" data-dtype="Number"/>
    </div>
    <div class="form-group">
-      <label class="alchimie-title" for="xp">Caractéristique/Compétence</label>
+      <label class="item-label" for="system.caraccomp">Caractéristique/Compétence</label>
      <input class="attribute-value" type="text" name="system.caraccomp" value="{{system.caraccomp}}" data-dtype="String"/>
    </div>
    <div class="form-group">
-      <label>Référence / Auteur</label>
+      <label for="system.reference">Référence / Auteur</label>
      <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
    </div>

--- a/templates/item-livre-sheet.html
+++ b/templates/item-livre-sheet.html
@ -5,9 +5,9 @@
          <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
          {{#if options.isOwned}}
          <div class="form-group">
-            <span for="xp"><a class="creer-tache-livre chat-card-button" data-actor-id="{{actorId}}">Créer une tâche de lecture</a></span>
+            <span><a class="creer-tache-livre chat-card-button" data-actor-id="{{actorId}}">Créer une tâche de lecture</a></span>
          </div>
-          {{/if}}      
+          {{/if}}
      </div>
  </header>
  <nav class="sheet-tabs tabs" data-group="primary">
@ -18,35 +18,35 @@
    <div class="tab items flexcol" data-group="primary" data-tab="informations">

      <div class="form-group">
-        <label for="xp">Auteur</label>
+        <label for="system.auteur">Auteur</label>
        <input class="attribute-value" type="text" name="system.auteur" value="{{system.auteur}}" data-dtype="String"/>
      </div>
      <div class="form-group">
-        <label for="xp">Compétence</label>
-        <select name="system.competence" id="competenceselect" data-dtype="String">
+        <label for="system.competence">Compétence</label>
+        <select name="system.competence" data-dtype="String">
          {{#select system.competence}}
          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-competence.html"}}
          {{/select}}    
        </select>
      </div>
      <div class="form-group">
-        <label for="xp">Difficulté</label>
+        <label for="system.difficulte">Difficulté</label>
        <input class="attribute-value" type="number" name="system.difficulte" value="{{system.difficulte}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
-        <label for="xp">Points de tâches</label>
+        <label for="system.points_de_tache">Points de tâches</label>
        <input class="attribute-value" type="number" name="system.points_de_tache" value="{{system.points_de_tache}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
-        <label for="xp">Expérience</label>
+        <label for="system.xp">Expérience</label>
        <input class="attribute-value" type="number" name="system.xp" value="{{system.xp}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
-        <label for="xp">Niveau minimum</label>
+        <label for="system.niveau_minimum">Niveau minimum</label>
        <input class="attribute-value" type="text" name="system.niveau_minimum" value="{{system.niveau_minimum}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
-        <label for="xp">Niveau maximum</label>
+        <label for="system.niveau_maximum">Niveau maximum</label>
        <input class="attribute-value" type="text" name="system.niveau_maximum" value="{{system.niveau_maximum}}" data-dtype="Number"/>
      </div>

--- a/templates/item-meditation-sheet.html
+++ b/templates/item-meditation-sheet.html
@ -3,53 +3,53 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">
    <div class="form-group">
-      <label for="xp">Compétence</label>
-      <select name="system.competence" id="competenceselect" data-dtype="String">
+      <label for="system.competence">Compétence</label>
+      <select name="system.competence" data-dtype="String">
        {{#select system.competence}}
        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-competence.html"}}
        {{/select}}    
      </select>
    </div>
    <div class="form-group">
-      <label for="xp">Thème</label>
+      <label for="system.theme">Thème</label>
      <input class="attribute-value" type="text" name="system.theme" value="{{system.theme}}" data-dtype="String"/>
    </div>
    <div class="form-group">
-      <label for="xp">Support</label>
+      <label for="system.support">Support</label>
      <input class="attribute-value" type="text" name="system.support" value="{{system.support}}" data-dtype="String"/>
    </div>
    <div class="form-group">
-      <label for="xp">Heure</label>
-      <select name="system.heure" id="heure" data-dtype="String">
+      <label for="system.heure">Heure</label>
+      <select name="system.heure" data-dtype="String">
        {{#select system.heure}}
        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-heures.html"}}
        {{/select}}
      </select>        
    </div>
    <div class="form-group">
-      <label for="xp">Purification</label>
+      <label for="system.purification">Purification</label>
      <input class="attribute-value" type="text" name="system.purification" value="{{system.purification}}" data-dtype="String"/>
    </div>
    <div class="form-group">
-      <label for="xp">Vêture</label>
+      <label for="system.veture">Vêture</label>
      <input class="attribute-value" type="text" name="system.veture" value="{{system.veture}}" data-dtype="String"/>
    </div>
    <div class="form-group">
-      <label for="xp">Comportement</label>
+      <label for="system.comportement">Comportement</label>
      <input class="attribute-value" type="text" name="system.comportement" value="{{system.comportement}}" data-dtype="String"/>
    </div>
    <div class="form-group">
-      <label for="xp">Case TMR</label>
-      <select name="system.tmr" id="tmr" data-dtype="String">
+      <label for="system.tmr">Case TMR</label>
+      <select name="system.tmr" data-dtype="String">
        {{#select system.tmr}}
        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-tmr-type.html"}}
        {{/select}}
      </select>
    </div>
    <div class="form-group">
-      <label for="xp">Malus</label>
+      <label for="system.malus">Malus</label>
      {{#if options.isGM}}
-      <select name="system.malus" id="malus" data-dtype="Number">
+      <select name="system.malus" data-dtype="Number">
        {{#select system.malus}}
        <option value="0">0</option>
        <option value="-1">-1</option>
--- a/templates/item-musique-sheet.html
+++ b/templates/item-musique-sheet.html
@ -3,14 +3,13 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">
    <div class="form-group">
-      <label class="alchimie-title" for="xp">Niveau</label>
+      <label class="item-label" for="system.niveau">Niveau</label>
      <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
    </div>
    <div class="form-group">
-      <label>Référence / Auteur</label>
+      <label for="system.reference">Référence / Auteur</label>
      <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
    </div>
-
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
  </section>
 </form>
--- a/templates/item-nombreastral-sheet.html
+++ b/templates/item-nombreastral-sheet.html
@ -3,21 +3,20 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">
    <div class="form-group">
-      <label for="xp">Nombre</label>
+      <label for="system.value">Nombre</label>
      <input class="attribute-value" type="text" name="system.value" value="{{system.value}}" data-dtype="Number"/>
    </div>
    <div class="form-group">
-      <label for="xp">Nombre valide ? </label>
+      <label for="system.istrue">Nombre valide ? </label>
      <input class="attribute-value" type="checkbox" name="system.istrue"  {{#if system.istrue}}checked{{/if}}/>
    </div>
    <div class="form-group">
-      <label for="xp">Index du jour concerné</label>
+      <label for="system.jourindex">Index du jour concerné</label>
      <input class="attribute-value" type="text" name="system.jourindex" value="{{system.jourindex}}" data-dtype="Number"/>
    </div>
    <div class="form-group">
-      <label for="xp">Label du jour</label>
+      <label for="system.jourlabel">Label du jour</label>
      <input class="attribute-value" type="text" name="system.jourlabel" value="{{system.jourlabel}}" data-dtype="String"/>
    </div>
-
  </section>
 </form>
--- a/templates/item-oeuvre-sheet.html
+++ b/templates/item-oeuvre-sheet.html
@ -9,27 +9,27 @@
    {{!-- Sheet Body --}}
    <section class="sheet-body">
      <div class="form-group">
-        <label>Caractéristique</label>
-        <select name="system.default_carac" id="default_carac" data-dtype="String">
+        <label for="system.default_carac">Caractéristique</label>
+        <select name="system.default_carac" data-dtype="String">
          {{#select system.default_carac}}
          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-caracteristiques.html"}}
          {{/select}}
        </select>
      </div>
      <div class="form-group">
-        <label>Compétence</label>
-        <select name="system.competence" id="competenceselect" data-dtype="String">
+        <label for="system.competence">Compétence</label>
+        <select name="system.competence" data-dtype="String">
          {{#select system.competence}}
          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-competence.html"}}
          {{/select}}    
        </select>
      </div>
      <div class="form-group">
-        <label>Référence / Auteur</label>
+        <label for="system.reference">Référence / Auteur</label>
        <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
      </div>
      <div class="form-group">
-        <label>Niveau</label>
+        <label for="system.niveau">Niveau</label>
        <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
      </div>

--- a/templates/item-possession-sheet.html
+++ b/templates/item-possession-sheet.html
@ -3,15 +3,15 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">
      <div class="form-group">
-        <label for="xp">Type de possession </label>
+        <label for="system.typepossession">Type de possession</label>
        <input class="attribute-value" type="text" name="system.typepossession" value="{{system.typepossession}}" data-dtype="String"/>
      </div>
      <div class="form-group">
-        <label for="xp">Possédé ? </label>
+        <label for="system.istrue">Possédé ?</label>
        <input class="attribute-value" type="checkbox" name="system.istrue"  {{#if system.istrue}}checked{{/if}}/>
      </div>
      <div class="form-group">
-        <label for="xp">Compteur </label>
+        <label for="system.compteur">Compteur</label>
        <input class="attribute-value" type="text" name="system.compteur" value="{{system.compteur}}" data-dtype="Number"/>
      </div>
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
--- a/templates/item-potion-sheet.html
+++ b/templates/item-potion-sheet.html
@ -5,7 +5,7 @@
      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
      {{#if options.isOwned}}
      <div class="form-group">
-        <span for="xp"><a class="consommer-potion chat-card-button" data-actor-id="{{actorId}}">Consommer cette potion et appliquer ses effets</a></span>
+        <span><a class="consommer-potion chat-card-button" data-actor-id="{{actorId}}">Consommer cette potion et appliquer ses effets</a></span>
      </div>
      {{/if}}  
    </div>
--- a/templates/item-recettealchimique-sheet.html
+++ b/templates/item-recettealchimique-sheet.html
@ -3,29 +3,29 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">
    <div class="form-group">
-      <label class="alchimie-title" for="xp">But</label>
+      <label class="item-label" for="system.but">But</label>
      <input class="attribute-value" type="text" name="system.but" value="{{system.but}}" data-dtype="String"/>
    </div>
    <div class="flexcol">
-      <span><label class="alchimie-title">Manipulation : </label></span>
+      <span><label class="item-label">Manipulation : </label></span>
      <div class="form-group medium-editor">
        {{editor manipulation_update target="system.manipulation" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
    </div>
    <div class="flexcol">
-      <span><label class="alchimie-title">Utilisation : </label></span>
+      <span><label class="item-label">Utilisation : </label></span>
      <div class="form-group small-editor">
        {{editor utilisation target="system.utilisation" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
    </div>
    <div class="flexcol">
-      <span><label class="alchimie-title">Enchantement : </label></span>
+      <span><label class="item-label">Enchantement : </label></span>
      <div class="form-group small-editor">
        {{editor enchantement target="system.enchantement" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
    </div>
    <div class="flexcol">
-      <span><label class="alchimie-title">Sur-effet : </label></span>
+      <span><label class="item-label">Sur-effet : </label></span>
      <div class="form-group small-editor">
        {{editor sureffet target="system.sureffet" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
--- a/templates/item-sort-sheet.html
+++ b/templates/item-sort-sheet.html
@ -3,8 +3,8 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">
    <div class="form-group">
-      <label>Draconic</label>
-      <select name="system.draconic" id="draconic" data-dtype="String">
+      <label for="system.draconic">Draconic</label>
+      <select name="system.draconic" data-dtype="String">
        {{#select system.draconic}}
        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-draconic.html"}}
        {{/select}}
@ -12,7 +12,7 @@
    </div>      
    <div class="form-group">
      <label for="system.caseTMR">Case TMR</label>
-      <select name="system.caseTMR" id="caseTMR" data-dtype="String">
+      <select name="system.caseTMR" data-dtype="String">
        {{#select system.caseTMR}}
        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-tmr-type.html"}}
        <option value="special">Case spéciale TMR (saisie ci-dessous)</option>
@ -62,7 +62,7 @@
    {{#each bonusCaseList as |bcData key|}}
    <div class="form-group">
      <label for="caseValue">Case/Bonus :</label>
-      <input class="attribute-value"  type="text" name="caseValue" value="{{bcData.case}}" data-dtype="String"/>
+      <input class="attribute-value" type="text" name="caseValue" value="{{bcData.case}}" data-dtype="String"/>
      <input class="attribute-value" type="text" name="bonusValue" value="{{bcData.bonus}}" data-dtype="Number"/>
    </div>
    {{/each}}
--- a/templates/item-sortreserve-sheet.html
+++ b/templates/item-sortreserve-sheet.html
@ -9,8 +9,8 @@
    </div>
    {{else}}
    <div class="form-group">
-      <label>Draconic</label>
-      <select name="system.draconic" id="draconic" data-dtype="String">
+      <label for="system.draconic">Draconic</label>
+      <select name="system.draconic" data-dtype="String">
        {{#select system.draconic}}
        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-draconic.html"}}
        {{/select}}
--- a/templates/item-tache-sheet.html
+++ b/templates/item-tache-sheet.html
@ -36,7 +36,7 @@
    {{#if options.isGM}}
    <div class="form-group">
      <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}}/>
+      <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="system.points_de_tache">Points de tâches nécessaires (MJ)</label>
--- a/templates/item-tarot-sheet.html
+++ b/templates/item-tarot-sheet.html
@ -9,12 +9,12 @@
      <img class="profile-img" src="{{img}}" data-edit="img" data-tooltip="{{name}}"/>
      <div class="flexcol">
        <div class="form-group">
-          <label>Aspect</label>
+          <label for="system.concept">Aspect</label>
          <input class="attribute-value" type="text" name="system.concept" value="{{system.concept}}" data-dtype="String" />
        </div>
        <div class="form-group">
-          <label>Sens</label>
-          <select name="system.aspect" id="aspect" data-dtype="String">
+          <label for="system.aspect">Sens</label>
+          <select name="system.aspect" data-dtype="String">
            {{#select system.aspect}}
            {{>"systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.html"}}
            {{/select}}
--- a/templates/voyage/chat-fatigue_voyage.hbs
+++ b/templates/voyage/chat-fatigue_voyage.hbs
@ -0,0 +1,10 @@
+<img class="chat-icon" src="{{actor.img}}" data-tooltip="{{actor.name}}" />
+<p>{{actor.name}} s'est fatigué de {{perteFatigue}}
+{{#if (and isVoyage (gt parameters.nombreHeures 0))}}
+après {{parameters.nombreHeures}} heure{{#if (gt parameters.nombreHeures 1)}}s{{/if}}
+de voyage {{lowerFirst parameters.typeTerrain.label}}
+à {{parameters.vitesseDeplacement}} km/h<sup>dr</sup> (Fatigue par heure: {{parameters.fatigueHoraire}})
+</p>
+<p>{{parameters.typeTerrain.description}}
+{{/if}}
+</p>
--- a/templates/voyage/dialog-fatigue-voyage.hbs
+++ b/templates/voyage/dialog-fatigue-voyage.hbs
@ -0,0 +1,58 @@
+<form class="dialog-fatigue-voyage">
+  <div class="flexcol">
+    <div class="flexrow">
+      <label for="code-terrain" class="flex-shrink">Type de terrain</label>
+      <div>
+      <select type="text" name="code-terrain" value="{{typeTerrain.code}}" data-dtype="String">
+        {{#select typeTerrain.code}}
+        {{#each tableauFatigueMarche as |ligne|}}
+        <option value="{{ligne.code}}">{{ligne.label}} - {{ligne.description}}</option>
+        {{/each}}
+        {{/select}}
+      </select>
+      </div>
+    </div>
+    <div class="flexrow">
+      <label for="vitesse-deplacement" class="flex-shrink">Vitesse de marche</label>
+      <div>
+      <select type="text" name="vitesse-deplacement" value="{{vitesseDeplacement}}" data-dtype="String">
+        {{#select vitesseDeplacement}}
+        {{#each typeTerrain.vitesses as |rythme|}}
+        {{> 'systems/foundryvtt-reve-de-dragon/templates/voyage/option-vitesse-fatigue.hbs' vitesse=rythme.vitesse fatigue=rythme.fatigue}}
+        {{/each}}
+        {{/select}}
+      </select>
+      </div>
+    </div>
+    <div class="flexrow">
+      <label for="nombre-heures" class="flex-shrink">Nombre d'heures</label>
+      <div>
+      <input type="number" name="nombre-heures" class="number-x2 nombre-heures" data-dtype="Number" value="{{nombreHeures}}" min="1" max="8"/> heures
+      </div>
+    </div>
+    <div class="flexrow">
+      <label for="base-fatigue" class="flex-shrink">Fatigue à appliquer</label>
+      <div>
+      <input type="number" name="base-fatigue" class="number-x2 base-fatigue" data-dtype="Number" value="{{nombreHeures}}" min="1" max="60"/>
+      </div>
+    </div>
+    <div><hr></div>
+    <div class="flexrow fatigue-actors-list">
+      <ul class="item-list alterne-list scrollable-list">
+        <li class="competence-header flexrow">
+          <span class="flex-grow-2">Personnage</span>
+          <span class="flex-grow-2">Survies</span>
+          <span class="flex-grow-1" data-tooltip="Ajustements à appliquer pour les personnages se reposant (par exemple, à cheval)">Ajustements</span>
+        </li>
+        {{#each playerActors as |selected|}}
+        {{>'systems/foundryvtt-reve-de-dragon/templates/voyage/fatigue-actor.hbs' voyageur=selected survies=@root.typeTerrain.survies}}
+        {{/each}}
+      </ul>
+    </div>
+    <hr>
+    <div class="flexrow">
+      <span class="flex-shrink"></span>
+      <button name="appliquer-fatigue">Appliquer la fatigue</button>
+    </div>
+  </div>
+</form>
--- a/templates/voyage/fatigue-actor.hbs
+++ b/templates/voyage/fatigue-actor.hbs
@ -0,0 +1,23 @@
+<li class="item flexrow list-item texte-dans-liste" data-actor-id="{{voyageur.actor.id}}">
+  <span class="flex-grow-2 flexrow">
+    <input type="checkbox" name="selectionner-acteur" {{#if voyageur.selected}}checked{{/if}}/>
+    <label>
+      <img class="chat-icon" src="{{voyageur.actor.img}}" data-tooltip="{{voyageur.actor.name}}" />
+      <span>{{voyageur.actor.name}}</span>
+    </label>
+  </span>
+  <span class="flex-grow-2">
+    <div class="flexcol ">
+      <label class="voyage-liste-survies">
+      {{#each voyageur.competencesVoyage as |comp key|}}
+      {{#if (array-includes ../survies key)}}
+        {{key}} {{comp.system.niveau}},
+      {{/if}}
+      {{/each}}
+      </label>
+    </div>
+  </span>
+  <span class="flex-grow-1">
+    <input type="number" name="ajustement-fatigue" class="number-x2 ajustement-fatigue" data-dtype="Number" value="{{voyageur.ajustementFatigue}}" min="-6" max="6"/>
+  </span>
+</li>
--- a/templates/voyage/option-vitesse-fatigue.hbs
+++ b/templates/voyage/option-vitesse-fatigue.hbs
@ -0,0 +1 @@
+<option value="{{vitesse}}">{{vitesse}} km/h<sup>dr</sup> (Fatigue: {{fatigue}})</option>
Author	SHA1	Message	Date
uberwald	ad9e75c66d	Merge pull request '11.2.19 - Les hémorroïdes d'Akarlikarlikar' (#697 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 Reviewed-on: #697	2024-05-01 08:59:34 +02:00
Vincent Vandemeulebrouck	e946299810	Version 11.2.19	2024-05-01 01:12:28 +02:00
Vincent Vandemeulebrouck	fad894704d	Fix: encaisser dommages par MJ Lorsque l'option d'encaisser les dommages était contrôlée par le MJ, les données envoyées par les joueurs ne correspondaient pas aux paramètres de la méthode à exécuter par le MJ. De plus, l'envoi de l'attacker (Actor) était reçu comme un Object, donc inutilisable en tant qu'Actor.	2024-05-01 01:08:50 +02:00
uberwald	3365852210	Merge pull request '11.2.18' (#696 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 Reviewed-on: #696	2024-03-21 15:51:07 +01:00
Vincent Vandemeulebrouck	d71bf27311	Version 11.2.18 - Le bourrichon d'Akarlikarlikar	2024-03-20 21:57:02 +01:00
Vincent Vandemeulebrouck	e6da18bebd	Ajout du bouton Montrer Ajout du bouton Montrer dans les différentes listes	2024-03-20 21:55:18 +01:00
uberwald	972ae74e2c	Merge pull request '11.2.17 - Le cache-oeil d'Akarlikarlikar' (#695 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 Reviewed-on: #695	2024-03-10 08:57:28 +01:00
Vincent Vandemeulebrouck	7969e74c8d	Version 11.2.17	2024-03-10 00:53:45 +01:00
Vincent Vandemeulebrouck	84ea3a6ea9	Fix: TMR qui ne s'affichent pas Après un certain temps (changements de scènes?), les TMR ne s'affichaient plus correctement. Tentative de forcer le chargement des textures manquantes lors de l'ouverture de la fenêtre de TMR.	2024-03-10 00:47:50 +01:00
Vincent Vandemeulebrouck	7ada5577aa	Ajout de l'information Ombre de Thanatos Si Thanatos a été utilisé, la prochaine queue est une ombre Un indicateur apparait dans l'onglet Haut-Rêve.	2024-03-10 00:24:02 +01:00
Vincent Vandemeulebrouck	b0e28ef937	Fix: labels for / id - Ajout de "for" sur labels - suppression d'id inutiles - corrections de for="xp" incorrects - simplification css alchimie-title/blessure-title	2024-03-10 00:13:36 +01:00
Vincent Vandemeulebrouck	6414f76d67	Fix: ignorer personnages joueurs non liés Pour les fenêtres de stress/repos/voyage/astrologie, ignorer les personnages non liés (par exemple, un guerrier sorde)	2024-03-09 23:12:13 +01:00
Vincent Vandemeulebrouck	dde3011f1d	Fix: Checkbox cacher les points de tâche	2024-03-09 19:50:00 +01:00
Vincent Vandemeulebrouck	6dbf322efe	Fix: traduction tooltip Ediot/Delete	2024-03-09 19:49:31 +01:00
Vincent Vandemeulebrouck	d34fde2ba4	Fix: titre des feuilles d'objets Suite à la correction de l'ordre et du nom dans la fenêtre de création, les titres étaient incorrects (TYPES.Item.Tache par exemple)	2024-03-09 19:48:53 +01:00
Vincent Vandemeulebrouck	bc169d931b	Fix: log erreur TMR en mode visu En mode visualisation, les informations du personnage ne sont pas affichées	2024-03-09 19:38:53 +01:00
Vincent Vandemeulebrouck	3b269b2baa	Simplifications	2024-03-09 19:13:13 +01:00
LeRatierBretonnien	dffaa29fd1	Fix termes dans les fenetres de creation	2024-02-29 21:22:42 +01:00
LeRatierBretonnien	c49e2a850b	Fix termes dans les fenetres de creation	2024-02-29 20:59:06 +01:00
LeRatierBretonnien	a5a9cc334e	Fix termes dans les fenetres de creation	2024-02-29 20:45:25 +01:00
LeRatierBretonnien	43e49a0eb8	New common CounterClass	2024-02-08 12:46:49 +01:00
LeRatierBretonnien	5ab551da9e	Rework usage log	2024-02-05 18:08:35 +01:00
LeRatierBretonnien	2a9e98f8c7	Ajout tirage de la force des rencontres avec /tmrr, ajout de bouton pour appliquer complètement les blessures	2024-01-30 23:18:21 +01:00
LeRatierBretonnien	669982ec4a	Ajout tirage de la force des rencontres avec /tmrr, ajout de bouton pour appliquer complètement les blessures	2024-01-28 20:43:23 +01:00
LeRatierBretonnien	34183cd1a7	Ajout tirage de la force des rencontres avec /tmrr, ajout de bouton pour appliquer complètement les blessures	2024-01-28 20:41:00 +01:00
LeRatierBretonnien	f7eae3ac1e	Fix version+changelog	2024-01-02 18:51:22 +01:00
LeRatierBretonnien	623044c936	Sync fiche	2024-01-02 18:43:42 +01:00
LeRatierBretonnien	94caf4040b	Affichage souffle	2023-12-30 14:20:05 +01:00
uberwald	d577e2d2ec	Merge pull request '11.2.13 - Les cent pas d'Akarlikarlikar' (#694 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 Reviewed-on: #694	2023-12-26 23:44:30 +01:00
Vincent Vandemeulebrouck	050cd80dae	Version 11.2.13	2023-12-26 19:07:36 +01:00
Vincent Vandemeulebrouck	3f098cab31	Commande /voyage Ajout de la commande /voyage pour gérer la fatigue en voyage	2023-12-26 19:06:13 +01:00
Vincent Vandemeulebrouck	4274bce7d5	minor cleanup	2023-12-26 19:06:13 +01:00
Vincent Vandemeulebrouck	25d68d265e	Image acteur dans les message de tours	2023-12-26 19:06:13 +01:00
uberwald	c1c192f710	Merge pull request '11.2.12 - Le somnifère d'Akarlikarlikar' (#693 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 Reviewed-on: #693	2023-12-24 12:42:15 +01:00
Vincent Vandemeulebrouck	7f64cd03f9	Version 11.2.12	2023-12-22 23:55:21 +01:00
Vincent Vandemeulebrouck	3ac9f487d0	Fix: perte de rêve potions enchantées La perte de rêve des potions enchantées bloquait le processus de récupération de château dormant	2023-12-22 20:12:58 +01:00
uberwald	fa67c3d9c1	Merge pull request 'Version 11.2.11' (#692 ) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 Reviewed-on: #692	2023-12-22 09:30:48 +01:00
Vincent Vandemeulebrouck	5b443f9ac0	Version 11.2.11	2023-12-22 02:25:30 +01:00
Vincent Vandemeulebrouck	b0098574a0	Fix: refoulement Le refoulement ne fonctionnait plus. Merci à javascript+VSCode pour l'incapacité de fournir de l'analyse de code statique...	2023-12-22 02:21:22 +01:00
Vincent Vandemeulebrouck	5729f7e926	Bordure des images de profils Remplacement de la bordure noire inesthétique avec des images de profil sous forme de badge ronds, en utilisant juste une variation de couleur de fond.	2023-12-22 02:21:22 +01:00
Vincent Vandemeulebrouck	0b66c945b8	Mise à jour couleur images compcreature Passage du blanc à la couleur habituelle	2023-12-22 02:21:22 +01:00
				`@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,3)" style=""><path d="M243.512 23.29c-27.105 18.337-53.533 32.92-82.274 45.337-2.843 17.364-3.948 34.497-4.05 51.584 28.913 15.41 56.096 32.85 83.33 49.634l7.045 4.344-3.432 7.482c-12.12 26.572-24.33 47.087-46.245 70.3l-5.184 5.512-6.46-3.904c-32.974-19.974-74.472-38.724-113.373-53.95l6.826-17.374c36.79 14.4 75.11 32.32 108.153 51.504 15.396-17.198 25.326-33.354 34.713-52.89-43.44-26.91-86.13-53.51-134.69-70.632-23.012 20.357-37.705 45.243-51.942 70.74 8.324 25.495 6.596 53.376-6.596 77.46 48.58-.593 97.994 2.23 150.666 10.26l5.658.837 1.787 5.44c8.85 26.46 11.79 54.41 8.325 83.588l-.987 8.432-8.466-.187c-40.508-.864-80.175-2.138-118.17.234 1.634 15.94-2.31 30.972-7.724 45.025 13.427 28.54 27.38 55.8 48.29 79.39 41.27-19.05 73.564-31.288 115.93-42.85-3.407-13.72-6.918-26.36-11.097-33.62-5.122-8.9-10.207-13.057-17.85-15.256-15.284-4.4-44.533 2.293-92.894 19.454l-6.243-17.594c48.907-17.354 79.702-26.894 104.283-19.82 9.133 2.628 16.884 8.004 23.066 15.46 14.487-7.627 28.415-16.79 42.053-26.996 12.34-45.92 37.29-81.42 66.626-112.107-7.226-13.52-13.208-27.204-20.563-40.613l-3.394-6.168 5-4.965c23.275-23.13 47.34-40.157 71.87-52.487l8.395 16.716c-20.952 10.53-41.503 25.913-61.795 45.152 12.41 23.91 22.263 45.5 39.457 64.826 37.488-27.124 74.943-51.39 116.84-74.938-13.96-30.473-31.345-58.357-56.286-79.462-32.2 13.38-62.527 17.39-92.61 12.29-14.223 13.25-30.094 22.23-48.756 23.337-29.017 1.722-60.74-15.74-99.174-57.672l6.858-6.295.017-.028.006.006 6.88-6.314c36.702 40.043 63.74 52.87 84.32 51.65 18.514-1.1 35.03-14.95 51.684-35.406-28.827-31.81-64.174-59.94-97.822-84.465zM39.324 277.884c-6.06.022-12.104.098-18.142.223 1.673 26.288 5.512 51.288 14.052 73.732 45.88-5.82 93.308-4.96 141.15-3.87 1.518-21.27-.253-41.69-6.058-61.212-45.528-6.565-88.59-9.03-131.002-8.873z" fill="#ffffff" fill-opacity="1" transform="translate(51.2, 51.2) scale(0.8, 0.8) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
				`@ -0,0 +1 @@`
				`<option value="{{vitesse}}">{{vitesse}} km/h<sup>dr</sup> (Fatigue: {{fatigue}})</option>`