From 86ea2f09e858511f098a8b3c2277190637e67166 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Fri, 7 Jan 2022 20:07:49 +0100
Subject: [PATCH 01/42] Fix hotbar drop

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index 2a221732..d3f4241a 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.5.55",
+  "version": "1.5.56",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
-- 
2.35.3


From 5bb4e02915d404ea9645b482585cab0ed6eef604 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Tue, 11 Jan 2022 23:39:51 +0100
Subject: [PATCH 02/42] Fix getActiveUser for v9

---
 module/chat-utility.js |  2 +-
 module/misc.js         | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/module/chat-utility.js b/module/chat-utility.js
index 224b2d2b..65e0c557 100644
--- a/module/chat-utility.js
+++ b/module/chat-utility.js
@@ -138,7 +138,7 @@ export class ChatUtility {
 
   /* -------------------------------------------- */
   static getUsers(filter) {
-    return game.users.filter(filter).map(user => user.data._id);
+    return Misc.getUsers().filter(filter).map(user => user.data._id);
   }
 
   /* -------------------------------------------- */
diff --git a/module/misc.js b/module/misc.js
index f7c62a42..3f8fa2a9 100644
--- a/module/misc.js
+++ b/module/misc.js
@@ -134,16 +134,17 @@ export class Misc {
     return Misc.firstConnectedGM()?.id ?? game.user.id;
   }
 
-  static getActiveUser(id) {
-    return game.users.entities.find(u => u.id == id && u.active);
+  static getUsers() {
+    return game.version ? game.users : game.users.entities;
   }
 
+  static getActiveUser(id) {
+    return Misc.getUsers().find(u => u.id == id && u.active);
+  }  
+
   static firstConnectedGM() {
-    if (game.version){
-      return game.users.filter(u => u.isGM && u.active)[0];
-    } else {
-      return game.users.entities.sort(Misc.ascending(u => u.id)).find(u => u.isGM && u.active);
-    }
+    return Misc.getUsers().filter(u => u.isGM && u.active).sort(Misc.ascending(u => u.id)).find(u => u.isGM && u.active);
+    
   }
 
   /**
@@ -155,7 +156,7 @@ export class Misc {
 
   /* -------------------------------------------- */
   static findPlayer(name) {
-    return Misc.findFirstLike(name, game.users, { description: 'joueur' });
+    return Misc.findFirstLike(name, Misc.getUsers(), { description: 'joueur' });
   }
 
   /* -------------------------------------------- */
-- 
2.35.3


From 31eab4a04f4265bae910d9baea13c4644c749755 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Fri, 7 Jan 2022 23:12:30 +0100
Subject: [PATCH 03/42] =?UTF-8?q?Fix=20erreur=20sur=20entit=C3=A9=20de=20c?=
 =?UTF-8?q?auchemar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lié à l'encombrement max, une entité n'en a pas
---
 module/actor.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index 796d0c1c..3b763ae6 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -1288,6 +1288,10 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   computeMalusSurEncombrement() {
+    switch (this.type) {
+      case 'entite': case 'vehicule':
+        return 0;
+    }
     return Math.min(0, this.getEncombrementMax() - Math.ceil(Number(this.getEncTotal())));
   }
   getMessageSurEncombrement(){
@@ -1295,9 +1299,14 @@ export class RdDActor extends Actor {
   }
 
   getEncombrementMax() {
-    return (this.data.type == 'vehicule')
-      ? Misc.templateData(this).capacite_encombrement
-      : Misc.templateData(this).attributs.encombrement.value;
+    switch (this.type){
+      case  'vehicule':
+        return Misc.templateData(this).capacite_encombrement;
+      case 'entite':
+        return 0; 
+      default:
+        return Misc.templateData(this).attributs.encombrement.value;
+    }
   }
 
   /* -------------------------------------------- */
-- 
2.35.3


From 264900a4bfdb12ee4aab8b3aa2ccaa4b2e6b0831 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sun, 9 Jan 2022 14:17:48 +0100
Subject: [PATCH 04/42] Formatting

---
 styles/simple.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/styles/simple.css b/styles/simple.css
index 27473615..f04559f8 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -434,17 +434,17 @@ table {border: 1px solid #7a7971;}
   border-bottom: 1px solid #BBB;
 }
 
-.blessure-inactive{
+.blessure-inactive {
   color:rgba(150, 150, 150, 0.4)
 }
-.blessure-active-legere{
+.blessure-active-legere {
   color:rgba(60, 60, 60, 0.9);
   text-shadow: rgba(60, 60, 60, 0.7);
 }
-.blessure-active-grave{
+.blessure-active-grave {
   color:rgba(218, 126, 21, 0.9);
 }
-.blessure-active-critique{
+.blessure-active-critique {
   color:rgba(173, 36, 26, 0.9);
 
 }
-- 
2.35.3


From 36398948519b0586c93d2ccafb918c6e8dc0335e Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sun, 9 Jan 2022 14:22:54 +0100
Subject: [PATCH 05/42] Ajout log pour probleme dans optimizeArgent

---
 module/actor.js | 3 ++-
 test/README.md  | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 test/README.md

diff --git a/module/actor.js b/module/actor.js
index 3b763ae6..0e076007 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -3602,7 +3602,8 @@ export class RdDActor extends Actor {
       10: Math.floor(fortuneTotale / 10) % 10, // bronze
       1: fortuneTotale % 10 // étain
     }
-    let updates = []
+    console.log('RdDActor.optimizeArgent', fortuneTotale, 'nouvelleFortune', nouvelleFortune, 'monnaie_par_valeur',parValeur);
+    let updates = [];
     for (const [valeur, nombre] of Object.entries(nouvelleFortune)) {
       updates.push({ _id: parValeur[valeur].id, 'data.quantite': nombre });
     }
diff --git a/test/README.md b/test/README.md
new file mode 100644
index 00000000..e599f842
--- /dev/null
+++ b/test/README.md
@@ -0,0 +1,8 @@
+# Quelques notes pour les tests
+
+# Commandes utiles
+
+Dans la console dans les "devtools" de Chrome, quelques commandes sont utiles:
+
+* `CONFIG.debug.hooks = true` permet de logger les appels des hooks et les objets passés
+* `game.system.rdd.TMRUtility.setForceRencontre('changeur', 3)` pour forcer une rencontre avec un changeur de rêves
-- 
2.35.3


From 732ef1332e74fa77cfd42fd00eeb081f22288fb3 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Thu, 13 Jan 2022 07:45:32 +0100
Subject: [PATCH 06/42] APply fix

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index d3f4241a..c3d77c0a 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.5.56",
+  "version": "1.5.57",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
-- 
2.35.3


From 8acbc8c8038e762c16e876491568ad6b39db30f3 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Wed, 19 Jan 2022 23:13:48 +0100
Subject: [PATCH 07/42] Adjust sidebar sizes and fix collapse

---
 styles/simple.css | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/styles/simple.css b/styles/simple.css
index f04559f8..2e3a6180 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -1067,11 +1067,6 @@ ul, li {
   color: rgba(220,220,220,0.75);
 }
 
-#sidebar.collapsed {
-  height: 430px !important;
-  position: absolute;
-}
-
 #sidebar-tabs > .collapsed, #chat-controls .chat-control-icon {
   color: rgba(220,220,220,0.75);
   text-shadow: 1px 1px 0 rgba(0,0,0,0.75);
@@ -1106,9 +1101,9 @@ ul, li {
 }
 
 #sidebar-tabs {
-  flex: 0 0 32px;
+  flex: 0 0 28px;
   box-sizing: border-box;
-  margin: 0 0 5px;
+  margin: 0 0 3px;
   border-bottom: 1px solid rgba(0,0,0,0);
   box-shadow: inset 0 0 2rem rgba(0,0,0,0.5);
 }
@@ -1120,8 +1115,8 @@ ul, li {
 }
 
 #sidebar #sidebar-tabs i{
-  width: 25px;
-  height: 25px;
+  width: 23px;
+  height: 23px;
   display: inline-block;
   background-position:center;
   background-size:cover;
-- 
2.35.3


From 8bbdb538e309aca3b46289c8bb3fad252e7a7434 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Thu, 20 Jan 2022 06:25:26 +0100
Subject: [PATCH 08/42] Fix sidebar

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index c3d77c0a..81d856b9 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.5.57",
+  "version": "1.5.58",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
-- 
2.35.3


From 351515a96a1f8969dc46fc62ddaa99dcacddb996 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Sun, 23 Jan 2022 16:00:01 +0100
Subject: [PATCH 09/42] Cacher les points de tache

---
 system.json                     |  4 ++--
 template.json                   |  1 +
 templates/item-tache-sheet.html | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/system.json b/system.json
index 81d856b9..0c33dee2 100644
--- a/system.json
+++ b/system.json
@@ -2,11 +2,11 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.5.58",
+  "version": "1.5.59",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
-  "templateVersion": 134,
+  "templateVersion": 135,
   "author": "LeRatierBretonnien",
   "authors": [
     { 
diff --git a/template.json b/template.json
index f7ad2348..0157db96 100644
--- a/template.json
+++ b/template.json
@@ -737,6 +737,7 @@
     "points_de_tache_courant": 0,
     "nb_jet_echec": 0,
     "nb_jet_succes": 0,
+    "cacher_points_de_tache": false,
     "description": "",
     "descriptionmj": ""
     },
diff --git a/templates/item-tache-sheet.html b/templates/item-tache-sheet.html
index 7be7d9c4..805ba0be 100644
--- a/templates/item-tache-sheet.html
+++ b/templates/item-tache-sheet.html
@@ -40,10 +40,25 @@
         <label for="xp">Fatigue</label>
         <input class="attribute-value" type="text" name="data.fatigue" value="{{data.fatigue}}" data-dtype="Number"/>
       </div>
+      {{#if isGM}}
+      <div class="form-group">
+        <label for="xp">Cacher les Points de Tâches nécessaires au joueur</label>
+        <input class="attribute-value" type="checkbox" name="data.cacher_points_de_tache" value="{{data.cacher_points_de_tache}}" {{checked data.cacher_points_de_tache}}/>
+      </div>
       <div class="form-group">
         <label for="xp">Points de tâches nécessaires</label>
         <input class="attribute-value" type="text" name="data.points_de_tache" value="{{data.points_de_tache}}" data-dtype="Number"/>
       </div>
+      {{else}}
+        <div class="form-group">
+          <label for="xp">Points de tâches nécessaires</label>
+          {{#if data.cacher_points_de_tache}}
+          <input class="attribute-value" type="text" value="?????" data-dtype="Number" disabled/>
+          {{else}}
+          <input class="attribute-value" type="text" name="data.points_de_tache" value="{{data.points_de_tache}}" data-dtype="Number"/>
+          {{/if}}
+        </div>
+      {{/if}}
       <hr>
       <div class="form-group">
         <label for="xp">Points de tâches obtenus</label>
-- 
2.35.3


From 60953672512dab3a3d1a672486f63579b0b8c589 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Tue, 25 Jan 2022 21:45:29 +0100
Subject: [PATCH 10/42] Rename entity to type

(warning in Foundry 9)
---
 system.json | 60 ++++++++++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/system.json b/system.json
index 0c33dee2..5b16a0dc 100644
--- a/system.json
+++ b/system.json
@@ -54,7 +54,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/competences.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "compétences" ]
     },
   	{
@@ -63,7 +63,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/arts-et-divertissements.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "recette", "cuisine", "danse", "musique", "chant", "jeux" ]
     },
   	{
@@ -72,7 +72,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/competences-creatures.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "compétences", "créatures" ]
     },
   	{
@@ -81,7 +81,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/competences-entites.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "compétences", "entités" ]
     },
   	{
@@ -90,7 +90,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/sorts-oniros.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "sorts" ]
     },
   	{
@@ -99,7 +99,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/sorts-hypnos.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "sorts" ]
     },
   	{
@@ -108,7 +108,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/sorts-narcos.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "sorts" ]
     },
   	{
@@ -117,7 +117,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/sorts-thanatos.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "sorts" ]
     },
   	{
@@ -126,7 +126,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/equipement.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "équipement", "objet" ]
     },
   	{
@@ -135,7 +135,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/maladies-et-poisons.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "maladie", "poison" ]
     },
   	{
@@ -144,7 +144,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/rappel-des-regles.db",
-      "entity": "JournalEntry",
+      "type": "JournalEntry",
       "tags" : [ "journal", "règles" ]
     },
   	{
@@ -153,7 +153,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/queues-de-dragon.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "queue" ]
     },
   	{
@@ -162,7 +162,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/ombres-de-thanatos.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "ombre" ]
     },
   	{
@@ -171,7 +171,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/souffles-de-dragon.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "souffle" ]
     },
   	{
@@ -180,7 +180,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/tarot-draconique.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "tarot" ]
     },
   	{
@@ -189,7 +189,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/tetes-de-dragon-pour-haut-revants.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "tête" ]
     },
   	{
@@ -198,7 +198,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/tetes-de-dragon-pour-tous-personnages.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "item", "tête" ]
     },
     {
@@ -207,7 +207,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/tables-diverses.db",
-      "entity": "RollTable",
+      "type": "RollTable",
       "tags" : [ "table", "tables" ]
     },
     {
@@ -216,7 +216,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/animaux.db",
-      "entity": "Actor",
+      "type": "Actor",
       "tags" : [ "animaux", "creature" ]
     },
     {
@@ -225,7 +225,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/voyageurs.db",
-      "entity": "Actor",
+      "type": "Actor",
       "tags" : [ "voyageur", "profils" ]
     },
     {
@@ -234,7 +234,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/vehicules.db",
-      "entity": "Actor",
+      "type": "Actor",
       "tags" : [ "vehicule", "bateau", "charett", "chariot", "carriole", "barque" ]
     },
     {
@@ -243,7 +243,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/archetypes.db",
-      "entity": "Actor",
+      "type": "Actor",
       "tags" : [ "archetype", "pnj" ]
     },
     {
@@ -252,7 +252,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/humanoides.db",
-      "entity": "Actor",
+      "type": "Actor",
       "tags" : [ "humanoides", "pnj" ]
     },
     {
@@ -261,7 +261,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/entites-de-cauchemar.db",
-      "entity": "Actor",
+      "type": "Actor",
       "tags" : [ "entités", "entite", "cauchemar", "ecni", "eni" ]
     },
     {
@@ -270,7 +270,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/invocations.db",
-      "entity": "Actor",
+      "type": "Actor",
       "tags" : [ "hypnos", "invocation" ]
     },
     {
@@ -279,7 +279,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/botanique.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "plantes", "champignons", "herbes" ]
     },
     {
@@ -288,7 +288,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/taches-courantes.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "taches" ]
     },
     {
@@ -297,7 +297,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/meditations-et-ecrits.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "meditations", "méditations", "livres", "livre", "méditation", "écrits", "écrit" ]
     },
     {
@@ -306,7 +306,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/recettes-alchimiques.db",
-      "entity": "Item",
+      "type": "Item",
       "tags" : [ "recettes", "recette", "alchimie", "alchimique", "potion" ]
     },
     {
@@ -315,7 +315,7 @@
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/scenes-rdd.db",
-      "entity": "Scene",
+      "type": "Scene",
       "tags" : [ "ecran", "scene" ]
     }
   ],
-- 
2.35.3


From 1eefa62495450c19a2d2d08cb2dc87abf90b0785 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Tue, 25 Jan 2022 22:06:10 +0100
Subject: [PATCH 11/42] =?UTF-8?q?Cacher=20les=20points=20de=20t=C3=A2che?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/item.js                     | 10 ++++++----
 templates/actor-sheet.html         |  5 ++++-
 templates/chat-resultat-tache.html |  3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/module/item.js b/module/item.js
