From 7e1bbcada0d72dff08f36a77c7ddf358cf9b675e Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Mon, 26 Sep 2022 03:36:18 +0200
Subject: [PATCH] =?UTF-8?q?S=C3=A9paration=20actor-sheet=20en=20sous-parti?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/actor-sheet.js                         |   1 -
 module/rdd-utility.js                         |  27 +-
 styles/simple.css                             |   6 +
 templates/actor-sheet-alchimie.html           |  13 +
 templates/actor-sheet-astrologie.html         |   2 +
 templates/actor-sheet-blessures.html          |   3 +-
 templates/actor-sheet-combat.html             |  46 +--
 templates/actor-sheet-haut-revant.html        |  35 ++
 templates/actor-sheet-hr-casestmr.html        |  15 +
 templates/actor-sheet-hr-meditations.html     |  15 +
 templates/actor-sheet-hr-rencontres.html      |  17 +
 .../actor-sheet-hr-signes-draconiques.html    |  15 +
 templates/actor-sheet-hr-sorts-reserve.html   |  15 +
 templates/actor-sheet-hr-sorts.html           |  19 ++
 templates/actor-sheet-jeux.html               |  13 +
 templates/actor-sheet-maladies-poisons.html   |  34 ++
 templates/actor-sheet-non-haut-revant.html    |  26 ++
 templates/actor-sheet-oeuvres.html            |  18 +
 templates/actor-sheet-possessions.html        |  22 ++
 templates/actor-sheet-queues.html             |   2 +-
 templates/actor-sheet-souffles.html           |  14 +
 templates/actor-sheet-taches.html             |  16 +
 templates/actor-sheet-tetes.html              |  14 +
 templates/actor-sheet-xp-competences.html     |  23 ++
 templates/actor-sheet-xp-journal.html         |  13 +
 templates/actor-sheet.html                    | 319 ++----------------
 26 files changed, 414 insertions(+), 329 deletions(-)
 create mode 100644 templates/actor-sheet-alchimie.html
 create mode 100644 templates/actor-sheet-astrologie.html
 create mode 100644 templates/actor-sheet-haut-revant.html
 create mode 100644 templates/actor-sheet-hr-casestmr.html
 create mode 100644 templates/actor-sheet-hr-meditations.html
 create mode 100644 templates/actor-sheet-hr-rencontres.html
 create mode 100644 templates/actor-sheet-hr-signes-draconiques.html
 create mode 100644 templates/actor-sheet-hr-sorts-reserve.html
 create mode 100644 templates/actor-sheet-hr-sorts.html
 create mode 100644 templates/actor-sheet-jeux.html
 create mode 100644 templates/actor-sheet-maladies-poisons.html
 create mode 100644 templates/actor-sheet-non-haut-revant.html
 create mode 100644 templates/actor-sheet-oeuvres.html
 create mode 100644 templates/actor-sheet-possessions.html
 create mode 100644 templates/actor-sheet-souffles.html
 create mode 100644 templates/actor-sheet-taches.html
 create mode 100644 templates/actor-sheet-tetes.html
 create mode 100644 templates/actor-sheet-xp-competences.html
 create mode 100644 templates/actor-sheet-xp-journal.html

