Fix spell rolls again

FIx spell order and dual rollll for spell damages
Fix ranged attacks again
2026-05-25 20:41:00 +02:00 · 2026-05-25 12:29:39 +02:00 · 2026-05-24 09:42:07 +02:00 · 2026-05-24 09:41:06 +02:00 · 2026-05-23 19:10:10 +02:00 · 2026-05-23 09:08:16 +02:00
44 changed files with 1165 additions and 464 deletions
@@ -59,5 +59,5 @@ jobs:
          version: ${{github.event.release.tag_name}}
          manifest: "https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/system.json"
          notes: "https://www.uberwald.me/gitea/public/fvtt-lethal-fantasy/raw/branch/main/changelog.md"
-          compatibility-minimum: "13"
+          compatibility-minimum: "14"
          compatibility-verified: "14"
@@ -0,0 +1,62 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with this repository.
+
+## Overview
+
+FoundryVTT v13+ game system for the **Lethal Fantasy RPG**. Entry point: `lethal-fantasy.mjs`.
+
+## Commands
+
+```bash
+# Compile LESS styles (styles/ -> css/)
+npx gulp css          # one-shot
+npx gulp              # compile + watch
+
+# Lint
+npx eslint .
+
+# Compendium pack management (LevelDB <-> YAML source)
+npm run pushLDBtoYML   # export packs-system/ LevelDB -> source YAML
+npm run pullYMLtoLDB   # import source YAML -> packs-system/ LevelDB
+```
+
+No test suite exists.
+
+## Architecture
+
+Four layers in `module/`, all wired in `lethal-fantasy.mjs` via the `init` hook:
+
+| Layer | Path | Purpose |
+|---|---|---|
+| Config | `module/config/` | Game constants. `SYSTEM` is `globalThis.SYSTEM` — always use `SYSTEM.*` for enumerations. |
+| Models | `module/models/` | `TypeDataModel` subclasses — data schemas per document type. |
+| Documents | `module/documents/` | Actor/Item/Roll/ChatMessage subclasses — game logic, roll processing, hooks. |
+| Applications | `module/applications/` | `ApplicationV2` sheets + custom combat tracker. |
+
+**Actor types**: `character`, `monster`
+**Item types**: `skill`, `gift`, `vulnerability`, `weapon`, `armor`, `shield`, `spell`, `miracle`, `equipment`
+
+Each layer has an `_module.mjs` barrel file that re-exports all classes from that layer.
+
+Templates (`.hbs`) live in `templates/`. Styles are authored in LESS under `styles/` and compiled to `css/`.
+
+### Key Patterns
+
+- **Sheets**: Extend `HandlebarsApplicationMixin(foundry.applications.sheets.ActorSheetV2)` — imported from `foundry.applications.api`. **Not** the legacy `ActorSheet`. Child sheets (e.g. `character-sheet.mjs`) extend `base-actor-sheet.mjs` and override `static PARTS` and `DEFAULT_OPTIONS.actions`. Template paths are prefixed `systems/fvtt-lethal-fantasy/templates/`. Actor sheets have a play/edit toggle via `_sheetMode` and `SHEET_MODES`.
+- **Models**: `static defineSchema()` using `foundry.data.fields.*`. Field definitions derived from SYSTEM config objects.
+- **Rolls**: `LethalFantasyRoll` extends `Roll` with rich metadata via `this.options`. `D30Roll` is a separate class for D30 result tables (initialized in the `ready` hook).
+- **Socket**: Events use `game.socket.on(\`system.${SYSTEM.id}\`, ...)`. Multi-player attack-defense uses a global `pendingDefenses` Map.
+- **i18n**: All user-visible strings are keys in `lang/en.json` as `LETHALFANTASY.Category.Key`. Always use `game.i18n.localize(key)`.
+
+### Compendium Packs
+
+Five LevelDB packs in `packs-system/`: skills, equipment, gifts, vulnerabilities, spells-miracles. Use the `tools/` scripts to export/import editable YAML.
+
+## Code Style
+
+- No semicolons, double quotes, 2-space indent
+- JSDoc `/** */` required on all functions/classes
+- Max line length 180 (strings/templates exempt)
+- Arrow functions: omit parens for single param
+- ESLint + Prettier config in `eslint.config.mjs`
@@ -529,16 +529,16 @@ i.lethalfantasy {
 }
 .lethalfantasy .tab.character-combat .main-div .combat-details .combat-detail .armor-hp {
  margin-right: 4px;
-  min-width: 10rem;
-  max-width: 10rem;
+  min-width: 11rem;
+  max-width: 11rem;
 }
 .lethalfantasy .tab.character-combat .main-div .combat-details .combat-detail .armor-hp .name {
  min-width: 6rem;
  max-width: 6rem;
 }
 .lethalfantasy .tab.character-combat .main-div .combat-details .combat-detail .armor-hp .input {
-  min-width: 2.5rem;
-  max-width: 2.5rem;
+  min-width: 3.5rem;
+  max-width: 3.5rem;
 }
 .lethalfantasy .tab.character-combat .main-div .combat-details .combat-detail .granted {
  min-width: 8rem;
@@ -2027,9 +2027,12 @@ i.lethalfantasy {
  background: #4a4940 !important;
  color: #ffffff !important;
 }
+.lethalfantasy .grit-luck-dialog {
+  color: var(--color-text-dark-primary, #191813);
+}
 .lethalfantasy .grit-luck-dialog .combat-status {
  padding: 12px;
-  background: linear-gradient(to bottom, rgba(42, 41, 32, 0.8) 0%, rgba(26, 25, 16, 0.9) 100%);
+  background: linear-gradient(to bottom, rgba(42, 41, 32, 0.88) 0%, rgba(26, 25, 16, 0.95) 100%);
  border: 1px solid rgba(212, 175, 55, 0.5);
  border-radius: 6px;
  margin-bottom: 16px;
@@ -2049,11 +2052,25 @@ i.lethalfantasy {
  margin-top: 8px;
 }
 .lethalfantasy .grit-luck-dialog .offer-text {
-  color: #f0e6d2;
+  color: var(--color-text-dark-primary, #191813);
  font-size: calc(var(--font-size-standard) * 1);
  text-align: center;
  font-weight: 600;
+  margin: 0 0 8px 0;
+}
+.lethalfantasy .grit-luck-dialog .shield-warning {
+  color: #7a4000;
+  background: rgba(255, 160, 0, 0.12);
+  border: 1px solid rgba(255, 160, 0, 0.4);
+  border-radius: 5px;
+  font-size: calc(var(--font-size-standard) * 0.88);
+  padding: 6px 10px;
  margin: 0;
+  text-align: center;
+}
+.lethalfantasy .grit-luck-dialog .shield-warning i {
+  color: #c07000;
+  margin-right: 5px;
 }
 .lethalfantasy .attack-result {
  padding: 16px;
@@ -2144,31 +2161,66 @@ i.lethalfantasy {
  color: #d4af37;
 }
 .lethalfantasy .attack-result .attack-result-damage {
-  display: flex;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
  gap: 8px;
-  justify-content: center;
+}
+.lethalfantasy .attack-result .attack-result-damage.single-btn {
+  grid-template-columns: 1fr;
+  max-width: 280px;
+  margin: 0 auto;
+}
+.lethalfantasy .attack-result .attack-result-damage.spell-damage {
+  grid-template-columns: 1fr;
+  width: 100%;
 }
 .lethalfantasy .attack-result .attack-result-damage .roll-damage-btn {
-  padding: 10px 16px;
+  padding: 10px 14px;
  background: linear-gradient(to bottom, #8b0000 0%, #660000 100%);
-  border: 1px solid #ff0000;
+  border: 1px solid #4b0000;
  border-radius: 6px;
  color: #f0e6d2;
  font-weight: 600;
+  font-size: calc(var(--font-size-standard) * 0.9);
+  text-align: center;
+  white-space: nowrap;
  cursor: pointer;
  transition: all 0.2s ease;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.4), inset 0 1px 0 rgba(255, 255, 255, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  position: relative;
+  overflow: hidden;
+}
+.lethalfantasy .attack-result .attack-result-damage .roll-damage-btn::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: -100%;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.15), transparent);
+  transition: left 0.5s;
+}
+.lethalfantasy .attack-result .attack-result-damage .roll-damage-btn:hover::before {
+  left: 100%;
+}
+.lethalfantasy .attack-result .attack-result-damage .roll-damage-btn i {
+  font-size: calc(var(--font-size-standard) * 1.1);
+  filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.5));
+  flex-shrink: 0;
 }
 .lethalfantasy .attack-result .attack-result-damage .roll-damage-btn:hover {
  background: linear-gradient(to bottom, #a00000 0%, #7b0000 100%);
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.4);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.15);
  transform: translateY(-2px);
+  border-color: #5b0000;
 }
 .lethalfantasy .attack-result .attack-result-damage .roll-damage-btn:active {
  transform: translateY(0);
-}
-.lethalfantasy .attack-result .attack-result-damage .roll-damage-btn i {
-  margin-right: 6px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4), inset 0 1px 3px rgba(0, 0, 0, 0.3);
 }
 .lethalfantasy .equipment-content {
  font-family: var(--font-primary);
@@ -3943,35 +3995,74 @@ i.lethalfantasy {
 }
 .message .attack-result .attack-result-damage,
 .attack-result .attack-result-damage {
-  display: flex;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
  gap: 8px;
-  justify-content: center;
+}
+.message .attack-result .attack-result-damage.single-btn,
+.attack-result .attack-result-damage.single-btn {
+  grid-template-columns: 1fr;
+  max-width: 280px;
+  margin: 0 auto;
+}
+.message .attack-result .attack-result-damage.spell-damage,
+.attack-result .attack-result-damage.spell-damage {
+  grid-template-columns: 1fr;
+  width: 100%;
 }
 .message .attack-result .attack-result-damage .roll-damage-btn,
 .attack-result .attack-result-damage .roll-damage-btn {
-  padding: 10px 16px;
+  padding: 10px 14px;
  background: linear-gradient(to bottom, #8b0000 0%, #660000 100%);
-  border: 1px solid #ff0000;
+  border: 1px solid #4b0000;
  border-radius: 6px;
  color: #f0e6d2;
  font-weight: 600;
+  font-size: calc(var(--font-size-standard) * 0.9);
+  text-align: center;
+  white-space: nowrap;
  cursor: pointer;
  transition: all 0.2s ease;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.4), inset 0 1px 0 rgba(255, 255, 255, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  position: relative;
+  overflow: hidden;
+}
+.message .attack-result .attack-result-damage .roll-damage-btn::before,
+.attack-result .attack-result-damage .roll-damage-btn::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: -100%;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.15), transparent);
+  transition: left 0.5s;
+}
+.message .attack-result .attack-result-damage .roll-damage-btn:hover::before,
+.attack-result .attack-result-damage .roll-damage-btn:hover::before {
+  left: 100%;
+}
+.message .attack-result .attack-result-damage .roll-damage-btn i,
+.attack-result .attack-result-damage .roll-damage-btn i {
+  font-size: calc(var(--font-size-standard) * 1.1);
+  filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.5));
+  flex-shrink: 0;
 }
 .message .attack-result .attack-result-damage .roll-damage-btn:hover,
 .attack-result .attack-result-damage .roll-damage-btn:hover {
  background: linear-gradient(to bottom, #a00000 0%, #7b0000 100%);
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.4);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.15);
  transform: translateY(-2px);
+  border-color: #5b0000;
 }
 .message .attack-result .attack-result-damage .roll-damage-btn:active,
 .attack-result .attack-result-damage .roll-damage-btn:active {
  transform: translateY(0);
-}
-.message .attack-result .attack-result-damage .roll-damage-btn i,
-.attack-result .attack-result-damage .roll-damage-btn i {
-  margin-right: 6px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4), inset 0 1px 3px rgba(0, 0, 0, 0.3);
 }
 #token-hud .hp-loss-wrap {
  position: absolute;
@@ -471,6 +471,8 @@
      "range": "Range",
      "rangeDefenseDialog": "Ranged defense dialog",
      "rangeDefenseRoll": "Ranged defense roll",
+      "rangeAttackDialog": "Ranged attack dialog",
+      "rangeAttackRoll": "Ranged attack roll",
      "rangedAttackDefense": "Ranged attack defense",
      "resource": "Resource",
      "resources": "Resources",