index 23bfb441..be445e19 100644
--- a/module/item.js
+++ b/module/item.js
@@ -404,10 +404,12 @@ export class RdDItem extends Item {
       `<b>Compétence</b>: ${tplData.competence}`,
       `<b>Périodicité</b>: ${tplData.periodicite}`,
       `<b>Fatigue</b>: ${tplData.fatigue}`,
-      `<b>Difficulté</b>: ${tplData.difficulte}`,
-      `<b>Points de Tâche</b>: ${tplData.points_de_tache}`,
-      `<b>Points de Tâche atteints</b>: ${tplData.points_de_tache_courant}`
-    ]
+      `<b>Difficulté</b>: ${tplData.difficulte}`
+    ].concat([
+      tplData.cacher_points_de_tache ? [] :`<b>Points de Tâche</b>: ${tplData.points_de_tache}`
+    ]).concat([
+      `<b>Points de Tâche atteints</b>: ${tplData.points_de_tache_courant}`]
+    );
     return properties;
   }
   /* -------------------------------------------- */
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 142268df..10cbdf3e 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -381,7 +381,10 @@
         <h3>Tâches</h3><a class='creer-tache'>Créer une nouvelle Tâche</a>
         <ul class="item-list alterne-list">
           {{#each taches as |tache id|}}
-          <li class="item flexrow list-item" data-item-id="{{tache._id}}"><span class="competence-title tache-label"><a>{{tache.name}} ({{tache.data.points_de_tache_courant}}/{{tache.data.points_de_tache}})</a></span>
+          <li class="item flexrow list-item" data-item-id="{{tache._id}}"><span class="competence-title tache-label"><a>{{tache.name}}
+            ({{tache.data.points_de_tache_courant}}{{#if
+               (or @root.options.isGM (not tache.data.cacher_points_de_tache))
+            }}/{{tache.data.points_de_tache}}{{/if}})</a></span>
             <div class="item-controls flex-shrink">
               <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
diff --git a/templates/chat-resultat-tache.html b/templates/chat-resultat-tache.html
index 248d89f9..e5443752 100644
--- a/templates/chat-resultat-tache.html
+++ b/templates/chat-resultat-tache.html
@@ -8,7 +8,8 @@
 <div>
   {{alias}} a obtenu {{rolled.ptTache}} point{{~#unless (eq rolled.ptTache 1)}}s{{/unless}} de tâche,
    son avancement est de
-   <span class="rdd-roll-{{#if (gt tache.data.points_de_tache_courant 0)}}norm{{else}}etotal{{/if}}">{{tache.data.points_de_tache_courant}} sur {{tache.data.points_de_tache}}</span>
+   <span class="rdd-roll-{{#if (gt tache.data.points_de_tache_courant 0)}}norm{{else}}etotal{{/if}}">{{tache.data.points_de_tache_courant}}
+     {{#unless tache.data.cacher_points_de_tache}} sur {{tache.data.points_de_tache}}{{/unless}}</span>
    point{{~#unless (eq tache.data.points_de_tache_courant 1)}}s{{/unless}} de tâche
    ({{~#unless (eq tache.data.tentatives 1)}}{{tache.data.tentatives}} tentatives{{else}}première tentative{{/unless~}}).
   {{#if (and tache.data.fatigue appliquerFatigue)}}<br><span>Il s'est fatigué de {{tache.data.fatigue}} case{{~#if (gt tache.data.fatigue 1)}}s{{/if}}.</span>{{/if}}
-- 
2.35.3


From c0b5bb3f356d7d7359ccbc79c67660f76106f1f7 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 29 Jan 2022 18:49:06 +0100
Subject: [PATCH 12/42] =?UTF-8?q?Fix=20jets=20encaissements=20faits=20par?=
 =?UTF-8?q?=20le=20d=C3=A9fenseur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

=> Les dés sont ceux du défenseur
=> Le message d'encaissement est visible par le joueur
---
 module/actor.js      | 32 ++++++++++++++++++--------------
 module/misc.js       |  8 ++++++++
 module/rdd-combat.js | 13 ++++++-------
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index 0e076007..2c0a7ec7 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -62,26 +62,23 @@ export class RdDActor extends Actor {
     }
   }
 
-  static remoteActorCall(data) {
-    if (Misc.isUniqueConnectedGM()) {
+  static remoteActorCall(data, canExecuteLocally = () => Misc.isUniqueConnectedGM()) {
+    if (canExecuteLocally()) {
       RdDActor.onRemoteActorCall(data);
+      return false;
     }
     else {
       game.socket.emit("system.foundryvtt-reve-de-dragon", { msg: "msg_remote_actor_call", data: data });
+      return true;
     }
   }
 
   static onRemoteActorCall(data) {
-    if (Misc.isUniqueConnectedGM()) { // Seul le joueur choisi effectue l'appel
-      const actor = game.actors.get(data?.actorId);
-      if (!actor) {
-        console.info("RdDActor.onRemoteActorCall: Pas d'Actor disponible ", data);
-      }
-      else {
-        const args = data.args;
-        console.info(`RdDActor.onRemoteActorCall: pour l'Actor ${data.actorId}, appel de RdDActor.${data.method}(`, ...args, ')');
-        actor[data.method](...args);
-      }
+    const actor = game.actors.get(data?.actorId);
+    if (Misc.isOwnerPlayerOrUniqueConnectedGM(actor)) { // Seul le joueur choisi effectue l'appel: le joueur courant si propriétaire de l'actor, ou le MJ sinon
+      const args = data.args;
+      console.info(`RdDActor.onRemoteActorCall: pour l'Actor ${data.actorId}, appel de RdDActor.${data.method}(`, ...args, ')');
+      actor[data.method](...args);
     }
   }
 
@@ -3668,7 +3665,10 @@ export class RdDActor extends Actor {
       return;
     }
     if (fromActorId && !game.user.isGM) {
-      RdDActor.remoteActorCall({ userId: Misc.connectedGMOrUser(), actorId: this.id, method: 'ajouterDeniers', args: [gain, fromActorId] });
+      RdDActor.remoteActorCall({
+        userId: Misc.connectedGMOrUser(),
+        actorId: this.id,
+        method: 'ajouterDeniers', args: [gain, fromActorId] });
     }
     else {
       const fromActor = game.actors.get(fromActorId)
@@ -3700,7 +3700,11 @@ export class RdDActor extends Actor {
       return;
     }
     if (!Misc.isUniqueConnectedGM()) {
-      RdDActor.remoteActorCall({ actorId: achat.vendeurId ?? achat.acheteurId, method: 'achatVente', args: [achat] });
+      RdDActor.remoteActorCall({
+        actorId: achat.vendeurId ?? achat.acheteurId,
+        method: 'achatVente',
+        args: [achat] },
+        );
       return;
     }
 
diff --git a/module/misc.js b/module/misc.js
index 3f8fa2a9..59fc080c 100644
--- a/module/misc.js
+++ b/module/misc.js
@@ -147,6 +147,14 @@ export class Misc {
     
   }
 
+  static isOwnerPlayer(actor, user=undefined) {
+    return actor.testUserPermission(user ?? game.user, CONST.DOCUMENT_PERMISSION_LEVELS.OWNER)
+  }
+
+  static  isOwnerPlayerOrUniqueConnectedGM(actor, user =undefined){
+    return Misc.isOwnerPlayer(actor, user) ?? Misc.isUniqueConnectedGM();
+  }
+
   /**
    * @returns true pour un seul utilisateur: le premier GM connecté par ordre d'id
    */
diff --git a/module/rdd-combat.js b/module/rdd-combat.js
index 0c354d1a..b350c398 100644
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@@ -544,16 +544,15 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   static onMsgEncaisser(data) {
-    if (Misc.isUniqueConnectedGM()) {
+    let defender = canvas.tokens.get(data.defenderTokenId).actor;
+    if (Misc.isOwnerPlayerOrUniqueConnectedGM()) {
       let attackerRoll = RdDCombat._getAttaque(data.attackerId); // Retrieve the rolldata from the store
       let attacker = data.attackerId ? game.actors.get(data.attackerId) : null;
-      let defender = canvas.tokens.get(data.defenderTokenId).actor;
 
       defender.encaisserDommages(attackerRoll, attacker);
       RdDCombat._deleteDefense(attackerRoll.passeArme);
       RdDCombat._deleteAttaque(data.attackerId);
     }
-
   }
 
   /* -------------------------------------------- */
@@ -917,11 +916,11 @@ export class RdDCombat {
       dmg: attackerRoll.dmg,
     };
 
-    if (!Misc.isUniqueConnectedGM()) {
-      this._socketSendMessageDefense(paramChatDefense, defenderRoll);
+    if (Misc.isUniqueConnectedGM()) {
+      await this._chatMessageDefense(paramChatDefense);
     }
     else {
-      await this._chatMessageDefense(paramChatDefense);
+      this._socketSendMessageDefense(paramChatDefense, defenderRoll);
     }
   }
 
@@ -1295,7 +1294,7 @@ export class RdDCombat {
       this._onEchecTotal(defenderRoll);
     }
 
-    if (Misc.isUniqueConnectedGM()) {
+    if (Misc.isOwnerPlayerOrUniqueConnectedGM(this.defender)) {
       attackerRoll.attackerId = this.attackerId;
       attackerRoll.defenderTokenId = defenderTokenId;
 
-- 
2.35.3


From 3ae3003be3bec75aa806215f1838238aeabdae85 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 29 Jan 2022 18:50:37 +0100
Subject: [PATCH 13/42] Ajout async sur displayRollData
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Préparation pour récupérer le message affiché et lui ajouter des flags
---
 module/actor.js                | 26 +++++++++++++-------------
 module/chat-utility.js         | 10 +++++-----
 module/rdd-possession.js       | 14 +++++++-------
 module/rdd-resolution-table.js |  2 +-
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index 2c0a7ec7..d7f361df 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -2458,7 +2458,7 @@ export class RdDActor extends Actor {
       this.currentTMR.close(); // Close TMR !
     }
     // Final chat message
-    RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-sort.html');
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-sort.html');
 
     if (reveActuel == 0) { // 0 points de reve
       ChatMessage.create({ content: this.name + " est réduit à 0 Points de Rêve, et tombe endormi !" });
@@ -2488,7 +2488,7 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   async _onRollCaracResult(rollData) {
     // Final chat message
-    RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-general.html');
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-general.html');
   }
 
   async rollCaracCompetence(caracName, compName, diff, options = { title: "", apprecier: false }) {
@@ -2516,7 +2516,7 @@ export class RdDActor extends Actor {
     RollDataAjustements.calcul(rollData, this);
     await RdDResolutionTable.rollData(rollData);
     this._appliquerExperienceRollData(rollData);
-    RdDResolutionTable.displayRollData(rollData, this)
+    await RdDResolutionTable.displayRollData(rollData, this)
     return rollData.rolled;
   }
 
@@ -2562,7 +2562,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async _competenceResult(rollData) {
-    RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-competence.html')
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-competence.html')
   }
 
   /* -------------------------------------------- */
@@ -2641,7 +2641,7 @@ export class RdDActor extends Actor {
     this.updateEmbeddedDocuments('Item', [rollData.tache]);
     this.santeIncDec("fatigue", rollData.tache.data.fatigue);
 
-    RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-tache.html');
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-tache.html');
   }
 
   /* -------------------------------------------- */
@@ -2688,7 +2688,7 @@ export class RdDActor extends Actor {
     const baseQualite = (artData.rolled.isSuccess ? artData.oeuvre.data.niveau : artData.competence.data.niveau);
     artData.qualiteFinale = Math.min(baseQualite, artData.oeuvre.data.niveau) + artData.rolled.ptQualite;
 
-    RdDResolutionTable.displayRollData(artData, this.name, `chat-resultat-${artData.art}.html`);
+    await RdDResolutionTable.displayRollData(artData, this.name, `chat-resultat-${artData.art}.html`);
   }
 
   /* -------------------------------------------- */
@@ -2766,7 +2766,7 @@ export class RdDActor extends Actor {
       ui.notifications.info(`${platCuisine.data.quantite} rations de ${platCuisine.name} ont été ajoutés à votre équipement`);
     }
     artData.platCuisine = platCuisine;
-    RdDResolutionTable.displayRollData(artData, this.name, `chat-resultat-${artData.art}.html`);
+    await RdDResolutionTable.displayRollData(artData, this.name, `chat-resultat-${artData.art}.html`);
   }
 
   /* -------------------------------------------- */
@@ -2834,7 +2834,7 @@ export class RdDActor extends Actor {
       await this.createEmbeddedDocuments("Item", [signeData]);
     }
 
-    RdDResolutionTable.displayRollData(meditationData, this.name, 'chat-resultat-meditation.html');
+    await RdDResolutionTable.displayRollData(meditationData, this.name, 'chat-resultat-meditation.html');
   }
 
   /* -------------------------------------------- */
@@ -2914,7 +2914,7 @@ export class RdDActor extends Actor {
       await this.updateExperienceLog("XP Sort", rollData.xpSort, "Signe draconique en " + rollData.competence.name);
     }
     await this.deleteEmbeddedDocuments("Item", [rollData.signe._id]);
-    RdDResolutionTable.displayRollData(rollData, this.name, 'chat-resultat-lecture-signedraconique.html');
+    await RdDResolutionTable.displayRollData(rollData, this.name, 'chat-resultat-lecture-signedraconique.html');
     this.currentTMR.close();
   }
 
@@ -3339,7 +3339,7 @@ export class RdDActor extends Actor {
       show: defenderRoll?.show ?? {}
     });
 
-    ChatUtility.createChatWithRollMode(this.name, {
+    await ChatUtility.createChatWithRollMode(this.name, {
       roll: encaissement.roll,
       content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-encaissement.html', encaissement)
     });
@@ -3821,7 +3821,7 @@ export class RdDActor extends Actor {
           callbacks: [
             this.createCallbackExperience(),
             this.createCallbackAppelAuMoral(),
-            { action: r => this._alchimieResult(r, false) }
+            { action: async r => await this._alchimieResult(r, false) }
           ]
         }
       );
@@ -3834,8 +3834,8 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  _alchimieResult(rollData) {
-    RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-alchimie.html');
+  async _alchimieResult(rollData) {
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-alchimie.html');
   }
 
   /* -------------------------------------------- */
diff --git a/module/chat-utility.js b/module/chat-utility.js
index 65e0c557..6dd97b77 100644
--- a/module/chat-utility.js
+++ b/module/chat-utility.js
@@ -66,7 +66,7 @@ export class ChatUtility {
   /* -------------------------------------------- */
 
   static removeMessages(data) {
-    if (Misc.isUniqueConnectedGM()){
+    if (Misc.isUniqueConnectedGM()) {
       ChatUtility.onRemoveMessages(data);
     }
     else {
@@ -86,12 +86,12 @@ export class ChatUtility {
   }
 
   /* -------------------------------------------- */
-  static createChatWithRollMode(name, chatOptions) {
-    ChatUtility.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions);
+  static async createChatWithRollMode(name, chatOptions) {
+    return await ChatUtility.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions);
   }
 
   /* -------------------------------------------- */
-  static createChatMessage(name, rollMode, chatOptions) {
+  static async createChatMessage(name, rollMode, chatOptions) {
     switch (rollMode) {
       case "blindroll": // GM only
         if (!game.user.isGM) {
@@ -109,7 +109,7 @@ export class ChatUtility {
         break;
     }
     chatOptions.alias = chatOptions.alias || name;
-    ChatMessage.create(chatOptions);
+    return await ChatMessage.create(chatOptions);
   }
 
   /* -------------------------------------------- */
diff --git a/module/rdd-possession.js b/module/rdd-possession.js
index 4d3b7b2c..4b9e0f36 100644
--- a/module/rdd-possession.js
+++ b/module/rdd-possession.js
@@ -50,13 +50,13 @@ export class RdDPossession {
   }
 
   /* -------------------------------------------- */
-  static resultConjuration( rollData) {
+  static async resultConjuration( rollData) {
     console.log("RollData!!!", rollData);
     if ( !rollData.rolled.isSuccess  ) {
       rollData.possession.data.compteur++;
     }
     this.updateEtatPossession(rollData.possession);
-    RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-possession.html');
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-possession.html');
   }
 
   /* -------------------------------------------- */
@@ -86,7 +86,7 @@ export class RdDPossession {
         name: 'conjurer',
         label: 'Conjurer une Possession',
         callbacks: [
-          { action: async r => this.resultConjuration(r) }
+          { action: async r => await this.resultConjuration(r) }
         ]
       }
     );
@@ -94,11 +94,11 @@ export class RdDPossession {
   }
 
   /* -------------------------------------------- */
-  static _onRollPossession( rollData, isSuccess ) {
+  static async _onRollPossession( rollData, isSuccess ) {
     let possession = rollData.possession;
     possession.isSuccess = isSuccess;
     this.updateEtatPossession( possession);
-    RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-possession.html');
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-possession.html');
   }
 
   /* -------------------------------------------- */
@@ -141,8 +141,8 @@ export class RdDPossession {
       name: 'jet-possession',
       label: 'Possession: ',
       callbacks: [
-        { condition: r => (r.rolled.isSuccess), action: r => this._onRollPossession(r, true) },
-        { condition: r => (r.rolled.isEchec), action: r => this._onRollPossession(r, false) },
+        { condition: r => (r.rolled.isSuccess), action: async r => await this._onRollPossession(r, true) },
+        { condition: r => (r.rolled.isEchec), action: async r => await this._onRollPossession(r, false) },
       ]
     });
     dialog.render(true);
diff --git a/module/rdd-resolution-table.js b/module/rdd-resolution-table.js
index 52d0bd6a..6db89650 100644
--- a/module/rdd-resolution-table.js
+++ b/module/rdd-resolution-table.js
@@ -64,7 +64,7 @@ export class RdDResolutionTable {
 
   /* -------------------------------------------- */
   static async displayRollData(rollData, actor = undefined, template = 'chat-resultat-general.html') {
-    ChatUtility.createChatWithRollMode(actor?.userName ?? game.user.name, {
+    return await ChatUtility.createChatWithRollMode(actor?.userName ?? game.user.name, {
       content: await RdDResolutionTable.buildRollDataHtml(rollData, actor, template)
     });
   }
-- 
2.35.3


From 3abaf4e944b7974b2fad598b0637dea0ec54d4e3 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 29 Jan 2022 22:49:34 +0100
Subject: [PATCH 14/42] Extract constants for SYSTEM / SOCKET

---
 module/actor.js                    | 24 ++++++++++++------------
 module/chat-utility.js             |  7 ++++---
 module/constants.js                |  3 ++-
 module/rdd-astrologie-joueur.js    |  3 ++-
 module/rdd-calendrier.js           | 12 ++++++------
 module/rdd-combat.js               |  9 +++++----
 module/rdd-compendium-organiser.js |  3 ++-
 module/rdd-main.js                 |  4 ++--
 module/rdd-tmr-dialog.js           |  3 ++-
 9 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index d7f361df..717152c0 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -33,7 +33,7 @@ import { RollDataAjustements } from "./rolldata-ajustements.js";
 import { DialogItemAchat } from "./dialog-item-achat.js";
 import { RdDItem } from "./item.js";
 import { RdDPossession } from "./rdd-possession.js";
-import { SYSTEM_RDD } from "./constants.js";
+import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
 
 /* -------------------------------------------- */
 /**
@@ -68,7 +68,7 @@ export class RdDActor extends Actor {
       return false;
     }
     else {
-      game.socket.emit("system.foundryvtt-reve-de-dragon", { msg: "msg_remote_actor_call", data: data });
+      game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_remote_actor_call", data: data });
       return true;
     }
   }
@@ -494,11 +494,11 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   async _recupereChance() {
     // On ne récupère un point de chance que si aucun appel à la chance dans la journée
-    if (this.getChanceActuel() < this.getChance() && !this.getFlag('foundryvtt-reve-de-dragon', 'utilisationChance')) {
+    if (this.getChanceActuel() < this.getChance() && !this.getFlag(SYSTEM_RDD, 'utilisationChance')) {
       await this.chanceActuelleIncDec(1);
     }
     // Nouveau jour, suppression du flag
-    await this.unsetFlag('foundryvtt-reve-de-dragon', 'utilisationChance');
+    await this.unsetFlag(SYSTEM_RDD, 'utilisationChance');
   }
 
   async _jetDeMoralChateauDormant(message) {
@@ -1469,7 +1469,7 @@ export class RdDActor extends Actor {
   async cacheTMRetMessage() {
     await this.reinsertionAleatoire("Action MJ");
     await this.cacheTMR();
-    game.socket.emit("system.foundryvtt-reve-de-dragon", {
+    game.socket.emit(SYSTEM_SOCKET_ID, {
       msg: "msg_tmr_move", data: {
         actorId: this.data._id,
         tmrPos: this.data.data.reve.tmrpos
@@ -1480,7 +1480,7 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   async afficheTMRetMessage() {
     await this.montreTMR();
-    game.socket.emit("system.foundryvtt-reve-de-dragon", {
+    game.socket.emit(SYSTEM_SOCKET_ID, {
       msg: "msg_tmr_move", data: {
         actorId: this.data._id,
         tmrPos: this.data.data.reve.tmrpos
@@ -2940,7 +2940,7 @@ export class RdDActor extends Actor {
   async _appelChanceResult(rollData, onSuccess = () => { }, onEchec = () => { }) {
     await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-appelchance.html')
     if (rollData.rolled.isSuccess) {
-      await this.setFlag('foundryvtt-reve-de-dragon', 'utilisationChance', true);
+      await this.setFlag(SYSTEM_RDD, 'utilisationChance', true);
       await this.chanceActuelleIncDec(-1);
       onSuccess();
     }
@@ -3493,21 +3493,21 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async resetItemUse() {
-    await this.unsetFlag('foundryvtt-reve-de-dragon', 'itemUse');
-    await this.setFlag('foundryvtt-reve-de-dragon', 'itemUse', {});
+    await this.unsetFlag(SYSTEM_RDD, 'itemUse');
+    await this.setFlag(SYSTEM_RDD, 'itemUse', {});
   }
 
   /* -------------------------------------------- */
   async incDecItemUse(itemId, inc = 1) {
-    let itemUse = duplicate(this.getFlag('foundryvtt-reve-de-dragon', 'itemUse') ?? {});
+    let itemUse = duplicate(this.getFlag(SYSTEM_RDD, 'itemUse') ?? {});
     itemUse[itemId] = (itemUse[itemId] ?? 0) + inc;
-    await this.setFlag('foundryvtt-reve-de-dragon', 'itemUse', itemUse);
+    await this.setFlag(SYSTEM_RDD, 'itemUse', itemUse);
     console.log("ITEM USE INC", inc, itemUse);
   }
 
   /* -------------------------------------------- */
   getItemUse(itemId) {
-    let itemUse = this.getFlag('foundryvtt-reve-de-dragon', 'itemUse') ?? {};
+    let itemUse = this.getFlag(SYSTEM_RDD, 'itemUse') ?? {};
     console.log("ITEM USE GET", itemUse);
     return itemUse[itemId] ?? 0;
   }
diff --git a/module/chat-utility.js b/module/chat-utility.js
index 6dd97b77..ba8fdf4c 100644
--- a/module/chat-utility.js
+++ b/module/chat-utility.js
@@ -1,4 +1,5 @@
 import { Misc } from "./misc.js";
+import { SYSTEM_SOCKET_ID } from "./constants.js";
 
 /**
  * Class providing helper methods to get the list of users, and 
@@ -23,7 +24,7 @@ export class ChatUtility {
       ChatUtility.onNotifyUser(data);
     }
     else {
-      game.socket.emit("system.foundryvtt-reve-de-dragon", {
+      game.socket.emit(SYSTEM_SOCKET_ID, {
         msg: "msg_user_ui_notifications", data: data
       });
     }
@@ -70,7 +71,7 @@ export class ChatUtility {
       ChatUtility.onRemoveMessages(data);
     }
     else {
-      game.socket.emit("system.foundryvtt-reve-de-dragon", { msg: "msg_delete_chat_message", data: data });
+      game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_delete_chat_message", data: data });
     }
   }
 
@@ -147,7 +148,7 @@ export class ChatUtility {
     chatGM.whisper = ChatUtility.getUsers(user => user.isGM);
     chatGM.content = "Message aveugle de " + game.user.name + "<br>" + chatOptions.content;
     console.log("blindMessageToGM", chatGM);
-    game.socket.emit("system.foundryvtt-reve-de-dragon", { msg: "msg_gm_chat_message", data: chatGM });
+    game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_gm_chat_message", data: chatGM });
   }
 
   /* -------------------------------------------- */
diff --git a/module/constants.js b/module/constants.js
index be1d1c86..865a0559 100644
--- a/module/constants.js
+++ b/module/constants.js
@@ -1,4 +1,5 @@
-export const SYSTEM_RDD = "foundryvtt-reve-de-dragon";
+export const SYSTEM_RDD = 'foundryvtt-reve-de-dragon';
+export const SYSTEM_SOCKET_ID = 'system.foundryvtt-reve-de-dragon';
 
 export const HIDE_DICE = 'hide';
 export const SHOW_DICE = 'show';
diff --git a/module/rdd-astrologie-joueur.js b/module/rdd-astrologie-joueur.js
index bf0c3692..7497a97a 100644
--- a/module/rdd-astrologie-joueur.js
+++ b/module/rdd-astrologie-joueur.js
@@ -1,5 +1,6 @@
 import { RdDItemCompetence } from "./item-competence.js";
 import { Misc } from "./misc.js";
+import { SYSTEM_SOCKET_ID } from "./constants.js";
 
 
 /**
@@ -74,7 +75,7 @@ export class RdDAstrologieJoueur extends Dialog {
     if (Misc.isUniqueConnectedGM()) {
       game.system.rdd.calendrier.requestNombreAstral(data);
     } else {
-      game.socket.emit("system.foundryvtt-reve-de-dragon", {
+      game.socket.emit(SYSTEM_SOCKET_ID, {
         msg: "msg_request_nombre_astral",
         data: data
       });
diff --git a/module/rdd-calendrier.js b/module/rdd-calendrier.js
index 7cc351c5..73a97003 100644
--- a/module/rdd-calendrier.js
+++ b/module/rdd-calendrier.js
@@ -7,7 +7,7 @@ import { RdDUtility } from "./rdd-utility.js";
 import { Grammar } from "./grammar.js";
 import { RdDDice } from "./rdd-dice.js";
 import { Misc } from "./misc.js";
-import { HIDE_DICE, SHOW_DICE, SYSTEM_RDD } from "./constants.js";
+import { HIDE_DICE, SHOW_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
 
 /* -------------------------------------------- */
 const dossierIconesHeures = 'systems/foundryvtt-reve-de-dragon/icons/heures/'
@@ -172,7 +172,7 @@ export class RdDCalendrier extends Application {
     this.listeNombreAstral = [];
     game.settings.set(SYSTEM_RDD, "liste-nombre-astral", this.listeNombreAstral);
 
-    game.socket.emit("system.foundryvtt-reve-de-dragon", {
+    game.socket.emit(SYSTEM_SOCKET_ID, {
       msg: "msg_reset_nombre_astral",
       data: {}
     });
@@ -254,8 +254,8 @@ export class RdDCalendrier extends Application {
       this.checkMaladie("jour");
     }
     game.settings.set(SYSTEM_RDD, "calendrier", duplicate(this.calendrier));
-    // Notification aux joueurs
-    game.socket.emit("system.foundryvtt-reve-de-dragon", {
+    // Notification aux joueurs // TODO: replace with Hook on game settings update
+    game.socket.emit(SYSTEM_SOCKET_ID, {
       msg: "msg_sync_time",
       data: duplicate(this.calendrier)
     });
@@ -343,7 +343,7 @@ export class RdDCalendrier extends Application {
       if (Misc.getActiveUser(request.userId)?.isGM) {
         RdDUtility.responseNombreAstral(request);
       } else {
-        game.socket.emit("system.foundryvtt-reve-de-dragon", {
+        game.socket.emit(SYSTEM_SOCKET_ID, {
           msg: "msg_response_nombre_astral",
           data: request
         });
@@ -474,7 +474,7 @@ export class RdDCalendrier extends Application {
 
     await this.rebuildListeNombreAstral();
 
-    game.socket.emit("system.foundryvtt-reve-de-dragon", {
+    game.socket.emit(SYSTEM_SOCKET_ID, {
       msg: "msg_sync_time",
       data: duplicate(this.calendrier)
     });
diff --git a/module/rdd-combat.js b/module/rdd-combat.js
index b350c398..d7a38e3f 100644
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@@ -1,5 +1,5 @@
 import { ChatUtility } from "./chat-utility.js";
-import { HIDE_DICE, SYSTEM_RDD } from "./constants.js";
+import { HIDE_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
 import { RdDItemArme } from "./item-arme.js";
 import { RdDItemCompetence } from "./item-competence.js";
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
@@ -473,7 +473,8 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   static messagePasseArme(data) {
-    game.socket.emit("system.foundryvtt-reve-de-dragon", { msg: "msg_combat_passearme", data: data });
+    // TODO: store required info for combat in the chat message presenting choices?
+    game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_combat_passearme", data: data });
     RdDCombat.onMsgPasseArme(data);
   }
 
@@ -938,7 +939,7 @@ export class RdDCombat {
   /* -------------------------------------------- */
   _socketSendMessageDefense(paramChatDefense, defenderRoll) {
     // envoyer le message au destinataire
-    game.socket.emit("system.foundryvtt-reve-de-dragon", {
+    game.socket.emit(SYSTEM_SOCKET_ID, {
       msg: "msg_defense", data: {
         attackerId: this.attacker?.data._id,
         defenderId: this.defender?.data._id,
@@ -1302,7 +1303,7 @@ export class RdDCombat {
       this.defender.encaisserDommages(attackerRoll, this.attacker, defenderRoll);
     }
     else { // envoi à un GM: les joueurs n'ont pas le droit de modifier les personnages qu'ils ne possèdent pas
-      game.socket.emit("system.foundryvtt-reve-de-dragon", {
+      game.socket.emit(SYSTEM_SOCKET_ID, {
         msg: "msg_encaisser",
         data: {
           attackerId: this.attackerId,
diff --git a/module/rdd-compendium-organiser.js b/module/rdd-compendium-organiser.js
index 91611194..7f4a4665 100644
--- a/module/rdd-compendium-organiser.js
+++ b/module/rdd-compendium-organiser.js
@@ -1,3 +1,4 @@
+import { SYSTEM_RDD } from "./constants.js";
 import { Misc } from "./misc.js";
 
 export class RddCompendiumOrganiser {
@@ -8,7 +9,7 @@ export class RddCompendiumOrganiser {
   static async onRenderCompendium(compendium, html, data) {
     console.log('onRenderCompendium', compendium, html, data);
     const pack = compendium.collection
-    if (pack.metadata.system === 'foundryvtt-reve-de-dragon') {
+    if (pack.metadata.system === SYSTEM_RDD) {
       html.find('.directory-item').each((i, element) => {
         RddCompendiumOrganiser.setEntityTypeName(pack, element);
       });
diff --git a/module/rdd-main.js b/module/rdd-main.js
index 1c7321c9..90852f7d 100644
--- a/module/rdd-main.js
+++ b/module/rdd-main.js
@@ -8,7 +8,7 @@
 
 /* -------------------------------------------- */
 // Import Modules
-import { SYSTEM_RDD } from "./constants.js";
+import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
 import { RdDActor } from "./actor.js";
 import { RdDItemSheet } from "./item-sheet.js";
 import { RdDActorSheet } from "./actor-sheet.js";
@@ -147,7 +147,7 @@ Hooks.once("init", async function () {
   };
 
   /* -------------------------------------------- */
-  game.socket.on("system.foundryvtt-reve-de-dragon", sockmsg => {
+  game.socket.on(SYSTEM_SOCKET_ID, sockmsg => {
     console.log(">>>>> MSG RECV", sockmsg);
 
     RdDUtility.onSocketMessage(sockmsg);
diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js
index ce522327..3d62ddac 100644
--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@@ -1,3 +1,4 @@
+import { SYSTEM_SOCKET_ID } from "./constants.js";
 import { RollDataAjustements } from "./rolldata-ajustements.js";
 import { RdDUtility } from "./rdd-utility.js";
 import { TMRUtility } from "./tmr-utility.js";
@@ -947,7 +948,7 @@ export class RdDTMRDialog extends Dialog {
       this.cumulFatigue += this.fatigueParCase;
     }
     this.updateValuesDisplay();
-    game.socket.emit("system.foundryvtt-reve-de-dragon", {
+    game.socket.emit(SYSTEM_SOCKET_ID, {
       msg: "msg_tmr_move", data: {
         actorId: this.actor.data._id,
         tmrPos: Misc.data(this.actor).data.reve.tmrpos
-- 
2.35.3


From c0442f607c71a78c809e8ee6f84e8729b9fb3e13 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 29 Jan 2022 23:33:31 +0100
Subject: [PATCH 15/42] Gestion des choix de combat par flags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Utiliser des flags sur les ChatMessage de choix de combat permet:

- de conserver les informations même après un refresh
- de simplifier un peu (pas besoin de gérer un stockage custom)
---
 module/chat-utility.js |  20 +++++-
 module/rdd-combat.js   | 141 +++++++----------------------------------
 2 files changed, 43 insertions(+), 118 deletions(-)

diff --git a/module/chat-utility.js b/module/chat-utility.js
index ba8fdf4c..976e1b0c 100644
--- a/module/chat-utility.js
+++ b/module/chat-utility.js
@@ -1,5 +1,7 @@
 import { Misc } from "./misc.js";
-import { SYSTEM_SOCKET_ID } from "./constants.js";
+import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+
+export const MESSAGE_DATA = 'message-data';
 
 /**
  * Class providing helper methods to get the list of users, and 
@@ -160,4 +162,20 @@ export class ChatUtility {
     }
   }
 
+  static async setMessageData(chatMessage, key, data) {
+    if (data) {
+      await chatMessage.setFlag(SYSTEM_RDD, key, JSON.stringify(data));
+    }
+  }
+
+  static getMessageData(chatMessage, key) {
+    const json = chatMessage.getFlag(SYSTEM_RDD, key);
+    return json ? JSON.parse(json) : undefined;
+  }
+
+  static getChatMessage(event) {
+    const chatMessageId = $(event.currentTarget).closest('.chat-message').attr('data-message-id');
+    return game.messages.get(chatMessageId);
+  }
+
 }
diff --git a/module/rdd-combat.js b/module/rdd-combat.js
index d7a38e3f..e341ed42 100644
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@@ -371,19 +371,10 @@ export class RdDCombatManager extends Combat {
 export class RdDCombat {
 
   static init() {
-    this.initStorePasseArmes();
     Hooks.on("updateCombat", (combat, change, options, userId) => { RdDCombat.onUpdateCombat(combat, change, options, userId) });
     Hooks.on("preDeleteCombat", (combat, options, userId) => { RdDCombat.onPreDeleteCombat(combat, options, userId); });
   }
 
-  /* -------------------------------------------- */
-  static initStorePasseArmes() {
-    game.system.rdd.combatStore = {
-      attaques: {},
-      defenses: {}
-    };
-  }
-
   /* -------------------------------------------- */
   static onSocketMessage(sockmsg) {
     switch (sockmsg.msg) {
@@ -391,8 +382,6 @@ export class RdDCombat {
         return RdDCombat.onMsgEncaisser(sockmsg.data);
       case "msg_defense":
         return RdDCombat.onMsgDefense(sockmsg.data);
-      case "msg_combat_passearme":
-        return RdDCombat.onMsgPasseArme(sockmsg.data);
     }
   }
 
@@ -405,22 +394,11 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   static onPreDeleteCombat(combat, options, userId) {
-    if (game.user.isGM) {
+    if (Misc.isUniqueConnectedGM()) {
       combat.cleanItemUse();
       ChatUtility.removeChatMessageContaining(`<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.removeChatMessageContaining(`<div data-passearme="${attackerRoll.passeArme}">`);
-      }
-      for (const key in game.system.rdd.combatStore.defenses) {
-        const defenderRoll = game.system.rdd.combatStore.defenses[key];
-        ChatUtility.removeChatMessageContaining(`<div data-passearme="${defenderRoll.passeArme}">`);
-      }
-      RdDCombat.initStorePasseArmes();
+      game.messages.filter(m => ChatUtility.getMessageData(m, 'attacker-roll') != undefined && ChatUtility.getMessageData(m, 'defender-roll') != undefined)
+        .forEach(it => it.delete());
     }
   }
 
@@ -471,61 +449,6 @@ export class RdDCombat {
     return undefined;
   }
 
-  /* -------------------------------------------- */
-  static messagePasseArme(data) {
-    // TODO: store required info for combat in the chat message presenting choices?
-    game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_combat_passearme", data: data });
-    RdDCombat.onMsgPasseArme(data);
-  }
-
-  /* -------------------------------------------- */
-  static onMsgPasseArme(data) {
-    switch (data.actionPasseArme) {
-      case "store-attaque":
-        game.system.rdd.combatStore.attaques[data.id] = data.rollData;
-        break;
-      case "store-defense":
-        game.system.rdd.combatStore.defenses[data.id] = data.rollData;
-        break;
-      case "delete-attaque":
-        delete game.system.rdd.combatStore.attaques[data.id];
-        break;
-      case "delete-defense":
-        delete game.system.rdd.combatStore.defenses[data.id];
-        break;
-    }
-  }
-
-  /* -------------------------------------------- */
-  static _storeAttaque(attackerId, attackerRoll) {
-    RdDCombat.messagePasseArme({ actionPasseArme: "store-attaque", id: attackerId, rollData: attackerRoll });
-  }
-
-  /* -------------------------------------------- */
-  static _getAttaque(attackerId) {
-    return game.system.rdd.combatStore.attaques[attackerId];
-  }
-
-  /* -------------------------------------------- */
-  static _deleteAttaque(attackerId) {
-    RdDCombat.messagePasseArme({ actionPasseArme: "delete-attaque", id: attackerId });
-  }
-
-  /* -------------------------------------------- */
-  static _storeDefense(passeArme, defenderRoll) {
-    RdDCombat.messagePasseArme({ actionPasseArme: "store-defense", id: passeArme, rollData: defenderRoll });
-  }
-
-  /* -------------------------------------------- */
-  static _getDefense(passeArme) {
-    return game.system.rdd.combatStore.defenses[passeArme];
-  }
-
-  /* -------------------------------------------- */
-  static _deleteDefense(passeArme) {
-    RdDCombat.messagePasseArme({ actionPasseArme: "delete-defense", id: passeArme });
-  }
-
   /* -------------------------------------------- */
   static create(attacker, defender, defenderTokenId, target = undefined) {
     return new RdDCombat(attacker, defender, defenderTokenId, target)
@@ -547,7 +470,7 @@ export class RdDCombat {
   static onMsgEncaisser(data) {
     let defender = canvas.tokens.get(data.defenderTokenId).actor;
     if (Misc.isOwnerPlayerOrUniqueConnectedGM()) {
-      let attackerRoll = RdDCombat._getAttaque(data.attackerId); // Retrieve the rolldata from the store
+      let attackerRoll = data.attackerRoll;
       let attacker = data.attackerId ? game.actors.get(data.attackerId) : null;
 
       defender.encaisserDommages(attackerRoll, attacker);
@@ -563,10 +486,8 @@ export class RdDCombat {
       const rddCombat = RdDCombat.createForAttackerAndDefender(msg.attackerId, msg.defenderTokenId);
       if (rddCombat) {
         const defenderRoll = msg.defenderRoll;
-        RdDCombat._storeAttaque(msg.attackerId, defenderRoll.attackerRoll);
-        RdDCombat._storeDefense(defenderRoll.passeArme, defenderRoll);
         rddCombat.removeChatMessageActionsPasseArme(defenderRoll.passeArme);
-        rddCombat._chatMessageDefense(msg.paramChatDefense);
+        rddCombat._chatMessageDefense(msg.paramChatDefense, msg.defenderRoll);
       }
     }
   }
@@ -621,12 +542,10 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   async onEvent(button, event) {
-    const attackerRoll = RdDCombat._getAttaque(this.attackerId);
-    if (!attackerRoll) {
-      ui.notifications.warn("Action automatisée impossible, le jet de l'attaquant a été perdu (suite à un raffraichissement?)")
-      return;
-    }
-    const defenderRoll = game.system.rdd.combatStore.defenses[attackerRoll.passeArme];
+    const chatMessage = ChatUtility.getChatMessage(event);
+    const defenderRoll = ChatUtility.getMessageData(chatMessage, 'defender-roll');
+    const attackerRoll = defenderRoll?.attackerRoll ?? ChatUtility.getMessageData(chatMessage, 'attacker-roll') ;
+    console.log('RdDCombat', attackerRoll, defenderRoll);
     const defenderTokenId = event.currentTarget.attributes['data-defenderTokenId']?.value;
 
     const armeParadeId = event.currentTarget.attributes['data-armeid']?.value;
@@ -637,7 +556,7 @@ export class RdDCombat {
       case '#particuliere-attaque': return await this.choixParticuliere(attackerRoll, event.currentTarget.attributes['data-mode'].value);
       case '#parer-button': return this.parade(attackerRoll, armeParadeId);
       case '#esquiver-button': return this.esquive(attackerRoll, compId, competence);
-      case '#encaisser-button': return this.encaisser(attackerRoll, defenderTokenId);
+      case '#encaisser-button': return this.encaisser(attackerRoll, defenderRoll, defenderTokenId);
       case '#echec-total-attaque': return this._onEchecTotal(attackerRoll);
 
       case '#appel-chance-attaque': return this.attacker.rollAppelChance(
@@ -650,7 +569,7 @@ export class RdDCombat {
         () => this.attaqueSignificative(attackerRoll),
         () => { });
       case '#appel-destinee-defense': return this.defender.appelDestinee(
-        () => this.defenseDestinee(attackerRoll),
+        () => this.defenseDestinee(defenderRoll),
         () => { });
     }
   }
@@ -680,8 +599,7 @@ export class RdDCombat {
   }
 
   /* -------------------------------------------- */
-  defenseDestinee(attackerRoll) {
-    let defenderRoll = RdDCombat._getDefense(attackerRoll.passeArme);
+  defenseDestinee(defenderRoll) {
     if (defenderRoll) {
       ui.notifications.info('Défense significative grâce à la destinée')
       RdDResolutionTable.significativeRequise(defenderRoll.rolled);
@@ -819,8 +737,7 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   async _onAttaqueParticuliere(rollData) {
-    RdDCombat._storeAttaque(this.attackerId, rollData);
-
+    
     const isMeleeDiffNegative = (rollData.competence.type == 'competencecreature' || rollData.selectedCarac.label == "Mêlée") && rollData.diffLibre < 0;
     // force toujours, sauf empoignade
     // finesse seulement en mélée, pour l'empoignade, ou si la difficulté libre est de -1 minimum
@@ -838,8 +755,8 @@ export class RdDCombat {
     else if (!isForce && !isFinesse && isRapide) {
       return await this.choixParticuliere(rollData, "rapidite");
     }
-
-    ChatMessage.create({
+    
+    const choixParticuliere = await ChatMessage.create({
       alias: this.attacker.name,
       whisper: ChatUtility.getWhisperRecipientsAndGMs(this.attacker.name),
       content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-attaque-particuliere.html', {
@@ -852,6 +769,7 @@ export class RdDCombat {
         passeArme: rollData.passeArme
       })
     });
+    ChatUtility.setMessageData(choixParticuliere, 'attacker-roll', rollData);
   }
 
   /* -------------------------------------------- */
@@ -860,10 +778,6 @@ export class RdDCombat {
 
     attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker.getBonusDegat(), this.defender.isEntiteCauchemar());
     let defenderRoll = { attackerRoll: attackerRoll, passeArme: attackerRoll.passeArme, show: {} }
-    // Save rollData for defender
-    RdDCombat._storeAttaque(this.attackerId, attackerRoll);
-    RdDCombat._storeDefense(defenderRoll.passeArme, defenderRoll);
-
     attackerRoll.show = {
       cible: this.target ? this.defender.data.name : 'la cible',
       isRecul: (attackerRoll.particuliere == 'force' || attackerRoll.tactique == 'charge')
@@ -918,7 +832,7 @@ export class RdDCombat {
     };
 
     if (Misc.isUniqueConnectedGM()) {
-      await this._chatMessageDefense(paramChatDefense);
+      await this._chatMessageDefense(paramChatDefense, defenderRoll);
     }
     else {
       this._socketSendMessageDefense(paramChatDefense, defenderRoll);
@@ -926,14 +840,16 @@ export class RdDCombat {
   }
 
   /* -------------------------------------------- */
-  async _chatMessageDefense(paramDemandeDefense) {
-    ChatMessage.create({
+  async _chatMessageDefense(paramDemandeDefense, defenderRoll) {
+    const choixDefense = await ChatMessage.create({
       // message privé: du défenseur à lui même (et aux GMs)
       speaker: ChatMessage.getSpeaker(this.defender, canvas.tokens.get(this.defenderTokenId)),
       alias: this.attacker.name,
       whisper: ChatUtility.getWhisperRecipientsAndGMs(this.defender.name),
       content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-defense.html', paramDemandeDefense),
     });
+    // flag pour garder les jets d'attaque/defense
+    ChatUtility.setMessageData(choixDefense, 'defender-roll', defenderRoll);
   }
 
   /* -------------------------------------------- */
@@ -974,10 +890,7 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   async _onAttaqueEchecTotal(attackerRoll) {
-
-    RdDCombat._storeAttaque(this.attackerId, attackerRoll);
-
-    ChatMessage.create({
+    const choixEchecTotal = await ChatMessage.create({
       whisper: ChatUtility.getWhisperRecipientsAndGMs(this.attacker.name),
       content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-attaque-etotal.html', {
         attackerId: this.attackerId,
@@ -986,6 +899,7 @@ export class RdDCombat {
         essais: attackerRoll.essais
       })
     });
+    ChatUtility.setMessageData(choixEchecTotal, 'attacker-roll', attackerRoll);
   }
 
   /* -------------------------------------------- */
@@ -1105,7 +1019,6 @@ export class RdDCombat {
 
     this.removeChatMessageActionsPasseArme(defenderRoll.passeArme);
     this._sendMessageDefense(defenderRoll.attackerRoll, defenderRoll, { defense: true });
-    RdDCombat._storeDefense(defenderRoll.passeArme, defenderRoll);
   }
 
   /* -------------------------------------------- */
@@ -1177,7 +1090,6 @@ export class RdDCombat {
 
     this.removeChatMessageActionsPasseArme(defenderRoll.passeArme);
     this._sendMessageDefense(defenderRoll.attackerRoll, defenderRoll, { defense: true })
-    RdDCombat._storeDefense(defenderRoll.passeArme, defenderRoll);
   }
 
   /* -------------------------------------------- */
@@ -1282,15 +1194,10 @@ export class RdDCombat {
   }
 
   /* -------------------------------------------- */
-  async encaisser(attackerRoll, defenderTokenId) {
+  async encaisser(attackerRoll, defenderRoll, defenderTokenId) {
     defenderTokenId = defenderTokenId || this.defenderTokenId;
     console.log("RdDCombat.encaisser >>>", attackerRoll, defenderTokenId);
 
-    let defenderRoll = RdDCombat._getDefense(attackerRoll.passeArme);
-    if (!defenderRoll) {
-      ui.notifications.warn("Cette passe d'arme est déjà terminée!")
-      return;
-    }
     if (defenderRoll?.rolled && RdDCombat.isEchecTotal(defenderRoll)) {
       this._onEchecTotal(defenderRoll);
     }
-- 
2.35.3


From 167a3d5894cad9f8c67057eb4c266a8014475512 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Sun, 30 Jan 2022 16:11:20 +0100
Subject: [PATCH 16/42] Count worlds instance

---
 module/rdd-main.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/module/rdd-main.js b/module/rdd-main.js
index 1c7321c9..ad2e559d 100644
--- a/module/rdd-main.js
+++ b/module/rdd-main.js
@@ -217,6 +217,28 @@ function messageDeBienvenue() {
   }
 }
 
+/* -------------------------------------------- */
+// Register world usage statistics
+function registerUsageCount( registerKey ) {
+  if ( game.user.isGM ) {
+    game.settings.register(registerKey, "world-key", {
+      name: "Unique world key",
+      scope: "world",
+      config: false,
+      type: String
+    });
+
+    let worldKey = game.settings.get(registerKey, "world-key")
+    if ( worldKey == undefined || worldKey == "" ) {
+      worldKey = randomID(32)
+      game.settings.set(registerKey, "world-key", worldKey )
+    }
+    // Simple API counter
+    $.ajax(`https://jdr.lahiette.com/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.data.version}"`)
+    /* -------------------------------------------- */
+  }
+}
+
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
 /* -------------------------------------------- */
@@ -246,6 +268,7 @@ Hooks.once("ready", async function () {
   }
   if (Misc.isUniqueConnectedGM()) {
     messageDeBienvenue();
+    registerUsageCount( SYSTEM_RDD );
   }
 });
 
@@ -282,6 +305,7 @@ async function migrationPngWebp_1_5_34() {
     let sidebar = document.getElementById("sidebar");
     sidebar.style.width = "min-content";
   }
+
 }
 
 /* -------------------------------------------- */
-- 
2.35.3


From 3ad6aa01cc5d15c8894fa062b866d3186d6b427d Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Sun, 30 Jan 2022 16:14:17 +0100
Subject: [PATCH 17/42] Count worlds instance

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index 5b16a0dc..3f6dd26d 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.5.59",
+  "version": "1.5.60",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
-- 
2.35.3


From 91f9e8832dfa0a1637276dc9d876f1bb2d885553 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Sun, 30 Jan 2022 21:49:35 +0100
Subject: [PATCH 18/42] Utilisation de tables custom du monde

---
 module/rdd-rolltables.js | 11 +++++++----
 system.json              |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/module/rdd-rolltables.js b/module/rdd-rolltables.js
index 89516904..f6aa6be9 100644
--- a/module/rdd-rolltables.js
+++ b/module/rdd-rolltables.js
@@ -2,10 +2,13 @@ export class RdDRollTables {
 
   /* -------------------------------------------- */
   static async genericGetTableResult(tableName, toChat) {
-    const pack = game.packs.get("foundryvtt-reve-de-dragon.tables-diverses");
-    const index = await pack.getIndex();
-    const entry = index.find(e => e.name === tableName);
-    const table = await pack.getDocument(entry._id);
+    let table = game.tables.find(table => table.name.toLowerCase() == tableName.toLowerCase())
+    if ( !table) {
+      const pack = game.packs.get("foundryvtt-reve-de-dragon.tables-diverses");
+      const index = await pack.getIndex();
+      const entry = index.find(e => e.name === tableName);
+      table = await pack.getDocument(entry._id);
+    }
     const draw = await table.draw({ displayChat: toChat, rollMode: "gmroll"});
     console.log("RdDRollTables", tableName, toChat, ":", draw);
     return draw.results.length > 0 ? draw.results[0] : undefined;
diff --git a/system.json b/system.json
index 3f6dd26d..bfeabbf9 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.5.60",
+  "version": "1.5.61",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
-- 
2.35.3


From a4fac5ac6a591f7c3ce7ea38fced373ddc81259d Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Fri, 4 Feb 2022 00:40:07 +0100
Subject: [PATCH 19/42] Fix evaluation force rencontres

---
 module/tmr-rencontres.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/tmr-rencontres.js b/module/tmr-rencontres.js
index 85c12887..af2621ed 100644
--- a/module/tmr-rencontres.js
+++ b/module/tmr-rencontres.js
@@ -379,7 +379,9 @@ export class TMRRencontres {
 
   /* -------------------------------------------- */
   static async evaluerForceRencontre(rencontre) {
-    rencontre.force = await new Roll(rencontre.force).evaluate().total;
+    const rollForce = new Roll(rencontre.force);
+    await rollForce.evaluate();
+    rencontre.force = rollForce.total;
     return rencontre.force;
   }
 
-- 
2.35.3


From 9e95b0f39f7ff2e8574e7dc5006b2549d0a54969 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Fri, 4 Feb 2022 14:11:55 +0100
Subject: [PATCH 20/42] Fix rencontres

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index bfeabbf9..d1d18fe4 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.5.61",
+  "version": "1.5.62",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
-- 
2.35.3


From 2ce8b35da0206177187200672c4d2490d8bb41c5 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Wed, 2 Mar 2022 20:19:02 +0100
Subject: [PATCH 21/42] Fix potions permanente

---
 module/actor.js    | 2 +-
 module/rdd-main.js | 4 ++--
 system.json        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index 717152c0..71a82c8a 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -388,7 +388,7 @@ export class RdDActor extends Actor {
   async verifierPotionsEnchantees() {
     let potionsEnchantees = this.filterItemsData(it => it.type == 'potion' && it.data.categorie.toLowerCase().includes('enchant'));
     for (let potion of potionsEnchantees) {
-      if (!potion.prpermanent) {
+      if (!potion.data.prpermanent) {
         console.log(potion);
         let newPr = (potion.data.pr > 0) ? potion.data.pr - 1 : 0;
         let update = { _id: potion._id, 'data.pr': newPr };
diff --git a/module/rdd-main.js b/module/rdd-main.js
index 69cba903..ba58e175 100644
--- a/module/rdd-main.js
+++ b/module/rdd-main.js
@@ -233,8 +233,8 @@ function registerUsageCount( registerKey ) {
       worldKey = randomID(32)
       game.settings.set(registerKey, "world-key", worldKey )
     }
-    // Simple API counter
-    $.ajax(`https://jdr.lahiette.com/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.data.version}"`)
+    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.data.version}"`
+    $.ajax(regURL)
     /* -------------------------------------------- */
   }
 }
diff --git a/system.json b/system.json
index d1d18fe4..996af5c3 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.5.62",
+  "version": "1.5.63",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
-- 
2.35.3


From aa09da814b4030cb65cfe520d3ad5201f8b33b1a Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Wed, 9 Mar 2022 22:27:05 +0100
Subject: [PATCH 22/42] Add XP tooltip information

---
 system.json                                   | 2 +-
 templates/actor-sheet-competence-partial.html | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/system.json b/system.json
index 996af5c3..e29b0bb6 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.5.63",
+  "version": "1.5.64",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
diff --git a/templates/actor-sheet-competence-partial.html b/templates/actor-sheet-competence-partial.html
index 18679f85..000357cb 100644
--- a/templates/actor-sheet-competence-partial.html
+++ b/templates/actor-sheet-competence-partial.html
@@ -4,18 +4,25 @@
       <img class="sheet-competence-img" src="{{img}}"/>
       <span class="competence-label">{{name}}</span>
     </a>
+
     {{#if data.isLevelUp}}
     <span class="tooltiptext ttt-xp">Vous pouvez dépenser {{data.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}}</span>
     <a class="item-control competence-xp-augmenter" compname="{{name}}" title="Augmenter">
       <i class="fas fa-arrow-alt-circle-up"></i>
     </a>
     {{/if}}
+
     <input class="competence-value" type="text" compname="{{name}}" name="comp-value-{{name}}"
           value="{{numberFormat data.niveau decimals=0 sign=true}}" data-dtype="number"
           {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
-    <input class="competence-xp" type="text" compname="{{name}}" name="comp-xp-{{name}}"
+    
+    <span class="competence-xp tooltip">
+    <input class="competence-xp " type="text" compname="{{name}}" name="comp-xp-{{name}}"
           value="{{numberFormat data.xp decimals=0 sign=false}}" data-dtype="number"
           {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+    <span class="tooltiptext ttt-xp">Vous devez acquérir {{data.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}}</span>      
+    </span>
+
     {{#if (eq data.categorie 'draconic')}}
     <input class="competence-xp-sort" type="text" compname="{{name}}" name="comp-xp-sort-{{name}}"
           value="{{numberFormat data.xp_sort decimals=0 sign=false}}" data-dtype="number"
-- 
2.35.3


From f2d793c622abc488b241f95763aea1944aeac3b3 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Thu, 10 Mar 2022 14:45:34 +0100
Subject: [PATCH 23/42] Add XP info pour carac

---
 system.json                | 2 +-
 templates/actor-sheet.html | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/system.json b/system.json
index e29b0bb6..390e0323 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.5.64",
+  "version": "1.5.65",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 10cbdf3e..ebff24e6 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -126,7 +126,10 @@
                             <span class="carac-label tooltip" name="data.carac.{{key}}.label"><a name={{key}}>{{carac.label}}</a></span>
                           {{/if}}
                           <input class="carac-value" type="text" name="data.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+                          <span class="carac-xp tooltip">
                           <input class="carac-xp" type="text" name="data.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number" {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+                          <span class="tooltiptext ttt-xp">Vous devez acquérir {{carac.xpNext}} points d'Experience pour augmenter de 1 votre {{carac.label}}</span>      
+                          </span>
                           {{#if carac.isLevelUp}}
                           <a class="item-control carac-xp-augmenter" name="augmenter.{{key}}" title="Augmenter">
                             <i class="fas fa-arrow-alt-circle-up"></i>
-- 
2.35.3


From f3e7a9b249d3df3da8d53fb734c2ea2a6d74e834 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Thu, 10 Mar 2022 23:48:49 +0100
Subject: [PATCH 24/42] Add fight options

---
 styles/simple.css                             | 9 +++++----
 system.json                                   | 2 +-
 templates/actor-sheet-competence-partial.html | 4 ++--
 templates/dialog-roll-signedraconique.html    | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/styles/simple.css b/styles/simple.css
index 2e3a6180..b57e1151 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -1455,19 +1455,20 @@ display: inline-flex;
 
 /* Tooltip text */
 .tooltip .tooltiptext {
-  text-align: center;
-  
+  text-align: center;  
   /* Position the tooltip text */
-  top: 20px;
   position: absolute;
   z-index: 1;
-  
   /* Fade in tooltip */
   visibility: hidden;
   opacity: 0;
   transition: opacity 0.3s;
 }
 
+.tooltip .left-competence {
+  transform: translate(-100%, 0%);
+}
+
 .tooltip .ttt-fatigue{
   width: 360px;
   
diff --git a/system.json b/system.json
index 390e0323..5f950d19 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.5.65",
+  "version": "1.5.66",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
diff --git a/templates/actor-sheet-competence-partial.html b/templates/actor-sheet-competence-partial.html
index 000357cb..ff294648 100644
--- a/templates/actor-sheet-competence-partial.html
+++ b/templates/actor-sheet-competence-partial.html
@@ -17,10 +17,10 @@
           {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
     
     <span class="competence-xp tooltip">
-    <input class="competence-xp " type="text" compname="{{name}}" name="comp-xp-{{name}}"
+      <input class="competence-xp " type="text" compname="{{name}}" name="comp-xp-{{name}}"
           value="{{numberFormat data.xp decimals=0 sign=false}}" data-dtype="number"
           {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
-    <span class="tooltiptext ttt-xp">Vous devez acquérir {{data.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}}</span>      
+      <span class="tooltiptext left-competence ttt-xp">Vous devez acquérir {{data.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}}</span>      
     </span>
 
     {{#if (eq data.categorie 'draconic')}}
diff --git a/templates/dialog-roll-signedraconique.html b/templates/dialog-roll-signedraconique.html
index c790fe6b..bf8fd8b2 100644
--- a/templates/dialog-roll-signedraconique.html
+++ b/templates/dialog-roll-signedraconique.html
@@ -42,5 +42,5 @@
   <div id="tableProbaReussite"></div>
 </form>
 
-<script>
-</script>
\ No newline at end of file
+<script>  
+</script>
-- 
2.35.3


From 8ab796400460f0e934b335fd3a4b9165958fe83c Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Tue, 22 Mar 2022 23:36:46 +0100
Subject: [PATCH 25/42] =?UTF-8?q?Message=20sur=20les=20comp=C3=A9tences=20?=
 =?UTF-8?q?tronc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Amélioration: ne liste que les compétences inférieures
---
 module/actor.js           | 10 +++++++---
 module/item-competence.js |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index 71a82c8a..354bb2e4 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -964,11 +964,15 @@ export class RdDActor extends Actor {
   async updateCompetence(idOrName, compValue) {
     let competence = this.getCompetence(idOrName);
     if (competence) {
-      let troncList = RdDItemCompetence.isTronc(competence.name);
       let nouveauNiveau = compValue ?? RdDItemCompetence.getNiveauBase(Misc.data(competence).data.categorie);
-      if (troncList) {
+      const tronc = RdDItemCompetence.getListTronc(competence.name).filter(it => {
+        const comp = this.getCompetence(it);
+        const niveauTr = comp? Misc.data(comp).data.niveau : 0;
+        return niveauTr < 0 && niveauTr < nouveauNiveau;
+      });
+      if (tronc.length > 0) {
         let message = "Vous avez modifié une compétence 'tronc'. Vérifiez que les compétences suivantes évoluent ensemble jusqu'au niveau 0 : ";
-        for (let troncName of troncList) {
+        for (let troncName of tronc) {
           message += "<br>" + troncName;
         }
         ChatMessage.create({
diff --git a/module/item-competence.js b/module/item-competence.js
index 268e4116..5c7f3156 100644
--- a/module/item-competence.js
+++ b/module/item-competence.js
@@ -113,14 +113,14 @@ export class RdDItemCompetence extends Item {
   }
 
   /* -------------------------------------------- */
-  static isTronc(compName) {
+  static getListTronc(compName) {
     for (let troncList of competenceTroncs) {
       for (let troncName of troncList) {
         if (troncName == compName)
           return troncList;
       }
     }
-    return false;
+    return [];
   }
 
   /* -------------------------------------------- */
-- 
2.35.3


From f41369a751b6cec521e92f665251c5207230088e Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Tue, 29 Mar 2022 20:34:00 +0200
Subject: [PATCH 26/42] =?UTF-8?q?Fix:=20grave=20transform=C3=A9e=20en=20cr?=
 =?UTF-8?q?itique?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

La transformation de grave en critique ajoutait de l'endurance et de
la vie
---
 module/actor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index 354bb2e4..aa5a01ac 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -3451,8 +3451,8 @@ export class RdDActor extends Actor {
       else {
         encaissement.critiques += count;
         encaissement.graves -= count;
-        encaissement.endurance = -endActuelle;
-        encaissement.vie = -4;
+        encaissement.endurance = endActuelle;
+        encaissement.vie = 4;
         break;
       }
     }
-- 
2.35.3


From 31d97439d421ba831f16aa05f210a70a713d255c Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Wed, 30 Mar 2022 01:18:34 +0200
Subject: [PATCH 27/42] =?UTF-8?q?Fix=20d=C3=A9placement=20apr=C3=A8s=20r?=
 =?UTF-8?q?=C3=A9insertion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On pouvait clicker sur les cases, jusqu'à tomber sur une case
adjacente pour trouver son demi-rêve...
---
 module/rdd-tmr-dialog.js | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js
index 3d62ddac..e8a043c4 100644
--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@@ -62,7 +62,6 @@ export class RdDTMRDialog extends Dialog {
     this.pixiApp = new PIXI.Application({ width: 720, height: 860 });
 
     this.pixiTMR = new PixiTMR(this, this.pixiApp);
-    this.cacheTMR = (game.user.isGM) ? false : actor.isTMRCache();
 
     this.callbacksOnAnimate = [];
     if (!this.viewOnly) {
@@ -73,6 +72,10 @@ export class RdDTMRDialog extends Dialog {
     this.pixiTMR.load((loader, resources) => this.createPixiSprites());
   }
 
+  isDemiReveCache() {
+    return !game.user.isGM && this.actor.isTMRCache();
+  }
+
   /* -------------------------------------------- */
   loadCasesSpeciales() {
     this.casesSpeciales = this.actor.data.items.filter(item => Draconique.isCaseTMR(item));
@@ -153,10 +156,7 @@ export class RdDTMRDialog extends Dialog {
 
   _updateDemiReve() {
     this.notifierResonanceSigneDraconique(this._getActorCoord());
-
-    if (!this.cacheTMR) {
-      this._setTokenPosition(this.demiReve);
-    }
+    this._setTokenPosition(this.demiReve);
   }
 
   _getActorCoord() {
@@ -252,7 +252,7 @@ export class RdDTMRDialog extends Dialog {
     ptsreve.innerHTML = actorData.data.reve.reve.value;
 
     let tmrpos = document.getElementById("tmr-pos");
-    if (this.cacheTMR) {
+    if (this.isDemiReveCache()) {
       tmrpos.innerHTML = '?? (' + TMRUtility.getTMRType(coord) + ')';
     } else {
       tmrpos.innerHTML = coord + " (" + TMRUtility.getTMRLabel(coord) + ")";
@@ -542,7 +542,9 @@ export class RdDTMRDialog extends Dialog {
     if (rencontre) {
       return rencontre;
     }
-    let locTMR = (this.cacheTMR) ? Misc.upperFirst(tmr.type) + " ??" : tmr.label + " (" + tmr.coord + ")";
+    let locTMR = (this.isDemiReveCache()
+      ? Misc.upperFirst(tmr.type) + " ??"
+      : tmr.label + " (" + tmr.coord + ")");
 
     let myRoll = await RdDDice.rollTotal("1dt");
     if (TMRUtility.isForceRencontre() || myRoll == 7) {
@@ -872,6 +874,14 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   async _onClickTMRPos(clickOddq) {
+    if (this.isDemiReveCache()) {
+      ui.notifications.error(`Vous ne connaissez plus votre position dans les TMR.
+      Vous devez utiliser les boutons de direction pour vous déplacer.
+      Une fois que vous aurez retrouvé votre demi-rêve, demandez au gardien de vérifier et rendre les TMR visibles.
+      `);
+      return;
+    }
+
     let currentOddq = TMRUtility.coordTMRToOddq(this._getActorCoord());
 
     console.log("deplacerDemiReve >>>>", currentOddq, clickOddq);
@@ -888,7 +898,7 @@ export class RdDTMRDialog extends Dialog {
     } else if (deplacementType == 'messager') { // Dans ce cas, ouverture du lancement de sort sur la case visée
       await this._messagerDemiReve(targetCoord);
     } else {
-      ui.notifications.error("Vous ne pouvez vous déplacer que sur des cases adjacentes à votre position ou valides dans le cas d'une rencontre");
+      ui.notifications.error("Vous ne pouvez pas vous déplacer que sur des cases adjacentes à votre position ou valides dans le cas d'une rencontre");
       console.log("STATUS :", this.rencontreState, this.currentRencontre);
     }
     this.checkQuitterTMR();
@@ -923,7 +933,6 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   externalRefresh(tmrData) {
-    this.cacheTMR = (game.user.isGM) ? false : this.actor.isTMRCache();
     this.createPixiSprites();
     this.forceDemiRevePositionView();
     this.updateValuesDisplay();
@@ -1018,9 +1027,10 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   _setTokenPosition(token) {
-    if (!this.cacheTMR) {
-      this.pixiTMR.setPosition(token.sprite, TMRUtility.coordTMRToOddq(token.coordTMR()));
+    if (this.isDemiReveCache() && this.demiReve === token ) {
+      return;
     }
+    this.pixiTMR.setPosition(token.sprite, TMRUtility.coordTMRToOddq(token.coordTMR()));
   }
 
   /* -------------------------------------------- */
-- 
2.35.3


From 0cf412bf066f8c825add813c22a618db66d1c6f1 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Wed, 30 Mar 2022 13:30:02 +0200
Subject: [PATCH 28/42] Minor fixes

---
 system.json | 335 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 254 insertions(+), 81 deletions(-)

diff --git a/system.json b/system.json
index 5f950d19..e7156469 100644
--- a/system.json
+++ b/system.json
@@ -2,204 +2,301 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.5.66",
-  "manifestPlusVersion": "1.0.0",
-  "minimumCoreVersion": "0.8.0",
-  "compatibleCoreVersion": "9",
-  "templateVersion": 135,
   "author": "LeRatierBretonnien",
   "authors": [
-    { 
+    {
       "name": "LeRatierBretonnien"
     },
-    { 
+    {
       "name": "VincentVK"
     },
-    { 
+    {
       "name": "Grendel"
     },
-    { 
+    {
       "name": "Michael Nonne"
     },
-    { 
+    {
       "name": "Mandar"
     },
-    { 
+    {
       "name": "Fred"
     },
-    { 
+    {
       "name": "Fab"
     }
   ],
-  "esmodules": [ "module/rdd-main.js"],
-  "styles": ["styles/simple.css"],
-  "media": [
+  "url": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/",
+  "license": "LICENSE.txt",
+  "flags": {},
+  "version": "1.5.67",
+  "minimumCoreVersion": "0.8.0",
+  "compatibleCoreVersion": "9",
+  "scripts": [],
+  "esmodules": [
+    "module/rdd-main.js"
+  ],
+  "styles": [
+    "styles/simple.css"
+  ],
+  "languages": [
     {
-      "type": "video",
-      "url": "https://www.youtube.com/watch?v=u2ckUAccX6w",
-      "loop": false,
-      "thumbnail": "https://i9.ytimg.com/vi/f29R_nc1vRA/mq2.jpg?sqp=CNDH-v8F&rs=AOn4CLDYE2Bla3_jhYCz5fDUmS-xQu1JDg"
+      "lang": "en",
+      "name": "English",
+      "path": "lang/fr.json",
+      "unreal": "this is a trick"
     },
     {
-      "type": "video",
-      "url": "https://www.youtube.com/watch?v=f29R_nc1vRA",
-      "loop": false,
-      "thumbnail": "https://i9.ytimg.com/vi/f29R_nc1vRA/mq2.jpg?sqp=CNDH-v8F&rs=AOn4CLDYE2Bla3_jhYCz5fDUmS-xQu1JDg"
+      "lang": "fr",
+      "name": "Français",
+      "path": "lang/fr.json"
     }
   ],
   "packs": [
-  	{
+    {
       "name": "competences",
       "label": "Compétences",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/competences.db",
       "type": "Item",
-      "tags" : [ "item", "compétences" ]
+      "tags": [
+        "item",
+        "compétences"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "arts-et-divertissements",
       "label": "Arts et Divertissements",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/arts-et-divertissements.db",
       "type": "Item",
-      "tags" : [ "recette", "cuisine", "danse", "musique", "chant", "jeux" ]
+      "tags": [
+        "recette",
+        "cuisine",
+        "danse",
+        "musique",
+        "chant",
+        "jeux"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "competences-creatures",
       "label": "Compétences de Créatures",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/competences-creatures.db",
       "type": "Item",
-      "tags" : [ "item", "compétences", "créatures" ]
+      "tags": [
+        "item",
+        "compétences",
+        "créatures"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "competences-entites",
       "label": "Compétences des Entités",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/competences-entites.db",
       "type": "Item",
-      "tags" : [ "item", "compétences", "entités" ]
+      "tags": [
+        "item",
+        "compétences",
+        "entités"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "sorts-oniros",
       "label": "Sorts d'Oniros",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/sorts-oniros.db",
       "type": "Item",
-      "tags" : [ "item", "sorts" ]
+      "tags": [
+        "item",
+        "sorts"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "sorts-hypnos",
       "label": "Sorts d'Hypnos",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/sorts-hypnos.db",
       "type": "Item",
-      "tags" : [ "item", "sorts" ]
+      "tags": [
+        "item",
+        "sorts"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "sorts-narcos",
       "label": "Sorts de Narcos",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/sorts-narcos.db",
       "type": "Item",
-      "tags" : [ "item", "sorts" ]
+      "tags": [
+        "item",
+        "sorts"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "sorts-thanatos",
       "label": "Sorts de Thanatos",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/sorts-thanatos.db",
       "type": "Item",
-      "tags" : [ "item", "sorts" ]
+      "tags": [
+        "item",
+        "sorts"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "equipement",
       "label": "Equipement",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/equipement.db",
       "type": "Item",
-      "tags" : [ "item", "équipement", "objet" ]
+      "tags": [
+        "item",
+        "équipement",
+        "objet"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "maladies-et-poisons",
       "label": "Maladies & Poisons",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/maladies-et-poisons.db",
       "type": "Item",
-      "tags" : [ "maladie", "poison" ]
+      "tags": [
+        "maladie",
+        "poison"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "rappel-des-regles",
       "label": "Rappels des Règles",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/rappel-des-regles.db",
       "type": "JournalEntry",
-      "tags" : [ "journal", "règles" ]
+      "tags": [
+        "journal",
+        "règles"
+      ],
+      "entity": "JournalEntry",
+      "private": false
     },
-  	{
+    {
       "name": "queues-de-dragon",
       "label": "Queues de Dragon",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/queues-de-dragon.db",
       "type": "Item",
-      "tags" : [ "item", "queue" ]
+      "tags": [
+        "item",
+        "queue"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "ombres-de-thanatos",
       "label": "Ombres de Thanatos",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/ombres-de-thanatos.db",
       "type": "Item",
-      "tags" : [ "item", "ombre" ]
+      "tags": [
+        "item",
+        "ombre"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "souffles-de-dragon",
       "label": "Souffles de Dragon",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/souffles-de-dragon.db",
       "type": "Item",
-      "tags" : [ "item", "souffle" ]
+      "tags": [
+        "item",
+        "souffle"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "tarot-draconique",
       "label": "Tarot Draconique",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/tarot-draconique.db",
       "type": "Item",
-      "tags" : [ "item", "tarot" ]
+      "tags": [
+        "item",
+        "tarot"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "tetes-de-dragon-pour-haut-revants",
       "label": "Têtes de Dragon (Hauts-Rêvants)",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/tetes-de-dragon-pour-haut-revants.db",
       "type": "Item",
-      "tags" : [ "item", "tête" ]
+      "tags": [
+        "item",
+        "tête"
+      ],
+      "entity": "Item",
+      "private": false
     },
-  	{
+    {
       "name": "tetes-de-dragon-pour-tous-personnages",
       "label": "Têtes de Dragon (Tous Personnages)",
       "system": "foundryvtt-reve-de-dragon",
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/tetes-de-dragon-pour-tous-personnages.db",
       "type": "Item",
-      "tags" : [ "item", "tête" ]
+      "tags": [
+        "item",
+        "tête"
+      ],
+      "entity": "Item",
+      "private": false
     },
     {
       "name": "tables-diverses",
@@ -208,7 +305,12 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/tables-diverses.db",
       "type": "RollTable",
-      "tags" : [ "table", "tables" ]
+      "tags": [
+        "table",
+        "tables"
+      ],
+      "entity": "RollTable",
+      "private": false
     },
     {
       "name": "animaux",
@@ -217,7 +319,12 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/animaux.db",
       "type": "Actor",
-      "tags" : [ "animaux", "creature" ]
+      "tags": [
+        "animaux",
+        "creature"
+      ],
+      "entity": "Actor",
+      "private": false
     },
     {
       "name": "voyageurs",
@@ -226,7 +333,12 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/voyageurs.db",
       "type": "Actor",
-      "tags" : [ "voyageur", "profils" ]
+      "tags": [
+        "voyageur",
+        "profils"
+      ],
+      "entity": "Actor",
+      "private": false
     },
     {
       "name": "vehicules",
@@ -235,7 +347,16 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/vehicules.db",
       "type": "Actor",
-      "tags" : [ "vehicule", "bateau", "charett", "chariot", "carriole", "barque" ]
+      "tags": [
+        "vehicule",
+        "bateau",
+        "charett",
+        "chariot",
+        "carriole",
+        "barque"
+      ],
+      "entity": "Actor",
+      "private": false
     },
     {
       "name": "archetypes",
@@ -244,7 +365,12 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/archetypes.db",
       "type": "Actor",
-      "tags" : [ "archetype", "pnj" ]
+      "tags": [
+        "archetype",
+        "pnj"
+      ],
+      "entity": "Actor",
+      "private": false
     },
     {
       "name": "humanoides",
@@ -253,7 +379,12 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/humanoides.db",
       "type": "Actor",
-      "tags" : [ "humanoides", "pnj" ]
+      "tags": [
+        "humanoides",
+        "pnj"
+      ],
+      "entity": "Actor",
+      "private": false
     },
     {
       "name": "entites",
@@ -262,7 +393,15 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/entites-de-cauchemar.db",
       "type": "Actor",
-      "tags" : [ "entités", "entite", "cauchemar", "ecni", "eni" ]
+      "tags": [
+        "entités",
+        "entite",
+        "cauchemar",
+        "ecni",
+        "eni"
+      ],
+      "entity": "Actor",
+      "private": false
     },
     {
       "name": "invocations",
@@ -271,7 +410,12 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/invocations.db",
       "type": "Actor",
-      "tags" : [ "hypnos", "invocation" ]
+      "tags": [
+        "hypnos",
+        "invocation"
+      ],
+      "entity": "Actor",
+      "private": false
     },
     {
       "name": "botanique",
@@ -280,7 +424,13 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/botanique.db",
       "type": "Item",
-      "tags" : [ "plantes", "champignons", "herbes" ]
+      "tags": [
+        "plantes",
+        "champignons",
+        "herbes"
+      ],
+      "entity": "Item",
+      "private": false
     },
     {
       "name": "taches-courantes",
@@ -289,7 +439,11 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/taches-courantes.db",
       "type": "Item",
-      "tags" : [ "taches" ]
+      "tags": [
+        "taches"
+      ],
+      "entity": "Item",
+      "private": false
     },
     {
       "name": "meditations-et-ecrits",
@@ -298,7 +452,17 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/meditations-et-ecrits.db",
       "type": "Item",
-      "tags" : [ "meditations", "méditations", "livres", "livre", "méditation", "écrits", "écrit" ]
+      "tags": [
+        "meditations",
+        "méditations",
+        "livres",
+        "livre",
+        "méditation",
+        "écrits",
+        "écrit"
+      ],
+      "entity": "Item",
+      "private": false
     },
     {
       "name": "recettes-alchimiques",
@@ -307,7 +471,15 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/recettes-alchimiques.db",
       "type": "Item",
-      "tags" : [ "recettes", "recette", "alchimie", "alchimique", "potion" ]
+      "tags": [
+        "recettes",
+        "recette",
+        "alchimie",
+        "alchimique",
+        "potion"
+      ],
+      "entity": "Item",
+      "private": false
     },
     {
       "name": "scenes-rdd",
@@ -316,21 +488,22 @@
       "module": "foundryvtt-reve-de-dragon",
       "path": "./packs/scenes-rdd.db",
       "type": "Scene",
-      "tags" : [ "ecran", "scene" ]
+      "tags": [
+        "ecran",
+        "scene"
+      ],
+      "entity": "Scene",
+      "private": false
     }
   ],
-  "library": false,
-  "languages": [
-    { "lang": "en", "name": "English", "path": "lang/fr.json", "unreal": "this is a trick"},
-    { "lang": "fr", "name": "Français", "path": "lang/fr.json" }
-  ],
+  "system": [],
+  "dependencies": [],
+  "socket": true,
+  "manifest": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/raw/v1.5/system.json",
+  "download": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/-/archive/v1.5/foundryvtt-reve-de-dragon-master.zip",
+  "protected": false,
   "gridDistance": 1,
   "gridUnits": "m",
   "primaryTokenAttribute": "sante.vie",
-  "secondaryTokenAttribute": "sante.endurance",
-  "socket": true,
-  "url": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/",
-  "manifest": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/raw/v1.5/system.json",
-  "download": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/-/archive/v1.5/foundryvtt-reve-de-dragon-master.zip",
-  "license": "LICENSE.txt"
+  "secondaryTokenAttribute": "sante.endurance"
 }
-- 
2.35.3


From 1fdfa6a83419efb672442d49c6ad36b4fc129464 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 23 Apr 2022 00:24:52 +0200
Subject: [PATCH 29/42] =?UTF-8?q?Actions=20sur=20objets=20d'un=20v=C3=A9hi?=
 =?UTF-8?q?cule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Permettre les mêmes actions pour les objets d'un véhicule
que pour ceux d'un personnage ou créature
---
 module/actor-vehicule-sheet.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/module/actor-vehicule-sheet.js b/module/actor-vehicule-sheet.js
index b4a33c37..1d39f106 100644
--- a/module/actor-vehicule-sheet.js
+++ b/module/actor-vehicule-sheet.js
@@ -112,6 +112,19 @@ export class RdDActorVehiculeSheet extends ActorSheet {
       const li = RdDSheetUtility.getEventElement(event);
       RdDUtility.confirmerSuppression(this, li);
     });
+    html.find('.item-vendre').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      item?.proposerVente();
+    });
+    html.find('.item-montrer').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      item?.postItem();
+    });
+
+    html.find('.item-action').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      this.actor.actionItem(item);
+    });
 
     html.find('.creer-un-objet').click(async event => {
       RdDUtility.selectObjetType(this);
-- 
2.35.3


From 806d44522d4f3d1599258467b5b0814cd29a6dc4 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 23 Apr 2022 00:26:56 +0200
Subject: [PATCH 30/42] Fix: transfert de contenants
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Le transfert de contenants faisait une copie et perdait les rangements
à cause de l'utilisation de _id
---
 module/actor.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index aa5a01ac..f90ebffc 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -1251,17 +1251,12 @@ export class RdDActor extends Actor {
     itemsList.push({ id: itemId, conteneurId: undefined }); // Init list
     sourceActor.buildSubConteneurObjetList(itemId, itemsList); // Get itemId list
 
-    let itemMap = {};
     const itemsDataToCreate = itemsList.map(it => sourceActor.getObjet(it.id))
       .map(it => duplicate(Misc.data(it)))
       .map(it => { it.data.contenu = []; return it; });
     let newItems = await this.createEmbeddedDocuments('Item', itemsDataToCreate);
-    for (let i = 0; i < itemsList.length; i++) {
-      const srcItem = itemsList[i];
-      const newItem = newItems[i];
-      console.log('New object', newItem, srcItem);
-      itemMap[srcItem.id] = newItem._id; // Pour garder le lien ancien / nouveau
-    }
+
+    let itemMap = this._buildMapOldNewId(itemsList, newItems);
 
     for (let item of itemsList) { // Second boucle pour traiter la remise en conteneurs
       // gestion conteneur/contenu
@@ -1282,6 +1277,14 @@ export class RdDActor extends Actor {
     }
   }
 
+  _buildMapOldNewId(itemsList, newItems) {
+    let itemMap = {};
+    for (let i = 0; i < itemsList.length; i++) {
+      itemMap[itemsList[i].id] = newItems[i].id; // Pour garder le lien ancien / nouveau
+    }
+    return itemMap;
+  }
+
   async regrouperEquipementsSimilaires(item, dest) {
     await dest.quantiteIncDec(Misc.templateData(item).quantite);
     await item.delete();
-- 
2.35.3


From 9a8ef9f316457c9629f0df724b620d976f52853f Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 23 Apr 2022 00:31:25 +0200
Subject: [PATCH 31/42] Fix: attachement de compagnons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Il est de nouveau possible d'attacher un animal/véhicule/personnage à un
personnage
---
 module/actor-sheet.js | 2 +-
 module/actor.js       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/actor-sheet.js b/module/actor-sheet.js
index a273878b..7a72d17a 100644
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -132,7 +132,7 @@ export class RdDActorSheet extends ActorSheet {
   /* -------------------------------------------- */
   async _onDropActor(event, dragData) {
     console.log("_onDropActor", this.actor.id, dragData);
-    this.actor.addSubacteur(dragData.id || dragData.data._id);
+    this.actor.addSubActeur(dragData.id || dragData.data._id);
     super._onDropActor(event, dragData);
   }
 
diff --git a/module/actor.js b/module/actor.js
index f90ebffc..9a0555d5 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -3898,10 +3898,10 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  addSubacteur(subActorId) {
+  addSubActeur(subActorId) {
     let subActor = game.actors.get(subActorId);
     //console.log("Ajout acteur : ", actor, this);
-    if (subActor && subActor.owner) {
+    if (subActor && !subActor.owner) {
       const actorData = Misc.data(this);
       if (subActor.data.type == 'vehicule') {
         this.pushSubacteur(subActor, actorData.data.subacteurs.vehicules, 'data.subacteurs.vehicules', 'Ce Véhicule');
-- 
2.35.3


From f0d23bb1d064fb47d94a6975fd12a48b41c67dbc Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 23 Apr 2022 01:02:03 +0200
Subject: [PATCH 32/42] Fix: soucis avec plusieurs queues&souffles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

=> montée laborieuse, mauvaises rencontres

Simplification de EffetsDraconiques: passer l'actor pour tester
si l'acteur a un effet sur lui, ou un item pour tester si un item
correspond
---
 module/actor-sheet.js            |   2 +-
 module/actor.js                  |   9 ++-
 module/rdd-tmr-dialog.js         |   2 +-
 module/tmr/effets-draconiques.js | 119 +++++++++++--------------------
 4 files changed, 49 insertions(+), 83 deletions(-)

diff --git a/module/actor-sheet.js b/module/actor-sheet.js
index 7a72d17a..75dc8495 100644
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -337,7 +337,7 @@ export class RdDActorSheet extends ActorSheet {
         ui.notifications.info("Impossible de lancer l'initiative sans être dans un combat.");
       }
     });
-    // Display TMR, visuualisation
+    // Display TMR, visualisation
     html.find('.visu-tmr').click(async event => {
       this.actor.displayTMR("visu");
     });
diff --git a/module/actor.js b/module/actor.js
index 9a0555d5..a4ded765 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -2373,14 +2373,13 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   isRencontreSpeciale() { // Gestion queue/souffle 'Mauvaise Rencontre en Perpective'
     let addMsg = "";
-    let rencSpecial = this.data.items.find(item => EffetsDraconiques.isMauvaiseRencontre(item));
+    let rencSpecial = EffetsDraconiques.mauvaiseRencontre(this);
     if (rencSpecial) {
-      rencSpecial = Misc.data(rencSpecial); // To keep it
       if (rencSpecial.type != 'souffle') {
-        this.deleteEmbeddedDocuments('Item', [rencSpecial._id]); // Suppression dans la liste des queues
+        this.deleteEmbeddedDocuments('Item', [rencSpecial.id]); // Suppression dans la liste des queues
         addMsg = " La queue a été supprimée de votre fiche automatiquement";
       } else {
-        addMsg = " Vous devez gérer manuellement le décompte de mauvaises rencontres manuellement.";
+        addMsg = " Vous devez gérer manuellement le décompte de mauvaises rencontres.";
       }
       ChatMessage.create({
         content: "Vous êtes sous le coup d'une Mauvaise Rencontre en Persective." + addMsg,
@@ -3138,7 +3137,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   countMonteeLaborieuse() { // Return +1 par queue/ombre/souffle Montée Laborieuse présente
-    let countMonteeLaborieuse = this.filterItemsData(it => EffetsDraconiques.isMonteeLaborieuse(it)).length;
+    let countMonteeLaborieuse = EffetsDraconiques.countMonteeLaborieuse(this);
     if (countMonteeLaborieuse > 0) {
       ChatMessage.create({
         content: `Vous êtes sous le coup d'une Montée Laborieuse : vos montées en TMR coûtent ${countMonteeLaborieuse} Point de Rêve de plus.`,
diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js
index e8a043c4..5185b0e2 100644
--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@@ -589,7 +589,7 @@ export class RdDTMRDialog extends Dialog {
         maitrise: { verbe: 'maîtriser', action: 'Maîtriser le fleuve' }
       }
       rollData.double = EffetsDraconiques.isDoubleResistanceFleuve(this.actor) ? true : undefined,
-        rollData.competence.data.defaut_carac = 'reve-actuel';
+      rollData.competence.data.defaut_carac = 'reve-actuel';
       await this._rollMaitriseCaseHumide(rollData);
     }
   }
diff --git a/module/tmr/effets-draconiques.js b/module/tmr/effets-draconiques.js
index a8cabd23..7236b40c 100644
--- a/module/tmr/effets-draconiques.js
+++ b/module/tmr/effets-draconiques.js
@@ -92,43 +92,10 @@ export class EffetsDraconiques {
   static isPresentCite(caseTMR, coord) {
     return EffetsDraconiques.presentCites.isCase(caseTMR, coord);
   }
-  /* -------------------------------------------- */
-  static isMauvaiseRencontre(item) {
-    return EffetsDraconiques.isMatching(item, it => Draconique.isQueueSouffle(it) && it.name.toLowerCase().includes('mauvaise rencontre'));
-  }
-
-  static isMonteeLaborieuse(item) {
-    return EffetsDraconiques.isMatching(item, it => Draconique.isQueueSouffle(it) && it.name.toLowerCase().includes('montée laborieuse'));
-  }
 
   /* -------------------------------------------- */
-  static isFermetureCite(item) {
-    return EffetsDraconiques.isMatching(item, it => EffetsDraconiques.fermetureCites.match(it));
-  }
-
-  static isPontImpraticable(item) {
-    return EffetsDraconiques.isMatching(item, it => EffetsDraconiques.pontImpraticable.match(it));
-  }
-
-  static isDoubleResistanceFleuve(item) {
-    return EffetsDraconiques.isMatching(item, it => Draconique.isSouffleDragon(it) && it.name.toLowerCase().includes('résistance du fleuve'));
-  }
-
-  static isPeage(item) {
-    return EffetsDraconiques.isMatching(item, it => Draconique.isSouffleDragon(it) && it.name.toLowerCase().includes('péage'));
-  }
-
-  static isPeriple(item) {
-    return EffetsDraconiques.isMatching(item, it => EffetsDraconiques.periple.match(it));
-  }
-
-  static isDesorientation(item) {
-    return EffetsDraconiques.isMatching(item, it => EffetsDraconiques.desorientation.match(it));    // TODO
-  }
-
-  /* -------------------------------------------- */
-  static isSortImpossible(item) {
-    return EffetsDraconiques.isMatching(item, it =>
+  static isSortImpossible(actor) {
+    return actor.data.items.find(it =>
       EffetsDraconiques.conquete.match(it) ||
       EffetsDraconiques.periple.match(it) ||
       EffetsDraconiques.urgenceDraconique.match(it) ||
@@ -136,57 +103,57 @@ export class EffetsDraconiques {
     );
   }
 
-  static isSortReserveImpossible(item) {
-    return EffetsDraconiques.isMatching(item, it =>
+  static isSortReserveImpossible(actor) {
+    return actor.data.items.find(it =>
       EffetsDraconiques.conquete.match(it) ||
       EffetsDraconiques.periple.match(it) ||
       EffetsDraconiques.pelerinage.match(it)
     );
   }
 
-  static isConquete(item) {
-    return EffetsDraconiques.isMatching(item, it => EffetsDraconiques.conquete.match(it));
+  static isDonDoubleReve(actor) {
+    return actor.data.items.find(it => Draconique.isTeteDragon(it) && it.name == 'Don de double-rêve');
   }
 
-  static isPelerinage(item) {
-    return EffetsDraconiques.isMatching(item, it => EffetsDraconiques.pelerinage.match(it));
-  }
-  
-  static countInertieDraconique(item) {
-    return EffetsDraconiques.count(item, it => Draconique.isQueueDragon(it) && it.name.toLowerCase().includes('inertie draconique'));
-  }
-  
-  static isUrgenceDraconique(item) {
-    return EffetsDraconiques.isMatching(item, it => EffetsDraconiques.urgenceDraconique.match(it));
-  }
-  
-  /* -------------------------------------------- */
-  static isDonDoubleReve(item) {
-    return EffetsDraconiques.isMatching(item, it => Draconique.isTeteDragon(it) && it.name == 'Don de double-rêve');
-  }
-  
-  static isConnaissanceFleuve(item) {
-    return EffetsDraconiques.isMatching(item, it => Draconique.isTeteDragon(it) && it.name.toLowerCase().includes('connaissance du fleuve'));
-  }
-  
-  static isReserveEnSecurite(item) {
-    return EffetsDraconiques.isMatching(item, it => Draconique.isTeteDragon(it) && it.name.toLowerCase().includes(' en sécurité'));
-  }
-  
-  static isDeplacementAccelere(item) {
-    item = Misc.data(item);
-    return EffetsDraconiques.isMatching(item, it => Draconique.isTeteDragon(it) && it.name.toLowerCase().includes(' déplacement accéléré'));
-  }
-  
-  static isMatching(item, matcher) {
-    return EffetsDraconiques.toItems(item).find(matcher);
-  }
-  static count(item, matcher) {
-    return EffetsDraconiques.toItems(item).filter(matcher).length;
+  static isConnaissanceFleuve(actor) {
+    return actor.data.items.find(it => Draconique.isTeteDragon(it) && it.name.toLowerCase().includes('connaissance du fleuve'));
   }
 
-  static toItems(item) {
-    return (item?.documentName === 'Actor') ? item.data.items : (item?.documentName === 'Item') ? [Misc.data(item)] : [];
+  static isReserveEnSecurite(actor) {
+    return actor.data.items.find(it => Draconique.isTeteDragon(it) && it.name.toLowerCase().includes(' en sécurité'));
   }
 
+  static isDeplacementAccelere(actor) {
+    return actor.data.items.find(it => Draconique.isTeteDragon(it) && it.name.toLowerCase().includes(' déplacement accéléré'));
+  }
+
+  static isDoubleResistanceFleuve(actor) {
+    return actor.data.items.find(it => Draconique.isSouffleDragon(it) && it.name.toLowerCase().includes('résistance du fleuve'));
+  }
+
+  static countInertieDraconique(actor) {
+    return actor.data.items.filter(it => Draconique.isQueueDragon(it) && it.name.toLowerCase().includes('inertie draconique')).length;
+  }
+
+  static countMonteeLaborieuse(actor) {
+    return actor.data.items.filter(it => Draconique.isQueueSouffle(it) && it.name.toLowerCase().includes('montée laborieuse')).length;
+  }
+
+  static mauvaiseRencontre(actor) {
+    return actor.data.items.find(it => Draconique.isQueueSouffle(it) && it.name.toLowerCase().includes('mauvaise rencontre'));
+  }
+
+  static isPontImpraticable(actor) {
+    return actor.data.items.find(it => EffetsDraconiques.pontImpraticable.match(it));
+  }
+
+  static isUrgenceDraconique(actor) {
+    return actor.data.items.find(it => EffetsDraconiques.urgenceDraconique.match(it));
+  }
+
+  static isPeage(actor) {
+    return actor.data.items.find(it => Draconique.isSouffleDragon(it) && it.name.toLowerCase().includes('péage'));
+  }
+
+
 }
\ No newline at end of file
-- 
2.35.3


From d7563965ea95aa79cda87144d5edf27e325526e5 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 23 Apr 2022 01:35:48 +0200
Subject: [PATCH 33/42] Fix: les tokens d'un acteur peuvent se battre

---
 module/rdd-combat.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/module/rdd-combat.js b/module/rdd-combat.js
index e341ed42..ea574f09 100644
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@@ -429,9 +429,7 @@ export class RdDCombat {
     else {
       const defender = target?.actor;
       const defenderTokenId = target?.data._id;
-      if ( defender.data._id == attacker.data._id) {
-        ui.notifications.warn("Vous vous attaquez vous-même !!!!");
-      } else if ( defender.type == 'entite' && defender.data.data.definition.typeentite == 'nonincarne') {
+      if ( defender.type == 'entite' && defender.data.data.definition.typeentite == 'nonincarne') {
         ui.notifications.warn("Vous ne pouvez pas cibler une entité non incarnée !!!!");
       } else {
         return this.create(attacker, defender, defenderTokenId, target)
-- 
2.35.3


From 87998801e3317bbd1c77815c96f348569b0d90fc Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Sat, 23 Apr 2022 11:55:33 +0200
Subject: [PATCH 34/42] Fixes

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index e7156469..ee56f3b2 100644
--- a/system.json
+++ b/system.json
@@ -29,7 +29,7 @@
   "url": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
   "flags": {},
-  "version": "1.5.67",
+  "version": "1.5.68",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
   "scripts": [],
-- 
2.35.3


From 0d70d9ef839af4a7c79b0a7f28674c9106811607 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Thu, 28 Apr 2022 00:17:40 +0200
Subject: [PATCH 35/42] =?UTF-8?q?Fix:=20drag&drop=20de=20tokens=20de=20v?=
 =?UTF-8?q?=C3=A9hicule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Erreur lors de l'update de l'acteur:

You must provide an _id for every object in the update data Array.
...
    at async RdDActor.updateAttributeValue (actor.js:1079:5)
    at async RdDActor.computeMalusArmure (actor.js:1352:7)
    at async RdDActor.computeEncombrementTotalEtMalusArmure
           (actor.js:1333:7)
---
 module/actor-vehicule-sheet.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/module/actor-vehicule-sheet.js b/module/actor-vehicule-sheet.js
index 1d39f106..43b20810 100644
--- a/module/actor-vehicule-sheet.js
+++ b/module/actor-vehicule-sheet.js
@@ -68,6 +68,9 @@ export class RdDActorVehiculeSheet extends ActorSheet {
     return formData;
   }
 
+  async computeMalusArmure() {
+    // pas de malus armure
+  }
   /* -------------------------------------------- */
   async _onDropItem(event, dragData) {
     const destItemId = $(event.target)?.closest('.item').attr('data-item-id');
-- 
2.35.3


From 557808475465980b50e4b50a07af3736680e7d4b Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Wed, 11 May 2022 00:23:27 +0200
Subject: [PATCH 36/42] Fix: effets draconiques incorrects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* double résistance du fleuve pour tous?
* connaissance du fleuve pour tous
* réserve en sécurité pour tous
* impossible de déclencher un sort
* montée accélérée pour tous
etc
---
 module/actor.js                  |  3 +--
 module/grammar.js                |  4 ++++
 module/tmr/effets-draconiques.js | 26 ++++++++++++++++----------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index a4ded765..ac9edb5c 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -2403,8 +2403,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async checkSoufflePeage(tmr) {
-    let peage = this.data.items.find(item => EffetsDraconiques.isPeage(item));
-    if (peage && (tmr.type == 'pont' || tmr.type == 'cite')) {
+    if ((tmr.type == 'pont' || tmr.type == 'cite') && EffetsDraconiques.isPeage(actor)) {
       await this.reveActuelIncDec(-1);
       ChatMessage.create({
         content: "Vous êtes sous le coup d'un Péage : l'entrée sur cette case vous a coûté 1 Point de Rêve (déduit automatiquement).",
diff --git a/module/grammar.js b/module/grammar.js
index 6bb642b4..a8bd17a6 100644
--- a/module/grammar.js
+++ b/module/grammar.js
@@ -19,6 +19,10 @@ export class Grammar {
     return word.match(/^[aeiouy]/i)
   }
 
+  
+  static includesLowerCaseNoAccent(value, content) {
+    return Grammar.toLowerCaseNoAccent(value).includes(Grammar.toLowerCaseNoAccent(content));
+  }
   /* -------------------------------------------- */
   static toLowerCaseNoAccent(words) {
     return words?.toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "") ?? words;
diff --git a/module/tmr/effets-draconiques.js b/module/tmr/effets-draconiques.js
index 7236b40c..4d6463f6 100644
--- a/module/tmr/effets-draconiques.js
+++ b/module/tmr/effets-draconiques.js
@@ -16,7 +16,7 @@ import { Conquete } from "./conquete.js";
 import { Pelerinage } from "./pelerinage.js";
 import { Periple } from "./periple.js";
 import { UrgenceDraconique } from "./urgence-draconique.js";
-import { Misc } from "../misc.js";
+import { Grammar } from "../grammar.js";
 
 
 export class EffetsDraconiques {
@@ -111,36 +111,42 @@ export class EffetsDraconiques {
     );
   }
 
+  static filterItems(actor, filter, name) {
+    return actor.data.items.filter(filter)
+      .filter(it => Grammar.includesLowerCaseNoAccent(it.name, name));
+  }
+
   static isDonDoubleReve(actor) {
-    return actor.data.items.find(it => Draconique.isTeteDragon(it) && it.name == 'Don de double-rêve');
+    return EffetsDraconiques.filterItems(actor, Draconique.isTeteDragon, 'Don de double-rêve').length>0;
   }
 
   static isConnaissanceFleuve(actor) {
-    return actor.data.items.find(it => Draconique.isTeteDragon(it) && it.name.toLowerCase().includes('connaissance du fleuve'));
+    return EffetsDraconiques.filterItems(actor, Draconique.isTeteDragon, 'connaissance du fleuve').length>0;
   }
 
   static isReserveEnSecurite(actor) {
-    return actor.data.items.find(it => Draconique.isTeteDragon(it) && it.name.toLowerCase().includes(' en sécurité'));
+    return EffetsDraconiques.filterItems(actor, Draconique.isTeteDragon, 'réserve en sécurité').length>0;
   }
 
   static isDeplacementAccelere(actor) {
-    return actor.data.items.find(it => Draconique.isTeteDragon(it) && it.name.toLowerCase().includes(' déplacement accéléré'));
+    return EffetsDraconiques.filterItems(actor, Draconique.isTeteDragon, ' déplacement accéléré').length>0;
   }
 
   static isDoubleResistanceFleuve(actor) {
-    return actor.data.items.find(it => Draconique.isSouffleDragon(it) && it.name.toLowerCase().includes('résistance du fleuve'));
+    return EffetsDraconiques.filterItems(actor, Draconique.isSouffleDragon, 'résistance du fleuve').length>0;
   }
 
   static countInertieDraconique(actor) {
-    return actor.data.items.filter(it => Draconique.isQueueDragon(it) && it.name.toLowerCase().includes('inertie draconique')).length;
+    return EffetsDraconiques.filterItems(actor, Draconique.isQueueDragon, 'inertie draconique').length;
   }
 
   static countMonteeLaborieuse(actor) {
-    return actor.data.items.filter(it => Draconique.isQueueSouffle(it) && it.name.toLowerCase().includes('montée laborieuse')).length;
+    return EffetsDraconiques.filterItems(actor, Draconique.isQueueSouffle, 'montée laborieuse').length;
   }
 
   static mauvaiseRencontre(actor) {
-    return actor.data.items.find(it => Draconique.isQueueSouffle(it) && it.name.toLowerCase().includes('mauvaise rencontre'));
+    const mauvaisesRencontres = EffetsDraconiques.filterItems(actor, Draconique.isQueueSouffle, 'mauvaise rencontre');
+    return mauvaisesRencontres.length>0 ? mauvaisesRencontres[0] : undefined;
   }
 
   static isPontImpraticable(actor) {
@@ -152,7 +158,7 @@ export class EffetsDraconiques {
   }
 
   static isPeage(actor) {
-    return actor.data.items.find(it => Draconique.isSouffleDragon(it) && it.name.toLowerCase().includes('péage'));
+    return EffetsDraconiques.filterItems(actor, Draconique.isSouffleDragon, 'péage').length > 0;
   }
 
 
-- 
2.35.3


From 90d6cd15332b1ac3d1d1d429cb82c69f6fae99a6 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Wed, 11 May 2022 00:24:52 +0200
Subject: [PATCH 37/42] =?UTF-8?q?Exception=20sur=20Probl=C3=A8me=20de=20mo?=
 =?UTF-8?q?nnaies?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Le but est d'empêcher un appel en boucle si ça arrive.
En temps normal, on ne devrait jamais arriver dans ce cas.
---
 module/actor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/actor.js b/module/actor.js
index ac9edb5c..53340194 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -3587,7 +3587,7 @@ export class RdDActor extends Actor {
     let monnaies = Monnaie.filtrerMonnaies(this.data.items);
     if (monnaies.length < 4) {
       ui.notifications.error("Problème de monnaies manquantes, impossible de payer correctement!")
-      return 0;
+      throw "Problème de monnaies manquantes, impossible de payer correctement!";
     }
     return monnaies.map(m => Misc.templateData(m))
       .map(tpl => tpl.valeur_deniers * Number(tpl.quantite))
-- 
2.35.3


From 0a65f767dd3602974bbf37d01eb719cea7eb238a Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Wed, 11 May 2022 08:12:20 +0200
Subject: [PATCH 38/42] Various fixes

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index ee56f3b2..0b557cfc 100644
--- a/system.json
+++ b/system.json
@@ -29,7 +29,7 @@
   "url": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
   "flags": {},
-  "version": "1.5.68",
+  "version": "1.5.69",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
   "scripts": [],
-- 
2.35.3


From fd32c21297144e3b921e9ed7053c908670740abe Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Sat, 14 May 2022 17:28:27 +0200
Subject: [PATCH 39/42] Various fixes

---
 lang/fr.json                           |   3 +-
 module/actor-sheet.js                  |  16 ++--
 module/actor.js                        |  29 ++++---
 module/item-competencecreature.js      |   6 +-
 module/item-sheet.js                   |  12 +--
 module/item.js                         |  11 +--
 module/rdd-main.js                     |   2 +-
 module/rdd-possession.js               | 110 ++++++++++++++++---------
 module/rdd-roll.js                     |  10 ++-
 module/rdd-sheet-utility.js            |   2 +-
 module/rdd-utility.js                  |   9 +-
 system.json                            |   2 +-
 template.json                          |   2 +-
 templates/actor-sheet.html             |   2 +-
 templates/competence-carac-defaut.html |   1 +
 templates/item-possession-sheet.html   |  29 +++++++
 16 files changed, 164 insertions(+), 82 deletions(-)
 create mode 100644 templates/item-possession-sheet.html

diff --git a/lang/fr.json b/lang/fr.json
index 51bbf8db..ee3e67cb 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -40,7 +40,8 @@
     "TypeQueue": "Queue de Dragon",
     "TypeOmbre": "Ombre de Thanatos",
     "TypeSouffle": "Souffle de Dragon",
-    "TypeTete": "Tête de Dragon"
+    "TypeTete": "Tête de Dragon",
+    "TypePossession": "Possession"
   },
   "EFFECT": {
     "StatusStunned": "Sonné",
diff --git a/module/actor-sheet.js b/module/actor-sheet.js
index 75dc8495..ad72328e 100644
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -171,9 +171,10 @@ export class RdDActorSheet extends ActorSheet {
       RdDSheetUtility.splitItem(item, this.actor);
     });
     html.find('.item-edit').click(async event => {
-      const item = RdDSheetUtility.getItem(event, this.actor);
-      item.sheet.render(true);
-    });
+      const item = RdDSheetUtility.getItem(event, this.actor)
+      console.log("ITEM :", item)
+      item.sheet.render(true)
+    })
     html.find('.display-label a').click(async event => {
       const item = RdDSheetUtility.getItem(event, this.actor);
       item.sheet.render(true);
@@ -195,7 +196,7 @@ export class RdDActorSheet extends ActorSheet {
     });
 
     html.find('.item-action').click(async event => {
-      const item = RdDSheetUtility.getItem(event, this.actor);
+      const item = RdDSheetUtility.getItem(event, this.actor)
       this.actor.actionItem(item);
     });
     html.find('.subacteur-delete').click(async event => {
@@ -205,8 +206,11 @@ export class RdDActorSheet extends ActorSheet {
 
     html.find('.encaisser-direct').click(async event => {
       this.actor.encaisser();
-    });
-
+    })
+    html.find('.sheet-possession-attack').click(async event => {
+      const poss = RdDSheetUtility.getItem(event, this.actor)
+      this.actor.conjurerPossession(poss)
+    })
     html.find('.remise-a-neuf').click(async event => {
       if (game.user.isGM) {
         this.actor.remiseANeuf();
diff --git a/module/actor.js b/module/actor.js
index 53340194..d0585047 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -2537,18 +2537,19 @@ export class RdDActor extends Actor {
   async rollCompetence(idOrName) {
     let rollData = { competence: Misc.data(this.getCompetence(idOrName)) }
 
-    //console.log("COMP CREATURE", name, rollData, name);
     if (rollData.competence.type == 'competencecreature') {
       if (rollData.competence.data.iscombat) {
-        const arme = RdDItemCompetenceCreature.toArme(rollData.competence);
-        RdDCombat.createUsingTarget(this).attaque(rollData.competence, arme);
-        return;
+        if (rollData.competence.data.ispossession) {
+          RdDPossession.managePossession(this, rollData.competence)
+        } else {
+          const arme = RdDItemCompetenceCreature.toArme(rollData.competence)
+          RdDCombat.createUsingTarget(this)?.attaque(competence, arme)
+        }
+        return
       }
-      //console.log("COMP CREATURE2");
       // Fake competence pour créature
-      RdDItemCompetenceCreature.setRollDataCreature(rollData);
-    }
-    else {
+      RdDItemCompetenceCreature.setRollDataCreature(rollData)
+    } else {
       rollData.carac = Misc.templateData(this).carac;
     }
     console.log("rollCompetence !!!", rollData);
@@ -2565,6 +2566,12 @@ export class RdDActor extends Actor {
     dialog.render(true);
   }
 
+  /* -------------------------------------------- */
+  conjurerPossession(possession) {
+    let draconic = this.getBestDraconic()
+    RdDPossession.managePossession(this, draconic, possession)
+  }
+
   /* -------------------------------------------- */
   async _competenceResult(rollData) {
     await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-competence.html')
@@ -2599,8 +2606,8 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   async rollTache(id) {
     const actorData = Misc.data(this);
-    const tacheData = Misc.data(this.getTache(id));
-    const compData = Misc.data(this.getCompetence(tacheData.data.competence));
+    const tacheData = Misc.data(this.getTache(id))
+    const compData = Misc.data(this.getCompetence(tacheData.data.competence))
     compData.data.defaut_carac = tacheData.data.carac; // Patch !
 
     let rollData = {
@@ -3202,7 +3209,7 @@ export class RdDActor extends Actor {
     let competence = Misc.data(this.getCompetence(arme.data.competence));
     if (arme || (competence.type == 'competencecreature' && competence.data.iscombat)) {
       if (competence.data.ispossession) {
-        RdDPossession.managePosession(this, competence);
+        RdDPossession.managePossession(this, competence);
       } else {
         RdDCombat.createUsingTarget(this)?.attaque(competence, arme);
       }
diff --git a/module/item-competencecreature.js b/module/item-competencecreature.js
index 5a2bde73..760b7f1e 100644
--- a/module/item-competencecreature.js
+++ b/module/item-competencecreature.js
@@ -7,9 +7,9 @@ export class RdDItemCompetenceCreature extends Item {
   static setRollDataCreature(rollData) {
     rollData.competence = Misc.data(rollData.competence);
     rollData.carac = { "carac_creature": { label: rollData.competence.name, value: rollData.competence.data.carac_value } };
-    rollData.competence.data.defaut_carac = "carac_creature";
-    rollData.competence.data.categorie = "creature";
-    rollData.selectedCarac =  rollData.carac.carac_creature;
+    rollData.competence.data.defaut_carac = "carac_creature"
+    rollData.competence.data.categorie = "creature"
+    rollData.selectedCarac =  rollData.carac.carac_creature
     if (rollData.competence.data.iscombat) {
       rollData.arme = RdDItemCompetenceCreature.toArme(rollData.competence);
     }
diff --git a/module/item-sheet.js b/module/item-sheet.js
index 2bade3f8..19958e8a 100644
--- a/module/item-sheet.js
+++ b/module/item-sheet.js
@@ -60,7 +60,7 @@ export class RdDItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = Misc.data(this.object);
+    const objectData = Misc.data(this.object)
     let formData = {
       id: this.object.id,
       title: objectData.name,
@@ -82,14 +82,15 @@ export class RdDItemSheet extends ItemSheet {
       }
     }
 
-    formData.categorieCompetences = RdDItemCompetence.getCategorieCompetences();
+    formData.categorieCompetences = RdDItemCompetence.getCategorieCompetences()
     if (formData.type == 'tache' || formData.type == 'livre' || formData.type == 'meditation' || formData.type == 'oeuvre') {
-      formData.caracList = duplicate(game.system.model.Actor.personnage.carac);
-      formData.competences = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.competences');
+      formData.caracList = duplicate(game.system.model.Actor.personnage.carac)
+      formData.caracList["reve-actuel"] = duplicate(game.system.model.Actor.personnage.reve.reve)
+      formData.competences = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.competences')
     }
     if (formData.type == 'arme') {
       formData.competences = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.competences', it => RdDItemCompetence.isCompetenceArme(it));
-      console.log(formData.competences);
+      console.log(formData.competences)
     }
     if (formData.type == 'recettealchimique') {
       RdDAlchimie.processManipulation(objectData, this.actor && this.actor.id);
@@ -113,6 +114,7 @@ export class RdDItemSheet extends ItemSheet {
     return formData;
   }
 
+  /* -------------------------------------------- */
   prepareConteneurData(formData) {
     formData.itemsByType = Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i.data)));
     RdDUtility.filterEquipementParType(formData);
diff --git a/module/item.js b/module/item.js
index be445e19..65b49b19 100644
--- a/module/item.js
+++ b/module/item.js
@@ -3,8 +3,8 @@ import { Grammar } from "./grammar.js";
 import { Misc } from "./misc.js";
 import { RdDUtility } from "./rdd-utility.js";
 
-const typesObjetsEquipement = ["objet", "arme", "armure", "gemme", "conteneur", "herbe", "ingredient", "livre", "potion", "munition", "nourritureboisson", "monnaie"];
-const typesObjetsOeuvres = ["oeuvre", "recettecuisine", "musique", "chant", "danse", "jeu"];
+const typesObjetsEquipement = ["objet", "arme", "armure", "gemme", "conteneur", "herbe", "ingredient", "livre", "potion", "munition", "nourritureboisson", "monnaie"]
+const typesObjetsOeuvres = ["oeuvre", "recettecuisine", "musique", "chant", "danse", "jeu"]
 const encBrin = 0.00005;// un brin = 1 décigramme = 1/10g = 1/10000kg = 1/20000 enc
 
 export const defaultItemImg = {
@@ -34,7 +34,8 @@ export const defaultItemImg = {
   oeuvre: "systems/foundryvtt-reve-de-dragon/icons/competence_comedie.webp",
   nourritureboisson: "systems/foundryvtt-reve-de-dragon/icons/objets/provision_crue.webp",
   signedraconique: "systems/foundryvtt-reve-de-dragon/icons/tmr/signe_draconique.webp",
-  gemme: "systems/foundryvtt-reve-de-dragon/icons/gemmes/almaze.webp"
+  gemme: "systems/foundryvtt-reve-de-dragon/icons/gemmes/almaze.webp",
+  possession: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp"
 }
 
 /* -------------------------------------------- */
@@ -48,11 +49,11 @@ export class RdDItem extends Item {
   }
 
   static getTypeObjetsEquipement() {
-    return typesObjetsEquipement;
+    return typesObjetsEquipement
   }
 
   static getTypesOeuvres() {
-    return typesObjetsOeuvres;
+    return typesObjetsOeuvres
   }
 
   isCompetence() {
diff --git a/module/rdd-main.js b/module/rdd-main.js
index ba58e175..199972cc 100644
--- a/module/rdd-main.js
+++ b/module/rdd-main.js
@@ -183,7 +183,7 @@ Hooks.once("init", async function () {
   Items.registerSheet(SYSTEM_RDD, RdDItemSheet, {
     types: ["arme", "armure", "objet", "arme", "armure", "conteneur", "competence", "sort", "herbe", "ingredient", "livre", "potion", "munition", "rencontresTMR", "queue", "ombre", "souffle",
       "tete", "competencecreature", "tarot", "monnaie", "nombreastral", "tache", "meditation", "casetmr", "recettealchimique", "gemme",
-      "musique", "chant", "danse", "jeu", "recettecuisine", "maladie", "poison", "oeuvre", "nourritureboisson"], makeDefault: true
+      "musique", "chant", "danse", "jeu", "recettecuisine", "maladie", "poison", "oeuvre", "nourritureboisson", "possession"], makeDefault: true
   });
   CONFIG.Combat.documentClass = RdDCombatManager;
 
diff --git a/module/rdd-possession.js b/module/rdd-possession.js
index 4b9e0f36..d47b160e 100644
--- a/module/rdd-possession.js
+++ b/module/rdd-possession.js
@@ -5,7 +5,6 @@ import { RdDUtility } from "./rdd-utility.js";
 import { RdDCombat } from "./rdd-combat.js";
 import { RdDResolutionTable } from "./rdd-resolution-table.js";
 import { RdDRoll } from "./rdd-roll.js";
-import { RdDRollTables } from "./rdd-rolltables.js";
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
 
 /* -------------------------------------------- */
@@ -18,7 +17,7 @@ Donc la compétence Possession ne peut être démarrée que par le MJ.
 export class RdDPossession {
 
   /* -------------------------------------------- */
-  static init() {
+  static init() {    
   }
 
   /* -------------------------------------------- */
@@ -35,10 +34,10 @@ export class RdDPossession {
     possession.ptsConjuration = 0;
     possession.ptsPossession = 0;
     if ( possession.data.compteur > 0) {
-      possession.ptsPossession = possession.data.compteur;
+      possession.ptsPossession = possession.data.compteur
     } 
     if ( possession.data.compteur < 0) {
-      possession.ptsConjuration = Math.abs(possession.data.compteur);
+      possession.ptsConjuration = Math.abs(possession.data.compteur)
     } 
     if (possession.ptsPossession >= 2 ) {
       // Possede
@@ -51,33 +50,61 @@ export class RdDPossession {
 
   /* -------------------------------------------- */
   static async resultConjuration( rollData) {
-    console.log("RollData!!!", rollData);
-    if ( !rollData.rolled.isSuccess  ) {
-      rollData.possession.data.compteur++;
+    console.log("RollData!!!", rollData)
+    if ( !rollData.rolled.isSuccess ) {
+      if( rollData.isECNIDefender) {
+        rollData.possession.data.compteur--
+      } else {
+        rollData.possession.data.compteur++
+      }
+      let actor = game.actors.get(rollData.possession.data.possedeid)
+      let update = { _id: rollData.possession._id, "data.compteur": rollData.possession.data.compteur }
+      await this.updateEmbeddedDocuments('Item', [update])
     }
-    this.updateEtatPossession(rollData.possession);
-    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-possession.html');
+      
+    this.updateEtatPossession(rollData.possession)
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-possession.html')
   }
 
   /* -------------------------------------------- */
-  static async onDefensePossession( actorId, possessionId) {
-    let actor = game.actors.get(actorId);
-    console.log("onDefensePossession", actor, possessionId);
-    let possession = duplicate(actor.items.find( item => item.type =='possession' && item.data.data.possessionid == possessionId));
-    let attacker = game.actors.get(possession.data.possesseurid);
+  static async onDefensePossession( attackerId, defenderId, possessionId) {
+    let attacker = game.actors.get(attackerId)
+    let defender = game.actors.get(defenderId)
+
+    let possession = attacker.items.find( item => item.type =='possession' && item.data.data.possessionid == possessionId)
+    if ( !possession ) {    
+      possession = defender.items.find( item => item.type =='possession' && item.data.data.possessionid == possessionId)
+      if ( !possession) {
+        ui.notifications.warn("Une erreur s'est produite : Aucune possession trouvée !!")
+        return
+      }
+    }
+    possession = duplicate(possession)
 
     // Update for draconic roll
     let rollData = {
       possession: possession
     }
-    rollData.actor = actor;
-    rollData.competence = duplicate(actor.getDraconicOrZero());
-    rollData.competence.data.defaut_carac = 'reve-actuel';
-    rollData.forceCarac = { 'reve-actuel': { label: "Rêve Actuel", value: actor.getReveActuel() } }
-    rollData.mode =  "conjuration";
-    rollData.possesseur = attacker.name;
+    rollData.actor = defender
+    if ( defender.type == "personnage") {
+      rollData.competence = duplicate(defender.getDraconicOrZero())
+      rollData.competence.data.defaut_carac = 'reve-actuel'
+      rollData.forceCarac = { 'reve-actuel': { label: "Rêve Actuel", value: actor.getReveActuel() } }
+      rollData.selectedCarac = defender.data.data.carac.reve
+      rollData.isECNIDefender = false
+    } else {
+      rollData.competence = duplicate(defender.getCompetence("Possession"))
+      rollData.competence.data.defaut_carac = "reve"
+      rollData.forceCarac = { 'reve': { label: "Rêve", value: defender.data.data.carac.reve.value } }
+      rollData.selectedCarac = defender.data.data.carac.reve
+      rollData.isECNIDefender = true
+      //RdDItemCompetenceCreature.setRollDataCreature( rollData )
+    }
+    rollData.mode =  "conjuration"
+    rollData.possesseur = attacker.name
+    console.log("onDefensePossession", rollData)
 
-    const dialog = await RdDRoll.create(actor, rollData,
+    const dialog = await RdDRoll.create(defender, rollData,
       {
         html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-defense-possession.html',
         options: { height: 400 }
@@ -90,21 +117,21 @@ export class RdDPossession {
         ]
       }
     );
-    dialog.render(true);
+    dialog.render(true)
   }
 
   /* -------------------------------------------- */
   static async _onRollPossession( rollData, isSuccess ) {
-    let possession = rollData.possession;
-    possession.isSuccess = isSuccess;
-    this.updateEtatPossession( possession);
+    let possession = rollData.possession
+    possession.isSuccess = isSuccess
+    this.updateEtatPossession( possession)
     await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-possession.html');
   }
 
   /* -------------------------------------------- */
-  static async managePosession(attacker, competence ) {    
+  static async managePossession(attacker, competence, possession=undefined) {    
     
-    const target = RdDCombat.getTarget();
+    const target = RdDCombat.getTarget()
     if (target == undefined) {
       ui.notifications.warn((game.user.targets?.size ?? 0) > 1
         ? "Vous devez choisir <strong>une seule</strong> cible à posséder!"
@@ -112,13 +139,16 @@ export class RdDPossession {
       return;
     }    
     
-    const defender = target.actor;
-    let possession = this.searchPossessionFromEntite( attacker, defender);
+    const defender = target.actor
     if ( !possession) {
-      possession = this.createPossession(attacker, defender);
+      possession = this.searchPossessionFromEntite( attacker, defender)
+      if ( !possession) {
+        possession = this.createPossession(attacker, defender)
+      }
     }
+    possession = duplicate(possession)
 
-    this.updateEtatPossession(possession);
+    this.updateEtatPossession(possession)
     let rollData = {
       competence: competence,
       possession: possession,
@@ -129,9 +159,9 @@ export class RdDPossession {
       mode: "possession"
     };
     if ( attacker.isCreature()) {
-      RdDItemCompetenceCreature.setRollDataCreature(rollData);
+      RdDItemCompetenceCreature.setRollDataCreature(rollData)
     }
-    console.log("Creation de possession2", attacker, rollData);
+    console.log("Creation de possession2", attacker, rollData)
 
     const dialog = await RdDRoll.create( attacker, rollData,
       {
@@ -145,19 +175,19 @@ export class RdDPossession {
         { condition: r => (r.rolled.isEchec), action: async r => await this._onRollPossession(r, false) },
       ]
     });
-    dialog.render(true);
+    dialog.render(true)
   }
 
   /* -------------------------------------------- */
   static async createPossession( attacker, defender ) {
-    let posessionData = {
-      name: "Possession en cours", type: 'possession',
+    let possessionData = {
+      name: "Possession en cours de " + attacker.name, type: 'possession',
       img: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp",
-      data: { description: "", possede: false, possessionid: randomID(16), possesseurid: attacker.data._id, possedeid: defender.data._id, date: 0 }
+      data: { description: "", typepossession: attacker.name, possede: false, possessionid: randomID(16), possesseurid: attacker.data._id, possedeid: defender.data._id, date: 0, compteur: 0 }
     }
-    await attacker.createEmbeddedDocuments('Item', [posessionData])
-    let poss = await defender.createEmbeddedDocuments('Item', [posessionData])
-    return duplicate(poss[0]);
+    // Creates only the possession on the personnage side
+    let poss = await defender.createEmbeddedDocuments('Item', [possessionData])
+    return duplicate(poss[0])
   }
 
 }
\ No newline at end of file
diff --git a/module/rdd-roll.js b/module/rdd-roll.js
index 41c38ff5..6f4b8a66 100644
--- a/module/rdd-roll.js
+++ b/module/rdd-roll.js
@@ -64,7 +64,11 @@ export class RdDRoll extends Dialog {
       canClose: true,
       isGM: game.user.isGM,
       forceDiceResult: -1
-    };
+    }
+    // Mini patch :Ajout du rêve actuel
+    if ( actorData.type == "personnage") {
+      defaultRollData.carac["reve-actuel"] = actorData.data.reve.reve
+    }
 
     mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
     if (rollData.forceCarac) {
@@ -298,8 +302,8 @@ export class RdDRoll extends Dialog {
   async updateRollResult() {
     let rollData = this.rollData;
 
-    rollData.dmg = rollData.attackerRoll?.dmg ?? RdDBonus.dmg(rollData, this.actor.getBonusDegat());
-    rollData.caracValue = parseInt(rollData.selectedCarac.value);
+    rollData.dmg = rollData.attackerRoll?.dmg ?? RdDBonus.dmg(rollData, this.actor.getBonusDegat())
+    rollData.caracValue = parseInt(rollData.selectedCarac.value)
     rollData.mortalite = rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite ?? 'mortel';
     rollData.coupsNonMortels = (rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite) == 'non-mortel';
     rollData.use.appelAuMoral = this.actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac);
diff --git a/module/rdd-sheet-utility.js b/module/rdd-sheet-utility.js
index 8db1ce1a..fe05a78c 100644
--- a/module/rdd-sheet-utility.js
+++ b/module/rdd-sheet-utility.js
@@ -4,7 +4,7 @@ import { Misc } from "./misc.js";
 export class RdDSheetUtility {
 
   static getItem(event, actor) {
-    return actor.items.get(RdDSheetUtility.getItemId(event));
+    return actor.items.get(RdDSheetUtility.getItemId(event))
   }
 
   static getItemId(event) {
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 5ee377a4..1c43cdc8 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -147,6 +147,7 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/item-meditation-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-nourritureboisson-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-signedraconique-sheet.html',
+      'systems/foundryvtt-reve-de-dragon/templates/item-possession-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/competence-carac-defaut.html',
       'systems/foundryvtt-reve-de-dragon/templates/competence-base.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.html',
@@ -473,6 +474,7 @@ export class RdDUtility {
     return str;
   }
 
+  /* -------------------------------------------- */
   static buildContenu(objet, niveau, afficherContenu) {
     if (!niveau) niveau = 1;
     objet.niveau = niveau;
@@ -692,9 +694,10 @@ export class RdDUtility {
 
     // gestion bouton tchat Acheter
     html.on("click", '.defense-possession', event => {
-      let actorId = event.currentTarget.attributes['data-defenderId'].value;
-      let possessionId = event.currentTarget.attributes['data-possessionId'].value;
-      RdDPossession.onDefensePossession(actorId, possessionId);
+      let attackerId = event.currentTarget.attributes['data-attackerId'].value
+      let defenderId = event.currentTarget.attributes['data-defenderId'].value
+      let possessionId = event.currentTarget.attributes['data-possessionId'].value
+      RdDPossession.onDefensePossession(attackerId, defenderId, possessionId)
     });
 
     // gestion bouton tchat Acheter
diff --git a/system.json b/system.json
index 0b557cfc..75593302 100644
--- a/system.json
+++ b/system.json
@@ -29,7 +29,7 @@
   "url": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
   "flags": {},
-  "version": "1.5.69",
+  "version": "1.5.71",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
   "scripts": [],
diff --git a/template.json b/template.json
index 0157db96..45b0ac5c 100644
--- a/template.json
+++ b/template.json
@@ -578,7 +578,7 @@
             "musique", "chant", "danse", "jeu", "recettecuisine", "maladie", "poison", "oeuvre", "nourritureboisson", "signedraconique", "gemme", 
             "possession" ],
   "possession": {
-    "type": "",
+    "typepossession": "",
     "possede": false,
     "possessionid": "",
     "possesseurid": "",
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index ebff24e6..d151bd16 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -366,7 +366,7 @@
           {{#each possessions as |possession  key|}}
             <li class="item flexrow list-item" data-item-id="{{possession._id}}">
                 <span class="competence-label">
-                  {{possession.name}}
+                  <a class="sheet-possession-attack">{{possession.name}} (Conjurer)</a>
                 </span>
                 <span class="competence-label">{{possession.data.type}}</span>
                 <div class="item-controls">
diff --git a/templates/competence-carac-defaut.html b/templates/competence-carac-defaut.html
index c7c4d740..3c68c3fc 100644
--- a/templates/competence-carac-defaut.html
+++ b/templates/competence-carac-defaut.html
@@ -15,3 +15,4 @@
 <option value="tir">Tir</option>
 <option value="lancer">Lancer</option>
 <option value="derobee">Dérobée</option>
+<option value="reve-actuel">Rêve Actuel</option>
diff --git a/templates/item-possession-sheet.html b/templates/item-possession-sheet.html
new file mode 100644
index 00000000..011a1e0f
--- /dev/null
+++ b/templates/item-possession-sheet.html
@@ -0,0 +1,29 @@
+<form class="{{cssClass}}" autocomplete="off">
+    <header class="sheet-header">
+        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <div class="header-fields">
+            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+        </div>
+    </header>
+    
+    {{!-- Sheet Body --}}
+    <section class="sheet-body">
+        <div class="form-group">
+          <label for="xp">Type de possession </label>
+          <input class="attribute-value" type="text" name="data.typepossession" value="{{data.typepossession}}" data-dtype="String"/>
+        </div>
+        <div class="form-group">
+          <label for="xp">Possédé ? </label>
+          <input class="attribute-value" type="checkbox" name="data.istrue"  {{#if data.istrue}}checked{{/if}}/>
+        </div>
+        <div class="form-group">
+          <label for="xp">Compteur </label>
+          <input class="attribute-value" type="text" name="data.compteur" value="{{data.compteur}}" data-dtype="Number"/>
+        </div>
+  
+      
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+    
+    </section>
+    
+</form>
-- 
2.35.3


From 7cae820a403bb64decab057e6729450789967cd2 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Sat, 14 May 2022 20:25:47 +0200
Subject: [PATCH 40/42] Various fixes

---
 module/rdd-possession.js                | 23 ++++++++++-------------
 system.json                             |  2 +-
 templates/chat-resultat-possession.html |  7 +++++++
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/module/rdd-possession.js b/module/rdd-possession.js
index d47b160e..28b41e84 100644
--- a/module/rdd-possession.js
+++ b/module/rdd-possession.js
@@ -1,7 +1,4 @@
 /* -------------------------------------------- */
-import { Misc } from "./misc.js";
-import { RdDDice } from "./rdd-dice.js";
-import { RdDUtility } from "./rdd-utility.js";
 import { RdDCombat } from "./rdd-combat.js";
 import { RdDResolutionTable } from "./rdd-resolution-table.js";
 import { RdDRoll } from "./rdd-roll.js";
@@ -31,21 +28,23 @@ export class RdDPossession {
 
   /* -------------------------------------------- */
   static updateEtatPossession( possession ) {
-    possession.ptsConjuration = 0;
-    possession.ptsPossession = 0;
+    possession.ptsConjuration = 0
+    possession.ptsPossession = 0
+    console.log("Possession", possession)
     if ( possession.data.compteur > 0) {
       possession.ptsPossession = possession.data.compteur
     } 
     if ( possession.data.compteur < 0) {
       possession.ptsConjuration = Math.abs(possession.data.compteur)
     } 
+    possession.isPosseder = false
+    possession.isConjurer = false
     if (possession.ptsPossession >= 2 ) {
-      // Possede
+      possession.isPosseder = true
     }
     if (possession.ptsConjuration <= -2 ) {      
-      // Libere
+      possession.isConjurer = true
     }
-    console.log("Poss", possession);
   }
 
   /* -------------------------------------------- */
@@ -59,7 +58,7 @@ export class RdDPossession {
       }
       let actor = game.actors.get(rollData.possession.data.possedeid)
       let update = { _id: rollData.possession._id, "data.compteur": rollData.possession.data.compteur }
-      await this.updateEmbeddedDocuments('Item', [update])
+      await actor.updateEmbeddedDocuments('Item', [update])
     }
       
     this.updateEtatPossession(rollData.possession)
@@ -89,7 +88,7 @@ export class RdDPossession {
     if ( defender.type == "personnage") {
       rollData.competence = duplicate(defender.getDraconicOrZero())
       rollData.competence.data.defaut_carac = 'reve-actuel'
-      rollData.forceCarac = { 'reve-actuel': { label: "Rêve Actuel", value: actor.getReveActuel() } }
+      rollData.forceCarac = { 'reve-actuel': { label: "Rêve Actuel", value: defender.getReveActuel() } }
       rollData.selectedCarac = defender.data.data.carac.reve
       rollData.isECNIDefender = false
     } else {
@@ -102,7 +101,6 @@ export class RdDPossession {
     }
     rollData.mode =  "conjuration"
     rollData.possesseur = attacker.name
-    console.log("onDefensePossession", rollData)
 
     const dialog = await RdDRoll.create(defender, rollData,
       {
@@ -143,7 +141,7 @@ export class RdDPossession {
     if ( !possession) {
       possession = this.searchPossessionFromEntite( attacker, defender)
       if ( !possession) {
-        possession = this.createPossession(attacker, defender)
+        possession = await this.createPossession(attacker, defender)
       }
     }
     possession = duplicate(possession)
@@ -161,7 +159,6 @@ export class RdDPossession {
     if ( attacker.isCreature()) {
       RdDItemCompetenceCreature.setRollDataCreature(rollData)
     }
-    console.log("Creation de possession2", attacker, rollData)
 
     const dialog = await RdDRoll.create( attacker, rollData,
       {
diff --git a/system.json b/system.json
index 75593302..6543f759 100644
--- a/system.json
+++ b/system.json
@@ -29,7 +29,7 @@
   "url": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
   "flags": {},
-  "version": "1.5.71",
+  "version": "1.5.72",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
   "scripts": [],
diff --git a/templates/chat-resultat-possession.html b/templates/chat-resultat-possession.html
index 9b0c6d7c..93c80e92 100644
--- a/templates/chat-resultat-possession.html
+++ b/templates/chat-resultat-possession.html
@@ -30,4 +30,11 @@
     {{/if}}
     <br>Points de Possession: {{possession.ptsPossession}}
     <br>Points de Conjuration: {{possession.ptsConjuration}}
+
+    {{#is isPosseder}}
+    <br><strong>Vous êtes été possédé par {{possesseur}} !</strong>
+    {{/if}}
+    {{#is isConjurer}}
+    <br><strong>Vous avez conjuré {{possesseur}} !</strong>
+    {{/if}}
 </div>
-- 
2.35.3


From 6d00efa70e9884c5fbdcd27fff815389b230177a Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Sat, 14 May 2022 20:27:26 +0200
Subject: [PATCH 41/42] Various fixes

---
 system.json                             | 2 +-
 templates/chat-resultat-possession.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system.json b/system.json
index 6543f759..c7f87455 100644
--- a/system.json
+++ b/system.json
@@ -29,7 +29,7 @@
   "url": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
   "flags": {},
-  "version": "1.5.72",
+  "version": "1.5.73",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
   "scripts": [],
diff --git a/templates/chat-resultat-possession.html b/templates/chat-resultat-possession.html
index 93c80e92..f67ee6da 100644
--- a/templates/chat-resultat-possession.html
+++ b/templates/chat-resultat-possession.html
@@ -31,10 +31,10 @@
     <br>Points de Possession: {{possession.ptsPossession}}
     <br>Points de Conjuration: {{possession.ptsConjuration}}
 
-    {{#is isPosseder}}
+    {{#if isPosseder}}
     <br><strong>Vous êtes été possédé par {{possesseur}} !</strong>
     {{/if}}
-    {{#is isConjurer}}
+    {{#if isConjurer}}
     <br><strong>Vous avez conjuré {{possesseur}} !</strong>
     {{/if}}
 </div>
-- 
2.35.3


From 54d546b94104d8c5c2b4fd378bcb1462515a3343 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Sat, 14 May 2022 20:39:01 +0200
Subject: [PATCH 42/42] Various fixes

---
 module/actor.js                         | 2 +-
 module/rdd-possession.js                | 8 +++++---
 system.json                             | 2 +-
 templates/chat-resultat-possession.html | 8 ++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index d0585047..5e97c81e 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -3748,7 +3748,7 @@ export class RdDActor extends Actor {
       vendeur.ajouterDeniers(coutDeniers);
       let resteQuantite = (itemVendu.data.quantite ?? 1) - achat.quantiteTotal;
       if (resteQuantite == 0) {
-        vendeur.deleteEmbeddedDocuments("Item", [itemId]);
+        vendeur.deleteEmbeddedDocuments("Item", [itemId])
       }
       else {
         vendeur.updateEmbeddedDocuments("Item", [{ _id: itemId, 'data.quantite': resteQuantite }]);
diff --git a/module/rdd-possession.js b/module/rdd-possession.js
index 28b41e84..44a02423 100644
--- a/module/rdd-possession.js
+++ b/module/rdd-possession.js
@@ -42,27 +42,29 @@ export class RdDPossession {
     if (possession.ptsPossession >= 2 ) {
       possession.isPosseder = true
     }
-    if (possession.ptsConjuration <= -2 ) {      
+    if (possession.ptsConjuration >= 2 ) {      
       possession.isConjurer = true
     }
   }
 
   /* -------------------------------------------- */
   static async resultConjuration( rollData) {
-    console.log("RollData!!!", rollData)
+    let actor = game.actors.get(rollData.possession.data.possedeid)
     if ( !rollData.rolled.isSuccess ) {
       if( rollData.isECNIDefender) {
         rollData.possession.data.compteur--
       } else {
         rollData.possession.data.compteur++
       }
-      let actor = game.actors.get(rollData.possession.data.possedeid)
       let update = { _id: rollData.possession._id, "data.compteur": rollData.possession.data.compteur }
       await actor.updateEmbeddedDocuments('Item', [update])
     }
       
     this.updateEtatPossession(rollData.possession)
     await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-possession.html')
+    if ( rollData.possession.isPosseder || rollData.possession.isConjurer) {
+      actor.deleteEmbeddedDocuments("Item", [rollData.possession._id])
+    }
   }
 
   /* -------------------------------------------- */
diff --git a/system.json b/system.json
index c7f87455..9b12c78d 100644
--- a/system.json
+++ b/system.json
@@ -29,7 +29,7 @@
   "url": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
   "flags": {},
-  "version": "1.5.73",
+  "version": "1.5.74",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
   "scripts": [],
diff --git a/templates/chat-resultat-possession.html b/templates/chat-resultat-possession.html
index f67ee6da..025ba08a 100644
--- a/templates/chat-resultat-possession.html
+++ b/templates/chat-resultat-possession.html
@@ -31,10 +31,10 @@
     <br>Points de Possession: {{possession.ptsPossession}}
     <br>Points de Conjuration: {{possession.ptsConjuration}}
 
-    {{#if isPosseder}}
-    <br><strong>Vous êtes été possédé par {{possesseur}} !</strong>
+    {{#if possession.isPosseder}}
+    <br><strong>Vous êtes été possédé par {{possession.data.typepossession}} ! La possession en cours a été supprimée.</strong>
     {{/if}}
-    {{#if isConjurer}}
-    <br><strong>Vous avez conjuré {{possesseur}} !</strong>
+    {{#if possession.isConjurer}}
+    <br><strong>Vous avez conjuré {{possession.data.typepossession}} ! La possession en cours a été supprimée.</strong>
     {{/if}}
 </div>
-- 
2.35.3