Version 11.2.17

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.

changelog.md

@@ -1,4 +1,24 @@
 # 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 - 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
 

lang/fr.json

@@ -1,55 +1,56 @@
 {
   "TYPES": {
     "Actor": { 
-      "Personnage": "Personnage",
+      "personnage": "Personnage",
-      "Creature": "Créature",
+      "creature": "Créature",
-      "Entite": "Entité de cauchemar",
+      "entite": "Entité de cauchemar",
-      "Commerce": "Commerce",
+      "commerce": "Commerce",
-      "Vehicule": "Véhicule"
+      "vehicule": "Véhicule"
     },
     "Item": {
-      "Arme": "Arme",
+      "arme": "Arme",
-      "Armure": "Armure",
+      "armure": "Armure",
-      "Blessure": "Blessure",
+      "blessure": "Blessure",
-      "Casetmr": "TMR spéciale",
+      "casetmr": "Case TMR spéciale",
-      "Chant": "Chant",
+      "chant": "Chant",
-      "Competence": "Compétence",
+      "competence": "Compétence",
-      "Competencecreature": "Compétence de créature",
+      "competencecreature": "Compétence de créature",
-      "Conteneur": "Conteneur",
+      "conteneur": "Conteneur",
-      "Danse": "Danse",
+      "danse": "Danse",
-      "Extraitpoetique": "Extrait poetique",
+      "empoignade": "Empoignade",
-      "Faune": "Faune",
+      "extraitpoetique": "Extrait poetique",
-      "Gemme": "Gemme",
+      "faune": "Faune",
-      "Herbe": "Herbe",
+      "gemme": "Gemme",
-      "Ingredient": "Ingrédient",
+      "herbe": "Herbe",
-      "Jeu": "Jeu",
+      "ingredient": "Ingrédient",
-      "Livre": "Livre",
+      "jeu": "Jeu",
-      "Maladie": "Maladie",
+      "livre": "Livre",
-      "Meditation": "Méditation",
+      "maladie": "Maladie",
-      "Monnaie": "Monnaie",
+      "meditation": "Méditation",
-      "Munition": "Munition",
+      "monnaie": "Monnaie",
-      "Musique": "Musique",
+      "munition": "Munition",
-      "Nombreastral": "Nombre astral",
+      "musique": "Musique",
-      "Nourritureboisson": "Nourriture & boisson",
+      "nombreastral": "Nombre astral",
-      "Objet": "Objet",
+      "nourritureboisson": "Nourriture & boisson",
-      "Oeuvre": "Oeuvre",
+      "objet": "Objet",
-      "Ombre": "Ombre de Thanatos",
+      "oeuvre": "Oeuvre",
-      "Plante": "Plante",
+      "ombre": "Ombre de Thanatos",
-      "Poison": "Poison",
+      "plante": "Plante",
-      "Possession": "Possession",
+      "poison": "Poison",
-      "Potion": "Potion",
+      "possession": "Possession",
-      "Queue": "Queue de Dragon",
+      "potion": "Potion",
-      "Recettealchimique": "Recette alchimique",
+      "queue": "Queue de Dragon",
-      "Recettecuisine": "Recette de cuisine",
+      "recettealchimique": "Recette alchimique",
-      "Rencontre": "Rencontre TMR",
+      "recettecuisine": "Recette de cuisine",
-      "Service": "Service",
+      "rencontre": "Rencontre TMR",
-      "Signedraconique": "Signe draconique",
+      "service": "Service",
-      "Sort": "Sort",
+      "signedraconique": "Signe draconique",
-      "Sortreserve": "Sort en réserve",
+      "sort": "Sort",
-      "Souffle": "Souffle de Dragon",
+      "sortreserve": "Sort en réserve",
-      "Tache": "Tâche",
+      "souffle": "Souffle de Dragon",
-      "Tarot": "Carte de tarot",
+      "tache": "Tâche",
-      "Tete": "Tête de Dragon"
+      "tarot": "Carte de tarot",
+      "tete": "Tête de Dragon"
     }
   },
   "EFFECT": {

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) }
+  getAgilite() { return this.system.carac.agilite?.value ?? 0 }
-  getChance() { return Number(this.system.carac.chance?.value ?? 0) }
+  getChance() { return this.system.carac.chance?.value ?? 0 }
 