@@ -230,9 +230,15 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
      const weaponName = message.rolls[0]?.rollName || "weapon"
      const attackRoll = message.rolls[0]?.rollTotal || 0
      const defenderName = combatant.name
-      const attackWeaponId = message.rolls[0]?.rollTarget?.weapon?.id || message.rolls[0]?.rollTarget?.weapon?._id
      const attackRollType = message.rolls[0]?.type
-      const attackRollKey = message.rolls[0]?.rollTarget?.rollKey
+      const rollTargetData = message.rolls[0]?.rollTarget
+      // For spell/miracle attacks, rollTarget IS the spell item (serialised as its data object).
+      // For weapon attacks, rollTarget is a plain skill+weapon object and weapon.id is the weapon.
+      const isSpellMiracleAttack = attackRollType === "spell-attack" || attackRollType === "miracle-attack"
+      const attackWeaponId = isSpellMiracleAttack
+        ? (rollTargetData?._id || rollTargetData?.id)
+        : (rollTargetData?.weapon?.id || rollTargetData?.weapon?._id)
+      const attackRollKey = rollTargetData?.rollKey
      console.log(`[LF] request-defense-btn | attackRollType=${attackRollType} defender=${defenderName} defenderType=${combatant.actor?.type}`)
      const attackD30result = message.rolls[0]?.options?.D30result || null
      const attackD30message = message.rolls[0]?.options?.D30message || null
@@ -256,6 +262,7 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
      const isRangedAttack = (rollTargetOptions?.attackMode === "ranged")
        || (attacker?.type === "monster" && attacker.system.attackMode === "ranged")
        || (attackerWeapon?.system?.weaponType === "ranged")
+        || (rollTargetOptions?.isRangedAttack === true)

      const defenseMsg = {
        type: "requestDefense",
@@ -363,17 +370,17 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
              action: "applyDR",
              label: game.i18n.localize("LETHALFANTASY.Combat.spellApplyDR"),
              icon: "fa-solid fa-shield",
-              callback: (event, button, dialog) => Number(dialog.querySelector("[name='manualDr']")?.value) || 0
+              callback: (event, button) => Number(button.form?.elements?.manualDr?.value) || 0
            },
            {
              action: "cancel",
              label: game.i18n.localize("LETHALFANTASY.Combat.proceedNo"),
-              callback: () => null
+              callback: () => "cancel"
            }
          ],
          rejectClose: false
        })
-        if (manualDR === null) return
+        if (manualDR === null || manualDR === "cancel") return
        const rollOpts = {
          type: "spell-damage",
          rollType: "spell-damage",
@@ -387,11 +394,7 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
          actorName: actor.name,
          actorImage: actor.img
        }
-        const roll = new LethalFantasyRoll(damageFormula, {}, rollOpts)
-        await roll.evaluate()
-        roll.options.rollTotal = roll.total
-        if (game?.dice3d) await game.dice3d.showForRoll(roll, game.user, true)
-        await roll.toMessage()
+        await documents.LethalFantasyRoll.rollSpellDamageToMessage(damageFormula, rollOpts)
        return
      }

@@ -402,7 +405,7 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
      }

      // Pour les monstres, utiliser prepareMonsterRoll
-      if (isMonster || actor.type === "monster") {
+      if (isMonster === "true" || actor.type === "monster") {
        await actor.system.prepareMonsterRoll("monster-damage", weaponId, undefined, undefined, damageModifier)
        return
      }
@@ -523,281 +526,294 @@ Hooks.on("createChatMessage", async (message) => {
    })
  }

-  // Si le défenseur est un personnage qui perd, proposer Grit/Luck (seulement s'il a des points)
-  // Seulement si l'utilisateur actuel est le propriétaire du défenseur
+  // Reaction phase — both sides may use grit/luck/shield/mulligan before the outcome is resolved.
+  // After a mulligan reroll (either side), the comparison restarts so both sides can react to the new numbers.
  let defenderHandledBonus = false
+  let attackerHandledBonus = false
  let shieldReaction = null
  let shieldBlocked = false
  const isSpellOrMiracle = attackRollType === "spell-attack" || attackRollType === "miracle-attack"
-  if (defender && defenseRoll < attackRoll && isPrimaryController(defender) && !isSpellOrMiracle) {
-    const shieldData = LethalFantasyUtils.getShieldReactionData(defender)
-    let canRerollDefense = LethalFantasyUtils.hasD30Reroll(defenseD30message)
-    let canShieldReact = !!shieldData
-    let canAdHocShield = !shieldData
-
-    while (defenseRoll < attackRoll) {
-      const currentGrit = Number(defender.system?.grit?.current) || 0
-      const currentLuck = Number(defender.system?.luck?.current) || 0
-      const buttons = []
-
-      if (currentGrit > 0) {
-        buttons.push({
-          action: "grit",
-          label: `Spend 1 Grit (+1D6) [${currentGrit} left]`,
-          icon: "fa-solid fa-fist-raised",
-          callback: () => "grit"
-        })
-      }
-
-      if (currentLuck > 0) {
-        buttons.push({
-          action: "luck",
-          label: `Spend 1 Luck (+1D6) [${currentLuck} left]`,
-          icon: "fa-solid fa-clover",
-          callback: () => "luck"
-        })
-      }
-
-      buttons.push({
-        action: "bonusDie",
-        label: "Add bonus die",
-        icon: "fa-solid fa-dice",
-        callback: () => "bonusDie"
-      })
-
-      if (canRerollDefense) {
-        buttons.push({
-          action: "rerollDefense",
-          label: "Re-roll defense",
-          icon: "fa-solid fa-rotate-right",
-          callback: () => "rerollDefense"
-        })
-      }
-
-      if (canShieldReact) {
-        buttons.push({
-          action: "shieldReact",
-          label: `Roll shield (${shieldData.label})`,
-          icon: "fa-solid fa-shield",
-          callback: () => "shieldReact"
-        })
-      } else if (canAdHocShield) {
-        // No pre-configured shield — offer ad-hoc shield option (useful for monsters)
-        buttons.push({
-          action: "adHocShield",
-          label: "Roll ad-hoc shield (choose dice + DR)",
-          icon: "fa-solid fa-shield-halved",
-          callback: () => "adHocShield"
-        })
-      }
-
-      buttons.push({
-        action: "continue",
-        label: "Continue (no defense bonus)",
-        icon: "fa-solid fa-forward",
-        callback: () => "continue"
-      })
-
-      const choice = await foundry.applications.api.DialogV2.wait({
-        window: { title: "Defense reactions" },
-        classes: ["lethalfantasy"],
-        content: `
-          <div class="grit-luck-dialog">
-            <div class="combat-status">
-              <p><strong>${attackerName}</strong> rolled <strong>${attackRoll}</strong></p>
-              <p><strong>${defenderName}</strong> currently has <strong>${defenseRoll}</strong></p>
-              ${defenseD30message ? `<p class="bonus-info">D30 special: ${defenseD30message.description}</p>` : ""}
-            </div>
-            <p class="offer-text">Choose how to improve the defense before resolving the hit.</p>
-          </div>
-        `,
-        buttons,
-        rejectClose: false
-      })
-
-      if (!choice || choice === "continue") break
-
-      defenderHandledBonus = true
-
-      if (choice === "grit") {
-        const bonusRoll = await LethalFantasyUtils.rollBonusDie("1d6", defender, (total) => `<p><strong>${defenderName}</strong> spends 1 Grit and rolls <strong>${total}</strong> for defense.</p>`)
-        defenseRoll += bonusRoll
-        await defender.update({ "system.grit.current": currentGrit - 1 })
-        continue
-      }
-
-      if (choice === "luck") {
-        const bonusRoll = await LethalFantasyUtils.rollBonusDie("1d6", defender, (total) => `<p><strong>${defenderName}</strong> spends 1 Luck and rolls <strong>${total}</strong> for defense.</p>`)
-        defenseRoll += bonusRoll
-        await defender.update({ "system.luck.current": currentLuck - 1 })
-        continue
-      }
-
-      if (choice === "bonusDie") {
-        const bonusDie = await LethalFantasyUtils.promptCombatBonusDie(defenderName, "attack", defenseRoll, attackRoll)
-        if (!bonusDie) continue
-        const bonusRoll = await LethalFantasyUtils.rollBonusDie(bonusDie, defender, (total, formula) => `<p><strong>${defenderName}</strong> adds <strong>${formula.toUpperCase()}</strong> and rolls <strong>${total}</strong> for defense.</p>`)
-        defenseRoll += bonusRoll
-        continue
-      }
-
-      if (choice === "rerollDefense" && canRerollDefense) {
-        const oldDefenseRoll = defenseRoll
-        const reroll = await LethalFantasyUtils.rerollConfiguredRoll(defenseRerollContext)
-        canRerollDefense = false
-        if (!reroll) continue
-        defenseRoll = reroll.options?.rollTotal || reroll.total || oldDefenseRoll
-        await createReactionMessage(defender, `<p><strong>${defenderName}</strong> uses Mulligan and re-rolls defense: <strong>${oldDefenseRoll}</strong> → <strong>${defenseRoll}</strong>.</p>`)
-        continue
-      }
-
-      if (choice === "shieldReact" && canShieldReact) {
-        const shieldBonus = await LethalFantasyUtils.rollBonusDie(shieldData.formula, defender)
-        const newDefenseTotal = defenseRoll + shieldBonus
-        defenseRoll = newDefenseTotal
-        canShieldReact = false
-
-        if (newDefenseTotal >= attackRoll) {
-          shieldBlocked = true
-          shieldReaction = {
-            damageReduction: shieldData.damageReduction,
-            label: shieldData.label,
-            bonus: shieldBonus
-          }
-          await createReactionMessage(
-            defender,
-            `<p><strong>${defenderName}</strong> rolls <strong>${shieldData.label}</strong> and adds <strong>${shieldBonus}</strong> to defense (${newDefenseTotal} ≥ ${attackRoll}). <strong>Shield blocked the attack!</strong> Both armor DR and shield DR <strong>${shieldData.damageReduction}</strong> will apply to damage.</p>`
-          )
-        } else {
-          shieldReaction = null
-          await createReactionMessage(
-            defender,
-            `<p><strong>${defenderName}</strong> rolls <strong>${shieldData.label}</strong> and adds <strong>${shieldBonus}</strong> to defense (${newDefenseTotal} < ${attackRoll}). Shield did not block — normal hit, armor DR only.</p>`
-          )
-        }
-      }
-
-      if (choice === "adHocShield") {
-        const adHoc = await LethalFantasyUtils.promptAdHocShield(defenderName, attackRoll, defenseRoll)
-        if (!adHoc) continue
-        const shieldBonus = await LethalFantasyUtils.rollBonusDie(adHoc.formula, defender)
-        const newDefenseTotal = defenseRoll + shieldBonus
-        defenseRoll = newDefenseTotal
-        canShieldReact = false
-        canAdHocShield = false
-
-        if (newDefenseTotal >= attackRoll) {
-          shieldBlocked = true
-          shieldReaction = {
-            damageReduction: adHoc.damageReduction,
-            label: `${adHoc.formula.toUpperCase()} shield`,
-            bonus: shieldBonus
-          }
-          await createReactionMessage(
-            defender,
-            `<p><strong>${defenderName}</strong> rolls <strong>${adHoc.formula.toUpperCase()}</strong> shield and adds <strong>${shieldBonus}</strong> to defense (${newDefenseTotal} ≥ ${attackRoll}). <strong>Shield blocked the attack!</strong> Both armor DR and shield DR <strong>${adHoc.damageReduction}</strong> will apply to damage.</p>`
-          )
-        } else {
-          shieldReaction = null
-          await createReactionMessage(
-            defender,
-            `<p><strong>${defenderName}</strong> rolls <strong>${adHoc.formula.toUpperCase()}</strong> shield and adds <strong>${shieldBonus}</strong> to defense (${newDefenseTotal} < ${attackRoll}). Shield did not block — normal hit, armor DR only.</p>`
-          )
-        }
-      }
-    }
-  }

+  // These persist across mulligan restarts (once used they stay consumed)
+  const shieldData = LethalFantasyUtils.getShieldReactionData(defender)
+  let canRerollDefense = LethalFantasyUtils.hasD30Reroll(defenseD30message)
+  let canShieldReact = !!shieldData
+  let canAdHocShield = !shieldData
  let attackRollFinal = attackRoll
