fix: cache results.length before explosion loop to prevent double-count

Pushing explosion dice to DieTerm.results made the for loop condition (j < results.length) grow mid-iteration, re-processing the explosion result as a normal die. This produced spurious entries like `1D6 → 4` alongside the correct `1D6-1 → 3`. Fixes prompt() (for loop) and rollSpellDamageToMessage() (for...of) by caching result count / snapshotting the array before iterating.
fix: push explosion dice to DieTerm results so DSN displays them
2026-06-16 19:34:13 +02:00 · 2026-06-16 19:29:07 +02:00 · 2026-06-14 23:00:39 +02:00 · 2026-06-14 22:57:41 +02:00 · 2026-06-13 23:15:22 +02:00 · 2026-06-13 21:06:18 +02:00
9 changed files with 291 additions and 161 deletions
@@ -57,7 +57,7 @@ jobs:
          token: ${{ secrets.FOUNDRY_PUBLISH_KEY }}
          id: "fvtt-lethal-fantasy"
          version: ${{github.event.release.tag_name}}
-          manifest: "https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/system.json"
+          manifest: "https://www.uberwald.me/gitea/uberwald/fvtt-lethal-fantasy/releases/download/latest/system.json"
          notes: "https://www.uberwald.me/gitea/public/fvtt-lethal-fantasy/raw/branch/main/changelog.md"
          compatibility-minimum: "14"
          compatibility-verified: "14"
