Merge branch 'v1.4-blessures' into 'v1.4'

Amélioration des blessures #173

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

styles/simple.css

@@ -379,6 +379,20 @@ table {border: 1px solid #7a7971;}
   border-bottom: 1px solid #BBB;
 }
 
+.blessure-inactive{
+  color:rgba(150, 150, 150, 0.4)
+}
+.blessure-active-legere{
+  color:rgba(60, 60, 60, 0.9);
+  text-shadow: rgba(60, 60, 60, 0.7);
+}
+.blessure-active-grave{
+  color:rgba(218, 126, 21, 0.9);
+}
+.blessure-active-critique{
+  color:rgba(173, 36, 26, 0.9);
+
+}
 .foundryvtt-reve-de-dragon .items-list .item .item-image {
   -webkit-box-flex: 0;
   -ms-flex: 0 0 24px;
@@ -660,7 +674,6 @@ ul, li {
 
 .table-row {
   margin: 0.125rem;
-  border-radius: 0;
   padding: 0.125rem;
   flex: 1 1 5rem;
 }

templates/actor-blessure-partial.html

@@ -1,24 +1,24 @@
 <tr class="table-row alterne-row item" data-blessure-type="{{gravite}}" data-attribute={{key}} data-blessure-index="{{key}}" >
-  <td class="flex-row first" >
-    {{title}}
-  </td>
   <td class="item-control blessure-control" title="Blessure {{title}}" data-blessure-active="{{bless.active}}">
     {{#if bless.active}}
-    <i class="fas fa-circle"></i>
+    <i class="fas fa-skull-crossbones blessure-active-{{gravite}}"></i>
+    {{!--   <i class="fas fa-first-aid"></i> --}}    
+    {{!--   <i class="fas fa-plus-square"></i> --}}    
     {{else}}
-    <i class="fas fa-genderless"></i>
+    {{!--    <i class="fas fa-genderless"></i>    --}}    
+      <i class="fas fa-skull-crossbones blessure-inactive"></i>
     {{/if}}
   </td>
-  <td class="competence-header ">
+  <td>
     <input class="blessures-soins" type="text" name='localisation' data-dtype="String" value="{{bless.loc}}"/>
   </td>
-  <td class="competence-header ">
+  <td>
     <input class="blessures-soins" type="text" name='premiers_soins' data-dtype="number" value="{{bless.premiers_soins}}"/>
   </td>
-  <td class="competence-header ">
+  <td>
     <input class="blessures-soins" type="text" name='soins_complets' data-dtype="number" value="{{bless.soins_complets}}"/>
   </td>
-  <td class="competence-header ">
+  <td>
     <input class="blessures-soins" type="text" name='jours' data-dtype="number" value="{{bless.jours}}"/>
   </td>
 </tr>

templates/actor-liste-blessures-partial.html

@@ -2,7 +2,7 @@
 <table class="table-container" role="table">
   <thead>
     <tr class="competence-header competence-title competence-label" >
-      <th class="first" colspan="2">Gravité</th>
+      <th></th>
       <th>Localisation</th>
       <th>Premiers soins</th>
       <th>Soins complets</th>
@@ -10,14 +10,17 @@
     </tr>
   </thead>
   <tbody>
+    <tr class="table-row alterne-row" ><td/><td colspan="4">Légères</td></tr>
     {{#each data.blessures.legeres.liste as |bless key|}}
     {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="legere" title="Légère"}}
     {{/each}}
+    <tr class="table-row alterne-row"><td/><td colspan="4">Graves</td></tr>
     {{#each data.blessures.graves.liste as |bless key|}}
     {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="grave" title="Grave"}}
     {{/each}}
+    <tr class="table-row alterne-row"><td/><td colspan="4">Critiques</td></tr>
     {{#each data.blessures.critiques.liste as |bless key|}}
-    {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="legere" title="Critique"}}
+    {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="critique" title="Critique"}}
     {{/each}}
   </tbody>
 </table>

templates/chat-resultat-encaissement.html

@@ -16,7 +16,7 @@
   </span>
 </h4>
 <div>
-  Je d'encaissement de {{roll.total}}
+  Jet d'encaissement de {{roll.total}}
   {{#unless (eq armure 0)}}, l'armure a protègé de {{armure}}
     {{~#unless (eq penetration 0)}} (pénétration de {{penetration}}){{/unless}}
   {{~/unless}}, total: <span class="rdd-roll-echec">{{total}}</span>