-  let attackerHandledBonus = false
+  let canRerollAttack = LethalFantasyUtils.hasD30Reroll(attackD30message)
+  let mulliganRestart = false

-  // Si l'attaquant est un personnage qui perd et a du Grit
-  // Seulement si l'utilisateur actuel est le propriétaire de l'attaquant (pas le MJ)
-  if (!defenderHandledBonus && attacker && attackRollFinal <= defenseRoll && isPrimaryController(attacker)) {
-    let canRerollAttack = LethalFantasyUtils.hasD30Reroll(attackD30message)
+  do {
+    mulliganRestart = false
+    defenderHandledBonus = false
+    attackerHandledBonus = false

-    while (attackRollFinal <= defenseRoll) {
-      const currentGrit = Number(attacker.system?.grit?.current) || 0
-      const buttons = []
+    // ── Defense reaction loop ──────────────────────────────────────────────
+    if (defender && defenseRoll < attackRollFinal && isPrimaryController(defender) && !isSpellOrMiracle) {
+      while (defenseRoll < attackRollFinal) {
+        const currentGrit = Number(defender.system?.grit?.current) || 0
+        const currentLuck = Number(defender.system?.luck?.current) || 0
+        const buttons = []
+
+        if (currentGrit > 0) {
+          buttons.push({
+            action: "grit",
+            label: `Spend 1 Grit (+1D6) [${currentGrit} left]`,
+            icon: "fa-solid fa-fist-raised",
+            callback: () => "grit"
+          })
+        }
+
+        if (currentLuck > 0) {
+          buttons.push({
+            action: "luck",
+            label: `Spend 1 Luck (+1D6) [${currentLuck} left]`,
+            icon: "fa-solid fa-clover",
+            callback: () => "luck"
+          })
+        }

-      if (currentGrit > 0) {
        buttons.push({
-          action: "grit",
-          label: `Spend 1 Grit (+1D6) [${currentGrit} left]`,
-          icon: "fa-solid fa-fist-raised",
-          callback: () => "grit"
+          action: "bonusDie",
+          label: "Add bonus die",
+          icon: "fa-solid fa-dice",
+          callback: () => "bonusDie"
        })
-      }

-      buttons.push({
-        action: "bonusDie",
-        label: "Add bonus die",
-        icon: "fa-solid fa-dice",
-        callback: () => "bonusDie"
-      })
+        if (canRerollDefense) {
+          buttons.push({
+            action: "rerollDefense",
+            label: "Re-roll defense (Mulligan)",
+            icon: "fa-solid fa-rotate-right",
+            callback: () => "rerollDefense"
+          })
+        }
+
+        if (canShieldReact) {
+          buttons.push({
+            action: "shieldReact",
+            label: `Roll shield (${shieldData.label})`,
+            icon: "fa-solid fa-shield",
+            callback: () => "shieldReact"
+          })
+        } else if (canAdHocShield) {
+          buttons.push({
+            action: "adHocShield",
+            label: "Roll ad-hoc shield (choose dice + DR)",
+            icon: "fa-solid fa-shield-halved",
+            callback: () => "adHocShield"
+          })
+        }

-      if (canRerollAttack && attackRerollContext) {
        buttons.push({
-          action: "rerollAttack",
-          label: "Re-roll attack",
-          icon: "fa-solid fa-rotate-right",
-          callback: () => "rerollAttack"
+          action: "continue",
+          label: "Continue (no defense bonus)",
+          icon: "fa-solid fa-forward",
+          callback: () => "continue"
        })
-      }

-      buttons.push({
-        action: "continue",
-        label: "Continue (no attack bonus)",
-        icon: "fa-solid fa-forward",
-        callback: () => "continue"
-      })
-
-      const choice = await foundry.applications.api.DialogV2.wait({
-        window: { title: "Attack reactions" },
-        classes: ["lethalfantasy"],
-        content: `
-          <div class="grit-luck-dialog">
-            <div class="combat-status">
-              <p><strong>${attackerName}</strong> currently has <strong>${attackRollFinal}</strong></p>
-              <p><strong>${defenderName}</strong> rolled <strong>${defenseRoll}</strong></p>
-              ${attackD30message ? `<p class="bonus-info">D30 special: ${attackD30message.description}</p>` : ""}
+        const choice = await foundry.applications.api.DialogV2.wait({
+          window: { title: "Defense reactions" },
+          classes: ["lethalfantasy"],
+          content: `
+            <div class="grit-luck-dialog">
+              <div class="combat-status">
+                <p><strong>${attackerName}</strong> rolled <strong>${attackRollFinal}</strong></p>
+                <p><strong>${defenderName}</strong> currently has <strong>${defenseRoll}</strong></p>
+                ${defenseD30message ? `<p class="bonus-info">D30 special: ${defenseD30message.description}</p>` : ""}
+              </div>
+              <p class="offer-text">Choose how to improve the defense before resolving the hit.</p>
            </div>
-            <p class="offer-text">Choose how to improve the attack before resolving the combat result.</p>
-          </div>
-        `,
-        buttons,
-        rejectClose: false
-      })
+          `,
+          buttons,
+          rejectClose: false
+        })

-      if (!choice || choice === "continue") break
+        if (!choice || choice === "continue") break

-      attackerHandledBonus = true
+        defenderHandledBonus = true

-      if (choice === "grit") {
-        const attackBonus = await LethalFantasyUtils.rollBonusDie("1d6", attacker, (total) => `<p><strong>${attackerName}</strong> spends 1 Grit and rolls <strong>${total}</strong> for attack.</p>`)
-        attackRollFinal += attackBonus
-        await attacker.update({ "system.grit.current": currentGrit - 1 })
-        continue
-      }
+        if (choice === "grit") {
+          const bonusRoll = await LethalFantasyUtils.rollBonusDie("1d6", defender, total => `<p><strong>${defenderName}</strong> spends 1 Grit and rolls <strong>${total}</strong> for defense.</p>`)
+          defenseRoll += bonusRoll
+          await defender.update({ "system.grit.current": currentGrit - 1 })
+          continue
+        }

-      if (choice === "bonusDie") {
-        const bonusDie = await LethalFantasyUtils.promptCombatBonusDie(attackerName, "defense", attackRollFinal, defenseRoll)
-        if (!bonusDie) continue
-        const attackBonus = await LethalFantasyUtils.rollBonusDie(bonusDie, attacker, (total, formula) => `<p><strong>${attackerName}</strong> adds <strong>${formula.toUpperCase()}</strong> and rolls <strong>${total}</strong> for attack.</p>`)
-        attackRollFinal += attackBonus
-        continue
-      }
+        if (choice === "luck") {
+          const bonusRoll = await LethalFantasyUtils.rollBonusDie("1d6", defender, total => `<p><strong>${defenderName}</strong> spends 1 Luck and rolls <strong>${total}</strong> for defense.</p>`)
+          defenseRoll += bonusRoll
+          await defender.update({ "system.luck.current": currentLuck - 1 })
+          continue
+        }

-      if (choice === "rerollAttack" && canRerollAttack && attackRerollContext) {
-        const oldAttackRoll = attackRollFinal
-        const reroll = await LethalFantasyUtils.rerollConfiguredRoll(attackRerollContext)
-        canRerollAttack = false
-        if (!reroll) continue
-        attackRollFinal = reroll.options?.rollTotal || reroll.total || oldAttackRoll
-        await createReactionMessage(attacker, `<p><strong>${attackerName}</strong> uses Mulligan and re-rolls attack: <strong>${oldAttackRoll}</strong> → <strong>${attackRollFinal}</strong>.</p>`)
+        if (choice === "bonusDie") {
+          const bonusDie = await LethalFantasyUtils.promptCombatBonusDie(defenderName, "attack", defenseRoll, attackRollFinal)
+          if (!bonusDie) continue
+          const bonusRoll = await LethalFantasyUtils.rollBonusDie(bonusDie, defender, (total, formula) => `<p><strong>${defenderName}</strong> adds <strong>${formula.toUpperCase()}</strong> and rolls <strong>${total}</strong> for defense.</p>`)
+          defenseRoll += bonusRoll
+          continue
+        }
+
+        if (choice === "rerollDefense" && canRerollDefense) {
+          const oldDefenseRoll = defenseRoll
+          const reroll = await LethalFantasyUtils.rerollConfiguredRoll(defenseRerollContext)
+          canRerollDefense = false
+          if (!reroll) continue
+          defenseRoll = reroll.options?.rollTotal || reroll.total || oldDefenseRoll
+          await createReactionMessage(defender, `<p><strong>${defenderName}</strong> uses Mulligan and re-rolls defense: <strong>${oldDefenseRoll}</strong> → <strong>${defenseRoll}</strong>. Both sides may now react to the new numbers.</p>`)
+          // Restart the full comparison so both sides can react to the new roll
+          mulliganRestart = true
+          break
+        }
+
+        if (choice === "shieldReact" && canShieldReact) {
+          const shieldBonus = await LethalFantasyUtils.rollBonusDie(shieldData.formula, defender)
+          const newDefenseTotal = defenseRoll + shieldBonus
+          defenseRoll = newDefenseTotal
+          canShieldReact = false
+
+          if (newDefenseTotal >= attackRollFinal) {
+            shieldBlocked = true
+            shieldReaction = {
+              damageReduction: shieldData.damageReduction,
+              label: shieldData.label,
+              bonus: shieldBonus
+            }
+            await createReactionMessage(
+              defender,
+              `<p><strong>${defenderName}</strong> rolls <strong>${shieldData.label}</strong> and adds <strong>${shieldBonus}</strong> to defense (${newDefenseTotal} ≥ ${attackRollFinal}). <strong>Shield blocked the attack!</strong> Both armor DR and shield DR <strong>${shieldData.damageReduction}</strong> will apply to damage.</p>`
+            )
+          } else {
+            shieldReaction = null
+            await createReactionMessage(
+              defender,
+              `<p><strong>${defenderName}</strong> rolls <strong>${shieldData.label}</strong> and adds <strong>${shieldBonus}</strong> to defense (${newDefenseTotal} < ${attackRollFinal}). Shield did not block — normal hit, armor DR only.</p>`
+            )
+          }
+        }
+
+        if (choice === "adHocShield") {
+          const adHoc = await LethalFantasyUtils.promptAdHocShield(defenderName, attackRollFinal, defenseRoll)
+          if (!adHoc) continue
+          const shieldBonus = await LethalFantasyUtils.rollBonusDie(adHoc.formula, defender)
+          const newDefenseTotal = defenseRoll + shieldBonus
+          defenseRoll = newDefenseTotal
+          canShieldReact = false
+          canAdHocShield = false
+
+          if (newDefenseTotal >= attackRollFinal) {
+            shieldBlocked = true
+            shieldReaction = {
+              damageReduction: adHoc.damageReduction,
+              label: `${adHoc.formula.toUpperCase()} shield`,
+              bonus: shieldBonus
+            }
+            await createReactionMessage(
+              defender,
+              `<p><strong>${defenderName}</strong> rolls <strong>${adHoc.formula.toUpperCase()}</strong> shield and adds <strong>${shieldBonus}</strong> to defense (${newDefenseTotal} ≥ ${attackRollFinal}). <strong>Shield blocked the attack!</strong> Both armor DR and shield DR <strong>${adHoc.damageReduction}</strong> will apply to damage.</p>`
+            )
+          } else {
+            shieldReaction = null
+            await createReactionMessage(
+              defender,
+              `<p><strong>${defenderName}</strong> rolls <strong>${adHoc.formula.toUpperCase()}</strong> shield and adds <strong>${shieldBonus}</strong> to defense (${newDefenseTotal} < ${attackRollFinal}). Shield did not block — normal hit, armor DR only.</p>`
+            )
+          }
+        }
      }
    }
-  }
+
+    if (mulliganRestart) continue
+
+    // ── Attack reaction loop ───────────────────────────────────────────────
+    if (!defenderHandledBonus && attacker && attackRollFinal <= defenseRoll && isPrimaryController(attacker)) {
+      while (attackRollFinal <= defenseRoll) {
+        const currentGrit = Number(attacker.system?.grit?.current) || 0
+        const buttons = []
+
+        if (currentGrit > 0) {
+          buttons.push({
+            action: "grit",
+            label: `Spend 1 Grit (+1D6) [${currentGrit} left]`,
+            icon: "fa-solid fa-fist-raised",
+            callback: () => "grit"
+          })
+        }
+
+        buttons.push({
+          action: "bonusDie",
+          label: "Add bonus die",
+          icon: "fa-solid fa-dice",
+          callback: () => "bonusDie"
+        })
+
+        if (canRerollAttack && attackRerollContext) {
+          buttons.push({
+            action: "rerollAttack",
+            label: "Re-roll attack (Mulligan)",
+            icon: "fa-solid fa-rotate-right",
+            callback: () => "rerollAttack"
+          })
+        }
+
+        buttons.push({
+          action: "continue",
+          label: "Continue (no attack bonus)",
+          icon: "fa-solid fa-forward",
+          callback: () => "continue"
+        })
+
+        const choice = await foundry.applications.api.DialogV2.wait({
+          window: { title: "Attack reactions" },
+          classes: ["lethalfantasy"],
+          content: `
+            <div class="grit-luck-dialog">
+              <div class="combat-status">
+                <p><strong>${attackerName}</strong> currently has <strong>${attackRollFinal}</strong></p>
+                <p><strong>${defenderName}</strong> rolled <strong>${defenseRoll}</strong></p>
+                ${attackD30message ? `<p class="bonus-info">D30 special: ${attackD30message.description}</p>` : ""}
+              </div>
+              <p class="offer-text">Choose how to improve the attack before resolving the combat result.</p>
+            </div>
+          `,
+          buttons,
+          rejectClose: false
+        })
+
+        if (!choice || choice === "continue") break
+
+        attackerHandledBonus = true
+
+        if (choice === "grit") {
+          const attackBonus = await LethalFantasyUtils.rollBonusDie("1d6", attacker, total => `<p><strong>${attackerName}</strong> spends 1 Grit and rolls <strong>${total}</strong> for attack.</p>`)
+          attackRollFinal += attackBonus
+          await attacker.update({ "system.grit.current": currentGrit - 1 })
+          continue
+        }
+
+        if (choice === "bonusDie") {
+          const bonusDie = await LethalFantasyUtils.promptCombatBonusDie(attackerName, "defense", attackRollFinal, defenseRoll)
+          if (!bonusDie) continue
+          const attackBonus = await LethalFantasyUtils.rollBonusDie(bonusDie, attacker, (total, formula) => `<p><strong>${attackerName}</strong> adds <strong>${formula.toUpperCase()}</strong> and rolls <strong>${total}</strong> for attack.</p>`)
+          attackRollFinal += attackBonus
+          continue
+        }
+
+        if (choice === "rerollAttack" && canRerollAttack && attackRerollContext) {
+          const oldAttackRoll = attackRollFinal
+          const reroll = await LethalFantasyUtils.rerollConfiguredRoll(attackRerollContext)
+          canRerollAttack = false
+          if (!reroll) continue
+          attackRollFinal = reroll.options?.rollTotal || reroll.total || oldAttackRoll
+          await createReactionMessage(attacker, `<p><strong>${attackerName}</strong> uses Mulligan and re-rolls attack: <strong>${oldAttackRoll}</strong> → <strong>${attackRollFinal}</strong>. Both sides may now react to the new numbers.</p>`)
+          // Restart the full comparison so both sides can react to the new roll
+          mulliganRestart = true
+          break
+        }
+      }
+    }
+  } while (mulliganRestart)

  const shieldDamageReduction = shieldBlocked ? shieldReaction.damageReduction : 0
  const outcome = shieldBlocked ? "shielded-hit" : (attackRollFinal > defenseRoll ? "hit" : "miss")
@@ -22,6 +22,7 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet
      divinityPointsMinus: LethalFantasyCharacterSheet.#onDivinityPointsMinus,
      aetherPointsPlus: LethalFantasyCharacterSheet.#onAetherPointsPlus,
      aetherPointsMinus: LethalFantasyCharacterSheet.#onAetherPointsMinus,
+      rollSpellDamage: LethalFantasyCharacterSheet.#onRollSpellDamage,
    },
  }

