Roll damages and so on

Manage DR and damage roll
Fix DR and defense values
2025-12-14 21:18:00 +01:00 · 2025-12-14 20:48:33 +01:00 · 2025-12-08 11:54:36 +01:00 · 2025-11-07 07:58:58 +01:00 · 2025-10-17 20:06:49 +02:00 · 2025-10-01 17:26:29 +02:00
52 changed files with 1685 additions and 556 deletions
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -1,6 +1,6 @@
 name: Release Creation

-on: 
+on:
  release:
    types: [published]

@@ -8,45 +8,56 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-    - run: echo "💡 The ${{ gitea.repository }} repository will cloned to the runner."
-    
-    #- uses: actions/checkout@v3
-    - uses: RouxAntoine/checkout@v3.5.4
+      - run: echo "💡 The ${{ gitea.repository }} repository will cloned to the runner."

-    # get part of the tag after the `v`
-    - name: Extract tag version number
-      id: get_version
-      uses: battila7/get-version-action@v2
+      #- uses: actions/checkout@v3
+      - uses: RouxAntoine/checkout@v3.5.4

-    # Substitute the Manifest and Download URLs in the module.json
-    - name: Substitute Manifest and Download Links For Versioned Ones
-      id: sub_manifest_link_version
-      uses: microsoft/variable-substitution@v1
-      with:
-        files: 'system.json'
-      env:
-        version: ${{steps.get_version.outputs.version-without-v}}
-        url: https://www.uberwald.me/gitea/${{gitea.repository}}
-        manifest: https://www.uberwald.me/gitea/public/${{gitea.repository}}/releases/download/latest/system.json
-        download: https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/fvtt-lethal-fantasy-${{github.event.release.tag_name}}.zip
-    
-    # Create a zip file with all files required by the module to add to the release
-    - run: |
-         apt update -y
-         apt install -y zip
+      # get part of the tag after the `v`
+      - name: Extract tag version number
+        id: get_version
+        uses: battila7/get-version-action@v2

-    - run: zip -r ./fvtt-lethal-fantasy-${{github.event.release.tag_name}}.zip system.json README.md LICENSE assets/ css/ lang/ module/ packs-system/ templates/ lethal-fantasy.mjs
-    
-    - name: setup go
-      uses: https://github.com/actions/setup-go@v4
-      with:
-        go-version: '>=1.20.1'
-    
-    - name: Use Go Action  
-      id: use-go-action
-      uses: https://gitea.com/actions/release-action@main
-      with:
-        files: |-
-          ./fvtt-lethal-fantasy-${{github.event.release.tag_name}}.zip
-          system.json
-        api_key: '${{secrets.ALLOW_PUSH_RELEASE}}'
+      # Substitute the Manifest and Download URLs in the module.json
+      - name: Substitute Manifest and Download Links For Versioned Ones
+        id: sub_manifest_link_version
+        uses: microsoft/variable-substitution@v1
+        with:
+          files: "system.json"
+        env:
+          version: ${{steps.get_version.outputs.version-without-v}}
+          url: https://www.uberwald.me/gitea/${{gitea.repository}}
+          manifest: https://www.uberwald.me/gitea/public/${{gitea.repository}}/releases/download/latest/system.json
+          download: https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/fvtt-lethal-fantasy-${{github.event.release.tag_name}}.zip
+
+      # Create a zip file with all files required by the module to add to the release
+      - run: |
+          apt update -y
+          apt install -y zip
+
+      - run: zip -r ./fvtt-lethal-fantasy-${{github.event.release.tag_name}}.zip system.json README.md LICENSE assets/ css/ lang/ module/ packs-system/ templates/ lethal-fantasy.mjs
+
+      - name: setup go
+        uses: https://github.com/actions/setup-go@v4
+        with:
+          go-version: ">=1.20.1"
+
+      - name: Use Go Action
+        id: use-go-action
+        uses: https://gitea.com/actions/release-action@main
+        with:
+          files: |-
+            ./fvtt-lethal-fantasy-${{github.event.release.tag_name}}.zip
+            system.json
+          api_key: "${{secrets.ALLOW_PUSH_RELEASE}}"
+
+      - name: Publish to Foundry server
+        uses: djlechuck/foundryvtt-publish-package-action@v1
+        with:
+          token: ${{ secrets.FOUNDRY_PUBLISH_KEY }}
+          id: "fvtt-lethal-fantasy"
+          version: ${{github.event.release.tag_name}}
+          manifest: "https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/system.json"
+          notes: "https://www.uberwald.me/gitea/public/fvtt-lethal-fantasy/raw/branch/main/changelog.md"
+          compatibility-minimum: "13"
+          compatibility-verified: "13"
--- a/changelog.md
+++ b/changelog.md
@@ -0,0 +1,5 @@
+## v13.0.12
+
+- Fix favor/disfavor
+- Fix granted dice
+- Cosmetic fixes
--- a/css/fvtt-lethal-fantasy.css
+++ b/css/fvtt-lethal-fantasy.css
@@ -2218,6 +2218,54 @@ i.lethalfantasy {
  border-color: var(--color-dark-6);
  color: var(--color-dark-2);
 }
+.application.dialog.lethalfantasy .apply-damage-dialog .dialog-content {
+  padding: 6px;
+  font-size: calc(var(--font-size-standard) * 1);
+}
+.application.dialog.lethalfantasy .apply-damage-dialog .dialog-content .header {
+  text-align: center;
+  padding: 4px;
+  margin-bottom: 6px;
+  background-color: rgba(0, 0, 0, 0.1);
+  border-radius: 3px;
+}
+.application.dialog.lethalfantasy .apply-damage-dialog .dialog-content .damage-summary {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 4px 6px;
+  margin-bottom: 6px;
+  background-color: rgba(139, 0, 0, 0.1);
+  border-radius: 3px;
+}
+.application.dialog.lethalfantasy .apply-damage-dialog .dialog-content .damage-summary .damage-value {
+  color: var(--color-level-error);
+  font-size: calc(var(--font-size-standard) * 1.2);
+  font-weight: bold;
+}
+.application.dialog.lethalfantasy .apply-damage-dialog .dialog-content .dr-summary {
+  display: flex;
+  justify-content: space-around;
+  gap: 4px;
+  padding: 3px;
+  margin-bottom: 6px;
+  font-size: calc(var(--font-size-standard) * 0.85);
+  background-color: rgba(0, 0, 0, 0.05);
+  border-radius: 3px;
+}
+.application.dialog.lethalfantasy .apply-damage-dialog .dialog-content .damage-options .option-line {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 3px 6px;
+  margin: 2px 0;
+  background-color: rgba(0, 0, 0, 0.05);
+  border-radius: 3px;
+}
+.application.dialog.lethalfantasy .apply-damage-dialog .dialog-content .damage-options .option-line strong {
+  color: var(--color-dark-1);
+  font-size: calc(var(--font-size-standard) * 1.05);
+}
 .lethalfantasy-roll-dialog fieldset {
  padding: 4px;
 }
@@ -2261,9 +2309,16 @@ i.lethalfantasy {
  min-width: 5rem;
  max-width: 5em;
 }
+.dialog-form .form-footer {
+  padding: 4px;
+  gap: 4px;
+}
 .dialog-form .form-footer button {
-  min-width: 14rem;
-  min-height: 3.2rem;
+  min-width: 8rem;
+  min-height: 2rem;
+  padding: 2px 6px;
+  margin: 0;
+  font-size: calc(var(--font-size-standard) * 0.9);
 }
 .dialog-modifier {
  display: flex;
@@ -2356,6 +2411,111 @@ i.lethalfantasy {
  font-size: calc(var(--font-size-standard) * 1);
  text-shadow: 0 0 10px var(--color-shadow-primary);
 }
+.dice-roll .damage-buttons {
+  width: 100%;
+  padding: 8px;
+  margin-top: 8px;
+}
+.dice-roll .damage-buttons .damage-buttons-title {
+  font-weight: bold;
+  margin-bottom: 8px;
+  font-size: calc(var(--font-size-standard) * 0.95);
+  text-align: center;
+}
+.dice-roll .damage-buttons .damage-buttons-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 6px;
+  padding: 8px;
+  background-color: rgba(0, 0, 0, 0.1);
+  border-radius: 5px;
+}
+.dice-roll .damage-buttons .damage-buttons-grid .damage-roll-btn {
+  padding: 6px 10px;
+  background: linear-gradient(to bottom, #8b4513 0%, #6b3410 100%);
+  border: 1px solid #4b2408;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+  color: #f0f0e0;
+  cursor: pointer;
+  border-radius: 4px;
+  font-size: calc(var(--font-size-standard) * 0.85);
+  font-weight: 500;
+  text-align: center;
+  transition: all 0.2s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+}
+.dice-roll .damage-buttons .damage-buttons-grid .damage-roll-btn i {
+  font-size: calc(var(--font-size-standard) * 1);
+}
+.dice-roll .damage-buttons .damage-buttons-grid .damage-roll-btn:hover {
+  background: linear-gradient(to bottom, #9b5523 0%, #7b4420 100%);
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.4);
+  transform: translateY(-1px);
+  border-color: #5b3418;
+}
+.dice-roll .damage-buttons .damage-buttons-grid .damage-roll-btn:active {
+  transform: translateY(0);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+}
+.dice-roll .damage-result {
+  width: 100%;
+  padding: 8px;
+}
+.dice-roll .damage-result ul {
+  padding: 0;
+  margin: 0;
+}
+.dice-roll .damage-result .li-apply-wounds {
+  list-style: none;
+  margin-top: 10px;
+  padding: 0;
+  display: none;
+}
+.dice-roll .damage-result .li-apply-wounds > div:first-child {
+  font-weight: bold;
+  margin-bottom: 8px;
+  font-size: calc(var(--font-size-standard) * 0.95);
+  text-align: center;
+}
+.dice-roll .damage-result .li-apply-wounds .combatants-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 6px;
+  margin-top: 5px;
+  padding: 8px;
+  background-color: rgba(0, 0, 0, 0.1);
+  border-radius: 5px;
+}
+.dice-roll .damage-result .li-apply-wounds .combatants-grid .apply-wounds-btn {
+  padding: 6px 10px;
+  background: linear-gradient(to bottom, #5a5850 0%, #4b4a44 100%);
+  border: 1px solid #2b2a24;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+  color: #f0f0e0;
+  cursor: pointer;
+  border-radius: 4px;
+  font-size: calc(var(--font-size-standard) * 0.85);
+  font-weight: 500;
+  text-align: center;
+  transition: all 0.2s ease;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 100%;
+}
+.dice-roll .damage-result .li-apply-wounds .combatants-grid .apply-wounds-btn:hover {
+  background: linear-gradient(to bottom, #6a6860 0%, #5a5850 100%);
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.4);
+  transform: translateY(-1px);
+  border-color: #3b3a34;
+}
+.dice-roll .damage-result .li-apply-wounds .combatants-grid .apply-wounds-btn:active {
+  transform: translateY(0);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+}
 #token-hud .hp-loss-wrap {
  position: absolute;
  left: 75px;
--- a/lang/en.json
+++ b/lang/en.json
@@ -282,6 +282,8 @@
    },
    "Label": {
      "agility": "Dexterity",
+      "applyDamage": "Apply damage to:",
+      "rollDamage": "Roll Damage",
      "gotoToken": "Go to token",
      "combatAction": "Combat action",
      "currentAction": "Current ongoing action",
@@ -421,7 +423,9 @@
      "monster-damage": "Monster damage",
      "monster-defense": "Monster defense",
      "weapons": "Weapons",
-      "wis": "WIS"
+      "wis": "WIS",
+      "weapon-damage-medium": "Weapon damage medium",
+      "weapon-damage-small": "Weapon damage small"
    },
    "Miracle": {
      "FIELDS": {
@@ -856,6 +860,20 @@
        "melee": "Melee",
        "ranged": "Ranged"
      }
+    },
+    "Dialog": {
+      "applyDamageTo": "Apply damage to",
+      "weapon": "Weapon",
+      "totalDamage": "Total Damage",
+      "damageReduction": "Damage Reduction",
+      "armorDR": "Armor DR",
+      "shieldDR": "Shield DR",
+      "totalDR": "Total DR",
+      "selectOption": "Select damage application option",
+      "noDR": "No DR",
+      "withArmor": "With Armor DR only",
+      "withAll": "With Armor + Shield DR",
+      "damage": "damage"
    }
  },
  "TYPES": {
--- a/lethal-fantasy.mjs
+++ b/lethal-fantasy.mjs
@@ -152,6 +152,65 @@ Hooks.on(hookName, (message, html, data) => {
      })
    }
  }
+
+  // Gestion du survol et du clic sur les boutons de dégâts pour les GMs
+  if (game.user.isGM) {
+    // Show damage buttons only for GM
+    $(html).find(".li-apply-wounds").each((i, btn) => {
+      btn.style.display = "block"
+    })
+
+    $(html).find(".apply-wounds-btn").hover(
+      function (event) {
+        // Mouse enter - select the token and pan to it
+        let combatantId = $(this).data("combatant-id")
+        if (combatantId && game.combat) {
+          let combatant = game.combat.combatants.get(combatantId)
+          if (combatant?.token) {
+            let token = canvas.tokens.get(combatant.token.id)
+            if (token) {
+              token.control({ releaseOthers: true })
+              canvas.animatePan(token.center)
+            }
+          }
+        }
+      },
+      function (event) {
+        // Mouse leave - release selection
+        canvas.tokens.releaseAll()
+      }
+    )
+
+    $(html).find(".apply-wounds-btn").click((event) => {
+      LethalFantasyUtils.applyDamage(message, event)
+    })
+  }
+
+  // Gestionnaire pour les boutons de jet de dégâts
+  $(html).find(".damage-roll-btn").click(async (event) => {
+    const button = $(event.currentTarget)
+    const weaponId = button.data("weapon-id")
+    const damageType = button.data("damage-type")
+    const damageFormula = button.data("damage-formula")
+
+    // Récupérer l'acteur qui a fait le jet initial
+    const actor = game.actors.get(message.rolls[0]?.actorId)
+    if (!actor) {
+      ui.notifications.error("Actor not found")
+      return
+    }
+
+    // Récupérer l'arme
+    const weapon = actor.items.get(weaponId)
+    if (!weapon) {
+      ui.notifications.error("Weapon not found")
+      return
+    }
+
+    // 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)
+  })
 })

 Hooks.on("getCombatTrackerEntryContext", (html, options) => {
--- a/module/applications/sheets/character-sheet.mjs
+++ b/module/applications/sheets/character-sheet.mjs
@@ -95,6 +95,9 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet
    const doc = this.document
    switch (partId) {
      case "main":
+        context.armorDR = this.actor.getArmorDR()
+        context.damageReduction = this.actor.computeDamageReduction()
+        context.damageReductionShield = this.actor.getShieldDR()
        break
      case "skills":
        context.tab = context.tabs.skills
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -65,7 +65,7 @@ export default class LethalFantasyActor extends Actor {
        }
      }
    }
-    goodSkill.weaponSkillModifier = maxValue * multiplier
+    goodSkill.weaponSkillModifier = Math.ceil(maxValue * multiplier)
    return goodSkill
  }

