Other fixes for damage buttons from chat

css/fvtt-lethal-fantasy.css

@@ -2027,9 +2027,12 @@ i.lethalfantasy {
   background: #4a4940 !important;
   color: #ffffff !important;
 }
+.lethalfantasy .grit-luck-dialog {
+  color: var(--color-text-dark-primary, #191813);
+}
 .lethalfantasy .grit-luck-dialog .combat-status {
   padding: 12px;
-  background: linear-gradient(to bottom, rgba(42, 41, 32, 0.8) 0%, rgba(26, 25, 16, 0.9) 100%);
+  background: linear-gradient(to bottom, rgba(42, 41, 32, 0.88) 0%, rgba(26, 25, 16, 0.95) 100%);
   border: 1px solid rgba(212, 175, 55, 0.5);
   border-radius: 6px;
   margin-bottom: 16px;
@@ -2049,11 +2052,25 @@ i.lethalfantasy {
   margin-top: 8px;
 }
 .lethalfantasy .grit-luck-dialog .offer-text {
-  color: #f0e6d2;
+  color: var(--color-text-dark-primary, #191813);
   font-size: calc(var(--font-size-standard) * 1);
   text-align: center;
   font-weight: 600;
+  margin: 0 0 8px 0;
+}
+.lethalfantasy .grit-luck-dialog .shield-warning {
+  color: #7a4000;
+  background: rgba(255, 160, 0, 0.12);
+  border: 1px solid rgba(255, 160, 0, 0.4);
+  border-radius: 5px;
+  font-size: calc(var(--font-size-standard) * 0.88);
+  padding: 6px 10px;
   margin: 0;
+  text-align: center;
+}
+.lethalfantasy .grit-luck-dialog .shield-warning i {
+  color: #c07000;
+  margin-right: 5px;
 }
 .lethalfantasy .attack-result {
   padding: 16px;
@@ -2144,31 +2161,66 @@ i.lethalfantasy {
   color: #d4af37;
 }
 .lethalfantasy .attack-result .attack-result-damage {
-  display: flex;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
   gap: 8px;
-  justify-content: center;
+}
+.lethalfantasy .attack-result .attack-result-damage.single-btn {
+  grid-template-columns: 1fr;
+  max-width: 280px;
+  margin: 0 auto;
+}
+.lethalfantasy .attack-result .attack-result-damage.spell-damage {
+  grid-template-columns: 1fr;
+  width: 100%;
 }
 .lethalfantasy .attack-result .attack-result-damage .roll-damage-btn {
-  padding: 10px 16px;
+  padding: 10px 14px;
   background: linear-gradient(to bottom, #8b0000 0%, #660000 100%);
-  border: 1px solid #ff0000;
+  border: 1px solid #4b0000;
   border-radius: 6px;
   color: #f0e6d2;
   font-weight: 600;
+  font-size: calc(var(--font-size-standard) * 0.9);
+  text-align: center;
+  white-space: nowrap;
   cursor: pointer;
   transition: all 0.2s ease;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.4), inset 0 1px 0 rgba(255, 255, 255, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  position: relative;
+  overflow: hidden;
+}
+.lethalfantasy .attack-result .attack-result-damage .roll-damage-btn::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: -100%;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.15), transparent);
+  transition: left 0.5s;
+}
+.lethalfantasy .attack-result .attack-result-damage .roll-damage-btn:hover::before {
+  left: 100%;
+}
+.lethalfantasy .attack-result .attack-result-damage .roll-damage-btn i {
+  font-size: calc(var(--font-size-standard) * 1.1);
+  filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.5));
+  flex-shrink: 0;
 }
 .lethalfantasy .attack-result .attack-result-damage .roll-damage-btn:hover {
   background: linear-gradient(to bottom, #a00000 0%, #7b0000 100%);
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.4);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.15);
   transform: translateY(-2px);
+  border-color: #5b0000;
 }
 .lethalfantasy .attack-result .attack-result-damage .roll-damage-btn:active {
   transform: translateY(0);
-}
-.lethalfantasy .attack-result .attack-result-damage .roll-damage-btn i {
-  margin-right: 6px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4), inset 0 1px 3px rgba(0, 0, 0, 0.3);
 }
 .lethalfantasy .equipment-content {
   font-family: var(--font-primary);
@@ -2634,6 +2686,21 @@ i.lethalfantasy {
   max-width: 8rem;
   margin-left: 1rem;
 }
+.dialog-warning {
+  margin: 0.4rem 0.2rem 0.2rem;
+  padding: 0.35rem 0.5rem;
+  border-left: 3px solid #c8941a;
+  background: rgba(200, 148, 26, 0.12);
+  border-radius: 3px;
+  font-family: var(--font-secondary);
+  font-size: calc(var(--font-size-standard) * 0.9);
+  color: #7a5400;
+  line-height: 1.4;
+}
+.dialog-warning i {
+  color: #c8941a;
+  margin-right: 0.4rem;
+}
 .lethalfantasy.dice-roll,
 .fvtt-lethal-fantasy.dice-roll,
 .message.lethalfantasy.dice-roll,
@@ -3928,35 +3995,74 @@ i.lethalfantasy {
 }
 .message .attack-result .attack-result-damage,
 .attack-result .attack-result-damage {
-  display: flex;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
   gap: 8px;
-  justify-content: center;
+}
+.message .attack-result .attack-result-damage.single-btn,
+.attack-result .attack-result-damage.single-btn {
+  grid-template-columns: 1fr;
+  max-width: 280px;
+  margin: 0 auto;
+}
+.message .attack-result .attack-result-damage.spell-damage,
+.attack-result .attack-result-damage.spell-damage {
+  grid-template-columns: 1fr;
+  width: 100%;
 }
 .message .attack-result .attack-result-damage .roll-damage-btn,
 .attack-result .attack-result-damage .roll-damage-btn {
-  padding: 10px 16px;
+  padding: 10px 14px;
   background: linear-gradient(to bottom, #8b0000 0%, #660000 100%);
-  border: 1px solid #ff0000;
+  border: 1px solid #4b0000;
   border-radius: 6px;
   color: #f0e6d2;
   font-weight: 600;
+  font-size: calc(var(--font-size-standard) * 0.9);
+  text-align: center;
+  white-space: nowrap;
   cursor: pointer;
   transition: all 0.2s ease;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.4), inset 0 1px 0 rgba(255, 255, 255, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  position: relative;
+  overflow: hidden;
+}
+.message .attack-result .attack-result-damage .roll-damage-btn::before,
+.attack-result .attack-result-damage .roll-damage-btn::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: -100%;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.15), transparent);
+  transition: left 0.5s;
+}
+.message .attack-result .attack-result-damage .roll-damage-btn:hover::before,
+.attack-result .attack-result-damage .roll-damage-btn:hover::before {
+  left: 100%;
+}
+.message .attack-result .attack-result-damage .roll-damage-btn i,
+.attack-result .attack-result-damage .roll-damage-btn i {
+  font-size: calc(var(--font-size-standard) * 1.1);
+  filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.5));
+  flex-shrink: 0;
 }
 .message .attack-result .attack-result-damage .roll-damage-btn:hover,
 .attack-result .attack-result-damage .roll-damage-btn:hover {
   background: linear-gradient(to bottom, #a00000 0%, #7b0000 100%);
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.4);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.15);
   transform: translateY(-2px);
+  border-color: #5b0000;
 }
 .message .attack-result .attack-result-damage .roll-damage-btn:active,
 .attack-result .attack-result-damage .roll-damage-btn:active {
   transform: translateY(0);
-}
-.message .attack-result .attack-result-damage .roll-damage-btn i,
-.attack-result .attack-result-damage .roll-damage-btn i {
-  margin-right: 6px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4), inset 0 1px 3px rgba(0, 0, 0, 0.3);
 }
 #token-hud .hp-loss-wrap {
   position: absolute;

lang/en.json

@@ -507,7 +507,40 @@
       "weapon-damage-small": "Weapon damage small",
       "combatProgressionStart": "Combat start threshold",
       "miracle": "Miracle",
-      "titleStandard": "Standard Roll"
+      "titleStandard": "Standard Roll",
+      "privateRoll": "Private Roll",
+      "current": "Current",
+      "max": "Max",
+      "speed": "Speed",
+      "bonuses": "Bonuses",
+      "handToHandAttacks": "Hand To Hand Attacks",
+      "beyondSkill": "Beyond Skill",
+      "letItFly": "Let It Fly!",
+      "class": "Class",
+      "mortal": "Mortal",
+      "alignment": "Alignment",
+      "age": "Age",
+      "height": "Height",
+      "weight": "Weight",
+      "eyes": "Eyes",
+      "hair": "Hair",
+      "magicUser": "Magic User",
+      "clericUser": "Cleric User",
+      "lastHdRoll": "Last HD roll",
+      "naturalDR": "Natural DR",
+      "magicalDR": "Magical DR",
+      "saveBonus": "Save bonus (1/5 levels)",
+      "spellBonus": "Spell bonus (1/5 levels)",
+      "miracleBonus": "Miracle bonus (1/5 levels)",
+      "devPointsTotal": "Dev. Points (Total)",
+      "devPointsRem": "Dev. Points (Rem.)",
+      "length": "Length",
+      "vision": "Vision",
+      "damageType": "Damage Type",
+      "components": "Components",
+      "coverRanged": "Cover vs ranged attacks",
+      "standing": "Standing",
+      "crouching": "Crouching"
     },
     "Miracle": {
       "FIELDS": {
@@ -563,6 +596,15 @@
         },
         "savingThrow": {
           "label": "Saving throw"
+        },
+        "damageDiceOverpowered": {
+          "label": "Overpowered Damage Dice"
+        },
+        "damageDiceOverpowered2": {
+          "label": "Overpowered 2 Damage Dice"
+        },
+        "damageDice": {
+          "label": "Damage Dice"
         }
       }
     },
