Fix E dice in dice Tray

Add specific diceTray and enhance message styles
2026-04-17 23:21:49 +02:00 · 2026-04-17 17:32:46 +02:00 · 2026-04-17 17:32:32 +02:00 · 2026-04-16 23:42:24 +02:00 · 2026-04-16 21:39:51 +02:00 · 2026-04-14 21:31:17 +02:00
45 changed files with 1606 additions and 233 deletions
--- a/assets/rules/dice_30_effects.xlsx
+++ b/assets/rules/dice_30_effects.xlsx
--- a/css/fvtt-lethal-fantasy.css
+++ b/css/fvtt-lethal-fantasy.css
@@ -2974,7 +2974,7 @@ i.lethalfantasy {
 .message.fvtt-lethal-fantasy.dice-roll .result-section .d30-result .d30-header .d30-label {
  flex-grow: 1;
  font-weight: bold;
-  color: #e0d5f0;
+  color: #2a1a3a;
  text-transform: uppercase;
  letter-spacing: 0.5px;
  font-size: calc(var(--font-size-standard) * 0.9);
@@ -2986,11 +2986,11 @@ i.lethalfantasy {
  font-family: var(--font-primary);
  font-size: calc(var(--font-size-standard) * 1.5);
  font-weight: bold;
-  color: #ff69b4;
-  background: rgba(255, 105, 180, 0.1);
+  color: #3d006e;
+  background: rgba(255, 255, 255, 0.35);
  padding: 4px 12px;
  border-radius: 12px;
-  border: 1px solid rgba(255, 105, 180, 0.3);
+  border: 1px solid rgba(138, 43, 226, 0.4);
 }
 .lethalfantasy.dice-roll .result-section .d30-result .d30-message,
 .fvtt-lethal-fantasy.dice-roll .result-section .d30-result .d30-message,
@@ -3994,3 +3994,226 @@ i.lethalfantasy {
  padding-left: 8px;
  font-size: 0.9rem;
 }
+/* -------------------------------------------------- */
+/* Dice Tray — injected into the Foundry chat sidebar */
+/* -------------------------------------------------- */
+.lf-dice-tray {
+  padding: 6px 8px;
+  background: linear-gradient(135deg, rgba(245, 232, 200, 0.97) 0%, rgba(238, 222, 185, 0.97) 100%), url("/systems/fvtt-lethal-fantasy/assets/ui/lethal_fantasy_background.webp") center / cover;
+  border-top: 2px solid rgba(139, 69, 19, 0.5);
+  border-bottom: 1px solid rgba(139, 69, 19, 0.25);
+  width: 100%;
+  box-sizing: border-box;
+  pointer-events: all;
+}
+.lf-dice-tray .lf-dt-row {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  flex-wrap: wrap;
+}
+.lf-dice-tray .lf-dt-label {
+  color: #3a2a10;
+  font-size: 15px;
+  flex-shrink: 0;
+  opacity: 0.7;
+}
+.lf-dice-tray .lf-dt-count {
+  width: 44px;
+  flex-shrink: 0;
+  padding: 3px 4px;
+  background: rgba(139, 69, 19, 0.15);
+  border: 1px solid rgba(139, 69, 19, 0.45);
+  border-radius: 4px;
+  color: #2a1a08;
+  font-size: 11px;
+  font-weight: 700;
+  cursor: pointer;
+  text-align: center;
+}
+.lf-dice-tray .lf-dt-count option {
+  background: #f5ead0;
+  color: #2a1a08;
+}
+.lf-dice-tray .lf-dt-count:focus {
+  outline: none;
+  border-color: rgba(139, 69, 19, 0.7);
+  box-shadow: 0 0 4px rgba(139, 69, 19, 0.25);
+}
+.lf-dice-tray .lf-dt-dice {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 3px;
+  flex: 1;
+}
+.lf-dice-tray .lf-dt-die-btn {
+  padding: 3px 7px;
+  background: rgba(139, 69, 19, 0.15);
+  border: 1px solid rgba(139, 69, 19, 0.4);
+  border-radius: 4px;
+  color: #2a1a08;
+  font-size: 10px;
+  font-weight: 700;
+  cursor: pointer;
+  transition: background 0.15s, border-color 0.15s, box-shadow 0.15s, transform 0.1s;
+  line-height: 1.5;
+  letter-spacing: 0.3px;
+}
+.lf-dice-tray .lf-dt-die-btn:hover {
+  background: rgba(139, 69, 19, 0.35);
+  border-color: rgba(139, 69, 19, 0.7);
+  color: #5a2a00;
+  box-shadow: 0 0 5px rgba(139, 69, 19, 0.3);
+  transform: translateY(-1px);
+}
+.lf-dice-tray .lf-dt-die-btn:active {
+  transform: translateY(0);
+  box-shadow: none;
+  background: rgba(139, 69, 19, 0.5);
+}
+.lf-dice-tray .lf-dt-explode-label {
+  display: flex;
+  align-items: center;
+  gap: 3px;
+  cursor: pointer;
+  color: rgba(160, 80, 20, 0.7);
+  font-size: 14px;
+  flex-shrink: 0;
+  padding: 3px 6px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  transition: color 0.15s, border-color 0.15s, background 0.15s;
+}
+.lf-dice-tray .lf-dt-explode-label:hover {
+  color: rgba(200, 100, 30, 0.9);
+  border-color: rgba(139, 69, 19, 0.45);
+  background: rgba(139, 69, 19, 0.12);
+}
+.lf-dice-tray .lf-dt-explode-label input[type="checkbox"] {
+  appearance: none;
+  width: 0;
+  height: 0;
+  position: absolute;
+  opacity: 0;
+}
+.lf-dice-tray .lf-dt-explode-label input[type="checkbox"]:checked ~ i {
+  color: #cc4400;
+  filter: drop-shadow(0 0 4px rgba(200, 80, 0, 0.6));
+}
+.lf-dice-tray .lf-dt-explode-label:has(input:checked) {
+  color: #cc4400;
+  border-color: rgba(139, 69, 19, 0.55);
+  background: rgba(139, 60, 10, 0.2);
+}
+/* Free roll chat card — styled to match regular system roll cards */
+.lf-free-roll-card {
+  border-radius: 6px;
+  overflow: hidden;
+}
+.lf-free-roll-card .lf-frc-header {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 6px 8px;
+  background: linear-gradient(135deg, rgba(40, 30, 20, 0.7) 0%, rgba(30, 22, 15, 0.9) 100%);
+  border-bottom: 2px solid rgba(139, 69, 19, 0.4);
+}
+.lf-free-roll-card .lf-frc-header i {
+  color: #c9b896;
+  font-size: calc(var(--font-size-standard, 14px) * 1.1);
+}
+.lf-free-roll-card .lf-frc-header .lf-frc-title-text {
+  font-size: calc(var(--font-size-standard, 14px) * 0.85);
+  color: #c9b896;
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+}
+.lf-free-roll-card .lf-frc-header .lf-frc-badge {
+  display: inline-flex;
+  align-items: center;
+  padding: 2px 8px;
+  background: rgba(139, 69, 19, 0.3);
+  border: 1px solid rgba(139, 69, 19, 0.5);
+  border-radius: 10px;
+  font-size: calc(var(--font-size-standard, 14px) * 0.85);
+  font-weight: 600;
+  color: #d4c5a9;
+}
+.lf-free-roll-card .lf-frc-dice {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px;
+  padding: 6px 8px;
+  background: rgba(0, 0, 0, 0.15);
+  border: 1px solid rgba(139, 69, 19, 0.3);
+  border-top: none;
+}
+.lf-free-roll-card .lf-frc-dice .lf-frc-die-chip {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 3px 8px;
+  background: rgba(139, 69, 19, 0.2);
+  border: 1px solid rgba(139, 69, 19, 0.3);
+  border-radius: 4px;
+}
+.lf-free-roll-card .lf-frc-dice .lf-frc-die-chip .lf-frc-die-type {
+  font-size: calc(var(--font-size-standard, 14px) * 0.85);
+  font-weight: 600;
+  color: #2a2a1a;
+  text-transform: uppercase;
+}
+.lf-free-roll-card .lf-frc-dice .lf-frc-die-chip .lf-frc-die-sep {
+  color: rgba(0, 0, 0, 0.35);
+  font-weight: 300;
+  font-size: calc(var(--font-size-standard, 14px) * 0.8);
+}
+.lf-free-roll-card .lf-frc-dice .lf-frc-die-chip .lf-frc-die-val {
+  font-weight: bold;
+  color: #ffd700;
+  font-size: calc(var(--font-size-standard, 14px) * 0.95);
+}
+.lf-free-roll-card .lf-frc-dice .lf-frc-die-chip .lf-frc-die-val .lf-dt-explode-icon {
+  font-size: 8px;
+  color: #ffcc00;
+  margin-left: 2px;
+  vertical-align: super;
+  text-shadow: 0 0 4px rgba(255, 200, 0, 0.8);
+}
+.lf-free-roll-card .lf-frc-dice .lf-frc-die-chip.lf-frc-max {
+  background: rgba(139, 90, 19, 0.35);
+  border-color: rgba(200, 116, 42, 0.6);
+}
+.lf-free-roll-card .lf-frc-dice .lf-frc-die-chip.lf-frc-max .lf-frc-die-val {
+  color: #ff9a40;
+  text-shadow: 0 0 6px rgba(200, 116, 42, 0.6);
+}
+.lf-free-roll-card .lf-frc-dice .lf-frc-die-chip.lf-frc-min {
+  background: rgba(139, 20, 20, 0.25);
+  border-color: rgba(139, 34, 34, 0.5);
+}
+.lf-free-roll-card .lf-frc-dice .lf-frc-die-chip.lf-frc-min .lf-frc-die-val {
+  color: #ff6b6b;
+}
+.lf-free-roll-card .lf-frc-total-bar {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  padding: 6px 10px;
+  background: linear-gradient(135deg, rgba(40, 30, 20, 0.6) 0%, rgba(20, 15, 10, 0.8) 100%);
+  border: 2px solid rgba(139, 69, 19, 0.5);
+}
+.lf-free-roll-card .lf-frc-total-bar .lf-frc-total-label {
+  font-size: calc(var(--font-size-standard, 14px) * 0.85);
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+  color: #c9b896;
+}
+.lf-free-roll-card .lf-frc-total-bar .lf-frc-total-value {
+  font-family: var(--font-primary, serif);
+  font-size: calc(var(--font-size-standard, 14px) * 1.6);
+  font-weight: bold;
+  color: #e8d5a0;
+  text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.8);
+}
--- a/lang/en.json
+++ b/lang/en.json
@@ -152,6 +152,57 @@
        "wis": {
          "label": "Wisdom"
        }
+      },
+      "agility": {
+        "label": "Agility"
+      },
+      "app": {
+        "label": "Appearance"
+      },
+      "cha": {
+        "label": "Charisma"
+      },
+      "con": {
+        "label": "Constitution"
+      },
+      "contagion": {
+        "label": "Contagion Save"
+      },
+      "dex": {
+        "label": "Dexterity"
+      },
+      "dodge": {
+        "label": "Dodge Save"
+      },
+      "dying": {
+        "label": "Dying Challenge"
+      },
+      "int": {
+        "label": "Intelligence"
+      },
+      "luc": {
+        "label": "Luck"
+      },
+      "pain": {
+        "label": "Pain Save"
+      },
+      "painCourage": {
+        "label": "Pain/Courage Save"
+      },
+      "poison": {
+        "label": "Poison Save"
+      },
+      "str": {
+        "label": "Strength"
+      },
+      "toughness": {
+        "label": "Toughness Save"
+      },
+      "will": {
+        "label": "Willpower Save"
+      },
+      "wis": {
+        "label": "Wisdom"
      }
    },
    "Monster": {
@@ -250,6 +301,21 @@
        "wis": {
          "label": "Wisdom"
        }
+      },
+      "perception": {
+        "label": "Perception"
+      },
+      "resistIntimidation": {
+        "label": "Resist Intimidation"
+      },
+      "resistPerformance": {
+        "label": "Resist Performance"
+      },
+      "resistTorture": {
+        "label": "Resist Torture"
+      },
+      "stealth": {
+        "label": "Stealth"
      }
    },
    "Delete": "Delete",