@@ -0,0 +1,105 @@
+# Lethal Fantasy FoundryVTT System — Session Context
+
+## Current Goal
+Fix Grit/Luck defense reaction dialog UX (stacking dialogs, multiple clicks, revert on close) and cross-client sync of defense bonuses.
+
+## Accomplished
+
+### Pass 1 — Critical Issues
+- **Telemetry removed**: `ClassCounter`, `registerWorldCount`, orphaned `worldKey` setting deleted from system.json
+- **globalThis side effects**: `globalThis.SYSTEM`, `globalThis.pendingDefenses` moved from top-level to `init` hook
+- **console.log → log()**: All runtime console.log replaced with `log()` helper guarded by `lethalFantasy.debug` setting
+- **Stale Tenebris refs**: `macros.mjs` — `TENEBRIS.Label.jet` → `LETHALFANTASY.Label.jet`, `TENEBRIS.Manager.*` → `LETHALFANTASY.Label.*`, `tenebris.macro` flag → `lethalFantasy.macro`
+
+### Pass 2 — V1/V2 Mixing, Fire-and-Forget
+- **V1 sheet registrations removed**: `foundry.appv1.sheets.*` in system.json
+- **V1 `activateListeners`/jQuery**: removed dead `defaultOptions`, V1 tab code from `combat.mjs`
+- **V2 API paths**: `FilePicker` → V2, `TextEditor.getDragEventData` → V2, `item.sheet.render(true)` → `render({force:true})`, `super._onRender()` → `super._onRender(context, options)`, `token._id` → `token.id`
+- **Fire-and-forget Promises**: All `actor.update()`, `ChatMessage.create()`, `prepareRoll()`, `prepareMonsterRoll()`, socket handler calls now awaited
+- **Misnamed class**: `LethalFantasySkill` → `LethalFantasyWeapon`; added missing `WEAPON_TYPE` import; fixed `weaponCategory`
+
+### Pass 3 — Code Review Fixes
+- **Duplicated dialogs**: Per-element `.rollable`/`.wound-data` bindings moved to `_onRender` (V2 destroys/recreates DOM each render); `_activateListeners` reverted
+- **renderChatMessage reverted**: V2 hook `renderChatMessage` passes jQuery html, `querySelectorAll` fails; kept `renderChatMessageHTML`
+- **Roll actions broken**: Fixed `async` base-actor-sheet methods; `_onRender` bindings for rollable elements restored
+- **Token HUD guard**: `html.querySelector()` → `html.find().length` (html is jQuery object)
+- **All review awaits confirmed**: `showDefenseRequest`/`socket` handlers all awaited
+
+## Defense Dialog Investigation — Status
+
+### Symptom (user process)
+1. Monster (GM) attacks player — hits
+2. Player uses Grit/Luck to boost defense
+3. Defense now beats attack — reports new result
+4. Dialog **stays open** — Grit/Luck/bonus dice options still visible
+5. Closing dialog (Continue or X) causes "rolls vanish" — reverts to original result
+
+### Root Cause Found — Duplicate cross-client processing (FIXED)
+
+When monster (GM) attacks player, the `createChatMessage` hook fires on **both** clients:
+
+```
+Player's client:                         GM's client:
+  defense msg created                      defense msg synced
+  ↓                                        ↓
+  hook fires (line 557)                    hook fires (line 557)
+  isPrimaryController(defender)=true       isPrimaryController(defender)=false
+  ↓                                        ↓
+  Defense dialog A shows                   Defense dialog skipped
+  Player spends Grit                       Cross-client code (line 1009):
+  defenseRoll=10→16                        isPrimaryController(attacker)=true
+  While loop exits                         defenderOwner=player (≠GM)
+  Comparison: "miss"                       ↓
+                                           **Sends attackBoosted with ORIGINAL
+                                            defenseRoll=10 (stale!)**
+                                           ↓
+                                           Player receives socket → handleAttackBoosted
+                                           → Defense dialog B shows with OLD values
+                                           → When closed, comparison: "hit" (overwrites!)
+```
+
+Player sees **two** dialogs (A then B). Dialog B uses unboosted values, so closing/ignoring it produces a stale "hit" result that overwrites the correct "miss."
+
+### Fix
+`lethal-fantasy.mjs:1016` — only send `attackBoosted` socket when `attackerHandledBonus || attackerHasNonGMOwner`. Guards against stale-socket overwrite for GM→player combat (where hook-based processing works without socket), while preserving socket delegation for PC→PC cross-client (where `attackerIsCrossClient` suppresses the hook-based processing on the defender's client).
+
+Before:
+```js
+if (defenderOwner && defenderOwner.id !== game.user.id) {
+  game.socket.emit(`system.${SYSTEM.id}`, { type: "attackBoosted", ... })
+  return
+}
+```
+
+After:
+```js
+if (defenderOwner && defenderOwner.id !== game.user.id) {
+  if (attackerHandledBonus || attackerHasNonGMOwner) {
+    game.socket.emit(`system.${SYSTEM.id}`, { type: "attackBoosted", ... })
+  }
+  return
+}
+```
+
+### Same-Client Path
+Code pattern is identical between attack and defense dialogs — both use `await DialogV2.wait({rejectClose:false})` in a while loop. Same-client defense works correctly because no duplicate socket messages arrive.
+
+### Other Findings
+- `offerGritLuckBonus` (`utils.mjs:1121`) is dead code — never called
+- `promptCombatBonusDie` (`utils.mjs:975`) is correct — DialogV2 resolves to callback return value, not `action`
+- Cross-client `handleAttackBoosted` (`utils.mjs:291`) still uses `else if` chain without `continue` — functionally correct but differs from same-client pattern
+
+### Code Paths
+| Flow | File | Line |
+|------|------|------|
+| Same-client attack | `lethal-fantasy.mjs` | 918-1004 |
+| Same-client defense | `lethal-fantasy.mjs` | 697-870 |
+| Cross-client defense | `module/utils.mjs` | 291-445 |
+| Cross-client socket guard | `lethal-fantasy.mjs` | 1006-1037 |
+| Attack Grit offer | `module/utils.mjs` | 1210-1290 |
+
+### Key Files
+- `lethal-fantasy.mjs` — Main system hooks, same-client attack/defense reactions
+- `module/utils.mjs` — Cross-client defense flow, bonus dialogs, compareAttackDefense
+- `module/documents/actor.mjs` — `prepareRoll()` entry point
+- `module/documents/roll.mjs` — Roll resolution pipeline
@@ -873,6 +873,7 @@ Hooks.on("createChatMessage", async (message) => {

    // ── D30 bonus dice (attack) — resolved before grit/luck ────────────────
    if (attackD30message && !attackD30Processed) {
+      const preD30AttackRoll = attackRollFinal
      const canDialog = isPrimaryController(attacker)
      const d30Result = await LethalFantasyUtils.processD30BonusDice(attackD30message, "attack", attackNaturalRoll, attacker, canDialog)
      if (d30Result.modifier) {
@@ -913,10 +914,17 @@ Hooks.on("createChatMessage", async (message) => {
        }
      }
      attackD30Processed = true
+      // If D30 boosted attack past defense, restart so defender can react.
+      // Only restart when D30 actually changed the outcome (pre-D30 defender was
+      // winning or tied, post-D30 defender is losing).
+      if (defender && preD30AttackRoll <= defenseRoll && defenseRoll < attackRollFinal) {
+        mulliganRestart = true
+        continue
+      }
    }

    // ── Attack reaction loop ───────────────────────────────────────────────
-    if (!defenderHandledBonus && attacker && attackRollFinal <= defenseRoll && isPrimaryController(attacker)) {
+    if (attacker && attackRollFinal <= defenseRoll && isPrimaryController(attacker)) {
      while (attackRollFinal <= defenseRoll) {
        const currentGrit = Number(attacker.system?.grit?.current) || 0
        const buttons = []
@@ -1003,13 +1011,22 @@ Hooks.on("createChatMessage", async (message) => {
      }
    }

-    // Cross-client coordination: delegate the remaining reaction + message
-    // to the defender's controller via socket. Only the attacker's owning
-    // client sends — preventing duplicate emissions from other clients.
+    // Cross-client coordination: only delegate to the defender's client
+    // when the attacker boosted past the defense. When no attacker boost
+    // occurred, the defender's client already processed the defense via
+    // the createChatMessage hook and will create the correct comparison.
+    // Sending attackBoosted with stale (unboosted) values would cause
+    // the defender to see a duplicate dialog and overwrite the result.
    if (defender && isPrimaryController(attacker)) {
      const defenderOwner = game.users.find(u => u.active && !u.isGM && defender.testUserPermission(u, "OWNER"))
        || game.users.find(u => u.active && u.isGM)
      if (defenderOwner && defenderOwner.id !== game.user.id) {
+        // Send attackBoosted when the attacker actually boosted (so defender
+        // can respond to the new numbers), OR when the attacker has an active
+        // non-GM owner (PC-vs-PC cross-client) — the defender's hook-based
+        // processing is suppressed by attackerIsCrossClient, so the socket
+        // handler must show the defense dialog instead.
+        if (attackerHandledBonus || attackerHasNonGMOwner) {
          const sData = LethalFantasyUtils.getShieldReactionData(defender)
          game.socket.emit(`system.${SYSTEM.id}`, {
            type: "attackBoosted",
@@ -1028,6 +1045,7 @@ Hooks.on("createChatMessage", async (message) => {
            shieldDr: sData?.damageReduction || 0,
            canAdHocShield: !sData,
          })
+        }
        return
      }
      // Same client: restart for defender loop if attacker boosted past defense
@@ -255,18 +255,21 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet
      buttons: [
        {
          action: "noDR",
+          type: "button",
          label: game.i18n.localize("LETHALFANTASY.Combat.spellNoDR"),
          icon: "fa-solid fa-wand-magic-sparkles",
          callback: () => 0
        },
        {
          action: "applyDR",
+          type: "button",
          label: game.i18n.localize("LETHALFANTASY.Combat.spellApplyDR"),
          icon: "fa-solid fa-shield",
          callback: (event, button) => Number(button.form?.elements?.manualDr?.value) || 0
        },
        {
          action: "cancel",
+          type: "button",
          label: game.i18n.localize("LETHALFANTASY.Combat.proceedNo"),
          callback: () => "cancel"
        }
@@ -73,20 +73,6 @@
        ],
        "description": "Possible Lethal or Vital Magical Strike or Add D20E to Spell Attack"
      },
-      "arcane_spell_defense": {
-        "type": "choice",
-        "choices": [
-          {
-            "type": "spell_calamity"
-          },
-          {
-            "type": "bonus_dice",
-            "dice": "D20E",
-            "target": "spell_defense"
-          }
-        ],
-        "description": "Possible Spell Catastrophe or adds D20E to Spell Defense"
-      },
      "skill_rolls": {
        "type": "skill_auto_success",
        "description": "Skill Succeeds Regardless of Opposing Roll"
@@ -109,9 +95,19 @@
        ],
        "description": "Possible Flawless or Legendary Defense or Add D20E to Defense"
      },
-      "saving_throws": {
-        "type": "save_auto_success",
-        "description": "Saving Throw Succeeds Regardless of Opposing Roll"
+      "arcane_spell_defense": {
+        "type": "choice",
+        "choices": [
+          {
+            "type": "spell_calamity"
+          },
+          {
+            "type": "bonus_dice",
+            "dice": "D20E",
+            "target": "spell_defense"
+          }
+        ],
+        "description": "Possible Spell Catastrophe or adds D20E to Spell Defense"
      }
    },
    "29": {
@@ -135,11 +131,6 @@
        "amount": 1,
        "description": "Gain 1 Grit"
      },
-      "arcane_spell_defense": {
-        "type": "gain_grit",
-        "amount": 1,
-        "description": "Gain 1 Grit"
-      },
      "skill_rolls": {
        "type": "gain_grit",
        "amount": 1,
@@ -150,7 +141,7 @@
        "amount": 1,
        "description": "Gain 1 Grit"
      },
-      "saving_throws": {
+      "arcane_spell_defense": {
        "type": "gain_grit",
        "amount": 1,
        "description": "Gain 1 Grit"
@@ -184,16 +175,16 @@
        "type": "no_lethargy",
        "description": "No Spell Lethargy the Aether Approves of Characters Efforts"
      },
+      "ranged_defense": {
+        "type": "luck_die",
+        "scope": "combat",
+        "description": "Granted 1 Luck dice for Use in This Combat Only"
+      },
      "arcane_spell_defense": {
        "type": "flash_of_pain",
        "duration_dice": "1D6E",
        "target": "caster",
        "description": "Caster Suffers Severe pain and will be under a flash of pain for 1D6E seconds"
-      },
-      "ranged_defense": {
-        "type": "luck_die",
-        "scope": "combat",
-        "description": "Granted 1 Luck dice for Use in This Combat Only"
      }
    },
    "26": {
@@ -208,12 +199,6 @@
        "amount": 1,
        "target": "skill",
        "description": "Add 1 to Skill Roll"
-      },
-      "saving_throws": {
-        "type": "bonus_flat",
-        "amount": 1,
-        "target": "save",
-        "description": "Add 1 to Saving Throw"
      }
    },
    "21": {
@@ -239,12 +224,6 @@
        "target": "defender",
        "description": "Magical Damage inflicts Flash of pain 1D6E seconds"
      },
-      "arcane_spell_defense": {
-        "type": "flash_of_pain",
-        "duration_dice": "1D6E",
-        "target": "caster",
-        "description": "Caster Suffers Severe pain and will be under a flash of pain for 1D6E seconds"
-      },
      "skill_rolls": {
        "type": "bonus_dice",
        "dice": "D6",
@@ -255,11 +234,11 @@
        "type": "recover_pain",
        "description": "Defender Recovers or ignores any flash of pain"
      },
-      "saving_throws": {
-        "type": "bonus_dice",
-        "dice": "D6",
-        "target": "save",
-        "description": "Granted D6 (1-6) Saving Throw Modifier for this Saving Throw Attempt"
+      "arcane_spell_defense": {
+        "type": "flash_of_pain",
+        "duration_dice": "1D6E",
+        "target": "caster",
+        "description": "Caster Suffers Severe pain and will be under a flash of pain for 1D6E seconds"
      }
    },
    "20": {
@@ -331,23 +310,6 @@
        ],
        "description": "Possible Vicious Application of a Magical Attack or add D12 to attack"
      },
-      "arcane_spell_defense": {
-        "type": "choice",
-        "choices": [
-          {
-            "type": "special_defense",
-            "options": [
-              "perfect_spell"
-            ]
-          },
-          {
-            "type": "bonus_dice",
-            "dice": "D12",
-            "target": "spell_defense"
-          }
-        ],
-        "description": "Possible 20/20 Spell defense that Saves Against Any Magical Attack Except a Lethal Magical Strike or add D12 to spell defense"
-      },
      "skill_rolls": {
        "type": "bonus_flat",
        "amount": 20,
@@ -371,11 +333,22 @@
        ],
        "description": "Possible 20/20 defense that avoids Any Attack Except a Lethal Strike or adds D12 to defense"
      },
-      "saving_throws": {
-        "type": "bonus_flat",
-        "amount": 20,
-        "target": "save",
-        "description": "20 Added to Saving Throw"
+      "arcane_spell_defense": {
+        "type": "choice",
+        "choices": [
+          {
+            "type": "special_defense",
+            "options": [
+              "perfect_spell"
+            ]
+          },
+          {
+            "type": "bonus_dice",
+            "dice": "D12",
+            "target": "spell_defense"
+          }
+        ],
+        "description": "Possible 20/20 Spell defense that Saves Against Any Magical Attack Except a Lethal Magical Strike or add D12 to spell defense"
      }
    },
    "15": {
@@ -416,12 +389,6 @@
          "punch"
        ],
        "description": "Kick or Punch"
-      },
-      "saving_throws": {
-        "type": "bonus_flat",
-        "amount": 1,
-        "target": "save",
-        "description": "Add 1 to Saving Throw"
      }
    },
    "13": {},
@@ -474,12 +441,6 @@
          "punch"
        ],
        "description": "Kick or Punch"
-      },
-      "saving_throws": {
-        "type": "bonus_flat",
-        "amount": 1,
-        "target": "save",
-        "description": "Add 1 to Saving Throw"
      }
    },
    "8": {
@@ -499,10 +460,6 @@
        "type": "mulligan",
        "description": "Mulligan, Can Re-Roll This Spell Attack"
      },