diff --git a/module/actor-sheet.js b/module/actor-sheet.js
index fb21e9e6..ec0b9885 100644
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -105,7 +105,6 @@ export class RdDActorSheet extends ActorSheet {
     formData.hautreve = {
       isDemiReve: this.actor.getEffect(STATUSES.StatusDemiReve),
       rencontres: duplicate(formData.system.reve.rencontre.list),
-      casesTmr: formData.itemsByType.casetmr,
       cacheTMR: this.actor.isTMRCache()
     }
 
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 905694ff..200ccc2d 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -115,15 +115,36 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html',
+      // sous-parties de feuilles de personnages
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-effects-partial.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-xp-competences.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-combat.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessures.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessure.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-maladies-poisons.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-possessions.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-actor-sheet-taches.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-taches.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvres.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-jeux.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-alchimie.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-astrologie.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-non-haut-revant.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-haut-revant.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html',
-      // Conteneur/item in Actor sheet
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-souffles.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-tetes.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-signes-draconiques.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-rencontres.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-sorts.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-sorts-reserve.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-meditations.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-casestmr.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-xp-journal.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-item-queue.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html',
@@ -131,7 +152,6 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-suivants.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html',
       //Items
       'systems/foundryvtt-reve-de-dragon/templates/header-item.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-competence-sheet.html',
@@ -374,6 +394,7 @@ export class RdDUtility {
     RdDUtility.filterEquipementParType(formData);
 
     formData.sorts = this.arrayOrEmpty(formData.itemsByType['sort']);
+    formData.casestmr = this.arrayOrEmpty(formData.itemsByType['casetmr']);
     formData.signesdraconiques = this.arrayOrEmpty(formData.itemsByType['signedraconique']);
     formData.queues = this.arrayOrEmpty(formData.itemsByType['queue']);
     formData.souffles = this.arrayOrEmpty(formData.itemsByType['souffle']);
diff --git a/styles/simple.css b/styles/simple.css
index 70c7a19c..67ec038f 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -937,6 +937,12 @@ ul, li {
   margin-right: 0.2rem;
   margin-left: 0.2rem;
 }
+.initiative-value {
+  flex-grow: 0;
+  flex-basis: 3rem;
+  margin-right: 0.2rem;
+  margin-left: 0.2rem;
+}
 .description-value {
   flex-grow: 0;
   flex-basis: 4rem;
diff --git a/templates/actor-sheet-alchimie.html b/templates/actor-sheet-alchimie.html
new file mode 100644
index 00000000..7a27fb7a
--- /dev/null
+++ b/templates/actor-sheet-alchimie.html
@@ -0,0 +1,13 @@
+{{#if recettesAlchimiques.length}}
+<h3>Recettes Alchimiques</h3>
+<ul class="item-list alterne-list">
+  {{#each recettesAlchimiques as |recette id|}}
+  <li class="item flexrow list-item" data-item-id="{{recette._id}}"><span class="competence-title recette-label item-edit"><a>{{recette.name}}</a></span>
+    <div class="item-controls flex-shrink">
+      <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet-astrologie.html b/templates/actor-sheet-astrologie.html
new file mode 100644
index 00000000..d5094e1e
--- /dev/null
+++ b/templates/actor-sheet-astrologie.html
@@ -0,0 +1,2 @@
+<h3>Astrologie</h3>
+<span class="astrologie-label"><a id="jet-astrologie">Astrologie : Nombres Astraux</a></span>
diff --git a/templates/actor-sheet-blessures.html b/templates/actor-sheet-blessures.html
index ec809d1f..b6853800 100644
--- a/templates/actor-sheet-blessures.html
+++ b/templates/actor-sheet-blessures.html
@@ -1,7 +1,6 @@
-<h3>Blessures:</h3>
 <ul class="item-list alterne-list">
   <li class="competence-header flexrow" >
-    <span>Blessure</span>
+    <span>Blessures</span>
     <span>Premiers soins</span>
     <span>Soins complets</span>
     <span>Age (jours)</span>
diff --git a/templates/actor-sheet-combat.html b/templates/actor-sheet-combat.html
index 3b33cba9..b7fed5fd 100644
--- a/templates/actor-sheet-combat.html
+++ b/templates/actor-sheet-combat.html
@@ -1,30 +1,32 @@
-<h3 class="blessures-title">Armes et Défenses:</h3>
 <ul class="item-list alterne-list">
   <li class="competence-header flexrow">
-    <span class="competence-title competence-label">Armes</span>
-    <span class="competence-title competence-label">Initiative</span>
-    <span class="competence-title competence-label">Comp.</span>
+    <span class="competence-title competence-label">Armes et Défenses</span>
     <span class="competence-title competence-value">Niveau</span>
     <span class="competence-title competence-value">+dom</span>
+    <span class="competence-title competence-value"></span>
+    <span class="competence-title initiative-value">Initiative</span>
   </li>
 {{#each combat as |arme key|}}
-  <li class="item flexrow list-item" data-item-id="{{arme._id}}"
-      data-arme-name="{{arme.name}}" data-competence-name="{{arme.system.competence}}" >
-      <span class="arme-label">
-        <a>
-          {{#if arme.img}}
-          <img class="sheet-competence-img" src="{{arme.img}}"/>
-          {{/if}}
-          <span>{{arme.name}}</span>
-        </a>
-      </span>
-      <span class="arme-initiative"><a>{{arme.system.initiative}}</a></span>
-      <span class="competence-label">{{arme.system.competence}}</span>
-      <span class="competence-value">{{numberFormat arme.system.niveau decimals=0 sign=true}}</span>
-      <span class="competence-value">{{numberFormat arme.system.dommagesReels decimals=0 sign=true}}</span>
+  <li class="item flexrow list-item"
+      data-item-id="{{arme._id}}"
+      data-arme-name="{{arme.name}}"
+      data-competence-name="{{arme.system.competence}}" >
+    <span class="arme-label">
+      <a>
+        {{#if arme.img}}
+        <img class="sheet-competence-img" src="{{arme.img}}"/>
+        {{/if}}
+        <span>{{arme.name}}</span>
+      </a>
+      ({{arme.system.competence}})
+    </span>
+    <span class="competence-value">{{numberFormat arme.system.niveau decimals=0 sign=true}}</span>
+    <span class="competence-value">{{numberFormat arme.system.dommagesReels decimals=0 sign=true}}</span>
+    <span class="competence-value"></span>
+    <span class="initiative-value arme-initiative"><a>{{arme.system.initiative}}</a></span>
   </li>
-{{/each}}
-{{#each esquives as |esq key|}}
+  {{/each}}
+  {{#each esquives as |esq key|}}
   <li class="item flexrow list-item" data-item-id="{{esq._id}}">
     <span class="competence-label">
       <a class="competence-label" name="{{esq.name}}">
@@ -32,10 +34,10 @@
         <span>{{esq.name}}</span>
       </a>
     </span>
-    <span class="arme-initiative"></span>
-    <span class="competence-label"></span>
     <span class="competence-value">{{numberFormat esq.system.niveau decimals=0 sign=true}}</span>
     <span class="competence-value"></span>
+    <span class="competence-value"></span>
+    <span class="initiative-value"></span>
   </li>
 {{/each}}
 </ul>
\ No newline at end of file
diff --git a/templates/actor-sheet-haut-revant.html b/templates/actor-sheet-haut-revant.html
new file mode 100644
index 00000000..2d06671d
--- /dev/null
+++ b/templates/actor-sheet-haut-revant.html
@@ -0,0 +1,35 @@
+{{#if options.isGM}}
+<li class="item flexrow">
+  <span>
+    <a class="chat-card-button forcer-tmr-aleatoire">Ré-insertion aléatoire (ie TMR cachée)</a>
+  </span>
+  <span>
+    <a class="chat-card-button afficher-tmr">Montrer les TMR</a>
+  </span>
+</li>
+{{/if}}
+<li class="item flexrow">
+  <span class="competence-label flex-shrink">Demi rêve :
+  {{#if options.isGM}}
+    {{caseTmr-label system.reve.tmrpos.coord}}
+  </span><span>
+    <input class="competence-value" type="text" name="system.reve.tmrpos.coord" value="{{system.reve.tmrpos.coord}}" data-dtype="String"/>
+  {{else if hautreve.cacheTMR}}
+    {{caseTmr-type system.reve.tmrpos.coord}}
+  </span><span>
+    ??
+  {{else}}
+    {{caseTmr-label system.reve.tmrpos.coord}}
+  </span><span>
+    {{system.reve.tmrpos.coord}}
+  {{/if}}
+  </span> 
+</li>
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-non-haut-revant.html"}}
+<hr>
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-signes-draconiques.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-rencontres.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-sorts.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-sorts-reserve.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-meditations.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-casestmr.html"}}
diff --git a/templates/actor-sheet-hr-casestmr.html b/templates/actor-sheet-hr-casestmr.html
new file mode 100644
index 00000000..1c1f3fd8
--- /dev/null
+++ b/templates/actor-sheet-hr-casestmr.html
@@ -0,0 +1,15 @@
+{{#if casestmr.length}}
+  <h3>Effets sur les cases des TMR</h3>
+  <ul class="item-list alterne-list">
+    {{#each casestmr as |casetmr key|}}
+    <li class="item list-item flexrow" data-item-id="{{casetmr.id}}" data-attribute="{{key}}">
+      <img class="sheet-competence-img" src="{{casetmr.img}}" />
+      <span class="display-label"><a>{{casetmr.name}}</a></span>
+      <span>{{casetmr.system.coord}} - {{caseTmr-label casetmr.system.coord}}</span> 
+      <div class="item-controls flex-shrink">
+        <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+      </div>
+    </li>
+    {{/each}}
+  </ul>
+{{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet-hr-meditations.html b/templates/actor-sheet-hr-meditations.html
new file mode 100644
index 00000000..9f7cb1d0
--- /dev/null
+++ b/templates/actor-sheet-hr-meditations.html
@@ -0,0 +1,15 @@
+{{#if meditations.length}}
+<h3>Méditations</h3>
+<ul class="item-list">
+  {{#each meditations as |meditation key|}}
+  <li class="item flexrow" data-item-id="{{meditation._id}}" data-attribute="{{key}}">
+    <img class="sheet-competence-img" src="{{meditation.img}}" />
+    <span class="meditation-label flex-grow"><a data-item-id="{{meditation._id}}">{{meditation.name}} - {{meditation.system.competence}}</a></span> 
+    <div class="item-controls flex-shrink">
+      <a class="item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet-hr-rencontres.html b/templates/actor-sheet-hr-rencontres.html
new file mode 100644
index 00000000..f13be489
--- /dev/null
+++ b/templates/actor-sheet-hr-rencontres.html
@@ -0,0 +1,17 @@
+{{#if hautreve.rencontres.length}}
+<h3>Rencontres en attente dans les TMR</h3>
+<ul class="item-list">
+  {{#each hautreve.rencontres as |rencontre key|}}
+  <li class="item flexrow" data-item-id="{{key}}" data-attribute="{{key}}">
+    <span class="display-label"><a data-item-id="{{key}}">{{rencontre.name}} r{{rencontre.force}}</a></span> 
+    <span class="flex-shrink">{{rencontre.coord}} - {{caseTmr-label rencontre.coord}}</span> 
+    {{#if rencontre.date}}
+    <span>{{upperFirst rencontre.heure}}, le {{rencontre.date}}</span> 
+    {{/if}}
+    <div class="item-controls flex-shrink">
+      <a class="rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}
diff --git a/templates/actor-sheet-hr-signes-draconiques.html b/templates/actor-sheet-hr-signes-draconiques.html
new file mode 100644
index 00000000..1edb8f1c
--- /dev/null
+++ b/templates/actor-sheet-hr-signes-draconiques.html
@@ -0,0 +1,15 @@
+{{#if (and options.isGM signesdraconiques.length)}}
+<h3>Signes draconiques</h3>
+<ul class="item-list alterne-list">
+  {{#each signesdraconiques as |signe key|}}
+    <li class="item list-item flexrow" data-item-id="{{signe._id}}" data-attribute="{{key}}">
+      <img class="sheet-competence-img" src="{{signe.img}}" />
+      <span class="display-label flex-grow"><a>{{signe.name}}</a></span> 
+      <span class="flex-shrink">{{signe.system.difficulte}}</span>
+      <div class="item-controls flex-shrink">
+        <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+      </div>
+    </li>
+  {{/each}}
+</ul>
+{{/if}}
diff --git a/templates/actor-sheet-hr-sorts-reserve.html b/templates/actor-sheet-hr-sorts-reserve.html
new file mode 100644
index 00000000..3214bceb
--- /dev/null
+++ b/templates/actor-sheet-hr-sorts-reserve.html
@@ -0,0 +1,15 @@
+{{#if sortsReserve.length}}
+<h3>Sorts en Réserve</h3>
+<ul class="item-list alterne-list">
+  {{#each sortsReserve as |sort key|}}
+  <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
+    <img class="sheet-competence-img" src="{{sort.img}}" />
+    <span class="display-label"><a>{{#if sort.system.echectotal}}Echec total: {{/if}}{{sort.name}} r{{sort.system.ptreve}}</a></span> 
+    <span>{{sort.system.coord}} - {{caseTmr-label sort.system.coord}}</span> 
+    <div class="item-controls flex-shrink">
+      <a class="item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}
diff --git a/templates/actor-sheet-hr-sorts.html b/templates/actor-sheet-hr-sorts.html
new file mode 100644
index 00000000..8ebb8fc8
--- /dev/null
+++ b/templates/actor-sheet-hr-sorts.html
@@ -0,0 +1,19 @@
+{{#if sorts.length}}
+<h3>Sorts</h3>
+<ul class="item-list alterne-list">
+  {{#each sorts as |sort key|}}
+  <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
+    <img class="sheet-competence-img" src="{{sort.img}}" />
+    <span class="display-label flex-grow">
+      <a data-item-id="{{sort._id}}">{{sort.name}}
+        - {{#if sort.system.caseTMRspeciale}}{{sort.system.caseTMRspeciale}}{{else}}{{upperFirst sort.system.caseTMR}}{{/if}}
+      </a>
+    </span> 
+    <span>{{sort.system.draconic}} / {{sort.system.difficulte}}</span>
+    <div class="item-controls flex-shrink">
+      <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet-jeux.html b/templates/actor-sheet-jeux.html
new file mode 100644
index 00000000..38b5cf35
--- /dev/null
+++ b/templates/actor-sheet-jeux.html
@@ -0,0 +1,13 @@
+{{#if jeux.length}}
+<h3>Jeux :</h3>
+<ul class="item-list alterne-list">
+  {{#each jeux as |jeu id|}}
+  <li class="item flexrow list-item" data-item-id="{{jeu._id}}"><span class="competence-title jeu-label"><a>{{jeu.name}} (base {{jeu.system.base}})</a></span>
+    <div class="item-controls flex-shrink">
+      <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet-maladies-poisons.html b/templates/actor-sheet-maladies-poisons.html
new file mode 100644
index 00000000..aa3de0c2
--- /dev/null
+++ b/templates/actor-sheet-maladies-poisons.html
@@ -0,0 +1,34 @@
+{{#if maladiesPoisons.length}}
+<h3 class="blessures-title">Maladies & Poisons:</h3>
+<ul class="item-list alterne-list">
+  <li class="competence-header flexrow">
+    <span class="competence-title flex-grow competence-label">Nom</span>
+    <span class="competence-title competence-label">Type</span>
+    <span class="competence-title competence-value">Remèdes</span>
+    <span class="competence-title flex-grow competence-value">Edition</span>
+  </li>
+  {{#each maladiesPoisons as |maladie key|}}
+  <li class="item flexrow list-item" data-item-id="{{maladie._id}}">
+      <span class="competence-label">
+        {{#if (or @root.options.isGM maladie.system.identifie)}} 
+          {{maladie.name}}
+        {{else}}
+          Inconnue
+        {{/if}}
+      </span>
+      <span class="competence-label">{{maladie.type}}</span>
+      <span class="competence-label">
+        {{#if (or @root.options.isGM maladie.system.remedesconnus)}} 
+          {{maladie.system.remedes}}
+        {{else}}
+          Remèdes Inconnus
+        {{/if}}
+      </span>
+      <div class="item-controls">
+        <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
+        <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+      </div>          
+  </li>
+  {{/each}}
+  </ul>
+{{/if}}
diff --git a/templates/actor-sheet-non-haut-revant.html b/templates/actor-sheet-non-haut-revant.html
new file mode 100644
index 00000000..8349a8f5
--- /dev/null
+++ b/templates/actor-sheet-non-haut-revant.html
@@ -0,0 +1,26 @@
+<ul class="item-list">
+  <li class="item flexrow">
+    <span class="competence-label">Seuil de Rêve :</span>
+    <span>
+    {{#if options.isGM}}
+      <input class="seuil-reve-value" type="text" name="system.reve.seuil.value" value="{{system.reve.seuil.value}}" data-dtype="Number"/>
+    {{else}}
+      {{system.reve.seuil.value}}
+    {{/if}}
+    </span>
+  </li>
+  <li class="item flexrow" >
+    <span class="competence-label">Refoulement : </span>
+    <span>
+    {{#if options.isGM}}
+      <input class="competence-value" type="text" name="system.reve.refoulement.value" value="{{system.reve.refoulement.value}}" data-dtype="Number"/>
+    {{else}}
+      {{system.reve.refoulement.value}}
+    {{/if}}
+    </span>
+  </li>
+</ul>
+<hr>
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-souffles.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-tetes.html"}}
diff --git a/templates/actor-sheet-oeuvres.html b/templates/actor-sheet-oeuvres.html
new file mode 100644
index 00000000..f6819673
--- /dev/null
+++ b/templates/actor-sheet-oeuvres.html
@@ -0,0 +1,18 @@
+<h3>Oeuvres diverses</h3><a class="creer-une-oeuvre">Créer une oeuvre</a>
+<ul class="item-list alterne-list">
+  {{#each chants as |chant id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=chant typeOeuvre="Chant" classOeuvre="chant-label"}}
+  {{/each}}
+  {{#each musiques as |musique id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=musique typeOeuvre="Musique" classOeuvre="musique-label"}}
+  {{/each}}
+  {{#each danses as |danse id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=danse typeOeuvre="Danse" classOeuvre="danse-label"}}
+  {{/each}}
+  {{#each oeuvres as |oeuvre id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=oeuvre typeOeuvre=oeuvre.system.competence classOeuvre="oeuvre-label"}}
+  {{/each}}
+  {{#each recettescuisine as |recette id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=recette typeOeuvre="Recette de cuisine" classOeuvre="recettecuisine-label"}}
+  {{/each}}
+</ul>
diff --git a/templates/actor-sheet-possessions.html b/templates/actor-sheet-possessions.html
new file mode 100644
index 00000000..893d9caa
--- /dev/null
+++ b/templates/actor-sheet-possessions.html
@@ -0,0 +1,22 @@
+{{#if possessions.length}}
+{{!-- Possession --}}
+<h3 class="blessures-title">Possession:</h3>
+<ul class="item-list alterne-list">
+  <li class="competence-header flexrow">
+    <span class="competence-title flex-grow competence-label">Nom</span>
+    <span class="competence-title competence-label">Type</span>
+  </li>
+  {{#each possessions as |possession  key|}}
+  <li class="item flexrow list-item" data-item-id="{{possession._id}}">
+      <span class="competence-label">
+        <a class="sheet-possession-attack">{{possession.name}} (Conjurer)</a>
+      </span>
+      <span class="competence-label">{{possession.system.type}}</span>
+      <div class="item-controls">
+        <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
+        <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+      </div>          
+  </li>
+  {{/each}}
+  </ul>
+{{/if}}
diff --git a/templates/actor-sheet-queues.html b/templates/actor-sheet-queues.html
index a91a3388..9bbb716a 100644
--- a/templates/actor-sheet-queues.html
+++ b/templates/actor-sheet-queues.html
@@ -3,7 +3,7 @@
   {{#if queues.length}}Queues de Dragon{{/if}}
   {{#if (and queues.length ombres.length)}} et {{/if}}
   {{#if ombres.length}}Ombres de Thanatos{{/if}}
-  :</h3>
+</h3>
 <ul class="flex-group-left">
   {{#each queues as |queue key|}}
   {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-item-queue.html" queue=queue key=key}}
diff --git a/templates/actor-sheet-souffles.html b/templates/actor-sheet-souffles.html
new file mode 100644
index 00000000..aa28abab
--- /dev/null
+++ b/templates/actor-sheet-souffles.html
@@ -0,0 +1,14 @@
+{{#if souffles.length}}
+<h3>Souffles</h3>
+<ul class="item-list">
+  {{#each souffles as |souffle key|}}
+  <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}">
+    <img class="sheet-competence-img" src="{{souffle.img}}" />
+    <span class="display-label flex-grow"><a>{{souffle.name}}</a></span>
+    <div class="item-controls flex-shrink">
+      <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet-taches.html b/templates/actor-sheet-taches.html
new file mode 100644
index 00000000..526d465b
--- /dev/null
+++ b/templates/actor-sheet-taches.html
@@ -0,0 +1,16 @@
+<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}}">
+    <img class="sheet-competence-img" src="{{tache.img}}" />
+    <span class="competence-title tache-label"><a>{{tache.name}}
+    ({{tache.system.points_de_tache_courant}}{{#if
+       (or @root.options.isGM (not tache.system.cacher_points_de_tache))
+    }}/{{tache.system.points_de_tache}}{{/if}})</a></span>
+    <div class="item-controls flex-shrink">
+      <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
diff --git a/templates/actor-sheet-tetes.html b/templates/actor-sheet-tetes.html
new file mode 100644
index 00000000..fc65ed54
--- /dev/null
+++ b/templates/actor-sheet-tetes.html
@@ -0,0 +1,14 @@
+{{#if tetes.length}}
+<h3>Tetes</h3>
+<ul class="item-list">
+  {{#each tetes as |tete key|}}
+  <li class="item flexrow" data-attribute={{key}} data-item-id="{{tete._id}}">
+    <img class="sheet-competence-img" src="{{tete.img}}" />
+    <span class="display-label flex-grow"><a>{{tete.name}}</a></span>
+    <div class="item-controls flex-shrink">
+      <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    </div>
+  </li>
+  {{/each}}
+</ul>
+{{/if}}
diff --git a/templates/actor-sheet-xp-competences.html b/templates/actor-sheet-xp-competences.html
new file mode 100644
index 00000000..28720100
--- /dev/null
+++ b/templates/actor-sheet-xp-competences.html
@@ -0,0 +1,23 @@
+<div>
+  <ul class="item-list">
+    <li class="item flexrow">
+      <span class="generic-label">Stress transformé</span>
+      <input class="compteur-edit" type="text" name="experience" value="{{system.compteurs.experience.value}}" data-dtype="number" size="3"/>
+    </li>
+
+    <li class="item flexrow">
+      <span class="generic-label">Total XP compétences</span>
+      <span class="competence-value">{{calc.competenceXPTotal}}</span>
+    </li>
+    {{#if options.vueDetaillee}}
+    <li>Niveaux d'archétype à répartir</li>
+    {{#each calc.comptageArchetype as |archetype key|}}
+    {{#if (lt archetype.nombre archetype.nombreMax)}}
+    <li class="item flexrow">
+      <label class="generic-label">Archetype {{archetype.niveau}} : {{archetype.nombre}} / {{archetype.nombreMax}}</label>
+    </li>
+    {{/if}}
+    {{/each}}
+    {{/if}}
+  </ul>
+</div>
diff --git a/templates/actor-sheet-xp-journal.html b/templates/actor-sheet-xp-journal.html
new file mode 100644
index 00000000..15c509b9
--- /dev/null
+++ b/templates/actor-sheet-xp-journal.html
@@ -0,0 +1,13 @@
+<h3>Journal d'Experience</h3>
+<div class="form-group editor">
+  <ul class="item-list alterne-list">
+  {{#each system.experiencelog as |xp key|}}
+    <li class="item flexrow list-item">
+      <label class="flex-shrink">{{xp.mode}} </label>
+      <label class="flex-grow">{{xp.valeur}} {{xp.raison}} </label>
+      <label class="flex-shrink">{{xp.daterdd}} </label>
+      <label class="flex-shrink">{{xp.datereel}} </label>
+    </li>
+  {{/each}}
+  </ul>
+</div>
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 67c49c11..81c2a3c2 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -243,309 +243,41 @@
               {{#if (or system.attributs.hautrevant.value options.vueDetaillee)}}
               {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.draconic) categorie="Draconic"}}
               {{/if}}
-
-              <div>
-                <ul class="item-list">
-                  <li class="item flexrow">
-                    <span class="generic-label">Stress transformé</span>
-                    <input class="compteur-edit" type="text" name="experience" value="{{system.compteurs.experience.value}}" data-dtype="number" size="3"/>
-                  </li>
-
-                  <li class="item flexrow">
-                    <span class="generic-label">Total XP compétences</span>
-                    <span class="competence-value">{{calc.competenceXPTotal}}</span>
-                  </li>
-                  {{#if options.vueDetaillee}}
-                  <li>Niveaux d'archétype à répartir</li>
-                  {{#each calc.comptageArchetype as |archetype key|}}
-                  {{#if (lt archetype.nombre archetype.nombreMax)}}
-                  <li class="item flexrow">
-                    <label class="generic-label">Archetype {{archetype.niveau}} : {{archetype.nombre}} / {{archetype.nombreMax}}</label>
-                  </li>
-                  {{/if}}
-                  {{/each}}
-                  {{/if}}
-                </ul>
-              </div>    
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-xp-competences.html"}}
             </div>
           </div>
         </div>
 
         {{!-- Combat Tab --}}
         <div class="tab combat" data-group="primary" data-tab="combat">
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-combat.html" this}}<hr>
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessures.html" this}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-maladies-poisons.html" this}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-possessions.html" this}}
-
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-combat.html"}}<hr>
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessures.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-maladies-poisons.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-possessions.html"}}
+        
       </div>
-
+      
       {{!-- Connaissances Tab --}}
       <div class="tab connaissances" data-group="primary" data-tab="connaissances">
-        <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}}">
-            <img class="sheet-competence-img" src="{{tache.img}}" />
-            <span class="competence-title tache-label"><a>{{tache.name}}
-            ({{tache.system.points_de_tache_courant}}{{#if
-               (or @root.options.isGM (not tache.system.cacher_points_de_tache))
-            }}/{{tache.system.points_de_tache}}{{/if}})</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        <hr>
-        <h3>Oeuvres diverses :</h3><a class="creer-une-oeuvre">Créer une oeuvre</a>
-        <ul class="item-list alterne-list">
-          {{#each chants as |chant id|}}
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=chant typeOeuvre="Chant" classOeuvre="chant-label"}}
-          {{/each}}
-          {{#each musiques as |musique id|}}
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=musique typeOeuvre="Musique" classOeuvre="musique-label"}}
-          {{/each}}
-          {{#each danses as |danse id|}}
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=danse typeOeuvre="Danse" classOeuvre="danse-label"}}
-          {{/each}}
-          {{#each oeuvres as |oeuvre id|}}
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=oeuvre typeOeuvre=oeuvre.system.competence classOeuvre="oeuvre-label"}}
-          {{/each}}
-          {{#each recettescuisine as |recette id|}}
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=recette typeOeuvre="Recette de cuisine" classOeuvre="recettecuisine-label"}}
-          {{/each}}
-        </ul>
-        <h3>Jeux :</h3>
-        <ul class="item-list alterne-list">
-          {{#each jeux as |jeu id|}}
-          <li class="item flexrow list-item" data-item-id="{{jeu._id}}"><span class="competence-title jeu-label"><a>{{jeu.name}} (base {{jeu.system.base}})</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        <h3>Recettes Alchimiques</h3>
-        <ul class="item-list alterne-list">
-          {{#each recettesAlchimiques as |recette id|}}
-          <li class="item flexrow list-item" data-item-id="{{recette._id}}"><span class="competence-title recette-label item-edit"><a>{{recette.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        <hr>
-        <h3>Astrologie</h3>
-        <span class="astrologie-label"><a id="jet-astrologie">Astrologie : Nombres Astraux</a></span>
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-taches.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvres.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-jeux.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-alchimie.html"}}
       </div>
-
+      
       {{!-- hautreve Tab --}}
       <div class="tab hautreve " data-group="primary" data-tab="hautreve" style="height:200px">
         <div>
           {{#if system.attributs.hautrevant.value}}
           <h3>Haut rêvant</h3>
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-haut-revant.html"}}
           {{else}}
-          <h3>Vous n'avez pas le don de haut-rêve! Il faut attribuer la Tête de Dragon 'Don de Haut Rêve' si votre personnage est ou devient Haut-Rêvant.</h3>
+          <h3>Vous n'avez pas le don de haut-rêve</h3>
+          <p>Attribuer la Tête de Dragon 'Don de Haut Rêve' pour rendre le personnage Haut-Rêvant.</p>
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-non-haut-revant.html"}}
           {{/if}}
-          <ul class="item-list">
-            {{#if system.attributs.hautrevant.value}}
-            {{#if options.isGM}}
-            <li class="item flexrow">
-              <span>
-                <a class="chat-card-button forcer-tmr-aleatoire">Ré-insertion aléatoire (ie TMR cachée)</a>
-              </span>
-              <span>
-                <a class="chat-card-button afficher-tmr">Montrer les TMR</a>
-              </span>
-            </li>
-            {{/if}}
-            <li class="item flexrow">
-              <span class="competence-label flex-shrink">Demi rêve :
-              {{#if options.isGM}}
-                {{caseTmr-label system.reve.tmrpos.coord}}
-              </span><span>
-                <input class="competence-value" type="text" name="system.reve.tmrpos.coord" value="{{system.reve.tmrpos.coord}}" data-dtype="String"/>
-              {{else if hautreve.cacheTMR}}
-                {{caseTmr-type system.reve.tmrpos.coord}}
-              </span><span>
-                ??
-              {{else}}
-                {{caseTmr-label system.reve.tmrpos.coord}}
-              </span><span>
-                {{system.reve.tmrpos.coord}}
-              {{/if}}
-              </span> 
-            </li>
-            {{/if}}
-            <li class="item flexrow">
-              <span class="competence-label">Seuil de Rêve :</span>
-              <span>
-              {{#if options.isGM}}
-                <input class="seuil-reve-value" type="text" name="system.reve.seuil.value" value="{{system.reve.seuil.value}}" data-dtype="Number"/>
-              {{else}}
-                {{system.reve.seuil.value}}
-              {{/if}}
-              </span>
-            </li>
-            <li class="item flexrow" >
-              <span class="competence-label">Refoulement : </span>
-              <span>
-              {{#if options.isGM}}
-                <input class="competence-value" type="text" name="system.reve.refoulement.value" value="{{system.reve.refoulement.value}}" data-dtype="Number"/>
-              {{else}}
-                {{system.reve.refoulement.value}}
-              {{/if}}
-              </span>
-            </li>
-          </ul>
+          <br><br>
         </div>
-        <hr>
-        {{!-- Queues, Souffles, Tetes, Ombre --}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html"}}
-        {{#if souffles.length}}
-        <h3>Souffles:</h3>
-        <ul class="item-list">
-          {{#each souffles as |souffle key|}}
-          <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}">
-            <img class="sheet-competence-img" src="{{souffle.img}}" />
-            <span class="display-label flex-grow"><a>{{souffle.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        {{/if}}
-        {{#if tetes.length}}
-        <h3>Tetes:</h3>
-        <ul class="item-list">
-          {{#each tetes as |tete key|}}
-          <li class="item flexrow" data-attribute={{key}} data-item-id="{{tete._id}}">
-            <img class="sheet-competence-img" src="{{tete.img}}" />
-            <span class="display-label flex-grow"><a>{{tete.name}}</a></span>
-            <div class="item-controls flex-shrink">
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        {{/if}}
-        {{#if system.attributs.hautrevant.value}}
-        {{#if (and options.isGM signesdraconiques.length)}}
-        <h3>Signes draconiques</h3>
-        <ul class="item-list alterne-list">
-          {{#each signesdraconiques as |signe key|}}
-            <li class="item list-item flexrow" data-item-id="{{signe._id}}" data-attribute="{{key}}">
-                <img class="sheet-competence-img" src="{{signe.img}}" />
-                <span class="display-label flex-grow"><a>{{signe.name}}</a></span> 
-                <span class="flex-shrink">{{signe.system.difficulte}}</span>
-                <div class="item-controls flex-shrink">
-                  <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-              {{/each}}
-            </ul>
-            {{/if}}
-            
-            {{#if hautreve.rencontres.length}}
-            <h3>Rencontres présentes:</h3>
-            <ul class="item-list">
-              {{#each hautreve.rencontres as |rencontre key|}}
-              <li class="item flexrow" data-item-id="{{key}}" data-attribute="{{key}}">
-                <span class="display-label"><a data-item-id="{{key}}">{{rencontre.name}} r{{rencontre.force}}</a></span> 
-                <span class="flex-shrink">{{rencontre.coord}} - {{caseTmr-label rencontre.coord}}</span> 
-                {{#if rencontre.date}}
-                <span>{{upperFirst rencontre.heure}}, le {{rencontre.date}}</span> 
-                {{/if}}
-                <div class="item-controls flex-shrink">
-                  <a class="rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-              {{/each}}
-            </ul>
-            {{/if}}
-            {{#if sortsReserve.length}}
-            <h3>Sorts en Réserve:</h3>
-            <ul class="item-list alterne-list">
-              {{#each sortsReserve as |sort key|}}
-              <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
-                <img class="sheet-competence-img" src="{{sort.img}}" />
-                <span class="display-label"><a>{{#if sort.system.echectotal}}Echec total: {{/if}}{{sort.name}} r{{sort.system.ptreve}}</a></span> 
-                <span>{{sort.system.coord}} - {{caseTmr-label sort.system.coord}}</span> 
-                <div class="item-controls flex-shrink">
-                  <a class="item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-              {{/each}}
-              {{#each hautreve.sortsReserve as |reserve key|}}
-              <li class="item list-item flexrow" data-index="{{key}}">
-                <img class="sheet-competence-img" src="{{reserve.img}}" />
-                <span class="display-label">{{reserve.sort.name}} r{{reserve.sort.system.ptreve_reel}}</span> 
-                <span>{{reserve.coord}} - {{caseTmr-label reserve.coord}}</span> 
-                <div class="item-controls flex-shrink">
-                  <a class="delete-sort-reserve flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-              {{/each}}
-            </ul>
-          {{/if}}
-          
-          <hr>
-          
-          <h3>Sorts:</h3>
-          <ul class="item-list alterne-list">
-            {{#each sorts as |sort key|}}
-            <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
-              <img class="sheet-competence-img" src="{{sort.img}}" />
-              <span class="display-label flex-grow">
-                <a data-item-id="{{sort._id}}">{{sort.name}}
-                  - {{#if sort.system.caseTMRspeciale}}{{sort.system.caseTMRspeciale}}{{else}}{{upperFirst sort.system.caseTMR}}{{/if}}
-                </a>
-              </span> 
-              <span>{{sort.system.draconic}} / {{sort.system.difficulte}}</span>
-              <div class="item-controls flex-shrink">
-                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ul>
-
-          <h3>Méditations:</h3>
-          <ul class="item-list">
-            {{#each meditations as |meditation key|}}
-            <li class="item flexrow" data-item-id="{{meditation._id}}" data-attribute="{{key}}">
-              <img class="sheet-competence-img" src="{{meditation.img}}" />
-              <span class="meditation-label flex-grow"><a data-item-id="{{meditation._id}}">{{meditation.name}} - {{meditation.system.competence}}</a></span> 
-              <div class="item-controls flex-shrink">
-                <a class="item-edit" title="Editer"><i class="fas fa-edit"></i></a>
-                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ul>
-          <hr>
-          {{#if hautreve.casesTmr}}
-            <h3>Cases Spéciales:</h3>
-            <ul class="item-list">
-              {{#each hautreve.casesTmr as |casetmr key|}}
-              <li class="item flexrow" data-item-id="{{casetmr._id}}" data-attribute="{{key}}">
-                <img class="sheet-competence-img" src="{{casetmr.img}}" />
-                <span class="display-label"><a data-item-id="{{casetmr._id}}">{{casetmr.name}}</a></span>
-                <span>{{casetmr.system.coord}} - {{caseTmr-label casetmr.system.coord}}</span> 
-                <div class="item-controls flex-shrink">
-                  <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-              {{/each}}
-            </ul>
-          {{/if}}
-        <br><br>
-        {{/if}}
       </div>
 
       {{!-- Equipment Tab --}}
@@ -620,21 +352,8 @@
           <div class="form-group editor">
             {{editor notes target="system.notes" button=true owner=owner editable=editable}}
           </div>
-          <h3>Journal d'Experience</h3>
-          <div class="form-group editor">
-            <ul class="item-list alterne-list">
-              {{#each system.experiencelog as |xp key|}}
-              <li class="item flexrow list-item">
-                <label class="flex-shrink">{{xp.mode}} </label>
-                <label class="flex-grow">{{xp.valeur}} {{xp.raison}} </label>
-                <label class="flex-shrink">{{xp.daterdd}} </label>
-                <label class="flex-shrink">{{xp.datereel}} </label>
-              </li>
-            {{/each}}
-          </ul>
-        </div>
-
-          {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-xp-journal.html"}}
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
         </article>
       </div>