@@ -429,7 +495,9 @@
      "wis": "WIS",
      "weapon-damage-medium": "Weapon damage medium",
      "weapon-damage-small": "Weapon damage small",
-      "combatProgressionStart": "Combat start threshold"
+      "combatProgressionStart": "Combat start threshold",
+      "miracle": "Miracle",
+      "titleStandard": "Standard Roll"
    },
    "Miracle": {
      "FIELDS": {
@@ -519,7 +587,9 @@
      "save": "Save roll {save}",
      "success": "Success",
      "visibility": "Visibility",
-      "favorDisfavor": "Favor/Disfavor"
+      "favorDisfavor": "Favor/Disfavor",
+      "displayArmor": "Target: {targetName} — Armor DR: {targetArmor} — Damage: {realDamage}",
+      "resourceLost": "Resource spent"
    },
    "Save": {
      "FIELDS": {
@@ -661,6 +731,9 @@
        "weaponClass": {
          "label": "Class"
        }
+      },
+      "error": {
+        "weaponBonus": "Weapon bonus exceeds the allowed maximum (skill total / 10)"
      }
    },
    "Spell": {
@@ -723,7 +796,17 @@
        },
        "catalyst": {
          "label": "Catalyst"
+        },
+        "damageDice": {
+          "label": "Damage dice"
        }
+      },
+      "Range": {
+        "contact": "Contact",
+        "distant": "Distant",
+        "loin": "Far",
+        "na": "N/A",
+        "proche": "Close"
      }
    },
    "ToggleSheet": "Toggle mode",
@@ -731,7 +814,11 @@
      "addEquipment": "New equipment",
      "addSpell": "New spells",
      "skill": "Skills list",
