Moral sur les oeuvres

Simplification de l'appel au moral pour les oeuvres

Ajout de la possibilité d'utiliser le moral sur les oeuvres

Affichage du moral/appel selon la caractéristique

templates/actor-sheet.html

@@ -1,4 +1,3 @@
-{{log "handlebar actor-sheet" this}} 
 <form class="{{cssClass}}" autocomplete="off">
 
     {{!-- Sheet Header --}}
@@ -198,9 +197,9 @@
                         {{else if (eq compteur.label 'Ethylisme')}}
                         <a class="item-control ethylisme-test" id="ethylisme-test" title="Jet d'Ethylisme">Jet d'Ethylisme</a>
                         {{else if (eq compteur.label 'Moral')}}
-                        <a id="moral-malheureux" title="Jet de moral situation malheureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-malheureux.svg" alt="Jet de moral situation malheureuse"/></a>
-                        <a id="moral-neutre" title="Jet de moral situation neutre"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg" alt="Jet de moral situation neutre"/></a>
-                        <a id="moral-heureux" title="Jet de moral situation heureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-heureux.svg" alt="Jet de moral situation heureuse"/></a>
+                        <a class="moral-malheureux" title="Jet de moral situation malheureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-malheureux.svg" alt="Jet de moral situation malheureuse"/></a>
+                        <a class="moral-neutre" title="Jet de moral situation neutre"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg" alt="Jet de moral situation neutre"/></a>
+                        <a class="moral-heureux" title="Jet de moral situation heureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-heureux.svg" alt="Jet de moral situation heureuse"/></a>
                         {{else}}
                         <label></label>
                       {{/if}}

templates/dialog-competence.html

@@ -1,7 +1,7 @@
 <form class="skill-roll-dialog">
 <h2 class="compdialog" id="compdialogTitle"></h2>
 <div class="form-group">
