Merge pull request '11.2.17 - Le cache-oeil d'Akarlikarlikar' (#695) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11

Reviewed-on: #695

changelog.md

@@ -1,6 +1,13 @@
 # 11.2
+## 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 - La Tri d'Akarlikarlikar
+## 11.2.16 - Le Tri d'Akarlikarlikar
 - Tri alphabétique des items dans la fenêtre de création
 - Mise à jour comptage de monde
 

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
   }
 
   /* -------------------------------------------- */

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) {

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) {

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}`)
       : '';
   }
 

module/rdd-commands.js

@@ -463,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);
         }

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;
 

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

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()

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,

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

module/voyage/dialog-fatigue-voyage.js

@@ -33,11 +33,10 @@ export class DialogFatigueVoyage extends Dialog {
       return
     }
     if (!DialogFatigueVoyage.dialog) {
-      const playerActors = game.actors.filter(actor => actor.hasPlayerOwner && actor.isPersonnage())
-        .map(actor => DialogFatigueVoyage.prepareActor(actor))
       const parameters = {
         tableauFatigueMarche: TABLEAU_FATIGUE_MARCHE,
-        playerActors: playerActors,
+        playerActors: game.actors.filter(actor => actor.isPersonnageJoueur())
+          .map(actor => DialogFatigueVoyage.prepareActor(actor)),
         nombreHeures: 1,
       }
       DialogFatigueVoyage.setModeDeplacement(parameters, undefined, undefined)

styles/simple.css

@@ -1315,10 +1315,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 {

system.json

@@ -1,8 +1,8 @@
 {
   "id": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
-  "version": "11.2.16",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.2.16.zip",
+  "version": "11.2.17",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.2.17.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": {

templates/actor/alchimie.html

@@ -4,8 +4,8 @@
   {{#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>
+      <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}}

templates/actor/chirurgie.html

@@ -13,8 +13,8 @@
       <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>
+        <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>
     {{/if}}

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

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>

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

templates/actor/dragon-queue.html

@@ -8,7 +8,7 @@
     <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>
     {{#if queue.system.refoulement}}
     <a class="item-action">Refouler</a>
     {{/if}}

templates/actor/dragon-souffles.html

@@ -6,7 +6,7 @@
     <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>
+      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
     </div>
   </li>
   {{/each}}

templates/actor/dragon-tetes.html

@@ -6,7 +6,7 @@
     <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>
+      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
     </div>
   </li>
   {{/each}}

templates/actor/jeux.html

@@ -5,8 +5,8 @@
   <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>
+      <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}}

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>

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

templates/actor/oeuvre.html

@@ -5,8 +5,8 @@
     <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>
   </div>
 </li>
 

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>

templates/actor/taches.html

@@ -9,8 +9,8 @@
           (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>
+        <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>
     {{/unless}}

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>

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

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

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>
 

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

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

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>
 

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

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

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>
 

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>
 

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>

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>

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>

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>
 

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

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>

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>

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

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

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>

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