Ajout multiples pour le combat et ameliorations des items

templates/actors/actor-sheet.hbs

@@ -36,62 +36,147 @@
 
     {{!-- Skills Tab --}}
     <div class="tab principal" data-group="primary" data-tab="principal">
-      
+
       <div class="grid grid-2col">
-        
+
+        <div>
         <ul class="item-list alternate-list">
-        {{#each caracList as |char key|}}
+          {{#each caracList as |char key|}}
           <li class="item flexrow list-item carac-box">
             <img class="sheet-competence-img" src="/systems/fvtt-te-deum/images/icons/{{key}}.webp" />
-            <label class="item-left-pad item-field item-field-label-medium">{{char.name}}</label>            
-            <select type="text" class="input-numeric-short" name="system.caracteristiques.{{key}}.value"data-dtype="Number" />
-              {{selectOptions @root.config.descriptionValeur selected=char.value labelAttr="valeur"}}
+            <label class="item-left-pad item-field item-field-label-medium">{{char.name}}</label>
+            <select type="text" class="input-numeric-short" name="system.caracteristiques.{{key}}.value"
+              data-dtype="Number" />
+            {{selectOptions @root.config.descriptionValeur selected=char.value labelAttr="valeur"}}
             </select>
-            <label class="item-field item-field-label-medium">{{char.qualite}}</label>            
-            <label class="item-field item-field-label-medium">{{char.dice}} ({{char.negativeDice}})</label>            
+            <label class="item-field item-field-label-medium">{{char.qualite}}</label>
+            <label class="item-field item-field-label-medium">{{char.dice}} ({{char.negativeDice}})</label>
           </li>
-        {{/each}}
+          {{/each}}
         </ul>
+        
+        <div>
+          <h4>Malus de santé : {{santeModifier}} niveaux</h4>
+        </div>
+
+        <ul class="item-list alternate-list">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-field-title-long">
+                <h3><label class="item-field-label-long">Blessures</label></h3>
+              </span>
+            </li>
+            {{#each blessures as |blessure key|}}
+            <li class="item flexrow list-item list-item-shadow item-id" data-item-id="{{blessure._id}}">
+              <a class="item-edit item-name-img" title="Editer Item"><img class="sheet-competence-img"
+                  src="{{blessure.img}}" /></a>
+              <span class="item-field-label-medium">
+                {{blessure.name}}
+              </span>
+              <span class="item-field-label-short">
+                {{getConfigLabel "blessures" blessure.system.typeBlessure}}
+              </span>
+              <span class="item-field-label-short">
+                {{getConfigLabel "LOCALISATION" blessure.system.localisation}}
+              </span>
+              <span class="item-field-label-short">
+                {{blessure.malus}}
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'arme"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+
+          {{#if (or (count maladies) (count poisons))}}
+          <ul class="item-list alternate-list"> 
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-field-title-long">
+                <h3><label class="item-field-label-long">Maladies & Poisons</label></h3>
+              </span>
+            </li>
+            {{#each maladies as |maladie key|}}
+            <li class="item flexrow list-item list-item-shadow item-id" data-item-id="{{maladie._id}}">
+              <a class="item-edit item-name-img" title="Editer Item"><img class="sheet-competence-img"
+                  src="{{maladie.img}}" /></a>
+              <span class="item-field-label-medium">
+                {{maladie.name}}
+              </span>
+              <span class="item-field-label-short">
+                {{maladie.malus}}
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'arme"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+            {{#each poisons as |poison key|}}
+            <li class="item flexrow list-item list-item-shadow item-id" data-item-id="{{poison._id}}">
+              <a class="item-edit item-name-img" title="Editer Item"><img class="sheet-competence-img"
+                  src="{{poison.img}}" /></a>
+              <span class="item-field-label-medium">
+                {{poison.name}}
+              </span>
+              <span class="item-field-label-short">
+                {{poison.malus}}
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'arme"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+
+          </ul>
+          {{/if}}
+
+        </div>
 
         <div>
           <ul class="item-list alternate-list">
             <li class="item flexrow list-item carac-box">
-              <label class="item-left-pad  item-field item-field-label-medium">Providence</label>            
+              <label class="item-left-pad  item-field item-field-label-medium">Providence</label>
               <select type="text" class="input-numeric-short" name="system.providence.value" data-dtype="Number" />
-                {{selectOptions @root.config.providence selected=providence.value nameAttr="value" valueAttr="value" labelAttr="value"}}
+              {{selectOptions @root.config.providence selected=providence.value nameAttr="value" valueAttr="value"
+              labelAttr="value"}}
               </select>
-              <label class="item-field item-field-label-long">{{providence.qualite}}</label>            
-              <label class="item-field item-field-label-short">{{providence.dice}}</label>            
+              <label class="item-field item-field-label-long">{{providence.qualite}}</label>
+              <label class="item-field item-field-label-short">{{providence.dice}}</label>
             </li>
             <li class="item flexrow list-item carac-box">
-              <label class="item-left-pad item-field item-field-label-medium">Bienveillance</label>            
+              <label class="item-left-pad item-field item-field-label-medium">Bienveillance</label>
               <input class="input-numeric-short" type="text" name="system.bienveillance.value" data-dtype="Number" />
-              <label class="item-field item-field-label-long"></label>            
-              <label class="item-field item-field -label-short"></label>            
+              <label class="item-field item-field-label-long"></label>
+              <label class="item-field item-field -label-short"></label>
             </li>
           </ul>
 
           <ul class="item-list alternate-list">
-          <li class="item flexrow list-item items-title-bg">
-            <span class="item-field-title-long">
-              <h3><label class="item-field-label-long">Graces</label></h3>
-            </span>
-          </li>
-          {{#each graces as |grace key|}}
-          <li class="item flexrow list-item list-item-shadow item-id" data-item-id="{{arme._id}}">
-            <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                src="{{grace.img}}" /></a>
-            <span class="item-field-label-long">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-field-title-long">
+                <h3><label class="item-field-label-long">Graces</label></h3>
+              </span>
+            </li>
+            {{#each graces as |grace key|}}
+            <li class="item flexrow list-item list-item-shadow item-id" data-item-id="{{arme._id}}">
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                  src="{{grace.img}}" /></a>
+              <span class="item-field-label-long">
                 {{grace.name}}
-            </span>
-            <div class="item-filler">&nbsp;</div>
-            <div class="item-controls item-controls-fixed">
-              <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Supprimer l'arme"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'arme"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
         </div>
       </div>
 
@@ -101,26 +186,26 @@
     <div class="tab competences" data-group="primary" data-tab="competences">
 
       {{#each arbreCompetences as |carac key|}}
-        <ul>
-          <li class="flexrow">
-            <img class="sheet-competence-img" src="/systems/fvtt-te-deum/images/icons/{{key}}.webp" />
-            <h3 class="item-field-label-long14" data-tooltip="Caracteristique">{{carac.name}} : {{carac.qualite}}</h3>
-            <label class="item-field item-field-label-short">{{carac.value}}</label>            
-            <label class="item-field item-field-label-medium">{{carac.dice}} (xp : {{carac.experience}})</label>            
+      <ul>
+        <li class="flexrow">
+          <img class="sheet-competence-img" src="/systems/fvtt-te-deum/images/icons/{{key}}.webp" />
+          <h3 class="item-field-label-long14" data-tooltip="Caracteristique">{{carac.name}} : {{carac.qualite}}</h3>
+          <label class="item-field item-field-label-short">{{carac.value}}</label>
+          <label class="item-field item-field-label-medium">{{carac.dice}} (xp : {{carac.experience}})</label>
+        </li>
+        <ul class="ul-level1 flexrow item-list">
+          {{#each carac.competences as |comp skillkey|}}
+          <li class="flexrow carac-box comp-box item-id" data-item-id="{{comp.id}}">
+            <label class="item-left-pad item-field item-field-label-long">
+              <a class="roll-competence" data-comp-id="{{comp.id}}">{{comp.name}} {{comp.system.formula}} </a>
+            </label>
+            <span>&nbsp;</span>
+            <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+            <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
           </li>
-          <ul class="ul-level1 flexrow item-list">
-            {{#each carac.competences as |comp skillkey|}}
-            <li class="flexrow carac-box comp-box item-id" data-item-id="{{comp.id}}">
-              <label class="item-left-pad item-field item-field-label-long">
-                <a class="roll-competence" data-comp-id="{{comp.id}}">{{comp.name}} {{comp.system.formula}} </a>
-              </label>
-              <span>&nbsp;</span>
-              <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-            </li>
-            {{/each}}
-          </ul>
+          {{/each}}
         </ul>
+      </ul>
       {{/each}}
 
     </div>
@@ -151,7 +236,7 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{arme.img}}" /></a>
           <span class="item-field-label-long">
-            <a class="roll-arme">
+            <a class="roll-arme" data-arme-id="{{arme._id}}">
               {{arme.name}}
             </a>
           </span>
@@ -191,6 +276,28 @@
         {{/each}}
       </ul>
 
+      <div class="center-content">
+        <div class="corps-combat-block flexrow">
+          <img src="/systems/fvtt-te-deum/images/ui/femme_gauche.webp" class="silhouette-combat-picture" />
+          <div class="silhouette-combat-space"></div>
+          <img src="/systems/fvtt-te-deum/images/ui/homme_droit.webp" class="silhouette-combat-picture" />
+
+          {{#each combat as |loc key|}}
+          <div class="silhouette-combat-block" style="top:{{loc.coord.top}}px;left:{{loc.coord.left}}px;">
+            <h4 class="center">{{loc.score.min}}-{{loc.score.max}}. {{loc.label}}</h4>
+            <div class="flexcol">
+              {{#each loc.armures as |armure idx| }}
+                <span>{{armure.name}} ({{armure.system.protection}})</span>
+              {{/each}}
+              <span>Touché : {{touche}}</span>
+              <span>Blessures : {{blessuresTete}}</span>
+            </div>
+          </div>
+          {{/each}}
+
+        </div>
+      </div>
+
     </div>
 
 
@@ -214,7 +321,8 @@
           </span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="equipment" title="Créer un équipement"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="equipment" title="Créer un équipement"><i
+                class="fas fa-plus"></i></a>
           </div>
 
         </li>

templates/chat/chat-generic-result.hbs

@@ -27,6 +27,9 @@
         {{#if bonusMalus}}
           <li>Bonus/Malus: {{bonusMalus}} </li>
         {{/if}}
+        {{#if santeModifier}}
+          <li>Santé: {{santeModifier}} niveaux</li>
+        {{/if}}
         {{#if enableProvidence}}
           <li>Un niveau de Providence a été utilisé !</li>
         {{/if}}

templates/dialogs/roll-dialog-generic.hbs

@@ -19,10 +19,10 @@
     </div>
     {{/if}}
 
-    {{#if malusBlessures}}
+    {{#if santeModifier}}
     <div class="flexrow">
       <span class="roll-dialog-label">Malus Blessures </span>
-      <span class="roll-dialog-label">{{malusBlessures}} niveaux</span>
+      <span class="roll-dialog-label">{{santeModifier}} niveaux</span>
     </div>
     {{/if}}
 

templates/items/item-arme-sheet.hbs

@@ -85,6 +85,12 @@
           {{/each}}
 
           <h3>Autres</h3>
+
+          <li class="flexrow">
+            <label class="item-name-label-long">Equipé?</label>
+            <input type="checkbox" name="system.equipe" {{checked system.equipe}} />
+          </li>
+
           <li class="flexrow">
             <label class="item-name-label-long">Bonus d'Initiative</label>
             <input type="text" class="padd-right numeric-input item-field-label-short"

templates/items/item-armure-sheet.hbs

@@ -32,6 +32,11 @@
               name="system.protection" value="{{system.protection}}" data-dtype="Number" />
           </li>
           
+          <li class="flexrow">
+            <label class="item-name-label-long">Equipé?</label>
+            <input type="checkbox" name="system.equipe" {{checked system.equipe}} />
+          </li>
+
           <li class="flexrow">
             <label class="item-name-label-long">Prix</label>
             <input type="text" class="padd-right numeric-input item-field-label-short"

templates/items/item-blessure-sheet.hbs

@@ -0,0 +1,38 @@
+<form class="{{cssClass}}" autocomplete="off">
+  <header class="sheet-header">
+    <img class="item-sheet-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>
+
+  {{> systems/fvtt-te-deum/templates/items/partial-item-nav.hbs}}
+
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{> systems/fvtt-te-deum/templates/items/partial-item-description.hbs}}
+
+    <div class="tab details" data-group="primary" data-tab="details">
+
+        <ul>
+          <li class="flexrow">
+            <label class="item-name-label-long">Type de Blessure</label>
+            <select name="system.typeBlessure">
+              {{selectOptions config.blessures selected=system.typeBlessure valueAttr="key" nameAttr="key" labelAttr="label"}}
+            </select>
+          </li>
+          <li class="flexrow">
+            <label class="item-name-label-long">Localisation</label>
+            <select name="system.localisation">
+              {{selectOptions config.LOCALISATION selected=system.localisation valueAttr="id" nameAttr="id" labelAttr="label"}}
+            </select>
+          </li>
+        </ul>
+
+      </div>
+    </div>
+
+  </section>
+</form>

templates/items/item-maladie-sheet.hbs

@@ -0,0 +1,59 @@
+<form class="{{cssClass}}" autocomplete="off">
+  <header class="sheet-header">
+    <img class="item-sheet-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>
+
+  {{> systems/fvtt-te-deum/templates/items/partial-item-nav.hbs}}
+
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{> systems/fvtt-te-deum/templates/items/partial-item-description.hbs}}
+
+    <div class="tab details" data-group="primary" data-tab="details">
+
+        <h4 class="item-name-label-long">Transmission</h4>
+        <textarea name="system.transmission" data-dtype="String">
+          {{{system.transmission}}}
+          </textarea>
+
+        <h4 class="item-name-label-long">Symptômes</h4>
+        <textarea name="system.symptomes" data-dtype="String">
+              {{{system.symptomes}}}
+          </textarea>
+
+        <ul>          
+          <li class="flexrow">
+            <label class="item-name-label-long">Difficulté au test d'Endurance</label>
+            <select class="" type="text" name="system.difficulteEndurance" data-dtype="String">
+                {{selectOptions config.difficulte selected=system.difficulteEndurance abelAttr="label"}}
+            </select>
+          </li>
+          <li class="flexrow">
+            <label class="item-name-label-long">Virulence</label>
+            <select name="system.virulence">
+              {{selectOptions config.virulence selected=system.virulence labelAttr="label"}}
+            </select>
+          </li>
+          <li class="flexrow">
+            <label class="item-name-label-long">Fièvre</label>
+            <select name="system.fievre">
+              {{selectOptions config.fievre selected=system.fievre labelAttr="label"}}
+            </select>
+          </li>
+          <li class="flexrow">
+            <label class="item-name-label-long">Appliquée?</label>
+            <input type="checkbox" name="system.appliquee" {{checked system.appliquee}} />
+          </li>
+
+        </ul>
+
+      </div>
+    </div>
+
+  </section>
+</form>

templates/items/item-simple-sheet.hbs

@@ -0,0 +1,62 @@
+<form class="{{cssClass}}" autocomplete="off">
+  <header class="sheet-header">
+    <img class="item-sheet-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>
+
+  {{> systems/fvtt-te-deum/templates/items/partial-item-nav.hbs}}
+
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{> systems/fvtt-te-deum/templates/items/partial-item-description.hbs}}
+
+    <div class="tab details" data-group="primary" data-tab="details">
+
+        <h4 class="item-name-label-long">Vertus médicinales</h4>
+        <textarea name="system.vertus" data-dtype="String">
+          {{{system.vertus}}}
+          </textarea>
+
+        <h4 class="item-name-label-long">Toxicité</h4>
+        <textarea name="system.toxicite" data-dtype="String">
+              {{{system.toxicite}}}
+          </textarea>
+
+        <ul>          
+          <li class="flexrow">
+            <label class="item-name-label-long">Difficulté au test d'Endurance</label>
+            <select class="" type="text" name="system.difficulteEndurance" data-dtype="String">
+                {{selectOptions config.difficulte selected=system.difficulteEndurance abelAttr="label"}}
+            </select>
+          </li>
+          <li class="flexrow">
+            <label class="item-name-label-long">Virulence</label>
+            <select name="system.virulence">
+              {{selectOptions config.virulencePoison selected=system.virulence labelAttr="label"}}
+            </select>
+          </li>
+          <li class="flexrow">
+            <label class="item-name-label-long">Appliquée?</label>
+            <input type="checkbox" name="system.appliquee" {{checked system.appliquee}} />
+          </li>
+
+          <li class="flexrow">
+            <label class="item-name-label-long">Valeur moyenne</label>
+            <input type="text" class="padd-right numeric-input item-field-label-short"
+              name="system.prix" value="{{system.prix}}" data-dtype="Number" />
+            <select name="system.monnaie">
+              {{selectOptions config.monnaie selected=system.monnaie labelAttr="label" blank="denier"}}
+            </select>
+          </li>
+
+        </ul>
+
+      </div>
+    </div>
+
+  </section>
+</form>