Merge branch 'gestion-status' into 'v1.2'

Gestion des status effects

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!110

module/actor-sheet.js

@@ -8,6 +8,7 @@ import { HtmlUtility } from "./html-utility.js";
 import { RdDItem } from "./item.js";
 import { RdDItemArme } from "./item-arme.js";
 import { RdDItemCompetence } from "./item-competence.js";
+import { RdDBonus } from "./rdd-bonus.js";
 
 /* -------------------------------------------- */
 export class RdDActorSheet extends ActorSheet {
@@ -108,6 +109,7 @@ export class RdDActorSheet extends ActorSheet {
     // Common data
     data.data.competenceByCategory = data.competenceByCategory;
     data.data.encTotal = this.actor.encTotal;
+    data.data.surprise = RdDBonus.find(this.actor.getSurprise(false)).descr;
     data.data.isGM = game.user.isGM;
     data.ajustementsConditions = CONFIG.RDD.ajustementsConditions;
     data.difficultesLibres = CONFIG.RDD.difficultesLibres;
@@ -126,7 +128,6 @@ export class RdDActorSheet extends ActorSheet {
     data.data.vehiculesList = this.actor.buildVehiculesList();
     data.data.monturesList  = this.actor.buildMonturesList();
     data.data.suivantsList  = this.actor.buildSuivantsList();
-
     return data;
   }
 
@@ -332,7 +333,9 @@ export class RdDActorSheet extends ActorSheet {
     html.find('#dormir-chateau-dormant').click((event) => {
       this.actor.dormirChateauDormant();
     });
-
+    html.find('#enlever-tous-effets').click((event) => {
+      this.actor.enleverTousLesEffets();
+    });
     // Display info about queue
     html.find('.queuesouffle-label a').click((event) => {
       let myID = event.currentTarget.attributes['data-item-id'].value;
@@ -483,6 +486,10 @@ export class RdDActorSheet extends ActorSheet {
       this.actor.santeIncDec("endurance", -1);
       this.render(true);
     });
+    html.find('.data-sante-sonne').click((event) => {
+      this.actor.setSonne(event.currentTarget.checked);
+      this.render(true);
+    });
     html.find('#ptreve-actuel-plus').click((event) => {
       this.actor.reveActuelIncDec(1);
       this.render(true);

module/actor.js

@@ -18,6 +18,8 @@ import { RdDAudio } from "./rdd-audio.js";
 import { RdDItemCompetence } from "./item-competence.js";
 import { RdDItemArme } from "./item-arme.js";
 import { RdDAlchimie } from "./rdd-alchimie.js";
+import { StatusEffects } from "./status-effects.js";
+
 
 /* -------------------------------------------- */
 /**
@@ -25,6 +27,12 @@ import { RdDAlchimie } from "./rdd-alchimie.js";
  * @extends {Actor}
  */
 export class RdDActor extends Actor {
+  /* -------------------------------------------- */
+  static init() {
+    Hooks.on("deleteActiveEffect", (actor, effect, options) => actor.onDeleteActiveEffect(effect, options));
+    Hooks.on("createActiveEffect", (actor, effect, options) => actor.onCreateActiveEffect(effect, options));
+    Hooks.on("updateToken", (scene, token, data, options) => { RdDActor.onUpdateToken(scene, token, data, options) });
+  }
 
   /* -------------------------------------------- */
   /**
@@ -247,24 +255,19 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  getSurprise() {
+  getSurprise(isCombat = true) {
-    // TODO: gérer une liste de flags demi-surprise (avec icône sur le token)?
+    let niveauSurprise = Array.from(this.effects?.values() ?? [])
-    if (this.getSonne()) {
+      .map(effect => StatusEffects.valeurSurprise(effect.data, isCombat))
+      .reduce((a,b)=> a+b, 0);
+    if (niveauSurprise>1) {
+      return 'totale';
+    }
+    if (niveauSurprise==1 || this.getSonne()) {
       return 'demi';
     }
     return '';
   }
 
-  /* -------------------------------------------- */
-  isDemiSurprise() {
-    return this.getSurprise() == 'demi';
-  }
-
-  /* -------------------------------------------- */
-  isSurpriseTotale() {
-    return this.getSurprise() == 'totale';
-  }
-
   /* -------------------------------------------- */
   async dormirChateauDormant() {
     let message = {
@@ -830,7 +833,6 @@ export class RdDActor extends Actor {
     }
     // Mise à jour valeur totale et états
     this.encTotal = encTotal;
-    console.log("Enco total : ", this.encTotal);
     this.detectSurEncombrement();
     // Mise à jour éventuelle du malus armure
     if (this.data.data.attributs && this.data.data.attributs.malusarmure && newMalusArmure != malusArmureData.value) {
@@ -1058,17 +1060,31 @@ export class RdDActor extends Actor {
     return !this.isEntiteCauchemar() && (this.data.data.sante.sonne?.value ?? false);
   }
 
+  async setSonne(sonne = true) {
+    if (this.isEntiteCauchemar()) {
+      return;
+    }
+    await this.setStatusSonne(sonne);
+    await this.setStateSonne(sonne);
+  }
+  
+  async setStateSonne(sonne) {
+    if (this.isEntiteCauchemar()) {
+      return;
+    }
+    await this.update({ "data.sante.sonne.value": sonne });
+  }
+
   /* -------------------------------------------- */
   getSConst() {
-
+    if (this.isEntiteCauchemar()) {
-    if (!this.isEntiteCauchemar() && this.data.data.attributs) {
-      return this.data.data.attributs.sconst.value;
-    }
       return 0;
     }
+    return this.data.data.attributs?.sconst?.value ?? 0;
+  }
 
   /* -------------------------------------------- */
-  testSiSonne(sante, endurance) {
+  async testSiSonne(sante, endurance) {
     const roll = new Roll("1d20").roll();
     roll.showDice = true;
     RdDDice.show(roll);
@@ -1083,6 +1099,7 @@ export class RdDActor extends Actor {
     }
     if (result.sonne) {
       // 20 is always a failure
+      await this.setSonne();
       sante.sonne.value = true;
     }
     return result;
@@ -1127,8 +1144,8 @@ export class RdDActor extends Actor {
   async santeIncDec(name, inc, isCritique = false) {
 
     const sante = duplicate(this.data.data.sante);
-    let data = sante[name];
+    let compteur = sante[name];
-    if (!data) {
+    if (!compteur) {
       return;
     }
     let result = {
@@ -1141,13 +1158,10 @@ export class RdDActor extends Actor {
       minValue = name == "vie" ? -Number(this.data.data.attributs.sconst.value) : 0;
     }
 
-    result.newValue = Math.max(minValue, Math.min(data.value + inc, data.max));
+    result.newValue = Math.max(minValue, Math.min(compteur.value + inc, compteur.max));
     //console.log("New value ", inc, minValue, result.newValue);
-
+    let fatigue = 0;
     if (name == "endurance" && this.data.type != 'entite') {
-      if (sante.fatigue && inc < 0) { // Each endurance lost -> fatigue lost
-        sante.fatigue.value = sante.fatigue.value - inc
-      }
       if (!isCritique && result.newValue == 0 && inc < 0) { // perte endurance et endurance devient 0 -> -1 vie sauf si coup critique
         sante.vie.value = sante.vie.value - 1;
       }
@@ -1155,21 +1169,23 @@ export class RdDActor extends Actor {
       if (inc > 0) { // le max d'endurance s'applique seulement à la récupération
         result.newValue = Math.min(result.newValue, this._computeEnduranceMax())
       }
-      if (data.value - result.newValue > 1) {
+      const perte = compteur.value - result.newValue;
+      if (perte > 1) {
         // Peut-être sonné si 2 points d'endurance perdus d'un coup
-        const testIsSonne = this.testSiSonne(sante, result.newValue);
+        const testIsSonne = await this.testSiSonne(sante, result.newValue);
         result.sonne = testIsSonne.sonne;
         result.jetEndurance = testIsSonne.roll.total;
-      } else if (inc > 0 && !this.isEntiteCauchemar()) {
+      } else if (inc > 0) {
-        sante.sonne.value = false;
+        await this.setSonne(false);
+      }
+      if (sante.fatigue && inc < 0) { // Each endurance lost -> fatigue lost
+        fatigue = perte;
       }
     }
-    data.value = result.newValue;
+    compteur.value = result.newValue;
     //console.log(name, inc, data.value, result.newValue, minValue, data.max);
-    if (sante.fatigue) { // If endurance lost, then the same amount of fatigue cannot be recovered
+    // If endurance lost, then the same amount of fatigue cannot be recovered
-      sante.fatigue.value = Math.max(sante.fatigue.value, this._computeFatigueMin());
+    sante.fatigue.value = Math.max(sante.fatigue.value + fatigue, this._computeFatigueMin());
-    }
-    //console.log("SANTE::::", sante);
 
     await this.update({ "data.sante": sante });
     return result;
@@ -1779,8 +1795,7 @@ export class RdDActor extends Actor {
       competence: competence,
       tache: tache,
       diffConditions: tache.data.difficulte,
-      editLibre: false,
+      use: { libre: false, conditions: false},
-      editConditions: false,
       carac: {}
     };
     rollData.carac[tache.data.carac] = duplicate(this.data.data.carac[tache.data.carac]); // Single carac
@@ -1830,8 +1845,7 @@ export class RdDActor extends Actor {
         isPurification: false,
       },
       diffConditions: 0,
-      editLibre: false,
+      use: { libre: false, conditions: true, },
-      editConditions: true,
       carac: {}
     };
     meditationData.carac["intellect"] = duplicate(this.data.data.carac["intellect"]);
@@ -2196,15 +2210,15 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  async encaisserDommages(attackerRoll, attacker = undefined) {
+  async encaisserDommages(rollData, attacker = undefined) {
     if (attacker && !await attacker.accorder(this, 'avant-encaissement')) {
       return;
     }
 
-    console.log("encaisserDommages", attackerRoll)
+    console.log("encaisserDommages", rollData)
 
     let santeOrig = duplicate(this.data.data.sante);
-    let encaissement = this.jetEncaissement(attackerRoll);
+    let encaissement = this.jetEncaissement(rollData);
 
     this.ajouterBlessure(encaissement); // Will upate the result table
     const perteVie = await this.santeIncDec("vie", - encaissement.vie);
@@ -2219,7 +2233,7 @@ export class RdDActor extends Actor {
     encaissement.hasPlayerOwner = this.hasPlayerOwner;
     encaissement.resteEndurance = santeActuelle.endurance.value
     encaissement.sonne = perteEndurance.sonne;
-    encaissement.jetEndurance = perteEndurance.jetEndurance,
+    encaissement.jetEndurance = perteEndurance.jetEndurance;
     encaissement.endurance = santeOrig.endurance.value - perteEndurance.newValue;
     encaissement.vie = santeOrig.vie.value - perteVie.newValue;
 
@@ -2513,7 +2527,6 @@ export class RdDActor extends Actor {
     }
   }
 
-
   /* -------------------------------------------- */
   _alchimieResult(rollData) {
     RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-alchimie.html');
@@ -2592,6 +2605,100 @@ export class RdDActor extends Actor {
     await this.update( { 'data.subacteurs.suivants': newSuivants });
     await this.update( { 'data.subacteurs.montures': newMontures });
   }
+  /* -------------------------------------------- */
+  async onCreateActiveEffect(effect, options) {
+    switch (StatusEffects.statusId(effect)) {
+      case 'sonne':
+        await this.setStateSonne(true);
+        return;
+    }
   }
       
+  /* -------------------------------------------- */
+  async onDeleteActiveEffect(effect, options) {
+    switch (StatusEffects.statusId(effect)) {
+      case 'sonne':
+        await this.setStateSonne(false);
+        return;
+    }
+  }
     
+  /* -------------------------------------------- */
+  enleverTousLesEffets() {
+    this.deleteEmbeddedEntity('ActiveEffect', Array.from(this.effects?.keys() ?? []));
+  }
+  
+  /* -------------------------------------------- */
+  listeEffets(matching = it => true) {
+    const all = Array.from(this.effects?.values() ?? []);
+    const filtered = all.filter(it => matching(it.data));
+    return filtered;
+  }
+  
+  /* -------------------------------------------- */
+  async setStatusDemiReve(status) {
+    const options = { renderSheet: true/*, noHook: from == 'hook' */ };
+    if (status) {
+      await this.addEffect(StatusEffects.demiReve(), options)
+    }
+    else {
+      this.deleteEffect(StatusEffects.demiReve(), options)
+    }
+  }
+  
+  /* -------------------------------------------- */
+  async setStatusSonne(sonne) {
+    if (this.isEntiteCauchemar()) {
+      return;
+    }
+    const id = 'sonne';
+    const options = { renderSheet: true/*, noHook: from == 'hook' */ };
+    
+    if (sonne) {
+      await this.addById(id, options);
+    }
+    else /* if (!sonne)*/ {
+      this.deleteById(id, options)
+    }
+  }
+
+  /* -------------------------------------------- */
+  deleteById(id, options) {
+    const effects = Array.from(this.effects?.values())
+    .filter(it => it.data.flags.core?.statusId == id);
+    this._deleteAll(effects, options);
+  }
+
+  /* -------------------------------------------- */
+  deleteEffect(effect, options) {
+    const toDelete = Array.from(this.effects?.values())
+    .filter(it => StatusEffects.statusId(it.data) == StatusEffects.statusId(effect));
+    this._deleteAll(toDelete, options);
+  }
+
+  /* -------------------------------------------- */
+  _deleteAll(effects, options) {
+    this._deleteAllIds(effects.map(it => it.id), options);
+  }
+
+  /* -------------------------------------------- */
+  _deleteAllIds(effectIds, options) {
+    this.deleteEmbeddedEntity('ActiveEffect', effectIds, options);
+    this.applyActiveEffects();
+  }
+
+  /* -------------------------------------------- */
+  async addById(id, options) {
+    const statusEffect = CONFIG.statusEffects.find(it => it.id == id);
+    await this.addEffect(statusEffect, options);
+  }
+
+  /* -------------------------------------------- */
+  async addEffect(statusEffect, options) {
+    this.deleteById(statusEffect.id, options);
+    const effet = duplicate(statusEffect);
+    effet["flags.core.statusId"] = effet.id;
+    await this.createEmbeddedEntity('ActiveEffect', effet, options);
+    this.applyActiveEffects();
+  }
+}

module/rdd-bonus.js

@@ -38,7 +38,7 @@ export class RdDBonus {
       dmg.penetration = RdDBonus._peneration(rollData);
       dmg.dmgTactique = RdDBonus.dmgBonus(rollData.tactique);
       dmg.dmgParticuliere = RdDBonus._dmgParticuliere(rollData);
-      dmg.dmgSurprise = RdDBonus.dmgBonus(rollData.surpriseDefenseur);
+      dmg.dmgSurprise = RdDBonus.dmgBonus(rollData.ajustements?.attaqueDefenseurSurpris.used);
       dmg.dmgActor = rollData.selectedCarac ? RdDBonus._dmgPerso(dmgActor, rollData.selectedCarac.label, dmg.dmgArme) : 0;
       dmg.total = dmg.dmgSurprise + dmg.dmgTactique + dmg.dmgArme + dmg.dmgActor + dmg.dmgParticuliere;
       dmg.mortalite = RdDBonus._calculMortalite(rollData, isCauchemar)

module/rdd-combat.js

@@ -9,6 +9,67 @@ import { RdDRollTables } from "./rdd-rolltables.js";
 
 export class RdDCombat {
 
+  static init() {
+    this.initStorePasseArmes();
+    Hooks.on("updateCombat", (combat, data) => { RdDCombat.onUpdateCombat(combat, data) });
+    Hooks.on("preDeleteCombat", (combat, options) => { RdDCombat.onPreDeleteCombat(combat, options); });
+  }
+
+  /* -------------------------------------------- */
+  static initStorePasseArmes() {
+    game.system.rdd.combatStore = {
+      attaques: {},
+      defenses: {}
+    };
+  }
+
+  /* -------------------------------------------- */
+  static onSocketMessage(sockmsg) {
+    switch (sockmsg.msg) {
+      case "msg_encaisser":
+        return RdDCombat.terminerPasseArmes(data);
+      case "msg_defense":
+        return RdDCombat.handleMsgDefense(sockmsg.data);
+    }
+  }
+
+  /* -------------------------------------------- */
+  static onUpdateCombat(combat, data) {
+    if (combat.data.round != 0 && combat.turns && combat.data.active) {
+      RdDCombat.combatNouveauRound(combat);
+    }
+  }
+
+  /* -------------------------------------------- */
+  static onPreDeleteCombat(combat, options) {
+    if (game.user.isGM) {
+      ChatUtility.removeMyChatMessageContaining(`<div data-combatid="${combat.id}" data-combatmessage="actor-turn-summary">`)
+      /*
+      * TODO: support de plusieurs combats parallèles
+      * il faudrait avoir un id de combat en plus de celui de passe d'armes
+      */
+      for (const key in game.system.rdd.combatStore.attaques) {
+        const attackerRoll = game.system.rdd.combatStore.attaques[key];
+        ChatUtility.removeMyChatMessageContaining(`<div data-passearme="${attackerRoll.passeArme}">`);
+      }
+      for (const key in game.system.rdd.combatStore.defenses) {
+        const defenderRoll = game.system.rdd.combatStore.defenses[key];
+        ChatUtility.removeMyChatMessageContaining(`<div data-passearme="${defenderRoll.passeArme}">`);
+      }
+      RdDCombat.initStorePasseArmes();
+    }
+  }
+
+  /* -------------------------------------------- */
+  static combatNouveauRound(combat) {
+    let turn = combat.turns.find(t => t.tokenId == combat.current.tokenId);
+    if (game.user.isGM) {
+      // seul le GM notifie le status
+      this.displayActorCombatStatus(combat, turn.actor);
+      // TODO Playaudio for player??
+    }
+  }
+
   /* -------------------------------------------- */
   static isActive() {
     return true;
@@ -58,6 +119,33 @@ export class RdDCombat {
     return RdDCombat.createUsingTarget(attacker)
   }
 
+  /* -------------------------------------------- */
+  static handleMsgDefense(data) {
+    let defenderToken = canvas.tokens.get(data.defenderTokenId);
+    if (defenderToken) {
+      if (!game.user.isGM && game.user.character == undefined) { // vérification / sanity check
+        ui.notifications.error("Le joueur " + game.user.name + " n'est connecté à aucun personnage. Impossible de continuer.");
+        return;
+      }
+      if ((game.user.isGM && !defenderToken.actor.hasPlayerOwner) || (defenderToken.actor.hasPlayerOwner && (game.user.character.id == defenderToken.actor.data._id))) {
+        //console.log("User is pushing message...", game.user.name);
+        game.system.rdd.combatStore.attaques[data.attackerId] = duplicate(data.rollData);
+        data.whisper = [game.user];
+        data.blind = true;
+        data.rollMode = "blindroll";
+        ChatMessage.create(data);
+      }
+    }
+  }
+
+  static terminerPasseArmes(data) {
+    if (game.user.isGM) { // Seul le GM nettoie le stockage des données de combat
+      let attackerRoll = game.system.rdd.combatStore.attaques[data.attackerId]; // Retrieve the rolldata from the store
+      game.system.rdd.combatStore.attaques[data.attackerId] = undefined;
+      game.system.rdd.combatStore.defenses[attackerRoll.passeArme] = undefined;
+    }
+  }
+
   /* -------------------------------------------- */
   static _sendRollMessage(sender, recipient, defenderTokenId, topic, message, rollData) {
     let chatMessage = {
@@ -129,12 +217,12 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   async onEvent(button, event) {
-    let attackerRoll = game.system.rdd.rollDataHandler.attaques[this.attackerId];
+    let attackerRoll = game.system.rdd.combatStore.attaques[this.attackerId];
     if (!attackerRoll) {
       ui.notifications.warn("Action automatisée impossible, le jet de l'attaquant a été perdu (suite à un raffraichissement?)")
       return;
     }
-    const defenderTokenId = event.currentTarget.attributes['data-defenderTokenId'].value;
+    const defenderTokenId = event.currentTarget.attributes['data-defenderTokenId']?.value;
 
     const armeParadeId = event.currentTarget.attributes['data-armeid']?.value;
 
@@ -163,18 +251,18 @@ export class RdDCombat {
   /* -------------------------------------------- */
   _consumeDefense(passeArme) {
     let defenderRoll = this._getDefense(passeArme);
-    game.system.rdd.rollDataHandler.defenses[passeArme] = undefined;
+    game.system.rdd.combatStore.defenses[passeArme] = undefined;
     return defenderRoll;
   }
 
   /* -------------------------------------------- */
   _getDefense(passeArme) {
-    return game.system.rdd.rollDataHandler.defenses[passeArme];
+    return game.system.rdd.combatStore.defenses[passeArme];
   }
 
   /* -------------------------------------------- */
   _storeDefense(defenderRoll) {
-    game.system.rdd.rollDataHandler.defenses[defenderRoll.passeArme] = defenderRoll;
+    game.system.rdd.combatStore.defenses[defenderRoll.passeArme] = defenderRoll;
   }
 
   /* -------------------------------------------- */
@@ -235,7 +323,7 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   static isEchec(rollData) {
-    switch (rollData.surprise) {
+    switch (rollData.ajustements.surprise.used) {
       case 'totale': return true;
     }
     return rollData.rolled.isEchec;
@@ -243,7 +331,7 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   static isEchecTotal(rollData) {
-    if (!rollData.attackerRoll && rollData.surprise) {
+    if (!rollData.attackerRoll && rollData.ajustements.surprise.used) {
       return rollData.rolled.isEchec;
     }
     return rollData.rolled.isETotal;
@@ -251,7 +339,7 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   static isParticuliere(rollData) {
-    if (!rollData.attackerRoll && rollData.surprise) {
+    if (!rollData.attackerRoll && rollData.ajustements.surprise.used) {
       return false;
     }
     return rollData.rolled.isPart;
@@ -259,7 +347,7 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   static isReussite(rollData) {
-    switch (rollData.surprise) {
+    switch (rollData.ajustements.surprise.used) {
       case 'totale': return false;
     }
     return rollData.rolled.isSuccess;
@@ -299,10 +387,11 @@ export class RdDCombat {
       passeArme: randomID(16),
       coupsNonMortels: false,
       competence: competence,
-      surprise: this.attacker.getSurprise(),
+      surprise: this.attacker.getSurprise(true),
-      surpriseDefenseur: this.defender.getSurprise(),
+      surpriseDefenseur: this.defender.getSurprise(true),
       essais: {}
     };
+    rollData.diviseurSignificative = this._getDiviseurSignificative(rollData);
 
     if (this.attacker.isCreature()) {
       RdDItemCompetence.setRollDataCreature(rollData);
@@ -320,13 +409,13 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   async _onAttaqueParticuliere(rollData) {
-    game.system.rdd.rollDataHandler.attaques[this.attackerId] = duplicate(rollData);
+    game.system.rdd.combatStore.attaques[this.attackerId] = duplicate(rollData);
 
     // Finesse et Rapidité seulement en mêlée et si la difficulté libre est de -1 minimum
     const isMeleeDiffNegative = rollData.selectedCarac.label == "Mêlée" && rollData.diffLibre < 0;
     ChatMessage.create({
       whisper: ChatMessage.getWhisperRecipients(this.attacker.name),
-      content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-defense.html', {
+      content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-attaque-particuliere.html', {
         attackerId: this.attackerId,
         defenderTokenId: this.defenderTokenId,
         isFinesse: isMeleeDiffNegative,
@@ -342,7 +431,7 @@ export class RdDCombat {
     attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker.getBonusDegat(), this.defender.isEntiteCauchemar());
 
     // Save rollData for defender
-    game.system.rdd.rollDataHandler.attaques[this.attackerId] = duplicate(attackerRoll);
+    game.system.rdd.combatStore.attaques[this.attackerId] = duplicate(attackerRoll);
 
     attackerRoll.show = {
       cible: this.target ? this.defender.data.name : 'la cible',
@@ -368,7 +457,8 @@ export class RdDCombat {
     const paramDemandeDefense = {
       passeArme: attackerRoll.passeArme,
       essais: attackerRoll.essais,
-      surprise: this.defender.getSurprise(),
+      // surprise: this.defender.getSurprise(true),
+      // surprise: attackerRoll.ajustements.attaqueDefenseurSurpris.used,
       defender: this.defender,
       attackerId: this.attackerId,
       defenderTokenId: this.defenderTokenId,
@@ -401,7 +491,7 @@ export class RdDCombat {
   /* -------------------------------------------- */
   async _onAttaqueEchecTotal(attackerRoll) {
 
-    game.system.rdd.rollDataHandler.attaques[this.attackerId] = duplicate(attackerRoll);
+    game.system.rdd.combatStore.attaques[this.attackerId] = duplicate(attackerRoll);
 
     // Finesse et Rapidité seulement en mêlée et si la difficulté libre est de -1 minimum
     ChatMessage.create({
@@ -469,7 +559,6 @@ export class RdDCombat {
   }
 
   _prepareParade(attackerRoll, armeParade) {
-    const isCreature = this.defender.isCreature();
     const compName = armeParade.data.competence;
     const armeAttaque = attackerRoll.arme;
     
@@ -480,14 +569,15 @@ export class RdDCombat {
       attackerRoll: attackerRoll,
       competence: this.defender.getCompetence(compName),
       arme: armeParade,
-      surprise: this.defender.getSurprise(),
+      surprise: this.defender.getSurprise(true),
       needParadeSignificative: RdDItemArme.needParadeSignificative(armeAttaque, armeParade),
       needResist: RdDItemArme.needArmeResist(armeAttaque, armeParade),
       carac: this.defender.data.data.carac,
       show: {}
     };
-    rollData.diviseur = this._getDiviseurSignificative(rollData);
+    rollData.diviseurSignificative = this._getDiviseurSignificative(rollData);
-    if (isCreature) {
+
+    if (this.defender.isCreature()) {
       RdDItemCompetence.setRollDataCreature(rollData);
     }
     return rollData;
@@ -495,7 +585,13 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   _getDiviseurSignificative(defenderRoll) {
-    let facteurSign = (this.defender.isDemiSurprise() || defenderRoll.needParadeSignificative) ? 2 : 1;
+    let facteurSign = 1;
+    if (defenderRoll.surprise == 'demi'){
+      facteurSign *= 2;
+    } 
+    if (defenderRoll.needParadeSignificative) {
+      facteurSign *= 2;
+    }
     if (RdDBonus.isDefenseAttaqueFinesse(defenderRoll)) {
       facteurSign *= 2;
     }
@@ -568,12 +664,12 @@ export class RdDCombat {
       diffLibre: attackerRoll.diffLibre,
       attackerRoll: attackerRoll,
       competence: competence,
-      surprise: this.defender.getSurprise(),
+      surprise: this.defender.getSurprise(true),
-      surpriseDefenseur: this.defender.getSurprise(),
+      surpriseDefenseur: this.defender.getSurprise(true),
       carac: this.defender.data.data.carac,
       show: {}
     };
-    rollData.diviseur = this._getDiviseurSignificative(rollData);
+    rollData.diviseurSignificative = this._getDiviseurSignificative(rollData);
 
     if (this.defender.isCreature()) {
       RdDItemCompetence.setRollDataCreature(rollData);
@@ -590,21 +686,21 @@ export class RdDCombat {
   }
 
   /* -------------------------------------------- */
-  async _onEsquiveNormale(rollData) {
+  async _onEsquiveNormale(defenderRoll) {
-    console.log("RdDCombat._onEsquiveNormal >>>", rollData);
+    console.log("RdDCombat._onEsquiveNormal >>>", defenderRoll);
-    this._consumeDefense(rollData.passeArme);
+    this._consumeDefense(defenderRoll.passeArme);
-    await RdDResolutionTable.displayRollData(rollData, this.defender, 'chat-resultat-esquive.html');
+    await RdDResolutionTable.displayRollData(defenderRoll, this.defender, 'chat-resultat-esquive.html');
   }
 
   /* -------------------------------------------- */
-  async _onEsquiveEchec(rollData) {
+  async _onEsquiveEchec(defenderRoll) {
-    console.log("RdDCombat._onEsquiveEchec >>>", rollData);
+    console.log("RdDCombat._onEsquiveEchec >>>", defenderRoll);
 
-    await RdDResolutionTable.displayRollData(rollData, this.defender, 'chat-resultat-esquive.html');
+    await RdDResolutionTable.displayRollData(defenderRoll, this.defender, 'chat-resultat-esquive.html');
 
-    this.removeChatMessageActionsPasseArme(rollData.passeArme);
+    this.removeChatMessageActionsPasseArme(defenderRoll.passeArme);
-    this._sendMessageDefense(rollData.attackerRoll, { defense: true })
+    this._sendMessageDefense(defenderRoll.attackerRoll, { defense: true })
-    this._storeDefense(rollData);
+    this._storeDefense(defenderRoll);
   }
 
   /* -------------------------------------------- */
@@ -688,12 +784,6 @@ export class RdDCombat {
     return Misc.toInt(this.defender.data.data.carac.taille.value) - (attaque.forceValue + attaque.arme.data.dommagesReels);
   }
 
-  /* -------------------------------------------- */
-  _sendMessageEncaisser(rollData) {
-    let message = "<strong>" + this.defender.name + "</strong> doit:" + this._buildMessageEncaisser(rollData);
-    RdDCombat._sendRollMessage(this.attacker, this.defender, this.defenderTokenId, "msg_encaisser", message, rollData);
-  }
-
   /* -------------------------------------------- */
   async encaisser(attackerRoll, defenderTokenId) {
     defenderTokenId = defenderTokenId || this.defenderTokenId;
@@ -755,8 +845,9 @@ export class RdDCombat {
   }
 
   /* -------------------------------------------- */
-  static async displayActorCombatStatus(actor) {
+  static async displayActorCombatStatus(combat, actor) {
-    let rollData = {
+    let data = {
+      combatId: combat._id,
       alias: actor.name,
       etatGeneral: actor.getEtatGeneral(),
       isSonne: actor.getSonne(),
@@ -767,22 +858,14 @@ export class RdDCombat {
       isCritique: false
     }
     if (actor.countBlessuresByName("critiques") > 0) { // Pour éviter le cumul grave + critique
-      rollData.isCritique = true;
+      data.isCritique = true;
     } else if (actor.countBlessuresByName("graves") > 0) {
-      rollData.isGrave = true;
+      data.isGrave = true;
     }
+
     ChatUtility.createChatWithRollMode(actor.name, {
-      content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-summary.html`, rollData)
+      content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-summary.html`, data)
     });
   }
 
-  /* -------------------------------------------- */
-  static updateCombatRound(combat, data) {
-    if (combat.data.round != 0 && combat.turns && combat.data.active) {
-      let turn = combat.turns.find(t => t.tokenId == combat.current.tokenId);
-      this.displayActorCombatStatus(turn.actor);
-      // TODO Playaudio ??
-    }
-  }
-
 }

module/rdd-main.js

@@ -23,6 +23,7 @@ import { RdDCommands } from "./rdd-commands.js";
 import { RdDCombat } from "./rdd-combat.js";
 import { ChatUtility } from "./chat-utility.js";
 import { RdDItemCompetence } from "./item-competence.js";
+import { StatusEffects } from "./status-effects.js";
 
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
@@ -103,15 +104,8 @@ Hooks.once("init", async function() {
 
   // preload handlebars templates
   RdDUtility.preloadHandlebarsTemplates();
-
   // Create useful storage space
-  game.system.rdd = {
+  game.system.rdd = { TMRUtility: TMRUtility }
-    rollDataHandler: {
-      attaques: {},
-      defenses: {}
-    },
-    TMRUtility: TMRUtility
-  }
 
   /* -------------------------------------------- */
   game.settings.register("foundryvtt-reve-de-dragon", "accorder-entite-cauchemar", {
@@ -185,12 +179,13 @@ Hooks.once("init", async function() {
   // Set an initiative formula for the system 
   CONFIG.Combat.initiative = {
     formula: "1d20",
-    decimals: 2
+    decimals: 0
   };
 
   /* -------------------------------------------- */
   game.socket.on("system.foundryvtt-reve-de-dragon", data => {
-    RdDUtility.performSocketMesssage( data );
+    RdDUtility.onSocketMesssage(data);
+    RdDCombat.onSocketMessage(data);
   });
 
   /* -------------------------------------------- */
@@ -206,22 +201,10 @@ Hooks.once("init", async function() {
   /* -------------------------------------------- */
   // Register sheet application classes
   Actors.unregisterSheet("core", ActorSheet);
-  Actors.registerSheet("foundryvtt-reve-de-dragon", RdDActorSheet, {
+  Actors.registerSheet("foundryvtt-reve-de-dragon", RdDActorSheet, { types: ["personnage"], makeDefault: true });
-     types: ["personnage"],
+  Actors.registerSheet("foundryvtt-reve-de-dragon", RdDActorCreatureSheet, { types: ["creature"], makeDefault: true });
-     makeDefault: true }
+  Actors.registerSheet("foundryvtt-reve-de-dragon", RdDActorVehiculeSheet, { types: ["vehicule"], makeDefault: true });
-  );
+  Actors.registerSheet("foundryvtt-reve-de-dragon", RdDActorEntiteSheet, { types: ["entite"], makeDefault: true });
-  Actors.registerSheet("foundryvtt-reve-de-dragon", RdDActorCreatureSheet,  {
-    types: ["creature"],
-    makeDefault: true
-  });
-  Actors.registerSheet("foundryvtt-reve-de-dragon", RdDActorVehiculeSheet,  {
-    types: ["vehicule"],
-    makeDefault: true
-  });
-  Actors.registerSheet("foundryvtt-reve-de-dragon", RdDActorEntiteSheet,  {
-    types: ["entite"],
-    makeDefault: true
-  });
   Items.unregisterSheet("core", ItemSheet);
   Items.registerSheet("foundryvtt-reve-de-dragon", RdDItemSheet, { makeDefault: true });
 
@@ -230,6 +213,13 @@ Hooks.once("init", async function() {
 
   // Patch the initiative formula
   _patch_initiative();
+
+  // préparation des différents modules
+  RdDCommands.init();
+  RdDCombat.init();
+  RdDTokenHud.init();
+  RdDActor.init();
+  StatusEffects.init();
 });
 
 /* -------------------------------------------- */
@@ -244,18 +234,10 @@ function messageDeBienvenue(){
     ` });
 }
 
-/* -------------------------------------------- */
-Hooks.once("renderApplication", () => {
-  messageDeBienvenue();
-});
-
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
 /* -------------------------------------------- */
 Hooks.once("ready", function () {
-
-  // préparation des lignes de commandes 
-  RdDCommands.init();
   /* -------------------------------------------- */
   /* Affiche/Init le calendrier */
   let calendrier = new RdDCalendrier();
@@ -270,14 +252,14 @@ Hooks.once("ready", function() {
   // Avertissement si joueur sans personnage
   if (!game.user.isGM && game.user.character == undefined) {
     ui.notifications.info("Attention ! Vous n'êtes connecté à aucun personnage !");
-    ChatMessage.create( { content:"<b>ATTENTION</b> Le joueur " + game.user.name + " n'est connecté à aucun personnage !", 
+    ChatMessage.create({
-            user: game.user._id } );
+      content: "<b>ATTENTION</b> Le joueur " + game.user.name + " n'est connecté à aucun personnage !",
+      user: game.user._id
+    });
     //whisper:  [ ChatMessage.getWhisperRecipients("GM") ] } );
   }
 
-  // Integration du TokenHUD
+  messageDeBienvenue();
-  Hooks.on('renderTokenHUD', (app, html, data) => { RdDTokenHud.addTokenHudExtensions(app, html, data._id) });
-  Hooks.on("updateCombat", (combat, data)  => { RdDCombat.updateCombatRound(combat, data) } );
 });
 
 /* -------------------------------------------- */

module/rdd-resolution-table.js

@@ -82,7 +82,7 @@ export class RdDResolutionTable {
   static explain(rolled) {
     let message = "<br>Jet : <strong>" + rolled.roll + "</strong> sur " + rolled.score + "% ";
     if (rolled.caracValue != null && rolled.finalLevel != null) {
-      message += (rolled.diviseur > 1 ? `(1/${rolled.diviseur} de ` : "(")
+      message += (rolled.diviseurSignificative > 1 ? `(1/${rolled.diviseurSignificative} de ` : "(")
         + rolled.caracValue + " à " + Misc.toSignedString(rolled.finalLevel) + ") ";
     }
     message += '<strong>' + rolled.quality + '</strong>'
@@ -104,7 +104,7 @@ export class RdDResolutionTable {
 
   /* -------------------------------------------- */
   static async rollData(rollData) {
-    rollData.rolled = await this.roll(rollData.caracValue, rollData.finalLevel, rollData.bonus, rollData.diviseur, rollData.showDice);
+    rollData.rolled = await this.roll(rollData.caracValue, rollData.finalLevel, rollData.bonus, rollData.diviseurSignificative, rollData.showDice);
     return rollData;
   }
 

module/rdd-roll-resolution-table.js

@@ -70,45 +70,45 @@ export class RdDRollResolutionTable extends Dialog {
 
     this.bringToTop();
 
-    var rollData = this.rollData;
     var dialog = this;
 
-    function updateRollResult(rollData) {
+    // Setup everything onload
+    function onLoad(){
+      $("#diffLibre").val(Misc.toInt(dialog.rollData.diffLibre));
+      $("#diffConditions").val(Misc.toInt(dialog.rollData.diffConditions));
+      dialog.updateRollResult();
+    }
+    $(function () { onLoad();});
+    
+    // Update !
+    html.find('#diffLibre').change((event) => {
+      this.rollData.diffLibre = Misc.toInt(event.currentTarget.value);
+      this.updateRollResult();
+    });
+    html.find('#diffConditions').change((event) => {
+      rollData.diffConditions = Misc.toInt(event.currentTarget.value);
+      this.updateRollResult();
+    });
+    html.find('#carac').change((event) => {
+      let caracKey = event.currentTarget.value;
+      this.rollData.selectedCarac = this.rollData.carac[caracKey];
+      this.updateRollResult();
+    });
+  }
+  async updateRollResult() {
+    let rollData = this.rollData;
     rollData.caracValue = parseInt(rollData.selectedCarac.value)
-      rollData.finalLevel = dialog._computeFinalLevel(rollData);
+    rollData.finalLevel = this._computeFinalLevel(rollData);
 
     // Mise à jour valeurs
     $("#carac").val(rollData.caracValue);
     $("#roll-param").text(rollData.selectedCarac.value + " / " + Misc.toSignedString(rollData.finalLevel));
     $(".table-resolution").remove();
-      $("#resolutionTable").append(RdDResolutionTable.buildHTMLTable(rollData.caracValue, rollData.finalLevel, 1, 20, -10, 10));
     $(".table-proba-reussite").remove();
+    $("#tableResolution").append(RdDResolutionTable.buildHTMLTable(rollData.caracValue, rollData.finalLevel));
     $("#tableProbaReussite").append(RdDResolutionTable.buildHTMLResults(rollData.caracValue, rollData.finalLevel));
   }
 
-    // Setup everything onload
-    $(function () {
-      $("#diffLibre").val(Misc.toInt(rollData.diffLibre));
-      $("#diffConditions").val(Misc.toInt(rollData.diffConditions));
-      updateRollResult(rollData);
-    });
-
-    // Update !
-    html.find('#diffLibre').change((event) => {
-      rollData.diffLibre = Misc.toInt(event.currentTarget.value);
-      updateRollResult(rollData);
-    });
-    html.find('#diffConditions').change((event) => {
-      rollData.diffConditions = Misc.toInt(event.currentTarget.value);
-      updateRollResult(rollData);
-    });
-    html.find('#carac').change((event) => {
-      let caracKey = event.currentTarget.value;
-      this.rollData.selectedCarac = rollData.carac[caracKey];
-      updateRollResult(rollData);
-    });
-  }
-
   /* -------------------------------------------- */
   _computeFinalLevel(rollData) {
     const diffConditions = Misc.toInt(rollData.diffConditions);

module/rdd-roll.js

@@ -40,7 +40,7 @@ export class RdDRoll extends Dialog {
       moral: actor.getMoralTotal(),
       carac: actor.data.data.carac,
       finalLevel: 0,
-      diffConditions: rollData.arme ? RdDBonus.bonusAttaque(rollData.surpriseDefenseur) : 0,
+      diffConditions: 0,
       diffLibre: rollData.competence?.data.default_diffLibre ?? 0,
       editLibre: true,
       editConditions: true,
@@ -49,15 +49,12 @@ export class RdDRoll extends Dialog {
       surencMalusFlag: actor.isPersonnage() ? (actor.data.data.compteurs.surenc.value < 0) : false,
       surencMalusValue: actor.getSurenc(),
       useMalusSurenc: false,
-      use: {
+      use: { libre:true, conditions: true, surenc: false, encTotal: false, },
-        surenc: false,
-        encTotal: false,
-      },
       isMalusEncombrementTotal: RdDItemCompetence.isMalusEncombrementTotal(rollData.competence),
       useMalusEncTotal: false,
       encTotal: actor.getEncTotal(),
       ajustementAstrologique: actor.ajustementAstrologique(),
-      surprise: actor.getSurprise(),
+      surprise: actor.getSurprise(false),
     }
     mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
     RollDataAjustements.calcul(rollData, actor);
@@ -228,7 +225,7 @@ export class RdDRoll extends Dialog {
     $("#compdialogTitle").text(this._getTitle(rollData));
     $('#coupsNonMortels').prop('checked', rollData.coupsNonMortels);
     $("#dmg-arme-actor").text(dmgText);
-    $("#defenseur-surprise").text(RdDBonus.description(rollData.surpriseDefenseur));
+//    $("#defenseur-surprise").text(RdDBonus.description(rollData.ajustements.attaqueDefenseurSurpris.descr));
     $('.table-ajustement').remove();
     $(".table-resolution").remove();
     $(".table-proba-reussite").remove();
@@ -245,23 +242,7 @@ export class RdDRoll extends Dialog {
 
   /* -------------------------------------------- */
   _computeFinalLevel(rollData) {
-    const etat = RdDCarac.isIgnoreEtatGeneral(rollData.selectedCarac) ? 0 : rollData.etat;
+    return RollDataAjustements.sum(rollData.ajustements);
-    const diffConditions = Misc.toInt(rollData.diffConditions);
-    const malusSurenc = (rollData.useMalusSurenc) ? rollData.surencMalusValue : 0;
-    const bonusTactique = RdDBonus.bonusAttaque(rollData.tactique);
-    const malusEncTotal = (rollData.useMalusEncTotal) ? -rollData.encTotal : 0;
-    const ajustementChance = RdDResolutionTable.isAjustementAstrologique(rollData) ? rollData.ajustementAstrologique : 0;
-    // Gestion malus armure
-    const malusArmureValue = this._computeMalusArmure(rollData);
-
-    const diffMeditation = RdDItemMeditation.calculDifficulte(rollData);
-    const diffLibre = this._computeDiffLibre(rollData);
-    const diffCompetence = this._computeDiffCompetence(rollData);
-    const diffMoral = rollData.selectedCarac == this.actor.data.data.carac.volonte ? rollData.moral : 0;
-
-    let ajust = RollDataAjustements.sum(rollData.ajustements);
-    return ajust;
-    //return etat + diffCompetence + diffLibre + diffMoral + diffConditions + malusSurenc + malusEncTotal + malusArmureValue + diffMeditation + ajustementChance + bonusTactique;
   }
 
   /* -------------------------------------------- */

module/rdd-tmr-dialog.js

@@ -51,6 +51,7 @@ export class RdDTMRDialog extends Dialog {
     this.rencontreState = 'aucune';
     this.pixiApp = new PIXI.Application({ width: 720, height: 860 });
     if (!this.viewOnly){
+      this.actor.setStatusDemiReve(true);
       this._tellToGM(this.actor.name + " monte dans les terres médianes (" + mode + ")");
     }
   }
@@ -59,6 +60,8 @@ export class RdDTMRDialog extends Dialog {
   close() {
     this.actor.santeIncDec("fatigue", this.nbFatigue).then(super.close()); // moving 1 cell costs 1 fatigue
     this.actor.tmrApp = undefined; // Cleanup reference
+    this.actor.setStatusDemiReve(false);
+
     this._tellToGM(this.actor.name + " a quitté les terres médianes")
   }
 

module/rdd-token-hud.js

@@ -5,6 +5,11 @@ import { RdDUtility } from "./rdd-utility.js";
 /* -------------------------------------------- */
 export class RdDTokenHud {
 
+  static init(){
+      // Integration du TokenHUD
+    Hooks.on('renderTokenHUD', (app, html, data) => { RdDTokenHud.addTokenHudExtensions(app, html, data._id) });
+  }
+
   /* -------------------------------------------- */
   static async removeExtensionHud( app, html, tokenId) {
     let combat = html.find('.control-icon.rdd-combat');

module/rdd-utility.js

@@ -629,13 +629,11 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static performSocketMesssage(sockmsg) {
+  static onSocketMesssage(sockmsg) {
     console.log(">>>>> MSG RECV", sockmsg);
     switch (sockmsg.msg) {
       case "msg_encaisser":
         return RdDUtility._handleMsgEncaisser(sockmsg.data);
-      case "msg_defense":
-        return RdDUtility._handleMsgDefense(sockmsg.data);
       case "msg_gm_chat_message":
         return ChatUtility.handleGMChatMessage(sockmsg.data);
       case "msg_sync_time":
@@ -647,25 +645,6 @@ export class RdDUtility {
     }
   }
 
-  /* -------------------------------------------- */
-  static _handleMsgDefense(data) {
-    let defenderToken = canvas.tokens.get(data.defenderTokenId);
-    if (defenderToken) {
-      if (!game.user.isGM && game.user.character == undefined) { // vérification / sanity check
-        ui.notifications.error("Le joueur " + game.user.name + " n'est connecté à aucun personnage. Impossible de continuer.");
-        return;
-      }
-      if ((game.user.isGM && !defenderToken.actor.hasPlayerOwner) || (defenderToken.actor.hasPlayerOwner && (game.user.character.id == defenderToken.actor.data._id))) {
-        //console.log("User is pushing message...", game.user.name);
-        game.system.rdd.rollDataHandler.attaques[data.attackerId] = duplicate(data.rollData);
-        data.whisper = [game.user];
-        data.blind = true;
-        data.rollMode = "blindroll";
-        ChatMessage.create(data);
-      }
-    }
-  }
-
   /* -------------------------------------------- */
   static rollInitiativeCompetence(combatantId, arme) {
     const combatant = game.combat.getCombatant(combatantId);
@@ -760,12 +739,9 @@ export class RdDUtility {
   /* -------------------------------------------- */
   static _handleMsgEncaisser(data) {
     if (game.user.isGM) { // Seul le GM effectue l'encaissement sur la fiche
-      let attackerRoll = game.system.rdd.rollDataHandler.attaques[data.attackerId]; // Retrieve the rolldata from the store
-      game.system.rdd.rollDataHandler.attaques[data.attackerId] = undefined;
-      game.system.rdd.rollDataHandler.defenses[attackerRoll.passeArme] = undefined;
-
       let defender = canvas.tokens.get(data.defenderTokenId).actor;
-      defender.encaisserDommages(attackerRoll);
+      let attacker = data.attackerId ? game.actors.get(data.attackerId) : null;
+      defender.encaisserDommages(attackerRoll, attacker);
     }
   }
 

module/rolldata-ajustements.js

@@ -45,7 +45,7 @@ export const referenceAjustements = {
   },
   attaqueDefenseurSurpris: {
     isUsed: (rollData, actor) => rollData.surpriseDefenseur,
-    getLabel: (rollData, actor) => RdDBonus.find(rollData.surpriseDefenseur).descr,
+    getLabel: (rollData, actor) => RdDBonus.find(rollData.surpriseDefenseur).descr + (rollData.attackerRoll ? '' : ' défenseur'),
     getValue: (rollData, actor) => RdDBonus.find(rollData.surpriseDefenseur).attaque,
   },
   etat: {
@@ -88,8 +88,9 @@ export const referenceAjustements = {
     getValue: (rollData, actor) => actor.ajustementAstrologique()
   },
   facteurSign: {
-    isUsed: (rollData, actor) => rollData.diviseur > 1,
+    isUsed: (rollData, actor) => rollData.diviseurSignificative > 1,
-    getDescr: (rollData, actor) => rollData.diviseur > 1 ? `Facteur significative ×${Misc.getFractionHtml(rollData.diviseur)}` : ''
+    getLabel: (rollData, actor) => Misc.getFractionHtml(rollData.diviseurSignificative),
+    getDescr: (rollData, actor) => rollData.diviseurSignificative > 1 ? `Facteur significative <span class="rdd-diviseur">&times;${Misc.getFractionHtml(rollData.diviseurSignificative)}</span>` : ''
   },
   finesse: {
     isUsed: (rollData, actor) => RdDBonus.isDefenseAttaqueFinesse(rollData),
@@ -100,7 +101,7 @@ export const referenceAjustements = {
     getDescr: (rollData, actor) => rollData.attackerRoll && rollData.arme ? `${RdDItemArme.getNomCategorieParade(rollData.attackerRoll?.arme)} vs ${RdDItemArme.getNomCategorieParade(rollData.arme)}` : ''
   },
   surprise: {
-    isUsed: (rollData, actor) => actor.getSurprise(),
+    isUsed: (rollData, actor) => actor.getSurprise(rollData.passeArme),
     getDescr: (rollData, actor) => RdDBonus.find(actor.getSurprise()).descr
   },
   bonusCase: {

module/status-effects.js

@@ -0,0 +1,128 @@
+
+const rddStatusEffects = [
+  { id: 'sonne', rdd: true, label: 'Sonné', icon: 'icons/svg/stoned.svg' },
+];
+const demiReveStatusEffect = { id: 'demi-reve', rdd: true, label: 'Demi-rêve', icon: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd12.svg' };
+const rddPrivateStatusEffects = [demiReveStatusEffect,];
+const statusDemiSurpriseCombat = new Set(['sonne', 'demi-reve', 'prone', 'restrain']);
+const statusDemiSurprise = new Set(['sonne', 'prone', 'restrain']);
+const statusSurpriseTotale = new Set(['unconscious', 'blind']);
+
+export class StatusEffects {
+  static init() {
+    StatusEffects.setCoreStatusId(rddPrivateStatusEffects);
+    StatusEffects.setCoreStatusId(rddStatusEffects);
+    const defaultUseStatusEffect = CONFIG.statusEffects.map(it => it.id).join();
+    game.settings.register("foundryvtt-reve-de-dragon", "use-status-effects", {
+      name: "use-status-effects",
+      scope: "world",
+      config: false,
+      default: defaultUseStatusEffect,
+      type: String
+    });
+
+    game.settings.registerMenu("foundryvtt-reve-de-dragon", "select-status-effect", {
+      name: "Choisir les effets disponibles",
+      label: "Choix des effets",
+      hint: "Ouvre la fenêtre de sélection des effets/status appliqués aux acteurs",
+      icon: "fas fa-bars",
+      type: StatusEffectsSettings,
+      restricted: true
+    });
+    CONFIG.RDD.allEffects = rddStatusEffects.concat(CONFIG.statusEffects);
+
+    StatusEffects._setUseStatusEffects(StatusEffects._getUseStatusEffects());
+
+    console.log('statusEffects', CONFIG.statusEffects);
+  }
+
+  static valeurSurprise(effect, isCombat) {
+    const id = StatusEffects.statusId(effect);
+    if (statusSurpriseTotale.has(id)) {
+      return 2;
+    }
+    const status = (isCombat ? statusDemiSurpriseCombat : statusDemiSurprise);
+    return status.has(id) ? 1 : 0;
+  }
+
+  static statusId(effectData) {
+    return effectData.flags?.core?.statusId ?? effectData["flags.core.statusId"];
+  }
+
+  static setCoreStatusId(list) {
+    list.forEach(it => {
+      it.flags = { core: { statusId: it.id } };
+      it["flags.core.statusId"] = it.id;
+    });
+  }
+
+  static _getUseStatusEffects() {
+    const setting = game.settings.get("foundryvtt-reve-de-dragon", "use-status-effects");
+    return setting ? new Set(setting.split(',')) : new Set();
+  }
+
+  static _setUseStatusEffects(useStatusEffects) {
+    game.settings.set("foundryvtt-reve-de-dragon", "use-status-effects", StatusEffects._toSetting(useStatusEffects));
+
+    for (let effect of CONFIG.RDD.allEffects) {
+      effect.active = effect.rdd || useStatusEffects.has(effect.id);
+    }
+    CONFIG.statusEffects = CONFIG.RDD.allEffects.filter(it => it.active);
+  }
+
+  static _toSetting(useStatusEffects) {
+    return Array.from(useStatusEffects).join();
+  }
+
+  static demiReve() {
+    return demiReveStatusEffect;
+  }
+}
+
+class StatusEffectsSettings extends FormApplication {
+  constructor(...args) {
+    super(...args);
+  }
+
+  static get defaultOptions() {
+    const options = super.defaultOptions;
+    mergeObject(options, {
+      id: "status-effects-settings",
+      template: "systems/foundryvtt-reve-de-dragon/templates/status-effects-settings.html",
+      height: "auto",
+      width: 350,
+      minimizable: false,
+      closeOnSubmit: true,
+      title: "Choix des status/effets"
+    });
+    return options;
+  }
+
+  getData() {
+    let data = super.getData();
+    data.effects = CONFIG.RDD.allEffects;
+    return data;
+  }
+
+  activateListeners(html) {
+    html.find(".select-effect").click((event) => {
+      let id = event.currentTarget.attributes.name?.value;
+      if (id) {
+        let selected = StatusEffects._getUseStatusEffects();
+        let isChecked = event.currentTarget.checked;
+        if (isChecked) {
+          selected.add(id);
+        }
+        else {
+          selected.delete(id);
+        }
+        StatusEffects._setUseStatusEffects(selected);
+      }
+    });
+  }
+
+  async _updateObject(event, formData) {
+    this.close();
+  }
+}
+

styles/simple.css

@@ -241,8 +241,18 @@ table {border: 1px solid #7a7971;}
 }
 
 .button-img {
+  vertical-align: baseline;
   width: 8%;
   height: 8%;
+  max-height: 48px;
+  border-width: 0;
+}
+
+.button-effect-img {
+  vertical-align: baseline;
+  width: 16px;
+  max-height: 16px;
+  height: 16;
   border-width: 0;
 }
 
@@ -253,12 +263,6 @@ table {border: 1px solid #7a7971;}
   vertical-align: bottom;
 }
 
-.img-sonne {
-  vertical-align: baseline;
-  max-height: 16px;
-  border: 0;
-}
-
 .foundryvtt-reve-de-dragon .sheet-header .header-fields {
   -webkit-box-flex: 1;
   -ms-flex: 1;

templates/actor-creature-sheet.html

@@ -83,7 +83,7 @@
               <span class="competence-label flexrow" name="data.sante.sonne.label">Sonné : </span>
               <input class="resource-content" type="checkbox" name="data.sante.sonne.value"
                 value="{{data.sante.sonne.value}}" {{#if data.sante.sonne.value}}checked{{/if}} />
-                <img class="img-sonne" {{#if data.sante.sonne.value}}style="opacity: 1;"{{else}}style="opacity: 0;"{{/if}} src="icons/svg/stoned.svg" height="16" width="16"/>
+                <img class="button-effect-img" {{#if data.sante.sonne.value}}style="opacity: 1;"{{else}}style="opacity: 0;"{{/if}} src="icons/svg/stoned.svg" height="16" width="16"/>
             </li>
             <li class="competence flexrow list-item" data-attribute="etat">
               <span class="competence-label flexrow" name="data.compteurs.etat.label">Etat Général : </span>

templates/actor-humanoide-sheet.html

@@ -83,7 +83,7 @@
               <span class="competence-label flexrow" name="data.sante.sonne.label">Sonné : </span>
               <input class="resource-content" type="checkbox" name="data.sante.sonne.value"
                 value="{{data.sante.sonne.value}}" {{#if data.sante.sonne.value}}checked{{/if}} />
-                <img class="img-sonne" {{#if data.sante.sonne.value}}style="opacity: 1;"{{else}}style="opacity: 0;"{{/if}} src="icons/svg/stoned.svg" height="16" width="16"/>
+                <img class="button-effect-img" {{#if data.sante.sonne.value}}style="opacity: 1;"{{else}}style="opacity: 0;"{{/if}} src="icons/svg/stoned.svg" height="16" width="16"/>
             </li>
             <li class="competence flexrow list-item" data-attribute="etat">
               <span class="competence-label flexrow" name="data.compteurs.etat.label">Etat Général : </span>

templates/actor-sheet.html

@@ -1,3 +1,4 @@
+{{log "handlebar actor-sheet" this}} 
 <form class="{{cssClass}}" autocomplete="off">
 
     {{!-- Sheet Header --}}
@@ -40,8 +41,8 @@
             <li>
               <label class="ctn-sonne">
                 Sonné :
-                <input class="resource-content" type="checkbox" name="data.sante.sonne.value" value="{{data.sante.sonne.value}}" {{#if data.sante.sonne.value}}checked{{/if}} />
+                <input class="resource-content data-sante-sonne" type="checkbox" value="{{data.sante.sonne.value}}" {{#if data.sante.sonne.value}}checked{{/if}} />
-                <img class="img-sonne" {{#if data.sante.sonne.value}}style="opacity: 1;"{{else}}style="opacity: 0;"{{/if}} src="icons/svg/stoned.svg" height="16" width="16"/>
+                <img class="button-effect-img" {{#if data.sante.sonne.value}}style="opacity: 1;"{{else}}style="opacity: 0;"{{/if}} src="icons/svg/stoned.svg" height="16" width="16"/>
               </label>
             </li>
             <li>
@@ -71,10 +72,23 @@
               <span>{{data.blessures.resume}}</span>
             </div>
             <div class="flexrow">
-              <span>{{data.compteurs.etat.label}}: {{data.compteurs.etat.value}}</span><span></span>
+              <span>{{data.compteurs.etat.label}}: {{data.compteurs.etat.value}}</span>
+              <span>{{data.compteurs.surenc.label}}: {{data.compteurs.surenc.value}}</span>
             </div>
-            <div class="flexrow">
+            <div>
-              <span>{{data.compteurs.surenc.label}}: {{data.compteurs.surenc.value}}</span><span></span>
+              {{#if actor.effects}}
+              {{data.surprise}}! 
+              {{#each actor.effects as |effect key|}}
+              <span id="effect-{{effect.flags.core.status.statusId}} ">
+                <img class="button-effect-img" src="{{effect.icon}}" alt="{{effect.label}}" width="16" height="16" />
+              </span>
+              {{/each}}
+              {{#if data.isGM}}
+              <span id="enlever-tous-effets"><a>(enlever tout)</a></span>
+              {{/if}}
+              {{else}}
+                Aucun effet actif
+              {{/if}}
             </div>
           </div>
         </div>

templates/chat-actor-turn-summary.html

@@ -1,5 +1,5 @@
 <h4>C'est au tour de {{alias}} !</h4>
-<div>{{blessuresStatus}}</div>
+<div data-combatid="{{combatId}}" data-combatmessage="actor-turn-summary">{{blessuresStatus}}</div>
 <div>Son état général est de : {{etatGeneral}} {{#if isSonne}} et est <strong>sonné</strong>{{/if}}</div>
 {{#if isGrave}}
 <div>{{alias}} souffre de Blessure(s) Grave(s) : n'oubliez pas de faire un Je de Vie toutes les SC ({{SConst}}) minutes.</div>

templates/chat-resultat-attaque.html

@@ -1,5 +1,5 @@
-<h4>{{alias}} attaque: {{arme.name}}</h4>
+<h4>{{alias}} attaque  à {{diffLibre}}: {{arme.name}}</h4>
-<div>{{selectedCarac.label}}{{#unless (eq selectedCarac.label competence.name)}} / {{competence.name}}{{/unless}}, difficulté {{diffLibre}}</div>
+<div>{{selectedCarac.label}}{{#unless (eq selectedCarac.label competence.name)}} / {{competence.name}}{{/unless}}</div>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 <hr>
 {{#if tactique}}

templates/chat-resultat-encaissement.html

@@ -24,7 +24,7 @@
   {{#if (gt eraflures 0)}}une contusion
   {{else if (gt legeres 0)}}une blessure légère
   {{else if (gt graves 0)}}une blessure grave
-  {{else if (gt critique 0)}}une blessure critique
+  {{else if (gt critiques 0)}}une blessure critique
   {{else}}Rien du tout
   {{/if}}
 

templates/dialog-competence.html

@@ -1,3 +1,4 @@
+{{log "handlebar dialog-competence" this}} 
 <form class="skill-roll-dialog">
 <h2 class="compdialog" id="compdialogTitle"></h2>
 <div class="form-group">
@@ -17,7 +18,7 @@
   <label>{{diffLibre}}</label>
   {{else}}
   <label for="categorie">Difficulté libre</label>
-  <select name="diffLibre" id="diffLibre" data-dtype="number" {{#unless editLibre}}disabled{{/unless}}>
+  <select name="diffLibre" id="diffLibre" data-dtype="number" {{#unless use.libre}}disabled{{/unless}}>
       {{#select diffLibre}}
       {{#each difficultesLibres as |key|}}
       <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
@@ -26,7 +27,7 @@
   </select>
   {{/if}}
   <label for="categorie">&nbsp;&nbsp;Conditions</label>
-  <select name="diffConditions" id="diffConditions" data-dtype="number" {{#unless editConditions}}disabled{{/unless}}>
+  <select name="diffConditions" id="diffConditions" data-dtype="number" {{#unless use.conditions}}disabled{{/unless}}>
       {{#select diffConditions}}
       {{#each ajustementsConditions  as |key|}}
       <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
@@ -45,7 +46,7 @@
       <label></label>
     {{else}}
       <label for="categorie">Tactique:</label>
-      <select name="tactique-combat" id="tactique-combat" data-dtype="String" {{#unless editConditions}}disabled{{/unless}}>
+      <select name="tactique-combat" id="tactique-combat" data-dtype="String" {{#unless use.conditions}}disabled{{/unless}}>
         <option value="Attaque normale">Attaque normale</option>
         <option value="charge">Charge</option>
         <option value="feinte">Feinte</option>
@@ -54,8 +55,8 @@
       <label>Non Mortel</label>
       <input class="attribute-value" type="checkbox" id="coupsNonMortels" name="coupsNonMortels"  {{#if coupsNonMortels}}checked{{/if}}/>
     {{/if}}
-    {{#if surpriseDefenseur}}
+    {{#if ajustements.attaqueDefenseurSurpris.used}}
-    <label for="categorie" id="defenseur-surprise"></label>
+    <label for="categorie" id="defenseur-surprise">{{ajustements.attaqueDefenseurSurpris.label}}</label>
     {{/if}}
   </div>
 {{/if}}

templates/dialog-roll-ajustements.html

@@ -1,5 +1,5 @@
 <div class="table-ajustement">
-  <label class="tooltip">
+  <span class="tooltip">
     <span>Ajustement Final:</span>
     <span id="roll-param">{{selectedCarac.value}} / {{numberFormat finalLevel decimals=0 sign=true}}</span>
     <div class="tooltiptext ttt-ajustements">
@@ -15,5 +15,10 @@
       {{/if}}
       {{/each}}
     </div>
-  </label>
+  </span>
+  {{#if ajustements.facteurSign.used}}
+  <span>
+    Significative requise <span class="rdd-diviseur">&times;{{{ajustements.facteurSign.label}}}</span>!
+  </span>
+  {{/if}}
 </div>

templates/dialog-roll-resolution.html

@@ -28,8 +28,6 @@
       {{/select}}
   </select>
 </div>
-<div id="tableAjustements">
-</div>
 <div id="tableResolution">  
 </div>
 <div id="tableProbaReussite">  

templates/status-effects-settings.html

@@ -0,0 +1,16 @@
+<form autocomplete="off" onsubmit="event.preventDefault();">
+  <ul>
+    {{#each effects as |effect key|}}
+    <li>
+      {{#if effect.rdd}}
+      <input class="resource-content" type="checkbox" checked disabled/>
+      {{else}}
+      <input class="resource-content select-effect" type="checkbox" name="{{effect.id}}" {{#if effect.active}}checked{{/if}}/>
+      {{/if}}
+      <img class="button-effect-img" height="16" width="16" src="{{effect.icon}}" alt="{{ localize  effect.label}}" />
+      <label>{{ localize effect.label}}</label>
+    </li>
+    {{/each}}
+  </ul>
+</form>
+