-  getReveActuel() { return Misc.toInt(this.system.reve?.reve?.value ?? this.carac.reve.value) }
+  getReveActuel() { return this.system.reve?.reve?.value ?? this.carac.reve.value ?? 0 }
-  getChanceActuel() { return Misc.toInt(this.system.compteurs.chance?.value ?? 10) }
+  getChanceActuel() { return this.system.compteurs.chance?.value ?? 10 }
-  getMoralTotal() { return Number(this.system.compteurs.moral?.value ?? 0) }
+  getMoralTotal() { return this.system.compteurs.moral?.value ?? 0 }
 
   /* -------------------------------------------- */
   getEtatGeneral(options = { ethylisme: false }) {
-    const etatGeneral = Misc.toInt(this.system.compteurs.etat?.value)
+    const etatGeneral = this.system.compteurs.etat?.value ?? 0
-    if (options.ethylisme) {
+    // Pour les jets d'Ethylisme, on retire le malus d'éthylisme (p.162)
-      // Pour les jets d'Ethylisme, on retire le malus d'éthylisme (p.162)
+    const annuleMalusEthylisme = options.ethylisme ? this.malusEthylisme() : 0
-      return etatGeneral - this.malusEthylisme()
+    return etatGeneral - annuleMalusEthylisme
-    }
-    return etatGeneral
   }
 
   /* -------------------------------------------- */

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

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/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: "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, label: 'Légère', max: 5, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.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, label: 'Grave', max: 2, 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, label: 'Critique', max: 1, 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 = {

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

@@ -300,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;
   }
 
