From d353b6ccaf0cf325faa68501dd239d1af517fe3c Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Fri, 2 Apr 2021 22:06:58 +0200
Subject: [PATCH 1/3] =?UTF-8?q?Fix=20regression=20liste=20t=C3=A2ches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/actor-sheet.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 955d12bd..9542a692 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -470,7 +470,7 @@
       <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|}}
+          {{#each data.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>
             <div class="item-controls">
               <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>

From 72f8c83cafe6010dc10a4b52bbeb5e5bc5d5fa75 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 3 Apr 2021 03:04:48 +0200
Subject: [PATCH 2/3] =?UTF-8?q?Draconic=20que=20pour=20les=20Haut=20r?=
 =?UTF-8?q?=C3=AAvant=20#174?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/rdd-combat.js       |  9 ++++++---
 templates/actor-sheet.html | 20 ++++++++++++--------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/module/rdd-combat.js b/module/rdd-combat.js
index 79ea86d7..cc0a6748 100644
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@@ -180,6 +180,7 @@ export class RdDCombatManager extends Combat {
       ui.notifications.warn(`Le combatant ${combatant.name} n'est pas associé à un acteur, impossible de déterminer ses actions de combat!`)
       return [];
     }
+    const actorData = Misc.data(combatant.actor);
     let items = combatant.actor.data.items;
     let actions = []
     if (combatant.actor.isCreature()) {
@@ -192,9 +193,11 @@ export class RdDCombatManager extends Combat {
         .concat(RdDItemArme.mainsNues());
 
       let competences = items.filter(it => it.type == 'competence');
-      actions = actions.concat(RdDCombatManager.finalizeArmeList(armes, competences, Misc.data(combatant.actor).data.carac));
-
-      actions.push({ name: "Draconic", data: { initOnly: true, competence: "Draconic" } });
+      actions = actions.concat(RdDCombatManager.finalizeArmeList(armes, competences, actorData.data.carac));
+      
+      if (actorData.data.attributs.hautrevant.value){
+        actions.push({ name: "Draconic", data: { initOnly: true, competence: "Draconic" } });
+      }
     }
 
     actions.push({ name: "Autre action", data: { initOnly: true, competence: "Autre action" } });
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 9542a692..f25e230d 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -61,7 +61,7 @@
               <span class="gm-only remise-a-neuf"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
               <span id="dormir-une-heure"><a title="Dormir une heure"><img class="button-img" src="icons/svg/sleep.svg" alt="Dormir une heure"/></a></span>
               <span id="dormir-chateau-dormant"><a title="Chateau Dormant"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/icons/heures/hd12.svg" alt="Chateau Dormant"/></a></span>
-              {{#if (eq data.attributs.hautrevant.value 'Haut rêvant')}}
+              {{#if data.attributs.hautrevant.value}}
               <span id="monte-tmr"><a title="Montée dans les Terres M&eacute;dianes !"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-normal.svg" alt="Montée dans les Terres M&eacute;dianes !"/></a></span>
               <span id="monte-tmr-rapide"><a title="Montée accélérée dans les Terres M&eacute;dianes !"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-rapide.svg" alt="Montée accélérée dans les Terres M&eacute;dianes !"/></a></span>
               <span id="visu-tmr"><a title="Regarder les Terres M&eacute;dianes"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-view.svg" alt="Regarder les Terres M&eacute;dianes"/></a></span>
@@ -164,15 +164,17 @@
                   </span>
                 </li>
                 {{#each data.attributs as |attr key|}}
+                {{#unless (eq key 'hautrevant')}}
                 <li class="competence flexrow  list-item" data-attribute="{{key}}">
                   <span class="competence-label flexrow" name="data.attributs.{{key}}.label">{{attr.label}} :
-                  {{#if (eq key 'protection')}}
+                    {{#if (eq key 'protection')}}
                     <input id="attribut-protection-edit" type="text" name="{{key}}" value="{{attr.value}}" data-dtype="number"/><span/>
-                  {{else}}
+                    {{else}}
                     {{attr.value}}
-                  {{/if}}
+                    {{/if}}
                   </span>
                 </li>
+                {{/unless}}
                 {{/each}}
               </ul>
               <ul class="carac-list alterne-list">
@@ -299,7 +301,7 @@
                 {{/each}}
               </ul>
 
-              {{#if (eq data.attributs.hautrevant.value 'Haut rêvant')}}
+              {{#if data.attributs.hautrevant.value}}
               <header class="competence-header flexrow">
                 <span class="competence-title">Draconic</span>
               </header>
@@ -553,9 +555,11 @@
       {{!-- hautreve Tab --}}
       <div class="tab hautreve " data-group="primary" data-tab="hautreve" style="height:200px">
         <div>
-          <h3>Haut rêve:</h3>
+          {{#if data.attributs.hautrevant.value}}
+          <h3>Haut rêvant</h3>
+          {{/if}}
           <ul class="item-list">
-            {{#if (eq data.attributs.hautrevant.value 'Haut rêvant')}}
+            {{#if data.attributs.hautrevant.value}}
             <li class="item flexrow">
               <span class="competence-label">Position en TMR :</span> 
               <span>
@@ -590,7 +594,7 @@
           </ul>
         </div>
         <hr>
-        {{#if (eq data.attributs.hautrevant.value 'Haut rêvant')}}
+        {{#if data.attributs.hautrevant.value}}
         <div>
           <h3>Sorts:</h3>
           <ul class="item-list">

From 329ae475d9c2a27706688124a617e5a350a39289 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 3 Apr 2021 03:05:44 +0200
Subject: [PATCH 3/3] =?UTF-8?q?Correction=20message=20=C3=A9chec=20total?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/chat-demande-attaque-etotal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/chat-demande-attaque-etotal.html b/templates/chat-demande-attaque-etotal.html
index 77ef3a99..1df10af6 100644
--- a/templates/chat-demande-attaque-etotal.html
+++ b/templates/chat-demande-attaque-etotal.html
@@ -17,6 +17,6 @@
   {{/if}}
   <a class='chat-card-button' id='echec-total-attaque' data-attackerId='{{attackerId}}'
     data-defenderTokenId='{{defenderTokenId}}'>
-    Tirer l'échec total !
+    Tirer la maladresse !
   </a>
 </div>
\ No newline at end of file