@@ -70,10 +71,10 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet
      biography: { id: "biography", group: "sheet", icon: "fa-solid fa-book", label: "LETHALFANTASY.Label.biography" },
    }
    if (this.actor.system.biodata.magicUser) {
-      tabs.spells = { id: "spells", group: "sheet", icon: "fa-sharp-duotone fa-solid fa-wand-magic-sparkles", label: "LETHALFANTASY.Label.spells" }
+      tabs.spells = { id: "spells", group: "sheet", icon: "fa-solid fa-wand-magic-sparkles", label: "LETHALFANTASY.Label.spells" }
    }
    if (this.actor.system.biodata.clericUser) {
-      tabs.miracles = { id: "miracles", group: "sheet", icon: "fa-sharp-duotone fa-solid fa-hands-praying", label: "LETHALFANTASY.Label.miracles" }
+      tabs.miracles = { id: "miracles", group: "sheet", icon: "fa-solid fa-hands-praying", label: "LETHALFANTASY.Label.miracles" }
    }
    for (const v of Object.values(tabs)) {
      v.active = this.tabGroups[v.group] === v.id
@@ -219,6 +220,75 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet
    this.actor.update({ "system.aetherPoints.value": points })
  }

+  /**
+   * Handles spell damage roll from the spell sheet tab.
+   * Shows a DR dialog then rolls the appropriate damage formula.
+   * @param {PointerEvent} event
+   * @param {HTMLElement} target
+   */
+  static async #onRollSpellDamage(event, target) {
+    if (this.isEditMode) return
+    const itemId = target.dataset.itemId
+    const tier = target.dataset.damageTier
+    const spell = this.actor.items.get(itemId)
+    if (!spell) return
+
+    const formulaMap = {
+      standard: spell.system.damageDice,
+      overpowered: spell.system.damageDiceOverpowered,
+      overpowered2: spell.system.damageDiceOverpowered2,
+    }
+    const formula = formulaMap[tier]
+    if (!formula) return
+
+    const manualDR = await foundry.applications.api.DialogV2.wait({
+      window: { title: game.i18n.localize("LETHALFANTASY.Combat.spellDRDialogTitle") },
+      classes: ["lethalfantasy"],
+      position: { width: 320 },
+      content: `<div style="padding:0.5rem 0">
+        <p style="margin-bottom:0.6rem">${game.i18n.localize("LETHALFANTASY.Combat.spellDRDialogMsg")}</p>
+        <div style="display:flex;align-items:center;gap:0.5rem">
+          <label style="font-weight:bold">${game.i18n.localize("LETHALFANTASY.Combat.spellDRLabel")}</label>
+          <input type="number" name="manualDr" value="0" min="0" style="width:5rem"/>
+        </div>
+      </div>`,
+      buttons: [
+        {
+          action: "noDR",
+          label: game.i18n.localize("LETHALFANTASY.Combat.spellNoDR"),
+          icon: "fa-solid fa-wand-magic-sparkles",
+          callback: () => 0
+        },
+        {
+          action: "applyDR",
+          label: game.i18n.localize("LETHALFANTASY.Combat.spellApplyDR"),
+          icon: "fa-solid fa-shield",
+          callback: (event, button) => Number(button.form?.elements?.manualDr?.value) || 0
+        },
+        {
+          action: "cancel",
+          label: game.i18n.localize("LETHALFANTASY.Combat.proceedNo"),
+          callback: () => "cancel"
+        }
+      ],
+      rejectClose: false
+    })
+    if (manualDR === null || manualDR === "cancel") return
+
+    const rollOpts = {
+      type: "spell-damage",
+      rollType: "spell-damage",
+      rollName: `${spell.name} — ${formula}`,
+      isDamage: true,
+      rollData: { isDamage: true },
+      manualDR,
+      actorId: this.actor.id,
+      actorName: this.actor.name,
+      actorImage: this.actor.img
+    }
+    await LethalFantasyRoll.rollSpellDamageToMessage(formula, rollOpts)
+  }
+
  static #onCreateEquipment(event, target) {
  }

@@ -108,6 +108,10 @@
          }
        ],
        "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"
      }
    },
    "29": {
@@ -145,6 +149,11 @@
        "type": "gain_grit",
        "amount": 1,
        "description": "Gain 1 Grit"
+      },
+      "saving_throws": {
+        "type": "gain_grit",
+        "amount": 1,
+        "description": "Gain 1 Grit"
      }
    },
    "28": {
@@ -199,6 +208,12 @@
        "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,6 +254,12 @@
      "ranged_defense": {
        "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"
      }
    },
    "20": {
@@ -349,6 +370,12 @@
          }
        ],
        "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"
      }
    },
    "15": {
@@ -391,6 +418,12 @@
          "shield_bash"
        ],
        "description": "Kick, Punch or Shield Bash"
+      },
+      "saving_throws": {
+        "type": "bonus_flat",
+        "amount": 1,
+        "target": "save",
+        "description": "Add 1 to Saving Throw"
      }
    },
    "13": {},
@@ -445,6 +478,12 @@
          "shield_bash"
        ],
        "description": "Kick, Punch or Shield Bash"
+      },
+      "saving_throws": {
+        "type": "bonus_flat",
+        "amount": 1,
+        "target": "save",
+        "description": "Add 1 to Saving Throw"
      }
    },
    "8": {
@@ -475,6 +514,10 @@
      "ranged_defense": {
        "type": "mulligan",
        "description": "Mulligan, Can Choose to Re-Roll This Defense"
+      },
+      "saving_throws": {
+        "type": "mulligan",
+        "description": "Mulligan, Can Re-Roll This Saving Throw"
      }
    },
    "7": {
@@ -528,6 +571,12 @@
          "shield_bash"
        ],
        "description": "Kick, Punch, or Shield Bash"
+      },
+      "saving_throws": {
+        "type": "bonus_flat",
+        "amount": 1,
+        "target": "save",
+        "description": "Add 1 to Saving Throw"
      }
    },
    "3": {
@@ -608,7 +657,12 @@
      },
      "arcane_spell_attack": {
        "type": "spell_calamity",
-        "description": "Possible Spell Calamity or Catastrophe"
+        "description": "A possible spell calamity has occurred"
+      },
+      "melee_attack": {
+        "type": "fumble",
+        "detail": "melee_fumble",
+        "description": "Possible Fumble"
      }
    }
  },
@@ -85,11 +85,18 @@ export const RANGE_CHOICES = {
  "pointblank": { label: "Point Blank (Special)", value: "pointblank" },
  "short": { label: "Short (+0)", value: "0" },
  "medium": { label: "Medium (Red +5)", value: "+5" },
-  "long": { label: "Long (Purle +7)", value: "+7" },
+  "long": { label: "Long (Purple +7)", value: "+7" },
  "extreme": { label: "Extreme (Grey +9)", value: "+9" },
  "beyondskill": { label: "Beyond Skill (Blue +11)", value: "beyondskill" }
 }