-      "arcane_spell_defense": {
-        "type": "mulligan",
-        "description": "Mulligan, Can Re-Roll This Spell Defense"
-      },
      "skill_rolls": {
        "type": "mulligan",
        "description": "Mulligan, Can Re-Roll This Skill roll"
@@ -511,9 +468,9 @@
        "type": "mulligan",
        "description": "Mulligan, Can Choose to Re-Roll This Defense"
      },
-      "saving_throws": {
+      "arcane_spell_defense": {
        "type": "mulligan",
-        "description": "Mulligan, Can Re-Roll This Saving Throw"
+        "description": "Mulligan, Can Re-Roll This Spell Defense"
      }
    },
    "7": {
@@ -565,12 +522,6 @@
          "punch"
        ],
        "description": "Kick or Punch"
-      },
-      "saving_throws": {
-        "type": "bonus_flat",
-        "amount": 1,
-        "target": "save",
-        "description": "Add 1 to Saving Throw"
      }
    },
    "3": {
@@ -595,17 +546,17 @@
        "multiplier": 3,
        "description": "Triple Damage on Spell Damage"
      },
-      "arcane_spell_defense": {
-        "type": "bonus_dice",
-        "dice": "D12",
-        "target": "spell_defense",
-        "description": "D12 Added to Spell Defense Modifier"
-      },
      "ranged_defense": {
        "type": "dr_multiplier",
        "multiplier": 3,
        "includes_shield": true,
        "description": "DR Tripled including Shield"
+      },
+      "arcane_spell_defense": {
+        "type": "bonus_dice",
+        "dice": "D12",
+        "target": "spell_defense",
+        "description": "D12 Added to Spell Defense Modifier"
      }
    },
    "2": {
@@ -630,17 +581,17 @@
        "multiplier": 2,
        "description": "Double Damage on Spell Damage"
      },
