Various initiative fixes + shield management messages

lang/en.json

@@ -428,7 +428,8 @@
       "weapons": "Weapons",
       "wis": "WIS",
       "weapon-damage-medium": "Weapon damage medium",
-      "weapon-damage-small": "Weapon damage small"
+      "weapon-damage-small": "Weapon damage small",
+      "combatProgressionStart": "Combat start threshold"
     },
     "Miracle": {
       "FIELDS": {
@@ -729,7 +730,8 @@
     "Tooltip": {
       "addEquipment": "New equipment",
       "addSpell": "New spells",
-      "skill": "Skills list"
+      "skill": "Skills list",
+      "combatProgressionStart": "First attack of combat can succeed on a roll of 1 through this value. Resets to 1 for subsequent attacks."
     },
     "Vulnerability": {
       "FIELDS": {

lethal-fantasy.mjs

@@ -250,6 +250,18 @@ 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
+    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 +274,9 @@ Hooks.on(hookName, (message, html, data) => {
       attackWeaponId: attackWeaponId,
       attackRollType: attackRollType,
       attackRollKey: attackRollKey,
+      attackD30result: attackD30result,
+      attackD30message: attackD30message,
+      attackRerollContext: attackRerollContext,
       combatantId: combatantId,
       tokenId: tokenId
     }
@@ -317,6 +332,8 @@ Hooks.on(hookName, (message, html, data) => {
     const attackKey = button.data("attack-key")
     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")
@@ -331,7 +348,7 @@ Hooks.on(hookName, (message, html, data) => {
 
     // 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)
+      await actor.system.prepareMonsterRoll("monster-damage", attackKey, undefined, undefined, undefined, defenderId, defenderTokenId, extraShieldDr)
       return
     }
 
@@ -350,7 +367,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)
+    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
@@ -409,8 +426,21 @@ Hooks.on("createChatMessage", async (message) => {
     return
   }
 
-  const { attackerId, attackRoll, attackerName, defenderName, attackWeaponId, attackRollType, attackRollKey, defenderId } = 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 })
 
@@ -422,26 +452,165 @@ 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) {
+  let shieldReaction = null
-    const hasGritOrLuck = (defender.system.grit.current > 0) || (defender.system.luck.current > 0)
+  if (defender && defenseRoll < attackRoll && isPrimaryController(defender)) {
+    const shieldData = LethalFantasyUtils.getShieldReactionData(defender)
+    let canRerollDefense = LethalFantasyUtils.hasD30Reroll(defenseD30message)
+    let canShieldReact = !!shieldData
 
-    if (hasGritOrLuck) {
+    while (defenseRoll < attackRoll) {
-      const bonusRoll = await LethalFantasyUtils.offerGritLuckBonus(
+      const currentGrit = Number(defender.system?.grit?.current) || 0
-        defender,
+      const currentLuck = Number(defender.system?.luck?.current) || 0
-        attackRoll,
+      const buttons = []
-        defenseRoll,
+
-        attackerName,
+      if (currentGrit > 0) {
-        defenderName
+        buttons.push({
-      )
+          action: "grit",
-      if (bonusRoll > 0) {
+          label: `Spend 1 Grit (+1D6) [${currentGrit} left]`,
-        defenseRoll += bonusRoll
+          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"
+        })
+      }
+
+      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)
+        defenseRoll += shieldBonus
+        shieldReaction = {
+          damageReduction: shieldData.damageReduction,
+          label: shieldData.label,
+          bonus: shieldBonus
+        }
+        canShieldReact = false
+        await createReactionMessage(
+          defender,
+          `<p><strong>${defenderName}</strong> rolls <strong>${shieldData.label}</strong> and adds <strong>${shieldBonus}</strong> to defense.${defenseRoll < attackRoll ? ` The hit still lands, but shield DR <strong>${shieldData.damageReduction}</strong> will reduce the damage.` : ""}</p>`
+        )
+      }
+    }
   }
 
   let attackRollFinal = attackRoll
@@ -449,31 +618,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) {
+  if (!defenderHandledBonus && attacker && attackRollFinal <= defenseRoll && isPrimaryController(attacker)) {
-    // Vérifier si l'utilisateur est un propriétaire non-GM de l'attaquant
+    let canRerollAttack = LethalFantasyUtils.hasD30Reroll(attackD30message)
-    const isAttackerOwner = !game.user.isGM && attacker.testUserPermission(game.user, "OWNER")
 
-    if (isAttackerOwner) {
+    while (attackRollFinal <= defenseRoll) {
-      console.log("Offering Grit to attacker")
+      const currentGrit = Number(attacker.system?.grit?.current) || 0
+      const buttons = []
 
-      const attackBonus = await LethalFantasyUtils.offerAttackerGritBonus(
+      if (currentGrit > 0) {
-        attacker,
+        buttons.push({
-        attackRollFinal,
+          action: "grit",
-        defenseRoll,
+          label: `Spend 1 Grit (+1D6) [${currentGrit} left]`,
-        attackerName,
+          icon: "fa-solid fa-fist-raised",
-        defenderName
+          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 = shieldReaction && attackRollFinal > defenseRoll ? shieldReaction.damageReduction : 0
+  const outcome = shieldDamageReduction > 0 ? "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 })
@@ -487,7 +723,10 @@ Hooks.on("createChatMessage", async (message) => {
       attackRollKey,
       defenderName,
       defenderId,
-      defenseRoll
+      defenderTokenId,
+      defenseRoll,
+      outcome,
+      shieldDamageReduction
     })
   } else {
     console.log("Skipping message creation", { attackerHandledBonus, defenderHandledBonus })
@@ -512,7 +751,7 @@ Hooks.on("createChatMessage", async (message) => {
   // 1. Si l'attaquant a un propriétaire joueur, seul ce joueur applique
   // 2. Si l'attaquant n'a que le MJ comme propriétaire (monstre), seul le MJ applique
   const attackerOwners = attacker ? game.users.filter(u =>
-    !u.isGM && attacker.testUserPermission(u, "OWNER")
+    u.active && !u.isGM && attacker.testUserPermission(u, "OWNER")
   ) : []
 
   let shouldApplyDamage = false
@@ -550,13 +789,17 @@ Hooks.on("createChatMessage", async (message) => {
 
   // Calculer les DR
   const armorDR = defender.computeDamageReduction() || 0
-  const finalDamage = Math.max(0, damageTotal - armorDR)
+  const extraShieldDr = Number(message.rolls[0]?.options?.extraShieldDr) || 0
+  const totalDR = armorDR + extraShieldDr
+  const finalDamage = Math.max(0, damageTotal - totalDR)
 
-  // For unlinked tokens (default for monsters), we need the specific token actor, not the base
+  // Prefer the token ID stored in roll options (set at attack time when the exact token is known).
-  // world actor — otherwise applyDamage would modify the base actor and affect every unlinked
+  // For unlinked tokens (default for monsters), this ensures we target the right instance even
-  // copy of that monster. Prefer the combatant actor, fall back to canvas scan.
+  // when multiple unlinked copies of the same monster type are in combat.
+  const rollDefenderTokenId = message.rolls[0]?.options?.defenderTokenId
   const defenderCombatant = game.combat?.combatants?.find(c => c.actorId === defender.id)
-  const defenderTokenId = defenderCombatant?.token?.id
+  const defenderTokenId = rollDefenderTokenId
+    ?? defenderCombatant?.token?.id
     ?? canvas.tokens?.placeables?.find(t => t.actor?.id === defender.id)?.id
     ?? null
 
@@ -564,7 +807,11 @@ Hooks.on("createChatMessage", async (message) => {
   // route the HP update to the GM via socket. The confirmation message is still created here
   // since all users can create chat messages.
   if (defender.isOwner) {
-    const tokenActor = defenderCombatant?.actor ?? defender
+    // Resolve the token actor: prefer lookup by token ID (exact match for unlinked monsters),
+    // fall back to combatant actor, then base world actor.
+    const tokenActor = (defenderTokenId
+      ? canvas.tokens?.placeables?.find(t => t.id === defenderTokenId)?.actor
+      : defenderCombatant?.actor) ?? defender
     await tokenActor.applyDamage(-finalDamage)
   } else {
     game.socket.emit(`system.${SYSTEM.id}`, { type: "applyDamage", actorId: defender.id, tokenId: defenderTokenId, damage: -finalDamage })
@@ -576,7 +823,7 @@ Hooks.on("createChatMessage", async (message) => {
     {
       targetName: defender.name,
       damage: finalDamage,
-      drText: armorDR > 0 ? `Armor DR: ${armorDR}` : "",
+      drText: totalDR > 0 ? `Armor DR: ${armorDR}${extraShieldDr > 0 ? ` + Shield DR: ${extraShieldDr}` : ""}` : "",
       weaponName: weaponName,
       attackerName: attackerName,
       rawDamage: damageTotal

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);
+      const playerOwner = game.users.find(u => u.active && !u.isGM && u.character?.id === c.actor.id);
-      if (user?.hasPlayerOwner) {
+      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);
+        await c.actor.system.rollInitiative(this.id, c.id);
-        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);
+        const playerOwner = game.users.find(u => u.active && !u.isGM && u.character?.id === c.actor.id);
-        if (user?.hasPlayerOwner) {
+        if (game.user.isGM && playerOwner) {
-          game.socket.emit(`system.${SYSTEM.id}`, { type: "rollProgressionDice", progressionCount: c.system.progressionCount + 1, actorId: c.actor.id, combatId: this.id, combatantId: c.id });
+          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);
+          await c.actor.system.rollProgressionDice(this.id, c.id);
-          c.actor.system.rollProgressionDice(this.id, c.id);
         }
       }
     }

module/documents/actor.mjs

@@ -153,7 +153,7 @@ export default class LethalFantasyActor extends Actor {
   }
 
   /* *************************************************/
-  async prepareRoll(rollType, rollKey, rollDice, defenderId) {
+  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)
+    await this.system.roll(rollType, rollTarget, defenderId, defenderTokenId, extraShieldDr)
   }
 
 }

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();
+              canvas.tokens.releaseAll()
-            token.control({ releaseOthers: true });
+              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) {
@@ -620,6 +639,8 @@ export default class LethalFantasyRoll extends Roll {
     rollBase.options.badResult = badResult
     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.
@@ -698,7 +719,7 @@ export default class LethalFantasyRoll extends Roll {
 
     if (options.combatId && options.combatantId) {
       let combat = game.combats.get(options.combatId)
-      await combat.updateEmbeddedDocuments("Combatant", [{ _id: options.combatantId, initiative: initRoll.total, 'system.progressionCount': 0 }])
+      await combat.updateEmbeddedDocuments("Combatant", [{ _id: options.combatantId, initiative: initRoll.total, 'system.progressionCount': 0, [`flags.${SYSTEM.id}.firstActionTaken`]: false }])
     }
   }
 
@@ -835,7 +856,11 @@ export default class LethalFantasyRoll extends Roll {
       let selectedItem = combatant.actor.items.find(i => i.id === selectedChoice)
       // Setup flag for combat action usage
       let actionItem = foundry.utils.duplicate(selectedItem)
-      actionItem.progressionCount = 1
+      // First action of this combat: use the class-based starting threshold;
+      // all subsequent actions reset to 1 (normal progression).
+      const firstActionTaken = combatant.getFlag(SYSTEM.id, "firstActionTaken")
+      actionItem.progressionCount = firstActionTaken ? 1 : (combatant.actor.system.combat?.combatProgressionStart ?? 1)
+      if (!firstActionTaken) await combatant.setFlag(SYSTEM.id, "firstActionTaken", true)
       actionItem.rangedMode = rangedMode
       actionItem.castingTime = 1
       actionItem.spellStatus = "castingTime"
@@ -1291,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,
@@ -1308,7 +1333,7 @@ export default class LethalFantasyRoll extends Roll {
         rollData: this.rollData,
         ...messageData,
       },
-      { rollMode: rollMode },
+      { rollMode, create },
     )
   }
 

module/models/character.mjs

@@ -155,6 +155,7 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod
       defenseBonus: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
       damageModifier: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
       armorHitPoints: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
+      combatProgressionStart: new fields.NumberField({ ...requiredInteger, initial: 1, min: 1 }),
     })
 
     const moneyField = (label) => {
@@ -273,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) {
+  async roll(rollType, rollTarget, defenderId, defenderTokenId, extraShieldDr = 0) {
     const hasTarget = false
     let roll = await LethalFantasyRoll.prompt({
       rollType,
@@ -283,7 +284,9 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod
       actorImage: this.parent.img,
       hasTarget,
       target: false,
-      defenderId
+      defenderId,
+      defenderTokenId,
+      extraShieldDr
     })
     if (!roll) return null
 

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) {
+  async roll(rollType, rollTarget, defenderId = undefined, defenderTokenId = undefined, extraShieldDr = 0) {
     const hasTarget = false
     let roll = await LethalFantasyRoll.prompt({
       rollType,
@@ -151,14 +151,16 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel
       actorImage: this.parent.img,
       hasTarget,
       target: false,
-      defenderId
+      defenderId,
+      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) {
+  async prepareMonsterRoll(rollType, rollKey, rollDice = undefined, tokenId = undefined, damageModifier = undefined, defenderId = undefined, defenderTokenId = undefined, extraShieldDr = 0) {
     let rollTarget
     switch (rollType) {
       case "monster-attack":
@@ -254,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)
+      await this.roll(rollType, rollTarget, defenderId, defenderTokenId, extraShieldDr)
     }
   }
 

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
 
@@ -216,6 +221,18 @@ export default class LethalFantasyUtils {
       return
     }
 
+    // Resolve the specific token ID now while we still have combatant/token context.
+    // This is passed through to the damage roll so the GM-side socket handler can find the
+    // correct synthetic actor for unlinked tokens (avoids wrong-instance damage with multiple
+    // unlinked copies of the same monster).
+    const defenderTokenId = (() => {
+      if (game.combat && combatantId) {
+        const cbt = game.combat.combatants.get(combatantId)
+        if (cbt?.token?.id) return cbt.token.id
+      }
+      return tokenId ?? canvas.tokens?.placeables?.find(t => t.actor?.id === defender.id)?.id ?? null
+    })()
+
     const isMonster = defender.type === "monster"
 
     // Pour les monstres, récupérer les attaques activées
@@ -277,11 +294,13 @@ export default class LethalFantasyUtils {
           attackWeaponId,
           attackRollType,
           attackRollKey,
-          defenderId: defender.id
+          attackD30result,
+          attackD30message,
+          attackRerollContext,
+          defenderId: defender.id,
+          defenderTokenId
         }
 
-        console.log("Storing defense data for monster:", defender.id)
-
         defender.system.prepareMonsterRoll("monster-defense", result)
       }
       return
@@ -347,7 +366,11 @@ export default class LethalFantasyUtils {
         attackWeaponId,
         attackRollType,
         attackRollKey,
-        defenderId: defender.id
+        attackD30result,
+        attackD30message,
+        attackRerollContext,
+        defenderId: defender.id,
+        defenderTokenId
       }
 
       console.log("Storing defense data for character:", defender.id)
@@ -356,6 +379,114 @@ 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: [
+        {
+          label: "Roll Bonus Die",
+          icon: "fa-solid fa-dice",
+          callback: (event, button, dialog) => button.form.elements.bonusDie.value
+        },
+        {
+          label: "Cancel",
+          icon: "fa-solid fa-xmark",
+          callback: () => null
+        }
+      ],
+      rejectClose: false
+    })
+  }
+
+  /* -------------------------------------------- */
+  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
@@ -526,7 +657,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 = ""
@@ -536,10 +668,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-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-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>
@@ -547,7 +679,7 @@ 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-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>
@@ -576,9 +708,11 @@ export default class LethalFantasyUtils {
           </div>
         </div>
         <div class="combat-result-text">
-          ${isAttackWin ?
+          ${outcome === "shielded-hit"
-        `<i class="fa-solid fa-circle-check"></i> <strong>${data.attackerName}</strong> hits <strong>${data.defenderName}</strong>!` :
+        ? `<i class="fa-solid fa-shield"></i> <strong>${data.attackerName}</strong> still hits <strong>${data.defenderName}</strong>, but shield DR <strong>${data.shieldDamageReduction || 0}</strong> reduces the damage.`
-        `<i class="fa-solid fa-shield-halved"></i> <strong>${data.defenderName}</strong> parries the attack!`
+        : 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}

packs-system/lf-equipment/CURRENT

@@ -1 +1 @@
-MANIFEST-000539
+MANIFEST-000551

packs-system/lf-equipment/LOG

@@ -1,8 +1,8 @@
-2026/02/06-21:03:10.117032 7f71b6ffd6c0 Recovering log #537
+2026/04/12-00:56:41.816652 7f20ecbfc6c0 Recovering log #549
-2026/02/06-21:03:10.127068 7f71b6ffd6c0 Delete type=3 #535
+2026/04/12-00:56:41.832396 7f20ecbfc6c0 Delete type=3 #547
-2026/02/06-21:03:10.127128 7f71b6ffd6c0 Delete type=0 #537
+2026/04/12-00:56:41.832446 7f20ecbfc6c0 Delete type=0 #549
-2026/02/06-21:51:23.216143 7f71b67fc6c0 Level-0 table #542: started
+2026/04/12-01:07:05.182307 7f1e4ffff6c0 Level-0 table #554: started
-2026/02/06-21:51:23.216190 7f71b67fc6c0 Level-0 table #542: 0 bytes OK
+2026/04/12-01:07:05.182364 7f1e4ffff6c0 Level-0 table #554: 0 bytes OK
-2026/02/06-21:51:23.251149 7f71b67fc6c0 Delete type=0 #540
+2026/04/12-01:07:05.188459 7f1e4ffff6c0 Delete type=0 #552
-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/04/12-01:07:05.207103 7f1e4ffff6c0 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/12-01:07:05.207149 7f1e4ffff6c0 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/02/04-08:49:16.805619 7f3bddbff6c0 Recovering log #533
+2026/04/11-21:32:22.595743 7f20ecbfc6c0 Recovering log #545
-2026/02/04-08:49:16.866468 7f3bddbff6c0 Delete type=3 #531
+2026/04/11-21:32:22.605266 7f20ecbfc6c0 Delete type=3 #543
-2026/02/04-08:49:16.866605 7f3bddbff6c0 Delete type=0 #533
+2026/04/11-21:32:22.605313 7f20ecbfc6c0 Delete type=0 #545
-2026/02/04-08:52:25.382505 7f3946fff6c0 Level-0 table #538: started
+2026/04/12-00:19:41.485614 7f1e4ffff6c0 Level-0 table #550: started
-2026/02/04-08:52:25.382568 7f3946fff6c0 Level-0 table #538: 0 bytes OK
+2026/04/12-00:19:41.485662 7f1e4ffff6c0 Level-0 table #550: 0 bytes OK
-2026/02/04-08:52:25.390046 7f3946fff6c0 Delete type=0 #536
+2026/04/12-00:19:41.492344 7f1e4ffff6c0 Delete type=0 #548
-2026/02/04-08:52:25.403667 7f3946fff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/04/12-00:19:41.513106 7f1e4ffff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2026/02/04-08:52:25.403757 7f3946fff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/04/12-00:19:41.513142 7f1e4ffff6c0 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-000536
+MANIFEST-000548

packs-system/lf-gifts/LOG

@@ -1,8 +1,8 @@
-2026/02/06-21:03:10.133019 7f71b7fff6c0 Recovering log #534
+2026/04/12-00:56:41.835571 7f20ee3ff6c0 Recovering log #546
-2026/02/06-21:03:10.144336 7f71b7fff6c0 Delete type=3 #532
+2026/04/12-00:56:41.850974 7f20ee3ff6c0 Delete type=3 #544
-2026/02/06-21:03:10.144427 7f71b7fff6c0 Delete type=0 #534
+2026/04/12-00:56:41.851033 7f20ee3ff6c0 Delete type=0 #546
-2026/02/06-21:51:23.291316 7f71b67fc6c0 Level-0 table #539: started
+2026/04/12-01:07:05.194434 7f1e4ffff6c0 Level-0 table #551: started
-2026/02/06-21:51:23.291356 7f71b67fc6c0 Level-0 table #539: 0 bytes OK
+2026/04/12-01:07:05.194455 7f1e4ffff6c0 Level-0 table #551: 0 bytes OK
-2026/02/06-21:51:23.327518 7f71b67fc6c0 Delete type=0 #537
+2026/04/12-01:07:05.200694 7f1e4ffff6c0 Delete type=0 #549
-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/04/12-01:07:05.207125 7f1e4ffff6c0 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/12-01:07:05.207165 7f1e4ffff6c0 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/02/04-08:49:16.884043 7f3bdd3fe6c0 Recovering log #530
+2026/04/11-21:32:22.610678 7f20ed3fd6c0 Recovering log #542
-2026/02/04-08:49:16.942005 7f3bdd3fe6c0 Delete type=3 #528
+2026/04/11-21:32:22.621586 7f20ed3fd6c0 Delete type=3 #540
-2026/02/04-08:49:16.942138 7f3bdd3fe6c0 Delete type=0 #530
+2026/04/11-21:32:22.621657 7f20ed3fd6c0 Delete type=0 #542
-2026/02/04-08:52:25.418216 7f3946fff6c0 Level-0 table #535: started
+2026/04/12-00:19:41.492538 7f1e4ffff6c0 Level-0 table #547: started
-2026/02/04-08:52:25.418276 7f3946fff6c0 Level-0 table #535: 0 bytes OK
+2026/04/12-00:19:41.492574 7f1e4ffff6c0 Level-0 table #547: 0 bytes OK
-2026/02/04-08:52:25.424939 7f3946fff6c0 Delete type=0 #533
+2026/04/12-00:19:41.499243 7f1e4ffff6c0 Delete type=0 #545
-2026/02/04-08:52:25.432353 7f3946fff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/04/12-00:19:41.513118 7f1e4ffff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
-2026/02/04-08:52:25.432442 7f3946fff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/04/12-00:19:41.513149 7f1e4ffff6c0 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-000541
+MANIFEST-000553

packs-system/lf-skills/LOG

@@ -1,8 +1,8 @@
-2026/02/06-21:03:10.101791 7f71b77fe6c0 Recovering log #539
+2026/04/12-00:56:41.797453 7f20ed3fd6c0 Recovering log #551
-2026/02/06-21:03:10.111914 7f71b77fe6c0 Delete type=3 #537
+2026/04/12-00:56:41.813315 7f20ed3fd6c0 Delete type=3 #549
-2026/02/06-21:03:10.111991 7f71b77fe6c0 Delete type=0 #539
+2026/04/12-00:56:41.813371 7f20ed3fd6c0 Delete type=0 #551
-2026/02/06-21:51:23.251285 7f71b67fc6c0 Level-0 table #544: started
+2026/04/12-01:07:05.200810 7f1e4ffff6c0 Level-0 table #556: started
-2026/02/06-21:51:23.251325 7f71b67fc6c0 Level-0 table #544: 0 bytes OK
+2026/04/12-01:07:05.200837 7f1e4ffff6c0 Level-0 table #556: 0 bytes OK
-2026/02/06-21:51:23.291180 7f71b67fc6c0 Delete type=0 #542
+2026/04/12-01:07:05.207008 7f1e4ffff6c0 Delete type=0 #554
-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/04/12-01:07:05.207134 7f1e4ffff6c0 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/12-01:07:05.207157 7f1e4ffff6c0 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/02/04-08:49:16.723698 7f3bdcbfd6c0 Recovering log #535
+2026/04/11-21:32:22.580345 7f20ee3ff6c0 Recovering log #547
-2026/02/04-08:49:16.780187 7f3bdcbfd6c0 Delete type=3 #533
+2026/04/11-21:32:22.590425 7f20ee3ff6c0 Delete type=3 #545
-2026/02/04-08:49:16.780329 7f3bdcbfd6c0 Delete type=0 #535
+2026/04/11-21:32:22.590495 7f20ee3ff6c0 Delete type=0 #547
-2026/02/04-08:52:25.375521 7f3946fff6c0 Level-0 table #540: started
+2026/04/12-00:19:41.520423 7f1e4ffff6c0 Level-0 table #552: started
-2026/02/04-08:52:25.375622 7f3946fff6c0 Level-0 table #540: 0 bytes OK
+2026/04/12-00:19:41.520464 7f1e4ffff6c0 Level-0 table #552: 0 bytes OK
-2026/02/04-08:52:25.382202 7f3946fff6c0 Delete type=0 #538
+2026/04/12-00:19:41.527028 7f1e4ffff6c0 Delete type=0 #550
-2026/02/04-08:52:25.403638 7f3946fff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/04/12-00:19:41.543900 7f1e4ffff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2026/02/04-08:52:25.403738 7f3946fff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/04/12-00:19:41.554664 7f1e4ffff6c0 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-000236
+MANIFEST-000248

packs-system/lf-spells-miracles/LOG

@@ -1,8 +1,8 @@
-2026/02/06-21:03:10.160494 7f71b6ffd6c0 Recovering log #234
+2026/04/12-00:56:41.870438 7f20ecbfc6c0 Recovering log #246
-2026/02/06-21:03:10.170771 7f71b6ffd6c0 Delete type=3 #232
+2026/04/12-00:56:41.885745 7f20ecbfc6c0 Delete type=3 #244
-2026/02/06-21:03:10.170846 7f71b6ffd6c0 Delete type=0 #234
+2026/04/12-00:56:41.885813 7f20ecbfc6c0 Delete type=0 #246
-2026/02/06-21:51:23.435610 7f71b67fc6c0 Level-0 table #239: started
+2026/04/12-01:07:05.229253 7f1e4ffff6c0 Level-0 table #251: started
-2026/02/06-21:51:23.435649 7f71b67fc6c0 Level-0 table #239: 0 bytes OK
+2026/04/12-01:07:05.229286 7f1e4ffff6c0 Level-0 table #251: 0 bytes OK
-2026/02/06-21:51:23.473038 7f71b67fc6c0 Delete type=0 #237
+2026/04/12-01:07:05.235261 7f1e4ffff6c0 Delete type=0 #249
-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/04/12-01:07:05.235386 7f1e4ffff6c0 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/12-01:07:05.245080 7f1e4ffff6c0 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/02/04-08:49:17.043224 7f3bc7fff6c0 Recovering log #230
+2026/04/11-21:32:22.642207 7f20edbfe6c0 Recovering log #242
-2026/02/04-08:49:17.105842 7f3bc7fff6c0 Delete type=3 #228
+2026/04/11-21:32:22.652005 7f20edbfe6c0 Delete type=3 #240
-2026/02/04-08:49:17.106088 7f3bc7fff6c0 Delete type=0 #230
+2026/04/11-21:32:22.652058 7f20edbfe6c0 Delete type=0 #242
-2026/02/04-08:52:25.396931 7f3946fff6c0 Level-0 table #235: started
+2026/04/12-00:19:41.506566 7f1e4ffff6c0 Level-0 table #247: started
-2026/02/04-08:52:25.396997 7f3946fff6c0 Level-0 table #235: 0 bytes OK
+2026/04/12-00:19:41.506602 7f1e4ffff6c0 Level-0 table #247: 0 bytes OK
-2026/02/04-08:52:25.403390 7f3946fff6c0 Delete type=0 #233
+2026/04/12-00:19:41.512971 7f1e4ffff6c0 Delete type=0 #245
-2026/02/04-08:52:25.403717 7f3946fff6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/04/12-00:19:41.513136 7f1e4ffff6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2026/02/04-08:52:25.403823 7f3946fff6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/04/12-00:19:41.513162 7f1e4ffff6c0 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-000535
+MANIFEST-000547

packs-system/lf-vulnerabilities/LOG

@@ -1,8 +1,8 @@
-2026/02/06-21:03:10.146976 7f71b77fe6c0 Recovering log #533
+2026/04/12-00:56:41.853085 7f20ed3fd6c0 Recovering log #545
-2026/02/06-21:03:10.156549 7f71b77fe6c0 Delete type=3 #531
+2026/04/12-00:56:41.867862 7f20ed3fd6c0 Delete type=3 #543
-2026/02/06-21:03:10.156610 7f71b77fe6c0 Delete type=0 #533
+2026/04/12-00:56:41.867925 7f20ed3fd6c0 Delete type=0 #545
-2026/02/06-21:51:23.327858 7f71b67fc6c0 Level-0 table #538: started
+2026/04/12-01:07:05.188580 7f1e4ffff6c0 Level-0 table #550: started
-2026/02/06-21:51:23.327892 7f71b67fc6c0 Level-0 table #538: 0 bytes OK
+2026/04/12-01:07:05.188606 7f1e4ffff6c0 Level-0 table #550: 0 bytes OK
-2026/02/06-21:51:23.359727 7f71b67fc6c0 Delete type=0 #536
+2026/04/12-01:07:05.194367 7f1e4ffff6c0 Delete type=0 #548
-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/04/12-01:07:05.207115 7f1e4ffff6c0 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/12-01:07:05.207142 7f1e4ffff6c0 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/02/04-08:49:16.956252 7f3bdcbfd6c0 Recovering log #529
+2026/04/11-21:32:22.628476 7f20ecbfc6c0 Recovering log #541
-2026/02/04-08:49:17.018344 7f3bdcbfd6c0 Delete type=3 #527
+2026/04/11-21:32:22.638519 7f20ecbfc6c0 Delete type=3 #539
-2026/02/04-08:49:17.018475 7f3bdcbfd6c0 Delete type=0 #529
+2026/04/11-21:32:22.638582 7f20ecbfc6c0 Delete type=0 #541
-2026/02/04-08:52:25.390221 7f3946fff6c0 Level-0 table #534: started
+2026/04/12-00:19:41.499517 7f1e4ffff6c0 Level-0 table #546: started
-2026/02/04-08:52:25.390273 7f3946fff6c0 Level-0 table #534: 0 bytes OK
+2026/04/12-00:19:41.499556 7f1e4ffff6c0 Level-0 table #546: 0 bytes OK
-2026/02/04-08:52:25.396704 7f3946fff6c0 Delete type=0 #532
+2026/04/12-00:19:41.506406 7f1e4ffff6c0 Delete type=0 #544
-2026/02/04-08:52:25.403694 7f3946fff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/04/12-00:19:41.513127 7f1e4ffff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2026/02/04-08:52:25.403801 7f3946fff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/04/12-00:19:41.513155 7f1e4ffff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)

templates/character-combat.hbs

@@ -21,6 +21,11 @@
             <a data-action="armorHitPointsMinus"><i class="fa-solid fa-hexagon-minus"></i></a>
           </div>
 
+          <div class="flexrow armor-hp">
+            <span class="name" data-tooltip="{{localize 'LETHALFANTASY.Tooltip.combatProgressionStart'}}">{{localize "LETHALFANTASY.Label.combatProgressionStart"}}</span>
+            {{formInput systemFields.combat.fields.combatProgressionStart value=system.combat.combatProgressionStart disabled=isPlayMode }}
+          </div>
+
           <div class="flexrow granted">
             <span class="">{{localize
               "LETHALFANTASY.Label.grantedAttackDice"}}</a></span>

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}}

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"

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" }}