Diverses corrections + ajouts armes en compendiums

modules/common/tedeum-utility.js

@@ -17,7 +17,10 @@ export class TeDeumUtility {
   }
 
   static installHooks() {
-    Hooks.on('renderChatLog', (log, html, data) => TeDeumUtility.chatListeners(html));
+    Hooks.on('renderChatMessageHTML', (message, html) => {
+      TeDeumUtility.chatListeners(html);
+      TeDeumUtility.onRenderChatMessage(message, html);
+    });
 
     Hooks.on("renderActorDirectory", (app, html, data) => {
       if (game.user.can('ACTOR_CREATE')) {
@@ -175,7 +178,6 @@ export class TeDeumUtility {
       fetch(ECRYME_WELCOME_MESSAGE_URL)
         .then(response => response.text())
         .then(html => {
-          console.log("Fetched welcome message:", html);
           ChatMessage.create({
             user: game.user.id,
             whisper: [game.user.id],
@@ -309,16 +311,24 @@ export class TeDeumUtility {
     }
   }
 
-  /* -------------------------------------------- */  /* -------------------------------------------- */
+  /* -------------------------------------------- */
+  static getTokenActorFromId(tokenId) {
+    for (let scene of game.scenes) {
+      const tokenDoc = scene.tokens.get(tokenId)
+      if (tokenDoc) return tokenDoc.actor
+    }
+    return null
+  }
+
+  /* -------------------------------------------- */
   static async appliquerDegats(rollData) {
     await this.processAttaqueMelee(rollData)
-    let defenderToken = canvas.tokens.placeables.find(t => t.id == rollData.defenderTokenId)
-    if (defenderToken) {
-      let actor = defenderToken.actor
-      if (game.user.isGM || actor.isOwner) {
-        await actor.appliquerDegats(rollData)
+    let defenderActor = this.getTokenActorFromId(rollData.defenderTokenId)
+    if (defenderActor) {
+      if (game.user.isGM || defenderActor.isOwner) {
+        await defenderActor.appliquerDegats(rollData)
       } else {
-        // Send a socket message
+        // Send a socket message — seul le premier MJ actif le traitera
         game.socket.emit("system.fvtt-te-deum", { name: "msg_apply_damage", data: { rollData } });
       }
       // Attaque naturelle avec dégats inférieur à -2
@@ -351,19 +361,27 @@ export class TeDeumUtility {
         TeDeumUtility.appliquerDegats(rollData, messageId)
       }
     })
-    $(html).on("click", '.chat-command-gain-xp', event => {
+    $(html).on("click", '.chat-command-gain-xp', async event => {
       let messageId = TeDeumUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "te-deum-rolldata")
       if (rollData) {
         let actor = TeDeumUtility.getActorFromRollData(rollData)
         actor.modifyXP(rollData.carac.key, 1)
-        // Hide this button
-        event.currentTarget.style.display = 'none';
+        event.currentTarget.style.display = 'none'; // feedback immédiat local
+        await message.setFlag("world", "te-deum-xp-used", true) // sync tous les clients
       }
     })
   }
 
+  /* -------------------------------------------- */
+  static onRenderChatMessage(message, html) {
+    if (message.getFlag("world", "te-deum-xp-used")) {
+      const btn = html.querySelector('.chat-command-gain-xp');
+      if (btn) btn.style.display = 'none';
+    }
+  }
+
   /* -------------------------------------------- */
   static async preloadHandlebarsTemplates() {
 
@@ -467,12 +485,12 @@ export class TeDeumUtility {
       }
     }
     if (msg.name == "msg_apply_damage") {
-      if (game.user.isGM) {
+      const firstGM = game.users.find(u => u.isGM && u.active)
+      if (game.user === firstGM) {
         let rollData = msg.data.rollData
-        let defenderToken = canvas.tokens.placeables.find(t => t.id == rollData.defenderTokenId)
-        if (defenderToken) {
-          let actor = defenderToken.actor
-          await actor.appliquerDegats(rollData)
+        let defenderActor = TeDeumUtility.getTokenActorFromId(rollData.defenderTokenId)
+        if (defenderActor) {
+          await defenderActor.appliquerDegats(rollData)
         } else {
           ui.notifications.error("Impossible de trouver la cible de l'attaque, aucun degats appliqué")
         }