Merge branch 'stabilisation-v1.2' into 'v1.2'

Stabilisation v1.2

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

module/rdd-roll-resolution-table.js

@@ -49,8 +49,9 @@ export class RdDRollResolutionTable extends Dialog {
       title: titleTableDeResolution,
       content: html,
       buttons: {
-        'lancer': { label: 'Lancer les dés', callback: html => this.onAction(html) }
+        'lancer-fermer': { label: 'Lancer les dés et fermer', callback: html => this.onLancerFermer() }
-      }
+      },
+      default: 'lancer'
     };
     super(conf, { classes: ["rdddialog"], width: 800, height: 800, 'z-index': 99999 });
 
@@ -58,7 +59,14 @@ export class RdDRollResolutionTable extends Dialog {
   }
 
   /* -------------------------------------------- */
-  async onAction(html) {
+  async onLancer() {
+    await RdDResolutionTable.rollData(this.rollData);
+    console.log("RdDRollResolutionTable -=>", this.rollData, this.rollData.rolled);
+    await RdDResolutionTable.displayRollData(this.rollData);
+  }
+
+  /* -------------------------------------------- */
+  async onLancerFermer() {
     await RdDResolutionTable.rollData(this.rollData);
     console.log("RdDRollResolutionTable -=>", this.rollData, this.rollData.rolled);
     await RdDResolutionTable.displayRollData(this.rollData);
@@ -79,7 +87,9 @@ export class RdDRollResolutionTable extends Dialog {
       dialog.updateRollResult();
     }
     $(function () { onLoad();});
-    
+    html.find('#lancer').click((event) => {
+      this.onLancer();
+    });
     // Update !
     html.find('#diffLibre').change((event) => {
       this.rollData.diffLibre = Misc.toInt(event.currentTarget.value);

module/rdd-utility.js

@@ -663,11 +663,12 @@ export class RdDUtility {
     } else if (arme.name == "Draconic") {
       initOffset = 7;
     } else {
-      initOffset = 2; // Melée = 3.XX
+      initOffset = 3; // Melée = 3.XX
       let competence = RdDItemCompetence.findCompetence(combatant.actor.data.items, arme.data.competence);
       compNiveau = competence.data.niveau;
       
       if (actor.data.type == 'creature' || actor.data.type == 'entite') {
+        initOffset = 3; // Melée = 3.XX
         caracForInit = competence.data.carac_value;
       } else {
         caracForInit = actor.data.data.carac[competence.data.defaut_carac].value;

styles/simple.css

@@ -507,6 +507,11 @@ section.sheet-body:after {
   text-align: left;
   width: 2rem;
 }
+.select-diff {
+  display: inline-block;
+  text-align: left;
+  width: 50px;
+}
 
 #vie-plus, #vie-moins, #endurance-plus, #endurance-moins, #fatigue-plus, #fatigue-moins, #ptreve-actuel-plus, #ptreve-actuel-moins, .monnaie-plus, .monnaie-moins {
   display: inline-block;

templates/dialog-roll-resolution.html

@@ -1,18 +1,15 @@
 <form class="resolution-roll-dialog">
-<div class="form-group">
+<div class="flexrow flex-group-left">
-  <label for="categorie">Caractéristique </label>
+  <label for="categorie">Caractéristique</label>
-  <select name="carac" id="carac" data-dtype="String">
+  <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></label>
-</div>
-<div class="form-group">
   <label for="categorie">Difficulté libre</label>
-  <select name="diffLibre" id="diffLibre" data-dtype="number">
+  <select name="diffLibre" id="diffLibre" class="select-diff" data-dtype="number">
       {{#select diffLibre}}
       {{#each difficultesLibres as |key|}}
       <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
@@ -20,13 +17,15 @@
       {{/select}}
   </select>
   <label for="categorie">&nbsp;&nbsp;Conditions</label>
-  <select name="diffConditions" id="diffConditions" data-dtype="number">
+  <select name="diffConditions" id="diffConditions" class="select-diff" data-dtype="number">
       {{#select diffConditions}}
       {{#each ajustementsConditions as |key|}}
       <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
       {{/each}}
       {{/select}}
   </select>
+  <span class="flex-between"></span>
+  <button id="lancer" type="button">Lancer les dés</button>
 </div>
 <div id="tableResolution">  
 </div>