Dur au mal, parade, initiative management, amelioration dialogues, bonus/malus sur jets

templates/chat-degats-result.html

@@ -22,7 +22,7 @@
     <li>Dégats : {{finalResult}}</li>    
     {{#if targetVigueur}}
       <li>Vigueur de la cible : {{targetVigueur}}</li>    
-      <li>Etats de Combativité perdus : {{nbEtatPerdus}}</li>    
+      <li>Etats Combativité supplémentaires perdus (manuel): {{nbEtatPerdus}} </li>
     {{/if}}
   </ul>
 </div>

templates/chat-generic-result.html

@@ -64,7 +64,7 @@
 
     {{#if isSuccess}}
       {{#if arme}}
-        <li>Votre adversaire perd 1 Etat de Combativité </li>
+        <li>Votre adversaire perd 1 Etat de Combativité (manuel) </li>
         {{#if (not arme.system.onlevelonly)}}
           <button class="chat-card-button roll-chat-degat">Dégats de l'arme</button>
         {{/if}}

templates/partial-automation.html

@@ -16,8 +16,8 @@
           value="{{automation.eventtype}}" data-dtype="String">
           {{#select automation.eventtype}}
           <option value="on-drop">Drop sur l'acteur</option>
-          <option value="prepare-actor">Préparation de l'acteur</option>
           <option value="prepare-roll">Préparation d'un jet</option>
+          <option value="bonus-permanent">Bonus permanent</option>
           {{/select}}
         </select>
 
@@ -39,6 +39,23 @@
       </li>
       {{/if}}
 
+      {{#if (eq automation.eventtype "bonus-permanent")}}
+      <li class="automation-item item flexrow">
+        <label class="generic-label item-field-label-long">Désignation</label>
+        <select class="item-field-label-long automation-edit-field" type="text" data-automation-index="{{key}}" data-automation-field="bonusname"
+          value="{{automation.bonusname}}" data-dtype="String">
+          {{#select automation.bonusname}}
+          <option value="vigueur">Vigueur</option>
+          <option value="bonus-defensif">Bonus au Seuil de Défense</option>
+          {{/select}}
+        </select>
+      </li>
+      <li class="automation-item item flexrow">
+        <label class="generic-label item-field-label-long">Bonus</label>
+        <input type="text" class="item-field-label-medium automation-edit-field" data-automation-index="{{key}}" data-automation-field="bonus" value="{{automation.bonus}}" data-dtype="Number" />
+      </li>
+      {{/if}}
+
       {{#if (eq automation.eventtype "prepare-roll")}}
       <li class="automation-item item flexrow">
         <label class="generic-label item-field-label-long">Compétence/Attribut</label>

templates/roll-dialog-generic.html

@@ -20,21 +20,21 @@
         </select>      
       {{else}}
         <span class="roll-dialog-label">{{attr.label}}</span>
-        <span class="small-label">{{attr.value}}</span>
+        <span class="small-label roll-dialog-label">{{attr.value}}</span>
       {{/if}}
     </div>
 
     {{#if nbAdversites}}
     <div class="flexrow">
-      <span class="roll-dialog-label">Malus d'adversités : </span>
-      <span class="small-label">- {{nbAdversites}}</span>
+      <span class="roll-dialog-label">Malus d'adversités </span>
+      <span class="small-label roll-dialog-label">- {{nbAdversites}}</span>
     </div>
     {{/if}}
-    
+
     {{#if competence}}
       <div class="flexrow">
         <span class="roll-dialog-label">{{competence.name}}</span>
-        <span class="small-label">{{competence.system.niveau}}</span>
+        <span class="small-label roll-dialog-label">{{competence.system.niveau}}</span>
       </div>
       {{#if maitrises}}
       <div class="flexrow">
@@ -53,7 +53,7 @@
 
     {{#if (count talents)}}
     <div class="flexrow">
-      <span class="roll-dialog-label">Talents applicables :</span>
+      <span class="roll-dialog-label">Talents </span>
       <select class="flex1" name="competence-talents" id="competence-talents" data-type="String" multiple>
         {{#each talents as |talent key|}}
           <option value="{{talent._id}}">{{talent.name}}</option>
@@ -62,12 +62,33 @@
     </div>
     {{/if}}
 
+    <div class="flexrow">
+      <span class="roll-dialog-label">Bonus/Malus </span>
+      <select class="roll-dialog-label" id="bonus-malus-context" type="text" value="{{bonusMalusContext}}"
+        data-dtype="Number">
+        {{#select bonusMalusContext}}
+        <option value="-4">-4</option>
+        <option value="-3">-3</option>
+        <option value="-2">-2</option>
+        <option value="-1">-1</option>
+        <option value="0">0</option>
+        <option value="1">+1</option>
+        <option value="2">+2</option>
+        <option value="3">+3</option>
+        <option value="4">+4</option>
+        {{/select}}
+      </select>
+    </div>
+
     {{#if armeDefense}}
     <div class="flexrow">
       <span class="roll-dialog-label">Défense adversaire : </span>
       <span class="roll-dialog-label"><strong>{{difficulte}}</strong> </span>
     </div>
     {{else}}
+      {{#if isInit}}
+
+      {{else}}
       <div class="flexrow">
         <span class="roll-dialog-label">Difficulté : </span>
         <select class="roll-dialog-label" id="difficulte" type="text" name="difficulte" value="{{difficulte}}"
@@ -82,9 +103,10 @@
           <option value="30">Pure Folie (30)</option>
           {{/select}}
         </select>
+      {{/if}}
       </div>
     {{/if}}
-
+    
   </div>
 
 </form>