Merge branch 'v1.4-fix-182' into 'v1.4'

Fix xp des compétences tronc #182

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

module/item-competence.js

@@ -151,11 +151,11 @@ export class RdDItemCompetence extends Item {
   static computeEconomieXPTronc(competences) {
     return competenceTroncs.map(
       list => list.map(name => RdDItemCompetence.findCompetence(competences, name))
-        // calcul du coût xp jusqu'au niveau 0 maximum
-        .map(it => RdDItemCompetence.computeDeltaXP(it?.data.base ?? -11, Math.min(it?.data.niveau ?? -11, 0)))
-        .sort(Misc.descending(x => x))
-        .splice(0, 1) // ignorer le coût xp le plus élevé
-        .reduce(Misc.sum(), 0)
+          // calcul du coût xp jusqu'au niveau 0 maximum
+          .map(it => RdDItemCompetence.computeDeltaXP(it?.data.base ?? -11, Math.min(it?.data.niveau ?? -11, 0)))
+          .sort(Misc.ascending()) 
+          .splice(0, list.length-1) // prendre toutes les valeurs sauf l'une des plus élevées
+          .reduce(Misc.sum(), 0)
     ).reduce(Misc.sum(), 0);
   }
 

module/misc.js

@@ -22,11 +22,11 @@ export class Misc {
     return (a, b) => a + b;
   }
 
-  static ascending(orderFunction) {
+  static ascending(orderFunction = x=>x) {
     return (a, b) => Misc.sortingBy(orderFunction(a), orderFunction(b));
   }  
 
-  static descending(orderFunction) {
+  static descending(orderFunction = x=>x) {
     return (a, b) => Misc.sortingBy(orderFunction(b), orderFunction(a));
   }  
 

module/rdd-roll.js

@@ -219,14 +219,15 @@ export class RdDRoll extends Dialog {
       this.rollData.dmg.mortalite = event.currentTarget.checked ? "non-mortel" : "mortel";
       this.updateRollResult();
     });
-    html.find('#tactique-combat').change((event) => {
-      this.rollData.tactique = event.currentTarget.value;
-      this.updateRollResult();
-    });
     html.find('.cuisine-proportions').change((event) => {
       this.rollData.proportions = Number(event.currentTarget.value);
       this.updateRollResult();
     });
+    html.find('.select-by-name').change((event) => {
+      const attribute = event.currentTarget.attributes['name'].value;
+      this.rollData[attribute] = event.currentTarget.value;
+      this.updateRollResult();
+    });
     html.find('.checkbox-by-name').change((event) => {
       const attribute = event.currentTarget.attributes['name'].value;
       this.rollData[attribute] = event.currentTarget.checked;

templates/dialog-competence.html

@@ -50,7 +50,7 @@
     {{else}}
     <span class="tooltip">
       <label>Tactique:</label>
-        <select name="tactique-combat" id="tactique-combat" data-dtype="String" {{#unless use.conditions}}disabled{{/unless}}>
+        <select class="select-by-name" name="tactique" id="tactique-combat" data-dtype="String" {{#unless use.conditions}}disabled{{/unless}}>
           <option value="Attaque normale">Attaque normale</option>
           <option value="charge">Charge</option>
           <option value="feinte">Feinte</option>