@@ -79,7 +79,69 @@ export default class LethalFantasyActor extends Actor {
  }

  /* *************************************************/
-  async prepareRoll(rollType, rollKey, rollDice ) {
+  computeDamageReduction() {
+    let naturalDR = Number(this.system.biodata.naturalDR) || 0
+    let magicDR = Number(this.system.biodata.magicDR) || 0
+    let armorDR = this.getArmorDR()
+    return naturalDR + magicDR + armorDR
+  }
+
+  /* *************************************************/
+  getShieldDR() {
+    let dr = 0
+    for (let item of this.items) {
+      if (item.type === "shield" && item.system.equipped) {
+        dr += Number(item.system.damageReduction)
+      }
+    }
+    return dr
+  }
+
+  /* *************************************************/
+  getArmorDR() {
+    let dr = 0
+    for (let item of this.items) {
+      if (item.type === "armor" && item.system.equipped) {
+        dr += Number(item.system.damageReduction)
+      }
+    }
+    return dr
+  }
+
+  /* *************************************************/
+  getArmorDefenseValue() {
+    let defenseValue = 0
+    for (let item of this.items) {
+      if (item.type === "armor" && item.system.equipped) {
+        defenseValue += Number(item.system.defense)
+      }
+    }
+    return defenseValue
+  }
+
+  /* *************************************************/
+  fuzzyNameSearchWeaponSkills(weaponName, weaponClass = null) {
+    // Get all weapon skills without the " skill" suffix
+    let skills = this.items.filter((i) => i.type === "skill" && i.system.weaponClass === weaponClass && i.system.category === "weapon")
+    // Remove parenthesis in the weapon name for better matching
+    weaponName = weaponName.replace(/\(.*?\)/g, "").trim()
+    // Now search if we find all the words of the weapon name in the skill name
+    skills = skills.filter((s) => {
+      let skillName = s.name.toLowerCase().replace(" skill", "").trim()
+      let wName = weaponName.toLowerCase().trim()
+      let wWords = wName.split(" ")
+      for (let w of wWords) {
+        if (!skillName.includes(w)) {
+          return false
+        }
+      }
+      return true
+    })
+    return skills
+  }
+
+  /* *************************************************/
+  async prepareRoll(rollType, rollKey, rollDice) {
    console.log("Preparing roll", rollType, rollKey, rollDice)
    let rollTarget
    switch (rollType) {
@@ -89,7 +151,7 @@ export default class LethalFantasyActor extends Actor {
          formula: foundry.utils.duplicate(this.system.granted[rollKey]),
          rollKey: rollKey
        }
-        if ( rollTarget.formula === "" || rollTarget.formula === undefined) {
+        if (rollTarget.formula === "" || rollTarget.formula === undefined) {
          rollTarget.formula = 0
        }
        break;
@@ -126,60 +188,64 @@ export default class LethalFantasyActor extends Actor {
        rollTarget.rollKey = rollKey
        break
      case "shield-roll": {
-          rollTarget = this.items.find((i) => i.type === "shield" && i.id === rollKey)
-          let shieldSkill = this.items.find((i) => i.type === "skill" && i.name.toLowerCase() === rollTarget.name.toLowerCase())
-          rollTarget.skill = shieldSkill
-          rollTarget.rollKey = rollKey
-        }
+        rollTarget = this.items.find((i) => i.type === "shield" && i.id === rollKey)
+        let shieldSkill = this.items.find((i) => i.type === "skill" && i.name.toLowerCase() === rollTarget.name.toLowerCase())
+        rollTarget.skill = shieldSkill
+        rollTarget.rollKey = rollKey
+      }
        break;
      case "weapon-damage-small":
      case "weapon-damage-medium":
      case "weapon-attack":
      case "weapon-defense": {
-          let weapon = this.items.find((i) => i.type === "weapon" && i.id === rollKey)
-          let skill
-          let skills = this.items.filter((i) => i.type === "skill" && i.name.toLowerCase() === weapon.name.toLowerCase())
+        let weapon = this.items.find((i) => i.type === "weapon" && i.id === rollKey)
+        let skill
+        let skills = this.items.filter((i) => i.type === "skill" && i.system.category === "weapon" && i.name.toLowerCase() === weapon.name.toLowerCase())
+        if (skills.length > 0) {
+          skill = this.getBestWeaponClassSkill(skills, rollType, 1.0)
+        } else {
+          skills = this.fuzzyNameSearchWeaponSkills(weapon.name, weapon.system.weaponClass)
          if (skills.length > 0) {
            skill = this.getBestWeaponClassSkill(skills, rollType, 1.0)
          } else {
-            skills = this.items.filter((i) => i.type === "skill" && i.name.toLowerCase().replace(" skill", "") === weapon.name.toLowerCase())
+            skills = this.items.filter((i) => i.type === "skill" && i.system.category === "weapon" && i.system.weaponClass === weapon.system.weaponClass)
            if (skills.length > 0) {
-              skill = this.getBestWeaponClassSkill(skills, rollType, 1.0)
+              skill = this.getBestWeaponClassSkill(skills, rollType, 0.5)
            } else {
-              skills = this.items.filter((i) => i.type === "skill" && i.system.weaponClass === weapon.system.weaponClass)
+              skills = this.items.filter((i) => i.type === "skill" && i.system.category === "weapon" && i.system.weaponClass.includes(SYSTEM.WEAPON_CATEGORIES[weapon.system.weaponClass]))
              if (skills.length > 0) {
-                skill = this.getBestWeaponClassSkill(skills, rollType, 0.5)
+                skill = this.getBestWeaponClassSkill(skills, rollType, 0.25)
              } else {
-                skills = this.items.filter((i) => i.type === "skill" && i.system.weaponClass.includes(SYSTEM.WEAPON_CATEGORIES[weapon.system.weaponClass]))
-                if (skills.length > 0) {
-                  skill = this.getBestWeaponClassSkill(skills, rollType, 0.25)
-                } else {
-                  ui.notifications.warn(game.i18n.localize("LETHALFANTASY.Notifications.skillNotFound"))
-                  return
-                }
+                ui.notifications.warn(game.i18n.localize("LETHALFANTASY.Notifications.skillNotFound"))
+                return
              }
            }
          }
-          if (!weapon || !skill) {
-            console.error("Weapon or skill not found", weapon, skill)
-            ui.notifications.warn(game.i18n.localize("LETHALFANTASY.Notifications.skillNotFound"))
-            return
-          }
-          rollTarget = skill
-          rollTarget.weapon = weapon
-          rollTarget.weaponSkillModifier = skill.weaponSkillModifier
-          rollTarget.rollKey = rollKey
-          rollTarget.combat = foundry.utils.duplicate(this.system.combat)
-          if ( rollType === "weapon-damage-small" || rollType === "weapon-damage-medium") {
-            rollTarget.grantedDice = this.system.granted.damageDice
-          }
-          if ( rollType === "weapon-attack") {
-            rollTarget.grantedDice = this.system.granted.attackDice
-          }
-          if ( rollType === "weapon-defense") {
-            rollTarget.grantedDice = this.system.granted.defenseDice
-          }
        }
+        if (!weapon || !skill) {
+          console.error("Weapon or skill not found", weapon, skill)
+          ui.notifications.warn(game.i18n.localize("LETHALFANTASY.Notifications.skillNotFound"))
+          return
+        }
+        // Créer un objet plain au lieu de modifier directement le skill
+        rollTarget = {
+          ...skill,
+          weapon: weapon,
+          weaponSkillModifier: skill.weaponSkillModifier,
+          rollKey: rollKey,
+          combat: foundry.utils.duplicate(this.system.combat)
+        }
+        if (rollType === "weapon-damage-small" || rollType === "weapon-damage-medium") {
+          rollTarget.grantedDice = this.system.granted.damageDice
+        }
+        if (rollType === "weapon-attack") {
+          rollTarget.grantedDice = this.system.granted.attackDice
+        }
+        if (rollType === "weapon-defense") {
+          rollTarget.armorDefense = this.getArmorDefenseValue()
+          rollTarget.grantedDice = this.system.granted.defenseDice
+        }
+      }
        break
      default:
        ui.notifications.error(game.i18n.localize("LETHALFANTASY.Notifications.rollTypeNotFound") + String(rollType))
--- a/module/documents/roll.mjs
+++ b/module/documents/roll.mjs
@@ -134,6 +134,7 @@ export default class LethalFantasyRoll extends Roll {
    let beyondSkill = false
    let hasStaticModifier = false
    let hasExplode = true
+    let actor = game.actors.get(options.actorId)

    if (options.rollType === "challenge" || options.rollType === "save") {
      options.rollName = game.i18n.localize(`LETHALFANTASY.Label.${options.rollTarget.rollKey}`)
@@ -209,7 +210,7 @@ export default class LethalFantasyRoll extends Roll {
          options.rollTarget.charModifier = options.rollTarget.combat.rangedAttackModifier
        }
      } else {
-        options.rollTarget.value = options.rollTarget.combat.defenseModifier + options.rollTarget.weaponSkillModifier + options.rollTarget.weapon.system.bonuses.defenseBonus
+        options.rollTarget.value = options.rollTarget.combat.defenseModifier + options.rollTarget.weaponSkillModifier + options.rollTarget.weapon.system.bonuses.defenseBonus + options.rollTarget.armorDefense
        options.rollTarget.charModifier = options.rollTarget.combat.defenseModifier
      }

@@ -259,14 +260,17 @@ export default class LethalFantasyRoll extends Roll {

    } else if (options.rollType.includes("weapon-damage")) {
      options.rollName = options.rollTarget.name
+      options.isDamage = true
      hasModifier = true
      hasChangeDice = false
      let damageBonus = (options.rollTarget.weapon.system.applyStrengthDamageBonus) ? options.rollTarget.combat.damageModifier : 0
      options.rollTarget.value = damageBonus + options.rollTarget.weaponSkillModifier + options.rollTarget.weapon.system.bonuses.damageBonus
      options.rollTarget.charModifier = damageBonus
      if (options.rollType.includes("small")) {
+        options.damageSmall = true
        dice = options.rollTarget.weapon.system.damage.damageS
      } else {
+        options.damageMedium = true
        dice = options.rollTarget.weapon.system.damage.damageM
      }
      dice = dice.replace("E", "")
@@ -473,6 +477,9 @@ export default class LethalFantasyRoll extends Roll {
      actorImage: options.actorImage,
      rollMode: rollContext.visibility,
      hasTarget: options.hasTarget,
+      isDamage: options.isDamage,
+      damageSmall: options.damageSmall,
+      damageMedium: options.damageMedium,
      pointBlank,
      beyondSkill,
      letItFly,
@@ -1122,6 +1129,30 @@ export default class LethalFantasyRoll extends Roll {
   * Generates the data required for rendering a roll chat card.
   */
  async _getChatCardData(isPrivate) {
+    // Générer la liste des combatants de la scène
+    let combatants = []
+    if (game?.combat?.combatants && this.rollData?.isDamage) {
+      for (let c of game.combat.combatants) {
+        if (c.actorId !== this.actorId) {
+          combatants.push({ id: c.id, name: c.name })
+        }
+      }
+    }
+
+    // Récupérer les informations de l'arme pour les attaques réussies
+    let weaponDamageOptions = null
+    console.log("Roll type:", this.type, "rollTarget:", this.rollTarget, "Has weapon:", !!this.rollTarget?.weapon)
+    if (this.type === "weapon-attack" && this.rollTarget?.weapon) {
+      const weapon = this.rollTarget.weapon
+      weaponDamageOptions = {
+        weaponId: weapon._id || weapon.id,
+        weaponName: weapon.name,
+        damageS: weapon.system?.damage?.damageS,
+        damageM: weapon.system?.damage?.damageM
+      }
+      console.log("Weapon damage options:", weaponDamageOptions)
+    }
+
    const cardData = {
      css: [SYSTEM.id, "dice-roll"],
      data: this.data,
@@ -1145,7 +1176,9 @@ export default class LethalFantasyRoll extends Roll {
      D30result: this.D30result,
      badResult: this.badResult,
      rollData: this.rollData,
-      isPrivate: isPrivate
+      isPrivate: isPrivate,
+      combatants: combatants,
+      weaponDamageOptions: weaponDamageOptions
    }
    cardData.cssClass = cardData.css.join(" ")
    cardData.tooltip = isPrivate ? "" : await this.getTooltip()
--- a/module/models/character.mjs
+++ b/module/models/character.mjs
@@ -120,6 +120,8 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod
      magicUser: new fields.BooleanField({ initial: false }),
      clericUser: new fields.BooleanField({ initial: false }),
      hpPerLevel: new fields.StringField({ required: true, nullable: false, initial: "" }),
+      naturalDR: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
+      magicDR: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
    })

    schema.modifiers = new fields.SchemaField({
--- a/module/models/shield.mjs
+++ b/module/models/shield.mjs
@@ -6,9 +6,10 @@ export default class LethalFantasyShield extends foundry.abstract.TypeDataModel
    const requiredInteger = { required: true, nullable: false, integer: true }

    schema.description = new fields.HTMLField({ required: true, textSearch: true })
-    schema.defense = new fields.StringField({required: true, initial: "d4", choices: SYSTEM.SHIELD_DEFENSE_DICE})
+    schema.defense = new fields.StringField({ required: true, initial: "d4", choices: SYSTEM.SHIELD_DEFENSE_DICE })
    schema.movementreduction = new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 })
    schema.hascover = new fields.BooleanField({ required: true, initial: false })
+    schema.damageReduction = new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 })

    schema.standing = new fields.SchemaField({
      min: new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 }),
--- a/module/utils.mjs
+++ b/module/utils.mjs
@@ -22,43 +22,43 @@ export default class LethalFantasyUtils {
  static setHookListeners() {

    Hooks.on('renderTokenHUD', async (hud, html, token) => {
-      const lossHPButton = await foundry.applications.handlebars.renderTemplate('systems/fvtt-lethal-fantasy/templates/loss-hp-hud.hbs', {} )
+      const lossHPButton = await foundry.applications.handlebars.renderTemplate('systems/fvtt-lethal-fantasy/templates/loss-hp-hud.hbs', {})
      $(html).find('div.left').append(lossHPButton);
-        $(html).find('img.lethal-hp-loss-hud').click((event) => {
-          event.preventDefault();
-          let hpMenu = $(html).find('.hp-loss-wrap')[0]
-          if (hpMenu.classList.contains("hp-loss-hud-disabled")) {
-            $(html).find('.hp-loss-wrap')[0].classList.add('hp-loss-hud-active');
-            $(html).find('.hp-loss-wrap')[0].classList.remove('hp-loss-hud-disabled');
-            $(html).find('.hp-loss-wrap')[1].classList.add('hp-loss-hud-active');
-            $(html).find('.hp-loss-wrap')[1].classList.remove('hp-loss-hud-disabled');
-            $(html).find('.hp-loss-wrap')[2].classList.add('hp-loss-hud-active');
-            $(html).find('.hp-loss-wrap')[2].classList.remove('hp-loss-hud-disabled');
-          } else {
-            $(html).find('.hp-loss-wrap')[0].classList.remove('hp-loss-hud-active');
-            $(html).find('.hp-loss-wrap')[0].classList.add('hp-loss-hud-disabled');
-            $(html).find('.hp-loss-wrap')[1].classList.remove('hp-loss-hud-active');
-            $(html).find('.hp-loss-wrap')[1].classList.add('hp-loss-hud-disabled');
-            $(html).find('.hp-loss-wrap')[2].classList.remove('hp-loss-hud-active');
-            $(html).find('.hp-loss-wrap')[2].classList.add('hp-loss-hud-disabled');
-          }
-        })
-        $(html).find('.loss-hp-hud-click').click((event) => {
-          event.preventDefault();
-          let hpLoss = event.currentTarget.dataset.hpValue;
-          if (token) {
-            let tokenFull = canvas.tokens.placeables.find( t => t.id === token._id);
-            console.log(tokenFull, token)
-            let actor = tokenFull.actor;
-            actor.applyDamage(Number(hpLoss));
-            $(html).find('.hp-loss-wrap')[0].classList.remove('hp-loss-hud-active');
-            $(html).find('.hp-loss-wrap')[0].classList.add('hp-loss-hud-disabled');
-            $(html).find('.hp-loss-wrap')[1].classList.remove('hp-loss-hud-active');
-            $(html).find('.hp-loss-wrap')[1].classList.add('hp-loss-hud-disabled');
-            $(html).find('.hp-loss-wrap')[2].classList.remove('hp-loss-hud-active');
-            $(html).find('.hp-loss-wrap')[2].classList.add('hp-loss-hud-disabled');
-          }
-        })
+      $(html).find('img.lethal-hp-loss-hud').click((event) => {
+        event.preventDefault();
+        let hpMenu = $(html).find('.hp-loss-wrap')[0]
+        if (hpMenu.classList.contains("hp-loss-hud-disabled")) {
+          $(html).find('.hp-loss-wrap')[0].classList.add('hp-loss-hud-active');
+          $(html).find('.hp-loss-wrap')[0].classList.remove('hp-loss-hud-disabled');
+          $(html).find('.hp-loss-wrap')[1].classList.add('hp-loss-hud-active');
+          $(html).find('.hp-loss-wrap')[1].classList.remove('hp-loss-hud-disabled');
+          $(html).find('.hp-loss-wrap')[2].classList.add('hp-loss-hud-active');
+          $(html).find('.hp-loss-wrap')[2].classList.remove('hp-loss-hud-disabled');
+        } else {
+          $(html).find('.hp-loss-wrap')[0].classList.remove('hp-loss-hud-active');
+          $(html).find('.hp-loss-wrap')[0].classList.add('hp-loss-hud-disabled');
+          $(html).find('.hp-loss-wrap')[1].classList.remove('hp-loss-hud-active');
+          $(html).find('.hp-loss-wrap')[1].classList.add('hp-loss-hud-disabled');
+          $(html).find('.hp-loss-wrap')[2].classList.remove('hp-loss-hud-active');
+          $(html).find('.hp-loss-wrap')[2].classList.add('hp-loss-hud-disabled');
+        }
+      })
+      $(html).find('.loss-hp-hud-click').click((event) => {
+        event.preventDefault();
+        let hpLoss = event.currentTarget.dataset.hpValue;
+        if (token) {
+          let tokenFull = canvas.tokens.placeables.find(t => t.id === token._id);
+          console.log(tokenFull, token)
+          let actor = tokenFull.actor;
+          actor.applyDamage(Number(hpLoss));
+          $(html).find('.hp-loss-wrap')[0].classList.remove('hp-loss-hud-active');
+          $(html).find('.hp-loss-wrap')[0].classList.add('hp-loss-hud-disabled');
+          $(html).find('.hp-loss-wrap')[1].classList.remove('hp-loss-hud-active');
+          $(html).find('.hp-loss-wrap')[1].classList.add('hp-loss-hud-disabled');
+          $(html).find('.hp-loss-wrap')[2].classList.remove('hp-loss-hud-active');
+          $(html).find('.hp-loss-wrap')[2].classList.add('hp-loss-hud-disabled');
+        }
+      })
    })
  }

@@ -246,4 +246,100 @@ export default class LethalFantasyUtils {
    }
  }

+  /* -------------------------------------------- */
+  static async applyDamage(message, event) {
+    // Récupérer les données du message
+    let combatantId = event.currentTarget.dataset.combatantId
+    if (!combatantId || !game.combat) {
+      ui.notifications.error("No combatant selected")
+      return
+    }
+
+    let combatant = game.combat.combatants.get(combatantId)
+    if (!combatant) {
+      ui.notifications.error("Combatant not found")
+      return
+    }
+
+    let targetActor = combatant.token?.actor || game.actors.get(combatant.actorId)
+    if (!targetActor) {
+      ui.notifications.error("Target actor not found")
+      return
+    }
+
+    // Récupérer les données de dégâts du message
+    let damageTotal = message.rolls[0]?.total || 0
+    let weaponName = message.rolls[0]?.options?.rollName || "Unknown Weapon"
+
+    // Calculer les DR
+    let armorDR = targetActor.computeDamageReduction() || 0
+    let shieldDR = targetActor.getShieldDR() || 0
+    let totalDR = armorDR + shieldDR
+
+    // Créer le dialogue
+    const content = await foundry.applications.handlebars.renderTemplate(
+      "systems/fvtt-lethal-fantasy/templates/apply-damage-dialog.hbs",
+      {
+        targetName: targetActor.name,
+        weaponName: weaponName,
+        damageTotal: damageTotal,
+        armorDR: armorDR,
+        shieldDR: shieldDR,
+        totalDR: totalDR,
+        damageNoDR: damageTotal,
+        damageWithArmor: Math.max(0, damageTotal - armorDR),
+        damageWithAll: Math.max(0, damageTotal - totalDR)
+      }
+    )
+
+    const result = await foundry.applications.api.DialogV2.wait({
+      window: { title: "Apply Damage" },
+      classes: ["lethalfantasy"],
+      position: { width: 280 },
+      content,
+      buttons: [
+        {
+          action: "noDR",
+          label: "No DR",
+          callback: () => ({ drType: "none", damage: damageTotal })
+        },
+        {
+          action: "armorDR",
+          label: "With Armor DR",
+          callback: () => ({ drType: "armor", damage: Math.max(0, damageTotal - armorDR) })
+        },
+        {
+          action: "allDR",
+          label: "With Armor + Shield DR",
+          callback: () => ({ drType: "all", damage: Math.max(0, damageTotal - totalDR) })
+        },
+        {
+          action: "cancel",
+          label: "Cancel",
+          callback: () => null
+        }
+      ],
+      rejectClose: false
+    })
+
+    if (result && result.damage !== undefined) {
+      await targetActor.applyDamage(-result.damage)
+
+      // Message de confirmation
+      let drText = ""
+      if (result.drType === "armor") {
+        drText = ` (Armor DR: ${armorDR})`
+      } else if (result.drType === "all") {
+        drText = ` (Total DR: ${totalDR})`
+      }
+
+      ChatMessage.create({
+        user: game.user.id,
+        speaker: { alias: targetActor.name },
+        rollMode: "gmroll",
+        content: `${targetActor.name} takes ${result.damage} damage${drText} from ${weaponName}`
+      })
+    }
+  }
+
 }
--- a/packs-system/lf-equipment/000464.ldb
+++ b/packs-system/lf-equipment/000464.ldb
--- a/packs-system/lf-equipment/000467.log
+++ b/packs-system/lf-equipment/000467.log
--- a/packs-system/lf-equipment/CURRENT
+++ b/packs-system/lf-equipment/CURRENT
@@ -1 +1 @@
-MANIFEST-000436
+MANIFEST-000465
--- a/packs-system/lf-equipment/LOG
+++ b/packs-system/lf-equipment/LOG
@@ -1,8 +1,8 @@
-2025/10/01-16:42:57.866432 7fc499ffb6c0 Recovering log #434
-2025/10/01-16:42:57.877314 7fc499ffb6c0 Delete type=3 #432
-2025/10/01-16:42:57.877388 7fc499ffb6c0 Delete type=0 #434
-2025/10/01-17:11:30.188440 7fc497ff76c0 Level-0 table #439: started
-2025/10/01-17:11:30.188469 7fc497ff76c0 Level-0 table #439: 0 bytes OK
-2025/10/01-17:11:30.194363 7fc497ff76c0 Delete type=0 #437
-2025/10/01-17:11:30.200618 7fc497ff76c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2025/10/01-17:11:30.200653 7fc497ff76c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2025/12/14-20:51:28.512263 7f17053ff6c0 Recovering log #462
+2025/12/14-20:51:28.522433 7f17053ff6c0 Delete type=3 #460
+2025/12/14-20:51:28.522511 7f17053ff6c0 Delete type=0 #462
+2025/12/14-21:17:40.691121 7f16eeffd6c0 Level-0 table #468: started
+2025/12/14-21:17:40.691177 7f16eeffd6c0 Level-0 table #468: 0 bytes OK
+2025/12/14-21:17:40.697563 7f16eeffd6c0 Delete type=0 #466
+2025/12/14-21:17:40.718082 7f16eeffd6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2025/12/14-21:17:40.718119 7f16eeffd6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-equipment/LOG.old
+++ b/packs-system/lf-equipment/LOG.old
@@ -1,8 +1,15 @@
-2025/10/01-09:52:37.607891 7fc498ff96c0 Recovering log #430
-2025/10/01-09:52:37.617656 7fc498ff96c0 Delete type=3 #428
-2025/10/01-09:52:37.617728 7fc498ff96c0 Delete type=0 #430
-2025/10/01-10:19:09.456857 7fc497ff76c0 Level-0 table #435: started
-2025/10/01-10:19:09.456891 7fc497ff76c0 Level-0 table #435: 0 bytes OK
-2025/10/01-10:19:09.500293 7fc497ff76c0 Delete type=0 #433
-2025/10/01-10:19:09.675931 7fc497ff76c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2025/10/01-10:19:09.675968 7fc497ff76c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2025/12/14-09:09:25.826835 7f17053ff6c0 Recovering log #458
+2025/12/14-09:09:25.838032 7f17053ff6c0 Delete type=3 #456
+2025/12/14-09:09:25.838116 7f17053ff6c0 Delete type=0 #458
+2025/12/14-20:45:56.707785 7f16eeffd6c0 Level-0 table #463: started
+2025/12/14-20:45:56.710879 7f16eeffd6c0 Level-0 table #463: 1677 bytes OK
+2025/12/14-20:45:56.716936 7f16eeffd6c0 Delete type=0 #461
+2025/12/14-20:45:56.730287 7f16eeffd6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2025/12/14-20:45:56.730345 7f16eeffd6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at '!items!VFHTlDVKj2yNJEWi' @ 1129 : 1
+2025/12/14-20:45:56.730356 7f16eeffd6c0 Compacting 1@1 + 1@2 files
+2025/12/14-20:45:56.736659 7f16eeffd6c0 Generated table #464@1: 485 keys, 217363 bytes
+2025/12/14-20:45:56.736680 7f16eeffd6c0 Compacted 1@1 + 1@2 files => 217363 bytes
+2025/12/14-20:45:56.742890 7f16eeffd6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/12/14-20:45:56.742996 7f16eeffd6c0 Delete type=2 #323
+2025/12/14-20:45:56.743249 7f16eeffd6c0 Delete type=2 #463
+2025/12/14-20:45:56.750017 7f16eeffd6c0 Manual compaction at level-1 from '!items!VFHTlDVKj2yNJEWi' @ 1129 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-equipment/MANIFEST-000436
+++ b/packs-system/lf-equipment/MANIFEST-000436
--- a/packs-system/lf-equipment/MANIFEST-000465
+++ b/packs-system/lf-equipment/MANIFEST-000465
--- a/packs-system/lf-gifts/000447.ldb
+++ b/packs-system/lf-gifts/000447.ldb
--- a/packs-system/lf-gifts/000466.log
+++ b/packs-system/lf-gifts/000466.log
--- a/packs-system/lf-gifts/CURRENT
+++ b/packs-system/lf-gifts/CURRENT
@@ -1 +1 @@
-MANIFEST-000436
+MANIFEST-000464
--- a/packs-system/lf-gifts/LOG
+++ b/packs-system/lf-gifts/LOG
@@ -1,8 +1,8 @@
-2025/10/01-16:42:57.881962 7fc4987f86c0 Recovering log #434
-2025/10/01-16:42:57.892761 7fc4987f86c0 Delete type=3 #432
-2025/10/01-16:42:57.892833 7fc4987f86c0 Delete type=0 #434
-2025/10/01-17:11:30.181134 7fc497ff76c0 Level-0 table #439: started
-2025/10/01-17:11:30.181171 7fc497ff76c0 Level-0 table #439: 0 bytes OK
-2025/10/01-17:11:30.188327 7fc497ff76c0 Delete type=0 #437
-2025/10/01-17:11:30.200601 7fc497ff76c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end)
-2025/10/01-17:11:30.200645 7fc497ff76c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end)
+2025/12/14-20:51:28.526428 7f16effff6c0 Recovering log #462
+2025/12/14-20:51:28.536097 7f16effff6c0 Delete type=3 #460
+2025/12/14-20:51:28.536151 7f16effff6c0 Delete type=0 #462
+2025/12/14-21:17:40.711547 7f16eeffd6c0 Level-0 table #467: started
+2025/12/14-21:17:40.711584 7f16eeffd6c0 Level-0 table #467: 0 bytes OK
+2025/12/14-21:17:40.717934 7f16eeffd6c0 Delete type=0 #465
+2025/12/14-21:17:40.718128 7f16eeffd6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2025/12/14-21:17:40.718154 7f16eeffd6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-gifts/LOG.old
+++ b/packs-system/lf-gifts/LOG.old
@@ -1,8 +1,8 @@
-2025/10/01-09:52:37.622704 7fc4997fa6c0 Recovering log #430
-2025/10/01-09:52:37.632146 7fc4997fa6c0 Delete type=3 #428
-2025/10/01-09:52:37.632199 7fc4997fa6c0 Delete type=0 #430
-2025/10/01-10:19:09.736826 7fc497ff76c0 Level-0 table #435: started
-2025/10/01-10:19:09.736857 7fc497ff76c0 Level-0 table #435: 0 bytes OK
-2025/10/01-10:19:09.782928 7fc497ff76c0 Delete type=0 #433
-2025/10/01-10:19:09.809673 7fc497ff76c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end)
-2025/10/01-10:19:09.809700 7fc497ff76c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end)
+2025/12/14-09:09:25.859023 7f16ef7fe6c0 Recovering log #458
+2025/12/14-09:09:25.869163 7f16ef7fe6c0 Delete type=3 #456
+2025/12/14-09:09:25.869258 7f16ef7fe6c0 Delete type=0 #458
+2025/12/14-20:45:56.717084 7f16eeffd6c0 Level-0 table #463: started
+2025/12/14-20:45:56.717117 7f16eeffd6c0 Level-0 table #463: 0 bytes OK
+2025/12/14-20:45:56.723011 7f16eeffd6c0 Delete type=0 #461
+2025/12/14-20:45:56.730301 7f16eeffd6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2025/12/14-20:45:56.743359 7f16eeffd6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-gifts/MANIFEST-000436
+++ b/packs-system/lf-gifts/MANIFEST-000436
--- a/packs-system/lf-gifts/MANIFEST-000464
+++ b/packs-system/lf-gifts/MANIFEST-000464
--- a/packs-system/lf-skills/000453.ldb
+++ b/packs-system/lf-skills/000453.ldb
--- a/packs-system/lf-skills/000468.log
+++ b/packs-system/lf-skills/000468.log
--- a/packs-system/lf-skills/CURRENT
+++ b/packs-system/lf-skills/CURRENT
@@ -1 +1 @@
-MANIFEST-000436
+MANIFEST-000466
--- a/packs-system/lf-skills/LOG
+++ b/packs-system/lf-skills/LOG
@@ -1,8 +1,8 @@
-2025/10/01-16:42:57.852986 7fc498ff96c0 Recovering log #434
-2025/10/01-16:42:57.862534 7fc498ff96c0 Delete type=3 #432
-2025/10/01-16:42:57.862603 7fc498ff96c0 Delete type=0 #434
-2025/10/01-17:11:30.174361 7fc497ff76c0 Level-0 table #439: started
-2025/10/01-17:11:30.174817 7fc497ff76c0 Level-0 table #439: 0 bytes OK
-2025/10/01-17:11:30.181000 7fc497ff76c0 Delete type=0 #437
-2025/10/01-17:11:30.200584 7fc497ff76c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2025/10/01-17:11:30.200638 7fc497ff76c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2025/12/14-20:51:28.497448 7f1704bfe6c0 Recovering log #464
+2025/12/14-20:51:28.507553 7f1704bfe6c0 Delete type=3 #462
+2025/12/14-20:51:28.507622 7f1704bfe6c0 Delete type=0 #464
+2025/12/14-21:17:40.697721 7f16eeffd6c0 Level-0 table #469: started
+2025/12/14-21:17:40.697764 7f16eeffd6c0 Level-0 table #469: 0 bytes OK
+2025/12/14-21:17:40.703907 7f16eeffd6c0 Delete type=0 #467
+2025/12/14-21:17:40.718096 7f16eeffd6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2025/12/14-21:17:40.718137 7f16eeffd6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-skills/LOG.old
+++ b/packs-system/lf-skills/LOG.old
@@ -1,8 +1,8 @@
-2025/10/01-09:52:37.593230 7fc4987f86c0 Recovering log #430
-2025/10/01-09:52:37.603848 7fc4987f86c0 Delete type=3 #428
-2025/10/01-09:52:37.603909 7fc4987f86c0 Delete type=0 #430
-2025/10/01-10:19:09.418020 7fc497ff76c0 Level-0 table #435: started
-2025/10/01-10:19:09.418055 7fc497ff76c0 Level-0 table #435: 0 bytes OK
-2025/10/01-10:19:09.456709 7fc497ff76c0 Delete type=0 #433
-2025/10/01-10:19:09.675920 7fc497ff76c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2025/10/01-10:19:09.675962 7fc497ff76c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2025/12/14-09:09:25.806646 7f16effff6c0 Recovering log #460
+2025/12/14-09:09:25.817606 7f16effff6c0 Delete type=3 #458
+2025/12/14-09:09:25.817666 7f16effff6c0 Delete type=0 #460
+2025/12/14-20:45:56.701142 7f16eeffd6c0 Level-0 table #465: started
+2025/12/14-20:45:56.701194 7f16eeffd6c0 Level-0 table #465: 0 bytes OK
+2025/12/14-20:45:56.707652 7f16eeffd6c0 Delete type=0 #463
+2025/12/14-20:45:56.730266 7f16eeffd6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2025/12/14-20:45:56.730327 7f16eeffd6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-skills/MANIFEST-000436
+++ b/packs-system/lf-skills/MANIFEST-000436
--- a/packs-system/lf-skills/MANIFEST-000466
+++ b/packs-system/lf-skills/MANIFEST-000466
--- a/packs-system/lf-spells-miracles/000166.log
+++ b/packs-system/lf-spells-miracles/000166.log
--- a/packs-system/lf-spells-miracles/CURRENT
+++ b/packs-system/lf-spells-miracles/CURRENT
@@ -1 +1 @@
-MANIFEST-000136
+MANIFEST-000164
--- a/packs-system/lf-spells-miracles/LOG
+++ b/packs-system/lf-spells-miracles/LOG
@@ -1,8 +1,8 @@
-2025/10/01-16:42:57.908006 7fc4997fa6c0 Recovering log #134
-2025/10/01-16:42:57.919602 7fc4997fa6c0 Delete type=3 #132
-2025/10/01-16:42:57.919658 7fc4997fa6c0 Delete type=0 #134
-2025/10/01-17:11:30.207352 7fc497ff76c0 Level-0 table #139: started
-2025/10/01-17:11:30.207416 7fc497ff76c0 Level-0 table #139: 0 bytes OK
-2025/10/01-17:11:30.214221 7fc497ff76c0 Delete type=0 #137
-2025/10/01-17:11:30.239177 7fc497ff76c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2025/10/01-17:11:30.278471 7fc497ff76c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2025/12/14-20:51:28.551833 7f16ef7fe6c0 Recovering log #162
+2025/12/14-20:51:28.562344 7f16ef7fe6c0 Delete type=3 #160
+2025/12/14-20:51:28.562406 7f16ef7fe6c0 Delete type=0 #162
+2025/12/14-21:17:40.735101 7f16eeffd6c0 Level-0 table #167: started
+2025/12/14-21:17:40.735151 7f16eeffd6c0 Level-0 table #167: 0 bytes OK
+2025/12/14-21:17:40.741604 7f16eeffd6c0 Delete type=0 #165
+2025/12/14-21:17:40.771470 7f16eeffd6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2025/12/14-21:17:40.781560 7f16eeffd6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-spells-miracles/LOG.old
+++ b/packs-system/lf-spells-miracles/LOG.old
@@ -1,8 +1,8 @@
-2025/10/01-09:52:37.648603 7fc498ff96c0 Recovering log #130
-2025/10/01-09:52:37.658051 7fc498ff96c0 Delete type=3 #128
-2025/10/01-09:52:37.658136 7fc498ff96c0 Delete type=0 #130
-2025/10/01-10:19:09.381699 7fc497ff76c0 Level-0 table #135: started
-2025/10/01-10:19:09.381742 7fc497ff76c0 Level-0 table #135: 0 bytes OK
-2025/10/01-10:19:09.417885 7fc497ff76c0 Delete type=0 #133
-2025/10/01-10:19:09.675902 7fc497ff76c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2025/10/01-10:19:09.675956 7fc497ff76c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2025/12/14-09:09:25.891410 7f17053ff6c0 Recovering log #158
+2025/12/14-09:09:25.901634 7f17053ff6c0 Delete type=3 #156
+2025/12/14-09:09:25.901690 7f17053ff6c0 Delete type=0 #158
+2025/12/14-20:45:56.743394 7f16eeffd6c0 Level-0 table #163: started
+2025/12/14-20:45:56.743431 7f16eeffd6c0 Level-0 table #163: 0 bytes OK
+2025/12/14-20:45:56.749813 7f16eeffd6c0 Delete type=0 #161
+2025/12/14-20:45:56.767206 7f16eeffd6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2025/12/14-20:45:56.791687 7f16eeffd6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-spells-miracles/MANIFEST-000164
+++ b/packs-system/lf-spells-miracles/MANIFEST-000164
--- a/packs-system/lf-vulnerabilities/000465.log
+++ b/packs-system/lf-vulnerabilities/000465.log
--- a/packs-system/lf-vulnerabilities/CURRENT
+++ b/packs-system/lf-vulnerabilities/CURRENT
@@ -1 +1 @@
-MANIFEST-000435
+MANIFEST-000463
--- a/packs-system/lf-vulnerabilities/LOG
+++ b/packs-system/lf-vulnerabilities/LOG
@@ -1,8 +1,8 @@
-2025/10/01-16:42:57.895507 7fc498ff96c0 Recovering log #433
-2025/10/01-16:42:57.905329 7fc498ff96c0 Delete type=3 #431
-2025/10/01-16:42:57.905405 7fc498ff96c0 Delete type=0 #433
-2025/10/01-17:11:30.194475 7fc497ff76c0 Level-0 table #438: started
-2025/10/01-17:11:30.194505 7fc497ff76c0 Level-0 table #438: 0 bytes OK
-2025/10/01-17:11:30.200450 7fc497ff76c0 Delete type=0 #436
-2025/10/01-17:11:30.200628 7fc497ff76c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2025/10/01-17:11:30.200661 7fc497ff76c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2025/12/14-20:51:28.538266 7f1704bfe6c0 Recovering log #461
+2025/12/14-20:51:28.549289 7f1704bfe6c0 Delete type=3 #459
+2025/12/14-20:51:28.549364 7f1704bfe6c0 Delete type=0 #461
+2025/12/14-21:17:40.704054 7f16eeffd6c0 Level-0 table #466: started
+2025/12/14-21:17:40.704085 7f16eeffd6c0 Level-0 table #466: 0 bytes OK
+2025/12/14-21:17:40.711382 7f16eeffd6c0 Delete type=0 #464
+2025/12/14-21:17:40.718108 7f16eeffd6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2025/12/14-21:17:40.718145 7f16eeffd6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-vulnerabilities/LOG.old
+++ b/packs-system/lf-vulnerabilities/LOG.old
@@ -1,8 +1,8 @@
-2025/10/01-09:52:37.634817 7fc4987f86c0 Recovering log #429
-2025/10/01-09:52:37.645670 7fc4987f86c0 Delete type=3 #427
-2025/10/01-09:52:37.645745 7fc4987f86c0 Delete type=0 #429
-2025/10/01-10:19:09.704901 7fc497ff76c0 Level-0 table #434: started
-2025/10/01-10:19:09.704973 7fc497ff76c0 Level-0 table #434: 0 bytes OK
-2025/10/01-10:19:09.736698 7fc497ff76c0 Delete type=0 #432
-2025/10/01-10:19:09.809658 7fc497ff76c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2025/10/01-10:19:09.809691 7fc497ff76c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2025/12/14-09:09:25.874671 7f16effff6c0 Recovering log #457
+2025/12/14-09:09:25.886173 7f16effff6c0 Delete type=3 #455
+2025/12/14-09:09:25.886272 7f16effff6c0 Delete type=0 #457
+2025/12/14-20:45:56.723132 7f16eeffd6c0 Level-0 table #462: started
+2025/12/14-20:45:56.723164 7f16eeffd6c0 Level-0 table #462: 0 bytes OK
+2025/12/14-20:45:56.730108 7f16eeffd6c0 Delete type=0 #460
+2025/12/14-20:45:56.730316 7f16eeffd6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2025/12/14-20:45:56.743378 7f16eeffd6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-vulnerabilities/MANIFEST-000463
+++ b/packs-system/lf-vulnerabilities/MANIFEST-000463
--- a/styles/chat.less
+++ b/styles/chat.less
@@ -1,33 +1,34 @@
 &.fortune {
-    img {
-        border: 0px;
-      }
-      .intro-chat {
-        border-radius: 20px;
-        display: flex;
-        flex-direction: row;
-        .intro-img {
-          padding: 5px;
-          width: 80px;
-          align-self: center;
-        }
-        .intro-right {
-          display: flex;
-          flex-direction: column;
-          .introText {
-            font-family: var(--font-secondary);
-            font-size: calc(var(--font-size-standard) * 1.2);
-            width: 210px;
-            text-align: center;
-          }
-        }
-      }
-      .button.control, .fortune-accepted {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        font-size: calc(var(--font-size-standard) * 1.3);
+  img {
+    border: 0px;
+  }
+  .intro-chat {
+    border-radius: 20px;
+    display: flex;
+    flex-direction: row;
+    .intro-img {
+      padding: 5px;
+      width: 80px;
+      align-self: center;
+    }
+    .intro-right {
+      display: flex;
+      flex-direction: column;
+      .introText {
+        font-family: var(--font-secondary);
+        font-size: calc(var(--font-size-standard) * 1.2);
+        width: 210px;
+        text-align: center;
      }
+    }
+  }
+  .button.control,
+  .fortune-accepted {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: calc(var(--font-size-standard) * 1.3);
+  }
 }

 &.ask-roll {
@@ -37,4 +38,4 @@
  justify-content: center;
  font-family: var(--font-secondary);
  font-size: calc(var(--font-size-standard) * 1.2);
-}
+}
--- a/styles/roll.less
+++ b/styles/roll.less
@@ -7,6 +7,65 @@
    border-color: var(--color-dark-6);
    color: var(--color-dark-2);
  }
