fix: dead combatants reappearing as targets via scene token fallback

The combat loop correctly skipped defeated combatants, but their token
IDs were absent from existingTokenIds, so the scene token loop re-added
them. Now building a defeatedTokenIds set from defeated combatants and
checking it in the scene token loop. Also switched from
game.actors.get() to token.actor for the monster HP check so unlinked
monster tokens (synthetic actors) are covered.

Generated by Mistral Vibe.
Co-Authored-By: Mistral Vibe <vibe@mistral.ai>

module/documents/roll-base.mjs

@@ -161,11 +161,15 @@ export default class LethalFantasyRoll extends Roll {
     let isAttack = this.type === "weapon-attack" || this.type === "monster-attack" || this.type === "spell-attack" || this.type === "miracle-attack"
     if (this.rollData?.isDamage || isAttack) {
       // D'abord, ajouter les combattants du combat actif
+      const defeatedTokenIds = new Set()
       if (game?.combat?.combatants) {
         for (let c of game.combat.combatants) {
-          if (c.actorId !== this.actorId) {
+          if (c.actorId !== this.actorId && !c.isDefeated) {
             combatants.push({ id: c.id, name: c.name, tokenId: c.token.id })
           }
+          if (c.isDefeated && c.token?.id) {
+            defeatedTokenIds.add(c.token.id)
+          }
         }
       }
 
@@ -173,7 +177,10 @@ export default class LethalFantasyRoll extends Roll {
       if (canvas?.scene?.tokens) {
         const existingTokenIds = new Set(combatants.map(c => c.tokenId))
         for (let token of canvas.scene.tokens) {
-          if (token.actorId !== this.actorId && !existingTokenIds.has(token.id)) {
+          if (token.actorId !== this.actorId && !existingTokenIds.has(token.id) && !defeatedTokenIds.has(token.id)) {
+            // Skip dead monsters (0 HP). Use token.actor for unlinked tokens.
+            const tokenActor = token.actor ?? game.actors.get(token.actorId)
+            if (tokenActor?.type === "monster" && (Number(tokenActor?.system?.hp?.value) || 0) <= 0) continue
             combatants.push({
               id: token.id,
               name: token.name,

module/hooks/chat-reaction.mjs

@@ -33,38 +33,12 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
     }
 
     for (const btn of html.querySelectorAll(".apply-wounds-btn")) {
-      btn.addEventListener("mouseenter", () => {
-        const combatantId = btn.dataset.combatantId
-        if (combatantId && game.combat) {
-          const combatant = game.combat.combatants.get(combatantId)
-          if (combatant?.token) {
-            const token = canvas.tokens.get(combatant.token.id)
-            if (token) {
-              token.control({ releaseOthers: true })
-              canvas.animatePan(token.center)
-            }
-          }
-        }
-      })
-      btn.addEventListener("mouseleave", () => canvas.tokens.releaseAll())
       btn.addEventListener("click", event => LethalFantasyUtils.applyDamage(message, event))
     }
   }
 
   // Gestion du survol et du clic sur les boutons de défense
   for (const btn of html.querySelectorAll(".request-defense-btn")) {
-    btn.addEventListener("mouseenter", () => {
-      const tokenId = btn.dataset.tokenId
-      if (tokenId) {
-        const token = canvas.tokens.get(tokenId)
-        if (token) {
-          token.control({ releaseOthers: true })
-          canvas.animatePan(token.center)
-        }
-      }
-    })
-    btn.addEventListener("mouseleave", () => canvas.tokens.releaseAll())
-
     // Gestionnaire pour les boutons de demande de défense
     btn.addEventListener("click", async event => {
       event.preventDefault()

module/utils/combat.mjs

@@ -108,20 +108,22 @@ export async function handleAttackBoosted(msg) {
   const attacker = game.actors.get(attackerId)
   if (!defender) return
 
-  // When the attacker is GM-owned (not a PC on another client), the createChatMessage
-  // hook on the defender's client already handles everything: D30 bonus dice, defense
-  // reaction dialog (grit/luck/shield/mulligan), and the comparison message. Running
-  // handleAttackBoosted too would double-roll all dice and show duplicate dialogs.
-  // Only proceed when the hook is suppressed (attacker is a PC on another client).
-  const attackerHasNonGMOwner = attacker && game.users.some(u => u.active && !u.isGM && attacker.testUserPermission(u, "OWNER"))
+  // The createChatMessage hook is suppressed on this client in two cases:
+  //   1. Attacker is a PC on another client — the hook's defense reaction loop
+  //      and shouldCreateMessage are both skipped.
+  //   2. Attacker is GM-controlled with D30 — the hook skips everything and
+  //      waits for this socket handler.
+  // In both cases, this handler must run to show the defense dialog and create
+  // the comparison message. The common condition: the current user is the
+  // defender's primary controller.
   const _isPrimaryController = actor => {
     if (!actor) return false
     const activePlayerOwners = game.users.filter(u => u.active && !u.isGM && actor.testUserPermission(u, "OWNER"))
     if (activePlayerOwners.length > 0) return activePlayerOwners[0].id === game.user.id
     return game.user.isGM
   }
-  const attackerIsCrossClient = attackerHasNonGMOwner && !_isPrimaryController(attacker)
-  if (!attackerIsCrossClient) return
+  const defenderIsMine = _isPrimaryController(defender)
+  if (!defenderIsMine) return
 
   let updatedDefenseRoll = defenseRoll
   let shieldBlocked = false