From bcbd4ab58cced7b8de167fe48a106f0077682984 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Sat, 27 Feb 2021 22:59:10 +0100
Subject: [PATCH] Fix initiative

---
 module/rdd-combat.js  | 22 ++++++++++++++++++++++
 module/rdd-utility.js | 21 ---------------------
 system.json           |  2 +-
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/module/rdd-combat.js b/module/rdd-combat.js
index b84c8d6a..dafda8ed 100644
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@@ -9,6 +9,27 @@ import { RdDRoll } from "./rdd-roll.js";
 import { RdDRollTables } from "./rdd-rolltables.js";
 import { ReglesOptionelles } from "./regles-optionelles.js";
 
+/* -------------------------------------------- */
+const premierRoundInit = [
+  { pattern: 'hast', init: 3.90 },
+  { pattern: 'lance', init: 3.85 },
+  { pattern: 'baton', init: 3.80 },
+  { pattern: 'doubledragonne', init: 3.75 },
+  { pattern: 'esparlongue', init: 3.70 },
+  { pattern: 'epeedragonne', init: 3.65 },
+  { pattern: 'epeebatarde', init: 3.60 },
+  { pattern: 'epeecyane', init: 3.55 },
+  { pattern: 'epeesorde', init: 3.50 },
+  { pattern: 'grandehache', init: 3.45 },
+  { pattern: 'bataille', init: 3.40 },
+  { pattern: 'epeegnome', init: 3.35 },
+  { pattern: 'masse', init: 3.30 },
+  { pattern: 'gourdin', init: 3.25 },
+  { pattern: 'fléau', init: 3.20 },
+  { pattern: 'dague', init: 3.15 },
+  { pattern: 'autre', init: 3.10 },
+];
+
 /* -------------------------------------------- */
 export class RdDCombatManager extends Combat {
 
@@ -283,6 +304,7 @@ export class RdDCombatManager extends Combat {
 
   /* -------------------------------------------- */
   static displayInitiativeMenu(html, combatantId) {
+    console.log("Combatant ; ", combatantId);
     const combatant = game.combat.getCombatant(combatantId);
     let armesList = RdDCombatManager.buildListeActionsCombat(combatant);
 
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 0c579375..0e952cfe 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -81,27 +81,6 @@ const tableCaracDerivee = {
   32: { xp: 180, poids: "1501-2000", plusdom: +11, sconst: 10, sust: 17 }
 }
 
-/* -------------------------------------------- */
-const premierRoundInit = [
-  { pattern: 'hast', init: 3.90 },
-  { pattern: 'lance', init: 3.85 },
-  { pattern: 'baton', init: 3.80 },
-  { pattern: 'doubledragonne', init: 3.75 },
-  { pattern: 'esparlongue', init: 3.70 },
-  { pattern: 'epeedragonne', init: 3.65 },
-  { pattern: 'epeebatarde', init: 3.60 },
-  { pattern: 'epeecyane', init: 3.55 },
-  { pattern: 'epeesorde', init: 3.50 },
-  { pattern: 'grandehache', init: 3.45 },
-  { pattern: 'bataille', init: 3.40 },
-  { pattern: 'epeegnome', init: 3.35 },
-  { pattern: 'masse', init: 3.30 },
-  { pattern: 'gourdin', init: 3.25 },
-  { pattern: 'fléau', init: 3.20 },
-  { pattern: 'dague', init: 3.15 },
-  { pattern: 'autre', init: 3.10 },
-];
-
 /* -------------------------------------------- */
 function _buildAllSegmentsFatigue(max) {
   const cycle = [5, 2, 4, 1, 3, 0];
diff --git a/system.json b/system.json
index 1e23b4f2..70076bb4 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "1.3.24",
+  "version": "1.3.25",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.7.5",
   "compatibleCoreVersion": "0.7.9",