-      "combatProgressionStart": "First attack of combat can succeed on a roll of 1 through this value. Resets to 1 for subsequent attacks."
+      "combatProgressionStart": "First attack of combat can succeed on a roll of 1 through this value. Resets to 1 for subsequent attacks.",
+      "addMiracle": "Add Miracle",
+      "gifts": "Gifts list",
+      "skills": "Skills list",
+      "vulnerabilities": "Vulnerabilities list"
    },
    "Vulnerability": {
      "FIELDS": {
@@ -890,6 +977,25 @@
      "cannotAct": "cannot act this second",
      "diceResult": "Dice result",
      "progressionCount": "Progression count:"
+    },
+    "EquipmentCategories": {
+      "ClassKit": "Class Kit",
+      "Clothing": "Clothing",
+      "EssentialKit": "Essential Kit",
+      "FoodDrink": "Food & Drink",
+      "LandTransport": "Land Transport",
+      "Light": "Light",
+      "LoadBearing": "Load Bearing",
+      "Misc": "Miscellaneous",
+      "Mount": "Mount",
+      "Music": "Music",
+      "Sleeping": "Sleeping",
+      "WaterTransport": "Water Transport"
+    },
+    "DiceTray": {
+      "CountTitle": "Number of dice",
+      "ExplodeTitle": "Exploding dice — re-roll on maximum value",
+      "ChatTitle": "Free Roll"
    }
  },
  "TYPES": {
--- a/lethal-fantasy.mjs
+++ b/lethal-fantasy.mjs
@@ -250,6 +250,19 @@ Hooks.on(hookName, (message, html, data) => {
    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
+    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
+    const attackRerollContext = {
+      rollType: message.rolls[0]?.options?.rollType,
+      rollTarget: foundry.utils.duplicate(message.rolls[0]?.options?.rollTarget ?? {}),
+      actorId: message.rolls[0]?.options?.actorId,
+      actorName: message.rolls[0]?.options?.actorName,
+      actorImage: message.rolls[0]?.options?.actorImage,
+      defenderId: combatant.actor?.id || null,
+      defenderTokenId: tokenId || combatant.token?.id || null,
+      rollContext: foundry.utils.duplicate(message.rolls[0]?.options?.rollData ?? {})
+    }

    // Préparer le message de demande de défense
    const defenseMsg = {
@@ -262,6 +275,9 @@ Hooks.on(hookName, (message, html, data) => {
      attackWeaponId: attackWeaponId,
      attackRollType: attackRollType,
      attackRollKey: attackRollKey,
+      attackD30result: attackD30result,
+      attackD30message: attackD30message,
+      attackRerollContext: attackRerollContext,
      combatantId: combatantId,
      tokenId: tokenId
    }
@@ -279,10 +295,14 @@ Hooks.on(hookName, (message, html, data) => {
    const attacker = game.actors.get(attackerId)
    const attackerOwners = attacker ? game.users.filter(u => attacker.testUserPermission(u, "OWNER")).map(u => u.id) : []

+    // Monsters always need their owner (usually the GM) to roll a save/defense,
+    // even if that owner also controls the attacker. Only skip for same-player PC-vs-PC.
+    const defenderIsMonster = combatant.actor?.type === "monster"
+
    let messageSent = false
    owners.forEach(owner => {
-      // Ne pas afficher le dialogue à l'attaquant lui-même s'il contrôle aussi le défenseur
-      if (attackerOwners.includes(owner.id) && owner.id === game.user.id) {
+      // Don't let a player be both attacker and defender for their own PC, unless defending a monster.
+      if (attackerOwners.includes(owner.id) && owner.id === game.user.id && !defenderIsMonster) {
        // Ne rien faire - on ne veut pas que l'attaquant se défende contre lui-même
        return
      }
@@ -318,6 +338,7 @@ Hooks.on(hookName, (message, html, data) => {
    let attackerId = button.data("attacker-id")
    const defenderId = button.data("defender-id")
    const defenderTokenId = button.data("defender-token-id") || null
+    const extraShieldDr = Number(button.data("extra-shield-dr") || 0)
    const damageType = button.data("damage-type")
    const damageFormula = button.data("damage-formula")
    const damageModifier = button.data("damage-modifier")
@@ -330,9 +351,39 @@ Hooks.on(hookName, (message, html, data) => {
      return
    }

+    // Pour les sorts, rouler les dés de dégâts avec option bypass DR
+    if (damageType === "spell" && damageFormula) {
+      const bypassArmor = await foundry.applications.api.DialogV2.confirm({
+        window: { title: "Spell Damage" },
+        classes: ["lethalfantasy"],
+        content: "<p>Does this spell's damage bypass armor DR?</p>",
+        yes: { label: "Yes (ignore armor)", icon: "fa-solid fa-wand-magic-sparkles" },
+        no: { label: "No (apply armor DR)", icon: "fa-solid fa-shield" }
+      })
+      const rollOpts = {
+        type: "spell-damage",
+        rollType: "spell-damage",
+        rollName: damageFormula,
+        isDamage: true,
+        rollData: { isDamage: true },
+        bypassArmor: bypassArmor ?? false,
+        defenderId,
+        defenderTokenId,
+        actorId: actor.id,
+        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()
+      return
+    }
+
    // Pour les boutons de résultat de combat (monster damage)
    if (damageType === "monster" && attackKey) {
-      await actor.system.prepareMonsterRoll("monster-damage", attackKey, undefined, undefined, undefined, defenderId, defenderTokenId)
+      await actor.system.prepareMonsterRoll("monster-damage", attackKey, undefined, undefined, undefined, defenderId, defenderTokenId, extraShieldDr)
      return
    }

@@ -351,7 +402,7 @@ Hooks.on(hookName, (message, html, data) => {

    // Lancer les dégâts avec la bonne méthode
    const rollType = damageType === "small" ? "weapon-damage-small" : "weapon-damage-medium"
-    await actor.prepareRoll(rollType, weaponId, undefined, defenderId, defenderTokenId)
+    await actor.prepareRoll(rollType, weaponId, undefined, defenderId, defenderTokenId, extraShieldDr)
  })

  // Masquer les boutons de dommages dans les messages de résultat de combat si l'utilisateur n'est pas l'attaquant
@@ -378,7 +429,7 @@ Hooks.on("preCreateChatMessage", (message) => {
  const rollType = message.rolls[0]?.options?.rollType

  // Si c'est un message de défense et qu'on a des données en attente
-  if ((rollType === "weapon-defense" || rollType === "monster-defense") && game.lethalFantasy?.nextDefenseData) {
+  if ((rollType === "weapon-defense" || rollType === "monster-defense" || rollType === "save") && game.lethalFantasy?.nextDefenseData) {
    // Ajouter les données dans les flags du message
    message.updateSource({
      [`flags.${SYSTEM.id}.attackData`]: game.lethalFantasy.nextDefenseData
@@ -398,7 +449,7 @@ Hooks.on("createChatMessage", async (message) => {
  console.log("Defense hook checking message, rollType:", rollType)

  // Vérifier si c'est un message de défense
-  if (rollType !== "weapon-defense" && rollType !== "monster-defense") return
+  if (rollType !== "weapon-defense" && rollType !== "monster-defense" && rollType !== "save") return

  // Récupérer les données d'attaque depuis les flags
  const attackData = message.flags?.[SYSTEM.id]?.attackData
@@ -410,8 +461,21 @@ Hooks.on("createChatMessage", async (message) => {
    return
  }

-  const { attackerId, attackRoll, attackerName, defenderName, attackWeaponId, attackRollType, attackRollKey, defenderId, defenderTokenId } = attackData
+  const {
+    attackerId,
+    attackRoll,
+    attackerName,
+    defenderName,
+    attackWeaponId,
+    attackRollType,
+    attackRollKey,
+    attackD30message,
+    attackRerollContext,
+    defenderId,
+    defenderTokenId
+  } = attackData
  let defenseRoll = message.rolls[0]?.options?.rollTotal || message.rolls[0]?.total || 0
+  const defenseD30message = message.rolls[0]?.options?.D30message || null

  console.log("Processing defense:", { attackRoll, defenseRoll, attackerId, defenderId })

@@ -423,26 +487,216 @@ Hooks.on("createChatMessage", async (message) => {
  // Récupérer le défenseur et l'attaquant
  const defender = game.actors.get(defenderId)
  const attacker = game.actors.get(attackerId)
+  const defenseRerollContext = {
+    rollType: message.rolls[0]?.options?.rollType,
+    rollTarget: foundry.utils.duplicate(message.rolls[0]?.options?.rollTarget ?? {}),
+    actorId: message.rolls[0]?.options?.actorId,
+    actorName: message.rolls[0]?.options?.actorName,
+    actorImage: message.rolls[0]?.options?.actorImage,
+    defenderId,
+    defenderTokenId,
+    rollContext: foundry.utils.duplicate(message.rolls[0]?.options?.rollData ?? {})
+  }
+
+  const isPrimaryController = actor => {
+    if (!actor) return false
+    const activePlayerOwners = game.users.filter(u => u.active && !u.isGM && actor.testUserPermission(u, "OWNER"))
+    if (activePlayerOwners.length > 0) {
+      return activePlayerOwners[0].id === game.user.id
+    }
+    return game.user.isGM
+  }
+
+  const createReactionMessage = async (actorDocument, content) => {
+    await ChatMessage.create({
+      content,
+      speaker: ChatMessage.getSpeaker({ actor: actorDocument })
+    })
+  }

  // 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
  let defenderHandledBonus = false
-  if (defender?.type === "character" && defenseRoll < attackRoll && !game.user.isGM && defender.isOwner) {
-    const hasGritOrLuck = (defender.system.grit.current > 0) || (defender.system.luck.current > 0)
+  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

-    if (hasGritOrLuck) {
-      const bonusRoll = await LethalFantasyUtils.offerGritLuckBonus(
-        defender,
-        attackRoll,
-        defenseRoll,
-        attackerName,
-        defenderName
-      )
-      if (bonusRoll > 0) {
-        defenseRoll += bonusRoll
+    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}</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>`
+          )
+        }
+      }
+    }
  }

  let attackRollFinal = attackRoll
@@ -450,31 +704,98 @@ Hooks.on("createChatMessage", async (message) => {

  // 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 (attacker?.type === "character" && attackRollFinal <= defenseRoll && attacker.system.grit.current > 0) {
-    // Vérifier si l'utilisateur est un propriétaire non-GM de l'attaquant
-    const isAttackerOwner = !game.user.isGM && attacker.testUserPermission(game.user, "OWNER")
+  if (!defenderHandledBonus && attacker && attackRollFinal <= defenseRoll && isPrimaryController(attacker)) {
+    let canRerollAttack = LethalFantasyUtils.hasD30Reroll(attackD30message)

-    if (isAttackerOwner) {
-      console.log("Offering Grit to attacker")
+    while (attackRollFinal <= defenseRoll) {
+      const currentGrit = Number(attacker.system?.grit?.current) || 0
+      const buttons = []

-      const attackBonus = await LethalFantasyUtils.offerAttackerGritBonus(
-        attacker,
-        attackRollFinal,
-        defenseRoll,
-        attackerName,
-        defenderName
-      )
+      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",
+          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}</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

-      attackRollFinal += attackBonus
      attackerHandledBonus = true
-    } else {
-      console.log("Not attacker owner or is GM, skipping Grit offer")
+
+      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>.</p>`)
      }
    }
+  }
+
+  const shieldDamageReduction = shieldBlocked ? shieldReaction.damageReduction : 0
+  const outcome = shieldBlocked ? "shielded-hit" : (attackRollFinal > defenseRoll ? "hit" : "miss")

  // Créer le message de comparaison - uniquement par le client qui a géré le dernier bonus
  // Priorité: attaquant si il a géré le bonus, sinon défenseur si il a géré le bonus, sinon défenseur
-  const shouldCreateMessage = attackerHandledBonus || (!attackerHandledBonus && defenderHandledBonus) || (!attackerHandledBonus && !defenderHandledBonus && defender.isOwner)
+  const shouldCreateMessage = attackerHandledBonus || (!attackerHandledBonus && defenderHandledBonus) || (!attackerHandledBonus && !defenderHandledBonus && isPrimaryController(defender))

  if (shouldCreateMessage) {
    console.log("Creating comparison message", { attackerHandledBonus, defenderHandledBonus, isDefenderOwner: defender.isOwner })
@@ -489,7 +810,9 @@ Hooks.on("createChatMessage", async (message) => {
      defenderName,
      defenderId,
      defenderTokenId,
-      defenseRoll
+      defenseRoll,
+      outcome,
+      shieldDamageReduction
    })
  } else {
    console.log("Skipping message creation", { attackerHandledBonus, defenderHandledBonus })
@@ -551,8 +874,11 @@ Hooks.on("createChatMessage", async (message) => {
  const attackerName = message.rolls[0]?.options?.actorName || "Unknown Attacker"

  // Calculer les DR
-  const armorDR = defender.computeDamageReduction() || 0
-  const finalDamage = Math.max(0, damageTotal - armorDR)
+  const bypassArmor = message.rolls[0]?.options?.bypassArmor || false
+  const armorDR = bypassArmor ? 0 : (defender.computeDamageReduction() || 0)
+  const extraShieldDr = Number(message.rolls[0]?.options?.extraShieldDr) || 0
+  const totalDR = armorDR + extraShieldDr
+  const finalDamage = Math.max(0, damageTotal - totalDR)

  // Prefer the token ID stored in roll options (set at attack time when the exact token is known).
  // For unlinked tokens (default for monsters), this ensures we target the right instance even
@@ -584,7 +910,7 @@ Hooks.on("createChatMessage", async (message) => {
    {
      targetName: defender.name,
      damage: finalDamage,
-      drText: armorDR > 0 ? `Armor DR: ${armorDR}` : "",
+      drText: bypassArmor ? "Armor DR bypassed (spell)" : (totalDR > 0 ? `Armor DR: ${armorDR}${extraShieldDr > 0 ? ` + Shield DR: ${extraShieldDr}` : ""}` : ""),
      weaponName: weaponName,
      attackerName: attackerName,
      rawDamage: damageTotal
@@ -612,6 +938,12 @@ Hooks.on("hotbarDrop", (bar, data, slot) => {
  }
 })

+/* -------------------------------------------- */
+/**
+ * Inject the Lethal Fantasy dice tray into the chat sidebar.
+ */
+Hooks.on("renderChatLog", (_chatLog, html) => applications.injectDiceTray(_chatLog, html))
+
 /**
 * Register world usage statistics
 * @param {string} registerKey
--- a/module/applications/_module.mjs
+++ b/module/applications/_module.mjs
@@ -9,4 +9,5 @@ export { default as LethalFantasySpellSheet } from "./sheets/spell-sheet.mjs"
 export { default as LethalFantasyEquipmentSheet } from "./sheets/equipment-sheet.mjs"
 export { default as LethalFantasyShieldSheet } from "./sheets/shield-sheet.mjs"
 export { default as LethalFantasyMiracleSheet } from "./sheets/miracle-sheet.mjs"
+export { injectDiceTray } from "./free-roll.mjs"

--- a/module/applications/combat.mjs
+++ b/module/applications/combat.mjs
@@ -100,6 +100,14 @@ export class LethalFantasyCombat extends Combat {
    return this.turns = turns;
  }

+  async startCombat() {
+    this._playCombatSound("startEncounter")
+    const updateData = { round: 0, turn: 0 }
+    Hooks.callAll("combatStart", this, updateData)
+    await this.update(updateData)
+    return this
+  }
+
  async rollInitiative(ids, options) {
    console.log("%%%%%%%%% Roll Initiative", ids, options);

@@ -110,13 +118,12 @@ export class LethalFantasyCombat extends Combat {
    let updates = [];
    for (let cId of ids) {
      const c = this.combatants.get(cId);
-      let user = game.users.find(u => u.active && u.character && u.character.id === c.actor.id);
-      if (user?.hasPlayerOwner) {
+      const playerOwner = game.users.find(u => u.active && !u.isGM && u.character?.id === c.actor.id);
+      if (game.user.isGM && playerOwner) {
        console.log("Rolling initiative for", c.actor.name);
-        game.socket.emit(`system.${SYSTEM.id}`, { type: "rollInitiative", actorId: c.actor.id, combatId: this.id, combatantId: c.id });
+        game.socket.emit(`system.${SYSTEM.id}`, { type: "rollInitiative", userId: playerOwner.id, actorId: c.actor.id, combatId: this.id, combatantId: c.id });
      } else {
-        user = game.users.find(u => u.active && u.isGM);
-        c.actor.system.rollInitiative(this.id, c.id);
+        await c.actor.system.rollInitiative(this.id, c.id);
      }
    }

@@ -196,12 +203,11 @@ export class LethalFantasyCombat extends Combat {

    for (let c of this.combatants) {
      if (nextRound >= c.initiative) {
-        let user = game.users.find(u => u.active && u.character && u.character.id === c.actor.id);
-        if (user?.hasPlayerOwner) {
-          game.socket.emit(`system.${SYSTEM.id}`, { type: "rollProgressionDice", progressionCount: c.system.progressionCount + 1, actorId: c.actor.id, combatId: this.id, combatantId: c.id });
+        const playerOwner = game.users.find(u => u.active && !u.isGM && u.character?.id === c.actor.id);
+        if (game.user.isGM && playerOwner) {
+          game.socket.emit(`system.${SYSTEM.id}`, { type: "rollProgressionDice", userId: playerOwner.id, progressionCount: c.system.progressionCount + 1, actorId: c.actor.id, combatId: this.id, combatantId: c.id });
        } else {
-          user = game.users.find(u => u.active && u.isGM);
-          c.actor.system.rollProgressionDice(this.id, c.id);
+          await c.actor.system.rollProgressionDice(this.id, c.id);
        }
      }
    }
--- a/module/applications/free-roll.mjs
+++ b/module/applications/free-roll.mjs
@@ -0,0 +1,152 @@
+/**
+ * Free Dice Tray — injected into the Foundry chat sidebar.
+ *
+ * Provides a compact bar for GM and players to roll any standard die (d4–d30)
+ * or its exploding variant (dXx) without needing an actor sheet.
+ * Supports selecting how many dice to roll (1–9).
+ */
+
+/** Standard dice available in Lethal Fantasy */
+const DICE_TYPES = ["d4", "d6", "d8", "d10", "d12", "d20", "d30"]
+
+/**
+ * Inject the dice tray bar into the ChatLog HTML.
+ * Called from `Hooks.on("renderChatLog", ...)`.
+ *
+ * @param {Application} _chatLog
+ * @param {HTMLElement|jQuery} html
+ */
+export function injectDiceTray(_chatLog, html) {
+  const el = (html instanceof HTMLElement) ? html : (html[0] ?? html)
+  if (!el?.querySelector) return
+  if (el.querySelector(".lf-dice-tray")) return
+
+  const bar = document.createElement("div")
+  bar.className = "lf-dice-tray"
+
+  const diceButtons = DICE_TYPES.map(d =>
+    `<button type="button" class="lf-dt-die-btn" data-die="${d}" title="${d.toUpperCase()}">${d.toUpperCase()}</button>`
+  ).join("")
+
+  const countOptions = Array.from({ length: 9 }, (_, i) =>
+    `<option value="${i + 1}">${i + 1}</option>`
+  ).join("")
+
+  bar.innerHTML = `
+    <div class="lf-dt-row">
+      <span class="lf-dt-label"><i class="fa-solid fa-dice"></i></span>
+      <select class="lf-dt-count" title="${game.i18n.localize("LETHALFANTASY.DiceTray.CountTitle")}">
+        ${countOptions}
+      </select>
+      <div class="lf-dt-dice">${diceButtons}</div>
+      <label class="lf-dt-explode-label" title="${game.i18n.localize("LETHALFANTASY.DiceTray.ExplodeTitle")}">
+        <input type="checkbox" class="lf-dt-explode" />
+        <i class="fa-solid fa-explosion"></i>
+      </label>
+    </div>
+  `
+
+  bar.addEventListener("click", async ev => {
+    const btn = ev.target.closest(".lf-dt-die-btn")
+    if (!btn) return
+    ev.stopPropagation()
+
+    const dieType = btn.dataset.die
+    const count = parseInt(bar.querySelector(".lf-dt-count").value) || 1
+    const explode = bar.querySelector(".lf-dt-explode").checked
+
+    try {
+      await rollFreeDie(dieType, count, explode)
+    } catch (err) {
+      console.error("Lethal Fantasy | Dice Tray error:", err)
+      ui.notifications?.error("Dice Tray roll failed — see console")
+    }
+  })
+
+  const anchor = el.querySelector(".chat-form")
+    ?? el.querySelector(".chat-message-form")
+    ?? el.querySelector("form")
+  if (anchor) {
+    anchor.parentElement.insertBefore(bar, anchor)
+  } else {
+    el.appendChild(bar)
+  }
+}
+
+/**
+ * Roll one or more dice of the given type and post the result to chat.
+ * For exploding dice, follows the Lethal Fantasy rule: each exploded reroll
+ * contributes (result − 1) to the total, same as all other system rolls.
+ *
+ * @param {string}  dieType  Die face, e.g. "d20"
+ * @param {number}  count    Number of dice to roll (1–9)
+ * @param {boolean} explode  Whether to use the exploding variant (max triggers reroll at −1)
+ * @returns {Promise<void>}
+ */
+export async function rollFreeDie(dieType, count = 1, explode = false) {
+  const sides = parseInt(dieType.replace("d", "")) || 20
+  const baseFormula = `1d${sides}`
+  const label = explode
+    ? `${count}${dieType.toUpperCase()}E`
+    : `${count}${dieType.toUpperCase()}`
+
+  const dieLabel = dieType.toUpperCase()
+  const dieChips = []
+  let total = 0
+
+  for (let i = 0; i < count; i++) {
+    const r0 = await new Roll(baseFormula).evaluate()
+    if (game?.dice3d) await game.dice3d.showForRoll(r0, game.user, true)
+    let diceResult = r0.dice[0].results[0].result
+    dieChips.push({ label: dieLabel, value: diceResult, exploded: false })
+    total += diceResult
+
+    if (explode) {
+      while (diceResult === sides) {
+        const rx = await new Roll(baseFormula).evaluate()
+        if (game?.dice3d) await game.dice3d.showForRoll(rx, game.user, true)
+        diceResult = rx.dice[0].results[0].result
+        const contrib = diceResult - 1
+        dieChips.push({ label: `${dieLabel}-1`, value: contrib, exploded: true })
+        total += contrib
+      }
+    }
+  }
+
+  const resultHtml = dieChips.map(chip => {
+    const isMax = !chip.exploded && chip.value === sides
+    const isMin = chip.value === 1
+    const explodeIcon = chip.exploded ? `<i class="fa-solid fa-burst lf-dt-explode-icon"></i>` : ""
+    const classes = ["lf-frc-die-chip", isMax ? "lf-frc-max" : "", isMin ? "lf-frc-min" : ""].filter(Boolean).join(" ")
+    return `<div class="${classes}">
+      <span class="lf-frc-die-type">${chip.label}</span>
+      <span class="lf-frc-die-sep">→</span>
+      <span class="lf-frc-die-val">${chip.value}${explodeIcon}</span>
+    </div>`
+  }).join("")
+
+  const totalLabel = game.i18n.localize("LETHALFANTASY.Label.total").toUpperCase()
+  const content = `
+    <div class="lf-free-roll-card">
+      <div class="lf-frc-header">
+        <i class="fa-solid fa-dice"></i>
+        <span class="lf-frc-title-text">${game.i18n.localize("LETHALFANTASY.DiceTray.ChatTitle")}</span>
+        <span class="lf-frc-badge">${label}</span>
+      </div>
+      <div class="lf-frc-dice">${resultHtml}</div>
+      <div class="lf-frc-total-bar">
+        <span class="lf-frc-total-label">${totalLabel}</span>
+        <span class="lf-frc-total-value">${total}</span>
+      </div>
+    </div>
+  `
+
+  const rollMode = game.settings.get("core", "rollMode")
+  const msgData = {
+    speaker: ChatMessage.getSpeaker(),
+    content,
+    sound: CONFIG.sounds.dice,
+  }
+  ChatMessage.applyRollMode(msgData, rollMode)
+  await ChatMessage.create(msgData)
+}
--- a/module/config/d30_results_tables.json
+++ b/module/config/d30_results_tables.json
@@ -6,7 +6,7 @@
      "melee_defense": "Possible Flawless or Legendary Defense or Add D20E to Defense",
      "arcane_spell_attack": "Possible Lethal or Vital Magical Strike or Add D20E to Spell Attack",
      "arcane_spell_defense": "Possible Spell Catastrophe or adds D20E to Spell Defense",
-      "skill_rolls": "Skill Succeeds Regardless of Opposing Roll / Success at highest level / Matching 30s cancel each other out"
+      "skill_rolls": "Skill Succeeds Regardless of Opposing Roll"
    },
    "29": {
      "melee_attack": "Gain 1 Grit",
@@ -28,9 +28,9 @@
      "melee_attack": "Granted D6 (1-6) Attack Modifier for This Melee Attack",
      "ranged_attack": "Granted D6 (1-6) Attack Modifier for This Ranged Attack",
      "melee_defense": "Granted 1 Luck dice for Use in This Combat Only",
-      "arcane_spell_attack": "No Spell Lethargy (the Aether Approves)",
+      "arcane_spell_attack": "No Spell Lethargy the Aether Approves of Characters Efforts",
      "arcane_spell_defense": "Caster Suffers Severe pain and will be under a flash of pain for 1D6E seconds",
-      "skill_rolls": "Granted D6 (1-6) Skill Modifier for this Skill Attempt"
+      "skill_rolls": "empty"
    },
    "26": {
      "melee_attack": "Shield Destruction",
@@ -41,9 +41,9 @@
      "skill_rolls": "empty"
    },
    "25": {
-      "melee_attack": "Bleed, Knock-Back on Hit",
-      "ranged_attack": "Bleed",
-      "melee_defense": "Kick, Punch or Shield Bash",
+      "melee_attack": "empty",
+      "ranged_attack": "empty",
+      "melee_defense": "empty",
      "arcane_spell_attack": "empty",
      "arcane_spell_defense": "empty",
      "skill_rolls": "Add 1 to Skill Roll"
@@ -54,14 +54,14 @@
      "melee_defense": "Defender Recovers or ignores any flash of pain",
      "arcane_spell_attack": "Magical Damage inflicts Flash of pain 1D6E seconds",
      "arcane_spell_defense": "Caster Suffers Severe pain and will be under a flash of pain for 1D6E seconds",
-      "skill_rolls": "empty"
+      "skill_rolls": "Granted D6 (1-6) Skill Modifier for this Skill Attempt"
    },
    "20": {
-      "melee_attack": "Possible Vicious Strike. Bleed, Knock-back on Hit",
-      "ranged_attack": "Possible Vicious Strike. Bleeding wound inflicted on hit.",
-      "melee_defense": "Possible 20/20 defense (avoids Any Attack Except a Lethal Strike). Grants a Kick, Punch or Shield Bash counter",
-      "arcane_spell_attack": "Possible Vicious Application of a Magical Attack",
-      "arcane_spell_defense": "Possible 20/20 Spell defense (Saves Against Any Magical Attack Except a Lethal Magical Strike)",
+      "melee_attack": "Possible Vicious Strike or Add D12 to attack",
+      "ranged_attack": "Possible Vicious Strike or add D12 to attack",
+      "melee_defense": "Possible 20/20 defense that avoids Any Attack Except a Lethal Strike or adds D12 to defense",
+      "arcane_spell_attack": "Possible Vicious Application of a Magical Attack or add D12 to attack",
+      "arcane_spell_defense": "Possible 20/20 Spell defense that Saves Against Any Magical Attack Except a Lethal Magical Strike or add D12 to defense",
      "skill_rolls": "20 Added to Skill Roll"
    },
    "15": {
@@ -106,7 +106,7 @@
    },
    "7": {
      "melee_attack": "Flurry Attack on Hit or Miss",
-      "ranged_attack": "Roll 2x Double Damage Dice",
+      "ranged_attack": "Roll 2x Damage Dice",
      "melee_defense": "empty",
      "arcane_spell_attack": "empty",
      "arcane_spell_defense": "empty",
@@ -146,7 +146,9 @@
    }
  },
  "definitions": {
-    "flash_of_pain": "Causes the victim to defend with disfavor. They can only walk and cannot attack, cast spells, call miracles or perform skills.",
-    "shield_destruction_condition": "Occurs only if damage exceeds the shields DR."
+    "flash_of_pain": "Causes the victim to defend against melee and spell attacks with disfavor. They can only walk and cannot attack, cast spells, call miracles or perform skills.",
+    "shield_destruction_condition": "Shield destruction occurs only if damage exceeds the shields DR.",
+    "matching_30s": "Matching 30s on skill rolls cancel each other out and is resolved by the skill roll.",
+    "skill_roll_30": "A 30 on a skill roll indicates success at highest level of the skill involved."
  }
 }
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -153,7 +153,7 @@ export default class LethalFantasyActor extends Actor {
  }

  /* *************************************************/
-  async prepareRoll(rollType, rollKey, rollDice, defenderId, defenderTokenId) {
+  async prepareRoll(rollType, rollKey, rollDice, defenderId, defenderTokenId, extraShieldDr = 0) {
    console.log("Preparing roll", rollType, rollKey, rollDice, defenderId)
    let rollTarget
    switch (rollType) {
@@ -268,7 +268,7 @@ export default class LethalFantasyActor extends Actor {
    rollTarget.magicUser = this.system.biodata.magicUser
    rollTarget.actorModifiers = foundry.utils.duplicate(this.system.modifiers)
    rollTarget.actorLevel = this.system.biodata.level
-    await this.system.roll(rollType, rollTarget, defenderId, defenderTokenId)
+    await this.system.roll(rollType, rollTarget, defenderId, defenderTokenId, extraShieldDr)
  }

 }
--- a/module/documents/roll.mjs
+++ b/module/documents/roll.mjs
@@ -346,11 +346,25 @@ export default class LethalFantasyRoll extends Roll {
      favor: "none",
      targetName
    }
+    let rollContext
+    if (options.rollContext) {
+      rollContext = foundry.utils.duplicate(options.rollContext)
+      hasGrantedDice = !!rollContext.hasGrantedDice
+      pointBlank = !!rollContext.pointBlank
+      beyondSkill = !!rollContext.beyondSkill
+      letItFly = !!rollContext.letItFly
+      saveSpell = !!rollContext.saveSpell
+      rollContext.visibility ||= rollContext.rollMode || game.settings.get("core", "rollMode")
+      rollContext.modifier ||= modifier
+      rollContext.favor ||= "none"
+      rollContext.changeDice ||= `${dice}`
+      rollContext.attackerAim ||= "0"
+    } else {
      const content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-lethal-fantasy/templates/roll-dialog.hbs", dialogContext)

      let position = game.user.getFlag(SYSTEM.id, "roll-dialog-pos") || { top: -1, left: -1 }
      const label = game.i18n.localize("LETHALFANTASY.Roll.roll")
-    const rollContext = await foundry.applications.api.DialogV2.wait({
+      rollContext = await foundry.applications.api.DialogV2.wait({
        window: { title: "Roll dialog" },
        classes: ["lethalfantasy"],
        content,
@@ -391,13 +405,14 @@ export default class LethalFantasyRoll extends Roll {
            let token = canvas.tokens?.get(tokenId)
            if (token) {
              canvas.animatePan({ x: token.x, y: token.y, duration: 200 })
-            canvas.tokens.releaseAll();
-            token.control({ releaseOthers: true });
+              canvas.tokens.releaseAll()
+              token.control({ releaseOthers: true })
            }
          }
        },
        rejectClose: false // Click on Close button will not launch an error
      })
+    }

    // If the user cancels the dialog, exit
    if (rollContext === null) return
@@ -547,6 +562,10 @@ export default class LethalFantasyRoll extends Roll {
      rollFavor = null
    }

+    if (options.forceNoD30) {
+      hasD30 = false
+    }
+
    if (hasD30) {
      let rollD30 = await new Roll("1D30").evaluate()
      if (game?.dice3d) {
@@ -621,6 +640,7 @@ export default class LethalFantasyRoll extends Roll {
    rollBase.options.rollData = foundry.utils.duplicate(rollData)
    rollBase.options.defenderId = options.defenderId
    rollBase.options.defenderTokenId = options.defenderTokenId
+    rollBase.options.extraShieldDr = options.extraShieldDr || 0

    /**
     * A hook event that fires after the roll has been made.
@@ -693,7 +713,7 @@ export default class LethalFantasyRoll extends Roll {
    let initRoll = new Roll(formula, options.data)
    await initRoll.evaluate()
    let msg = await initRoll.toMessage({ flavor: `Initiative for ${options.actorName}` }, { rollMode: rollContext.visibility })
-    if (game?.dice3d) {
+    if (game?.dice3d && initRoll.dice?.length) {
      await game.dice3d.waitFor3DAnimationByMessageID(msg.id)
    }

@@ -1296,7 +1316,7 @@ export default class LethalFantasyRoll extends Roll {
   * @returns {Promise} - A promise that resolves when the message is created.
   */
  async toMessage(messageData = {}, { rollMode, create = true } = {}) {
-    super.toMessage(
+    return await super.toMessage(
      {
        isSave: this.isSave,
        isChallenge: this.isChallenge,
@@ -1313,7 +1333,7 @@ export default class LethalFantasyRoll extends Roll {
        rollData: this.rollData,
        ...messageData,
      },
-      { rollMode: rollMode },
+      { rollMode, create },
    )
  }

--- a/module/models/character.mjs
+++ b/module/models/character.mjs
@@ -274,7 +274,7 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod
   * @param {"="|"+"|"++"|"-"|"--"} rollAdvantage If there is an avantage (+), a disadvantage (-), a double advantage (++), a double disadvantage (--) or a normal roll (=).
   * @returns {Promise<null>} - A promise that resolves to null if the roll is cancelled.
   */
-  async roll(rollType, rollTarget, defenderId, defenderTokenId) {
+  async roll(rollType, rollTarget, defenderId, defenderTokenId, extraShieldDr = 0) {
    const hasTarget = false
    let roll = await LethalFantasyRoll.prompt({
      rollType,
@@ -285,7 +285,8 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod
      hasTarget,
      target: false,
      defenderId,
-      defenderTokenId
+      defenderTokenId,
+      extraShieldDr
    })
    if (!roll) return null

--- a/module/models/monster.mjs
+++ b/module/models/monster.mjs
@@ -141,7 +141,7 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel
   * @param {"="|"+"|"++"|"-"|"--"} rollAdvantage If there is an avantage (+), a disadvantage (-), a double advantage (++), a double disadvantage (--) or a normal roll (=).
   * @returns {Promise<null>} - A promise that resolves to null if the roll is cancelled.
   */
-  async roll(rollType, rollTarget, defenderId = undefined, defenderTokenId = undefined) {
+  async roll(rollType, rollTarget, defenderId = undefined, defenderTokenId = undefined, extraShieldDr = 0) {
    const hasTarget = false
    let roll = await LethalFantasyRoll.prompt({
      rollType,
@@ -152,14 +152,15 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel
      hasTarget,
      target: false,
      defenderId,
-      defenderTokenId
+      defenderTokenId,
+      extraShieldDr
    })
    if (!roll) return null

    await roll.toMessage({}, { rollMode: roll.options.rollMode })
  }

-  async prepareMonsterRoll(rollType, rollKey, rollDice = undefined, tokenId = undefined, damageModifier = undefined, defenderId = undefined, defenderTokenId = undefined) {
+  async prepareMonsterRoll(rollType, rollKey, rollDice = undefined, tokenId = undefined, damageModifier = undefined, defenderId = undefined, defenderTokenId = undefined, extraShieldDr = 0) {
    let rollTarget
    switch (rollType) {
      case "monster-attack":
@@ -255,7 +256,7 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel
    if (rollTarget) {
      rollTarget.tokenId = tokenId
      console.log(rollTarget)
-      await this.roll(rollType, rollTarget, defenderId, defenderTokenId)
+      await this.roll(rollType, rollTarget, defenderId, defenderTokenId, extraShieldDr)
    }
  }

--- a/module/models/spell.mjs
+++ b/module/models/spell.mjs
@@ -39,6 +39,7 @@ export default class LethalFantasySpell extends foundry.abstract.TypeDataModel {

    schema.attackRoll = new fields.StringField({ required: true, initial: "" })
    schema.powerRoll = new fields.StringField({ required: true, initial: "" })
+    schema.damageDice = new fields.StringField({ required: false, initial: "" })
  
    return schema
  }
--- a/module/utils.mjs
+++ b/module/utils.mjs
@@ -124,10 +124,12 @@ export default class LethalFantasyUtils {
        }
        break
      case "rollInitiative":
+        if (msg.userId && msg.userId !== game.user.id) break
        actor = game.actors.get(msg.actorId)
        actor.system.rollInitiative(msg.combatId, msg.combatantId)
        break
      case "rollProgressionDice":
+        if (msg.userId && msg.userId !== game.user.id) break
        actor = game.actors.get(msg.actorId)
        actor.system.rollProgressionDice(msg.combatId, msg.combatantId, msg.rollProgressionCount)
        break
@@ -190,6 +192,9 @@ export default class LethalFantasyUtils {
    const attackWeaponId = msg.attackWeaponId
    const attackRollType = msg.attackRollType
    const attackRollKey = msg.attackRollKey
+    const attackD30result = msg.attackD30result
+    const attackD30message = msg.attackD30message
+    const attackRerollContext = msg.attackRerollContext
    const combatantId = msg.combatantId
    const tokenId = msg.tokenId

@@ -230,6 +235,73 @@ export default class LethalFantasyUtils {

    const isMonster = defender.type === "monster"

+    console.log(`[LF] showDefenseRequest | attackRollType=${attackRollType} isMonster=${isMonster} defender=${defender?.name}`)
+
+    // Spell/miracle attacks use saving throws instead of weapon defense
+    const isSpellAttack = attackRollType === "spell-attack" || attackRollType === "miracle-attack"
+    if (isSpellAttack) {
+      const savesConfig = isMonster ? SYSTEM.MONSTER_SAVES : SYSTEM.SAVES
+      const combatSaves = ["will", "dodge", "toughness"]
+      const savesHTML = Object.values(savesConfig)
+        .filter(s => combatSaves.includes(s.id))
+        .map(s => `<option value="${s.id}">${game.i18n.localize(s.label)}</option>`)
+        .join("")
+
+      const content = `
+        <div class="defense-request-dialog">
+          <div class="attack-info">
+            <p><strong>${attackerName}</strong> targets <strong>${defenderName}</strong> with <strong>${weaponName}</strong>!</p>
+            <p>Attack roll: <strong>${attackRoll}</strong></p>
+          </div>
+          <div class="weapon-selection">
+            <label for="save-type">Choose saving throw:</label>
+            <select id="save-type" name="saveKey" style="width: 100%; margin-top: 8px;">
+              ${savesHTML}
+            </select>
+          </div>
+        </div>
+      `
+
+      const result = await foundry.applications.api.DialogV2.wait({
+        window: { title: "Saving Throw vs Spell" },
+        classes: ["lethalfantasy"],
+        content,
+        buttons: [
+          {
+            action: "rollSave",
+            label: "Roll Save",
+            icon: "fa-solid fa-person-running",
+            callback: (event, button) => button.form.elements.saveKey.value,
+          },
+        ],
+        rejectClose: false
+      })
+
+      if (result) {
+        game.lethalFantasy = game.lethalFantasy || {}
+        game.lethalFantasy.nextDefenseData = {
+          attackerId,
+          attackRoll,
+          attackerName,
+          defenderName,
+          attackWeaponId,
+          attackRollType,
+          attackRollKey,
+          attackD30result,
+          attackD30message,
+          attackRerollContext,
+          defenderId: defender.id,
+          defenderTokenId
+        }
+        if (isMonster) {
+          defender.system.prepareMonsterRoll("save", result)
+        } else {
+          defender.prepareRoll("save", result)
+        }
+      }
+      return
+    }
+
    // Pour les monstres, récupérer les attaques activées
    if (isMonster) {
      const enabledAttacks = Object.entries(defender.system.attacks).filter(([key, attack]) => attack.enabled)
@@ -289,6 +361,9 @@ export default class LethalFantasyUtils {
          attackWeaponId,
          attackRollType,
          attackRollKey,
+          attackD30result,
+          attackD30message,
+          attackRerollContext,
          defenderId: defender.id,
          defenderTokenId
        }
@@ -358,6 +433,9 @@ export default class LethalFantasyUtils {
        attackWeaponId,
        attackRollType,
        attackRollKey,
+        attackD30result,
+        attackD30message,
+        attackRerollContext,
        defenderId: defender.id,
        defenderTokenId
      }
@@ -368,6 +446,188 @@ export default class LethalFantasyUtils {
    }
  }

+  /* -------------------------------------------- */
+  static hasD30Reroll(d30Message) {
+    return /mulligan|re-?roll/i.test(d30Message || "")
+  }
+
+  /* -------------------------------------------- */
+  static getCombatBonusDiceChoices() {
+    return ["1d4", "1d6", "1d8", "1d10", "1d12", "1d20", "1d20e"]
+  }
+
+  /* -------------------------------------------- */
+  static getShieldReactionData(actor) {
+    if (!actor) return null
+    if (actor.type === "monster") {
+      const formula = actor.system.combat?.shieldDefenseDice
+      const damageReduction = actor.getShieldDR()
+      if (!formula || damageReduction <= 0) return null
+      return {
+        label: game.i18n.localize("LETHALFANTASY.Label.shieldDefenseDice"),
+        formula,
+        damageReduction
+      }
+    }
+
+    const equippedShields = actor.items.filter(item => item.type === "shield" && item.system.equipped)
+    if (equippedShields.length === 0) return null
+
+    const shield = equippedShields[0]
+    return {
+      label: shield.name,
+      formula: shield.system.defense,
+      damageReduction: actor.getShieldDR(),
+      shieldId: shield.id
+    }
+  }
+
+  /* -------------------------------------------- */
+  static async promptCombatBonusDie(actorName, sideLabel, currentRoll, opposingRoll) {
+    const choices = this.getCombatBonusDiceChoices()
+    const optionsHtml = choices.map(choice => `<option value="${choice}">${choice.toUpperCase()}</option>`).join("")
+    const content = `
+      <div class="grit-luck-dialog">
+        <div class="combat-status">
+          <p><strong>${actorName}</strong> currently has <strong>${currentRoll}</strong></p>
+          <p>Opposing ${sideLabel} roll: <strong>${opposingRoll}</strong></p>
+        </div>
+        <div class="weapon-selection">
+          <label for="bonus-die">Choose a bonus die:</label>
+          <select id="bonus-die" name="bonusDie" style="width: 100%; margin-top: 8px;">
+            ${optionsHtml}
+          </select>
+        </div>
+      </div>
+    `
+
+    return await foundry.applications.api.DialogV2.wait({
+      window: { title: "Add Bonus Die" },
+      classes: ["lethalfantasy"],
+      content,
+      buttons: [
+        {
+          action: "roll",
+          label: "Roll Bonus Die",
+          icon: "fa-solid fa-dice",
+          callback: (event, button) => {
+            const sel = button.form?.elements?.bonusDie ?? button.closest("form")?.elements?.bonusDie
+            return sel?.value ?? choices[0]
+          }
+        },
+        {
+          action: "cancel",
+          label: "Cancel",
+          icon: "fa-solid fa-xmark",
+          callback: () => null
+        }
+      ],
+      rejectClose: false
+    })
+  }
+
+  /* -------------------------------------------- */
+  /**
+   * Prompt the GM or player to choose an ad-hoc shield dice and DR value.
+   * Used when the defender has no pre-configured shield equipment.
+   * @param {string} defenderName
+   * @param {number} attackRoll
+   * @param {number} defenseRoll
+   * @returns {Promise<{formula: string, damageReduction: number}|null>}
+   */
+  static async promptAdHocShield(defenderName, attackRoll, defenseRoll) {
+    const choices = this.getCombatBonusDiceChoices()
+    const optionsHtml = choices.map(c => `<option value="${c}">${c.toUpperCase()}</option>`).join("")
+    const content = `
+      <div class="grit-luck-dialog">
+        <div class="combat-status">
+          <p><strong>${defenderName}</strong> uses a shield (not equipped)</p>
+          <p>Attack: <strong>${attackRoll}</strong> — Current defense: <strong>${defenseRoll}</strong></p>
+        </div>
+        <div class="weapon-selection" style="margin-top:8px;">
+          <label for="shield-dice">Shield dice:</label>
+          <select id="shield-dice" name="shieldDice" style="width: 100%; margin-top: 4px;">
+            ${optionsHtml}
+          </select>
+        </div>
+        <div class="weapon-selection" style="margin-top:8px;">
+          <label for="shield-dr">Shield DR value:</label>
+          <input id="shield-dr" name="shieldDR" type="number" min="0" value="0" style="width: 100%; margin-top: 4px;" />
+        </div>
+      </div>
+    `
+
+    const raw = await foundry.applications.api.DialogV2.wait({
+      window: { title: "Ad-hoc Shield Roll" },
+      classes: ["lethalfantasy"],
+      content,
+      buttons: [
+        {
+          action: "roll",
+          label: "Roll Shield",
+          icon: "fa-solid fa-shield",
+          callback: (event, button) => {
+            const shieldDice = button.form?.elements?.shieldDice ?? button.closest("form")?.elements?.shieldDice
+            const shieldDR = button.form?.elements?.shieldDR ?? button.closest("form")?.elements?.shieldDR
+            return {
+              formula: shieldDice?.value ?? "1d6",
+              damageReduction: Number(shieldDR?.value) || 0
+            }
+          }
+        },
+        {
+          action: "cancel",
+          label: "Cancel",
+          icon: "fa-solid fa-xmark",
+          callback: () => null
+        }
+      ],
+      rejectClose: false
+    })
+
+    return raw ?? null
+  }
+
+  /* -------------------------------------------- */
+  /**
+   * Roll a bonus die formula, optionally showing Dice So Nice animation and posting a chat message.
+   * @param {string} formula
+   * @param {Actor} actor
+   * @param {Function} [messageContent]
+   * @returns {Promise<number>}
+   */
+  static async rollBonusDie(formula, actor, messageContent) {
+    const roll = new Roll(formula)
+    await roll.evaluate()
+    if (game?.dice3d) {
+      await game.dice3d.showForRoll(roll, game.user, true)
+    }
+    if (messageContent) {
+      await ChatMessage.create({
+        content: messageContent(roll.total, formula),
+        speaker: ChatMessage.getSpeaker({ actor })
+      })
+    }
+    return roll.total
+  }
+
+  /* -------------------------------------------- */
+  static async rerollConfiguredRoll(rerollContext = {}) {
+    const RollClass = CONFIG.Dice.rolls.find(r => r.name === "LethalFantasyRoll")
+    if (typeof RollClass?.prompt !== "function") {
+      ui.notifications.error("Lethal Fantasy roll class not available for reroll")
+      return null
+    }
+
+    return await RollClass.prompt({
+      ...foundry.utils.duplicate(rerollContext),
+      rollContext: foundry.utils.duplicate(rerollContext.rollContext || {}),
+      forceNoD30: true,
+      hasTarget: false,
+      target: false
+    })
+  }
+
  /* -------------------------------------------- */
  static async offerGritLuckBonus(defender, attackRoll, currentDefenseRoll, attackerName, defenderName) {
    let totalBonus = 0
@@ -538,7 +798,8 @@ export default class LethalFantasyUtils {
  /* -------------------------------------------- */
  static async compareAttackDefense(data) {
    console.log("compareAttackDefense called with:", data)
-    const isAttackWin = data.attackRoll > data.defenseRoll
+    const outcome = data.outcome || (data.attackRoll > data.defenseRoll ? "hit" : "miss")
+    const isAttackWin = outcome !== "miss"
    console.log("isAttackWin:", isAttackWin, "attackRoll:", data.attackRoll, "defenseRoll:", data.defenseRoll)

    let damageButton = ""
@@ -548,10 +809,10 @@ export default class LethalFantasyUtils {
      if (data.attackRollType === "weapon-attack") {
        damageButton = `
          <div class="attack-result-damage">
-            <button class="roll-damage-btn" data-attacker-id="${data.attackerId}" data-defender-id="${data.defenderId}" data-defender-token-id="${data.defenderTokenId || ""}" data-weapon-id="${data.attackWeaponId}" data-damage-type="small">
+            <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-weapon-id="${data.attackWeaponId}" data-damage-type="small">
              <i class="fa-solid fa-dice-d6"></i> Damage (Small)
            </button>
-            <button class="roll-damage-btn" data-attacker-id="${data.attackerId}" data-defender-id="${data.defenderId}" data-defender-token-id="${data.defenderTokenId || ""}" data-weapon-id="${data.attackWeaponId}" data-damage-type="medium">
+            <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-weapon-id="${data.attackWeaponId}" data-damage-type="medium">
              <i class="fa-solid fa-dice-d20"></i> Damage (Medium)
            </button>
          </div>
@@ -559,11 +820,29 @@ export default class LethalFantasyUtils {
      } else if (data.attackRollType === "monster-attack") {
        damageButton = `
          <div class="attack-result-damage">
-            <button class="roll-damage-btn" data-attacker-id="${data.attackerId}" data-defender-id="${data.defenderId}" data-defender-token-id="${data.defenderTokenId || ""}" data-attack-key="${data.attackRollKey}" data-damage-type="monster">
+            <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>
          </div>
        `
+      } 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 damageDice = spell?.system?.damageDice
+        if (damageDice) {
+          damageButton = `
+            <div class="attack-result-damage">
+              <button class="roll-damage-btn"
+                data-attacker-id="${data.attackerId}"
+                data-defender-id="${data.defenderId}"
+                data-defender-token-id="${data.defenderTokenId || ""}"
+                data-damage-type="spell"
+                data-damage-formula="${damageDice}">
+                <i class="fa-solid fa-wand-magic-sparkles"></i> Spell Damage (${damageDice})
+              </button>
+            </div>
+          `
+        }
      }
    }

@@ -588,9 +867,11 @@ export default class LethalFantasyUtils {
          </div>
        </div>
        <div class="combat-result-text">
-          ${isAttackWin ?
-        `<i class="fa-solid fa-circle-check"></i> <strong>${data.attackerName}</strong> hits <strong>${data.defenderName}</strong>!` :
-        `<i class="fa-solid fa-shield-halved"></i> <strong>${data.defenderName}</strong> parries the attack!`
+          ${outcome === "shielded-hit"
+        ? `<i class="fa-solid fa-shield"></i> <strong>${data.attackerName}</strong> hits <strong>${data.defenderName}</strong>, but the shield blocked — apply armor DR + shield DR <strong>${data.shieldDamageReduction || 0}</strong>.`
+        : isAttackWin
+          ? `<i class="fa-solid fa-circle-check"></i> <strong>${data.attackerName}</strong> hits <strong>${data.defenderName}</strong>!`
+          : `<i class="fa-solid fa-shield-halved"></i> <strong>${data.defenderName}</strong> parries the attack!`
      }
        </div>
        ${damageButton}
--- a/packs-system/lf-equipment/000573.log
+++ b/packs-system/lf-equipment/000573.log
--- a/packs-system/lf-equipment/CURRENT
+++ b/packs-system/lf-equipment/CURRENT
@@ -1 +1 @@
-MANIFEST-000543
+MANIFEST-000571
--- a/packs-system/lf-equipment/LOG
+++ b/packs-system/lf-equipment/LOG
@@ -1,8 +1,8 @@
-2026/04/07-20:41:02.007080 7f6820dfe6c0 Recovering log #541
-2026/04/07-20:41:02.061052 7f6820dfe6c0 Delete type=3 #539
-2026/04/07-20:41:02.061103 7f6820dfe6c0 Delete type=0 #541
-2026/04/07-20:44:04.752043 7f656afef6c0 Level-0 table #546: started
-2026/04/07-20:44:04.752063 7f656afef6c0 Level-0 table #546: 0 bytes OK
-2026/04/07-20:44:04.788614 7f656afef6c0 Delete type=0 #544
-2026/04/07-20:44:04.864197 7f656afef6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2026/04/07-20:44:04.864237 7f656afef6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/04/17-23:19:16.304838 7fc1d9fbd6c0 Recovering log #569
+2026/04/17-23:19:16.314937 7fc1d9fbd6c0 Delete type=3 #567
+2026/04/17-23:19:16.314986 7fc1d9fbd6c0 Delete type=0 #569
+2026/04/17-23:21:33.253358 7fc1d8fbb6c0 Level-0 table #574: started
+2026/04/17-23:21:33.253399 7fc1d8fbb6c0 Level-0 table #574: 0 bytes OK
+2026/04/17-23:21:33.259366 7fc1d8fbb6c0 Delete type=0 #572
+2026/04/17-23:21:33.272517 7fc1d8fbb6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/04/17-23:21:33.272537 7fc1d8fbb6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-equipment/LOG.old
+++ b/packs-system/lf-equipment/LOG.old
@@ -1,8 +1,8 @@
-2026/02/06-21:03:10.117032 7f71b6ffd6c0 Recovering log #537
-2026/02/06-21:03:10.127068 7f71b6ffd6c0 Delete type=3 #535
-2026/02/06-21:03:10.127128 7f71b6ffd6c0 Delete type=0 #537
-2026/02/06-21:51:23.216143 7f71b67fc6c0 Level-0 table #542: started
-2026/02/06-21:51:23.216190 7f71b67fc6c0 Level-0 table #542: 0 bytes OK
-2026/02/06-21:51:23.251149 7f71b67fc6c0 Delete type=0 #540
-2026/02/06-21:51:23.327713 7f71b67fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2026/02/06-21:51:23.327750 7f71b67fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/04/17-15:59:28.854423 7fc1d9fbd6c0 Recovering log #565
+2026/04/17-15:59:28.865018 7fc1d9fbd6c0 Delete type=3 #563
+2026/04/17-15:59:28.865088 7fc1d9fbd6c0 Delete type=0 #565
+2026/04/17-17:32:42.752073 7fc1d8fbb6c0 Level-0 table #570: started
+2026/04/17-17:32:42.752102 7fc1d8fbb6c0 Level-0 table #570: 0 bytes OK
+2026/04/17-17:32:42.757979 7fc1d8fbb6c0 Delete type=0 #568
+2026/04/17-17:32:42.764071 7fc1d8fbb6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/04/17-17:32:42.764104 7fc1d8fbb6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-equipment/MANIFEST-000571
+++ b/packs-system/lf-equipment/MANIFEST-000571
--- a/packs-system/lf-gifts/000570.log
+++ b/packs-system/lf-gifts/000570.log
--- a/packs-system/lf-gifts/CURRENT
+++ b/packs-system/lf-gifts/CURRENT
@@ -1 +1 @@
-MANIFEST-000540
+MANIFEST-000568
--- a/packs-system/lf-gifts/LOG
+++ b/packs-system/lf-gifts/LOG
@@ -1,8 +1,8 @@
-2026/04/07-20:41:02.075476 7f67ebfff6c0 Recovering log #538
-2026/04/07-20:41:02.123121 7f67ebfff6c0 Delete type=3 #536
-2026/04/07-20:41:02.123187 7f67ebfff6c0 Delete type=0 #538
-2026/04/07-20:44:04.788736 7f656afef6c0 Level-0 table #543: started
-2026/04/07-20:44:04.788765 7f656afef6c0 Level-0 table #543: 0 bytes OK
-2026/04/07-20:44:04.826947 7f656afef6c0 Delete type=0 #541
-2026/04/07-20:44:04.864207 7f656afef6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
-2026/04/07-20:44:04.864245 7f656afef6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/04/17-23:19:16.318519 7fc1da7be6c0 Recovering log #566
+2026/04/17-23:19:16.328366 7fc1da7be6c0 Delete type=3 #564
+2026/04/17-23:19:16.328429 7fc1da7be6c0 Delete type=0 #566
+2026/04/17-23:21:33.266428 7fc1d8fbb6c0 Level-0 table #571: started
+2026/04/17-23:21:33.266454 7fc1d8fbb6c0 Level-0 table #571: 0 bytes OK
+2026/04/17-23:21:33.272429 7fc1d8fbb6c0 Delete type=0 #569
+2026/04/17-23:21:33.272532 7fc1d8fbb6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/04/17-23:21:33.272553 7fc1d8fbb6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-gifts/LOG.old
+++ b/packs-system/lf-gifts/LOG.old
@@ -1,8 +1,8 @@
-2026/02/06-21:03:10.133019 7f71b7fff6c0 Recovering log #534
-2026/02/06-21:03:10.144336 7f71b7fff6c0 Delete type=3 #532
-2026/02/06-21:03:10.144427 7f71b7fff6c0 Delete type=0 #534
-2026/02/06-21:51:23.291316 7f71b67fc6c0 Level-0 table #539: started
-2026/02/06-21:51:23.291356 7f71b67fc6c0 Level-0 table #539: 0 bytes OK
-2026/02/06-21:51:23.327518 7f71b67fc6c0 Delete type=0 #537
-2026/02/06-21:51:23.327733 7f71b67fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
-2026/02/06-21:51:23.327757 7f71b67fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/04/17-15:59:28.871085 7fc1dafbf6c0 Recovering log #562
+2026/04/17-15:59:28.880683 7fc1dafbf6c0 Delete type=3 #560
+2026/04/17-15:59:28.880729 7fc1dafbf6c0 Delete type=0 #562
+2026/04/17-17:32:42.744598 7fc1d8fbb6c0 Level-0 table #567: started
+2026/04/17-17:32:42.744627 7fc1d8fbb6c0 Level-0 table #567: 0 bytes OK
+2026/04/17-17:32:42.751972 7fc1d8fbb6c0 Delete type=0 #565
+2026/04/17-17:32:42.764061 7fc1d8fbb6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/04/17-17:32:42.764085 7fc1d8fbb6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-gifts/MANIFEST-000568
+++ b/packs-system/lf-gifts/MANIFEST-000568
--- a/packs-system/lf-skills/000575.log
+++ b/packs-system/lf-skills/000575.log
--- a/packs-system/lf-skills/CURRENT
+++ b/packs-system/lf-skills/CURRENT
@@ -1 +1 @@
-MANIFEST-000545
+MANIFEST-000573
--- a/packs-system/lf-skills/LOG
+++ b/packs-system/lf-skills/LOG
@@ -1,8 +1,8 @@
-2026/04/07-20:41:01.946718 7f67eb7fe6c0 Recovering log #543
-2026/04/07-20:41:01.999435 7f67eb7fe6c0 Delete type=3 #541
-2026/04/07-20:41:01.999504 7f67eb7fe6c0 Delete type=0 #543
-2026/04/07-20:44:04.712609 7f656afef6c0 Level-0 table #548: started
-2026/04/07-20:44:04.712651 7f656afef6c0 Level-0 table #548: 0 bytes OK
-2026/04/07-20:44:04.751939 7f656afef6c0 Delete type=0 #546
-2026/04/07-20:44:04.864184 7f656afef6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2026/04/07-20:44:04.864223 7f656afef6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/04/17-23:19:16.291897 7fc1dafbf6c0 Recovering log #571
+2026/04/17-23:19:16.301798 7fc1dafbf6c0 Delete type=3 #569
+2026/04/17-23:19:16.301852 7fc1dafbf6c0 Delete type=0 #571
+2026/04/17-23:21:33.247119 7fc1d8fbb6c0 Level-0 table #576: started
+2026/04/17-23:21:33.247158 7fc1d8fbb6c0 Level-0 table #576: 0 bytes OK
+2026/04/17-23:21:33.253108 7fc1d8fbb6c0 Delete type=0 #574
+2026/04/17-23:21:33.272508 7fc1d8fbb6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/04/17-23:21:33.272542 7fc1d8fbb6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-skills/LOG.old
+++ b/packs-system/lf-skills/LOG.old
@@ -1,8 +1,8 @@
-2026/02/06-21:03:10.101791 7f71b77fe6c0 Recovering log #539
-2026/02/06-21:03:10.111914 7f71b77fe6c0 Delete type=3 #537
-2026/02/06-21:03:10.111991 7f71b77fe6c0 Delete type=0 #539
-2026/02/06-21:51:23.251285 7f71b67fc6c0 Level-0 table #544: started
-2026/02/06-21:51:23.251325 7f71b67fc6c0 Level-0 table #544: 0 bytes OK
-2026/02/06-21:51:23.291180 7f71b67fc6c0 Delete type=0 #542
-2026/02/06-21:51:23.327724 7f71b67fc6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2026/02/06-21:51:23.327764 7f71b67fc6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/04/17-15:59:28.839432 7fc1da7be6c0 Recovering log #567
+2026/04/17-15:59:28.849242 7fc1da7be6c0 Delete type=3 #565
+2026/04/17-15:59:28.849292 7fc1da7be6c0 Delete type=0 #567
+2026/04/17-17:32:42.764151 7fc1d8fbb6c0 Level-0 table #572: started
+2026/04/17-17:32:42.764181 7fc1d8fbb6c0 Level-0 table #572: 0 bytes OK
+2026/04/17-17:32:42.770357 7fc1d8fbb6c0 Delete type=0 #570
+2026/04/17-17:32:42.789018 7fc1d8fbb6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/04/17-17:32:42.789049 7fc1d8fbb6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-skills/MANIFEST-000573
+++ b/packs-system/lf-skills/MANIFEST-000573
--- a/packs-system/lf-spells-miracles/000270.log
+++ b/packs-system/lf-spells-miracles/000270.log
--- a/packs-system/lf-spells-miracles/CURRENT
+++ b/packs-system/lf-spells-miracles/CURRENT
@@ -1 +1 @@
-MANIFEST-000240
+MANIFEST-000268
--- a/packs-system/lf-spells-miracles/LOG
+++ b/packs-system/lf-spells-miracles/LOG
@@ -1,8 +1,8 @@
-2026/04/07-20:41:02.201674 7f6820dfe6c0 Recovering log #238
-2026/04/07-20:41:02.254572 7f6820dfe6c0 Delete type=3 #236
-2026/04/07-20:41:02.254638 7f6820dfe6c0 Delete type=0 #238
-2026/04/07-20:44:04.827060 7f656afef6c0 Level-0 table #243: started
-2026/04/07-20:44:04.827088 7f656afef6c0 Level-0 table #243: 0 bytes OK
-2026/04/07-20:44:04.864062 7f656afef6c0 Delete type=0 #241
-2026/04/07-20:44:04.864215 7f656afef6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2026/04/07-20:44:04.864230 7f656afef6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/04/17-23:19:16.342745 7fc1d9fbd6c0 Recovering log #266
+2026/04/17-23:19:16.352598 7fc1d9fbd6c0 Delete type=3 #264
+2026/04/17-23:19:16.352656 7fc1d9fbd6c0 Delete type=0 #266
+2026/04/17-23:21:33.291630 7fc1d8fbb6c0 Level-0 table #271: started
+2026/04/17-23:21:33.291664 7fc1d8fbb6c0 Level-0 table #271: 0 bytes OK
+2026/04/17-23:21:33.297690 7fc1d8fbb6c0 Delete type=0 #269
+2026/04/17-23:21:33.297852 7fc1d8fbb6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/04/17-23:21:33.297866 7fc1d8fbb6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-spells-miracles/LOG.old
+++ b/packs-system/lf-spells-miracles/LOG.old
@@ -1,8 +1,8 @@
-2026/02/06-21:03:10.160494 7f71b6ffd6c0 Recovering log #234
-2026/02/06-21:03:10.170771 7f71b6ffd6c0 Delete type=3 #232
-2026/02/06-21:03:10.170846 7f71b6ffd6c0 Delete type=0 #234
-2026/02/06-21:51:23.435610 7f71b67fc6c0 Level-0 table #239: started
-2026/02/06-21:51:23.435649 7f71b67fc6c0 Level-0 table #239: 0 bytes OK
-2026/02/06-21:51:23.473038 7f71b67fc6c0 Delete type=0 #237
-2026/02/06-21:51:23.473211 7f71b67fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2026/02/06-21:51:23.473250 7f71b67fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/04/17-15:59:28.899464 7fc1d97bc6c0 Recovering log #262
+2026/04/17-15:59:28.910004 7fc1d97bc6c0 Delete type=3 #260
+2026/04/17-15:59:28.910074 7fc1d97bc6c0 Delete type=0 #262
+2026/04/17-17:32:42.770457 7fc1d8fbb6c0 Level-0 table #267: started
+2026/04/17-17:32:42.770479 7fc1d8fbb6c0 Level-0 table #267: 0 bytes OK
+2026/04/17-17:32:42.777091 7fc1d8fbb6c0 Delete type=0 #265
+2026/04/17-17:32:42.789028 7fc1d8fbb6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/04/17-17:32:42.789054 7fc1d8fbb6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-spells-miracles/MANIFEST-000268
+++ b/packs-system/lf-spells-miracles/MANIFEST-000268
--- a/packs-system/lf-vulnerabilities/000569.log
+++ b/packs-system/lf-vulnerabilities/000569.log
--- a/packs-system/lf-vulnerabilities/CURRENT
+++ b/packs-system/lf-vulnerabilities/CURRENT
@@ -1 +1 @@
-MANIFEST-000539
+MANIFEST-000567
--- a/packs-system/lf-vulnerabilities/LOG
+++ b/packs-system/lf-vulnerabilities/LOG
@@ -1,8 +1,8 @@
-2026/04/07-20:41:02.136268 7f67eb7fe6c0 Recovering log #537
-2026/04/07-20:41:02.189277 7f67eb7fe6c0 Delete type=3 #535
-2026/04/07-20:41:02.189349 7f67eb7fe6c0 Delete type=0 #537
-2026/04/07-20:44:04.864322 7f656afef6c0 Level-0 table #542: started
-2026/04/07-20:44:04.864350 7f656afef6c0 Level-0 table #542: 0 bytes OK
-2026/04/07-20:44:04.894847 7f656afef6c0 Delete type=0 #540
-2026/04/07-20:44:05.055029 7f656afef6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2026/04/07-20:44:05.055068 7f656afef6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/04/17-23:19:16.330906 7fc1dafbf6c0 Recovering log #565
+2026/04/17-23:19:16.340561 7fc1dafbf6c0 Delete type=3 #563
+2026/04/17-23:19:16.340605 7fc1dafbf6c0 Delete type=0 #565
+2026/04/17-23:21:33.259495 7fc1d8fbb6c0 Level-0 table #570: started
+2026/04/17-23:21:33.259518 7fc1d8fbb6c0 Level-0 table #570: 0 bytes OK
+2026/04/17-23:21:33.266305 7fc1d8fbb6c0 Delete type=0 #568
+2026/04/17-23:21:33.272525 7fc1d8fbb6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/04/17-23:21:33.272548 7fc1d8fbb6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-vulnerabilities/LOG.old
+++ b/packs-system/lf-vulnerabilities/LOG.old
@@ -1,8 +1,8 @@
-2026/02/06-21:03:10.146976 7f71b77fe6c0 Recovering log #533
-2026/02/06-21:03:10.156549 7f71b77fe6c0 Delete type=3 #531
-2026/02/06-21:03:10.156610 7f71b77fe6c0 Delete type=0 #533
-2026/02/06-21:51:23.327858 7f71b67fc6c0 Level-0 table #538: started
-2026/02/06-21:51:23.327892 7f71b67fc6c0 Level-0 table #538: 0 bytes OK
-2026/02/06-21:51:23.359727 7f71b67fc6c0 Delete type=0 #536
-2026/02/06-21:51:23.473179 7f71b67fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2026/02/06-21:51:23.473221 7f71b67fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/04/17-15:59:28.886104 7fc1da7be6c0 Recovering log #561
+2026/04/17-15:59:28.896104 7fc1da7be6c0 Delete type=3 #559
+2026/04/17-15:59:28.896157 7fc1da7be6c0 Delete type=0 #561
+2026/04/17-17:32:42.758102 7fc1d8fbb6c0 Level-0 table #566: started
+2026/04/17-17:32:42.758128 7fc1d8fbb6c0 Level-0 table #566: 0 bytes OK
+2026/04/17-17:32:42.763950 7fc1d8fbb6c0 Delete type=0 #564
+2026/04/17-17:32:42.764079 7fc1d8fbb6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/04/17-17:32:42.764099 7fc1d8fbb6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-vulnerabilities/MANIFEST-000567
+++ b/packs-system/lf-vulnerabilities/MANIFEST-000567
--- a/styles/hud.less
+++ b/styles/hud.less
@@ -88,3 +88,249 @@
  padding-left: 8px;
  font-size: 0.9rem;
 }
+
+/* -------------------------------------------------- */
+/* Dice Tray — injected into the Foundry chat sidebar */
+/* -------------------------------------------------- */
+
+.lf-dice-tray {
+  padding: 6px 8px;
+  background:
+    linear-gradient(135deg, rgba(245, 232, 200, 0.97) 0%, rgba(238, 222, 185, 0.97) 100%),
+    url("/systems/fvtt-lethal-fantasy/assets/ui/lethal_fantasy_background.webp") center / cover;
+  border-top: 2px solid rgba(139, 69, 19, 0.5);
+  border-bottom: 1px solid rgba(139, 69, 19, 0.25);
+  width: 100%;
+  box-sizing: border-box;
+  pointer-events: all;
+
+  .lf-dt-row {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    flex-wrap: wrap;
+  }
+
+  .lf-dt-label {
+    color: #3a2a10;
+    font-size: 15px;
+    flex-shrink: 0;
+    opacity: 0.7;
+  }
+
+  .lf-dt-count {
+    width: 44px;
+    flex-shrink: 0;
+    padding: 3px 4px;
+    background: rgba(139, 69, 19, 0.15);
+    border: 1px solid rgba(139, 69, 19, 0.45);
+    border-radius: 4px;
+    color: #2a1a08;
+    font-size: 11px;
+    font-weight: 700;
+    cursor: pointer;
+    text-align: center;
+
+    option { background: #f5ead0; color: #2a1a08; }
+
+    &:focus {
+      outline: none;
+      border-color: rgba(139, 69, 19, 0.7);
+      box-shadow: 0 0 4px rgba(139, 69, 19, 0.25);
+    }
+  }
+
+  .lf-dt-dice {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 3px;
+    flex: 1;
+  }
+
+  .lf-dt-die-btn {
+    padding: 3px 7px;
+    background: rgba(139, 69, 19, 0.15);
+    border: 1px solid rgba(139, 69, 19, 0.4);
+    border-radius: 4px;
+    color: #2a1a08;
+    font-size: 10px;
+    font-weight: 700;
+    cursor: pointer;
+    transition: background 0.15s, border-color 0.15s, box-shadow 0.15s, transform 0.1s;
+    line-height: 1.5;
+    letter-spacing: 0.3px;
+
+    &:hover {
+      background: rgba(139, 69, 19, 0.35);
+      border-color: rgba(139, 69, 19, 0.7);
+      color: #5a2a00;
+      box-shadow: 0 0 5px rgba(139, 69, 19, 0.3);
+      transform: translateY(-1px);
+    }
+
+    &:active {
+      transform: translateY(0);
+      box-shadow: none;
+      background: rgba(139, 69, 19, 0.5);
+    }
+  }
+
+  .lf-dt-explode-label {
+    display: flex;
+    align-items: center;
+    gap: 3px;
+    cursor: pointer;
+    color: rgba(160, 80, 20, 0.7);
+    font-size: 14px;
+    flex-shrink: 0;
+    padding: 3px 6px;
+    border: 1px solid transparent;
+    border-radius: 4px;
+    transition: color 0.15s, border-color 0.15s, background 0.15s;
+
+    &:hover {
+      color: rgba(200, 100, 30, 0.9);
+      border-color: rgba(139, 69, 19, 0.45);
+      background: rgba(139, 69, 19, 0.12);
+    }
+
+    input[type="checkbox"] {
+      appearance: none;
+      width: 0;
+      height: 0;
+      position: absolute;
+      opacity: 0;
+
+      &:checked ~ i {
+        color: #cc4400;
+        filter: drop-shadow(0 0 4px rgba(200, 80, 0, 0.6));
+      }
+    }
+
+    &:has(input:checked) {
+      color: #cc4400;
+      border-color: rgba(139, 69, 19, 0.55);
+      background: rgba(139, 60, 10, 0.2);
+    }
+  }
+}
+
+/* Free roll chat card — styled to match regular system roll cards */
+.lf-free-roll-card {
+  border-radius: 6px;
+  overflow: hidden;
+
+  .lf-frc-header {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    padding: 6px 8px;
+    background: linear-gradient(135deg, rgba(40, 30, 20, 0.7) 0%, rgba(30, 22, 15, 0.9) 100%);
+    border-bottom: 2px solid rgba(139, 69, 19, 0.4);
+
+    i { color: #c9b896; font-size: calc(var(--font-size-standard, 14px) * 1.1); }
+
+    .lf-frc-title-text {
+      font-size: calc(var(--font-size-standard, 14px) * 0.85);
+      color: #c9b896;
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+    }
+
+    .lf-frc-badge {
+      display: inline-flex;
+      align-items: center;
+      padding: 2px 8px;
+      background: rgba(139, 69, 19, 0.3);
+      border: 1px solid rgba(139, 69, 19, 0.5);
+      border-radius: 10px;
+      font-size: calc(var(--font-size-standard, 14px) * 0.85);
+      font-weight: 600;
+      color: #d4c5a9;
+    }
+  }
+
+  .lf-frc-dice {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 4px;
+    padding: 6px 8px;
+    background: rgba(0, 0, 0, 0.15);
+    border: 1px solid rgba(139, 69, 19, 0.3);
+    border-top: none;
+
+    .lf-frc-die-chip {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      padding: 3px 8px;
+      background: rgba(139, 69, 19, 0.2);
+      border: 1px solid rgba(139, 69, 19, 0.3);
+      border-radius: 4px;
+
+      .lf-frc-die-type {
+        font-size: calc(var(--font-size-standard, 14px) * 0.85);
+        font-weight: 600;
+        color: #2a2a1a;
+        text-transform: uppercase;
+      }
+
+      .lf-frc-die-sep {
+        color: rgba(0, 0, 0, 0.35);
+        font-weight: 300;
+        font-size: calc(var(--font-size-standard, 14px) * 0.8);
+      }
+
+      .lf-frc-die-val {
+        font-weight: bold;
+        color: #ffd700;
+        font-size: calc(var(--font-size-standard, 14px) * 0.95);
+
+        .lf-dt-explode-icon {
+          font-size: 8px;
+          color: #ffcc00;
+          margin-left: 2px;
+          vertical-align: super;
+          text-shadow: 0 0 4px rgba(255, 200, 0, 0.8);
+        }
+      }
+
+      &.lf-frc-max {
+        background: rgba(139, 90, 19, 0.35);
+        border-color: rgba(200, 116, 42, 0.6);
+        .lf-frc-die-val { color: #ff9a40; text-shadow: 0 0 6px rgba(200, 116, 42, 0.6); }
+      }
+
+      &.lf-frc-min {
+        background: rgba(139, 20, 20, 0.25);
+        border-color: rgba(139, 34, 34, 0.5);
+        .lf-frc-die-val { color: #ff6b6b; }
+      }
+    }
+  }
+
+  .lf-frc-total-bar {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    padding: 6px 10px;
+    background: linear-gradient(135deg, rgba(40, 30, 20, 0.6) 0%, rgba(20, 15, 10, 0.8) 100%);
+    border: 2px solid rgba(139, 69, 19, 0.5);
+
+    .lf-frc-total-label {
+      font-size: calc(var(--font-size-standard, 14px) * 0.85);
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+      color: #c9b896;
+    }
+
+    .lf-frc-total-value {
+      font-family: var(--font-primary, serif);
+      font-size: calc(var(--font-size-standard, 14px) * 1.6);
+      font-weight: bold;
+      color: #e8d5a0;
+      text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.8);
+    }
+  }
+}
--- a/styles/roll.less
+++ b/styles/roll.less
@@ -467,7 +467,7 @@
        .d30-label {
          flex-grow: 1;
          font-weight: bold;
-          color: #e0d5f0;
+          color: #2a1a3a;
          text-transform: uppercase;
          letter-spacing: 0.5px;
          font-size: calc(var(--font-size-standard) * 0.9);
@@ -477,11 +477,11 @@
          font-family: var(--font-primary);
          font-size: calc(var(--font-size-standard) * 1.5);
          font-weight: bold;
-          color: #ff69b4;
-          background: rgba(255, 105, 180, 0.1);
+          color: #3d006e;
+          background: rgba(255, 255, 255, 0.35);
          padding: 4px 12px;
          border-radius: 12px;
-          border: 1px solid rgba(255, 105, 180, 0.3);
+          border: 1px solid rgba(138, 43, 226, 0.4);
        }
      }

--- a/templates/chat-message.hbs
+++ b/templates/chat-message.hbs
@@ -239,7 +239,7 @@
      <div class="damage-result auto-applied">
        <div class="auto-damage-notice">
          <i class="fa-solid fa-check-circle"></i>
-          <span>Damage automatically applied to defender (with Armor DR)</span>
+          <span>Damage automatically applied to defender (with damage reduction)</span>
        </div>
      </div>
    {{else}}
--- a/templates/combat-tracker-footer-v2.hbs
+++ b/templates/combat-tracker-footer-v2.hbs
@@ -3,7 +3,7 @@

    {{!-- GM Controls --}}
    {{#if user.isGM}}
-    {{#if combat.round}}
+    {{#if (or combat.round (eq combat.turn 0))}}
    <!-- <button type="button" class="inline-control combat-control icon fa-solid fa-backward-step"
            data-action="previousRound" data-tooltip aria-label="{{ localize "COMBAT.RoundPrev" }}"></button>
    <button type="button" class="inline-control combat-control icon fa-solid fa-arrow-left" data-action="previousTurn"
--- a/templates/combat-tracker-header-v2.hbs
+++ b/templates/combat-tracker-header-v2.hbs
@@ -70,7 +70,7 @@
        {{!-- Combat Status --}}
        <strong class="encounter-title">
            {{#if combats.length}}
-            {{#if combat.round}}
+            {{#if (or combat.round (eq combat.turn 0))}}
            {{ localize "COMBAT.Round" round=combat.round }}
            {{else}}
            {{ localize "COMBAT.NotStarted" }}
--- a/templates/spell.hbs
+++ b/templates/spell.hbs
@@ -30,6 +30,7 @@
  {{formField systemFields.savingThrow value=system.savingThrow}}
  {{formField systemFields.extraAetherPoints value=system.extraAetherPoints}}
  {{formField systemFields.criticalType value=system.criticalType}}
+  {{formField systemFields.damageDice value=system.damageDice}}


  <fieldset>
Author	SHA1	Message	Date
LeRatierBretonnier	b8174d5e22	Fix E dice in dice Tray All checks were successful Release Creation / build (release) Successful in 55s Details	2026-04-17 23:21:49 +02:00
LeRatierBretonnier	7f15450566	Add specific diceTray and enhance message styles All checks were successful Release Creation / build (release) Successful in 49s Details	2026-04-17 17:32:46 +02:00
LeRatierBretonnier	28fdaff2ec	Add specific diceTray and enhance message styles	2026-04-17 17:32:32 +02:00
LeRatierBretonnier	81584ed5d6	Update D30 descriptions and add simple shield option for NPCs	2026-04-16 23:42:24 +02:00
LeRatierBretonnier	8c9a13faf1	Fixes around D30 managemen	2026-04-16 21:39:51 +02:00
LeRatierBretonnier	6c6c473147	Fixes regarding shields usage and spells All checks were successful Release Creation / build (release) Successful in 52s Details	2026-04-14 21:31:17 +02:00
LeRatierBretonnier	2e2a917a45	Fixes regarding shields usage and spells	2026-04-14 21:31:03 +02:00
LeRatierBretonnier	343abc32e2	FIx init à 1 again All checks were successful Release Creation / build (release) Successful in 50s Details	2026-04-12 11:08:19 +02:00
LeRatierBretonnier	c37d92af25	Various initiative fixes + shield management messages All checks were successful Release Creation / build (release) Successful in 46s Details	2026-04-12 01:07:58 +02:00