+
+  .apply-damage-dialog {
+    .dialog-content {
+      padding: 6px;
+      font-size: calc(var(--font-size-standard) * 1);
+
+      .header {
+        text-align: center;
+        padding: 4px;
+        margin-bottom: 6px;
+        background-color: rgba(0, 0, 0, 0.1);
+        border-radius: 3px;
+      }
+
+      .damage-summary {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 4px 6px;
+        margin-bottom: 6px;
+        background-color: rgba(139, 0, 0, 0.1);
+        border-radius: 3px;
+
+        .damage-value {
+          color: var(--color-level-error);
+          font-size: calc(var(--font-size-standard) * 1.2);
+          font-weight: bold;
+        }
+      }
+
+      .dr-summary {
+        display: flex;
+        justify-content: space-around;
+        gap: 4px;
+        padding: 3px;
+        margin-bottom: 6px;
+        font-size: calc(var(--font-size-standard) * 0.85);
+        background-color: rgba(0, 0, 0, 0.05);
+        border-radius: 3px;
+      }
+
+      .damage-options {
+        .option-line {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 3px 6px;
+          margin: 2px 0;
+          background-color: rgba(0, 0, 0, 0.05);
+          border-radius: 3px;
+
+          strong {
+            color: var(--color-dark-1);
+            font-size: calc(var(--font-size-standard) * 1.05);
+          }
+        }
+      }
+    }
+  }
 }

 .lethalfantasy-roll-dialog {
@@ -59,9 +118,14 @@

 .dialog-form {
  .form-footer {
+    padding: 4px;
+    gap: 4px;
    button {
-      min-width: 14rem;
-      min-height: 3.2rem;
+      min-width: 8rem;
+      min-height: 2rem;
+      padding: 2px 6px;
+      margin: 0;
+      font-size: calc(var(--font-size-standard) * 0.9);
    }
  }
 }
@@ -156,4 +220,124 @@
    font-size: calc(var(--font-size-standard) * 1);
    text-shadow: 0 0 10px var(--color-shadow-primary);
  }
