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

Amélioration présentation blessures #173

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

module/item-competencecreature.js

@@ -26,6 +26,7 @@ export class RdDItemCompetenceCreature extends Item {
           competence: itemData.name,
           resistance: 100,
           equipe: true,
+          dommagesReels: arme.data.dommages,
           penetration: 0,
           force: 0,
           rapide: true

module/poetique.js

@@ -50,7 +50,7 @@ const poesieHautReve = [
   },
   {
     reference: 'Denis Gerfaud',
-    extrait: `Ainsi se cuccèdent les Jours et les Ages.
+    extrait: `Ainsi se succèdent les Jours et les Ages.
           <br>Les jours des Dragons sont les Ages des Hommes.`
   },
   {

module/rdd-combat.js

@@ -1179,7 +1179,7 @@ export class RdDCombat {
   _computeImpactRecul(attaque) {
     const taille = this.defender.getTaille();
     const force = this.attacker.getForce();
-    const dommages = attaque.arme.data.dommagesReels;
+    const dommages = attaque.arme.data.dommagesReels ?? attaque.arme.data.dommages;
     return taille - (force + dommages);
   }
 

module/rdd-utility.js

@@ -108,6 +108,8 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html',
       //Items
       'systems/foundryvtt-reve-de-dragon/templates/item-competence-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-competencecreature-sheet.html',

styles/simple.css

@@ -645,6 +645,24 @@ ul, li {
   padding: 0.125rem;
   flex: 1 1 5rem;
 }
+
+.table-row {
+  margin: 0.125rem;
+  border-radius: 0;
+  padding: 0.125rem;
+  flex: 1 1 5rem;
+}
+
+.alterne-row > .row-item:hover {
+  background: rgba(100, 100, 50, 0.25);
+}
+.alterne-row > .row-item:nth-child(even) {
+  background: rgba(80, 60, 0, 0.10);
+}
+.alterne-row > .row-item:nth-child(odd) {
+  background: rgb(160, 130, 100, 0.05);
+}
+
 .item-display-show {
   display: block;
 }

templates/actor-blessure-partial.html

@@ -0,0 +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>
+    {{else}}
+    <i class="fas fa-genderless"></i>
+    {{/if}}
+  </td>
+  <td class="competence-header ">
+    <input class="blessures-soins" type="text" name='localisation' data-dtype="String" value="{{bless.loc}}"/>
+  </td>
+  <td class="competence-header ">
+    <input class="blessures-soins" type="text" name='premiers_soins' data-dtype="number" value="{{bless.premiers_soins}}"/>
+  </td>
+  <td class="competence-header ">
+    <input class="blessures-soins" type="text" name='soins_complets' data-dtype="number" value="{{bless.soins_complets}}"/>
+  </td>
+  <td class="competence-header ">
+    <input class="blessures-soins" type="text" name='jours' data-dtype="number" value="{{bless.jours}}"/>
+  </td>
+</tr>

templates/actor-creature-sheet.html

@@ -136,62 +136,8 @@
       
     {{!-- blessures Tab --}}
     <div class="tab blessures" data-group="primary" data-tab="blessures" style="height:200px">
-        <span class="blessures-title">Blessures Légeres :</span>
+      {{!-- Liste de blessures --}}
-        <div class="blessure-data alterne-list">
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html" this}}
-          {{#each data.blessures.legeres.liste as |bless key|}}
-          <li class="item flexrow blessure-data list-item" data-blessure-type="legere" data-attribute={{key}}
-            data-blessure-index="{{key}}">
-            <a class="item-control blessure-control" title="Blessure Légère"
-              data-blessure-active="{{bless.active}}">{{#if bless.active}}<i class="fas fa-circle"></i>{{else}}<i
-                class="fas fa-genderless"></i>{{/if}}</a>
-            Premiers soins <input class="blessures-soins" type="text" name='premiers_soins' data-dtype="number"
-              value="{{this.premiers_soins}}" /> -
-            Soins complets <input class="blessures-soins" type="text" name='soins_complets' data-dtype="number"
-              value="{{this.soins_complets}}" /> -
-            Jours <input class="blessures-soins" type="text" name='jours' data-dtype="number" value="{{this.jours}}" />
-            -
-            Loc. <input class="blessures-soins" type="text" name='localisation' data-dtype="String"
-              value="{{this.loc}}" />
-          </li>
-          {{/each}}
-        </div>
-        <span class="blessures-title">Blessures Graves :</span>
-        <div class="blessure-data alterne-list">
-          {{#each data.blessures.graves.liste as |bless key|}}
-          <li class="item flexrow list-item" data-blessure-type="grave" data-attribute={{key}} data-blessure-index="{{key}}">
-            <a class="item-control blessure-control" title="Blessure Grave"
-              data-blessure-active="{{bless.active}}">{{#if bless.active}}<i class="fas fa-circle"></i>{{else}}<i
-                class="fas fa-genderless"></i>{{/if}}</a>
-            Premiers soins <input class="blessures-soins" type="text" name="premiers_soins" data-dtype="number"
-              value="{{bless.premiers_soins}}" /> -
-            Soins complets <input class="blessures-soins" type="text" name="soins_complets" data-dtype="number"
-              value="{{bless.soins_complets}}" /> -
-            Jours <input class="blessures-soins" type="text" name="jours" data-dtype="number" value="{{bless.jours}}" />
-            -
-            Loc. <input class="blessures-soins" type="text" name="localisation" data-dtype="String"
-              value="{{bless.loc}}" />
-          </li>
-          {{/each}}
-        </div>
-        <span class="blessures-title">Blessure Critique :</span>
-        <div class="blessure-data alterne-list">
-          {{#each data.blessures.critiques.liste as |bless key|}}
-          <li class="item flexrow list-item" data-blessure-type="critique" data-attribute={{key}} data-blessure-index="{{key}}">
-            <a class="item-control blessure-control" title="Blessure Critique"
-              data-blessure-active="{{bless.active}}">{{#if bless.active}}<i class="fas fa-circle"></i>{{else}}<i
-                class="fas fa-genderless"></i>{{/if}}</a>
-            Premiers soins <input class="blessures-soins" type="text" name="premiers_soins" data-dtype="number"
-              value="{{bless.premiers_soins}}" /> -
-            Soins complets <input class="blessures-soins" type="text" name="soins_complets" data-dtype="number"
-              value="{{bless.soins_complets}}" /> -
-            Jours <input class="blessures-soins" type="text" name="jours" data-dtype="number" value="{{bless.jours}}" />
-            -
-            Loc. <input class="blessures-soins" type="text" name="localisation" data-dtype="String"
-              value="{{bless.loc}}" />
-          </li>
-          </li>
-          {{/each}}
-        </div>
     </div>
 
     {{!-- Equipment Tab --}}

templates/actor-liste-blessures-partial.html

@@ -0,0 +1,23 @@
+<h3>Blessures:</h3>
+<table class="table-container" role="table">
+  <thead>
+    <tr class="competence-header competence-title competence-label" >
+      <th class="first" colspan="2">Gravité</th>
+      <th>Localisation</th>
+      <th>Premiers soins</th>
+      <th>Soins complets</th>
+      <th>Age (jours)</th>   
+    </tr>
+  </thead>
+  <tbody>
+    {{#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}}
+    {{#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}}
+    {{#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"}}
+    {{/each}}
+  </tbody>
+</table>

templates/actor-sheet.html

@@ -363,107 +363,8 @@
           </li>
         </ul>
         <hr>
-
         {{!-- Liste de blessures --}}
-        <h3 class="blessures-title">Blessures:</h3>
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html" this}}
-        <div class="flex-group-left flexcol competence-column">
-          <h4 class="blessures-title">Légères:</h4>
-          <ul class="blessure-data flexrow alterne-list blessures-list">
-            {{#each data.blessures.legeres.liste as |bless key|}}
-            <li class="item flexrow blessure-data list-item" data-blessure-type="legere" data-attribute={{key}} data-blessure-index="{{key}}">
-              <ul>
-                <li class="item-control blessure-control" title="Blessure Légère" data-blessure-active="{{bless.active}}">
-                  {{#if bless.active}}
-                    <i class="fas fa-circle"></i>
-                  {{else}}
-                    <i class="fas fa-genderless"></i>
-                  {{/if}}
-                </li>
-                <li>
-                  Premiers soins
-                  <input class="blessures-soins" type="text" name='premiers_soins' data-dtype="number" value="{{bless.premiers_soins}}"/>
-                </li>
-                <li>
-                  Soins complets
-                  <input class="blessures-soins" type="text" name='soins_complets' data-dtype="number" value="{{bless.soins_complets}}"/>
-                </li>
-                <li>
-                  Jours
-                  <input class="blessures-soins" type="text" name='jours' data-dtype="number" value="{{bless.jours}}"/>
-                </li>
-                <li>
-                  Loc.
-                  <input class="blessures-soins" type="text" name='localisation' data-dtype="String" value="{{bless.loc}}"/>
-                </li>
-              </ul>
-            </li>
-            {{/each}}
-          </ul>
-          <h4 class="blessures-title">Graves :</h4>
-          <ul class="flexrow alterne-list blessures-list">
-            {{#each data.blessures.graves.liste as |bless key|}}
-            <li class="item flexrow list-item" data-blessure-type="grave" data-attribute={{key}} data-blessure-index="{{key}}" >
-              <ul>
-                <li class="item-control blessure-control" title="Blessure Grave" data-blessure-active="{{bless.active}}">
-                  {{#if bless.active}}
-                    <i class="fas fa-circle"></i>
-                  {{else}}
-                    <i class="fas fa-genderless"></i>
-                  {{/if}}
-                </li>
-                <li>
-                  Premiers soins
-                  <input class="blessures-soins" type="text" name='premiers_soins' data-dtype="number" value="{{bless.premiers_soins}}"/>
-                </li>
-                <li>
-                  Soins complets
-                  <input class="blessures-soins" type="text" name='soins_complets' data-dtype="number" value="{{bless.soins_complets}}"/>
-                </li>
-                <li>
-                  Jours
-                  <input class="blessures-soins" type="text" name='jours' data-dtype="number" value="{{bless.jours}}"/>
-                </li>
-                <li>
-                  Loc.
-                  <input class="blessures-soins" type="text" name='localisation' data-dtype="String" value="{{bless.loc}}"/>
-                </li>
-              </ul>
-            </li>
-            {{/each}}
-          </ul>
-          <h4 class="blessures-title">Critique :</h4>
-          <ul class="flexrow alterne-list blessures-list">
-            {{#each data.blessures.critiques.liste as |bless key|}}
-            <li class="item list-item flexrow" data-blessure-type="critique" data-attribute={{key}} data-blessure-index="{{key}}" >
-              <ul>
-                <li class="flex-group-center item-control blessure-control" title="Blessure Critique" data-blessure-active="{{bless.active}}">
-                  {{#if bless.active}}
-                    <i class="fas fa-circle"></i>
-                  {{else}}
-                    <i class="fas fa-genderless"></i>
-                  {{/if}}
-                </li>
-                <li>
-                  Premiers soins
-                  <input class="blessures-soins" type="text" name='premiers_soins' data-dtype="number" value="{{bless.premiers_soins}}"/>
-                </li>
-                <li>
-                  Soins complets
-                  <input class="blessures-soins" type="text" name='soins_complets' data-dtype="number" value="{{bless.soins_complets}}"/>
-                </li>
-                <li>
-                  Jours
-                  <input class="blessures-soins" type="text" name='jours' data-dtype="number" value="{{bless.jours}}"/>
-                </li>
-                <li>
-                  Loc.
-                  <input class="blessures-soins" type="text" name='localisation' data-dtype="String" value="{{bless.loc}}"/>
-                </li>
-              </ul>
-            </li>
-            {{/each}}
-          </ul>
-        </div>
       </div>
 
       {{!-- Connaissances Tab --}}