Merge pull request 'Fix initiative' (#584) from VincentVk/foundryvtt-reve-de-dragon:v10 into v10

Reviewed-on: #584

module/actor.js

@@ -2266,13 +2266,19 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   async appliquerAjoutExperience(rollData, hideChatMessage = 'show') {
     if (!this.isPersonnage()) return;
-    hideChatMessage = hideChatMessage == 'hide' || (game.settings.get("core", "rollMode") != 'blindroll' && !game.user.isGM)
+    hideChatMessage = hideChatMessage == 'hide' || (Misc.isRollModeHiddenToPlayer() && !game.user.isGM)
     let xpData = await this._appliquerExperience(rollData.rolled, rollData.selectedCarac.label, rollData.competence);
-    if (xpData && !hideChatMessage) {
-      ChatMessage.create({
-        whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
-        content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-gain-xp.html`, xpData)
-      });
+    if (xpData) {
+      const content = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-gain-xp.html`, xpData);
+      if (hideChatMessage) {
+        ChatUtility.blindMessageToGM({ content: content});
+      }
+      else{
+        ChatMessage.create({
+          whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
+          content: content
+        });
+      }
     }
   }
 

module/misc.js

@@ -120,13 +120,20 @@ export class Misc {
     return Misc.firstConnectedGM()?.id ?? game.user.id;
   }
 
+  static isRollModeHiddenToPlayer() {
+      switch (game.settings.get("core", "rollMode")) {
+        case CONST.DICE_ROLL_MODES.BLIND:
+        case CONST.DICE_ROLL_MODES.SELF: return true;
+      }
+      return false
+  }
+
   static getActiveUser(id) {
     return game.users.find(u => u.id == id && u.active);
-  }  
+  }
 
   static firstConnectedGM() {
     return game.users.filter(u => u.isGM && u.active).sort(Misc.ascending(u => u.id)).find(u => u.isGM && u.active);
-    
   }
 
   static isOwnerPlayer(actor, user=undefined) {

module/rdd-combat.js

@@ -84,7 +84,6 @@ export class RdDCombatManager extends Combat {
     console.log(`${game.system.title} | Combat.rollInitiative()`, ids, formula, messageOptions);
 
     ids = typeof ids === "string" ? [ids] : ids;
-    const currentId = this.combatant._id;
     // calculate initiative
     for (let cId = 0; cId < ids.length; cId++) {
       const combatant = this.combatants.get(ids[cId]);

system.json

@@ -1,8 +1,8 @@
 {
   "id": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
-  "version": "10.3.1",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.3.1.zip",
+  "version": "10.3.2",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.3.2.zip",
   "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json",
   "compatibility": {
     "minimum": "10",