-  <label for="categorie">Caractéristique </label>
+  <label>Caractéristique </label>
   <select name="carac" id="carac" data-dtype="String">
       {{#select carac}}
       {{#each carac as |caracitem key|}}
@@ -9,21 +9,19 @@
       {{/each}}
       {{/select}}
   </select>
-  <label></label>
-  <div class="form-group" id="divAppelAuMoral" >
-    <div class="tooltipAppelAuMoral">
-      <input class="diffAppelAuMoral"  id="useAppelAuMoralCheckbox" type="checkbox" name="appelAuMoralDemander" />
-      <img for="useAppelAuMoralCheckbox" class="iconeSmile"  id="iconeSmile" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
-      <span class="tooltipAppelAuMoralText" id="tooltipAppelAuMoralText">Sans appel au moral</span>
-    </div>
-  </div> 
+
+  <label class="diffMoral">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label>
+  <div class="tooltipAppelAuMoral divAppelAuMoral">
+    <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
+    <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+  </div>
 </div>
 <div class="form-group">
   {{#if attackerRoll}}
-  <label for="categorie">Difficulté</label>
+  <label>Difficulté</label>
   <label>{{diffLibre}}</label>
   {{else}}
-  <label for="categorie">Difficulté libre</label>
+  <label>Difficulté libre</label>
   <select name="diffLibre" id="diffLibre" data-dtype="number" {{#unless use.libre}}disabled{{/unless}}>
       {{#select diffLibre}}
       {{#each difficultesLibres as |key|}}
@@ -32,7 +30,7 @@
       {{/select}}
   </select>
   {{/if}}
-  <label for="categorie">&nbsp;&nbsp;Conditions</label>
+  <label>&nbsp;&nbsp;Conditions</label>
   <select name="diffConditions" id="diffConditions" data-dtype="number" {{#unless use.conditions}}disabled{{/unless}}>
       {{#select diffConditions}}
       {{#each ajustementsConditions  as |key|}}
@@ -40,19 +38,18 @@
       {{/each}}
       {{/select}}
   </select>
-  <label class="diffMoral" for="categorie">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label>
 </div>
 {{#if arme}}
   <div class="form-group">
     {{#if attackerRoll}}
       {{#if attackerRoll.tactique}}
-      <label for="categorie">Tactique: {{attackerRoll.tactique}}</label>
+      <label>Tactique: {{attackerRoll.tactique}}</label>
       {{/if}}
-      <label for="categorie">D&eacute;gats:</label><label id="dmg-arme-actor"></label>
+      <label>D&eacute;gats:</label><label id="dmg-arme-actor"></label>
       <label></label>
     {{else}}
     <span class="tooltip">
-      <label for="categorie">Tactique:</label>
+      <label>Tactique:</label>
         <select name="tactique-combat" id="tactique-combat" data-dtype="String" {{#unless use.conditions}}disabled{{/unless}}>
           <option value="Attaque normale">Attaque normale</option>
           <option value="charge">Charge</option>
@@ -65,12 +62,12 @@
           </div>
         </div>
       </span>
-      <label for="categorie">D&eacute;gats:</label><label id="dmg-arme-actor"></label>
+      <label>D&eacute;gats:</label><label id="dmg-arme-actor"></label>
       <label>Non Mortel</label>
       <input class="attribute-value" type="checkbox" id="coupsNonMortels" name="coupsNonMortels"  {{#if coupsNonMortels}}checked{{/if}}/>
     {{/if}}
     {{#if ajustements.attaqueDefenseurSurpris.used}}
-    <label for="categorie" id="defenseur-surprise">{{ajustements.attaqueDefenseurSurpris.label}}</label>
+    <label id="defenseur-surprise">{{ajustements.attaqueDefenseurSurpris.label}}</label>
     {{/if}}
   </div>
 {{/if}}

templates/dialog-roll-alchimie.html

@@ -1,14 +1,18 @@
 <form class="dialog-roll-sort">
 <div class="form-group">
   <ul>
-    <li><label for="categorie">Recette : {{recetteName}}</label></li>
-    <li><label for="categorie">Tâche Alchimique : {{alchimieTexte}}</label></li>
-    <li><label for="categorie">Jet : {{selectedCarac.label}} / {{competence.name}}</label></li>
+    <li><label>Recette : {{recetteName}}</label></li>
+    <li><label>Tâche Alchimique : {{alchimieTexte}}</label></li>
+    <li><label>Jet : {{selectedCarac.label}} / {{competence.name}}</label></li>
   </ul>
+  <div class="tooltipAppelAuMoral divAppelAuMoral">
+    <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
+    <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+  </div>
 </div>
 
 <div class="form-group">
-  <label for="categorie">conditions</label>
+  <label>conditions</label>
   <select name="diffConditions" id="diffConditions" data-dtype="number">
       {{#select diffConditions}}
       {{#each ajustementsConditions as |key|}}
@@ -16,7 +20,7 @@
       {{/each}}
       {{/select}}
   </select>
-  <label for="categorie">Difficulté </label>
+  <label>Difficulté </label>
   <select name="diffLibre" id="diffLibre" data-dtype="number">
     {{#select diffLibre}}
     {{#each difficultesLibres  as |key|}}

templates/dialog-roll-carac.html

@@ -1,32 +1,37 @@
 <form class="skill-roll-dialog">
-<h2 class="compdialog" id="compdialogTitle"></h2>
-<div class="form-group">
-  <label for="categorie">Difficulté libre</label>
-  <select name="diffLibre" id="diffLibre" data-dtype="number">
+  <h2 class="compdialog" id="compdialogTitle"></h2>
+  <div class="form-group">
+    <label>Difficulté libre</label>
+    <select name="diffLibre" id="diffLibre" data-dtype="number">
       {{#select diffLibre}}
       {{#each difficultesLibres as |key|}}
       <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
       {{/each}}
       {{/select}}
-  </select>
-  <label for="categorie">conditions</label>
-  <select name="diffConditions" id="diffConditions" data-dtype="number">
+    </select>
+    <label>conditions</label>
+    <select name="diffConditions" id="diffConditions" data-dtype="number">
       {{#select diffConditions}}
       {{#each ajustementsConditions as |key|}}
       <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
       {{/each}}
       {{/select}}
-  </select>
-  <label class="diffMoral" for="categorie">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label>
-</div>
-{{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}}
-<div id="tableAjustements">
-</div>
-<div id="tableResolution">
-</div>
-<div id="tableProbaReussite">  
-</div>
+    </select>
+    <label class="diffMoral">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label>
+    <div class="tooltipAppelAuMoral divAppelAuMoral">
+      <img class="imgAppelAuMoral small-button-container"
+        src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
+      <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+    </div>
+  </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}}
+  <div id="tableAjustements">
+  </div>
+  <div id="tableResolution">
+  </div>
+  <div id="tableProbaReussite">
+  </div>
 </form>
 
 <script>
-</script>
+</script>

templates/dialog-roll-chant.html

@@ -1,13 +1,17 @@
 <form class="dialog-roll-sort">
 <div class="form-group">
   <ul>
-    <li><label for="categorie">Chant : {{chant.name}}</label></li>
-    <li><label for="categorie">Jet : OUIE / {{competence.name}}</label></li>
+    <li><label>Chant : {{oeuvre.name}}</label></li>
+    <li><label>Jet : OUIE / {{competence.name}}</label></li>
   </ul>
-</div>
+  <div class="tooltipAppelAuMoral divAppelAuMoral">
+    <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
+    <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+  </div>
+</div> 
 
 <div class="form-group">
-  <label for="categorie">conditions</label>
+  <label>conditions</label>
   <select name="diffConditions" id="diffConditions" data-dtype="number">
       {{#select diffConditions}}
       {{#each ajustementsConditions as |key|}}
@@ -15,7 +19,7 @@
       {{/each}}
       {{/select}}
   </select>
-  <label for="categorie">Difficulté </label>
+  <label>Difficulté </label>
   <select name="diffLibre" id="diffLibre" data-dtype="number">
     {{#select diffLibre}}
     {{#each difficultesLibres  as |key|}}

templates/dialog-roll-danse.html

@@ -1,46 +1,52 @@
 <form class="dialog-roll-danse">
-<div class="form-group">
-  <ul>
-    <li><label for="categorie">Danse : {{danse.name}}</label></li>
-    <li><label for="categorie">Jet : APPARENCE ou AGILITE / {{competence.name}}</label></li>
-  </ul>
-</div>
+  <div class="form-group">
+    <ul>
+      <li><label>Danse : {{oeuvre.name}}</label></li>
+      <li><label>Jet : APPARENCE ou AGILITE / {{competence.name}}</label></li>
+    </ul>
+  </div>
 
-<label for="categorie">Caractéristique</label>
-<select name="carac" id="carac" class="select-diff" data-dtype="String">
-    {{#select carac}}
-    {{#each carac as |caracitem key|}}
-    <option value={{key}}>{{caracitem.label}}</option>
-    {{/each}}
-    {{/select}}
-</select>
+  <div class="form-group">
+    <label>Caractéristique</label>
+    <select name="carac" id="carac" class="select-diff" data-dtype="String">
+      {{#select carac}}
+      {{#each carac as |caracitem key|}}
+      <option value={{key}}>{{caracitem.label}}</option>
+      {{/each}}
+      {{/select}}
+    </select>
+    <div class="tooltipAppelAuMoral divAppelAuMoral">
+      <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
+      <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+    </div>
+  </div>
 
-<div class="form-group">
-  <label for="categorie">conditions</label>
-  <select name="diffConditions" id="diffConditions" data-dtype="number">
+  <div class="form-group">
+    <label>conditions</label>
+    <select name="diffConditions" id="diffConditions" data-dtype="number">
       {{#select diffConditions}}
       {{#each ajustementsConditions as |key|}}
       <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
       {{/each}}
       {{/select}}
-  </select>
-  <label for="categorie">Difficulté </label>
-  <select name="diffLibre" id="diffLibre" data-dtype="number">
-    {{#select diffLibre}}
-    {{#each difficultesLibres  as |key|}}
-    <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-    {{/each}}
-  {{/select}}
-  </select>
-</div>
+    </select>
+    <label>Difficulté </label>
+    <select name="diffLibre" id="diffLibre" data-dtype="number">
+      {{#select diffLibre}}
+      {{#each difficultesLibres as |key|}}
+      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
+      {{/each}}
+      {{/select}}
+    </select>
+  </div>
 
-<div id="tableAjustements">
-</div>
-<div id="tableResolution">
-</div>
-<div id="tableProbaReussite">  
-</div>
+  <div id="tableAjustements">
+  </div>
+  <div id="tableResolution">
+  </div>
+  <div id="tableProbaReussite">
+  </div>
 </form>
 
 <script>
-</script>
+</script>

templates/dialog-roll-jeu.html

@@ -1,46 +1,52 @@
 <form class="dialog-roll-sort">
-<div class="form-group">
-  <ul>
-    <li><label for="competence-label">Jouer à : {{oeuvre.name}}</label></li>
-    <li><label for="competence-label">Type : {{oeuvre.data.type}}</label></li>
-    <li><label for="competence-label">Base : {{oeuvre.data.base}}</label></li>
-    <li><label for="competence-label">Carac/Compétence : {{oeuvre.data.caraccomp}}</label></li>
-  </ul>
-</div>
-<div class="form-group">
-  <label for="categorie">Caractéristique</label>
-  <select name="carac" id="carac" class="select-diff" data-dtype="String">
-    {{#select carac}}
-    {{#each carac as |caracitem key|}}
-    <option value={{key}}>{{caracitem.label}}</option>
-    {{/each}}
-    {{/select}}
-  </select>
-  <label for="categorie">conditions</label>
-  <select name="diffConditions" id="diffConditions" data-dtype="number">
+  <div class="form-group">
+    <ul>
+      <li><label for="competence-label">Jouer à : {{oeuvre.name}}</label></li>
+      <li><label for="competence-label">Type : {{oeuvre.data.type}}</label></li>
+      <li><label for="competence-label">Base : {{oeuvre.data.base}}</label></li>
+      <li><label for="competence-label">Carac/Compétence : {{oeuvre.data.caraccomp}}</label></li>
+    </ul>
+  </div>
+  <div class="form-group">
+    <label>Caractéristique</label>
+    <select name="carac" id="carac" class="select-diff" data-dtype="String">
+      {{#select carac}}
+      {{#each carac as |caracitem key|}}
+      <option value={{key}}>{{caracitem.label}}</option>
+      {{/each}}
+      {{/select}}
+    </select>
+    <div class="tooltipAppelAuMoral divAppelAuMoral">
+      <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
+      <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+    </div>
+  </div>
+  <div class="form-group">
+    <label>Conditions</label>
+    <select name="diffConditions" id="diffConditions" data-dtype="number">
       {{#select diffConditions}}
       {{#each ajustementsConditions as |key|}}
       <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
       {{/each}}
       {{/select}}
-  </select>
-  <label for="categorie">Difficulté </label>
-  <select name="diffLibre" id="diffLibre" data-dtype="number">
-    {{#select diffLibre}}
-    {{#each difficultesLibres  as |key|}}
-    <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-    {{/each}}
-  {{/select}}
-  </select>
-</div>
+    </select>
+    <label>Difficulté </label>
+    <select name="diffLibre" id="diffLibre" data-dtype="number">
+      {{#select diffLibre}}
+      {{#each difficultesLibres as |key|}}
+      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
+      {{/each}}
+      {{/select}}
+    </select>
+  </div>
 
-<div id="tableAjustements">
-</div>
-<div id="tableResolution">
-</div>
-<div id="tableProbaReussite">  
-</div>
+  <div id="tableAjustements">
+  </div>
+  <div id="tableResolution">
+  </div>
+  <div id="tableProbaReussite">
+  </div>
 </form>
 
 <script>
-</script>
+</script>

templates/dialog-roll-musique.html

@@ -1,13 +1,17 @@
 <form class="dialog-roll-sort">
 <div class="form-group">
   <ul>
-    <li><label for="categorie">Jouer une Musique : {{musique.name}}</label></li>
-    <li><label for="categorie">Jet : OUIE / {{competence.name}}</label></li>
+    <li><label>Jouer une Musique : {{oeuvre.name}}</label></li>
+    <li><label>Jet : OUIE / {{competence.name}}</label></li>
   </ul>
+  <div class="tooltipAppelAuMoral divAppelAuMoral">
+    <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
+    <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+  </div>
 </div>
 
 <div class="form-group">
-  <label for="categorie">conditions</label>
+  <label>conditions</label>
   <select name="diffConditions" id="diffConditions" data-dtype="number">
       {{#select diffConditions}}
       {{#each ajustementsConditions as |key|}}
@@ -15,7 +19,7 @@
       {{/each}}
       {{/select}}
   </select>
-  <label for="categorie">Difficulté </label>
+  <label>Difficulté </label>
   <select name="diffLibre" id="diffLibre" data-dtype="number">
     {{#select diffLibre}}
     {{#each difficultesLibres  as |key|}}

templates/dialog-roll-oeuvre.html

@@ -1,13 +1,17 @@
 <form class="dialog-roll-sort">
 <div class="form-group">
   <ul>
-    <li><label for="categorie">Interpréter une Oeuvre : {{oeuvre.name}}</label></li>
-    <li><label for="categorie">Jet : {{upperFirst oeuvre.data.default_carac}} / {{competence.name}}</label></li>
+    <li><label>Interpréter une Oeuvre : {{oeuvre.name}}</label></li>
+    <li><label>Jet : {{upperFirst oeuvre.data.default_carac}} / {{competence.name}}</label></li>
   </ul>
+  <div class="tooltipAppelAuMoral divAppelAuMoral">
+    <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
+    <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+  </div>
 </div>
 
 <div class="form-group">
-  <label for="categorie">conditions</label>
+  <label>conditions</label>
   <select name="diffConditions" id="diffConditions" data-dtype="number">
       {{#select diffConditions}}
       {{#each ajustementsConditions as |key|}}
@@ -15,7 +19,7 @@
       {{/each}}
       {{/select}}
   </select>
-  <label for="categorie">Difficulté </label>
+  <label>Difficulté </label>
   <select name="diffLibre" id="diffLibre" data-dtype="number">
     {{#select diffLibre}}
     {{#each difficultesLibres  as |key|}}

templates/dialog-roll-recettecuisine.html

@@ -2,14 +2,18 @@
 
 <div class="form-group">
   <ul>
-    <li><label for="categorie">Cuisiner : {{oeuvre.name}}</label></li>
-    <li><label for="categorie">Jet : ODORAT-GOUT / {{competence.name}}</label></li>
-    <li><label for="categorie">Exotisme : {{oeuvre.data.exotisme}}</label></li>
+    <li><label>Cuisiner : {{oeuvre.name}}</label></li>
+    <li><label>Jet : ODORAT-GOUT / {{competence.name}}</label></li>
+    <li><label>Exotisme : {{oeuvre.data.exotisme}}</label></li>
   </ul>
+  <div class="tooltipAppelAuMoral divAppelAuMoral">
+    <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
+    <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+  </div>
 </div>
 
 <div class="form-group">
-  <label for="categorie">conditions</label>
+  <label>conditions</label>
   <select name="diffConditions" id="diffConditions" data-dtype="number">
       {{#select diffConditions}}
       {{#each ajustementsConditions as |key|}}
@@ -17,7 +21,7 @@
       {{/each}}
       {{/select}}
   </select>
-  <label for="categorie">Difficulté </label>
+  <label>Difficulté </label>
   <select name="diffLibre" id="diffLibre" data-dtype="number">
     {{#select diffLibre}}
     {{#each difficultesLibres  as |key|}}