+
+  .damage-buttons {
+    width: 100%;
+    padding: 8px;
+    margin-top: 8px;
+
+    .damage-buttons-title {
+      font-weight: bold;
+      margin-bottom: 8px;
+      font-size: calc(var(--font-size-standard) * 0.95);
+      text-align: center;
+    }
+
+    .damage-buttons-grid {
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      gap: 6px;
+      padding: 8px;
+      background-color: rgba(0, 0, 0, 0.1);
+      border-radius: 5px;
+
+      .damage-roll-btn {
+        padding: 6px 10px;
+        background: linear-gradient(to bottom, #8b4513 0%, #6b3410 100%);
+        border: 1px solid #4b2408;
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+        color: #f0f0e0;
+        cursor: pointer;
+        border-radius: 4px;
+        font-size: calc(var(--font-size-standard) * 0.85);
+        font-weight: 500;
+        text-align: center;
+        transition: all 0.2s ease;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 4px;
+
+        i {
+          font-size: calc(var(--font-size-standard) * 1);
+        }
+
+        &:hover {
+          background: linear-gradient(to bottom, #9b5523 0%, #7b4420 100%);
+          box-shadow: 0 3px 6px rgba(0, 0, 0, 0.4);
+          transform: translateY(-1px);
+          border-color: #5b3418;
+        }
+
+        &:active {
+          transform: translateY(0);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+        }
+      }
+    }
+  }
+
+  .damage-result {
+    width: 100%;
+    padding: 8px;
+
+    ul {
+      padding: 0;
+      margin: 0;
+    }
+
+    .li-apply-wounds {
+      list-style: none;
+      margin-top: 10px;
+      padding: 0;
+      display: none;
+
+      > div:first-child {
+        font-weight: bold;
+        margin-bottom: 8px;
+        font-size: calc(var(--font-size-standard) * 0.95);
+        text-align: center;
+      }
+
+      .combatants-grid {
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+        gap: 6px;
+        margin-top: 5px;
+        padding: 8px;
+        background-color: rgba(0, 0, 0, 0.1);
+        border-radius: 5px;
+
+        .apply-wounds-btn {
+          padding: 6px 10px;
+          background: linear-gradient(to bottom, #5a5850 0%, #4b4a44 100%);
+          border: 1px solid #2b2a24;
+          box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+          color: #f0f0e0;
+          cursor: pointer;
+          border-radius: 4px;
+          font-size: calc(var(--font-size-standard) * 0.85);
+          font-weight: 500;
+          text-align: center;
+          transition: all 0.2s ease;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          max-width: 100%;
+
+          &:hover {
+            background: linear-gradient(to bottom, #6a6860 0%, #5a5850 100%);
+            box-shadow: 0 3px 6px rgba(0, 0, 0, 0.4);
+            transform: translateY(-1px);
+            border-color: #3b3a34;
+          }
+
+          &:active {
+            transform: translateY(0);
+            box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+          }
+        }
+      }
+    }
+  }
 }
--- a/templates/apply-damage-dialog.hbs
+++ b/templates/apply-damage-dialog.hbs
@@ -0,0 +1,37 @@
+<div class="apply-damage-dialog">
+  <div class="dialog-content">
+    <div class="header">
+      <strong>{{targetName}}</strong>
+      -
+      {{weaponName}}
+    </div>
+
+    <div class="damage-summary">
+      <span class="label">{{localize
+          "LETHALFANTASY.Dialog.totalDamage"
+        }}:</span>
+      <span class="damage-value">{{damageTotal}}</span>
+    </div>
+
+    <div class="dr-summary">
+      <span>{{localize "LETHALFANTASY.Dialog.armorDR"}}: {{armorDR}}</span>
+      <span>{{localize "LETHALFANTASY.Dialog.shieldDR"}}: {{shieldDR}}</span>
+      <span class="total">DR: <strong>{{totalDR}}</strong></span>
+    </div>
+
+    <div class="damage-options">
+      <div class="option-line">
+        <span>{{localize "LETHALFANTASY.Dialog.noDR"}}</span>
+        <strong>{{damageNoDR}}</strong>
+      </div>
+      <div class="option-line">
+        <span>{{localize "LETHALFANTASY.Dialog.withArmor"}}</span>
+        <strong>{{damageWithArmor}}</strong>
+      </div>
+      <div class="option-line">
+        <span>{{localize "LETHALFANTASY.Dialog.withAll"}}</span>
+        <strong>{{damageWithAll}}</strong>
+      </div>
+    </div>
+  </div>
+</div>
--- a/templates/character-biography.hbs
+++ b/templates/character-biography.hbs
@@ -1,97 +1,180 @@
-<section class="tab character-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
+<section
+  class="tab character-{{tab.id}} {{tab.cssClass}}"
+  data-tab="{{tab.id}}"
+  data-group="{{tab.group}}"
+>
  <div class="main-div">

-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.biodata"}}</legend>
-    <div class="biodata">
-      <div class="biodata-elem">
-        <span class="name">Class</span>
-        {{formInput systemFields.biodata.fields.class value=system.biodata.class }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Level</span>
-        {{formInput systemFields.biodata.fields.level value=system.biodata.level }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Mortal</span>
-        {{formInput systemFields.biodata.fields.mortal value=system.biodata.mortal }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Alignment</span>
-        {{formInput systemFields.biodata.fields.alignment value=system.biodata.alignment }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Age</span>
-        {{formInput systemFields.biodata.fields.age value=system.biodata.age }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Height</span>
-        {{formInput systemFields.biodata.fields.height value=system.biodata.height }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Weight</span>
-        {{formInput systemFields.biodata.fields.weight value=system.biodata.weight }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Eyes</span>
-        {{formInput systemFields.biodata.fields.eyes value=system.biodata.eyes }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Hair</span>
-        {{formInput systemFields.biodata.fields.hair value=system.biodata.hair }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Dev. Points (Total)</span>
-        {{formInput systemFields.developmentPoints.fields.total value=system.developmentPoints.total }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Dev. Points (Rem.)</span>
-        {{formInput systemFields.developmentPoints.fields.remaining value=system.developmentPoints.remaining }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Magic User</span>
-        {{formInput systemFields.biodata.fields.magicUser value=system.biodata.magicUser }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Cleric User</span>
-        {{formInput systemFields.biodata.fields.clericUser value=system.biodata.clericUser }}
-      </div>
-      <div class="biodata-elem">
-        <span class="name">Save bonus (1/5levels)</span>
-        {{formInput systemFields.modifiers.fields.saveModifier value=system.modifiers.saveModifier disabled=true}}
-      </div>
+    <fieldset>
+      <legend>{{localize "LETHALFANTASY.Label.biodata"}}</legend>
+      <div class="biodata">
+        <div class="biodata-elem">
+          <span class="name">Class</span>
+          {{formInput
+            systemFields.biodata.fields.class
+            value=system.biodata.class
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Level</span>
+          {{formInput
+            systemFields.biodata.fields.level
+            value=system.biodata.level
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Mortal</span>
+          {{formInput
+            systemFields.biodata.fields.mortal
+            value=system.biodata.mortal
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Alignment</span>
+          {{formInput
+            systemFields.biodata.fields.alignment
+            value=system.biodata.alignment
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Age</span>
+          {{formInput systemFields.biodata.fields.age value=system.biodata.age}}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Height</span>
+          {{formInput
+            systemFields.biodata.fields.height
+            value=system.biodata.height
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Weight</span>
+          {{formInput
+            systemFields.biodata.fields.weight
+            value=system.biodata.weight
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Eyes</span>
+          {{formInput
+            systemFields.biodata.fields.eyes
+            value=system.biodata.eyes
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Hair</span>
+          {{formInput
+            systemFields.biodata.fields.hair
+            value=system.biodata.hair
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Dev. Points (Total)</span>
+          {{formInput
+            systemFields.developmentPoints.fields.total
+            value=system.developmentPoints.total
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Dev. Points (Rem.)</span>
+          {{formInput
+            systemFields.developmentPoints.fields.remaining
+            value=system.developmentPoints.remaining
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Magic User</span>
+          {{formInput
+            systemFields.biodata.fields.magicUser
+            value=system.biodata.magicUser
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Cleric User</span>
+          {{formInput
+            systemFields.biodata.fields.clericUser
+            value=system.biodata.clericUser
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Save bonus (1/5levels)</span>
+          {{formInput
+            systemFields.modifiers.fields.saveModifier
+            value=system.modifiers.saveModifier
+            disabled=true
+          }}
+        </div>

-      {{#if system.biodata.magicUser}}
-      <div class="biodata-elem">
-        <span class="name">Spell bonus (1/5levels)</span>
-        {{formInput systemFields.modifiers.fields.levelSpellModifier value=system.modifiers.levelSpellModifier disabled=true}}
-      </div>
-      {{/if}}
-      {{#if system.biodata.clericUser}}
-      <div class="biodata-elem">
-        <span class="name">Miracle bonus (1/5levels)</span>
-        {{formInput systemFields.modifiers.fields.levelMiracleModifier value=system.modifiers.levelMiracleModifier disabled=true}}
-      </div>
-      {{/if}}
+        {{#if system.biodata.magicUser}}
+          <div class="biodata-elem">
+            <span class="name">Spell bonus (1/5levels)</span>
+            {{formInput
+              systemFields.modifiers.fields.levelSpellModifier
+              value=system.modifiers.levelSpellModifier
+              disabled=true
+            }}
+          </div>
+        {{/if}}
+        {{#if system.biodata.clericUser}}
+          <div class="biodata-elem">
+            <span class="name">Miracle bonus (1/5levels)</span>
+            {{formInput
+              systemFields.modifiers.fields.levelMiracleModifier
+              value=system.modifiers.levelMiracleModifier
+              disabled=true
+            }}
+          </div>
+        {{/if}}

-      <div class="biodata-elem">
-        <span class="name">Last HD roll</span>
-        {{formInput systemFields.biodata.fields.hpPerLevel value=system.biodata.hpPerLevel disabled=true}}
-      </div>
+        <div class="biodata-elem">
+          <span class="name">Last HD roll</span>
+          {{formInput
+            systemFields.biodata.fields.hpPerLevel
+            value=system.biodata.hpPerLevel
+            disabled=isPlayMode
+          }}
+        </div>

+        <div class="biodata-elem">
+          <span class="name">Natural DR</span>
+          {{formInput
+            systemFields.biodata.fields.naturalDR
+            value=system.biodata.naturalDR
+            disabled=isPlayMode
+          }}
+        </div>

-    </div>
-  </fieldset>
+        <div class="biodata-elem">
+          <span class="name">Magical DR</span>
+          {{formInput
+            systemFields.biodata.fields.magicDR
+            value=system.biodata.magicDR
+            disabled=isPlayMode
+          }}
+        </div>

-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.description"}}</legend>
-    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description"
-    toggled=true}}
-  </fieldset>
+      </fieldset>

-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.notes"}}</legend>
-    {{formInput systemFields.notes enriched=enrichedNotes value=system.notes name="system.notes" toggled=true}}
-  </fieldset>
+    <fieldset>
+      <legend>{{localize "LETHALFANTASY.Label.description"}}</legend>
+      {{formInput
+        systemFields.description
+        enriched=enrichedDescription
+        value=system.description
+        name="system.description"
+        toggled=true
+      }}
+    </fieldset>
+
+    <fieldset>
+      <legend>{{localize "LETHALFANTASY.Label.notes"}}</legend>
+      {{formInput
+        systemFields.notes
+        enriched=enrichedNotes
+        value=system.notes
+        name="system.notes"
+        toggled=true
+      }}
+    </fieldset>
  </div>
 </section>
--- a/templates/character-combat.hbs
+++ b/templates/character-combat.hbs
@@ -120,6 +120,7 @@
          <div class="item-detail" data-tooltip="Maximum movement">{{item.system.maximumMovement}}</div>
          <div class="item-detail" data-tooltip="HP">{{item.system.hp}}</div>
          <div class="item-detail" data-tooltip="Damage Reduction">{{item.system.damageReduction}}</div>
+          <div class="item-detail" data-tooltip={{#if item.system.equipped}}"Equipped"{{else}}"Not Equipped"{{/if}}>{{#if item.system.equipped}}<i class="fas fa-check"></i>{{else}}<i class="fas fa-times"></i>{{/if}}</div>
          <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>
@@ -149,7 +150,7 @@
          </div>
          <div class="item-detail" data-tooltip="Movement reduction">{{item.system.movementreduction}}</div>
          <div class="item-detail" data-tooltip="Has cover">{{#if item.system.hascover}}Cover{{/if}}</div>
-
+          <div class="item-detail" data-tooltip={{#if item.system.equipped}}"Equipped"{{else}}"Not Equipped"{{/if}}>{{#if item.system.equipped}}<i class="fas fa-check"></i>{{else}}<i class="fas fa-times"></i>{{/if}}</div>
          <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>
--- a/templates/character-main.hbs
+++ b/templates/character-main.hbs
@@ -1,4 +1,6 @@
-<section class="character-main character-main-{{ifThen isPlayMode 'play' 'edit'}}">
+<section
+  class="character-main character-main-{{ifThen isPlayMode 'play' 'edit'}}"
+>
  {{log "character-main" this}}

  <fieldset>
@@ -6,99 +8,189 @@
    <div class="character-pc character-pc-{{ifThen isPlayMode 'play' 'edit'}}">
      <div class="character-left">
        <div class="character-left-image">
-          <img class="character-img" src="{{actor.img}}" data-edit="img" data-action="editImage"
-            data-tooltip="{{actor.name}}" />
+          <img
+            class="character-img"
+            src="{{actor.img}}"
+            data-edit="img"
+            data-action="editImage"
+            data-tooltip="{{actor.name}}"
+          />
        </div>

        <fieldset class="">
          <div class="flexrow character-hp">
            <span class="name">{{localize "LETHALFANTASY.Label.HP"}}</span>
-            {{formInput systemFields.hp.fields.value value=system.hp.value disabled=isPlayMode
-            classes="character-hp-value"}}
+            {{formInput
+              systemFields.hp.fields.value
+              value=system.hp.value
+              disabled=isPlayMode
+              classes="character-hp-value"
+            }}
            &nbsp;/&nbsp;
-            {{formInput systemFields.hp.fields.max value=system.hp.max disabled=isPlayMode
-            classes="character-hp-value"}}
+            {{formInput
+              systemFields.hp.fields.max
+              value=system.hp.max
+              disabled=isPlayMode
+              classes="character-hp-value"
+            }}
          </div>
          <div class="flexrow character-hp">
            <span class="name">{{localize "LETHALFANTASY.Label.grit"}}</span>
-            {{formInput systemFields.grit.fields.current value=system.grit.current disabled=isPlayMode
-            classes="character-hp"}}
+            {{formInput
+              systemFields.grit.fields.current
+              value=system.grit.current
+              disabled=isPlayMode
+              classes="character-hp"
+            }}
            <span class="name">{{localize "LETHALFANTASY.Label.earned"}}</span>
-            {{formInput systemFields.grit.fields.earned value=system.grit.earned disabled=isPlayMode
-            classes="character-hp"}}
+            {{formInput
+              systemFields.grit.fields.earned
+              value=system.grit.earned
+              disabled=isPlayMode
+              classes="character-hp"
+            }}
          </div>
          <div class="flexrow character-hp">
            <span class="name">{{localize "LETHALFANTASY.Label.luck"}}</span>
-            {{formInput systemFields.luck.fields.current value=system.luck.current disabled=isPlayMode
-            classes="character-hp"}}
+            {{formInput
+              systemFields.luck.fields.current
+              value=system.luck.current
+              disabled=isPlayMode
+              classes="character-hp"
+            }}
            <span class="name">{{localize "LETHALFANTASY.Label.earned"}}</span>
-            {{formInput systemFields.luck.fields.earned value=system.luck.earned disabled=isPlayMode
-            classes="character-hp"}}
+            {{formInput
+              systemFields.luck.fields.earned
+              value=system.luck.earned
+              disabled=isPlayMode
+              classes="character-hp"
+            }}
          </div>

-          <div class="flexrow ">
-            <span class="">{{localize "LETHALFANTASY.Label.damageResistanceShort"}}</span>
-            {{formInput systemFields.hp.fields.damageResistance value=system.hp.fields.damageResistance
-            disabled=isPlayMode classes="character-hp"}}
-          </div>
+          <div class="flexrow">
+            <span class="" data-tooltip="Damage reduction">{{localize
+                "LETHALFANTASY.Label.damageResistanceShort"
+              }}
+            </span>
+            <input
+              type="text"
+              class="character-damage-reduction"
+              data-tooltip="DR (armor+natural+magical)"
+              disabled
+              value={{damageReduction}}
+            />
+            <input
+              type="text"
+              class="character-damage-reduction"
+              data-tooltip="DR (shield)"
+              disabled
+              value={{damageReductionShield}}
+            />

+          </div>

        </fieldset>

      </div>
      <div class="character-right">
        <div class="character-name">
-          {{formInput fields.name value=source.name rootId=partId disabled=isPlayMode}}
-          <a class="control" data-action="toggleSheet" data-tooltip="LETHALFANTASY.ToggleSheet"
-            data-tooltip-direction="UP">
+          {{formInput
+            fields.name
+            value=source.name
+            rootId=partId
+            disabled=isPlayMode
+          }}
+          <a
+            class="control"
+            data-action="toggleSheet"
+            data-tooltip="LETHALFANTASY.ToggleSheet"
+            data-tooltip-direction="UP"
+          >
            <i class="fa-solid fa-user-{{ifThen isPlayMode 'lock' 'pen'}}"></i>
          </a>
        </div>

-        <fieldset class="character-characteristics character-characteristics-{{ifThen isPlayMode 'play' 'edit'}}">
+        <fieldset
+          class="character-characteristics character-characteristics-{{ifThen
+              isPlayMode
+              'play'
+              'edit'
+            }}"
+        >
          <legend>{{localize "LETHALFANTASY.Label.Saves"}}</legend>
          <div class="character-saves">
            <div class="character-save">
-              <span class="name"><a class="rollable" data-roll-type="save" data-roll-key="will"><i
-                    class="lf-roll-small fa-solid fa-dice-d20"></i>
+              <span class="name"><a
+                  class="rollable"
+                  data-roll-type="save"
+                  data-roll-key="will"
+                ><i class="lf-roll-small fa-solid fa-dice-d20"></i>
                  {{localize "LETHALFANTASY.Label.saves.will"}}
                </a></span>
-              {{formField systemFields.saves.fields.will.fields.value value=system.saves.will.value disabled=true}}
+              {{formField
+                systemFields.saves.fields.will.fields.value
+                value=system.saves.will.value
+                disabled=true
+              }}
              <span class="name">
-                <a class="rollable" data-roll-type="save" data-roll-key="dodge"><i
-                    class="lf-roll-small fa-solid fa-dice-d20"></i>
+                <a
+                  class="rollable"
+                  data-roll-type="save"
+                  data-roll-key="dodge"
+                ><i class="lf-roll-small fa-solid fa-dice-d20"></i>
                  {{localize "LETHALFANTASY.Label.saves.dodge"}}
                </a>
              </span>
-              {{formField systemFields.saves.fields.dodge.fields.value value=system.saves.dodge.value
-              disabled=true}}
+              {{formField
+                systemFields.saves.fields.dodge.fields.value
+                value=system.saves.dodge.value
+                disabled=true
+              }}
              <span class="name">
-                <a class="rollable" data-roll-type="save" data-roll-key="toughness"><i
-                    class="lf-roll-small fa-solid fa-dice-d20"></i>
+                <a
+                  class="rollable"
+                  data-roll-type="save"
+                  data-roll-key="toughness"
+                ><i class="lf-roll-small fa-solid fa-dice-d20"></i>
                  {{localize "LETHALFANTASY.Label.saves.toughness"}}
                </a>
              </span>
-              {{formField systemFields.saves.fields.toughness.fields.value value=system.saves.toughness.value
-              disabled=true}}
+              {{formField
+                systemFields.saves.fields.toughness.fields.value
+                value=system.saves.toughness.value
+                disabled=true
+              }}
            </div>
            <div class="character-save">
              <span class="name">
-                <a class="rollable" data-roll-type="save" data-roll-key="contagion"><i
-                    class="lf-roll-small fa-solid fa-dice-d20"></i>
+                <a
+                  class="rollable"
+                  data-roll-type="save"
+                  data-roll-key="contagion"
+                ><i class="lf-roll-small fa-solid fa-dice-d20"></i>
                  {{localize "LETHALFANTASY.Label.saves.contagion"}}
                </a>
              </span>
-              {{formField systemFields.saves.fields.contagion.fields.value value=system.saves.contagion.value
-              disabled=true}}
+              {{formField
+                systemFields.saves.fields.contagion.fields.value
+                value=system.saves.contagion.value
+                disabled=true
+              }}

              <span class="name">
-                <a class="rollable" data-roll-type="save" data-roll-key="poison"><i
-                    class="lf-roll-small fa-solid fa-dice-d20"></i>
+                <a
+                  class="rollable"
+                  data-roll-type="save"
+                  data-roll-key="poison"
+                ><i class="lf-roll-small fa-solid fa-dice-d20"></i>
                  {{localize "LETHALFANTASY.Label.saves.poison"}}
                </a>
              </span>
-              {{formField systemFields.saves.fields.poison.fields.value value=system.saves.poison.value
-              disabled=true }}
+              {{formField
+                systemFields.saves.fields.poison.fields.value
+                value=system.saves.poison.value
+                disabled=true
+              }}

              <!--
              <span class="name-pain">
@@ -125,51 +217,124 @@
          </div>
        </fieldset>

-        <fieldset class="character-characteristics character-characteristics-{{ifThen isPlayMode 'play' 'edit'}}">
+        <fieldset
+          class="character-characteristics character-characteristics-{{ifThen
+              isPlayMode
+              'play'
+              'edit'
+            }}"
+        >
          <legend>{{localize "LETHALFANTASY.Label.Challenges"}}</legend>
          <div class="character-challenges">
            <div class="character-challenge">
-              <span class="name"><a class="rollable" data-roll-type="challenge" data-roll-key="str"><i
-                    class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize
-                  "LETHALFANTASY.Label.challenges.strength"}}</a></span>
-              {{formField systemFields.challenges.fields.str.fields.value value=system.challenges.str.value
-              disabled=true
+              <span class="name"><a
+                  class="rollable"
+                  data-roll-type="challenge"
+                  data-roll-key="str"
+                ><i class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize
+                    "LETHALFANTASY.Label.challenges.strength"
+                  }}</a></span>
+              {{formField
+                systemFields.challenges.fields.str.fields.value
+                value=system.challenges.str.value
+                disabled=true
              }}
-              <span class="name"><a class="rollable" data-roll-type="challenge" data-roll-key="agility"><i
-                    class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize
-                  "LETHALFANTASY.Label.challenges.agility"}}</a></span>
-              {{formField systemFields.challenges.fields.agility.fields.value value=system.challenges.agility.value
-              disabled=true
+              <span class="name"><a
+                  class="rollable"
+                  data-roll-type="challenge"
+                  data-roll-key="agility"
+                ><i class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize
+                    "LETHALFANTASY.Label.challenges.agility"
+                  }}</a></span>
+              {{formField
+                systemFields.challenges.fields.agility.fields.value
+                value=system.challenges.agility.value
+                disabled=true
+              }}
+              <span class="name"><a
+                  class="rollable"
+                  data-roll-type="challenge"
+                  data-roll-key="dying"
+                ><i class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize
+                    "LETHALFANTASY.Label.challenges.dying"
+                  }}</a></span>
+              {{formField
+                systemFields.challenges.fields.dying.fields.value
+                value=system.challenges.dying.value
+                disabled=true
              }}
-              <span class="name"><a class="rollable" data-roll-type="challenge" data-roll-key="dying"><i
-                    class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize
-                  "LETHALFANTASY.Label.challenges.dying"}}</a></span>
-              {{formField systemFields.challenges.fields.dying.fields.value value=system.challenges.dying.value
-              disabled=true }}
            </div>
          </div>
        </fieldset>

-        <fieldset class="character-characteristics character-characteristics-{{ifThen isPlayMode 'play' 'edit'}}">
+        <fieldset
+          class="character-characteristics character-characteristics-{{ifThen
+              isPlayMode
+              'play'
+              'edit'
+            }}"
+        >
          <legend>{{localize "LETHALFANTASY.Label.Movement"}}</legend>
          <div class="character-movements">
            <div class="character-movement">
-              <span class="name">{{localize "LETHALFANTASY.Label.movement.walk"}}</span>
-              {{formField systemFields.movement.fields.walk value=system.movement.walk disabled=isPlayMode}}
-              <span class="name">{{localize "LETHALFANTASY.Label.movement.jog"}}</span>
-              {{formField systemFields.movement.fields.jog value=system.movement.jog disabled=isPlayMode}}
-              <span class="name">{{localize "LETHALFANTASY.Label.movement.run"}}</span>
-              {{formField systemFields.movement.fields.run value=system.movement.run disabled=isPlayMode}}
-              <span class="name">{{localize "LETHALFANTASY.Label.movement.sprint"}}</span>
-              {{formField systemFields.movement.fields.sprint value=system.movement.sprint disabled=isPlayMode}}
+              <span class="name">{{localize
+                  "LETHALFANTASY.Label.movement.walk"
+                }}</span>
+              {{formField
+                systemFields.movement.fields.walk
+                value=system.movement.walk
+                disabled=isPlayMode
+              }}
+              <span class="name">{{localize
+                  "LETHALFANTASY.Label.movement.jog"
+                }}</span>
+              {{formField
+                systemFields.movement.fields.jog
+                value=system.movement.jog
+                disabled=isPlayMode
+              }}
+              <span class="name">{{localize
+                  "LETHALFANTASY.Label.movement.run"
+                }}</span>
+              {{formField
+                systemFields.movement.fields.run
+                value=system.movement.run
+                disabled=isPlayMode
+              }}
+              <span class="name">{{localize
+                  "LETHALFANTASY.Label.movement.sprint"
+                }}</span>
+              {{formField
+                systemFields.movement.fields.sprint
+                value=system.movement.sprint
+                disabled=isPlayMode
+              }}
            </div>
            <div class="character-movement">
-              <span class="name">{{localize "LETHALFANTASY.Label.movement.jumpBroad"}}</span>
-              {{formField systemFields.jump.fields.broad value=system.jump.broad disabled=isPlayMode}}
-              <span class="name">{{localize "LETHALFANTASY.Label.movement.jumpRunning"}}</span>
-              {{formField systemFields.jump.fields.running value=system.jump.running disabled=isPlayMode}}
-              <span class="name">{{localize "LETHALFANTASY.Label.movement.jumpVertical"}}</span>
-              {{formField systemFields.jump.fields.vertical value=system.jump.vertical disabled=isPlayMode}}
+              <span class="name">{{localize
+                  "LETHALFANTASY.Label.movement.jumpBroad"
+                }}</span>
+              {{formField
+                systemFields.jump.fields.broad
+                value=system.jump.broad
+                disabled=isPlayMode
+              }}
+              <span class="name">{{localize
+                  "LETHALFANTASY.Label.movement.jumpRunning"
+                }}</span>
+              {{formField
+                systemFields.jump.fields.running
+                value=system.jump.running
+                disabled=isPlayMode
+              }}
+              <span class="name">{{localize
+                  "LETHALFANTASY.Label.movement.jumpVertical"
+                }}</span>
+              {{formField
+                systemFields.jump.fields.vertical
+                value=system.jump.vertical
+                disabled=isPlayMode
+              }}
            </div>
          </div>
        </fieldset>
@@ -178,62 +343,124 @@
    </div>
  </fieldset>

-  <fieldset class="character-characteristics character-characteristics-{{ifThen isPlayMode 'play' 'edit'}}">
+  <fieldset
+    class="character-characteristics character-characteristics-{{ifThen
+        isPlayMode
+        'play'
+        'edit'
+      }}"
+  >
    <legend>{{localize "LETHALFANTASY.Label.characteristics"}}</legend>
    <div class="character-characteristic">
      <span>{{localize "LETHALFANTASY.Label.str"}}</span>
-      {{formField systemFields.characteristics.fields.str.fields.value value=system.characteristics.str.value
-      disabled=isPlayMode data-char-id="str" }}
-      {{formField systemFields.characteristics.fields.str.fields.percent value=system.characteristics.str.percent
-      disabled=isPlayMode type="number"}}
+      {{formField
+        systemFields.characteristics.fields.str.fields.value
+        value=system.characteristics.str.value
+        disabled=isPlayMode
+        data-char-id="str"
+      }}
+      {{formField
+        systemFields.characteristics.fields.str.fields.percent
+        value=system.characteristics.str.percent
+        disabled=isPlayMode
+        type="number"
+      }}
    </div>
    <div class="character-characteristic">
      <span>{{localize "LETHALFANTASY.Label.int"}}</span>
-      {{formField systemFields.characteristics.fields.int.fields.value value=system.characteristics.int.value
-      disabled=isPlayMode data-char-id="int" }}
+      {{formField
+        systemFields.characteristics.fields.int.fields.value
+        value=system.characteristics.int.value
+        disabled=isPlayMode
+        data-char-id="int"
+      }}

-      {{formField systemFields.characteristics.fields.int.fields.percent value=system.characteristics.int.percent
-      disabled=isPlayMode type="number" }}
+      {{formField
+        systemFields.characteristics.fields.int.fields.percent
+        value=system.characteristics.int.percent
+        disabled=isPlayMode
+        type="number"
+      }}
    </div>
    <div class="character-characteristic">
      <span>{{localize "LETHALFANTASY.Label.wis"}}</span>
-      {{formField systemFields.characteristics.fields.wis.fields.value value=system.characteristics.wis.value
-      disabled=isPlayMode data-char-id="wis" }}
+      {{formField
+        systemFields.characteristics.fields.wis.fields.value
+        value=system.characteristics.wis.value
+        disabled=isPlayMode
+        data-char-id="wis"
+      }}

-      {{formField systemFields.characteristics.fields.wis.fields.percent value=system.characteristics.wis.percent
-      disabled=isPlayMode type="number"}}
+      {{formField
+        systemFields.characteristics.fields.wis.fields.percent
+        value=system.characteristics.wis.percent
+        disabled=isPlayMode
+        type="number"
+      }}
    </div>
    <div class="character-characteristic">
      <span>{{localize "LETHALFANTASY.Label.dex"}}</span>
-      {{formField systemFields.characteristics.fields.dex.fields.value value=system.characteristics.dex.value
-      disabled=isPlayMode data-char-id="wis" }}
+      {{formField
+        systemFields.characteristics.fields.dex.fields.value
+        value=system.characteristics.dex.value
+        disabled=isPlayMode
+        data-char-id="wis"
+      }}

-      {{formField systemFields.characteristics.fields.dex.fields.percent value=system.characteristics.dex.percent
-      disabled=isPlayMode type="number" }}
+      {{formField
+        systemFields.characteristics.fields.dex.fields.percent
+        value=system.characteristics.dex.percent
+        disabled=isPlayMode
+        type="number"
+      }}
    </div>
    <div class="character-characteristic">
      <span>{{localize "LETHALFANTASY.Label.con"}}</span>
-      {{formField systemFields.characteristics.fields.con.fields.value value=system.characteristics.con.value
-      disabled=isPlayMode data-char-id="con" }}
+      {{formField
+        systemFields.characteristics.fields.con.fields.value
+        value=system.characteristics.con.value
+        disabled=isPlayMode
+        data-char-id="con"
+      }}

-      {{formField systemFields.characteristics.fields.con.fields.percent value=system.characteristics.con.percent
-      disabled=isPlayMode type="number"}}
+      {{formField
+        systemFields.characteristics.fields.con.fields.percent
+        value=system.characteristics.con.percent
+        disabled=isPlayMode
+        type="number"
+      }}
    </div>
    <div class="character-characteristic">
      <span>{{localize "LETHALFANTASY.Label.cha"}}</span>
-      {{formField systemFields.characteristics.fields.cha.fields.value value=system.characteristics.cha.value
-      disabled=isPlayMode data-char-id="cha" }}
+      {{formField
+        systemFields.characteristics.fields.cha.fields.value
+        value=system.characteristics.cha.value
+        disabled=isPlayMode
+        data-char-id="cha"
+      }}

-      {{formField systemFields.characteristics.fields.cha.fields.percent value=system.characteristics.cha.percent
-      disabled=isPlayMode type="number"}}
+      {{formField
+        systemFields.characteristics.fields.cha.fields.percent
+        value=system.characteristics.cha.percent
+        disabled=isPlayMode
+        type="number"
+      }}
    </div>
    <div class="character-characteristic">
      <span>{{localize "LETHALFANTASY.Label.luc"}}</span>
-      {{formField systemFields.characteristics.fields.luc.fields.value value=system.characteristics.luc.value
-      disabled=isPlayMode data-char-id="luc" }}
+      {{formField
+        systemFields.characteristics.fields.luc.fields.value
+        value=system.characteristics.luc.value
+        disabled=isPlayMode
+        data-char-id="luc"
+      }}

-      {{formField systemFields.characteristics.fields.luc.fields.percent value=system.characteristics.luc.percent
-      disabled=isPlayMode type="number"}}
+      {{formField
+        systemFields.characteristics.fields.luc.fields.percent
+        value=system.characteristics.luc.percent
+        disabled=isPlayMode
+        type="number"
+      }}
    </div>
  </fieldset>

--- a/templates/chat-message.hbs
+++ b/templates/chat-message.hbs
@@ -1,4 +1,5 @@
 {{!log 'chat-message' this}}
+{{!log 'weaponDamageOptions' weaponDamageOptions}}
 <div class="{{cssClass}}">
  <div class="intro-chat">
    <div class="intro-img">
@@ -9,80 +10,164 @@
      <span><STRONG>{{actingCharName}} - {{upperFirst rollName}}</STRONG></span>

      {{#if (match rollType "attack")}}
-      <span>Attack roll !</span>
+        <span>Attack roll !</span>
      {{/if}}
      {{#if (match rollType "defense")}}
-      <span>Defense roll !</span>
+        <span>Defense roll !</span>
      {{/if}}

      {{#if (eq rollData.favor "favor")}}
-      <span><strong>Favor roll</strong></span>
+        <span><strong>Favor roll</strong></span>
      {{/if}}
      {{#if (eq rollData.favor "disfavor")}}
-      <span><strong>Disfavor roll</strong></span>
+        <span><strong>Disfavor roll</strong></span>
      {{/if}}
      {{#if badResult}}
-      <span><strong>{{localize "LETHALFANTASY.Label.otherResult"}}</strong> : {{badResult}}</span>
+        <span><strong>{{localize "LETHALFANTASY.Label.otherResult"}}</strong>
+          :
+          {{badResult}}</span>
      {{/if}}

      {{#if rollTarget.weapon}}
-      <span>{{rollTarget.weapon.name}}</span>
+        <span>{{rollTarget.weapon.name}}</span>
+      {{/if}}
+
+      {{#if rollData.isDamage}}
+        <span><strong>Damage Roll</strong></span>
+      {{/if}}
+      {{#if rollData.damageSmall}}
+        <span><strong>{{localize
+              "LETHALFANTASY.Label.weapon-damage-small"
+            }}</strong></span>
+      {{/if}}
+      {{#if rollData.damageMedium}}
+        <span><strong>{{localize
+              "LETHALFANTASY.Label.weapon-damage-medium"
+            }}</strong></span>
      {{/if}}

      {{#if rollData.letItFly}}
-      <span>Let It Fly attack ! </span>
+        <span>Let It Fly attack ! </span>
      {{/if}}
      {{#if rollData.pointBlank}}
-      <span>Point Blank Range Attack !</span>
+        <span>Point Blank Range Attack !</span>
      {{/if}}
      {{#if rollData.beyondSkill}}
-      <span>Beyond Skill Range Attack !</span>
+        <span>Beyond Skill Range Attack !</span>
      {{/if}}

      <span><strong>Formula</strong> : {{titleFormula}}</span>

      {{#each diceResults as |result|}}
-      <span>{{result.dice}} : {{result.value}}</span>
+        <span>{{result.dice}} : {{result.value}}</span>
      {{/each}}

    </div>
  </div>
  {{#if isSave}}
-  <div class="result">
-    {{#if (eq resultType "success")}}
-    {{#if isPrivate}}?{{else}}{{localize "LETHALFANTASY.Roll.success"}}{{/if}}
-    {{else}}
-    {{#if isPrivate}}?{{else}}{{localize "LETHALFANTASY.Roll.failure"}}{{/if}}
-    {{/if}}
-  </div>
+    <div class="result">
+      {{#if (eq resultType "success")}}
+        {{#if isPrivate}}?{{else}}{{localize
+            "LETHALFANTASY.Roll.success"
+          }}{{/if}}
+      {{else}}
+        {{#if isPrivate}}?{{else}}{{localize
+            "LETHALFANTASY.Roll.failure"
+          }}{{/if}}
+      {{/if}}
+    </div>
  {{/if}}
  {{#if isResource}}
-  <div class="result">
-    {{#if (eq resultType "success")}}
-    {{#if isPrivate}}?{{else}}{{localize "LETHALFANTASY.Roll.success"}}{{/if}}
-    {{else}}
-    {{#if isPrivate}}?{{else}}{{localize "LETHALFANTASY.Roll.failure"}}{{#if isFailure}} ({{localize
-    "LETHALFANTASY.Roll.resourceLost"}}){{/if}}{{/if}}
-    {{/if}}
-  </div>
+    <div class="result">
+      {{#if (eq resultType "success")}}
+        {{#if isPrivate}}?{{else}}{{localize
+            "LETHALFANTASY.Roll.success"
+          }}{{/if}}
+      {{else}}
+        {{#if isPrivate}}?{{else}}{{localize "LETHALFANTASY.Roll.failure"}}{{#if
+            isFailure
+          }} ({{localize "LETHALFANTASY.Roll.resourceLost"}}){{/if}}{{/if}}
+      {{/if}}
+    </div>
  {{/if}}
  {{#if isDamage}}
-  <div>
-    {{#if (and isGM hasTarget)}}
-    {{{localize "LETHALFANTASY.Roll.displayArmor" targetName=targetName targetArmor=targetArmor realDamage=realDamage}}}
-    {{/if}}
-  </div>
+    <div>
+      {{#if (and isGM hasTarget)}}
+        {{{localize
+          "LETHALFANTASY.Roll.displayArmor"
+          targetName=targetName
+          targetArmor=targetArmor
+          realDamage=realDamage
+        }}}
+      {{/if}}
+    </div>
  {{/if}}

  {{#unless isPrivate}}
-  <div class="dice-result">
-    <h4 class="dice-total">{{total}}</h4>
-  </div>
-  {{#if D30result}}
-  <div class="dice-result">
-    <h4 class="dice-total">D30 result: {{D30result}}</h4>
-  </div>
-  {{/if}}
+    <div class="dice-result">
+      <h4 class="dice-total">{{total}}</h4>
+    </div>
+    {{#if D30result}}
+      <div class="dice-result">
+        <h4 class="dice-total">D30 result: {{D30result}}</h4>
+      </div>
+    {{/if}}

  {{/unless}}
+
+  {{#if weaponDamageOptions}}
+    <div class="damage-buttons">
+      <div class="damage-buttons-title">{{localize
+          "LETHALFANTASY.Label.rollDamage"
+        }}</div>
+      <div class="damage-buttons-grid">
+        {{#if weaponDamageOptions.damageS}}
+          <button
+            class="damage-roll-btn"
+            data-weapon-id="{{weaponDamageOptions.weaponId}}"
+            data-damage-type="small"
+            data-damage-formula="{{weaponDamageOptions.damageS}}"
+            title="{{localize 'LETHALFANTASY.Label.weapon-damage-small'}}"
+          >
+            <i class="fa-solid fa-dice-d6"></i>
+            {{localize "LETHALFANTASY.Label.weapon-damage-small"}}
+          </button>
+        {{/if}}
+        {{#if weaponDamageOptions.damageM}}
+          <button
+            class="damage-roll-btn"
+            data-weapon-id="{{weaponDamageOptions.weaponId}}"
+            data-damage-type="medium"
+            data-damage-formula="{{weaponDamageOptions.damageM}}"
+            title="{{localize 'LETHALFANTASY.Label.weapon-damage-medium'}}"
+          >
+            <i class="fa-solid fa-dice-d20"></i>
+            {{localize "LETHALFANTASY.Label.weapon-damage-medium"}}
+          </button>
+        {{/if}}
+      </div>
+    </div>
+  {{/if}}
+
+  {{#if rollData.isDamage}}
+    <div class="damage-result">
+      <ul>
+        <li class="li-apply-wounds">
+          <div>{{localize "LETHALFANTASY.Label.applyDamage"}}</div>
+          <div class="combatants-grid">
+            {{#each combatants}}
+              <button
+                class="apply-wounds-btn"
+                data-combatant-id="{{this.id}}"
+                title="{{this.name}}"
+              >
+                {{this.name}}
+              </button>
+            {{/each}}
+          </div>
+        </li>
+      </ul>
+    </div>
+  {{/if}}
+
 </div>
--- a/templates/monster-main.hbs
+++ b/templates/monster-main.hbs
@@ -147,7 +147,7 @@
              <span class="name">{{localize "LETHALFANTASY.Label.movement.walk"}}</span>
              {{formField systemFields.movement.fields.walk value=system.movement.walk disabled=isPlayMode}}
              <span class="name">{{localize "LETHALFANTASY.Label.movement.jog"}}</span>
-              {{formField systemFields.movement.fields.jog value=system.challenges.movement.jog disabled=isPlayMode}}
+              {{formField systemFields.movement.fields.jog value=system.movement.jog disabled=isPlayMode}}
              <span class="name">{{localize "LETHALFANTASY.Label.movement.run"}}</span>
              {{formField systemFields.movement.fields.run value=system.movement.run disabled=isPlayMode}}
              <span class="name">{{localize "LETHALFANTASY.Label.movement.sprint"}}</span>
--- a/templates/roll-dialog.hbs
+++ b/templates/roll-dialog.hbs
@@ -1,111 +1,148 @@
 <div class="lethalfantasy-roll-dialog">

  <fieldSet class="">
-    <legend>{{localize (concat "LETHALFANTASY.Label." rollType)}} - {{actorName}}</legend>
+    <legend>{{localize (concat "LETHALFANTASY.Label." rollType)}}
+      -
+      {{actorName}}</legend>

    {{#if rollTarget.tokenId}}
-    <div class="dialog-save">
-      <a class="goto-token-button" data-action="gotoToken" data-token-id="{{rollTarget.tokenId}}">{{localize
-        "LETHALFANTASY.Label.gotoToken"}} </a>
-    </div>
+      <div class="dialog-save">
+        <a
+          class="goto-token-button"
+          data-action="gotoToken"
+          data-token-id="{{rollTarget.tokenId}}"
+        >{{localize "LETHALFANTASY.Label.gotoToken"}} </a>
+      </div>
    {{/if}}

    {{#if (match rollType "attack")}}
-    <div class="dialog-save">Attack roll ! - {{rollTarget.name}}</div>
+      <div class="dialog-save">Attack roll ! - {{rollTarget.name}}</div>
    {{/if}}
    {{#if (match rollType "defense")}}
-    <div class="dialog-save">Defense roll ! - {{rollTarget.name}}</div>
+      <div class="dialog-save">Defense roll ! - {{rollTarget.name}}</div>
    {{/if}}

    {{#if hasModifier}}
-    <div class="dialog-save">{{upperFirst rollName}} : {{baseFormula}} + {{baseValue}}</div>
+      <div class="dialog-save">{{upperFirst rollName}}
+        :
+        {{baseFormula}}
+        +
+        {{baseValue}}</div>
    {{else}}
-    <div class="dialog-save">{{upperFirst rollName}} : {{baseFormula}}</div>
+      <div class="dialog-save">{{upperFirst rollName}} : {{baseFormula}}</div>
    {{/if}}
+
    {{#if rollTarget.weapon}}
-    <div class="dialog-save">{{localize "LETHALFANTASY.Label.baseModifier"}} : {{rollTarget.charModifier}}</div>
-    <div class="dialog-save">{{localize "LETHALFANTASY.Label.weapon"}} : {{rollTarget.weapon.name}}</div>
-    <div class="dialog-save">{{localize "LETHALFANTASY.Label.skill"}} : {{rollTarget.name}}</div>
-    <div class="dialog-save">{{localize "LETHALFANTASY.Label.skillBonus"}} : {{rollTarget.weaponSkillModifier}}</div>
+      <div class="dialog-save">{{localize "LETHALFANTASY.Label.baseModifier"}}
+        :
+        {{rollTarget.charModifier}}</div>
+      {{#if (match rollType "defense")}}
+        <div class="dialog-save">Armor defense modifier :
+          {{rollTarget.armorDefense}}</div>
+      {{/if}}
+      <div class="dialog-save">{{localize "LETHALFANTASY.Label.weapon"}}
+        :
+        {{rollTarget.weapon.name}}</div>
+      <div class="dialog-save">{{localize "LETHALFANTASY.Label.skill"}}
+        :
+        {{rollTarget.name}}</div>
+      <div class="dialog-save">{{localize "LETHALFANTASY.Label.skillBonus"}}
+        :
+        {{rollTarget.weaponSkillModifier}}</div>
    {{/if}}

    {{#if (match rollType "attack")}}
-    <div class="dialog-save">Add Granted Attack Dice
-      <input type="checkbox" data-action="selectGranted" name="granted">
-    </div>
-    {{#if rollTarget.weapon}}
-    {{#if (eq rollTarget.weapon.system.weaponType "melee")}}
-    {{else}}
-    <div class="dialog-save">Point Blank Range Attack
-      <input type="checkbox" data-action="selectPointBlank" name="pointBlankV">
-    </div>
-    <div class="dialog-save">Beyond Skill Range Attack
-      <input type="checkbox" data-action="selectBeyondSkill" name="beyondSkillV">
-    </div>
-    <div class="dialog-save">Let it Fly (Pure D20E)
-      <input type="checkbox" data-action="selectLetItFly" name="letItFlyV">
-    </div>
-    <div class="dialog-save">Aiming
-      <select name="attackerAim" data-tooltip-direction="UP">
-        {{selectOptions attackerAimChoices selected=attackerAim}}
-      </select>
-    </div>
-    {{/if}}
-    {{/if}}
+      <div class="dialog-save">Add Granted Attack Dice
+        <input type="checkbox" data-action="selectGranted" name="granted" />
+      </div>
+      {{#if rollTarget.weapon}}
+        {{#if (eq rollTarget.weapon.system.weaponType "melee")}}{{else}}
+          <div class="dialog-save">Point Blank Range Attack
+            <input
+              type="checkbox"
+              data-action="selectPointBlank"
+              name="pointBlankV"
+            />
+          </div>
+          <div class="dialog-save">Beyond Skill Range Attack
+            <input
+              type="checkbox"
+              data-action="selectBeyondSkill"
+              name="beyondSkillV"
+            />
+          </div>
+          <div class="dialog-save">Let it Fly (Pure D20E)
+            <input
+              type="checkbox"
+              data-action="selectLetItFly"
+              name="letItFlyV"
+            />
+          </div>
+          <div class="dialog-save">Aiming
+            <select name="attackerAim" data-tooltip-direction="UP">
+              {{selectOptions attackerAimChoices selected=attackerAim}}
+            </select>
+          </div>
+        {{/if}}
+      {{/if}}

    {{/if}}
    {{#if (match rollType "defense")}}
-    <div class="dialog-save">Add Granted Defense Dice
-      <input type="checkbox" data-action="selectGranted" name="granted">
-    </div>
+      <div class="dialog-save">Add Granted Defense Dice
+        <input type="checkbox" data-action="selectGranted" name="granted" />
+      </div>
    {{/if}}
    {{#if (match rollType "damage")}}
-    <div class="dialog-save">Add Granted Damage Dice
-      <input type="checkbox" data-action="selectGranted" name="granted">
-    </div>
+      <div class="dialog-save">Add Granted Damage Dice
+        <input type="checkbox" data-action="selectGranted" name="granted" />
+      </div>
    {{/if}}

    {{#if rollTarget.staticModifier}}
-    <div class="dialog-save">Static modifier : +{{rollTarget.staticModifier}}</div>
+      <div class="dialog-save">Static modifier : +{{rollTarget.staticModifier}}</div>
    {{/if}}

  </fieldSet>

-
  {{#if hasFavor}}
-  <fieldSet class="dialog-favor">
-    <legend>{{localize "LETHALFANTASY.Roll.favorDisfavor"}}</legend>
-    <select name="favor" class="favor-choice" data-tooltip-direction="UP">
-      {{selectOptions choiceFavor selected=favor}}
-    </select>
-  </fieldSet>
+    <fieldSet class="dialog-favor">
+      <legend>{{localize "LETHALFANTASY.Roll.favorDisfavor"}}</legend>
+      <select name="favor" class="favor-choice" data-tooltip-direction="UP">
+        {{selectOptions choiceFavor selected=favor}}
+      </select>
+    </fieldSet>
  {{/if}}

  {{#if hasModifier}}
-  <fieldSet class="dialog-modifier">
-    <legend>{{localize "LETHALFANTASY.Roll.modifierBonusMalus"}}</legend>
-    <select name="modifier" data-tooltip-direction="UP">
-      {{selectOptions choiceModifier selected=modifier}}
-    </select>
+    <fieldSet class="dialog-modifier">
+      <legend>{{localize "LETHALFANTASY.Roll.modifierBonusMalus"}}</legend>
+      <select name="modifier" data-tooltip-direction="UP">
+        {{selectOptions choiceModifier selected=modifier}}
+      </select>

-    {{#if (eq rollType "save")}}
-    {{#if rollTarget.magicUser}}
-    <div>
-      <span>Save against spell (+{{rollTarget.actorModifiers.saveModifier}}) ?</span>
-      <input type="checkbox" name="saveSpellCheck" data-action="saveSpellCheck">
-    </div>
-    {{/if}}
-    {{/if}}
-  </fieldSet>
+      {{#if (eq rollType "save")}}
+        {{#if rollTarget.magicUser}}
+          <div>
+            <span>Save against spell (+{{rollTarget.actorModifiers.saveModifier}})
+              ?</span>
+            <input
+              type="checkbox"
+              name="saveSpellCheck"
+              data-action="saveSpellCheck"
+            />
+          </div>
+        {{/if}}
+      {{/if}}
+    </fieldSet>
  {{/if}}

  {{#if hasChangeDice}}
-  <fieldSet class="dialog-modifier">
-    <legend>{{localize "LETHALFANTASY.Roll.changeDice"}}</legend>
-    <select name="changeDice" data-tooltip-direction="UP">
-      {{selectOptions choiceDice selected=changeDice}}
-    </select>
-  </fieldSet>
+    <fieldSet class="dialog-modifier">
+      <legend>{{localize "LETHALFANTASY.Roll.changeDice"}}</legend>
+      <select name="changeDice" data-tooltip-direction="UP">
+        {{selectOptions choiceDice selected=changeDice}}
+      </select>
+    </fieldSet>
  {{/if}}

  <fieldSet>
@@ -115,5 +152,4 @@
    </select>
  </fieldSet>

-
 </div>
--- a/templates/shield.hbs
+++ b/templates/shield.hbs
@@ -1,6 +1,12 @@
 <section>
  <div class="header">
-    <img class="item-img" src="{{item.img}}" data-edit="img" data-action="editImage" data-tooltip="{{item.name}}" />
+    <img
+      class="item-img"
+      src="{{item.img}}"
+      data-edit="img"
+      data-action="editImage"
+      data-tooltip="{{item.name}}"
+    />
    {{formInput fields.name value=source.name}}
  </div>

@@ -8,23 +14,32 @@
    <div class="align-top">
      {{formField systemFields.defense value=system.defense}}

+      {{formField systemFields.damageReduction value=system.damageReduction}}
+
      <div class="shift-right">&nbsp;
      </div>

      {{formField systemFields.hascover value=system.hascover}}

      {{#if system.hascover}}
-      <label>Cover vs ranged attacks</label>
-      <div class="shift-right">
-        <label>Standing </label>
-        <div class="flexrow">{{formField systemFields.standing.fields.min value=system.standing.min}} &nbsp;...&nbsp;30
+        <label>Cover vs ranged attacks</label>
+        <div class="shift-right">
+          <label>Standing </label>
+          <div class="flexrow">{{formField
+              systemFields.standing.fields.min
+              value=system.standing.min
+            }}
+            &nbsp;...&nbsp;30
+          </div>
+        </div>
+        <div class="shift-right">
+          <label>Crouching</label>
+          <div class="flexrow">{{formField
+              systemFields.crouching.fields.min
+              value=system.crouching.min
+            }}
+            &nbsp;...&nbsp;30</div>
        </div>
-      </div>
-      <div class="shift-right">
-        <label>Crouching</label>
-        <div class="flexrow">{{formField systemFields.crouching.fields.min value=system.crouching.min}}
-          &nbsp;...&nbsp;30</div>
-      </div>
      {{/if}}
    </div>

@@ -53,15 +68,14 @@
    </div>
  </div>

-
  <fieldset>
    <legend>{{localize "LETHALFANTASY.Label.description"}}</legend>
    {{formInput
-    systemFields.description
-    enriched=enrichedDescription
-    value=system.description
-    name="system.description"
-    toggled="false"
+      systemFields.description
+      enriched=enrichedDescription
+      value=system.description
+      name="system.description"
+      toggled="false"
    }}
  </fieldset>
 </section>
Author	SHA1	Message	Date
LeRatierBretonnien	96062c6fd9	Roll damages and so on All checks were successful Release Creation / build (release) Successful in 56s Details	2025-12-14 21:18:00 +01:00
LeRatierBretonnien	f6b35536de	Manage DR and damage roll	2025-12-14 20:48:33 +01:00
LeRatierBretonnien	7d27562bb4	Fix DR and defense values All checks were successful Release Creation / build (release) Successful in 1m7s Details	2025-12-08 11:54:36 +01:00
LeRatierBretonnien	64f2efdcb9	Fix last HD Roll All checks were successful Release Creation / build (release) Successful in 1m35s Details	2025-11-07 07:58:58 +01:00
LeRatierBretonnien	66f7aade25	Fix jog + update compendiums All checks were successful Release Creation / build (release) Successful in 52s Details	2025-10-17 20:06:49 +02:00
LeRatierBretonnien	8f682a1458	Auto-publish package on releas	2025-10-01 17:26:29 +02:00