-      "arcane_spell_defense": {
-        "type": "bonus_dice",
-        "dice": "D6",
-        "target": "spell_defense",
-        "description": "D6 Added to Spell Defense Modifier"
-      },
      "ranged_defense": {
        "type": "dr_multiplier",
        "multiplier": 2,
        "includes_shield": true,
        "description": "DR Doubled including Shield"
+      },
+      "arcane_spell_defense": {
+        "type": "bonus_dice",
+        "dice": "D6",
+        "target": "spell_defense",
+        "description": "D6 Added to Spell Defense Modifier"
      }
    },
    "1": {
@@ -218,6 +218,7 @@ export default class LethalFantasyActor extends Actor {
          if (available.length > 1) {
            const buttons = available.map(([id]) => ({
              action: id,
+              type: "button",
              label: id.charAt(0).toUpperCase() + id.slice(1),
              callback: () => id,
            }))
@@ -27,8 +27,7 @@ export default class D30Roll {
    RANGED_DEFENSE: "ranged_defense",
    ARCANE_SPELL_ATTACK: "arcane_spell_attack",
    ARCANE_SPELL_DEFENSE: "arcane_spell_defense",
-    SKILL_ROLLS: "skill_rolls",
-    SAVING_THROWS: "saving_throws"
+    SKILL_ROLLS: "skill_rolls"
  }

  /**
@@ -134,8 +133,9 @@ export default class D30Roll {
      return options.isRanged ? this.ROLL_TYPES.RANGED_DEFENSE : this.ROLL_TYPES.MELEE_DEFENSE
    }

-    // Spell types
-    if (externalType === "spell-attack" || externalType === "spell" || externalType === "spell-power") {
+    // Spell/Miracle types
+    if (externalType === "spell-attack" || externalType === "spell" || externalType === "spell-power"
+      || externalType === "miracle-attack" || externalType === "miracle" || externalType === "miracle-power") {
      return this.ROLL_TYPES.ARCANE_SPELL_ATTACK
    }

@@ -146,7 +146,7 @@ export default class D30Roll {

    // Saving throw types
    if (externalType === "save") {
-      return options.isSpellSave ? this.ROLL_TYPES.ARCANE_SPELL_DEFENSE : this.ROLL_TYPES.SAVING_THROWS
+      return this.ROLL_TYPES.ARCANE_SPELL_DEFENSE
    }

    // If no match, return null
@@ -127,6 +127,7 @@ export default class LethalFantasyRoll extends Roll {
   * @returns {Promise<Object|null>} The roll result or null if the dialog was cancelled.
   */
  static async prompt(options = {}) {
+    try {
    let dice = "1D20"
    let maxValue = 20
    let baseFormula = "1D20"
@@ -139,7 +140,7 @@ export default class LethalFantasyRoll extends Roll {
    let hasGrantedDice = false
    let pointBlank = false
    let letItFly = false
-    let saveSpell = false
+    let saveSpell = game.lethalFantasy?.spellDefense ?? false
    let beyondSkill = false
    let hasStaticModifier = false
    let hasExplode = true
@@ -358,7 +359,7 @@ export default class LethalFantasyRoll extends Roll {
      dice,
      hasTarget: options.hasTarget,
      modifier,
-      saveSpell: game.lethalFantasy?.spellDefense ?? false,
+      saveSpell,
      favor: "none",
      targetName,
      isRangedAttack
@@ -390,6 +391,8 @@ export default class LethalFantasyRoll extends Roll {
        position,
        buttons: [
          {
+            action: "roll",
+            type: "button",
            label: label,
            callback: (event, button, dialog) => {
              log("Roll context", event, button, dialog)
@@ -444,7 +447,7 @@ export default class LethalFantasyRoll extends Roll {
    if (hasModifier) {
      let bonus = Number(options.rollTarget.value)
      fullModifier = rollContext.modifier === "" ? 0 : parseInt(rollContext.modifier, 10) + bonus
-      fullModifier += (rollContext.saveSpell) ? options.rollTarget.actorModifiers.saveModifier : 0
+      fullModifier += (rollContext.saveSpell) ? (options.rollTarget.actorModifiers?.saveModifier ?? 0) : 0
      if (Number(rollContext.attackerAim) > 0) {
        fullModifier += Number(rollContext.attackerAim)
      }
@@ -613,8 +616,10 @@ export default class LethalFantasyRoll extends Roll {

    let singleDice = `1D${maxValue}`
    for (let i = 0; i < rollBase.dice.length; i++) {
-      for (let j = 0; j < rollBase.dice[i].results.length; j++) {
-        let diceResult = rollBase.dice[i].results[j].result
+      const dieResults = rollBase.dice[i].results
+      const resultCount = dieResults.length
+      for (let j = 0; j < resultCount; j++) {
+        let diceResult = dieResults[j].result
        diceResults.push({ dice: `${singleDice.toUpperCase()}`, value: diceResult })
        diceSum += diceResult
        if (hasMaxValue) {
@@ -623,6 +628,8 @@ export default class LethalFantasyRoll extends Roll {
            diceResult = r.dice[0].results[0].result
            diceResults.push({ dice: `${singleDice.toUpperCase()}-1`, value: diceResult - 1 })
            diceSum += (diceResult - 1)
+            // Add to DieTerm results so DSN/Foundry display shows explosion dice
+            dieResults.push({ result: diceResult, active: true })
          }
        }
      }
@@ -679,6 +686,10 @@ export default class LethalFantasyRoll extends Roll {
    if (Hooks.call("fvtt-lethal-fantasy.Roll", options, rollData, rollBase) === false) return

    return rollBase
+    } finally {
+      // Clear one-shot flag so it doesn't leak to subsequent non-spell saves
+      if (game.lethalFantasy) game.lethalFantasy.spellDefense = false
+    }
  }

  /* ***********************************************************/
@@ -714,6 +725,8 @@ export default class LethalFantasyRoll extends Roll {
      content,
      buttons: [
        {
+          action: "initiative",
+          type: "button",
          label: label,
          callback: (event, button) => {
            const output = Array.from(button.form.elements).reduce((obj, input) => {
@@ -791,6 +804,7 @@ export default class LethalFantasyRoll extends Roll {
        }
        buttons.push({
          action: "roll",
+          type: "button",
          label: weaponLabel,
          callback: (event, button) => {
            let pos = $('#combat-action-dialog').position()
@@ -817,6 +831,7 @@ export default class LethalFantasyRoll extends Roll {
        }
        buttons.push({
          action: "roll",
+          type: "button",
          label: label,
          callback: (event, button) => {
            let pos = $('#combat-action-dialog').position()
@@ -828,6 +843,7 @@ export default class LethalFantasyRoll extends Roll {
    } else {
      buttons.push({
        action: "roll",
+        type: "button",
        label: "Select action",
        callback: (event, button) => {
          let pos = $('#combat-action-dialog').position()
@@ -843,6 +859,7 @@ export default class LethalFantasyRoll extends Roll {
    }
    buttons.push({
      action: "cancel",
+      type: "button",
      label: "Other action, not listed here",
      callback: (event, button) => {
        let pos = $('#combat-action-dialog').position()
@@ -910,6 +927,7 @@ export default class LethalFantasyRoll extends Roll {
            content: `<div class="grit-luck-dialog"><p><strong>${selectedItem.name}</strong> has multiple damage tiers.</p><p>Choose which damage to use when the attack lands:</p></div>`,
            buttons: tiers.map(t => ({
              action: t.id,
+              type: "button",
              label: `${t.label} (${t.dice.toUpperCase()})`,
              icon: "fa-solid fa-wand-magic-sparkles",
              callback: () => t.id
@@ -1114,6 +1132,8 @@ export default class LethalFantasyRoll extends Roll {
      content,
      buttons: [
        {
+          action: "rangeDefense",
+          type: "button",
          label: label,
          callback: (event, button) => {
            const output = Array.from(button.form.elements).reduce((obj, input) => {
@@ -1198,6 +1218,7 @@ export default class LethalFantasyRoll extends Roll {
      diceResult = r.dice[0].results[0].result
      diceResults.push({ dice: `${dice.toUpperCase()}-1`, value: diceResult - 1 })
      diceSum += (diceResult - 1)
+      rollBase.dice[0].results.push({ result: diceResult, active: true })
    }
    if (fullModifier !== 0) {
      diceResults.push({ dice: `${rollModifier.formula.toUpperCase()}`, value: rollModifier.total })
@@ -1273,6 +1294,8 @@ export default class LethalFantasyRoll extends Roll {
      content,
      buttons: [
        {
+          action: "rangedAttack",
+          type: "button",
          label,
          callback: (event, button) => {
            const output = Array.from(button.form.elements).reduce((obj, input) => {
@@ -1358,6 +1381,7 @@ export default class LethalFantasyRoll extends Roll {
      diceResult = r.dice[0].results[0].result
      diceResults.push({ dice: `${dice.toUpperCase()}-1`, value: diceResult - 1 })
      diceSum += (diceResult - 1)
+      rollBase.dice[0].results.push({ result: diceResult, active: true })
    }

    if (fullModifier !== 0) {
@@ -1570,7 +1594,8 @@ export default class LethalFantasyRoll extends Roll {
    let diceSum = 0
    for (const term of roll.dice) {
      const singleDice = `1D${term.faces}`
-      for (const r of term.results) {
+      const termResults = Array.from(term.results)
+      for (const r of termResults) {
        let diceResult = r.result
        diceResults.push({ dice: singleDice.toUpperCase(), value: diceResult })
        diceSum += diceResult
@@ -1581,6 +1606,7 @@ export default class LethalFantasyRoll extends Roll {
            diceResult = xr.dice?.[0]?.results?.[0]?.result ?? (term.faces - 1)
            diceResults.push({ dice: `${singleDice.toUpperCase()}-1`, value: diceResult - 1 })
            diceSum += (diceResult - 1)
+            term.results.push({ result: diceResult, active: true })
          }
        }
      }
@@ -28,8 +28,12 @@ export default class LethalFantasyUtils {
  /* -------------------------------------------- */
  static setHookListeners() {

-    Hooks.on('renderTokenHUD', async (hud, html, token) => {
+    Hooks.on('renderTokenHUD', async (hud, html, data) => {
      if (html.querySelector(".lethal-hp-loss-hud")) return
+      // The token/actor is on the HUD application instance, not the third param.
+      // hud.token / hud.object gives the Token (PlaceableObject), which has .actor.
+      const hudActor = hud.token?.actor ?? hud.object?.actor
+      if (!hudActor) return
      // HP Loss Button (existing)
      const lossHPButton = await foundry.applications.handlebars.renderTemplate('systems/fvtt-lethal-fantasy/templates/loss-hp-hud.hbs', {})
      $(html).find('div.left').append(lossHPButton);
@@ -55,18 +59,13 @@ export default class LethalFantasyUtils {
      $(html).find('.loss-hp-hud-click').click(async (event) => {
        event.preventDefault();
        let hpLoss = event.currentTarget.dataset.hpValue;
-        if (token) {
-          let tokenFull = canvas.tokens.placeables.find(t => t.id === token.id);
-          log(tokenFull, token)
-          let actor = tokenFull.actor;
-          await actor.applyDamage(Number(hpLoss));
+        await hudActor.applyDamage(Number(hpLoss));
          $(html).find('.hp-loss-wrap')[0].classList.remove('hp-loss-hud-active');
          $(html).find('.hp-loss-wrap')[0].classList.add('hp-loss-hud-disabled');
          $(html).find('.hp-loss-wrap')[1].classList.remove('hp-loss-hud-active');
          $(html).find('.hp-loss-wrap')[1].classList.add('hp-loss-hud-disabled');
          $(html).find('.hp-loss-wrap')[2].classList.remove('hp-loss-hud-active');
          $(html).find('.hp-loss-wrap')[2].classList.add('hp-loss-hud-disabled');
-        }
      })

      // HP Gain Button (new)
@@ -94,18 +93,24 @@ export default class LethalFantasyUtils {
      $(html).find('.gain-hp-hud-click').click(async (event) => {
        event.preventDefault();
        let hpGain = event.currentTarget.dataset.hpValue;
-        if (token) {
-          let tokenFull = canvas.tokens.placeables.find(t => t.id === token.id);
-          log(tokenFull, token)
-          let actor = tokenFull.actor;
-          await actor.applyDamage(Number(hpGain)); // Positive value to add HP
+        await hudActor.applyDamage(Number(hpGain)); // Positive value to add HP
+          // Clear bleeding wounds on heal — regardless of heal amount, any
+          // healing is enough to stop bleeding (field dressing / magic / rest).
+          const wounds = foundry.utils.duplicate(hudActor.system.hp.wounds || [])
+          const hadBleeding = wounds.some(w => w.description === "Bleeding")
+          if (hadBleeding) {
+            await hudActor.update({
+              "system.hp.wounds": wounds.map(w =>
+                w.description === "Bleeding" ? { value: 0, duration: 0 } : w
+              )
+            })
+          }
          $(html).find('.hp-gain-wrap')[0].classList.remove('hp-gain-hud-active');
          $(html).find('.hp-gain-wrap')[0].classList.add('hp-gain-hud-disabled');
          $(html).find('.hp-gain-wrap')[1].classList.remove('hp-gain-hud-active');
          $(html).find('.hp-gain-wrap')[1].classList.add('hp-gain-hud-disabled');
          $(html).find('.hp-gain-wrap')[2].classList.remove('hp-gain-hud-active');
          $(html).find('.hp-gain-wrap')[2].classList.add('hp-gain-hud-disabled');
-        }
      })

      // Luck/Grit Buttons
@@ -124,17 +129,13 @@ export default class LethalFantasyUtils {
      })
      $(html).find('.luck-grit-btn').click(async (event) => {
        event.preventDefault();
-        if (token) {
-          let tokenFull = canvas.tokens.placeables.find(t => t.id === token.id);
-          let actor = tokenFull.actor;
        const resource = event.currentTarget.dataset.resource;
        const amount = Number(event.currentTarget.dataset.amount);
-          const current = Number(foundry.utils.getProperty(actor.system, `${resource}.current`)) || 0;
+        const current = Number(foundry.utils.getProperty(hudActor.system, `${resource}.current`)) || 0;
        const newValue = Math.max(0, current + amount);
-          await actor.update({ [`system.${resource}.current`]: newValue });
+        await hudActor.update({ [`system.${resource}.current`]: newValue });
        $(html).find('.luck-grit-wrap')[0].classList.remove('luck-grit-hud-active');
        $(html).find('.luck-grit-wrap')[0].classList.add('luck-grit-hud-disabled');
-        }
      })
    })
  }
@@ -298,6 +299,7 @@ export default class LethalFantasyUtils {
        if (currentGrit > 0) {
          buttons.push({
            action: "grit",
+            type: "button",
            label: `Spend 1 Grit (+1D6) [${currentGrit} left]`,
            icon: "fa-solid fa-fist-raised",
            callback: () => "grit"
@@ -307,6 +309,7 @@ export default class LethalFantasyUtils {
        if (currentLuck > 0) {
          buttons.push({
            action: "luck",
+            type: "button",
            label: `Spend 1 Luck (+1D6) [${currentLuck} left]`,
            icon: "fa-solid fa-clover",
            callback: () => "luck"
@@ -315,6 +318,7 @@ export default class LethalFantasyUtils {

        buttons.push({
          action: "bonusDie",
+          type: "button",
          label: "Add bonus die",
          icon: "fa-solid fa-dice",
          callback: () => "bonusDie"
@@ -323,6 +327,7 @@ export default class LethalFantasyUtils {
        if (canShieldReact) {
          buttons.push({
            action: "shieldReact",
+            type: "button",
            label: `Roll shield (${shieldLabel})`,
            icon: "fa-solid fa-shield",
            callback: () => "shieldReact"
@@ -330,6 +335,7 @@ export default class LethalFantasyUtils {
        } else if (canAdHoc) {
          buttons.push({
            action: "adHocShield",
+            type: "button",
            label: "Roll ad-hoc shield (choose dice + DR)",
            icon: "fa-solid fa-shield-halved",
            callback: () => "adHocShield"
@@ -338,6 +344,7 @@ export default class LethalFantasyUtils {

        buttons.push({
          action: "continue",
+          type: "button",
          label: "Continue (no defense bonus)",
          icon: "fa-solid fa-forward",
          callback: () => "continue"
@@ -533,6 +540,7 @@ export default class LethalFantasyUtils {
        buttons: [
          {
            action: "rollSave",
+            type: "button",
            label: "Roll Save",
            icon: "fa-solid fa-person-running",
            callback: (event, button) => button.form.elements.saveKey.value,
@@ -606,6 +614,8 @@ export default class LethalFantasyUtils {
        content,
        buttons: [
          {
+            action: "rangeDefense",
+            type: "button",
            label: "Roll Defense",
            icon: "fa-solid fa-shield",
            callback: (event, button, dialog) => {
@@ -713,6 +723,8 @@ export default class LethalFantasyUtils {
      content,
      buttons: [
        {
+          action: "defenseRoll",
+          type: "button",
          label: "Roll Defense",
          icon: "fa-solid fa-shield",
          callback: (event, button, dialog) => {
@@ -808,6 +820,7 @@ export default class LethalFantasyUtils {
        }
        return {
          action: c.type,
+          type: "button",
          label,
          icon,
          callback: () => c
@@ -997,6 +1010,7 @@ export default class LethalFantasyUtils {
      buttons: [
        {
          action: "roll",
+          type: "button",
          label: "Roll Bonus Die",
          icon: "fa-solid fa-dice",
          callback: (event, button) => {
@@ -1006,6 +1020,7 @@ export default class LethalFantasyUtils {
        },
        {
          action: "cancel",
+          type: "button",
          label: "Cancel",
          icon: "fa-solid fa-xmark",
          callback: () => null
@@ -1053,6 +1068,7 @@ export default class LethalFantasyUtils {
      buttons: [
        {
          action: "roll",
+          type: "button",
          label: "Roll Shield",
          icon: "fa-solid fa-shield",
          callback: (event, button) => {
@@ -1066,6 +1082,7 @@ export default class LethalFantasyUtils {
        },
        {
          action: "cancel",
+          type: "button",
          label: "Cancel",
          icon: "fa-solid fa-xmark",
          callback: () => null
@@ -1136,6 +1153,7 @@ export default class LethalFantasyUtils {
      if (currentGrit > 0) {
        buttons.push({
          action: "grit",
+          type: "button",
          label: `Spend 1 Grit (+1D6) [${currentGrit} left]`,
          icon: "fa-solid fa-fist-raised",
          callback: () => "grit"
@@ -1145,6 +1163,7 @@ export default class LethalFantasyUtils {
      if (currentLuck > 0) {
        buttons.push({
          action: "luck",
+          type: "button",
          label: `Spend 1 Luck (+1D6) [${currentLuck} left]`,
          icon: "fa-solid fa-clover",
          callback: () => "luck"
@@ -1153,6 +1172,7 @@ export default class LethalFantasyUtils {

      buttons.push({
        action: "continue",
+        type: "button",
        label: "Continue (no bonus)",
        icon: "fa-solid fa-forward",
        callback: () => "continue"
@@ -1228,12 +1248,14 @@ export default class LethalFantasyUtils {
      const buttons = [
        {
          action: "grit",
+          type: "button",
          label: `Spend 1 Grit (+1D6) [${currentGrit} left]`,
          icon: "fa-solid fa-fist-raised",
          callback: () => "grit"
        },
        {
          action: "continue",
+          type: "button",
          label: "Continue (no bonus)",
          icon: "fa-solid fa-forward",
          callback: () => "continue"
@@ -1624,21 +1646,25 @@ export default class LethalFantasyUtils {
      buttons: [
        {
          action: "noDR",
+          type: "button",
          label: "No DR",
          callback: () => ({ drType: "none", damage: damageTotal })
        },
        {
          action: "armorDR",
+          type: "button",
          label: "With Armor DR",
          callback: () => ({ drType: "armor", damage: Math.max(0, damageTotal - armorDR) })
        },
        {
          action: "allDR",
+          type: "button",
          label: "With Armor + Shield DR",
          callback: () => ({ drType: "all", damage: Math.max(0, damageTotal - totalDR) })
        },
        {
          action: "cancel",
+          type: "button",
          label: "Cancel",
          callback: () => null
        }
Author	SHA1	Message	Date
uberwald	3b0d4e032e	fix: cache results.length before explosion loop to prevent double-count Release Creation / build (release) Successful in 50s Details Pushing explosion dice to DieTerm.results made the for loop condition (j < results.length) grow mid-iteration, re-processing the explosion result as a normal die. This produced spurious entries like `1D6 → 4` alongside the correct `1D6-1 → 3`. Fixes prompt() (for loop) and rollSpellDamageToMessage() (for...of) by caching result count / snapshotting the array before iterating.	2026-06-16 19:34:13 +02:00
uberwald	539841c4ff	fix: push explosion dice to DieTerm results so DSN displays them Explosion rolls were evaluated as separate Roll instances but never added to the original DieTerm's results array. Dice So Nice reads DieTerm.results to render 3D dice, so explosions were invisible. Now each explosion result is pushed into the DieTerm's results array ({result, active:true}), letting DSN render explosion dice in the correct chronological order alongside the main die. Applies to prompt(), promptRangedDefense(), promptRangedAttack(), and rollSpellDamageToMessage().	2026-06-16 19:29:07 +02:00
uberwald	ffba37b59e	Fix D30 management, again	2026-06-14 23:00:39 +02:00
uberwald	1a7585e1f6	fix: merge saving_throws D30 table into arcane_spell_defense Release Creation / build (release) Successful in 49s Details saving_throws was redundant — all saves in this system are vs spells. Removed SAVING_THROWS constant; all save rollType lookups use ARCANE_SPELL_DEFENSE. D30=1 arcane_spell_defense blank (no special result). Added miracle types to ARCANE_SPELL_ATTACK mapping so they get D30 results instead of null.	2026-06-14 22:57:41 +02:00
uberwald	b567c8bbea	Fix D30 management, again Release Creation / build (release) Successful in 48s Details	2026-06-13 23:15:22 +02:00
uberwald	60b351f50d	Fix spell save/defense again Release Creation / build (release) Successful in 45s Details	2026-06-13 21:06:18 +02:00
uberwald	ace726a1fc	fix: use try/finally for spellDefense cleanup instead of delete Release Creation / build (release) Successful in 47s Details delete on game.lethalFantasy.spellDefense was breaking roll flow on Foundry's proxied game object. Use try/finally with assignment to false instead, which is safe on any object type. Initialize saveSpell local var from one-shot flag so D30 chart lookup correctly uses arcane_spell_defense for spell saves without requiring user to click the pre-checked checkbox.	2026-06-13 16:51:52 +02:00
uberwald	67499bc199	fix: add missing arcane_spell_defense entry for D30=1 Release Creation / build (release) Successful in 49s Details User spec lists D30=1 as 'Possible Spell Calamity or Catastrophe' for Arcane Spell Defense but it was missing from the table.	2026-06-13 16:29:54 +02:00
uberwald	7eae95cbbd	fix: use arcane spell defense D30 chart for spell saves Release Creation / build (release) Successful in 43s Details Bug: saveSpell local var initialized to false (line 142), while dialog checkbox was pre-checked via dialogContext.saveSpell = game.lethalFantasy.spellDefense. If user didn't click the checkbox, D30 call used SAVING_THROWS chart instead of ARCANE_SPELL_DEFENSE. Also: game.lethalFantasy.spellDefense was set true before spell defense rolls but never cleared, leaking to subsequent non-spell saves. Fix: initialize saveSpell from the one-shot flag and delete it immediately. Dialog context now uses the local saveSpell variable instead of re-reading the deleted flag.	2026-06-13 15:22:34 +02:00
uberwald	1b53bf9152	fix: resolve hud actor from hud.token not render context param Release Creation / build (release) Successful in 41s Details V2 renderTokenHUD passes (hud, html, data) where data is a render context object — not a TokenDocument. data.actor was undefined, and data?.token?.actor was also undefined. Use hud.token.actor (or hud.object.actor) instead, which is the real PlaceableObject with proper actor resolution. Also fix html.find() → html.querySelector() for V2 HTMLElement.	2026-06-12 19:01:54 +02:00
uberwald	2570bf707e	fix: prevent duplicate cross-client defense dialog, clear bleed on heal - Only send attackBoosted socket when attackerHandledBonus \|\| attackerHasNonGMOwner (GM→player: hook handles it, no socket needed; PC→PC: socket needed) - Clear bleeding wounds when HP restored via token HUD heal buttons	2026-06-12 17:23:39 +02:00