@@ -684,7 +726,8 @@
             "label": "Min"
           }
         }
-      }
+      },
+      "autoDestruction": "Auto-Destruction"
     },
     "Skill": {
       "Category": {
@@ -809,6 +852,12 @@
         },
         "damageDice": {
           "label": "Damage dice"
+        },
+        "damageDiceOverpowered": {
+          "label": "Overpowered Damage Dice"
+        },
+        "damageDiceOverpowered2": {
+          "label": "Overpowered 2 Damage Dice"
         }
       },
       "Range": {
@@ -843,7 +892,9 @@
         }
       }
     },
-    "Warning": {},
+    "Warning": {
+      "defenseShieldOrder": "To avoid a hit without using the shield, roll Grit or Luck first — then roll the shield."
+    },
     "Weapon": {
       "FIELDS": {
         "isAgile": {
@@ -989,7 +1040,16 @@
       "progressionCount": "Progression count:"
     },
     "Combat": {
-      "RollMonsters": "Roll Monsters"
+      "RollMonsters": "Roll Monsters",
+      "monstersNotRolledTitle": "Monsters Not Rolled",
+      "monstersNotRolledMsg": "Monsters have not rolled this second. Proceed anyway?",
+      "proceedYes": "Proceed",
+      "proceedNo": "Cancel",
+      "spellDRDialogTitle": "Spell Damage — Apply DR?",
+      "spellDRDialogMsg": "Enter a damage reduction value to subtract, or click No DR to apply full damage.",
+      "spellDRLabel": "DR:",
+      "spellNoDR": "No DR",
+      "spellApplyDR": "Apply DR"
     },
     "EquipmentCategories": {
       "ClassKit": "Class Kit",

lethal-fantasy.mjs

@@ -230,9 +230,15 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
       const weaponName = message.rolls[0]?.rollName || "weapon"
       const attackRoll = message.rolls[0]?.rollTotal || 0
       const defenderName = combatant.name
-      const attackWeaponId = message.rolls[0]?.rollTarget?.weapon?.id || message.rolls[0]?.rollTarget?.weapon?._id
       const attackRollType = message.rolls[0]?.type
-      const attackRollKey = message.rolls[0]?.rollTarget?.rollKey
+      const rollTargetData = message.rolls[0]?.rollTarget
+      // For spell/miracle attacks, rollTarget IS the spell item (serialised as its data object).
+      // For weapon attacks, rollTarget is a plain skill+weapon object and weapon.id is the weapon.
+      const isSpellMiracleAttack = attackRollType === "spell-attack" || attackRollType === "miracle-attack"
+      const attackWeaponId = isSpellMiracleAttack
+        ? (rollTargetData?._id || rollTargetData?.id)
+        : (rollTargetData?.weapon?.id || rollTargetData?.weapon?._id)
+      const attackRollKey = rollTargetData?.rollKey
       console.log(`[LF] request-defense-btn | attackRollType=${attackRollType} defender=${defenderName} defenderType=${combatant.actor?.type}`)
       const attackD30result = message.rolls[0]?.options?.D30result || null
       const attackD30message = message.rolls[0]?.options?.D30message || null
@@ -339,29 +345,55 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
         return
       }
 
-      // Pour les sorts, rouler les dés de dégâts avec option bypass DR
+      // Pour les sorts, rouler les dés de dégâts avec DR manuelle optionnelle
       if (damageType === "spell" && damageFormula) {
-        const bypassArmor = await foundry.applications.api.DialogV2.confirm({
-          window: { title: "Spell Damage" },
+        const manualDR = await foundry.applications.api.DialogV2.wait({
+          window: { title: game.i18n.localize("LETHALFANTASY.Combat.spellDRDialogTitle") },
           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" }
+          position: { width: 320 },
+          content: `<div style="padding:0.5rem 0">
+            <p style="margin-bottom:0.6rem">${game.i18n.localize("LETHALFANTASY.Combat.spellDRDialogMsg")}</p>
+            <div style="display:flex;align-items:center;gap:0.5rem">
+              <label style="font-weight:bold">${game.i18n.localize("LETHALFANTASY.Combat.spellDRLabel")}</label>
+              <input type="number" name="manualDr" value="0" min="0" style="width:5rem"/>
+            </div>
+          </div>`,
+          buttons: [
+            {
+              action: "noDR",
+              label: game.i18n.localize("LETHALFANTASY.Combat.spellNoDR"),
+              icon: "fa-solid fa-wand-magic-sparkles",
+              callback: () => 0
+            },
+            {
+              action: "applyDR",
+              label: game.i18n.localize("LETHALFANTASY.Combat.spellApplyDR"),
+              icon: "fa-solid fa-shield",
+              callback: (event, button) => Number(button.form?.elements?.manualDr?.value) || 0
+            },
+            {
+              action: "cancel",
+              label: game.i18n.localize("LETHALFANTASY.Combat.proceedNo"),
+              callback: () => null
+            }
+          ],
+          rejectClose: false
         })
+        if (manualDR === null) return
         const rollOpts = {
           type: "spell-damage",
           rollType: "spell-damage",
           rollName: damageFormula,
           isDamage: true,
           rollData: { isDamage: true },
-          bypassArmor: bypassArmor ?? false,
+          manualDR: manualDR,
           defenderId,
           defenderTokenId,
           actorId: actor.id,
           actorName: actor.name,
           actorImage: actor.img
         }
-        const roll = new LethalFantasyRoll(damageFormula, {}, rollOpts)
+        const roll = new documents.LethalFantasyRoll(damageFormula, {}, rollOpts)
         await roll.evaluate()
         roll.options.rollTotal = roll.total
         if (game?.dice3d) await game.dice3d.showForRoll(roll, game.user, true)
@@ -376,7 +408,7 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
       }
 
       // Pour les monstres, utiliser prepareMonsterRoll
-      if (isMonster || actor.type === "monster") {
+      if (isMonster === "true" || actor.type === "monster") {
         await actor.system.prepareMonsterRoll("monster-damage", weaponId, undefined, undefined, damageModifier)
         return
       }
@@ -922,12 +954,14 @@ Hooks.on("createChatMessage", async (message) => {
   const damageTotal = message.rolls[0]?.options?.rollTotal || message.rolls[0]?.total || 0
   const weaponName = message.rolls[0]?.options?.rollName || "Unknown Weapon"
   const attackerName = message.rolls[0]?.options?.actorName || "Unknown Attacker"
+  const rollType = message.rolls[0]?.options?.rollType
 
-  // Calculer les DR
-  const bypassArmor = message.rolls[0]?.options?.bypassArmor || false
-  const armorDR = bypassArmor ? 0 : (defender.computeDamageReduction() || 0)
+  // Calculer les DR — les sorts utilisent une DR manuelle saisie par l'utilisateur
+  const isSpellDamage = rollType === "spell-damage"
+  const manualDR = message.rolls[0]?.options?.manualDR ?? 0
   const extraShieldDr = Number(message.rolls[0]?.options?.extraShieldDr) || 0
-  const totalDR = armorDR + extraShieldDr
+  const armorDR = isSpellDamage ? manualDR : (defender.computeDamageReduction() || 0)
+  const totalDR = isSpellDamage ? manualDR : 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).
@@ -960,7 +994,9 @@ Hooks.on("createChatMessage", async (message) => {
     {
       targetName: defender.name,
       damage: finalDamage,
-      drText: bypassArmor ? "Armor DR bypassed (spell)" : (totalDR > 0 ? `Armor DR: ${armorDR}${extraShieldDr > 0 ? ` + Shield DR: ${extraShieldDr}` : ""}` : ""),
+      drText: isSpellDamage
+        ? (manualDR > 0 ? `Spell DR: ${manualDR}` : "No DR applied")
+        : (totalDR > 0 ? `Armor DR: ${armorDR}${extraShieldDr > 0 ? ` + Shield DR: ${extraShieldDr}` : ""}` : ""),
       weaponName: weaponName,
       attackerName: attackerName,
       rawDamage: damageTotal

module/applications/combat.mjs

@@ -119,18 +119,12 @@ export class LethalFantasyCombat extends Combat {
   }
 
   async rollInitiative(ids, options) {
-    console.log("%%%%%%%%% Roll Initiative", ids, options);
-
     ids = typeof ids === "string" ? [ids] : ids;
-    let messages = [];
-    let rollMode = game.settings.get("core", "rollMode");
 
-    let updates = [];
     for (let cId of ids) {
       const c = this.combatants.get(cId);
       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", userId: playerOwner.id, actorId: c.actor.id, combatId: this.id, combatantId: c.id });
       } else {
         await c.actor.system.rollInitiative(this.id, c.id);
@@ -165,6 +159,8 @@ export class LethalFantasyCombat extends Combat {
       } else {
         ui.notifications.info(`No monsters act yet — earliest monster initiative is ${earliest} (current round: ${currentRound}).`);
       }
+    } else {
+      this._monsterProgressionRolledRound = currentRound;
     }
   }
 
@@ -189,15 +185,12 @@ export class LethalFantasyCombat extends Combat {
   }
 
   async nextTurn() {
-    console.log("NEXT TURN");
-
     let turn = this.turn ?? -1;
     let skipDefeated = this.settings.skipDefeated;
 
     // Determine the next turn number
     let next = null;
     for (let [i, t] of this.turns.entries()) {
-      console.log("Turn", t);
       if (i <= turn) continue;
       if (skipDefeated && t.isDefeated) continue;
       next = i;
@@ -221,7 +214,6 @@ export class LethalFantasyCombat extends Combat {
     this.turnsDone = false
 
     let turn = this.turn === null ? null : 0; // Preserve the fact that it's no-one's turn currently.
-    console.log("ROUND", this);
 
     let advanceTime = Math.max(this.turns.length - this.turn, 0) * CONFIG.time.turnTime;
     advanceTime += CONFIG.time.roundTime;
@@ -239,6 +231,21 @@ export class LethalFantasyCombat extends Combat {
       return this;
     }
 
+    // Warn if eligible monsters have not rolled progression dice this round
+    const eligibleMonsters = this.combatants.filter(
+      c => c.actor?.type === "monster" && !c.isDefeated && c.initiative !== null && this.round >= c.initiative
+    );
+    if (eligibleMonsters.length > 0 && this._monsterProgressionRolledRound !== this.round) {
+      const proceed = await foundry.applications.api.DialogV2.confirm({
+        window: { title: game.i18n.localize("LETHALFANTASY.Combat.monstersNotRolledTitle") },
+        content: `<p>${game.i18n.localize("LETHALFANTASY.Combat.monstersNotRolledMsg")}</p>`,
+        yes: { label: game.i18n.localize("LETHALFANTASY.Combat.proceedYes") },
+        no: { label: game.i18n.localize("LETHALFANTASY.Combat.proceedNo") },
+        rejectClose: false,
+      });
+      if (!proceed) return this;
+    }
+
     for (let c of this.combatants) {
       if (nextRound >= c.initiative) {
         if (c.actor.type === "monster") continue;  // Monsters roll manually via the "Roll Monsters" button

module/applications/free-roll.mjs

@@ -142,11 +142,14 @@ export async function rollFreeDie(dieType, count = 1, explode = false) {
   `
 
   const rollMode = game.settings.get("core", "rollMode")
+  // Normalize old-style rollMode keys (v12/v13) to new-style (v14), fallback to "public"
+  const modeMap = { publicroll: "public", gmroll: "gm", blindroll: "blind", selfroll: "self" }
+  const mode = modeMap[rollMode] ?? rollMode ?? "public"
   const msgData = {
     speaker: ChatMessage.getSpeaker(),
     content,
     sound: CONFIG.sounds.dice,
+    mode,
   }
-  ChatMessage.applyMode(msgData, rollMode)
   await ChatMessage.create(msgData)
 }

module/applications/sheets/character-sheet.mjs

@@ -22,6 +22,7 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet
       divinityPointsMinus: LethalFantasyCharacterSheet.#onDivinityPointsMinus,
       aetherPointsPlus: LethalFantasyCharacterSheet.#onAetherPointsPlus,
       aetherPointsMinus: LethalFantasyCharacterSheet.#onAetherPointsMinus,
+      rollSpellDamage: LethalFantasyCharacterSheet.#onRollSpellDamage,
     },
   }
 
@@ -70,10 +71,10 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet
       biography: { id: "biography", group: "sheet", icon: "fa-solid fa-book", label: "LETHALFANTASY.Label.biography" },
     }
     if (this.actor.system.biodata.magicUser) {
-      tabs.spells = { id: "spells", group: "sheet", icon: "fa-sharp-duotone fa-solid fa-wand-magic-sparkles", label: "LETHALFANTASY.Label.spells" }
+      tabs.spells = { id: "spells", group: "sheet", icon: "fa-solid fa-wand-magic-sparkles", label: "LETHALFANTASY.Label.spells" }
     }
     if (this.actor.system.biodata.clericUser) {
-      tabs.miracles = { id: "miracles", group: "sheet", icon: "fa-sharp-duotone fa-solid fa-hands-praying", label: "LETHALFANTASY.Label.miracles" }
+      tabs.miracles = { id: "miracles", group: "sheet", icon: "fa-solid fa-hands-praying", label: "LETHALFANTASY.Label.miracles" }
     }
     for (const v of Object.values(tabs)) {
       v.active = this.tabGroups[v.group] === v.id
@@ -219,6 +220,79 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet
     this.actor.update({ "system.aetherPoints.value": points })
   }
 
+  /**
+   * Handles spell damage roll from the spell sheet tab.
+   * Shows a DR dialog then rolls the appropriate damage formula.
+   * @param {PointerEvent} event
+   * @param {HTMLElement} target
+   */
+  static async #onRollSpellDamage(event, target) {
+    if (this.isEditMode) return
+    const itemId = target.dataset.itemId
+    const tier = target.dataset.damageTier
+    const spell = this.actor.items.get(itemId)
+    if (!spell) return
+
+    const formulaMap = {
+      standard: spell.system.damageDice,
+      overpowered: spell.system.damageDiceOverpowered,
+      overpowered2: spell.system.damageDiceOverpowered2,
+    }
+    const formula = formulaMap[tier]
+    if (!formula) return
+
+    const manualDR = await foundry.applications.api.DialogV2.wait({
+      window: { title: game.i18n.localize("LETHALFANTASY.Combat.spellDRDialogTitle") },
+      classes: ["lethalfantasy"],
+      position: { width: 320 },
+      content: `<div style="padding:0.5rem 0">
+        <p style="margin-bottom:0.6rem">${game.i18n.localize("LETHALFANTASY.Combat.spellDRDialogMsg")}</p>
+        <div style="display:flex;align-items:center;gap:0.5rem">
+          <label style="font-weight:bold">${game.i18n.localize("LETHALFANTASY.Combat.spellDRLabel")}</label>
+          <input type="number" name="manualDr" value="0" min="0" style="width:5rem"/>
+        </div>
+      </div>`,
+      buttons: [
+        {
+          action: "noDR",
+          label: game.i18n.localize("LETHALFANTASY.Combat.spellNoDR"),
+          icon: "fa-solid fa-wand-magic-sparkles",
+          callback: () => 0
+        },
+        {
+          action: "applyDR",
+          label: game.i18n.localize("LETHALFANTASY.Combat.spellApplyDR"),
+          icon: "fa-solid fa-shield",
+          callback: (event, button) => Number(button.form?.elements?.manualDr?.value) || 0
+        },
+        {
+          action: "cancel",
+          label: game.i18n.localize("LETHALFANTASY.Combat.proceedNo"),
+          callback: () => null
+        }
+      ],
+      rejectClose: false
+    })
+    if (manualDR === null) return
+
+    const rollOpts = {
+      type: "spell-damage",
+      rollType: "spell-damage",
+      rollName: `${spell.name} — ${formula}`,
+      isDamage: true,
+      rollData: { isDamage: true },
+      manualDR,
+      actorId: this.actor.id,
+      actorName: this.actor.name,
+      actorImage: this.actor.img
+    }
+    const roll = new LethalFantasyRoll(formula, {}, rollOpts)
+    await roll.evaluate()
+    roll.options.rollTotal = roll.total
+    if (game?.dice3d) await game.dice3d.showForRoll(roll, game.user, true)
+    await roll.toMessage()
+  }
+
   static #onCreateEquipment(event, target) {
   }
 

module/documents/roll.mjs

@@ -370,7 +370,9 @@ export default class LethalFantasyRoll extends Roll {
       beyondSkill = !!rollContext.beyondSkill
       letItFly = !!rollContext.letItFly
       saveSpell = !!rollContext.saveSpell
-      rollContext.visibility ||= rollContext.rollMode || game.settings.get("core", "rollMode")
+      const _rawMode = rollContext.rollMode || game.settings.get("core", "rollMode")
+      const _modeMap = { publicroll: "public", gmroll: "gm", blindroll: "blind", selfroll: "self" }
+      rollContext.visibility ||= _modeMap[_rawMode] ?? _rawMode ?? "public"
       rollContext.modifier ||= modifier
       rollContext.favor ||= "none"
       rollContext.changeDice ||= `${dice}`
@@ -390,7 +392,7 @@ export default class LethalFantasyRoll extends Roll {
             label: label,
             callback: (event, button, dialog) => {
               console.log("Roll context", event, button, dialog)
-              let position = dialog.position
+              let position = dialog?.position
               game.user.setFlag(SYSTEM.id, "roll-dialog-pos", foundry.utils.duplicate(position))
               const output = Array.from(button.form.elements).reduce((obj, input) => {
                 if (input.name) obj[input.name] = input.value
@@ -401,22 +403,22 @@ export default class LethalFantasyRoll extends Roll {
           },
         ],
         actions: {
-          "selectGranted": (event, button, dialog) => {
+          "selectGranted": (event, button) => {
             hasGrantedDice = event.target.checked
           },
-          "selectBeyondSkill": (event, button, dialog) => {
+          "selectBeyondSkill": (event, button) => {
             beyondSkill = button.checked
           },
-          "selectPointBlank": (event, button, dialog) => {
+          "selectPointBlank": (event, button) => {
             pointBlank = button.checked
           },
-          "selectLetItFly": (event, button, dialog) => {
+          "selectLetItFly": (event, button) => {
             letItFly = button.checked
           },
-          "saveSpellCheck": (event, button, dialog) => {
+          "saveSpellCheck": (event, button) => {
             saveSpell = button.checked
           },
-          "gotoToken": (event, button, dialog) => {
+          "gotoToken": (event, button) => {
             let tokenId = $(button).data("tokenId")
             let token = canvas.tokens?.get(tokenId)
             if (token) {
@@ -708,7 +710,7 @@ export default class LethalFantasyRoll extends Roll {
       buttons: [
         {
           label: label,
-          callback: (event, button, dialog) => {
+          callback: (event, button) => {
             const output = Array.from(button.form.elements).reduce((obj, input) => {
               if (input.name) obj[input.name] = input.value
               return obj
@@ -776,7 +778,7 @@ export default class LethalFantasyRoll extends Roll {
         buttons.push({
           action: "roll",
           label: "Roll progression dice",
-          callback: (event, button, dialog) => {
+          callback: (event, button) => {
             let pos = $('#combat-action-dialog').position()
             game.user.setFlag(SYSTEM.id, "combat-action-dialog-pos", pos)
             return "rollProgressionDice"
@@ -802,7 +804,7 @@ export default class LethalFantasyRoll extends Roll {
         buttons.push({
           action: "roll",
           label: label,
-          callback: (event, button, dialog) => {
+          callback: (event, button) => {
             let pos = $('#combat-action-dialog').position()
             game.user.setFlag(SYSTEM.id, "combat-action-dialog-pos", foundry.utils.duplicate(pos))
             return "rollLethargyDice"
@@ -813,7 +815,7 @@ export default class LethalFantasyRoll extends Roll {
       buttons.push({
         action: "roll",
         label: "Select action",
-        callback: (event, button, dialog) => {
+        callback: (event, button) => {
           let pos = $('#combat-action-dialog').position()
           game.user.setFlag(SYSTEM.id, "combat-action-dialog-pos", foundry.utils.duplicate(pos))
           const output = Array.from(button.form.elements).reduce((obj, input) => {
@@ -828,7 +830,7 @@ export default class LethalFantasyRoll extends Roll {
     buttons.push({
       action: "cancel",
       label: "Other action, not listed here",
-      callback: (event, button, dialog) => {
+      callback: (event, button) => {
         let pos = $('#combat-action-dialog').position()
         game.user.setFlag(SYSTEM.id, "combat-action-dialog-pos", foundry.utils.duplicate(pos))
         return null;
@@ -1075,7 +1077,7 @@ export default class LethalFantasyRoll extends Roll {
       buttons: [
         {
           label: label,
-          callback: (event, button, dialog) => {
+          callback: (event, button) => {
             const output = Array.from(button.form.elements).reduce((obj, input) => {
               if (input.name) obj[input.name] = input.value
               return obj

module/models/miracle.mjs

@@ -35,6 +35,9 @@ export default class LethalFantasyMiracle 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: "" })
+    schema.damageDiceOverpowered = new fields.StringField({ required: false, initial: "" })
+    schema.damageDiceOverpowered2 = new fields.StringField({ required: false, initial: "" })
 
     return schema
   }

module/models/monster.mjs

@@ -233,7 +233,7 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel
         await roll.toMessage({
           flavor,
           speaker: ChatMessage.getSpeaker({ actor: this.parent })
-        })
+        }, { messageMode: roll.options.rollMode ?? game.settings.get("core", "rollMode") })
         return
       }
       case "weapon-damage-small":

module/models/spell.mjs

@@ -40,6 +40,8 @@ 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: "" })
+    schema.damageDiceOverpowered = new fields.StringField({ required: false, initial: "" })
+    schema.damageDiceOverpowered2 = new fields.StringField({ required: false, initial: "" })
   
     return schema
   }

module/utils.mjs

@@ -324,7 +324,7 @@ export default class LethalFantasyUtils {
             <p>Attack roll: <strong>${attackRoll}</strong></p>
           </div>
           <div class="weapon-selection">
-            <label for="defense-attack">Choose your defense attack:</label>
+            <label for="defense-attack">Choose your defense weapon:</label>
             <select id="defense-attack" name="attackKey" style="width: 100%; margin-top: 8px;">
               ${attacksHTML}
             </select>
@@ -711,6 +711,7 @@ export default class LethalFantasyUtils {
             ${totalBonus > 0 ? `<p class="bonus-info">Bonus already added: +${totalBonus}</p>` : ''}
           </div>
           <p class="offer-text">You are losing! Spend Grit or Luck to add 1D6 to your defense?</p>
+          <p class="shield-warning"><i class="fa-solid fa-triangle-exclamation"></i> If you intend to use a shield, you must spend Grit or Luck <strong>first</strong> — the shield roll comes after.</p>
         </div>
       `
 
@@ -853,7 +854,7 @@ export default class LethalFantasyUtils {
         `
       } else if (data.attackRollType === "monster-attack") {
         damageButton = `
-          <div class="attack-result-damage">
+          <div class="attack-result-damage single-btn">
             <button class="roll-damage-btn" data-attacker-id="${data.attackerId}" data-defender-id="${data.defenderId}" data-defender-token-id="${data.defenderTokenId || ""}" data-extra-shield-dr="${data.shieldDamageReduction || 0}" data-attack-key="${data.attackRollKey}" data-damage-type="monster">
               <i class="fa-solid fa-burst"></i> Damage
             </button>
@@ -861,21 +862,26 @@ export default class LethalFantasyUtils {
         `
       } else if (data.attackRollType === "spell-attack" || data.attackRollType === "miracle-attack") {
         const attacker = game.actors.get(data.attackerId)
-        const spell = attacker?.items.get(data.attackWeaponId)
-        const 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>
-          `
+        const spell = attacker?.items.get(data.attackWeaponId || data.attackRollKey)
+        const tiers = [
+          { formula: spell?.system?.damageDice, label: "Standard" },
+          { formula: spell?.system?.damageDiceOverpowered, label: "Overpowered" },
+          { formula: spell?.system?.damageDiceOverpowered2, label: "Overpowered 2" },
+        ].filter(t => t.formula)
+        if (tiers.length) {
+          const buttons = tiers.map(t => {
+            const escapedFormula = Handlebars.escapeExpression(t.formula)
+            return `
+            <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="${escapedFormula}">
+              <i class="fa-solid fa-wand-magic-sparkles"></i> ${t.label} (${escapedFormula})
+            </button>`
+          }).join("")
+          damageButton = `<div class="attack-result-damage spell-damage">${buttons}</div>`
         }
       }
     }
@@ -902,10 +908,10 @@ export default class LethalFantasyUtils {
         </div>
         <div class="combat-result-text">
           ${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>.`
+        ? `<i class="fa-solid fa-shield"></i> <strong>${data.defenderName}</strong> has blocked with shield — 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!`
+          : `<i class="fa-solid fa-shield-halved"></i> <strong>${data.defenderName}</strong> avoided the attack!`
       }
         </div>
         ${damageButton}
@@ -1195,7 +1201,7 @@ export default class LethalFantasyUtils {
       ChatMessage.create({
         user: game.user.id,
         speaker: { alias: targetActor.name },
-        mode: "gmroll",
+        mode: "gm",
         content: messageContent
       })
     }

packs-system/lf-equipment/CURRENT

@@ -1 +1 @@
-MANIFEST-000595
+MANIFEST-000607

packs-system/lf-equipment/LOG

@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.671725 7f5a94bff6c0 Recovering log #593
-2026/05/18-07:32:52.684619 7f5a94bff6c0 Delete type=3 #591
-2026/05/18-07:32:52.684760 7f5a94bff6c0 Delete type=0 #593
-2026/05/18-07:58:12.225439 7f5a467fc6c0 Level-0 table #598: started
-2026/05/18-07:58:12.225593 7f5a467fc6c0 Level-0 table #598: 0 bytes OK
-2026/05/18-07:58:12.232817 7f5a467fc6c0 Delete type=0 #596
-2026/05/18-07:58:12.252837 7f5a467fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.252955 7f5a467fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/20-00:10:37.079181 7f0b1e7ee6c0 Recovering log #605
+2026/05/20-00:10:37.089613 7f0b1e7ee6c0 Delete type=3 #603
+2026/05/20-00:10:37.089671 7f0b1e7ee6c0 Delete type=0 #605
+2026/05/20-10:53:40.566713 7f0b1cfeb6c0 Level-0 table #610: started
+2026/05/20-10:53:40.566740 7f0b1cfeb6c0 Level-0 table #610: 0 bytes OK
+2026/05/20-10:53:40.572741 7f0b1cfeb6c0 Delete type=0 #608
+2026/05/20-10:53:40.587356 7f0b1cfeb6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/20-10:53:40.587409 7f0b1cfeb6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)

packs-system/lf-equipment/LOG.old

@@ -1,8 +1,8 @@
-2026/05/17-11:57:50.231387 7f16423fc6c0 Recovering log #589
-2026/05/17-11:57:50.249229 7f16423fc6c0 Delete type=3 #587
-2026/05/17-11:57:50.249281 7f16423fc6c0 Delete type=0 #589
-2026/05/17-13:21:53.429711 7f1641bfb6c0 Level-0 table #594: started
-2026/05/17-13:21:53.429759 7f1641bfb6c0 Level-0 table #594: 0 bytes OK
-2026/05/17-13:21:53.437714 7f1641bfb6c0 Delete type=0 #592
-2026/05/17-13:21:53.449134 7f1641bfb6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2026/05/17-13:21:53.461721 7f1641bfb6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/19-10:50:35.862031 7f5a477fe6c0 Recovering log #601
+2026/05/19-10:50:35.923479 7f5a477fe6c0 Delete type=3 #599
+2026/05/19-10:50:35.923537 7f5a477fe6c0 Delete type=0 #601
+2026/05/19-10:51:28.990207 7f5a467fc6c0 Level-0 table #606: started
+2026/05/19-10:51:28.990237 7f5a467fc6c0 Level-0 table #606: 0 bytes OK
+2026/05/19-10:51:28.997402 7f5a467fc6c0 Delete type=0 #604
+2026/05/19-10:51:28.997604 7f5a467fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/19-10:51:28.997650 7f5a467fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)

packs-system/lf-gifts/CURRENT

@@ -1 +1 @@
-MANIFEST-000592
+MANIFEST-000604

packs-system/lf-gifts/LOG

@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.700651 7f5a477fe6c0 Recovering log #590
-2026/05/18-07:32:52.712680 7f5a477fe6c0 Delete type=3 #588
-2026/05/18-07:32:52.712814 7f5a477fe6c0 Delete type=0 #590
-2026/05/18-07:58:12.232998 7f5a467fc6c0 Level-0 table #595: started
-2026/05/18-07:58:12.233130 7f5a467fc6c0 Level-0 table #595: 0 bytes OK
-2026/05/18-07:58:12.244133 7f5a467fc6c0 Delete type=0 #593
-2026/05/18-07:58:12.252873 7f5a467fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.252977 7f5a467fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/20-00:10:37.107483 7f0b1efef6c0 Recovering log #602
+2026/05/20-00:10:37.117907 7f0b1efef6c0 Delete type=3 #600
+2026/05/20-00:10:37.117968 7f0b1efef6c0 Delete type=0 #602
+2026/05/20-10:53:40.572909 7f0b1cfeb6c0 Level-0 table #607: started
+2026/05/20-10:53:40.572948 7f0b1cfeb6c0 Level-0 table #607: 0 bytes OK
+2026/05/20-10:53:40.579001 7f0b1cfeb6c0 Delete type=0 #605
+2026/05/20-10:53:40.587370 7f0b1cfeb6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/20-10:53:40.587430 7f0b1cfeb6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)

packs-system/lf-gifts/LOG.old

@@ -1,8 +1,8 @@
-2026/05/17-11:57:50.260046 7f16433fe6c0 Recovering log #586
-2026/05/17-11:57:50.276348 7f16433fe6c0 Delete type=3 #584
-2026/05/17-11:57:50.276460 7f16433fe6c0 Delete type=0 #586
-2026/05/17-13:21:53.474443 7f1641bfb6c0 Level-0 table #591: started
-2026/05/17-13:21:53.474485 7f1641bfb6c0 Level-0 table #591: 0 bytes OK
-2026/05/17-13:21:53.481502 7f1641bfb6c0 Delete type=0 #589
-2026/05/17-13:21:53.490389 7f1641bfb6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
-2026/05/17-13:21:53.512946 7f1641bfb6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/19-10:50:35.962917 7f5a46ffd6c0 Recovering log #598
+2026/05/19-10:50:36.018914 7f5a46ffd6c0 Delete type=3 #596
+2026/05/19-10:50:36.018977 7f5a46ffd6c0 Delete type=0 #598
+2026/05/19-10:51:28.983427 7f5a467fc6c0 Level-0 table #603: started
+2026/05/19-10:51:28.983464 7f5a467fc6c0 Level-0 table #603: 0 bytes OK
+2026/05/19-10:51:28.990020 7f5a467fc6c0 Delete type=0 #601
+2026/05/19-10:51:28.997591 7f5a467fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/19-10:51:28.997639 7f5a467fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)

packs-system/lf-skills/CURRENT

@@ -1 +1 @@
-MANIFEST-000597
+MANIFEST-000609

packs-system/lf-skills/LOG

@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.650924 7f5a47fff6c0 Recovering log #595
-2026/05/18-07:32:52.662191 7f5a47fff6c0 Delete type=3 #593
-2026/05/18-07:32:52.662331 7f5a47fff6c0 Delete type=0 #595
-2026/05/18-07:58:12.218060 7f5a467fc6c0 Level-0 table #600: started
-2026/05/18-07:58:12.218402 7f5a467fc6c0 Level-0 table #600: 0 bytes OK
-2026/05/18-07:58:12.225237 7f5a467fc6c0 Delete type=0 #598
-2026/05/18-07:58:12.244392 7f5a467fc6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.252899 7f5a467fc6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/20-00:10:37.061485 7f0b1efef6c0 Recovering log #607
+2026/05/20-00:10:37.071572 7f0b1efef6c0 Delete type=3 #605
+2026/05/20-00:10:37.071684 7f0b1efef6c0 Delete type=0 #607
+2026/05/20-10:53:40.579189 7f0b1cfeb6c0 Level-0 table #612: started
+2026/05/20-10:53:40.579229 7f0b1cfeb6c0 Level-0 table #612: 0 bytes OK
+2026/05/20-10:53:40.587176 7f0b1cfeb6c0 Delete type=0 #610
+2026/05/20-10:53:40.587386 7f0b1cfeb6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/20-10:53:40.587419 7f0b1cfeb6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)

packs-system/lf-skills/LOG.old

@@ -1,8 +1,8 @@
-2026/05/17-11:57:50.206131 7f1643bff6c0 Recovering log #591
-2026/05/17-11:57:50.222037 7f1643bff6c0 Delete type=3 #589
-2026/05/17-11:57:50.222089 7f1643bff6c0 Delete type=0 #591
-2026/05/17-13:21:53.292176 7f1641bfb6c0 Level-0 table #596: started
-2026/05/17-13:21:53.292219 7f1641bfb6c0 Level-0 table #596: 0 bytes OK
-2026/05/17-13:21:53.299322 7f1641bfb6c0 Delete type=0 #594
-2026/05/17-13:21:53.306548 7f1641bfb6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2026/05/17-13:21:53.318889 7f1641bfb6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/19-10:50:35.772455 7f5a46ffd6c0 Recovering log #603
+2026/05/19-10:50:35.837426 7f5a46ffd6c0 Delete type=3 #601
+2026/05/19-10:50:35.837512 7f5a46ffd6c0 Delete type=0 #603
+2026/05/19-10:51:28.969686 7f5a467fc6c0 Level-0 table #608: started
+2026/05/19-10:51:28.969769 7f5a467fc6c0 Level-0 table #608: 0 bytes OK
+2026/05/19-10:51:28.976467 7f5a467fc6c0 Delete type=0 #606
+2026/05/19-10:51:28.997558 7f5a467fc6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/19-10:51:28.997616 7f5a467fc6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)

packs-system/lf-spells-miracles/CURRENT

@@ -1 +1 @@
-MANIFEST-000292
+MANIFEST-000304

packs-system/lf-spells-miracles/LOG

@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.738234 7f5a477fe6c0 Recovering log #290
-2026/05/18-07:32:52.749839 7f5a477fe6c0 Delete type=3 #288
-2026/05/18-07:32:52.749970 7f5a477fe6c0 Delete type=0 #290
-2026/05/18-07:58:12.253340 7f5a467fc6c0 Level-0 table #295: started
-2026/05/18-07:58:12.253449 7f5a467fc6c0 Level-0 table #295: 0 bytes OK
-2026/05/18-07:58:12.261029 7f5a467fc6c0 Delete type=0 #293
-2026/05/18-07:58:12.286385 7f5a467fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.286487 7f5a467fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/20-00:10:37.136939 7f0b1efef6c0 Recovering log #302
+2026/05/20-00:10:37.146957 7f0b1efef6c0 Delete type=3 #300
+2026/05/20-00:10:37.147030 7f0b1efef6c0 Delete type=0 #302
+2026/05/20-10:53:40.615430 7f0b1cfeb6c0 Level-0 table #307: started
+2026/05/20-10:53:40.615467 7f0b1cfeb6c0 Level-0 table #307: 0 bytes OK
+2026/05/20-10:53:40.621586 7f0b1cfeb6c0 Delete type=0 #305
+2026/05/20-10:53:40.621713 7f0b1cfeb6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/20-10:53:40.633723 7f0b1cfeb6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)

packs-system/lf-spells-miracles/LOG.old

@@ -1,8 +1,8 @@
-2026/05/17-11:57:50.303535 7f16433fe6c0 Recovering log #286
-2026/05/17-11:57:50.318955 7f16433fe6c0 Delete type=3 #284
-2026/05/17-11:57:50.319061 7f16433fe6c0 Delete type=0 #286
-2026/05/17-13:21:53.481662 7f1641bfb6c0 Level-0 table #291: started
-2026/05/17-13:21:53.481693 7f1641bfb6c0 Level-0 table #291: 0 bytes OK
-2026/05/17-13:21:53.490187 7f1641bfb6c0 Delete type=0 #289
-2026/05/17-13:21:53.502325 7f1641bfb6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2026/05/17-13:21:53.512979 7f1641bfb6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/19-10:50:36.147771 7f5a46ffd6c0 Recovering log #298
+2026/05/19-10:50:36.209801 7f5a46ffd6c0 Delete type=3 #296
+2026/05/19-10:50:36.209908 7f5a46ffd6c0 Delete type=0 #298
+2026/05/19-10:51:29.021338 7f5a467fc6c0 Level-0 table #303: started
+2026/05/19-10:51:29.021378 7f5a467fc6c0 Level-0 table #303: 0 bytes OK
+2026/05/19-10:51:29.027529 7f5a467fc6c0 Delete type=0 #301
+2026/05/19-10:51:29.027761 7f5a467fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/19-10:51:29.027787 7f5a467fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)

packs-system/lf-vulnerabilities/CURRENT

@@ -1 +1 @@
-MANIFEST-000591
+MANIFEST-000603

packs-system/lf-vulnerabilities/LOG

@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.720162 7f5a94bff6c0 Recovering log #589
-2026/05/18-07:32:52.731519 7f5a94bff6c0 Delete type=3 #587
-2026/05/18-07:32:52.731690 7f5a94bff6c0 Delete type=0 #589
-2026/05/18-07:58:12.244424 7f5a467fc6c0 Level-0 table #594: started
-2026/05/18-07:58:12.244618 7f5a467fc6c0 Level-0 table #594: 0 bytes OK
-2026/05/18-07:58:12.252579 7f5a467fc6c0 Delete type=0 #592
-2026/05/18-07:58:12.252922 7f5a467fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.252996 7f5a467fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/20-00:10:37.121340 7f0b1e7ee6c0 Recovering log #601
+2026/05/20-00:10:37.132435 7f0b1e7ee6c0 Delete type=3 #599
+2026/05/20-00:10:37.132491 7f0b1e7ee6c0 Delete type=0 #601
+2026/05/20-10:53:40.559937 7f0b1cfeb6c0 Level-0 table #606: started
+2026/05/20-10:53:40.560028 7f0b1cfeb6c0 Level-0 table #606: 0 bytes OK
+2026/05/20-10:53:40.566605 7f0b1cfeb6c0 Delete type=0 #604
+2026/05/20-10:53:40.587338 7f0b1cfeb6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/20-10:53:40.587398 7f0b1cfeb6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)

packs-system/lf-vulnerabilities/LOG.old

@@ -1,8 +1,8 @@
-2026/05/17-11:57:50.282340 7f16423fc6c0 Recovering log #585
-2026/05/17-11:57:50.297125 7f16423fc6c0 Delete type=3 #583
-2026/05/17-11:57:50.297189 7f16423fc6c0 Delete type=0 #585
-2026/05/17-13:21:53.299508 7f1641bfb6c0 Level-0 table #590: started
-2026/05/17-13:21:53.299854 7f1641bfb6c0 Level-0 table #590: 0 bytes OK
-2026/05/17-13:21:53.306309 7f1641bfb6c0 Delete type=0 #588
-2026/05/17-13:21:53.318877 7f1641bfb6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2026/05/17-13:21:53.325564 7f1641bfb6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/19-10:50:36.056028 7f5a47fff6c0 Recovering log #597
+2026/05/19-10:50:36.115465 7f5a47fff6c0 Delete type=3 #595
+2026/05/19-10:50:36.115585 7f5a47fff6c0 Delete type=0 #597
+2026/05/19-10:51:28.976707 7f5a467fc6c0 Level-0 table #602: started
+2026/05/19-10:51:28.976754 7f5a467fc6c0 Level-0 table #602: 0 bytes OK
+2026/05/19-10:51:28.983222 7f5a467fc6c0 Delete type=0 #600
+2026/05/19-10:51:28.997577 7f5a467fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/19-10:51:28.997627 7f5a467fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)

styles/chat.less

@@ -145,9 +145,11 @@
 }
 
 .grit-luck-dialog {
+  color: var(--color-text-dark-primary, #191813);
+
   .combat-status {
     padding: 12px;
-    background: linear-gradient(to bottom, rgba(42, 41, 32, 0.8) 0%, rgba(26, 25, 16, 0.9) 100%);
+    background: linear-gradient(to bottom, rgba(42, 41, 32, 0.88) 0%, rgba(26, 25, 16, 0.95) 100%);
     border: 1px solid rgba(212, 175, 55, 0.5);
     border-radius: 6px;
     margin-bottom: 16px;
@@ -171,11 +173,27 @@
   }
 
   .offer-text {
-    color: #f0e6d2;
+    color: var(--color-text-dark-primary, #191813);
     font-size: calc(var(--font-size-standard) * 1);
     text-align: center;
     font-weight: 600;
+    margin: 0 0 8px 0;
+  }
+
+  .shield-warning {
+    color: #7a4000;
+    background: rgba(255, 160, 0, 0.12);
+    border: 1px solid rgba(255, 160, 0, 0.4);
+    border-radius: 5px;
+    font-size: calc(var(--font-size-standard) * 0.88);
+    padding: 6px 10px;
     margin: 0;
+    text-align: center;
+
+    i {
+      color: #c07000;
+      margin-right: 5px;
+    }
   }
 }
 
@@ -283,33 +301,72 @@
   }
 
   .attack-result-damage {
-    display: flex;
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
     gap: 8px;
-    justify-content: center;
+
+    &.single-btn {
+      grid-template-columns: 1fr;
+      max-width: 280px;
+      margin: 0 auto;
+    }
+
+    &.spell-damage {
+      grid-template-columns: 1fr;
+      width: 100%;
+    }
 
     .roll-damage-btn {
-      padding: 10px 16px;
+      padding: 10px 14px;
       background: linear-gradient(to bottom, #8b0000 0%, #660000 100%);
-      border: 1px solid #ff0000;
+      border: 1px solid #4b0000;
       border-radius: 6px;
       color: #f0e6d2;
       font-weight: 600;
+      font-size: calc(var(--font-size-standard) * 0.9);
+      text-align: center;
+      white-space: nowrap;
       cursor: pointer;
       transition: all 0.2s ease;
-      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+      box-shadow: 0 3px 6px rgba(0, 0, 0, 0.4), inset 0 1px 0 rgba(255, 255, 255, 0.1);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 6px;
+      position: relative;
+      overflow: hidden;
+
+      &::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: -100%;
+        width: 100%;
+        height: 100%;
+        background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.15), transparent);
+        transition: left 0.5s;
+      }
+
+      &:hover::before {
+        left: 100%;
+      }
+
+      i {
+        font-size: calc(var(--font-size-standard) * 1.1);
+        filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.5));
+        flex-shrink: 0;
+      }
 
       &:hover {
         background: linear-gradient(to bottom, #a00000 0%, #7b0000 100%);
-        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.4);
+        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.15);
         transform: translateY(-2px);
+        border-color: #5b0000;
       }
 
       &:active {
         transform: translateY(0);
-      }
-
-      i {
-        margin-right: 6px;
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4), inset 0 1px 3px rgba(0, 0, 0, 0.3);
       }
     }
   }

styles/roll.less

@@ -176,6 +176,22 @@
   }
 }
 
+.dialog-warning {
+  margin: 0.4rem 0.2rem 0.2rem;
+  padding: 0.35rem 0.5rem;
+  border-left: 3px solid #c8941a;
+  background: rgba(200, 148, 26, 0.12);
+  border-radius: 3px;
+  font-family: var(--font-secondary);
+  font-size: calc(var(--font-size-standard) * 0.9);
+  color: #7a5400;
+  line-height: 1.4;
+  i {
+    color: #c8941a;
+    margin-right: 0.4rem;
+  }
+}
+
 .lethalfantasy,
 .fvtt-lethal-fantasy,
 .message.lethalfantasy,
@@ -1269,33 +1285,72 @@
   }
 
   .attack-result-damage {
-    display: flex;
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
     gap: 8px;
-    justify-content: center;
+
+    &.single-btn {
+      grid-template-columns: 1fr;
+      max-width: 280px;
+      margin: 0 auto;
+    }
+
+    &.spell-damage {
+      grid-template-columns: 1fr;
+      width: 100%;
+    }
 
     .roll-damage-btn {
-      padding: 10px 16px;
+      padding: 10px 14px;
       background: linear-gradient(to bottom, #8b0000 0%, #660000 100%);
-      border: 1px solid #ff0000;
+      border: 1px solid #4b0000;
       border-radius: 6px;
       color: #f0e6d2;
       font-weight: 600;
+      font-size: calc(var(--font-size-standard) * 0.9);
+      text-align: center;
+      white-space: nowrap;
       cursor: pointer;
       transition: all 0.2s ease;
-      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+      box-shadow: 0 3px 6px rgba(0, 0, 0, 0.4), inset 0 1px 0 rgba(255, 255, 255, 0.1);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 6px;
+      position: relative;
+      overflow: hidden;
+
+      &::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: -100%;
+        width: 100%;
+        height: 100%;
+        background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.15), transparent);
+        transition: left 0.5s;
+      }
+
+      &:hover::before {
+        left: 100%;
+      }
+
+      i {
+        font-size: calc(var(--font-size-standard) * 1.1);
+        filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.5));
+        flex-shrink: 0;
+      }
 
       &:hover {
         background: linear-gradient(to bottom, #a00000 0%, #7b0000 100%);
-        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.4);
+        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.15);
         transform: translateY(-2px);
+        border-color: #5b0000;
       }
 
       &:active {
         transform: translateY(0);
-      }
-
-      i {
-        margin-right: 6px;
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4), inset 0 1px 3px rgba(0, 0, 0, 0.3);
       }
     }
   }

templates/character-biography.hbs

@@ -9,95 +9,95 @@
       <legend>{{localize "LETHALFANTASY.Label.biodata"}}</legend>
       <div class="biodata">
         <div class="biodata-elem">
-          <span class="name">Class</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.class"}}</span>
           {{formInput
             systemFields.biodata.fields.class
             value=system.biodata.class
           }}
         </div>
         <div class="biodata-elem">
-          <span class="name">Level</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.level"}}</span>
           {{formInput
             systemFields.biodata.fields.level
             value=system.biodata.level
           }}
         </div>
         <div class="biodata-elem">
-          <span class="name">Mortal</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.mortal"}}</span>
           {{formInput
             systemFields.biodata.fields.mortal
             value=system.biodata.mortal
           }}
         </div>
         <div class="biodata-elem">
-          <span class="name">Alignment</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.alignment"}}</span>
           {{formInput
             systemFields.biodata.fields.alignment
             value=system.biodata.alignment
           }}
         </div>
         <div class="biodata-elem">
-          <span class="name">Age</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.age"}}</span>
           {{formInput systemFields.biodata.fields.age value=system.biodata.age}}
         </div>
         <div class="biodata-elem">
-          <span class="name">Height</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.height"}}</span>
           {{formInput
             systemFields.biodata.fields.height
             value=system.biodata.height
           }}
         </div>
         <div class="biodata-elem">
-          <span class="name">Weight</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.weight"}}</span>
           {{formInput
             systemFields.biodata.fields.weight
             value=system.biodata.weight
           }}
         </div>
         <div class="biodata-elem">
-          <span class="name">Eyes</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.eyes"}}</span>
           {{formInput
             systemFields.biodata.fields.eyes
             value=system.biodata.eyes
           }}
         </div>
         <div class="biodata-elem">
-          <span class="name">Hair</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.hair"}}</span>
           {{formInput
             systemFields.biodata.fields.hair
             value=system.biodata.hair
           }}
         </div>
         <div class="biodata-elem">
-          <span class="name">Dev. Points (Total)</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.devPointsTotal"}}</span>
           {{formInput
             systemFields.developmentPoints.fields.total
             value=system.developmentPoints.total
           }}
         </div>
         <div class="biodata-elem">
-          <span class="name">Dev. Points (Rem.)</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.devPointsRem"}}</span>
           {{formInput
             systemFields.developmentPoints.fields.remaining
             value=system.developmentPoints.remaining
           }}
         </div>
         <div class="biodata-elem">
-          <span class="name">Magic User</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.magicUser"}}</span>
           {{formInput
             systemFields.biodata.fields.magicUser
             value=system.biodata.magicUser
           }}
         </div>
         <div class="biodata-elem">
-          <span class="name">Cleric User</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.clericUser"}}</span>
           {{formInput
             systemFields.biodata.fields.clericUser
             value=system.biodata.clericUser
           }}
         </div>
         <div class="biodata-elem">
-          <span class="name">Save bonus (1/5levels)</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.saveBonus"}}</span>
           {{formInput
             systemFields.modifiers.fields.saveModifier
             value=system.modifiers.saveModifier
@@ -107,7 +107,7 @@
 
         {{#if system.biodata.magicUser}}
           <div class="biodata-elem">
-            <span class="name">Spell bonus (1/5levels)</span>
+            <span class="name">{{localize "LETHALFANTASY.Label.spellBonus"}}</span>
             {{formInput
               systemFields.modifiers.fields.levelSpellModifier
               value=system.modifiers.levelSpellModifier
@@ -117,7 +117,7 @@
         {{/if}}
         {{#if system.biodata.clericUser}}
           <div class="biodata-elem">
-            <span class="name">Miracle bonus (1/5levels)</span>
+            <span class="name">{{localize "LETHALFANTASY.Label.miracleBonus"}}</span>
             {{formInput
               systemFields.modifiers.fields.levelMiracleModifier
               value=system.modifiers.levelMiracleModifier
@@ -127,7 +127,7 @@
         {{/if}}
 
         <div class="biodata-elem">
-          <span class="name">Last HD roll</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.lastHdRoll"}}</span>
           {{formInput
             systemFields.biodata.fields.hpPerLevel
             value=system.biodata.hpPerLevel
@@ -136,7 +136,7 @@
         </div>
 
         <div class="biodata-elem">
-          <span class="name">Natural DR</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.naturalDR"}}</span>
           {{formInput
             systemFields.biodata.fields.naturalDR
             value=system.biodata.naturalDR
@@ -145,7 +145,7 @@
         </div>
 
         <div class="biodata-elem">
-          <span class="name">Magical DR</span>
+          <span class="name">{{localize "LETHALFANTASY.Label.magicalDR"}}</span>
           {{formInput
             systemFields.biodata.fields.magicDR
             value=system.biodata.magicDR

templates/character-miracles.hbs

@@ -5,12 +5,12 @@
       <legend>{{localize "LETHALFANTASY.Label.divinityPoints"}}</legend>
       <div class="miracle-details">
         <div class="miracle-detail">
-          <span>Current</span>
+          <span>{{localize "LETHALFANTASY.Label.current"}}</span>
           {{formField systemFields.divinityPoints.fields.value value=system.divinityPoints.value localize=true}}
           <a data-action="divinityPointsPlus"><i class="fa-solid fa-hexagon-plus"></i></a>
           <a data-action="divinityPointsMinus"><i class="fa-solid fa-hexagon-minus"></i></a>
 
-          <span>Max</span>
+          <span>{{localize "LETHALFANTASY.Label.max"}}</span>
           {{formField systemFields.divinityPoints.fields.max value=system.divinityPoints.max localize=true
           disabled=isPlayMode}}
         </div>

templates/character-spells.hbs

@@ -5,12 +5,12 @@
       <legend>{{localize "LETHALFANTASY.Label.aetherPoints"}}</legend>
       <div class="spell-details">
         <div class="spell-detail">
-          <span>Current</span>
+          <span>{{localize "LETHALFANTASY.Label.current"}}</span>
           {{formField systemFields.aetherPoints.fields.value value=system.aetherPoints.value localize=true}}
           <a data-action="aetherPointsPlus"><i class="fa-solid fa-hexagon-plus"></i></a>
           <a data-action="aetherPointsMinus"><i class="fa-solid fa-hexagon-minus"></i></a>
 
-          <span>Max</span>
+          <span>{{localize "LETHALFANTASY.Label.max"}}</span>
           {{formField systemFields.aetherPoints.fields.max value=system.aetherPoints.max localize=true
           disabled=isPlayMode}}
         </div>
@@ -37,6 +37,25 @@
             <i class="fa-duotone fa-solid fa-stars" data-roll-type="spell-power" data-roll-key="{{item.id}}"></i>
           </a>
 
+          {{#if item.system.damageDice}}
+          <a data-action="rollSpellDamage" data-item-id="{{item.id}}" data-damage-tier="standard"
+            data-tooltip="Spell Damage (Standard)">
+            <i class="fa-solid fa-wand-magic-sparkles"></i>S
+          </a>
+          {{/if}}
+          {{#if item.system.damageDiceOverpowered}}
+          <a data-action="rollSpellDamage" data-item-id="{{item.id}}" data-damage-tier="overpowered"
+            data-tooltip="Spell Damage (Overpowered)">
+            <i class="fa-solid fa-wand-magic-sparkles"></i>O
+          </a>
+          {{/if}}
+          {{#if item.system.damageDiceOverpowered2}}
+          <a data-action="rollSpellDamage" data-item-id="{{item.id}}" data-damage-tier="overpowered2"
+            data-tooltip="Spell Damage (Overpowered 2)">
+            <i class="fa-solid fa-wand-magic-sparkles"></i>O2
+          </a>
+          {{/if}}
+
           <div class="controls">
             <a data-tooltip="{{localize 'LETHALFANTASY.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
               data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>

templates/chat-message.hbs

@@ -40,32 +40,32 @@
     {{#if (eq rollData.favor "favor")}}
       <div class="detail-badge favor-badge">
         <i class="fa-solid fa-sparkles"></i>
-        <span>Favor</span>
+        <span>{{localize "LETHALFANTASY.Label.favor"}}</span>
       </div>
     {{/if}}
     {{#if (eq rollData.favor "disfavor")}}
       <div class="detail-badge disfavor-badge">
         <i class="fa-solid fa-skull"></i>
-        <span>Disfavor</span>
+        <span>{{localize "LETHALFANTASY.Label.disfavor"}}</span>
       </div>
     {{/if}}
 
     {{#if rollData.letItFly}}
       <div class="detail-badge special-badge">
         <i class="fa-solid fa-bow-arrow"></i>
-        <span>Let It Fly!</span>
+        <span>{{localize "LETHALFANTASY.Label.letItFly"}}</span>
       </div>
     {{/if}}
     {{#if rollData.pointBlank}}
       <div class="detail-badge special-badge">
         <i class="fa-solid fa-bullseye-arrow"></i>
-        <span>Point Blank</span>
+        <span>{{localize "LETHALFANTASY.Label.pointBlank"}}</span>
       </div>
     {{/if}}
     {{#if rollData.beyondSkill}}
       <div class="detail-badge special-badge">
         <i class="fa-solid fa-target-lock"></i>
-        <span>Beyond Skill</span>
+        <span>{{localize "LETHALFANTASY.Label.beyondSkill"}}</span>
       </div>
     {{/if}}
 
@@ -111,7 +111,7 @@
   {{#unless isPrivate}}
     <div class="result-section">
       <div class="main-result">
-        <div class="result-label">Total</div>
+        <div class="result-label">{{localize "LETHALFANTASY.Label.total"}}</div>
         <div class="result-value {{#if (eq resultType 'success')}}success{{else}}failure{{/if}}">
           {{total}}
         </div>
@@ -177,7 +177,7 @@
   {{else}}
     <div class="private-result">
       <i class="fa-solid fa-eye-slash"></i>
-      <span>Private Roll</span>
+      <span>{{localize "LETHALFANTASY.Label.privateRoll"}}</span>
     </div>
   {{/unless}}
 

templates/miracle.hbs

@@ -7,7 +7,7 @@
   {{formField systemFields.miracleType value=system.miracleType}}
   {{formField systemFields.level value=system.level}}
 
-  <label>Components</label>
+  <label>{{localize "LETHALFANTASY.Label.components"}}</label>
   <div class="shift-right">
     {{formField systemFields.components.fields.verbal value=system.components.verbal}}
     {{formField systemFields.components.fields.somatic value=system.components.somatic}}
@@ -27,6 +27,9 @@
   {{formField systemFields.areaAffected value=system.areaAffected}}
   {{formField systemFields.duration value=system.duration}}
   {{formField systemFields.savingThrow value=system.savingThrow}}
+  {{formField systemFields.damageDice value=system.damageDice}}
+  {{formField systemFields.damageDiceOverpowered value=system.damageDiceOverpowered}}
+  {{formField systemFields.damageDiceOverpowered2 value=system.damageDiceOverpowered2}}
 
 
   

templates/monster-biography.hbs

@@ -6,23 +6,23 @@
     <div class="biodata">
 
       <div class="biodata-elem">
-        <span class="name">Alignment</span>
+        <span class="name">{{localize "LETHALFANTASY.Label.alignment"}}</span>
         {{formInput systemFields.biodata.fields.alignment value=system.biodata.alignment }}
       </div>
       <div class="biodata-elem">
-        <span class="name">Height</span>
+        <span class="name">{{localize "LETHALFANTASY.Label.height"}}</span>
         {{formInput systemFields.biodata.fields.height value=system.biodata.height }}
       </div>
       <div class="biodata-elem">
-        <span class="name">Weight</span>
+        <span class="name">{{localize "LETHALFANTASY.Label.weight"}}</span>
         {{formInput systemFields.biodata.fields.weight value=system.biodata.weight }}
       </div>
       <div class="biodata-elem">
-        <span class="name">Length</span>
+        <span class="name">{{localize "LETHALFANTASY.Label.length"}}</span>
         {{formInput systemFields.biodata.fields.length value=system.biodata.length }}
       </div>
       <div class="biodata-elem">
-        <span class="name">Vision</span>
+        <span class="name">{{localize "LETHALFANTASY.Label.vision"}}</span>
         {{formInput systemFields.biodata.fields.vision value=system.biodata.vision }}
       </div>
 

templates/monster-combat.hbs

@@ -160,7 +160,7 @@
   </fieldset>
 
   <fieldset>
-    <legend>Hand To Hand Attacks</legend>
+    <legend>{{localize "LETHALFANTASY.Label.handToHandAttacks"}}</legend>
     <div class="attacks">
       {{#each system.combatHTH as |item key|}}
       <div class="attack" data-attack-key="{{key}}" >

templates/roll-dialog.hbs

@@ -91,6 +91,10 @@
       <div class="dialog-save">Add Granted Defense Dice
         <input type="checkbox" data-action="selectGranted" name="granted" />
       </div>
+      <div class="dialog-warning">
+        <i class="fa-solid fa-triangle-exclamation"></i>
+        {{localize "LETHALFANTASY.Warning.defenseShieldOrder"}}
+      </div>
     {{/if}}
     {{#if (match rollType "damage")}}
       <div class="dialog-save">Add Granted Damage Dice

templates/shield.hbs

@@ -22,9 +22,9 @@
       {{formField systemFields.hascover value=system.hascover}}
 
       {{#if system.hascover}}
-        <label>Cover vs ranged attacks</label>
+        <label>{{localize "LETHALFANTASY.Label.coverRanged"}}</label>
         <div class="shift-right">
-          <label>Standing </label>
+          <label>{{localize "LETHALFANTASY.Label.standing"}}</label>
           <div class="flexrow">{{formField
               systemFields.standing.fields.min
               value=system.standing.min
@@ -33,7 +33,7 @@
           </div>
         </div>
         <div class="shift-right">
-          <label>Crouching</label>
+          <label>{{localize "LETHALFANTASY.Label.crouching"}}</label>
           <div class="flexrow">{{formField
               systemFields.crouching.fields.min
               value=system.crouching.min

templates/spell.hbs

@@ -7,7 +7,7 @@
   {{formField systemFields.level value=system.level}}
   {{formField systemFields.cost value=system.cost}}
 
-  <label>Components</label>
+  <label>{{localize "LETHALFANTASY.Label.components"}}</label>
   <div class="shift-right">
     {{formField systemFields.components.fields.verbal value=system.components.verbal}}
     {{formField systemFields.components.fields.somatic value=system.components.somatic}}
@@ -31,6 +31,8 @@
   {{formField systemFields.extraAetherPoints value=system.extraAetherPoints}}
   {{formField systemFields.criticalType value=system.criticalType}}
   {{formField systemFields.damageDice value=system.damageDice}}
+  {{formField systemFields.damageDiceOverpowered value=system.damageDiceOverpowered}}
+  {{formField systemFields.damageDiceOverpowered2 value=system.damageDiceOverpowered2}}
 
 
   <fieldset>

templates/weapon.hbs

@@ -10,14 +10,14 @@
       {{formField systemFields.weaponType value=system.weaponType localize=true}}
       {{formField systemFields.weaponClass value=system.weaponClass localize=true}}
       
-      <label>Damage Type</label>
+      <label>{{localize "LETHALFANTASY.Label.damageType"}}</label>
       <div class="shift-right">
         {{formField systemFields.damageType.fields.typeP value=system.damageType.typeP}}
         {{formField systemFields.damageType.fields.typeB value=system.damageType.typeB}}
         {{formField systemFields.damageType.fields.typeS value=system.damageType.typeS}}
       </div>
 
-      <label>Damage</label>
+      <label>{{localize "LETHALFANTASY.Label.damage"}}</label>
       <div class="shift-right">
         {{formField systemFields.damage.fields.damageS value=system.damage.damageS}}
         {{formField systemFields.damage.fields.damageM value=system.damage.damageM}}
@@ -34,7 +34,7 @@
        {{/if}}
 
       {{#if (eq system.weaponType "ranged")}}
-        <label>Speed</label>
+        <label>{{localize "LETHALFANTASY.Label.speed"}}</label>
         <div class="shift-right">
           {{formField systemFields.speed.fields.simpleAim value=system.speed.simpleAim}}
           {{formField systemFields.speed.fields.carefulAim value=system.speed.carefulAim}}
@@ -47,7 +47,7 @@
 
         {{formField systemFields.defense value=system.defense}}
 
-        <label>Range</label>
+        <label>{{localize "LETHALFANTASY.Label.range"}}</label>
         <div class="shift-right">
           {{formField systemFields.weaponRange.fields.pointBlank value=system.weaponRange.pointBlank}}
           {{formField systemFields.weaponRange.fields.short value=system.weaponRange.short}}
@@ -60,7 +60,7 @@
 
       {{formField systemFields.equipped value=system.equipped}}
 
-      <label>Bonuses</label>
+      <label>{{localize "LETHALFANTASY.Label.bonuses"}}</label>
       <div class="shift-right">
         {{formField systemFields.bonuses.fields.attackBonus value=system.bonuses.attackBonus}}
         {{formField systemFields.bonuses.fields.defenseBonus value=system.bonuses.defenseBonus}}