@@ -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) {
+        for (let actor of personnages) {
-          // TODO: ne plus stresser les entités de cauchemar!
           await actor.distribuerStress('stress', stress, motif);
         }
       } else {
-        //console.log(stressValue, nomJoueur);
+        let actor = Misc.findActor(name, personnages) ?? Misc.findPlayer(name)?.character
-        let actor = Misc.findActor(name, game.actors.filter(it => it.hasPlayerOwner)) ?? Misc.findPlayer(name)?.character
         if (actor) {
           await actor.distribuerStress('stress', stress, motif);
         }

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

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

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

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

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)
+        .filter(img => img != undefined && !PIXI.utils.TextureCache[img])
-        .map(async img => PIXI.Sprite.from(await PIXI.Assets.load(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 { 
+.item-label { 
-  font-weight: bold;
-}
-.alchimie-title { 
   font-weight: bold;
 }
 .pointsreve-value {

system.json

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

template.json

@@ -525,15 +525,11 @@
   },
   "Item": {
     "types": [
-        "competence", "competencecreature",
+        "arme", "armure", "blessure", "casetmr", "chant", "competence", "competencecreature", "conteneur", "danse", 
-        "recettealchimique", "musique", "chant", "danse", "jeu", "recettecuisine", "oeuvre",
+        "empoignade", "extraitpoetique", "faune", "gemme", "herbe", "ingredient", "jeu", "livre", "maladie", "meditation",
-        "objet", "arme", "armure", "conteneur", "herbe", "plante", "ingredient", "faune", "livre", "potion", "munition",
+        "monnaie", "munition", "musique", "nombreastral", "nourritureboisson", "objet", "oeuvre", "ombre", "plante", "possession", 
-        "monnaie", "nourritureboisson", "gemme",
+        "poison", "potion", "queue", "recettealchimique", "recettecuisine", "rencontre", 
-        "service",
+        "service" ,"signedraconique", "sort", "sortreserve", "souffle", "tarot", "tache", "tete" ],
-        "meditation", "rencontre", "queue", "ombre", "souffle", "tete", "casetmr", "signedraconique", "sort", "sortreserve",
-        "nombreastral", "tache", "blessure", "maladie", "poison", "possession",
-        "tarot", "extraitpoetique", "empoignade"
-    ],
     "templates": {
       "description": {
         "description": "",

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-edit" data-tooltip="Modifier"><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-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
     </div>
   </li>
   {{/each}}

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-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 blessure grave"><i class="fas fa-plus-circle"></i> grave</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 blessure critque"><i class="fas fa-plus-circle"></i> critique</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">

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-edit" data-tooltip="Modifier"><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-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-edit" data-tooltip="Modifier"><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-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-edit" data-tooltip="Modifier"><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-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-edit" data-tooltip="Modifier"><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-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-edit" data-tooltip="Modifier"><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-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-edit" data-tooltip="Modifier"><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-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-edit" data-tooltip="Modifier"><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-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
       </div>
     </li>
     {{/unless}}

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

templates/dialog-tmr.html

@@ -21,49 +21,48 @@
       </div>
       {{else}}
         {{#if (and isGM hasPlayerOwner)}}
-      <div class="flex-group-center flex-shrink">
+          <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>
+            <h4>Le gardien gére les TMR du joueur, le joueur ne peut pas monter dans les TMR!</h4>
-        </div>
+          </div>
         {{/if}}
-      <div class="flex-group-center flex-shrink">
+        <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="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="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">
+          <img class="small-button-direction tmr-move" data-move="topright" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-topright.svg">
-      </div>
+        </div>
-      <div class="flex-group-center flex-shrink">
+        <div class="flex-group-center flex-shrink">
-        <label>Coordonnées : </label><span id="tmr-pos">0</span>
+          <label>Coordonnées : </label><span id="tmr-pos">0</span>
-      </div>
+        </div>
-      <div class="flex-group-center flex-shrink">
+        <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="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="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">
+          <img class="small-button-direction tmr-move" data-move="bottomright" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottomright.svg">
-      </div>
+        </div>
-      <div class="flex-group-center flex-shrink lire-signe-draconique">
+        <div class="flex-group-center flex-shrink lire-signe-draconique">
-        <a>Lire un signe draconique</a>
+          <a>Lire un signe draconique</a>
-      </div>
+        </div>
-      <div class="flex-group-center flex-shrink lancer-sort">
+        <div class="flex-group-center flex-shrink lancer-sort">
-        <a>Lancer un Sort</a>
+          <a>Lancer un Sort</a>
-      </div>
+        </div>
-      <hr>
+        <hr>
-      <div class="flex-group-center flex-shrink">
+        <div class="flex-group-center flex-shrink">
-        <label>Carac. Rêve : </label><label>{{caracReve}}</label>
+          <label>Carac. Rêve : </label><label>{{caracReve}}</label>
-      </div>
+        </div>
-      <div class="flex-group-center flex-shrink">
+        <div class="flex-group-center flex-shrink">
-        <label>Rêve actuel : </label><span id="tmr-pointsreve-value">0</span>
+          <label>Rêve actuel : </label><span id="tmr-pointsreve-value">0</span>
-      </div>
+        </div>
-      <div class="flex-group-center flex-shrink">
+        <div class="flex-group-center flex-shrink">
-        <label>Etat général : </label><span id="tmr-etatgeneral-value">0</span>
+          <label>Etat général : </label><span id="tmr-etatgeneral-value">0</span>
-      </div>
+        </div>
-      <div class="flex-group-center flex-shrink">
+        <div class="flex-group-center flex-shrink">
-        <label>Refoulement : </label><span id="tmr-refoulement-value">0</span>
+          <label>Refoulement : </label><span id="tmr-refoulement-value">0</span>
-      </div>
+        </div>
-      <div class="flex-group-center flex-actions-bar appliquerFatigue">
+        <div class="flex-group-center flex-actions-bar appliquerFatigue">
-        Fatigue 
+          Fatigue 
-        <span id="tmr-fatigue-table">{{{fatigue.html}}}</span>
+          <span id="tmr-fatigue-table">{{{fatigue.html}}}</span>
-      </div>
+        </div>
       {{/if}}
-      <div class="flex-group-center flex-grow">
+      <div class="flex-group-center flex-grow"></div>
-      </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>
+      <label for="system.specific">Mode spécifique</label>
-      <select name="system.specific" id="specific" data-dtype="String">
+      <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>
+        <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}}

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>
+        <label for="system.type">Type</label>
-        <select name="system.type" id="type" data-dtype="String">
+        <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>
+        <label for="system.competence">Compétence</label>
-        <select name="system.competence" id="competenceselect" data-dtype="String">
+        <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>
+      <label for="system.competence">Compétence</label>
-      <select name="system.competence" id="competenceselect" data-dtype="String">
+      <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>
+      <label for="system.heure">Heure</label>
-      <select name="system.heure" id="heure" data-dtype="String">
+      <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>
+      <label for="system.tmr">Case TMR</label>
-      <select name="system.tmr" id="tmr" data-dtype="String">
+      <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>
+        <label for="system.default_carac">Caractéristique</label>
-        <select name="system.default_carac" id="default_carac" data-dtype="String">
+        <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>
+        <label for="system.competence">Compétence</label>
-        <select name="system.competence" id="competenceselect" data-dtype="String">
+        <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>
+      <label for="system.draconic">Draconic</label>
-      <select name="system.draconic" id="draconic" data-dtype="String">
+      <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>
+      <label for="system.draconic">Draconic</label>
-      <select name="system.draconic" id="draconic" data-dtype="String">
+      <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>
+          <label for="system.aspect">Sens</label>
-          <select name="system.aspect" id="aspect" data-dtype="String">
+          <select name="system.aspect" data-dtype="String">
             {{#select system.aspect}}
             {{>"systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.html"}}
             {{/select}}