+export const ATTACKER_MOVEMENT_CHOICES = {
+  "none": { label: "None / Stationary (D20E Favor)", favor: true, value: "2D20kh" },
+  "walk": { label: "Walk (D20E)", value: "D20" },
+  "incombat": { label: "In Combat (D20E)", value: "D20" },
+  "run": { label: "Jog/Run/Sprint (D20E Disfavor)", disfavor: true, value: "2D20kl" }
+}
+
 export const ATTACKER_AIM_CHOICES = {
  "simple": { label: "Simple (+0)", value: "0" },
  "careful": { label: "Careful (Red +5)", value: "+4" },
@@ -321,6 +328,7 @@ export const SYSTEM = {
  RANGE_CHOICES,
  FAVOR_CHOICES,
  ATTACKER_AIM_CHOICES,
+  ATTACKER_MOVEMENT_CHOICES,
  MORTAL_CHOICES,
  SPELL_CRITICAL,
  MIRACLE_TYPES,
@@ -261,7 +261,8 @@ export default class LethalFantasyActor extends Actor {
          weapon: weapon,
          weaponSkillModifier: skill.weaponSkillModifier,
          rollKey: rollKey,
-          combat: foundry.utils.duplicate(this.system.combat)
+          combat: foundry.utils.duplicate(this.system.combat),
+          isRangedAttack: weapon.system.weaponType === "ranged"
        }
        if (rollType === "weapon-damage-small" || rollType === "weapon-damage-medium") {
          rollTarget.grantedDice = this.system.granted.damageDice
@@ -25,7 +25,8 @@ export default class D30Roll {
    RANGED_DEFENSE: "ranged_defense",
    ARCANE_SPELL_ATTACK: "arcane_spell_attack",
    ARCANE_SPELL_DEFENSE: "arcane_spell_defense",
-    SKILL_ROLLS: "skill_rolls"
+    SKILL_ROLLS: "skill_rolls",
+    SAVING_THROWS: "saving_throws"
  }

  /**
@@ -111,17 +112,16 @@ export default class D30Roll {
    if (externalType === "weapon-attack") {
      if (!weapon) {
        console.warn("D30Roll | Weapon object required for weapon-attack type")
-        return this.ROLL_TYPES.MELEE_ATTACK // Default to melee
+        // Fall through to use options.isRanged if available, otherwise default melee
      }
-      return weapon.system?.weaponType === "ranged"
+      return (options.isRanged || weapon?.system?.weaponType === "ranged")
        ? this.ROLL_TYPES.RANGED_ATTACK
        : this.ROLL_TYPES.MELEE_ATTACK
    }

-    // Monster attacks - default to melee
+    // Monster attacks - check options.isRanged (set from rollTarget.attackMode) or weapon type
    if (externalType === "monster-attack") {
-      // Check if weapon object has range information
-      if (weapon?.system?.weaponType === "ranged") {
+      if (options.isRanged || weapon?.system?.weaponType === "ranged") {
        return this.ROLL_TYPES.RANGED_ATTACK
      }
      return this.ROLL_TYPES.MELEE_ATTACK
@@ -138,11 +138,15 @@ export default class D30Roll {
    }

    // Skill types
-    if (externalType === "skill" || externalType === "monster-skill" ||
-        externalType === "save" || externalType === "challenge") {
+    if (externalType === "skill" || externalType === "monster-skill" || externalType === "challenge") {
      return this.ROLL_TYPES.SKILL_ROLLS
    }

+    // Saving throw types
+    if (externalType === "save") {
+      return options.isSpellSave ? this.ROLL_TYPES.ARCANE_SPELL_DEFENSE : this.ROLL_TYPES.SAVING_THROWS
+    }
+
    // If no match, return null
    console.warn(`D30Roll | Unknown external roll type: ${externalType}`)
    return null
@@ -237,6 +237,7 @@ export default class LethalFantasyRoll extends Roll {
      baseFormula = "D20"
      hasModifier = true
      hasChangeDice = false
+      hasFavor = true
      options.rollTarget.value = options.rollTarget.actorModifiers.levelSpellModifier + options.rollTarget.actorModifiers.intSpellModifier
      options.rollTarget.charModifier = options.rollTarget.actorModifiers.intSpellModifier
      hasStaticModifier = options.rollType === "spell-power"
@@ -253,6 +254,7 @@ export default class LethalFantasyRoll extends Roll {
      dice = "1D20"
      baseFormula = "D20"
      hasChangeDice = false
+      hasFavor = true
      options.rollTarget.value = options.rollTarget.actorModifiers.levelMiracleModifier + options.rollTarget.actorModifiers.chaMiracleModifier
      options.rollTarget.charModifier = options.rollTarget.actorModifiers.chaMiracleModifier
      hasStaticModifier = options.rollType === "miracle-power"
@@ -336,6 +338,10 @@ export default class LethalFantasyRoll extends Roll {
    let modifier = "+0"
    let targetName

+    // True for any ranged attack: PC weapon (ranged type) or monster attack (ranged mode)
+    const isRangedAttack = (options.rollType === "weapon-attack" && options.rollTarget?.weapon?.system?.weaponType === "ranged")
+      || (options.rollType === "monster-attack" && options.rollTarget?.attackMode === "ranged")
+
    let dialogContext = {
      rollType: options.rollType,
      rollTarget: options.rollTarget,
@@ -360,7 +366,8 @@ export default class LethalFantasyRoll extends Roll {
      modifier,
      saveSpell: false,
      favor: "none",
-      targetName
+      targetName,
+      isRangedAttack
    }
    let rollContext
    if (options.rollContext) {
@@ -392,7 +399,7 @@ export default class LethalFantasyRoll extends Roll {
            label: label,
            callback: (event, button, dialog) => {
              console.log("Roll context", event, button, dialog)
-              let position = dialog.position
+              let position = dialog?.position
              game.user.setFlag(SYSTEM.id, "roll-dialog-pos", foundry.utils.duplicate(position))
              const output = Array.from(button.form.elements).reduce((obj, input) => {
                if (input.name) obj[input.name] = input.value
@@ -403,22 +410,22 @@ export default class LethalFantasyRoll extends Roll {
          },
        ],
        actions: {
-          "selectGranted": (event, button, dialog) => {
+          "selectGranted": (event, button) => {
            hasGrantedDice = event.target.checked
          },
-          "selectBeyondSkill": (event, button, dialog) => {
+          "selectBeyondSkill": (event, button) => {
            beyondSkill = button.checked
          },
-          "selectPointBlank": (event, button, dialog) => {
+          "selectPointBlank": (event, button) => {
            pointBlank = button.checked
          },
-          "selectLetItFly": (event, button, dialog) => {
+          "selectLetItFly": (event, button) => {
            letItFly = button.checked
          },
-          "saveSpellCheck": (event, button, dialog) => {
+          "saveSpellCheck": (event, button) => {
            saveSpell = button.checked
          },
-          "gotoToken": (event, button, dialog) => {
+          "gotoToken": (event, button) => {
            let tokenId = $(button).data("tokenId")
            let token = canvas.tokens?.get(tokenId)
            if (token) {
@@ -592,12 +599,17 @@ export default class LethalFantasyRoll extends Roll {
      }
      options.D30result = rollD30.total

-      // Récupérer le message D30 correspondant
+      // Compute isRanged for D30: covers defense (isRangedDefense), monster ranged attacks (attackMode),
+      // and PC weapon attacks (isRangedAttack or weaponType)
+      const isRangedForD30 = options.isRangedDefense
+        || options.rollTarget?.attackMode === "ranged"
+        || options.rollTarget?.isRangedAttack === true
+        || options.rollTarget?.weapon?.system?.weaponType === "ranged"
      const d30Message = D30Roll.getResult(
        rollD30.total,
        options.rollType,
        options.rollTarget?.weapon,
-        { isRanged: options.isRangedDefense }
+        { isRanged: isRangedForD30, isSpellSave: saveSpell }
      )
      options.D30message = d30Message
    }
@@ -710,7 +722,7 @@ export default class LethalFantasyRoll extends Roll {
      buttons: [
        {
          label: label,
-          callback: (event, button, dialog) => {
+          callback: (event, button) => {
            const output = Array.from(button.form.elements).reduce((obj, input) => {
              if (input.name) obj[input.name] = input.value
              return obj
@@ -775,10 +787,19 @@ export default class LethalFantasyRoll extends Roll {
    let buttons = []
    if (currentAction) {
      if (currentAction.type === "weapon") {
+        let weaponLabel = "Roll progression dice"
+        if (currentAction.rangedMode) {
+          // Compute loading count from the speed formula (e.g. "3+1d6" → load=3)
+          const speedStr = currentAction.system?.speed?.[currentAction.rangedMode] ?? ""
+          const rangedLoad = currentAction.rangedLoad ?? (Number(speedStr.split("+")[0]) || 0)
+          if (rangedLoad > 0 && !currentAction.weaponLoaded) {
+            weaponLabel = "Load weapon"
+          }
+        }
        buttons.push({
          action: "roll",
-          label: "Roll progression dice",
-          callback: (event, button, dialog) => {
+          label: weaponLabel,
+          callback: (event, button) => {
            let pos = $('#combat-action-dialog').position()
            game.user.setFlag(SYSTEM.id, "combat-action-dialog-pos", pos)
            return "rollProgressionDice"
@@ -804,7 +825,7 @@ export default class LethalFantasyRoll extends Roll {
        buttons.push({
          action: "roll",
          label: label,
-          callback: (event, button, dialog) => {
+          callback: (event, button) => {
            let pos = $('#combat-action-dialog').position()
            game.user.setFlag(SYSTEM.id, "combat-action-dialog-pos", foundry.utils.duplicate(pos))
            return "rollLethargyDice"
@@ -815,7 +836,7 @@ export default class LethalFantasyRoll extends Roll {
      buttons.push({
        action: "roll",
        label: "Select action",
-        callback: (event, button, dialog) => {
+        callback: (event, button) => {
          let pos = $('#combat-action-dialog').position()
          game.user.setFlag(SYSTEM.id, "combat-action-dialog-pos", foundry.utils.duplicate(pos))
          const output = Array.from(button.form.elements).reduce((obj, input) => {
@@ -830,7 +851,7 @@ export default class LethalFantasyRoll extends Roll {
    buttons.push({
      action: "cancel",
      label: "Other action, not listed here",
-      callback: (event, button, dialog) => {
+      callback: (event, button) => {
        let pos = $('#combat-action-dialog').position()
        game.user.setFlag(SYSTEM.id, "combat-action-dialog-pos", foundry.utils.duplicate(pos))
        return null;
@@ -903,7 +924,8 @@ export default class LethalFantasyRoll extends Roll {
            await combatant.setFlag(SYSTEM.id, "currentAction", foundry.utils.duplicate(currentAction))
            return
          } else {
-            let message = `Spell/Miracle ${currentAction.name} ready to be cast on next second !`
+            // Last counting second — announce ready and transition immediately (no extra second consumed)
+            let message = `Casting time : ${currentAction.name}, count : ${time}/${time} — ready to cast next second !`
            ChatMessage.create({ content: message, speaker: ChatMessage.getSpeaker({ actor: combatant.actor }) })
            currentAction.castingTime = 1
            currentAction.spellStatus = "toBeCasted"
@@ -980,7 +1002,7 @@ export default class LethalFantasyRoll extends Roll {
        }
        // Range weapon loading
        if (!currentAction.weaponLoaded && currentAction.rangedLoad) {
-          if (currentAction.progressionCount <= currentAction.rangedLoad) {
+          if (currentAction.progressionCount < currentAction.rangedLoad) {
            let message = `Ranged weapon ${currentAction.name} is loading, loading count : ${currentAction.progressionCount}/${currentAction.rangedLoad}`
            ChatMessage.create({ content: message, speaker: ChatMessage.getSpeaker({ actor: combatant.actor }) })
            currentAction.progressionCount += 1
@@ -1077,7 +1099,7 @@ export default class LethalFantasyRoll extends Roll {
      buttons: [
        {
          label: label,
-          callback: (event, button, dialog) => {
+          callback: (event, button) => {
            const output = Array.from(button.form.elements).reduce((obj, input) => {
              if (input.name) obj[input.name] = input.value
              return obj
@@ -1126,6 +1148,8 @@ export default class LethalFantasyRoll extends Roll {
    options = { ...options, ...rollContext }
    options.rollName = "Ranged Defense"
    options.rollType = "weapon-defense"
+    options.type = options.rollType         // Required: this.type reads options.type
+    options.rollMode = rollContext.visibility  // Required: callers pass roll.options.rollMode to toMessage

    const rollBase = new this(rollContext.movement, options.data, rollData)
    const rollModifier = new Roll(modifierFormula, options.data, rollData)
@@ -1193,6 +1217,161 @@ export default class LethalFantasyRoll extends Roll {
    return rollBase
  }

+  /**
+   * Prompts the GM for ranged attack context (movement, range, target size, aim) when a monster
+   * attacks with a ranged weapon, then evaluates an exploding D20 attack roll with the resulting modifiers.
+   *
+   * @param {Object} options              Options for the roll.
+   * @param {string} options.actorId      The attacker actor ID.
+   * @param {string} options.actorName    The attacker actor name.
+   * @param {Object} options.rollTarget   The rollTarget containing attackModifier and related data.
+   * @returns {Promise<LethalFantasyRoll|null>}  The resulting roll, or null if cancelled.
+   */
+  static async promptRangedAttack(options = {}) {
+    const rollModes = foundry.utils.duplicate(CONFIG.ChatMessage.modes)
+    const fieldRollMode = new foundry.data.fields.StringField({
+      choices: rollModes,
+      blank: false,
+      default: "public",
+    })
+
+    let dialogContext = {
+      attackerMovementChoices: SYSTEM.ATTACKER_MOVEMENT_CHOICES,
+      rangeChoices: SYSTEM.RANGE_CHOICES,
+      sizeChoices: SYSTEM.SIZE_CHOICES,
+      attackerAimChoices: SYSTEM.ATTACKER_AIM_CHOICES,
+      movement: "none",
+      range: "short",
+      size: "+5",
+      attackerAim: "simple",
+      fieldRollMode,
+      rollModes
+    }
+
+    const content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-lethal-fantasy/templates/range-attack-dialog.hbs", dialogContext)
+
+    const label = game.i18n.localize("LETHALFANTASY.Label.rangeAttackRoll")
+    const rollContext = await foundry.applications.api.DialogV2.wait({
+      window: { title: "Ranged Attack" },
+      classes: ["lethalfantasy"],
+      content,
+      buttons: [
+        {
+          label,
+          callback: (event, button) => {
+            const output = Array.from(button.form.elements).reduce((obj, input) => {
+              if (input.name) obj[input.name] = input.value
+              return obj
+            }, {})
+            return output
+          },
+        },
+      ],
+      rejectClose: false
+    })
+
+    if (rollContext === null) return null
+
+    // Handle pointblank: attacker at point blank gets favor (standing still easier to aim)
+    if (rollContext.range === "pointblank") {
+      rollContext.movement = rollContext.movement.replace("kh", "")
+      rollContext.movement = rollContext.movement.replace("kl", "")
+      rollContext.movement += "kh" // Favor for attacker at point blank
+      rollContext.range = "0"
+    }
+    // Handle beyondskill: extreme range gives disfavor to attacker
+    if (rollContext.range === "beyondskill") {
+      rollContext.movement = rollContext.movement.replace("kh", "")
+      rollContext.movement = rollContext.movement.replace("kl", "")
+      rollContext.movement += "kl" // Disfavor for attacker beyond skill range
+      rollContext.range = "+11"
+    }
+
+    // Compute contextual penalty: range + target_size, reduced by aim bonus and attack modifier
+    const attackModifier = options.rollTarget?.attackModifier ?? 0
+    const contextualPenalty = Number(rollContext.range) + Number(rollContext.size)
+    const aimBonus = Number(rollContext.attackerAim || 0)
+    const fullModifier = contextualPenalty - aimBonus - attackModifier
+
+    let modifierFormula
+    if (fullModifier === 0) {
+      modifierFormula = "0"
+    } else {
+      const modAbs = Math.abs(fullModifier)
+      modifierFormula = `D${modAbs + 1} -1`
+    }
+
+    const rollData = { ...rollContext }
+    options = { ...options, ...rollContext }
+    options.rollName = "Ranged Attack"
+    options.rollType = options.rollType || "monster-attack"
+    options.type = options.rollType  // Required: this.type reads options.type, used to build weaponDamageOptions in toHTML
+    options.rollMode = rollContext.visibility   // Required: callers pass roll.options.rollMode to toMessage
+    options.isRangedAttack = true
+
+    const rollBase = new this(rollContext.movement, options.data, rollData)
+    const rollModifier = new Roll(modifierFormula, options.data, rollData)
+    rollModifier.evaluate()
+    await rollBase.evaluate()
+    const rollD30 = await new Roll("1D30").evaluate()
+    options.D30result = rollD30.total
+    options.D30message = D30Roll.getResult(rollD30.total, options.rollType, undefined, { isRanged: true })
+
+    // Determine favor from dice formula
+    let badResult = 0
+    if (rollContext.movement.includes("kh")) {
+      rollData.favor = "favor"
+      badResult = Math.min(rollBase.terms[0].results[0].result, rollBase.terms[0].results[1]?.result || 20)
+    }
+    if (rollContext.movement.includes("kl")) {
+      rollData.favor = "disfavor"
+      badResult = Math.max(rollBase.terms[0].results[0].result, rollBase.terms[0].results[1]?.result || 1)
+    }
+
+    const dice = rollContext.movement
+    const maxValue = 20
+    let rollTotal = -1
+    let diceResults = []
+
+    let diceResult = rollBase.dice[0].results[0].result
+    diceResults.push({ dice: `${dice.toUpperCase()}`, value: diceResult })
+    let diceSum = diceResult
+    // Exploding dice
+    while (diceResult === maxValue) {
+      const r = await new Roll(dice).evaluate()
+      diceResult = r.dice[0].results[0].result
+      diceResults.push({ dice: `${dice.toUpperCase()}-1`, value: diceResult - 1 })
+      diceSum += (diceResult - 1)
+    }
+
+    if (fullModifier !== 0) {
+      diceResults.push({ dice: `${rollModifier.formula.toUpperCase()}`, value: rollModifier.total })
+      if (fullModifier > 0) {
+        // Net penalty: subtract from roll
+        rollTotal = Math.max(diceSum - rollModifier.total, 0)
+      } else {
+        // Net bonus: add to roll
+        rollTotal = diceSum + rollModifier.total
+      }
+    } else {
+      rollTotal = diceSum
+    }
+
+    rollBase.options = { ...rollBase.options, ...options }
+    rollBase.options.resultType = undefined
+    rollBase.options.rollTotal = rollTotal
+    rollBase.options.diceResults = diceResults
+    rollBase.options.rollTarget = options.rollTarget
+    rollBase.options.titleFormula = `1D20E + ${modifierFormula}`
+    rollBase.options.D30result = options.D30result
+    rollBase.options.D30message = options.D30message
+    rollBase.options.rollName = "Ranged Attack"
+    rollBase.options.badResult = badResult
+    rollBase.options.rollData = foundry.utils.duplicate(rollData)
+
+    return rollBase
+  }
+
  /**
   * Creates a title based on the given type.
   *
@@ -1360,4 +1539,43 @@ export default class LethalFantasyRoll extends Roll {
    )
  }

+  /**
+   * Evaluate a spell/miracle damage formula with per-die explosion, then post to chat.
+   * Explosion dice are shown manually via showForRoll; the main roll is shown automatically
+   * by toMessage() (which triggers Dice So Nice via its createChatMessage hook).
+   * Append "NE" to the formula to disable explosion.
+   *
+   * @param {string} formula    Dice formula, e.g. "1d8", "2d6", "1d8NE"
+   * @param {Object} rollOpts   Options for LethalFantasyRoll (rollType, actorId, defenderId, etc.)
+   * @returns {Promise<ChatMessage>}
+   */
+  static async rollSpellDamageToMessage(formula, rollOpts) {
+    const roll = new LethalFantasyRoll(formula, {}, rollOpts)
+    await roll.evaluate()
+    const shouldExplode = !/NE$/i.test(formula)
+    const diceResults = []
+    let diceSum = 0
+    for (const term of roll.dice) {
+      const singleDice = `1D${term.faces}`
+      for (const r of term.results) {
+        let diceResult = r.result
+        diceResults.push({ dice: singleDice.toUpperCase(), value: diceResult })
+        diceSum += diceResult
+        if (shouldExplode && term.faces > 0) {
+          while (diceResult === term.faces) {
+            const xr = await new Roll(singleDice).evaluate()
+            if (game?.dice3d) await game.dice3d.showForRoll(xr, game.user, true)
+            // Optional chaining guards against unexpected roll structure
+            diceResult = xr.dice?.[0]?.results?.[0]?.result ?? (term.faces - 1)
+            diceResults.push({ dice: `${singleDice.toUpperCase()}-1`, value: diceResult - 1 })
+            diceSum += (diceResult - 1)
+          }
+        }
+      }
+    }
+    roll.options.diceResults = diceResults
+    roll.options.rollTotal = diceSum
+    return roll.toMessage()
+  }
+
 }
@@ -166,6 +166,22 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel
   */
  async roll(rollType, rollTarget, defenderId = undefined, defenderTokenId = undefined, extraShieldDr = 0) {
    const hasTarget = false
+
+    // Ranged monster defense uses the ranged defense dialog (movement, range, size modifiers)
+    if (rollType === "monster-defense" && rollTarget?.isRangedDefense === true) {
+      let roll = await LethalFantasyRoll.promptRangedDefense({
+        actorId: this.parent.id,
+        actorName: this.parent.name,
+        actorImage: this.parent.img,
+        rollTarget,
+        defenderId,
+        defenderTokenId,
+      })
+      if (!roll) return null
+      await roll.toMessage({}, { messageMode: roll.options.rollMode })
+      return
+    }
+
    let roll = await LethalFantasyRoll.prompt({
      rollType,
      rollTarget,
@@ -324,7 +324,7 @@ export default class LethalFantasyUtils {
            <p>Attack roll: <strong>${attackRoll}</strong></p>
          </div>
          <div class="weapon-selection">
-            <label for="defense-attack">Choose your defense attack:</label>
+            <label for="defense-attack">Choose your defense weapon:</label>
            <select id="defense-attack" name="attackKey" style="width: 100%; margin-top: 8px;">
              ${attacksHTML}
            </select>
@@ -711,6 +711,7 @@ export default class LethalFantasyUtils {
            ${totalBonus > 0 ? `<p class="bonus-info">Bonus already added: +${totalBonus}</p>` : ''}
          </div>
          <p class="offer-text">You are losing! Spend Grit or Luck to add 1D6 to your defense?</p>
+          <p class="shield-warning"><i class="fa-solid fa-triangle-exclamation"></i> If you intend to use a shield, you must spend Grit or Luck <strong>first</strong> — the shield roll comes after.</p>
        </div>
      `

@@ -853,7 +854,7 @@ export default class LethalFantasyUtils {
        `
      } else if (data.attackRollType === "monster-attack") {
        damageButton = `
-          <div class="attack-result-damage">
+          <div class="attack-result-damage single-btn">
            <button class="roll-damage-btn" data-attacker-id="${data.attackerId}" data-defender-id="${data.defenderId}" data-defender-token-id="${data.defenderTokenId || ""}" data-extra-shield-dr="${data.shieldDamageReduction || 0}" data-attack-key="${data.attackRollKey}" data-damage-type="monster">
              <i class="fa-solid fa-burst"></i> Damage
            </button>
@@ -861,7 +862,7 @@ export default class LethalFantasyUtils {
        `
      } else if (data.attackRollType === "spell-attack" || data.attackRollType === "miracle-attack") {
        const attacker = game.actors.get(data.attackerId)
-        const spell = attacker?.items.get(data.attackWeaponId)
+        const spell = attacker?.items.get(data.attackWeaponId || data.attackRollKey)
        const tiers = [
          { formula: spell?.system?.damageDice, label: "Standard" },
          { formula: spell?.system?.damageDiceOverpowered, label: "Overpowered" },
@@ -880,7 +881,7 @@ export default class LethalFantasyUtils {
              <i class="fa-solid fa-wand-magic-sparkles"></i> ${t.label} (${escapedFormula})
            </button>`
          }).join("")
-          damageButton = `<div class="attack-result-damage">${buttons}</div>`
+          damageButton = `<div class="attack-result-damage spell-damage">${buttons}</div>`
        }
      }
    }
@@ -1 +1 @@
-MANIFEST-000599
+MANIFEST-000623
@@ -1,8 +1,8 @@
-2026/05/18-17:40:11.769288 7f5a477fe6c0 Recovering log #597
-2026/05/18-17:40:11.780605 7f5a477fe6c0 Delete type=3 #595
-2026/05/18-17:40:11.780699 7f5a477fe6c0 Delete type=0 #597
-2026/05/18-20:25:54.228818 7f5a467fc6c0 Level-0 table #602: started
-2026/05/18-20:25:54.230037 7f5a467fc6c0 Level-0 table #602: 0 bytes OK
-2026/05/18-20:25:54.236369 7f5a467fc6c0 Delete type=0 #600
-2026/05/18-20:25:54.251050 7f5a467fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2026/05/18-20:25:54.251106 7f5a467fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/25-11:43:40.059603 7f88315ff6c0 Recovering log #621
+2026/05/25-11:43:40.071136 7f88315ff6c0 Delete type=3 #619
+2026/05/25-11:43:40.071202 7f88315ff6c0 Delete type=0 #621
+2026/05/25-12:29:17.727995 7f87e2ffd6c0 Level-0 table #626: started
+2026/05/25-12:29:17.728028 7f87e2ffd6c0 Level-0 table #626: 0 bytes OK
+2026/05/25-12:29:17.733783 7f87e2ffd6c0 Delete type=0 #624
+2026/05/25-12:29:17.740143 7f87e2ffd6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/25-12:29:17.740167 7f87e2ffd6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.671725 7f5a94bff6c0 Recovering log #593
-2026/05/18-07:32:52.684619 7f5a94bff6c0 Delete type=3 #591
-2026/05/18-07:32:52.684760 7f5a94bff6c0 Delete type=0 #593
-2026/05/18-07:58:12.225439 7f5a467fc6c0 Level-0 table #598: started
-2026/05/18-07:58:12.225593 7f5a467fc6c0 Level-0 table #598: 0 bytes OK
-2026/05/18-07:58:12.232817 7f5a467fc6c0 Delete type=0 #596
-2026/05/18-07:58:12.252837 7f5a467fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.252955 7f5a467fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/24-09:22:43.041326 7fdfa95ff6c0 Recovering log #617
+2026/05/24-09:22:43.083988 7fdfa95ff6c0 Delete type=3 #615
+2026/05/24-09:22:43.084045 7fdfa95ff6c0 Delete type=0 #617
+2026/05/24-09:42:00.304351 7fdf5affd6c0 Level-0 table #622: started
+2026/05/24-09:42:00.304423 7fdf5affd6c0 Level-0 table #622: 0 bytes OK
+2026/05/24-09:42:00.311333 7fdf5affd6c0 Delete type=0 #620
+2026/05/24-09:42:00.334170 7fdf5affd6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/24-09:42:00.334370 7fdf5affd6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
@@ -1 +1 @@
-MANIFEST-000596
+MANIFEST-000620
@@ -1,8 +1,8 @@
-2026/05/18-17:40:11.793894 7f5a94bff6c0 Recovering log #594
-2026/05/18-17:40:11.804447 7f5a94bff6c0 Delete type=3 #592
-2026/05/18-17:40:11.804549 7f5a94bff6c0 Delete type=0 #594
-2026/05/18-20:25:54.236611 7f5a467fc6c0 Level-0 table #599: started
-2026/05/18-20:25:54.236652 7f5a467fc6c0 Level-0 table #599: 0 bytes OK
-2026/05/18-20:25:54.243997 7f5a467fc6c0 Delete type=0 #597
-2026/05/18-20:25:54.251069 7f5a467fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
-2026/05/18-20:25:54.264439 7f5a467fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/25-11:43:40.077580 7f87e37fe6c0 Recovering log #618
+2026/05/25-11:43:40.087750 7f87e37fe6c0 Delete type=3 #616
+2026/05/25-11:43:40.087800 7f87e37fe6c0 Delete type=0 #618
+2026/05/25-12:29:17.758832 7f87e2ffd6c0 Level-0 table #623: started
+2026/05/25-12:29:17.758858 7f87e2ffd6c0 Level-0 table #623: 0 bytes OK
+2026/05/25-12:29:17.764622 7f87e2ffd6c0 Delete type=0 #621
+2026/05/25-12:29:17.777473 7f87e2ffd6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/25-12:29:17.784124 7f87e2ffd6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.700651 7f5a477fe6c0 Recovering log #590
-2026/05/18-07:32:52.712680 7f5a477fe6c0 Delete type=3 #588
-2026/05/18-07:32:52.712814 7f5a477fe6c0 Delete type=0 #590
-2026/05/18-07:58:12.232998 7f5a467fc6c0 Level-0 table #595: started
-2026/05/18-07:58:12.233130 7f5a467fc6c0 Level-0 table #595: 0 bytes OK
-2026/05/18-07:58:12.244133 7f5a467fc6c0 Delete type=0 #593
-2026/05/18-07:58:12.252873 7f5a467fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.252977 7f5a467fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/24-09:22:43.091828 7fdfa8dfe6c0 Recovering log #614
+2026/05/24-09:22:43.131041 7fdfa8dfe6c0 Delete type=3 #612
+2026/05/24-09:22:43.131104 7fdfa8dfe6c0 Delete type=0 #614
+2026/05/24-09:42:00.326388 7fdf5affd6c0 Level-0 table #619: started
+2026/05/24-09:42:00.326417 7fdf5affd6c0 Level-0 table #619: 0 bytes OK
+2026/05/24-09:42:00.334051 7fdf5affd6c0 Delete type=0 #617
+2026/05/24-09:42:00.334205 7fdf5affd6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/24-09:42:00.334364 7fdf5affd6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
@@ -1 +1 @@
-MANIFEST-000601
+MANIFEST-000625
@@ -1,8 +1,8 @@
-2026/05/18-17:40:11.749971 7f5a46ffd6c0 Recovering log #599
-2026/05/18-17:40:11.761423 7f5a46ffd6c0 Delete type=3 #597
-2026/05/18-17:40:11.761520 7f5a46ffd6c0 Delete type=0 #599
-2026/05/18-20:25:54.219239 7f5a467fc6c0 Level-0 table #604: started
-2026/05/18-20:25:54.219522 7f5a467fc6c0 Level-0 table #604: 0 bytes OK
-2026/05/18-20:25:54.228610 7f5a467fc6c0 Delete type=0 #602
-2026/05/18-20:25:54.251028 7f5a467fc6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2026/05/18-20:25:54.251085 7f5a467fc6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/25-11:43:40.044921 7f87e3fff6c0 Recovering log #623
+2026/05/25-11:43:40.054992 7f87e3fff6c0 Delete type=3 #621
+2026/05/25-11:43:40.055048 7f87e3fff6c0 Delete type=0 #623
+2026/05/25-12:29:17.710484 7f87e2ffd6c0 Level-0 table #628: started
+2026/05/25-12:29:17.710568 7f87e2ffd6c0 Level-0 table #628: 0 bytes OK
+2026/05/25-12:29:17.716928 7f87e2ffd6c0 Delete type=0 #626
+2026/05/25-12:29:17.740121 7f87e2ffd6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/25-12:29:17.758707 7f87e2ffd6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.650924 7f5a47fff6c0 Recovering log #595
-2026/05/18-07:32:52.662191 7f5a47fff6c0 Delete type=3 #593
-2026/05/18-07:32:52.662331 7f5a47fff6c0 Delete type=0 #595
-2026/05/18-07:58:12.218060 7f5a467fc6c0 Level-0 table #600: started
-2026/05/18-07:58:12.218402 7f5a467fc6c0 Level-0 table #600: 0 bytes OK
-2026/05/18-07:58:12.225237 7f5a467fc6c0 Delete type=0 #598
-2026/05/18-07:58:12.244392 7f5a467fc6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.252899 7f5a467fc6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/24-09:22:42.993966 7fdfa8dfe6c0 Recovering log #619
+2026/05/24-09:22:43.035467 7fdfa8dfe6c0 Delete type=3 #617
+2026/05/24-09:22:43.035518 7fdfa8dfe6c0 Delete type=0 #619
+2026/05/24-09:42:00.319082 7fdf5affd6c0 Level-0 table #624: started
+2026/05/24-09:42:00.319109 7fdf5affd6c0 Level-0 table #624: 0 bytes OK
+2026/05/24-09:42:00.326261 7fdf5affd6c0 Delete type=0 #622
+2026/05/24-09:42:00.334196 7fdf5affd6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/24-09:42:00.334355 7fdf5affd6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
@@ -1 +1 @@
-MANIFEST-000296
+MANIFEST-000320
@@ -1,8 +1,8 @@
-2026/05/18-17:40:11.831491 7f5a94bff6c0 Recovering log #294
-2026/05/18-17:40:11.842913 7f5a94bff6c0 Delete type=3 #292
-2026/05/18-17:40:11.843005 7f5a94bff6c0 Delete type=0 #294
-2026/05/18-20:25:54.257813 7f5a467fc6c0 Level-0 table #299: started
-2026/05/18-20:25:54.257869 7f5a467fc6c0 Level-0 table #299: 0 bytes OK
-2026/05/18-20:25:54.264186 7f5a467fc6c0 Delete type=0 #297
-2026/05/18-20:25:54.267118 7f5a467fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2026/05/18-20:25:54.296812 7f5a467fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/25-11:43:40.107633 7f8830dfe6c0 Recovering log #318
+2026/05/25-11:43:40.118039 7f8830dfe6c0 Delete type=3 #316
+2026/05/25-11:43:40.118104 7f8830dfe6c0 Delete type=0 #318
+2026/05/25-12:29:17.777484 7f87e2ffd6c0 Level-0 table #323: started
+2026/05/25-12:29:17.777511 7f87e2ffd6c0 Level-0 table #323: 0 bytes OK
+2026/05/25-12:29:17.784021 7f87e2ffd6c0 Delete type=0 #321
+2026/05/25-12:29:17.784188 7f87e2ffd6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/25-12:29:17.803354 7f87e2ffd6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.738234 7f5a477fe6c0 Recovering log #290
-2026/05/18-07:32:52.749839 7f5a477fe6c0 Delete type=3 #288
-2026/05/18-07:32:52.749970 7f5a477fe6c0 Delete type=0 #290
-2026/05/18-07:58:12.253340 7f5a467fc6c0 Level-0 table #295: started
-2026/05/18-07:58:12.253449 7f5a467fc6c0 Level-0 table #295: 0 bytes OK
-2026/05/18-07:58:12.261029 7f5a467fc6c0 Delete type=0 #293
-2026/05/18-07:58:12.286385 7f5a467fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.286487 7f5a467fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/24-09:22:43.194643 7fdfa8dfe6c0 Recovering log #314
+2026/05/24-09:22:43.231409 7fdfa8dfe6c0 Delete type=3 #312
+2026/05/24-09:22:43.231470 7fdfa8dfe6c0 Delete type=0 #314
+2026/05/24-09:42:00.341818 7fdf5affd6c0 Level-0 table #319: started
+2026/05/24-09:42:00.341853 7fdf5affd6c0 Level-0 table #319: 0 bytes OK
+2026/05/24-09:42:00.348538 7fdf5affd6c0 Delete type=0 #317
+2026/05/24-09:42:00.367125 7fdf5affd6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/24-09:42:00.367348 7fdf5affd6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
@@ -1 +1 @@
-MANIFEST-000595
+MANIFEST-000619
@@ -1,8 +1,8 @@
-2026/05/18-17:40:11.812004 7f5a47fff6c0 Recovering log #593
-2026/05/18-17:40:11.823277 7f5a47fff6c0 Delete type=3 #591
-2026/05/18-17:40:11.823388 7f5a47fff6c0 Delete type=0 #593
-2026/05/18-20:25:54.244177 7f5a467fc6c0 Level-0 table #598: started
-2026/05/18-20:25:54.244222 7f5a467fc6c0 Level-0 table #598: 0 bytes OK
-2026/05/18-20:25:54.250810 7f5a467fc6c0 Delete type=0 #596
-2026/05/18-20:25:54.251096 7f5a467fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2026/05/18-20:25:54.264461 7f5a467fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/25-11:43:40.093877 7f87e3fff6c0 Recovering log #617
+2026/05/25-11:43:40.103670 7f87e3fff6c0 Delete type=3 #615
+2026/05/25-11:43:40.103720 7f87e3fff6c0 Delete type=0 #617
+2026/05/25-12:29:17.764689 7f87e2ffd6c0 Level-0 table #622: started
+2026/05/25-12:29:17.764705 7f87e2ffd6c0 Level-0 table #622: 0 bytes OK
+2026/05/25-12:29:17.770486 7f87e2ffd6c0 Delete type=0 #620
+2026/05/25-12:29:17.784104 7f87e2ffd6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/25-12:29:17.784130 7f87e2ffd6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.720162 7f5a94bff6c0 Recovering log #589
-2026/05/18-07:32:52.731519 7f5a94bff6c0 Delete type=3 #587
-2026/05/18-07:32:52.731690 7f5a94bff6c0 Delete type=0 #589
-2026/05/18-07:58:12.244424 7f5a467fc6c0 Level-0 table #594: started
-2026/05/18-07:58:12.244618 7f5a467fc6c0 Level-0 table #594: 0 bytes OK
-2026/05/18-07:58:12.252579 7f5a467fc6c0 Delete type=0 #592
-2026/05/18-07:58:12.252922 7f5a467fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.252996 7f5a467fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/24-09:22:43.141936 7fdf5bfff6c0 Recovering log #613
+2026/05/24-09:22:43.189387 7fdf5bfff6c0 Delete type=3 #611
+2026/05/24-09:22:43.189438 7fdf5bfff6c0 Delete type=0 #613
+2026/05/24-09:42:00.311436 7fdf5affd6c0 Level-0 table #618: started
+2026/05/24-09:42:00.311459 7fdf5affd6c0 Level-0 table #618: 0 bytes OK
+2026/05/24-09:42:00.318964 7fdf5affd6c0 Delete type=0 #616
+2026/05/24-09:42:00.334187 7fdf5affd6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/24-09:42:00.334334 7fdf5affd6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
@@ -387,11 +387,11 @@
          min-width: 6rem;
          max-width: 6rem;
        }
-        min-width: 10rem;
-        max-width: 10rem;
+        min-width: 11rem;
+        max-width: 11rem;
        .input {
-          min-width: 2.5rem;
-          max-width: 2.5rem;
+          min-width: 3.5rem;
+          max-width: 3.5rem;
        }
      }
      .granted {
@@ -145,9 +145,11 @@
 }

 .grit-luck-dialog {
+  color: var(--color-text-dark-primary, #191813);
+
  .combat-status {
    padding: 12px;
-    background: linear-gradient(to bottom, rgba(42, 41, 32, 0.8) 0%, rgba(26, 25, 16, 0.9) 100%);
+    background: linear-gradient(to bottom, rgba(42, 41, 32, 0.88) 0%, rgba(26, 25, 16, 0.95) 100%);
    border: 1px solid rgba(212, 175, 55, 0.5);
    border-radius: 6px;
    margin-bottom: 16px;
@@ -171,11 +173,27 @@
  }

  .offer-text {
-    color: #f0e6d2;
+    color: var(--color-text-dark-primary, #191813);
    font-size: calc(var(--font-size-standard) * 1);
    text-align: center;
    font-weight: 600;
+    margin: 0 0 8px 0;
+  }
+
+  .shield-warning {
+    color: #7a4000;
+    background: rgba(255, 160, 0, 0.12);
+    border: 1px solid rgba(255, 160, 0, 0.4);
+    border-radius: 5px;
+    font-size: calc(var(--font-size-standard) * 0.88);
+    padding: 6px 10px;
    margin: 0;
+    text-align: center;
+
+    i {
+      color: #c07000;
+      margin-right: 5px;
+    }
  }
 }

@@ -283,33 +301,72 @@
  }

  .attack-result-damage {
-    display: flex;
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
    gap: 8px;
-    justify-content: center;
+
+    &.single-btn {
+      grid-template-columns: 1fr;
+      max-width: 280px;
+      margin: 0 auto;
+    }
+
+    &.spell-damage {
+      grid-template-columns: 1fr;
+      width: 100%;
+    }

    .roll-damage-btn {
-      padding: 10px 16px;
+      padding: 10px 14px;
      background: linear-gradient(to bottom, #8b0000 0%, #660000 100%);
-      border: 1px solid #ff0000;
+      border: 1px solid #4b0000;
      border-radius: 6px;
      color: #f0e6d2;
      font-weight: 600;
+      font-size: calc(var(--font-size-standard) * 0.9);
+      text-align: center;
+      white-space: nowrap;
      cursor: pointer;
      transition: all 0.2s ease;
-      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+      box-shadow: 0 3px 6px rgba(0, 0, 0, 0.4), inset 0 1px 0 rgba(255, 255, 255, 0.1);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 6px;
+      position: relative;
+      overflow: hidden;
+
+      &::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: -100%;
+        width: 100%;
+        height: 100%;
+        background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.15), transparent);
+        transition: left 0.5s;
+      }
+
+      &:hover::before {
+        left: 100%;
+      }
+
+      i {
+        font-size: calc(var(--font-size-standard) * 1.1);
+        filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.5));
+        flex-shrink: 0;
+      }

      &:hover {
        background: linear-gradient(to bottom, #a00000 0%, #7b0000 100%);
-        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.4);
+        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.15);
        transform: translateY(-2px);
+        border-color: #5b0000;
      }

      &:active {
        transform: translateY(0);
-      }
-
-      i {
-        margin-right: 6px;
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4), inset 0 1px 3px rgba(0, 0, 0, 0.3);
      }
    }
  }
@@ -1285,33 +1285,72 @@
  }

  .attack-result-damage {
-    display: flex;
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
    gap: 8px;
-    justify-content: center;
+
+    &.single-btn {
+      grid-template-columns: 1fr;
+      max-width: 280px;
+      margin: 0 auto;
+    }
+
+    &.spell-damage {
+      grid-template-columns: 1fr;
+      width: 100%;
+    }

    .roll-damage-btn {
-      padding: 10px 16px;
+      padding: 10px 14px;
      background: linear-gradient(to bottom, #8b0000 0%, #660000 100%);
-      border: 1px solid #ff0000;
+      border: 1px solid #4b0000;
      border-radius: 6px;
      color: #f0e6d2;
      font-weight: 600;
+      font-size: calc(var(--font-size-standard) * 0.9);
+      text-align: center;
+      white-space: nowrap;
      cursor: pointer;
      transition: all 0.2s ease;
-      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+      box-shadow: 0 3px 6px rgba(0, 0, 0, 0.4), inset 0 1px 0 rgba(255, 255, 255, 0.1);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 6px;
+      position: relative;
+      overflow: hidden;
+
+      &::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: -100%;
+        width: 100%;
+        height: 100%;
+        background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.15), transparent);
+        transition: left 0.5s;
+      }
+
+      &:hover::before {
+        left: 100%;
+      }
+
+      i {
+        font-size: calc(var(--font-size-standard) * 1.1);
+        filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.5));
+        flex-shrink: 0;
+      }

      &:hover {
        background: linear-gradient(to bottom, #a00000 0%, #7b0000 100%);
-        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.4);
+        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.15);
        transform: translateY(-2px);
+        border-color: #5b0000;
      }

      &:active {
        transform: translateY(0);
-      }
-
-      i {
-        margin-right: 6px;
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4), inset 0 1px 3px rgba(0, 0, 0, 0.3);
      }
    }
  }
@@ -37,6 +37,25 @@
            <i class="fa-duotone fa-solid fa-stars" data-roll-type="spell-power" data-roll-key="{{item.id}}"></i>
          </a>

+          {{#if item.system.damageDice}}
+          <a data-action="rollSpellDamage" data-item-id="{{item.id}}" data-damage-tier="standard"
+            data-tooltip="Spell Damage (Standard)">
+            <i class="fa-solid fa-wand-magic-sparkles"></i>S
+          </a>
+          {{/if}}
+          {{#if item.system.damageDiceOverpowered}}
+          <a data-action="rollSpellDamage" data-item-id="{{item.id}}" data-damage-tier="overpowered"
+            data-tooltip="Spell Damage (Overpowered)">
+            <i class="fa-solid fa-wand-magic-sparkles"></i>O
+          </a>
+          {{/if}}
+          {{#if item.system.damageDiceOverpowered2}}
+          <a data-action="rollSpellDamage" data-item-id="{{item.id}}" data-damage-tier="overpowered2"
+            data-tooltip="Spell Damage (Overpowered 2)">
+            <i class="fa-solid fa-wand-magic-sparkles"></i>O2
+          </a>
+          {{/if}}
+
          <div class="controls">
            <a data-tooltip="{{localize 'LETHALFANTASY.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
              data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
@@ -0,0 +1,45 @@
+<div class="lethalfantasy-range-defense-dialog">
+
+  <fieldSet class="">
+    <legend>{{localize "LETHALFANTASY.Label.rangeAttackDialog"}}</legend>
+
+    <div class="field-section">
+      <span class="field-name">Attacker Movement :</span>
+      <select name="movement" data-tooltip-direction="UP">
+        {{selectOptions attackerMovementChoices selected=movement}}
+      </select>
+    </div>
+
+    <div class="field-section">
+      <span class="field-name">Range :</span>
+      <select name="range" data-tooltip-direction="UP">
+        {{selectOptions rangeChoices selected=range}}
+      </select>
+    </div>
+
+    <div class="field-section">
+      <span class="field-name">Target Size :</span>
+      <select name="size" data-tooltip-direction="UP">
+        {{selectOptions sizeChoices selected=size}}
+      </select>
+    </div>
+
+    <div class="field-section">
+      <span class="field-name">Aim :</span>
+      <select name="attackerAim" data-tooltip-direction="UP">
+        {{selectOptions attackerAimChoices selected=attackerAim}}
+      </select>
+    </div>
+
+  </fieldSet>
+
+  <fieldSet>
+    <legend>{{localize "LETHALFANTASY.Roll.visibility"}}</legend>
+    <span class="fieldset-centered">
+      <select name="visibility">
+        {{selectOptions rollModes selected=visibility localize=true}}
+      </select>
+    </span>
+  </fieldSet>
+
+</div>
@@ -55,35 +55,33 @@
      <div class="dialog-save">Add Granted Attack Dice
        <input type="checkbox" data-action="selectGranted" name="granted" />
      </div>
-      {{#if rollTarget.weapon}}
-        {{#if (eq rollTarget.weapon.system.weaponType "melee")}}{{else}}
-          <div class="dialog-save">Point Blank Range Attack
-            <input
-              type="checkbox"
-              data-action="selectPointBlank"
-              name="pointBlankV"
-            />
-          </div>
-          <div class="dialog-save">Beyond Skill Range Attack
-            <input
-              type="checkbox"
-              data-action="selectBeyondSkill"
-              name="beyondSkillV"
-            />
-          </div>
-          <div class="dialog-save">Let it Fly (Pure D20E)
-            <input
-              type="checkbox"
-              data-action="selectLetItFly"
-              name="letItFlyV"
-            />
-          </div>
-          <div class="dialog-save">Aiming
-            <select name="attackerAim" data-tooltip-direction="UP">
-              {{selectOptions attackerAimChoices selected=attackerAim}}
-            </select>
-          </div>
-        {{/if}}
+      {{#if isRangedAttack}}
+        <div class="dialog-save">Point Blank Range Attack
+          <input
+            type="checkbox"
+            data-action="selectPointBlank"
+            name="pointBlankV"
+          />
+        </div>
+        <div class="dialog-save">Beyond Skill Range Attack
+          <input
+            type="checkbox"
+            data-action="selectBeyondSkill"
+            name="beyondSkillV"
+          />
+        </div>
+        <div class="dialog-save">Let it Fly (Pure D20E)
+          <input
+            type="checkbox"
+            data-action="selectLetItFly"
+            name="letItFlyV"
+          />
+        </div>
+        <div class="dialog-save">Aiming
+          <select name="attackerAim" data-tooltip-direction="UP">
+            {{selectOptions attackerAimChoices selected=attackerAim}}
+          </select>
+        </div>
      {{/if}}

    {{/if}}
Author	SHA1	Message	Date
uberwald	f6fb0b68b8	Fix spell rolls again Release Creation / build (release) Successful in 47s Details	2026-05-25 20:41:00 +02:00
uberwald	e45edd60c4	FIx spell order and dual rollll for spell damages Release Creation / build (release) Successful in 1m6s Details	2026-05-25 12:29:39 +02:00
uberwald	d389a85a9f	Fix ranged attacks again Release Creation / build (release) Successful in 43s Details	2026-05-24 09:42:07 +02:00
uberwald	c217490a5b	Fix ranged attacks again Release Creation / build (release) Has been cancelled Details	2026-05-24 09:41:06 +02:00
uberwald	38eb1a8d3d	Add ranged actions for monsters Release Creation / build (release) Successful in 54s Details	2026-05-23 19:10:10 +02:00
uberwald	4724cdf2bb	VArious fixes for rolls and ranged attacks Release Creation / build (release) Successful in 44s Details	2026-05-23 09:08:16 +02:00
uberwald	6d06c8ddad	Various fixes for spell and ranged attacks	2026-05-23 00:21:05 +02:00
uberwald	2770774aa3	Various fixes for spell and ranged attacks	2026-05-23 00:11:58 +02:00
uberwald	e417b61625	Spells fixe Release Creation / build (release) Successful in 46s Details	2026-05-20 23:17:07 +02:00
uberwald	9a8d580ef6	Other fixes for damage buttons from chat Release Creation / build (release) Successful in 53s Details	2026-05-20 10:53:46 +02:00
uberwald	9ccb0f90f0	Other fixes for damage buttons from chat	2026-05-20 10:53:22 +02:00
uberwald	6cf0880ad3	Enhance spell damage and messages content Release Creation / build (release) Successful in 44s Details	2026-05-19 10:52:03 +02:00