Fix jog + update compendiums

Auto-publish package on releas
Some granted dice/favor fixes
2025-10-17 20:06:49 +02:00 · 2025-10-01 17:26:29 +02:00 · 2025-10-01 17:17:33 +02:00 · 2025-09-20 09:34:13 +02:00 · 2025-09-19 23:32:15 +02:00 · 2025-09-19 22:30:26 +02:00
55 changed files with 915 additions and 547 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
@@ -521,6 +521,9 @@ i.lethalfantasy {
  min-width: 2.5rem;
  max-width: 2.5rem;
 }
+.lethalfantasy .tab.character-combat .main-div .combat-details .combat-detail .ranged-attack-button {
+  font-size: 0.8rem;
+}
 .lethalfantasy .tab.character-combat .main-div .combat-details .combat-detail button {
  min-width: 9rem;
 }
@@ -682,7 +685,8 @@ i.lethalfantasy {
  gap: 4px;
 }
 .lethalfantasy .tab.character-spells .main-div .spells .spell .item-img {
-  width: 24px;
+  min-width: 24px;
+  max-width: 24px;
  height: 24px;
 }
 .lethalfantasy .tab.character-spells .main-div .spells .spell .name {
@@ -2235,10 +2239,17 @@ i.lethalfantasy {
 .lethalfantasy-range-defense-dialog fieldset {
  padding: 4px;
 }
+.lethalfantasy-range-defense-dialog .fieldset-centered {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+}
 .lethalfantasy-range-defense-dialog select {
  margin-left: 0.5rem;
-  min-width: 10rem;
-  max-width: 10rem;
+  min-width: 12rem;
+  max-width: 12rem;
 }
 .lethalfantasy-range-defense-dialog .field-section {
  display: flex;
@@ -2246,9 +2257,9 @@ i.lethalfantasy {
  justify-content: left;
 }
 .lethalfantasy-range-defense-dialog .field-name {
-  width: 4rem;
-  min-width: 4rem;
-  max-width: 4rem;
+  width: 5rem;
+  min-width: 5rem;
+  max-width: 5em;
 }
 .dialog-form .form-footer button {
  min-width: 14rem;
@@ -2292,6 +2303,15 @@ i.lethalfantasy {
  font-size: calc(var(--font-size-standard) * 1);
  color: var(--color-dark-1);
 }
+.main select,
+.dialog-damage select,
+.dialog-resource select,
+.dialog-challenge select,
+.dialog-save select {
+  min-width: 8rem;
+  max-width: 8rem;
+  margin-left: 1rem;
+}
 .dice-roll {
  flex-direction: column;
 }
--- a/lang/en.json
+++ b/lang/en.json
@@ -83,7 +83,7 @@
        },
        "challenges": {
          "agility": {
-            "label": "Agility"
+            "label": "Dexterity"
          },
          "dying": {
            "label": "Dying"
@@ -181,7 +181,7 @@
        },
        "challenges": {
          "agility": {
-            "label": "Agility"
+            "label": "Dexterity"
          },
          "dying": {
            "label": "Dying"
@@ -281,6 +281,7 @@
      }
    },
    "Label": {
+      "agility": "Dexterity",
      "gotoToken": "Go to token",
      "combatAction": "Combat action",
      "currentAction": "Current ongoing action",
@@ -348,7 +349,7 @@
      "cha": "CHA",
      "challenge": "Challenge",
      "challenges": {
-        "agility": "Agility",
+        "agility": "Dexterity",
        "dying": "Dying",
        "strength": "Strength"
      },
--- a/module/applications/sheets/base-actor-sheet.mjs
+++ b/module/applications/sheets/base-actor-sheet.mjs
@@ -140,7 +140,7 @@ export default class LethalFantasyActorSheet extends HandlebarsApplicationMixin(
    if ("link" in event.target.dataset) return

    const el = event.currentTarget.closest('[data-drag="true"]')
-    const dragType = el.dataset.dragType
+    const dragType = el?.dataset?.dragType

    let dragData = {}

--- a/module/applications/sheets/character-sheet.mjs
+++ b/module/applications/sheets/character-sheet.mjs
@@ -143,7 +143,7 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet
    const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event)

    // Handle different data types
-    if  (data.type === "Item") {
+    if (data.type === "Item") {
      const item = await fromUuid(data.uuid)
      return this._onDropItem(item)
    }
@@ -246,7 +246,6 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet

  async _onRoll(event, target) {
    if (this.isEditMode) return
-    console.log("Roll event", event)
    const rollType = event.target.dataset.rollType
    let rollKey = event.target.dataset.rollKey;
    let rollDice = event.target.dataset?.rollDice;
--- a/module/config/system.mjs
+++ b/module/config/system.mjs
@@ -50,7 +50,7 @@ export const MORTAL_CHOICES = {
  "halfelf": { label: "Half-Elf", id: "halfelf", defenseBonus: 0 },
  "halforc": { label: "Half-Orc", id: "halforc", defenseBonus: 0 },
  "gnome": { label: "Gnome", id: "gnome", defenseBonus: 2 },
-  "halflings": { label: "Halflings", id: "halflings", defenseBonus: 2 }
+  "halflings": { label: "Halfling", id: "halflings", defenseBonus: 2 }
 }

 export const FAVOR_CHOICES = {
@@ -92,8 +92,8 @@ export const RANGE_CHOICES = {

 export const ATTACKER_AIM_CHOICES = {
  "simple": { label: "Simple (+0)", value: "0" },
-  "careful": { label: "Careful (Red -5)", value: "-4" },
-  "focused": { label: "Focused (Grey -9)", value: "-9" }
+  "careful": { label: "Careful (Red +5)", value: "+4" },
+  "focused": { label: "Focused (Grey +9)", value: "+9" }
 }

 export const SPELL_LETHARGY_DICE = [
@@ -104,6 +104,18 @@ export const SPELL_LETHARGY_DICE = [
  { dice: "D20", value: "20", level: "21-25", maxLevel: 25 }
 ]

+export const GRANTED_DICE_CHOICES = {
+  "0": { label: "None", value: "0" },
+  "D2": { label: "D2", value: "D2" },
+  "D3": { label: "D3", value: "D3" },
+  "D4": { label: "D4", value: "D4" },
+  "D6": { label: "D6", value: "D6" },
+  "D8": { label: "D8", value: "D8" },
+  "D10": { label: "D10", value: "D10" },
+  "D12": { label: "D12", value: "D12" },
+  "D20": { label: "D20", value: "D20" }
+}
+
 export const INITIATIVE_DICE_CHOICES_PER_CLASS = {
  "untrained": [
    { "name": "Asleep or totally distracted (2D12)", "value": "2D12" },
@@ -136,7 +148,7 @@ export const INITIATIVE_DICE_CHOICES_PER_CLASS = {
  "cleric": [
    { "name": "Asleep or totally distracted (1D12)", "value": "1D12" },
    { "name": "Awake but unsuspecting (1D10)", "value": "1D10" },
-    { "name": "Declared Ready on Alert (1D)", "value": "1D" },
+    { "name": "Declared Ready on Alert (1)", "value": "1" },
    /*{ "name": "Aware of the enemy, can hear them but not see (1D6)", "value": "1D6" },
    { "name": "Aware and know exactly where the enemy is (1D4)", "value": "1D4" }*/
  ],
@@ -310,5 +322,6 @@ export const SYSTEM = {
  MORTAL_CHOICES,
  SPELL_CRITICAL,
  MIRACLE_TYPES,
-  SPELL_LETHARGY_DICE
+  SPELL_LETHARGY_DICE,
+  GRANTED_DICE_CHOICES
 }
--- a/module/documents/roll.mjs
+++ b/module/documents/roll.mjs
@@ -96,6 +96,10 @@ export default class LethalFantasyRoll extends Roll {
    return this.options.badResult
  }

+  get rollData() {
+    return this.options.rollData
+  }
+
  /**
   * Prompt the user with a dialog to configure and execute a roll.
   *
@@ -125,6 +129,8 @@ export default class LethalFantasyRoll extends Roll {
    let hasMaxValue = true
    let hasGrantedDice = false
    let pointBlank = false
+    let letItFly = false
+    let saveSpell = false
    let beyondSkill = false
    let hasStaticModifier = false
    let hasExplode = true
@@ -178,6 +184,7 @@ export default class LethalFantasyRoll extends Roll {

    } else if (options.rollType === "skill") {
      options.rollName = options.rollTarget.name
+      hasD30 = true
      dice = "1D20"
      baseFormula = "D20"
      hasModifier = true
@@ -310,6 +317,8 @@ export default class LethalFantasyRoll extends Roll {
      hasChangeDice,
      pointBlank,
      baseValue: options.rollTarget.value,
+      attackerAimChoices: SYSTEM.ATTACKER_AIM_CHOICES,
+      attackerAim: "0",
      changeDice: `${dice}`,
      fieldRollMode,
      choiceModifier,
@@ -349,7 +358,7 @@ export default class LethalFantasyRoll extends Roll {
      ],
      actions: {
        "selectGranted": (event, button, dialog) => {
-          hasGrantedDice = true
+          hasGrantedDice = event.target.checked
        },
        "selectBeyondSkill": (event, button, dialog) => {
          beyondSkill = button.checked
@@ -357,6 +366,12 @@ export default class LethalFantasyRoll extends Roll {
        "selectPointBlank": (event, button, dialog) => {
          pointBlank = button.checked
        },
+        "selectLetItFly": (event, button, dialog) => {
+          letItFly = button.checked
+        },
+        "saveSpellCheck": (event, button, dialog) => {
+          saveSpell = button.checked
+        },
        "gotoToken": (event, button, dialog) => {
          let tokenId = $(button).data("tokenId")
          let token = canvas.tokens?.get(tokenId)
@@ -373,6 +388,7 @@ export default class LethalFantasyRoll extends Roll {
    // If the user cancels the dialog, exit
    if (rollContext === null) return
    console.log("rollContext", rollContext, hasGrantedDice)
+    rollContext.saveSpell = saveSpell // Update fucking flag

    let fullModifier = 0
    let titleFormula = ""
@@ -381,6 +397,9 @@ export default class LethalFantasyRoll extends Roll {
      let bonus = Number(options.rollTarget.value)
      fullModifier = rollContext.modifier === "" ? 0 : parseInt(rollContext.modifier, 10) + bonus
      fullModifier += (rollContext.saveSpell) ? options.rollTarget.actorModifiers.saveModifier : 0
+      if (Number(rollContext.attackerAim) > 0) {
+        fullModifier += Number(rollContext.attackerAim)
+      }

      if (fullModifier === 0) {
        modifierFormula = "0"
@@ -391,7 +410,6 @@ export default class LethalFantasyRoll extends Roll {
      if (hasStaticModifier) {
        modifierFormula += ` + ${options.rollTarget.staticModifier}`
      }
-      // modifierFormula += ` + ${options.rollTarget.charModifier}`
      let sign = fullModifier < 0 ? "-" : "+"
      if (hasExplode) {
        titleFormula = `${dice}E ${sign} ${modifierFormula}`
@@ -426,8 +444,21 @@ export default class LethalFantasyRoll extends Roll {
    }

    // Specific pain/poison/contagion case
-    if (options.rollType === "save" && (options.rollTarget.rollKey === "pain" || options.rollTarget.rollKey === "paincourage" || options.rollTarget.rollKey === "poison" || options.rollTarget.rollKey === "contagion")) {
+    if (options.rollType === "save" && (options.rollTarget.rollKey === "poison" || options.rollTarget.rollKey === "contagion")) {
      hasD30 = false
+      hasStaticModifier = true
+      modifierFormula = ` + ${Math.abs(fullModifier)}`
+      titleFormula = `${dice}E + ${Math.abs(fullModifier)}`
+    }
+
+    if (letItFly) {
+      baseFormula = "1D20"
+      titleFormula = `1D20E`
+      modifierFormula = "0"
+      fullModifier = 0
+      hasFavor = false
+      hasExplode = true
+      rollContext.favor = "none"
    }

    maxValue = Number(baseFormula.match(/\d+$/)[0]) // Update the max value agains
@@ -442,6 +473,9 @@ export default class LethalFantasyRoll extends Roll {
      actorImage: options.actorImage,
      rollMode: rollContext.visibility,
      hasTarget: options.hasTarget,
+      pointBlank,
+      beyondSkill,
+      letItFly,
      hasGrantedDice,
      titleFormula,
      targetName,
@@ -468,15 +502,17 @@ export default class LethalFantasyRoll extends Roll {
    if (rollContext.favor === "favor") {
      rollFavor = new this(baseFormula, options.data, rollData)
      await rollFavor.evaluate()
+      console.log("Rolling with favor", rollFavor)
      if (game?.dice3d) {
        game.dice3d.showForRoll(rollFavor, game.user, true)
      }
-      if (rollFavor.result > rollBase.result) {
+      if (Number(rollFavor.result) > Number(rollBase.result)) {
        badResult = rollBase.result
        rollBase = rollFavor
      } else {
        badResult = rollFavor.result
      }
+      rollFavor = null
    }

    if (rollContext.favor === "disfavor") {
@@ -485,12 +521,13 @@ export default class LethalFantasyRoll extends Roll {
      if (game?.dice3d) {
        game.dice3d.showForRoll(rollFavor, game.user, true)
      }
-      if (rollFavor.result < rollBase.result) {
+      if (Number(rollFavor.result) < Number(rollBase.result)) {
        badResult = rollBase.result
        rollBase = rollFavor
      } else {
        badResult = rollFavor.result
      }
+      rollFavor = null
    }

    if (hasD30) {
@@ -501,7 +538,7 @@ export default class LethalFantasyRoll extends Roll {
      options.D30result = rollD30.total
    }

-    let rollTotal = -1
+    let rollTotal = 0
    let diceResults = []
    let resultType
    let diceSum = 0
@@ -526,7 +563,8 @@ export default class LethalFantasyRoll extends Roll {
      }
    }

-    if (hasGrantedDice) {
+    if (hasGrantedDice && options.rollTarget.grantedDice && options.rollTarget.grantedDice !== "") {
+      titleFormula += ` + ${options.rollTarget.grantedDice.toUpperCase()}`
      let grantedRoll = new Roll(options.rollTarget.grantedDice)
      await grantedRoll.evaluate()
      if (game?.dice3d) {
@@ -539,12 +577,12 @@ export default class LethalFantasyRoll extends Roll {
    if (fullModifier !== 0) {
      diceResults.push({ dice: `${rollModifier.formula.toUpperCase()}`, value: rollModifier.total })
      if (fullModifier < 0) {
-        rollTotal = Math.max(diceSum - rollModifier.total, 0)
+        rollTotal += Math.max(diceSum - rollModifier.total, 0)
      } else {
-        rollTotal = diceSum + rollModifier.total
+        rollTotal += diceSum + rollModifier.total
      }
    } else {
-      rollTotal = diceSum
+      rollTotal += diceSum
    }

    rollBase.options.resultType = resultType
@@ -554,6 +592,7 @@ export default class LethalFantasyRoll extends Roll {
    rollBase.options.titleFormula = titleFormula
    rollBase.options.D30result = options.D30result
    rollBase.options.badResult = badResult
+    rollBase.options.rollData = foundry.utils.duplicate(rollData)

    /**
     * A hook event that fires after the roll has been made.
@@ -592,7 +631,6 @@ export default class LethalFantasyRoll extends Roll {
      fieldRollMode,
      rollModes
    }
-    console.log("CTX", dialogContext)

    const content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-lethal-fantasy/templates/roll-initiative-dialog.hbs", dialogContext)

@@ -627,7 +665,6 @@ export default class LethalFantasyRoll extends Roll {
      let combat = game.combats.get(options.combatId)
      combat.updateEmbeddedDocuments("Combatant", [{ _id: options.combatantId, initiative: initRoll.total, 'system.progressionCount': 0 }]);
    }
-
  }

  /* ***********************************************************/
@@ -890,9 +927,9 @@ export default class LethalFantasyRoll extends Roll {
  }

  /* ***********************************************************/
-  static async promptRangedDefense(rollTarget) {
+  static async promptRangedDefense(options = {}) {

-    const rollModes = foundry.utils.duplicate(CONFIG.Dice.rollModes); // v12 : Object.fromEntries(Object.entries(CONFIG.Dice.rollModes).map(([key, value]) => [key, game.i18n.localize(value)]))
+    const rollModes = foundry.utils.duplicate(CONFIG.Dice.rollModes);
    const fieldRollMode = new foundry.data.fields.StringField({
      choices: rollModes,
      blank: false,
@@ -907,13 +944,12 @@ export default class LethalFantasyRoll extends Roll {
      attackerAimChoices: SYSTEM.ATTACKER_AIM_CHOICES,
      movement: "none",
      moveDirection: "none",
-      size: "medium",
+      size: "+5",
      range: "short",
      attackerAim: "simple",
      fieldRollMode,
      rollModes
    }
-    console.log("CTX", dialogContext)

    const content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-lethal-fantasy/templates/range-defense-dialog.hbs", dialogContext)

@@ -951,7 +987,7 @@ export default class LethalFantasyRoll extends Roll {
    if (rollContext.range === "beyondskill") {
      rollContext.movement = rollContext.movement.replace("kh", "")
      rollContext.movement = rollContext.movement.replace("kl", "")
-      rollContext.movement += "kh" // Add the kl to the movement (disfavor for point blank range)
+      rollContext.movement += "kh" // Add the kl to the movement (favor for point blank range)
      rollContext.range = "+11"
    }

@@ -959,19 +995,19 @@ export default class LethalFantasyRoll extends Roll {
    let fullModifier = Number(rollContext.moveDirection) +
      Number(rollContext.size) +
      Number(rollContext.range) +
-      Number(rollContext.attackerAim)
-    console.log("Modifier", fullModifier)
+      Number(rollContext?.attackerAim || 0)

    let modifierFormula
    if (fullModifier === 0) {
      modifierFormula = "0"
    } else {
      let modAbs = Math.abs(fullModifier)
-      modifierFormula = `${modAbs}`
+      modifierFormula = `D${modAbs + 1} -1`
    }

    let rollData = { ...rollContext }
-    let options = { ...rollContext }
+    // Merge rollContext object into options object
+    options = { ...options, ...rollContext }
    options.rollName = "Ranged Defense"

    const rollBase = new this(rollContext.movement, options.data, rollData)
@@ -981,7 +1017,15 @@ export default class LethalFantasyRoll extends Roll {
    let rollD30 = await new Roll("1D30").evaluate()
    options.D30result = rollD30.total

-
+    let badResult = 0
+    if (rollContext.movement.includes("kh")) {
+      rollData.favor = "favor"
+      badResult = Math.min(rollBase.terms[0].results[0].result, rollBase.terms[0].results[1]?.result || 20)
+    }
+    if (rollContext.movement.includes("kl")) {
+      rollData.favor = "disfavor"
+      badResult = Math.max(rollBase.terms[0].results[0].result, rollBase.terms[0].results[1]?.result || 1)
+    }
    let dice = rollContext.movement
    let maxValue = 20 // As per latest changes (was : Number(dice.match(/\d+$/)[0])
    let rollTotal = -1
@@ -1007,15 +1051,16 @@ export default class LethalFantasyRoll extends Roll {
    } else {
      rollTotal = diceSum
    }
-
+    rollBase.options = { ...rollBase.options, ...options }
    rollBase.options.resultType = resultType
    rollBase.options.rollTotal = rollTotal
    rollBase.options.diceResults = diceResults
    rollBase.options.rollTarget = options.rollTarget
-    rollBase.options.titleFormula = `${dice}E + ${modifierFormula}`
+    rollBase.options.titleFormula = `1D20E + ${modifierFormula}`
    rollBase.options.D30result = options.D30result
    rollBase.options.rollName = "Ranged Defense"
-
+    rollBase.options.badResult = badResult
+    rollBase.options.rollData = foundry.utils.duplicate(rollData)
    /**
     * A hook event that fires after the roll has been made.
     * @function
@@ -1099,6 +1144,7 @@ export default class LethalFantasyRoll extends Roll {
      targetArmor: this.targetArmor,
      D30result: this.D30result,
      badResult: this.badResult,
+      rollData: this.rollData,
      isPrivate: isPrivate
    }
    cardData.cssClass = cardData.css.join(" ")
@@ -1130,6 +1176,7 @@ export default class LethalFantasyRoll extends Roll {
        targetArmor: this.targetArmor,
        targetMalus: this.targetMalus,
        realDamage: this.realDamage,
+        rollData: this.rollData,
        ...messageData,
      },
      { rollMode: rollMode },
--- a/module/models/character.mjs
+++ b/module/models/character.mjs
@@ -90,9 +90,9 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod
      current: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 })
    })
    schema.granted = new fields.SchemaField({
-      attackDice: new fields.StringField({ required: true, nullable: false, initial: "" }),
-      defenseDice: new fields.StringField({ required: true, nullable: false, initial: "" }),
-      damageDice: new fields.StringField({ required: true, nullable: false, initial: "" })
+      attackDice: new fields.StringField({ required: true, nullable: false, initial: "0", choices: SYSTEM.GRANTED_DICE_CHOICES }),
+      defenseDice: new fields.StringField({ required: true, nullable: false, initial: "0", choices: SYSTEM.GRANTED_DICE_CHOICES }),
+      damageDice: new fields.StringField({ required: true, nullable: false, initial: "0", choices: SYSTEM.GRANTED_DICE_CHOICES })
    })

    schema.movement = new fields.SchemaField({
@@ -179,13 +179,13 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod
      if (!SYSTEM.MORTAL_CHOICES[data.biodata.mortal]) {
        for (let key in SYSTEM.MORTAL_CHOICES) {
          let mortal = SYSTEM.MORTAL_CHOICES[key]
-          if ( mortal.label.toLowerCase() === data.biodata.mortal.toLowerCase()) {
+          if (mortal.label.toLowerCase() === data.biodata.mortal.toLowerCase()) {
            data.biodata.mortal = mortal.id
          }
-          if ( data.biodata.mortal.toLowerCase().includes("shire")) {
+          if (data.biodata.mortal.toLowerCase().includes("shire")) {
            data.biodata.mortal = "halflings"
          }
-          if ( data.biodata.mortal.toLowerCase().includes("human")) {
+          if (data.biodata.mortal.toLowerCase().includes("human")) {
            data.biodata.mortal = "mankind"
          }
        }
@@ -235,8 +235,8 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod
    this.saves.toughness.value = conDef.toughness_save + this.modifiers.saveModifier
    this.challenges.dying.value = conDef.stabilization_dice

-    this.saves.contagion.value = this.characteristics.con.value + this.modifiers.saveModifier
-    this.saves.poison.value = this.characteristics.con.value + this.modifiers.saveModifier
+    this.saves.contagion.value = this.characteristics.con.value;// + this.modifiers.saveModifier
+    this.saves.poison.value = this.characteristics.con.value; // + this.modifiers.saveModifier

    this.combat.attackModifier = 0
    for (let chaKey of SYSTEM.CHARACTERISTIC_ATTACK) {
@@ -293,7 +293,6 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod

    let wisDef = SYSTEM.CHARACTERISTICS_TABLES.wis.find((c) => c.value === this.characteristics.wis.value)
    let maxInit = Number(wisDef.init_cap) || 1000
-    console.log("Rolling initiative for", this)

    let roll = await LethalFantasyRoll.promptInitiative({
      actorId: this.parent.id,
--- a/packs-system/lf-equipment/000450.log
+++ b/packs-system/lf-equipment/000450.log
--- a/packs-system/lf-equipment/CURRENT
+++ b/packs-system/lf-equipment/CURRENT
@@ -1 +1 @@
-MANIFEST-000380
+MANIFEST-000448
--- a/packs-system/lf-equipment/LOG
+++ b/packs-system/lf-equipment/LOG
@@ -1,8 +1,8 @@
-2025/08/31-11:02:02.192092 7facb3fff6c0 Recovering log #378
-2025/08/31-11:02:02.202398 7facb3fff6c0 Delete type=3 #376
-2025/08/31-11:02:02.202444 7facb3fff6c0 Delete type=0 #378
-2025/08/31-11:28:03.032642 7facb27ff6c0 Level-0 table #383: started
-2025/08/31-11:28:03.032856 7facb27ff6c0 Level-0 table #383: 0 bytes OK
-2025/08/31-11:28:03.039646 7facb27ff6c0 Delete type=0 #381
-2025/08/31-11:28:03.047372 7facb27ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2025/08/31-11:28:03.047539 7facb27ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2025/10/17-20:04:40.410646 7f7b74bf86c0 Recovering log #446
+2025/10/17-20:04:40.459394 7f7b74bf86c0 Delete type=3 #444
+2025/10/17-20:04:40.459535 7f7b74bf86c0 Delete type=0 #446
+2025/10/17-20:06:06.949461 7f7b6f3ff6c0 Level-0 table #451: started
+2025/10/17-20:06:06.949513 7f7b6f3ff6c0 Level-0 table #451: 0 bytes OK
+2025/10/17-20:06:06.981230 7f7b6f3ff6c0 Delete type=0 #449
+2025/10/17-20:06:06.981548 7f7b6f3ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2025/10/17-20:06:07.038248 7f7b6f3ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-equipment/LOG.old
+++ b/packs-system/lf-equipment/LOG.old
@@ -1,8 +1,8 @@
-2025/08/30-18:23:53.067582 7facb3fff6c0 Recovering log #374
-2025/08/30-18:23:53.077306 7facb3fff6c0 Delete type=3 #372
-2025/08/30-18:23:53.077503 7facb3fff6c0 Delete type=0 #374
-2025/08/30-18:45:52.226055 7facb27ff6c0 Level-0 table #379: started
-2025/08/30-18:45:52.226081 7facb27ff6c0 Level-0 table #379: 0 bytes OK
-2025/08/30-18:45:52.233470 7facb27ff6c0 Delete type=0 #377
-2025/08/30-18:45:52.233679 7facb27ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2025/08/30-18:45:52.233706 7facb27ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2025/10/17-17:16:55.022615 7f7b74bf86c0 Recovering log #442
+2025/10/17-17:16:55.032145 7f7b74bf86c0 Delete type=3 #440
+2025/10/17-17:16:55.032213 7f7b74bf86c0 Delete type=0 #442
+2025/10/17-17:19:51.857936 7f7b6f3ff6c0 Level-0 table #447: started
+2025/10/17-17:19:51.857966 7f7b6f3ff6c0 Level-0 table #447: 0 bytes OK
+2025/10/17-17:19:51.864468 7f7b6f3ff6c0 Delete type=0 #445
+2025/10/17-17:19:51.873932 7f7b6f3ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2025/10/17-17:19:51.885633 7f7b6f3ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-equipment/MANIFEST-000448
+++ b/packs-system/lf-equipment/MANIFEST-000448
--- a/packs-system/lf-gifts/000322.ldb
+++ b/packs-system/lf-gifts/000322.ldb
--- a/packs-system/lf-gifts/000411.ldb
+++ b/packs-system/lf-gifts/000411.ldb
--- a/packs-system/lf-gifts/000447.ldb
+++ b/packs-system/lf-gifts/000447.ldb
--- a/packs-system/lf-gifts/000450.log
+++ b/packs-system/lf-gifts/000450.log
--- a/packs-system/lf-gifts/CURRENT
+++ b/packs-system/lf-gifts/CURRENT
@@ -1 +1 @@
-MANIFEST-000379
+MANIFEST-000448
--- a/packs-system/lf-gifts/LOG
+++ b/packs-system/lf-gifts/LOG
@@ -1,8 +1,8 @@
-2025/08/31-11:02:02.206543 7facb37fe6c0 Recovering log #377
-2025/08/31-11:02:02.215835 7facb37fe6c0 Delete type=3 #375
-2025/08/31-11:02:02.215878 7facb37fe6c0 Delete type=0 #377
-2025/08/31-11:28:03.017058 7facb27ff6c0 Level-0 table #382: started
-2025/08/31-11:28:03.017435 7facb27ff6c0 Level-0 table #382: 0 bytes OK
-2025/08/31-11:28:03.023891 7facb27ff6c0 Delete type=0 #380
-2025/08/31-11:28:03.047213 7facb27ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end)
-2025/08/31-11:28:03.047451 7facb27ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end)
+2025/10/17-20:04:40.466635 7f7b753f96c0 Recovering log #446
+2025/10/17-20:04:40.515547 7f7b753f96c0 Delete type=3 #444
+2025/10/17-20:04:40.515653 7f7b753f96c0 Delete type=0 #446
+2025/10/17-20:06:06.880963 7f7b6f3ff6c0 Level-0 table #451: started
+2025/10/17-20:06:06.881016 7f7b6f3ff6c0 Level-0 table #451: 0 bytes OK
+2025/10/17-20:06:06.917770 7f7b6f3ff6c0 Delete type=0 #449
+2025/10/17-20:06:06.981510 7f7b6f3ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2025/10/17-20:06:07.038270 7f7b6f3ff6c0 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/08/30-18:23:53.081675 7facb91fa6c0 Recovering log #373
-2025/08/30-18:23:53.092658 7facb91fa6c0 Delete type=3 #371
-2025/08/30-18:23:53.092710 7facb91fa6c0 Delete type=0 #373
-2025/08/30-18:45:52.213593 7facb27ff6c0 Level-0 table #378: started
-2025/08/30-18:45:52.213631 7facb27ff6c0 Level-0 table #378: 0 bytes OK
-2025/08/30-18:45:52.219786 7facb27ff6c0 Delete type=0 #376
-2025/08/30-18:45:52.233655 7facb27ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end)
-2025/08/30-18:45:52.233694 7facb27ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end)
+2025/10/17-17:16:55.037014 7f7b753f96c0 Recovering log #442
+2025/10/17-17:16:55.047876 7f7b753f96c0 Delete type=3 #440
+2025/10/17-17:16:55.047925 7f7b753f96c0 Delete type=0 #442
+2025/10/17-17:19:51.864578 7f7b6f3ff6c0 Level-0 table #447: started
+2025/10/17-17:19:51.867676 7f7b6f3ff6c0 Level-0 table #447: 197 bytes OK
+2025/10/17-17:19:51.873697 7f7b6f3ff6c0 Delete type=0 #445
+2025/10/17-17:19:51.873943 7f7b6f3ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2025/10/17-17:19:51.885624 7f7b6f3ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-gifts/MANIFEST-000379
+++ b/packs-system/lf-gifts/MANIFEST-000379
--- a/packs-system/lf-gifts/MANIFEST-000448
+++ b/packs-system/lf-gifts/MANIFEST-000448
--- a/packs-system/lf-skills/000322.ldb
+++ b/packs-system/lf-skills/000322.ldb
--- a/packs-system/lf-skills/000451.log
+++ b/packs-system/lf-skills/000451.log
--- a/packs-system/lf-skills/000453.ldb
+++ b/packs-system/lf-skills/000453.ldb
--- a/packs-system/lf-skills/CURRENT
+++ b/packs-system/lf-skills/CURRENT
@@ -1 +1 @@
-MANIFEST-000379
+MANIFEST-000449
--- a/packs-system/lf-skills/LOG
+++ b/packs-system/lf-skills/LOG
@@ -1,8 +1,15 @@
-2025/08/31-11:02:02.179303 7facb91fa6c0 Recovering log #377
-2025/08/31-11:02:02.189376 7facb91fa6c0 Delete type=3 #375
-2025/08/31-11:02:02.189457 7facb91fa6c0 Delete type=0 #377
-2025/08/31-11:28:03.039915 7facb27ff6c0 Level-0 table #382: started
-2025/08/31-11:28:03.039961 7facb27ff6c0 Level-0 table #382: 0 bytes OK
-2025/08/31-11:28:03.046598 7facb27ff6c0 Delete type=0 #380
-2025/08/31-11:28:03.047412 7facb27ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2025/08/31-11:28:03.047575 7facb27ff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2025/10/17-20:04:40.334536 7f7b75bfa6c0 Recovering log #446
+2025/10/17-20:04:40.405745 7f7b75bfa6c0 Delete type=3 #444
+2025/10/17-20:04:40.405910 7f7b75bfa6c0 Delete type=0 #446
+2025/10/17-20:06:06.834305 7f7b6f3ff6c0 Level-0 table #452: started
+2025/10/17-20:06:06.848868 7f7b6f3ff6c0 Level-0 table #452: 2022 bytes OK
+2025/10/17-20:06:06.880702 7f7b6f3ff6c0 Delete type=0 #450
+2025/10/17-20:06:06.981485 7f7b6f3ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2025/10/17-20:06:06.981572 7f7b6f3ff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at '!items!iu0NfEMvEsUW0FEx' @ 730 : 1
+2025/10/17-20:06:06.981587 7f7b6f3ff6c0 Compacting 1@1 + 1@2 files
+2025/10/17-20:06:07.000371 7f7b6f3ff6c0 Generated table #453@1: 89 keys, 118004 bytes
+2025/10/17-20:06:07.000414 7f7b6f3ff6c0 Compacted 1@1 + 1@2 files => 118004 bytes
+2025/10/17-20:06:07.037470 7f7b6f3ff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/10/17-20:06:07.037700 7f7b6f3ff6c0 Delete type=2 #448
+2025/10/17-20:06:07.038082 7f7b6f3ff6c0 Delete type=2 #452
+2025/10/17-20:06:07.038307 7f7b6f3ff6c0 Manual compaction at level-1 from '!items!iu0NfEMvEsUW0FEx' @ 730 : 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,15 @@
-2025/08/30-18:23:53.054593 7facb89f96c0 Recovering log #373
-2025/08/30-18:23:53.065011 7facb89f96c0 Delete type=3 #371
-2025/08/30-18:23:53.065091 7facb89f96c0 Delete type=0 #373
-2025/08/30-18:45:52.219947 7facb27ff6c0 Level-0 table #378: started
-2025/08/30-18:45:52.219975 7facb27ff6c0 Level-0 table #378: 0 bytes OK
-2025/08/30-18:45:52.225942 7facb27ff6c0 Delete type=0 #376
-2025/08/30-18:45:52.233667 7facb27ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2025/08/30-18:45:52.233700 7facb27ff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2025/10/17-17:16:55.008421 7f7b75bfa6c0 Recovering log #442
+2025/10/17-17:16:55.018287 7f7b75bfa6c0 Delete type=3 #440
+2025/10/17-17:16:55.018352 7f7b75bfa6c0 Delete type=0 #442
+2025/10/17-17:19:51.840745 7f7b6f3ff6c0 Level-0 table #447: started
+2025/10/17-17:19:51.844779 7f7b6f3ff6c0 Level-0 table #447: 965 bytes OK
+2025/10/17-17:19:51.851258 7f7b6f3ff6c0 Delete type=0 #445
+2025/10/17-17:19:51.873900 7f7b6f3ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2025/10/17-17:19:51.873957 7f7b6f3ff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at '!items!iu0NfEMvEsUW0FEx' @ 725 : 1
+2025/10/17-17:19:51.873962 7f7b6f3ff6c0 Compacting 1@1 + 1@2 files
+2025/10/17-17:19:51.879155 7f7b6f3ff6c0 Generated table #448@1: 89 keys, 117699 bytes
+2025/10/17-17:19:51.879178 7f7b6f3ff6c0 Compacted 1@1 + 1@2 files => 117699 bytes
+2025/10/17-17:19:51.885277 7f7b6f3ff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/10/17-17:19:51.885392 7f7b6f3ff6c0 Delete type=2 #411
+2025/10/17-17:19:51.885543 7f7b6f3ff6c0 Delete type=2 #447
+2025/10/17-17:19:51.885644 7f7b6f3ff6c0 Manual compaction at level-1 from '!items!iu0NfEMvEsUW0FEx' @ 725 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-skills/MANIFEST-000379
+++ b/packs-system/lf-skills/MANIFEST-000379
--- a/packs-system/lf-skills/MANIFEST-000449
+++ b/packs-system/lf-skills/MANIFEST-000449
--- a/packs-system/lf-spells-miracles/000022.ldb
+++ b/packs-system/lf-spells-miracles/000022.ldb
--- a/packs-system/lf-spells-miracles/000111.ldb
+++ b/packs-system/lf-spells-miracles/000111.ldb
--- a/packs-system/lf-spells-miracles/000150.log
+++ b/packs-system/lf-spells-miracles/000150.log
--- a/packs-system/lf-spells-miracles/CURRENT
+++ b/packs-system/lf-spells-miracles/CURRENT
@@ -1 +1 @@
-MANIFEST-000079
+MANIFEST-000148
--- a/packs-system/lf-spells-miracles/LOG
+++ b/packs-system/lf-spells-miracles/LOG
@@ -1,8 +1,8 @@
-2025/08/31-11:02:02.230091 7facb3fff6c0 Recovering log #77
-2025/08/31-11:02:02.240519 7facb3fff6c0 Delete type=3 #75
-2025/08/31-11:02:02.240600 7facb3fff6c0 Delete type=0 #77
-2025/08/31-11:28:03.047734 7facb27ff6c0 Level-0 table #82: started
-2025/08/31-11:28:03.047973 7facb27ff6c0 Level-0 table #82: 0 bytes OK
-2025/08/31-11:28:03.055122 7facb27ff6c0 Delete type=0 #80
-2025/08/31-11:28:03.086906 7facb27ff6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2025/08/31-11:28:03.086956 7facb27ff6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2025/10/17-20:04:40.563726 7f7b74bf86c0 Recovering log #146
+2025/10/17-20:04:40.603255 7f7b74bf86c0 Delete type=3 #144
+2025/10/17-20:04:40.603347 7f7b74bf86c0 Delete type=0 #146
+2025/10/17-20:06:07.107148 7f7b6f3ff6c0 Level-0 table #151: started
+2025/10/17-20:06:07.107209 7f7b6f3ff6c0 Level-0 table #151: 0 bytes OK
+2025/10/17-20:06:07.142401 7f7b6f3ff6c0 Delete type=0 #149
+2025/10/17-20:06:07.182630 7f7b6f3ff6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2025/10/17-20:06:07.182721 7f7b6f3ff6c0 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/08/30-18:23:53.106927 7facb3fff6c0 Recovering log #73
-2025/08/30-18:23:53.116922 7facb3fff6c0 Delete type=3 #71
-2025/08/30-18:23:53.116996 7facb3fff6c0 Delete type=0 #73
-2025/08/30-18:45:52.206763 7facb27ff6c0 Level-0 table #78: started
-2025/08/30-18:45:52.206840 7facb27ff6c0 Level-0 table #78: 0 bytes OK
-2025/08/30-18:45:52.213448 7facb27ff6c0 Delete type=0 #76
-2025/08/30-18:45:52.233641 7facb27ff6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2025/08/30-18:45:52.233688 7facb27ff6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2025/10/17-17:16:55.063170 7f7b74bf86c0 Recovering log #142
+2025/10/17-17:16:55.073152 7f7b74bf86c0 Delete type=3 #140
+2025/10/17-17:16:55.073202 7f7b74bf86c0 Delete type=0 #142
+2025/10/17-17:19:51.909136 7f7b6f3ff6c0 Level-0 table #147: started
+2025/10/17-17:19:51.909165 7f7b6f3ff6c0 Level-0 table #147: 0 bytes OK
+2025/10/17-17:19:51.915284 7f7b6f3ff6c0 Delete type=0 #145
+2025/10/17-17:19:51.933498 7f7b6f3ff6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2025/10/17-17:19:51.939577 7f7b6f3ff6c0 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-000079
+++ b/packs-system/lf-spells-miracles/MANIFEST-000079
--- a/packs-system/lf-spells-miracles/MANIFEST-000148
+++ b/packs-system/lf-spells-miracles/MANIFEST-000148
--- a/packs-system/lf-vulnerabilities/000449.log
+++ b/packs-system/lf-vulnerabilities/000449.log
--- a/packs-system/lf-vulnerabilities/CURRENT
+++ b/packs-system/lf-vulnerabilities/CURRENT
@@ -1 +1 @@
-MANIFEST-000379
+MANIFEST-000447
--- a/packs-system/lf-vulnerabilities/LOG
+++ b/packs-system/lf-vulnerabilities/LOG
@@ -1,8 +1,8 @@
-2025/08/31-11:02:02.217898 7facb91fa6c0 Recovering log #377
-2025/08/31-11:02:02.227818 7facb91fa6c0 Delete type=3 #375
-2025/08/31-11:02:02.227879 7facb91fa6c0 Delete type=0 #377
-2025/08/31-11:28:03.024048 7facb27ff6c0 Level-0 table #382: started
-2025/08/31-11:28:03.024094 7facb27ff6c0 Level-0 table #382: 0 bytes OK
-2025/08/31-11:28:03.032021 7facb27ff6c0 Delete type=0 #380
-2025/08/31-11:28:03.047310 7facb27ff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2025/08/31-11:28:03.047492 7facb27ff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2025/10/17-20:04:40.518960 7f7b75bfa6c0 Recovering log #445
+2025/10/17-20:04:40.559683 7f7b75bfa6c0 Delete type=3 #443
+2025/10/17-20:04:40.559810 7f7b75bfa6c0 Delete type=0 #445
+2025/10/17-20:06:06.918106 7f7b6f3ff6c0 Level-0 table #450: started
+2025/10/17-20:06:06.918166 7f7b6f3ff6c0 Level-0 table #450: 0 bytes OK
+2025/10/17-20:06:06.949207 7f7b6f3ff6c0 Delete type=0 #448
+2025/10/17-20:06:06.981529 7f7b6f3ff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2025/10/17-20:06:07.038289 7f7b6f3ff6c0 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/08/30-18:23:53.094395 7facb89f96c0 Recovering log #373
-2025/08/30-18:23:53.104578 7facb89f96c0 Delete type=3 #371
-2025/08/30-18:23:53.104646 7facb89f96c0 Delete type=0 #373
-2025/08/30-18:45:52.233837 7facb27ff6c0 Level-0 table #378: started
-2025/08/30-18:45:52.233866 7facb27ff6c0 Level-0 table #378: 0 bytes OK
-2025/08/30-18:45:52.239911 7facb27ff6c0 Delete type=0 #376
-2025/08/30-18:45:52.263164 7facb27ff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2025/08/30-18:45:52.263199 7facb27ff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2025/10/17-17:16:55.050630 7f7b75bfa6c0 Recovering log #441
+2025/10/17-17:16:55.059896 7f7b75bfa6c0 Delete type=3 #439
+2025/10/17-17:16:55.059946 7f7b75bfa6c0 Delete type=0 #441
+2025/10/17-17:19:51.851372 7f7b6f3ff6c0 Level-0 table #446: started
+2025/10/17-17:19:51.851400 7f7b6f3ff6c0 Level-0 table #446: 0 bytes OK
+2025/10/17-17:19:51.857689 7f7b6f3ff6c0 Delete type=0 #444
+2025/10/17-17:19:51.873917 7f7b6f3ff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2025/10/17-17:19:51.885612 7f7b6f3ff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
--- a/packs-system/lf-vulnerabilities/MANIFEST-000447
+++ b/packs-system/lf-vulnerabilities/MANIFEST-000447
--- a/styles/character.less
+++ b/styles/character.less
@@ -4,7 +4,6 @@
  overflow: scroll;
 }

-
 .character-main {
  display: flex;

@@ -46,7 +45,7 @@
          min-width: 2.2rem;
          max-width: 2.2rem;
          margin-left: 4px;
-          font-size: calc(var(--font-size-standard) * 1.0);
+          font-size: calc(var(--font-size-standard) * 1);
        }
        .character-hp-max {
          clear: both;
@@ -58,7 +57,7 @@
          input {
            width: 3.2rem;
            text-align: center;
-            font-size: calc(var(--font-size-standard) * 1.0);
+            font-size: calc(var(--font-size-standard) * 1);
          }
        }
      }
@@ -223,7 +222,7 @@
  }
 }

-.tab.character-biography .main-div{
+.tab.character-biography .main-div {
  .biodata {
    display: grid;
    grid-template-columns: repeat(4, 1fr);
@@ -253,7 +252,7 @@
  }
 }

-.tab.character-skills .main-div{
+.tab.character-skills .main-div {
  display: grid;
  grid-template-columns: 1fr;
  legend {
@@ -376,6 +375,9 @@
        min-width: 2.5rem;
        max-width: 2.5rem;
      }
+      .ranged-attack-button {
+        font-size: 0.8rem;
+      }
      button {
        min-width: 9rem;
      }
@@ -474,7 +476,7 @@
      min-width: 12rem;
    }
    .item-detail {
-      min-width:2rem;
+      min-width: 2rem;
    }
  }
  .shields {
@@ -493,13 +495,12 @@
      }
    }
    .item-detail {
-      min-width:2.5rem;
+      min-width: 2.5rem;
    }
    .name {
      min-width: 12rem;
    }
  }
-
 }

 .tab.character-spells .main-div {
@@ -535,7 +536,6 @@
    }
  }

-
  .spells {
    display: grid;
    grid-template-columns: repeat(2, 1fr);
@@ -546,7 +546,8 @@
      align-items: center;
      gap: 4px;
      .item-img {
-        width: 24px;
+        min-width: 24px;
+        max-width: 24px;
        height: 24px;
      }
      .name {
--- a/styles/roll.less
+++ b/styles/roll.less
@@ -25,7 +25,6 @@
    border-radius: 4px;
    padding: 0.5rem;
  }
-
 }

 .lethalfantasy-range-defense-dialog {
@@ -34,10 +33,17 @@
  fieldset {
    padding: 4px;
  }
+  .fieldset-centered {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+  }
  select {
    margin-left: 0.5rem;
-    min-width: 10rem;
-    max-width: 10rem;
+    min-width: 12rem;
+    max-width: 12rem;
  }
  .field-section {
    display: flex;
@@ -45,13 +51,12 @@
    justify-content: left;
  }
  .field-name {
-    width:4rem;
-    min-width: 4rem;
-    max-width: 4rem;
+    width: 5rem;
+    min-width: 5rem;
+    max-width: 5em;
  }
 }

-
 .dialog-form {
  .form-footer {
    button {
@@ -87,7 +92,6 @@
  }
 }

-
 .main,
 .dialog-damage,
 .dialog-resource,
@@ -99,8 +103,13 @@
  justify-content: center;
  align-items: center;
  font-family: var(--font-secondary);
-  font-size: calc(var(--font-size-standard) * 1.0);
+  font-size: calc(var(--font-size-standard) * 1);
  color: var(--color-dark-1);
+  select {
+    min-width: 8rem;
+    max-width: 8rem;
+    margin-left: 1rem;
+  }
 }

 &.dice-roll {
@@ -133,7 +142,7 @@
      flex-direction: column;
      .introText {
        font-family: var(--font-secondary);
-        font-size: calc(var(--font-size-standard) * 1.0);
+        font-size: calc(var(--font-size-standard) * 1);
        width: 210px;
        margin-left: 20px;
      }
@@ -144,7 +153,7 @@
    flex-direction: column;
    justify-content: center;
    align-items: center;
-    font-size: calc(var(--font-size-standard) * 1.0);
+    font-size: calc(var(--font-size-standard) * 1);
    text-shadow: 0 0 10px var(--color-shadow-primary);
  }
 }
--- a/templates/character-combat.hbs
+++ b/templates/character-combat.hbs
@@ -1,161 +1,164 @@
 <section class="tab character-{{tab.id}} {{tab.cssClass}}" data-tab="combat" data-group="sheet">
  <div class="main-div">

-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.combatDetails"}}</legend>
-    <div class="combat-details">
-      <div class="combat-detail">
+    <fieldset>
+      <legend>{{localize "LETHALFANTASY.Label.combatDetails"}}</legend>
+      <div class="combat-details">
+        <div class="combat-detail">

-        <button class="action" data-action="rangedAttackDefense">
-          {{localize "LETHALFANTASY.Label.rangedAttackDefense"}}
-        </button>
+          <button class="action ranged-attack-button" data-action="rangedAttackDefense">
+            {{localize "LETHALFANTASY.Label.rangedAttackDefense"}}
+          </button>

-        <button class="action" data-action="rollInitiative">
-          {{localize "LETHALFANTASY.Label.rollInitiative"}}
-        </button>
+          <button class="action ranged-attack-button" data-action="rollInitiative">
+            {{localize "LETHALFANTASY.Label.rollInitiative"}}
+          </button>
+
+          <div class="flexrow armor-hp">
+            <span class="name">{{localize "LETHALFANTASY.Label.armorHitPoints"}}</span>
+            {{formInput systemFields.combat.fields.armorHitPoints value=system.combat.armorHitPoints localize=true }}
+            <a data-action="armorHitPointsPlus"><i class="fa-solid fa-hexagon-plus"></i></a>
+            <a data-action="armorHitPointsMinus"><i class="fa-solid fa-hexagon-minus"></i></a>
+          </div>
+
+          <div class="flexrow granted">
+            <span class="">{{localize
+              "LETHALFANTASY.Label.grantedAttackDice"}}</a></span>
+            {{formInput systemFields.granted.fields.attackDice value=system.granted.attackDice disabled=isPlayMode }}
+          </div>
+
+          <div class="flexrow granted ">
+            <span class="">{{localize
+              "LETHALFANTASY.Label.grantedDefenseDice"}}</a></span>
+            {{formInput systemFields.granted.fields.defenseDice value=system.granted.defenseDice disabled=isPlayMode }}
+          </div>
+
+          <div class="flexrow granted">
+            <span class="">{{localize
+              "LETHALFANTASY.Label.grantedDamageDice"}}</a></span>
+            {{formInput systemFields.granted.fields.damageDice value=system.granted.damageDice disabled=isPlayMode }}
+          </div>

-        <div class="flexrow armor-hp">
-          <span class="name">{{localize "LETHALFANTASY.Label.armorHitPoints"}}</span>
-          {{formInput systemFields.combat.fields.armorHitPoints value=system.combat.armorHitPoints localize=true }}
-          <a data-action="armorHitPointsPlus"><i class="fa-solid fa-hexagon-plus"></i></a>
-          <a data-action="armorHitPointsMinus"><i class="fa-solid fa-hexagon-minus"></i></a>
        </div>
-
-        <div class="flexrow granted">
-          <span class=""><a class="rollable" data-roll-type="granted" data-roll-key="attackDice"><i
-                    class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize "LETHALFANTASY.Label.grantedAttackDice"}}</a></span>
-          {{formInput systemFields.granted.fields.attackDice value=system.granted.attackDice disabled=isPlayMode }}
-        </div>
-
-        <div class="flexrow granted ">
-          <span class=""><a class="rollable" data-roll-type="granted" data-roll-key="defenseDice"><i
-                    class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize "LETHALFANTASY.Label.grantedDefenseDice"}}</a></span>
-          {{formInput systemFields.granted.fields.defenseDice value=system.granted.defenseDice disabled=isPlayMode }}
-        </div>
-
-        <div class="flexrow granted">
-          <span class=""><a class="rollable" data-roll-type="granted" data-roll-key="damageDice"><i
-                    class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize "LETHALFANTASY.Label.grantedDamageDice"}}</a></span>
-          {{formInput systemFields.granted.fields.damageDice value=system.granted.damageDice disabled=isPlayMode }}
-        </div>
-
      </div>
-    </div>
-  </fieldset>
+    </fieldset>

-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.wounds"}}</legend>
-    <div class="wounds">
+    <fieldset>
+      <legend>{{localize "LETHALFANTASY.Label.wounds"}}</legend>
+      <div class="wounds">
        {{#each system.hp.wounds as |wound idx|}}
        <div class="wound">
-          Name:<input class="wound-description wound-data" type="text" data-type="String" data-index="{{@index}}" value="{{wound.description}}" data-name="description" >
-          Duration:<input class="wound-duration wound-data" type="text" data-type="Number" data-index="{{@index}}" value="{{wound.duration}}" data-name="duration" >
-          HP:<input class="wound-value wound-data" type="text" data-type="Number" data-index="{{@index}}" value="{{wound.value}}" data-name="value" >
+          Name:<input class="wound-description wound-data" type="text" data-type="String" data-index="{{@index}}"
+            value="{{wound.description}}" data-name="description">
+          Duration:<input class="wound-duration wound-data" type="text" data-type="Number" data-index="{{@index}}"
+            value="{{wound.duration}}" data-name="duration">
+          HP:<input class="wound-value wound-data" type="text" data-type="Number" data-index="{{@index}}"
+            value="{{wound.value}}" data-name="value">
        </div>
        {{/each}}
-    </div>
-  </fieldset>
-
-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.weapons"}}</legend>
-    <div class="weapons">
-      {{#each weapons as |item|}}
-      <div class="weapon" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="true"
-        data-drag-type="damage">
-        {{#if (ne item.img "icons/svg/item-bag.svg")}}
-        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
-        {{/if}}
-        <div class="name">
-          {{item.name}}
-        </div>
-        <div class="attack-icons">
-
-          <a class="rollable" data-roll-type="weapon-attack" data-roll-key="{{item.id}}" data-tooltip="Roll Attack">
-            <i class="lf-roll-small fa-solid fa-swords" data-roll-type="weapon-attack" data-roll-key="{{item.id}}"></i>
-          </a>
-
-          <a class="rollable" data-roll-type="weapon-defense" data-roll-key="{{item.id}}" data-tooltip="Roll Defense">
-            <i class="fa-solid fa-shield-halved" data-roll-type="weapon-defense" data-roll-key="{{item.id}}"></i>
-          </a>
-
-          <a class="rollable" data-roll-type="weapon-damage-small" data-roll-key="{{item.id}}"
-            data-tooltip="Roll Damage (Small)">
-            <i class="fa-regular fa-face-head-bandage" data-roll-type="weapon-damage-small"
-              data-roll-key="{{item.id}}"></i>S
-          </a>
-
-          <a class="rollable" data-roll-type="weapon-damage-medium" data-roll-key="{{item.id}}"
-            data-tooltip="Roll Damage (Medium)">
-            <i class="fa-regular fa-face-head-bandage" data-roll-type="weapon-damage-medium"
-              data-roll-key="{{item.id}}"></i>M
-          </a>
-
-        </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 data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
-        </div>
      </div>
-      {{/each}}
-    </div>
-  </fieldset>
+    </fieldset>

-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.armors"}}</legend>
-    <div class="armors">
-      {{#each armors as |item|}}
-      <div class="armor" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
-        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
-        <div class="name" data-tooltip="{{{item.system.description}}}">
-          {{item.name}}
-        </div>
-        <div class="item-detail" data-tooltip="Defense">{{item.system.defense}}</div>
-        <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="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 data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+    <fieldset>
+      <legend>{{localize "LETHALFANTASY.Label.weapons"}}</legend>
+      <div class="weapons">
+        {{#each weapons as |item|}}
+        <div class="weapon" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="true"
+          data-drag-type="damage">
+          {{#if (ne item.img "icons/svg/item-bag.svg")}}
+          <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+          {{/if}}
+          <div class="name" data-tooltip="{{item.system.description}}">
+            {{item.name}}
+          </div>
+          <div class="attack-icons">
+
+            <a class="rollable" data-roll-type="weapon-attack" data-roll-key="{{item.id}}" data-tooltip="Roll Attack">
+              <i class="lf-roll-small fa-solid fa-swords" data-roll-type="weapon-attack"
+                data-roll-key="{{item.id}}"></i>
+            </a>
+
+            <a class="rollable" data-roll-type="weapon-defense" data-roll-key="{{item.id}}" data-tooltip="Roll Defense">
+              <i class="fa-solid fa-shield-halved" data-roll-type="weapon-defense" data-roll-key="{{item.id}}"></i>
+            </a>
+
+            <a class="rollable" data-roll-type="weapon-damage-small" data-roll-key="{{item.id}}"
+              data-tooltip="Roll Damage (Small)">
+              <i class="fa-regular fa-face-head-bandage" data-roll-type="weapon-damage-small"
+                data-roll-key="{{item.id}}"></i>S
+            </a>
+
+            <a class="rollable" data-roll-type="weapon-damage-medium" data-roll-key="{{item.id}}"
+              data-tooltip="Roll Damage (Medium)">
+              <i class="fa-regular fa-face-head-bandage" data-roll-type="weapon-damage-medium"
+                data-roll-key="{{item.id}}"></i>M
+            </a>
+
+          </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 data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
+              data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+          </div>
        </div>
+        {{/each}}
      </div>
-      {{/each}}
-    </div>
-  </fieldset>
+    </fieldset>

-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.shields"}}</legend>
-    <div class="shields">
-      {{#each shields as |item|}}
-      <div class="shield" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
-        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
-        <div class="name" data-tooltip="{{{item.system.description}}}">
-          {{item.name}}
-        </div>
-        <div class="item-detail" data-tooltip="Defense">
-          <a class="rollable" data-roll-type="shield-roll" data-roll-key="{{item.id}}" data-tooltip="Shield Defense">
-            <i class="lf-roll-small fa-solid fa-shield" data-roll-type="shield-roll" data-roll-key="{{item.id}}"></i>
-            {{upperFirst item.system.defense}}
-          </a>
-
-        </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="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 data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+    <fieldset>
+      <legend>{{localize "LETHALFANTASY.Label.armors"}}</legend>
+      <div class="armors">
+        {{#each armors as |item|}}
+        <div class="armor" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
+          <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+          <div class="name" data-tooltip="{{item.system.description}}">
+            {{item.name}}
+          </div>
+          <div class="item-detail" data-tooltip="Defense">{{item.system.defense}}</div>
+          <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="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 data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
+              data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+          </div>
        </div>
+        {{/each}}
      </div>
-      {{/each}}
-    </div>
-  </fieldset>
-<div>
+    </fieldset>

+    <fieldset>
+      <legend>{{localize "LETHALFANTASY.Label.shields"}}</legend>
+      <div class="shields">
+        {{#each shields as |item|}}
+        <div class="shield" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
+          <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+          <div class="name" data-tooltip="{{item.system.description}}">
+            {{item.name}}
+          </div>
+          <div class="item-detail" data-tooltip="Defense">
+            <a class="rollable" data-roll-type="shield-roll" data-roll-key="{{item.id}}" data-tooltip="Shield Defense">
+              <i class="lf-roll-small fa-solid fa-shield" data-roll-type="shield-roll" data-roll-key="{{item.id}}"></i>
+              {{upperFirst item.system.defense}}
+            </a>
+
+          </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="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 data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
+              data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+          </div>
+        </div>
+        {{/each}}
+      </div>
+    </fieldset>
+  </div>
 </section>
--- 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,179 @@
    <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 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>

-
        </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 +207,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 +333,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/character-miracles.hbs
+++ b/templates/character-miracles.hbs
@@ -1,52 +1,52 @@
 <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.divinityPoints"}}</legend>
-    <div class="miracle-details">
-      <div class="miracle-detail">
-        <span >Current</span>
-        {{formField systemFields.divinityPoints.fields.value value=system.divinityPoints.value localize=true}}
-        <a data-action="divinityPointsPlus"><i class="fa-solid fa-hexagon-plus"></i></a>
-        <a data-action="divinityPointsMinus"><i class="fa-solid fa-hexagon-minus"></i></a>
+    <fieldset>
+      <legend>{{localize "LETHALFANTASY.Label.divinityPoints"}}</legend>
+      <div class="miracle-details">
+        <div class="miracle-detail">
+          <span>Current</span>
+          {{formField systemFields.divinityPoints.fields.value value=system.divinityPoints.value localize=true}}
+          <a data-action="divinityPointsPlus"><i class="fa-solid fa-hexagon-plus"></i></a>
+          <a data-action="divinityPointsMinus"><i class="fa-solid fa-hexagon-minus"></i></a>

-        <span >Max</span>
-        {{formField systemFields.divinityPoints.fields.max value=system.divinityPoints.max localize=true disabled=isPlayMode}}
+          <span>Max</span>
+          {{formField systemFields.divinityPoints.fields.max value=system.divinityPoints.max localize=true
+          disabled=isPlayMode}}
        </div>
      </div>
-    </div>
-  </fieldset>
+    </fieldset>

-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.miracles"}}{{#if isEditMode}}<a class="action" data-tooltip="{{localize "
-        LETHALFANTASY.Tooltip.addMiracle"}}" data-tooltip-direction="UP"><i class="fas fa-plus"
-          data-action="createMiracle"></i></a>{{/if}}</legend>
-    <div class="miracles">
-      {{#each miracles as |item|}}
-      <div class="miracle" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="true" >
-        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
-        <div class="name" >
-          {{item.name}}
-        </div>
-
-        <a class="rollable" data-roll-type="miracle-attack" data-roll-key="{{item.id}}" data-tooltip="Miracle Attack">
-          <i class="lf-roll-small fa-solid fa-swords" data-roll-type="miracle-attack" data-roll-key="{{item.id}}"></i>
-        </a>
-
-        <a class="rollable" data-roll-type="miracle-power" data-roll-key="{{item.id}}" data-tooltip="Miracle Power">
-          <i class="fa-duotone fa-solid fa-stars" data-roll-type="miracle-power" data-roll-key="{{item.id}}"></i>
-        </a>
-
-        <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 data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+    <fieldset>
+      <legend>{{localize "LETHALFANTASY.Label.miracles"}}{{#if isEditMode}}<a class="action" data-tooltip="{{localize "
+          LETHALFANTASY.Tooltip.addMiracle"}}" data-tooltip-direction="UP"><i class="fas fa-plus"
+            data-action="createMiracle"></i></a>{{/if}}</legend>
+      <div class="miracles">
+        {{#each miracles as |item|}}
+        <div class="miracle" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="true">
+          <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+          <div class="name">
+            {{item.name}}
+          </div>
+
+          <a class="rollable" data-roll-type="miracle-attack" data-roll-key="{{item.id}}" data-tooltip="Miracle Attack">
+            <i class="lf-roll-small fa-solid fa-swords" data-roll-type="miracle-attack" data-roll-key="{{item.id}}"></i>
+          </a>
+
+          <a class="rollable" data-roll-type="miracle-power" data-roll-key="{{item.id}}" data-tooltip="Miracle Power">
+            <i class="fa-duotone fa-solid fa-stars" data-roll-type="miracle-power" data-roll-key="{{item.id}}"></i>
+          </a>
+
+          <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 data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
+              data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+          </div>
        </div>
+        {{/each}}
      </div>
-      {{/each}}
-    </div>
-  </fieldset>
-</div>
+    </fieldset>
+  </div>

 </section>
--- a/templates/character-spells.hbs
+++ b/templates/character-spells.hbs
@@ -15,38 +15,37 @@
          disabled=isPlayMode}}
        </div>
      </div>
-  </div>
-  </fieldset>
+    </fieldset>

-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.spells"}}{{#if isEditMode}}<a class="action" data-tooltip="{{localize "
-        LETHALFANTASY.Tooltip.addSpell"}}" data-tooltip-direction="UP"><i class="fas fa-plus"
-          data-action="createSpell"></i></a>{{/if}}</legend>
-    <div class="spells">
-      {{#each spells as |item|}}
-      <div class="spell" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="true">
-        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
-        <div class="name">
-          {{item.name}}
-        </div>
-
-        <a class="rollable" data-roll-type="spell-attack" data-roll-key="{{item.id}}" data-tooltip="Spell Attack">
-          <i class="lf-roll-small fa-solid fa-swords" data-roll-type="spell-attack" data-roll-key="{{item.id}}"></i>
-        </a>
-
-        <a class="rollable" data-roll-type="spell-power" data-roll-key="{{item.id}}" data-tooltip="Spell Power">
-          <i class="fa-duotone fa-solid fa-stars" data-roll-type="spell-power" data-roll-key="{{item.id}}"></i>
-        </a>
-
-        <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 data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+    <fieldset>
+      <legend>{{localize "LETHALFANTASY.Label.spells"}}{{#if isEditMode}}<a class="action" data-tooltip="{{localize "
+          LETHALFANTASY.Tooltip.addSpell"}}" data-tooltip-direction="UP"><i class="fas fa-plus"
+            data-action="createSpell"></i></a>{{/if}}</legend>
+      <div class="spells">
+        {{#each spells as |item|}}
+        <div class="spell" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="true">
+          <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+          <div class="name">
+            {{item.name}}
+          </div>
+
+          <a class="rollable" data-roll-type="spell-attack" data-roll-key="{{item.id}}" data-tooltip="Spell Attack">
+            <i class="lf-roll-small fa-solid fa-swords" data-roll-type="spell-attack" data-roll-key="{{item.id}}"></i>
+          </a>
+
+          <a class="rollable" data-roll-type="spell-power" data-roll-key="{{item.id}}" data-tooltip="Spell Power">
+            <i class="fa-duotone fa-solid fa-stars" data-roll-type="spell-power" data-roll-key="{{item.id}}"></i>
+          </a>
+
+          <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 data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
+              data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+          </div>
        </div>
+        {{/each}}
      </div>
-      {{/each}}
-    </div>
-  </fieldset>
+    </fieldset>
  </div>
 </section>
--- a/templates/chat-message.hbs
+++ b/templates/chat-message.hbs
@@ -6,7 +6,7 @@
    </div>

    <div class="intro-right">
-      <span>{{actingCharName}} - {{upperFirst rollName}}</span>
+      <span><STRONG>{{actingCharName}} - {{upperFirst rollName}}</STRONG></span>

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

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

      {{#if rollTarget.weapon}}
      <span>{{rollTarget.weapon.name}}</span>
      {{/if}}

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

      {{#each diceResults as |result|}}
      <span>{{result.dice}} : {{result.value}}</span>
--- a/templates/monster-main.hbs
+++ b/templates/monster-main.hbs
@@ -13,13 +13,15 @@
        <fieldset class="monster-characteristics monster-characteristics-{{ifThen isPlayMode 'play' 'edit'}}">
          <div class="flexrow monster-hp">
            <span class="name">{{localize "LETHALFANTASY.Label.HP"}}</span>
-            {{formInput systemFields.hp.fields.value value=system.hp.value disabled=isPlayMode classes="monster-hp-value"}}
+            {{formInput systemFields.hp.fields.value value=system.hp.value disabled=isPlayMode
+            classes="monster-hp-value"}}
            &nbsp;/&nbsp;
            {{formInput systemFields.hp.fields.max value=system.hp.max disabled=isPlayMode classes="monster-hp-value"}}
          </div>
          <div class="flexrow monster-hp">
            <span class="damage-resistance">{{localize "LETHALFANTASY.Label.damageResistance"}}</span>
-            {{formInput systemFields.hp.fields.damageResistance value=system.hp.damageResistance disabled=isPlayMode classes="monster-hp-value"}}
+            {{formInput systemFields.hp.fields.damageResistance value=system.hp.damageResistance disabled=isPlayMode
+            classes="monster-hp-value"}}
          </div>
        </fieldset>

@@ -41,7 +43,8 @@
                    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=isPlayMode }}
+              {{formField systemFields.saves.fields.will.fields.value value=system.saves.will.value disabled=isPlayMode
+              }}
              <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>
@@ -65,20 +68,20 @@
                    class="lf-roll-small fa-solid fa-dice-d20"></i>
                  {{localize "LETHALFANTASY.Label.saves.contagion"}}
                </a>
-                </span>
+              </span>
              {{formField systemFields.saves.fields.contagion.fields.value value=system.saves.contagion.value
              disabled=isPlayMode}}

              <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>
-                {{localize "LETHALFANTASY.Label.saves.poison"}}
+                  {{localize "LETHALFANTASY.Label.saves.poison"}}
                </a>
-                </span>
-                {{formField systemFields.saves.fields.poison.fields.value value=system.saves.poison.value
+              </span>
+              {{formField systemFields.saves.fields.poison.fields.value value=system.saves.poison.value
              disabled=isPlayMode }}

-              <span class="name">
+              <!-- <span class="name">
                <a class="rollable" data-roll-type="save" data-roll-key="paincourage" data-roll-dice="D20" data-tooltip="Pain/Courage check on wound of..."><i
                    class="lf-roll-small fa-solid fa-dice-d20"></i>
                  {{localize "LETHALFANTASY.Label.saves.paincourage"}}
@@ -88,7 +91,7 @@

              <span data-tooltip="Pain save if wound exceeds">
              {{formField systemFields.hp.fields.painDamage value=system.hp.painDamage disabled=isPlayMode tooltip="Pain Damage"}}
-              </span>
+              </span>-->

            </div>

@@ -102,19 +105,22 @@
              <span class="name"><a class="rollable" data-roll-type="monster-skill" data-roll-key="resistTorture"><i
                    class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize
                  "LETHALFANTASY.Label.resistTorture"}}</a></span>
-              {{formField systemFields.resists.fields.resistTorture.fields.value value=system.resists.resistTorture.value
+              {{formField systemFields.resists.fields.resistTorture.fields.value
+              value=system.resists.resistTorture.value
              disabled=isPlayMode
              }}
              <span class="name"><a class="rollable" data-roll-type="monster-skill" data-roll-key="resistPerformance"><i
                    class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize
                  "LETHALFANTASY.Label.resistPerformance"}}</a></span>
-              {{formField systemFields.resists.fields.resistPerformance.fields.value value=system.resists.resistPerformance.value
-             disabled=isPlayMode
+              {{formField systemFields.resists.fields.resistPerformance.fields.value
+              value=system.resists.resistPerformance.value
+              disabled=isPlayMode
              }}
-              <span class="name"><a class="rollable" data-roll-type="monster-skill" data-roll-key="resistIntimidation"><i
-                    class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize
+              <span class="name"><a class="rollable" data-roll-type="monster-skill"
+                  data-roll-key="resistIntimidation"><i class="lf-roll-small fa-solid fa-dice-d20"></i>{{localize
                  "LETHALFANTASY.Label.resistIntimidation"}}</a></span>
-              {{formField systemFields.resists.fields.resistIntimidation.fields.value value=system.resists.resistIntimidation.value
+              {{formField systemFields.resists.fields.resistIntimidation.fields.value
+              value=system.resists.resistIntimidation.value
              disabled=isPlayMode }}

              <span class="name"><a class="rollable" data-roll-type="monster-skill" data-roll-key="perception"><i
@@ -141,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>
@@ -157,7 +163,7 @@
  <fieldset class="monster-characteristics monster-characteristics-{{ifThen isPlayMode 'play' 'edit'}}">
    <legend>{{localize "LETHALFANTASY.Label.characteristics"}}</legend>
    <div class="monster-characteristic">
-      <span>x{{localize "LETHALFANTASY.Label.int"}}</span>
+      <span>{{localize "LETHALFANTASY.Label.int"}}</span>
      {{formField systemFields.characteristics.fields.int.fields.value value=system.characteristics.int.value
      disabled=isPlayMode data-char-id="int" }}

--- a/templates/range-defense-dialog.hbs
+++ b/templates/range-defense-dialog.hbs
@@ -32,21 +32,15 @@
      </select>
    </div>

-    <div class="field-section">
-      <span class="field-name">Aim :</span>
-
-      <select name="attackerAim" data-tooltip-direction="UP">
-        {{selectOptions attackerAimChoices selected=attackerAim}}
-      </select>
-    </div>
-
  </fieldSet>

  <fieldSet>
    <legend>{{localize "LETHALFANTASY.Roll.visibility"}}</legend>
-    <select name="visibility">
-      {{selectOptions rollModes selected=visibility localize=true}}
-    </select>
+    <span class="fieldset-centered">
+      <select name="visibility">
+        {{selectOptions rollModes selected=visibility localize=true}}
+      </select>
+    </span>
  </fieldSet>

 </div>
--- a/templates/roll-dialog.hbs
+++ b/templates/roll-dialog.hbs
@@ -33,12 +33,26 @@
    <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="pointBlank">
+      <input type="checkbox" data-action="selectPointBlank" name="pointBlankV">
    </div>
-    <div class="dialog-save">Beyon Skill Range Attack
-      <input type="checkbox" data-action="selectBeyondSkill" name="beyondSkill">
+    <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
@@ -78,7 +92,7 @@
    {{#if rollTarget.magicUser}}
    <div>
      <span>Save against spell (+{{rollTarget.actorModifiers.saveModifier}}) ?</span>
-      <input type="checkbox" name="saveSpell" value="saveSpell">
+      <input type="checkbox" name="saveSpellCheck" data-action="saveSpellCheck">
    </div>
    {{/if}}
    {{/if}}
--- a/templates/shield.hbs
+++ b/templates/shield.hbs
@@ -29,7 +29,7 @@
    </div>

    <div class="align-top">
-      <label>Destruction</label>
+      <!-- <label>Destruction</label>
      <div class="shift-right">
        {{formField systemFields.destruction.fields.bashing value=system.destruction.bashing}}
        {{formField systemFields.destruction.fields.slashing value=system.destruction.slashing}}
@@ -41,7 +41,7 @@
        {{formField systemFields.autodestruction.fields.bashing value=system.autodestruction.bashing}}
        {{formField systemFields.autodestruction.fields.slashing value=system.autodestruction.slashing}}
        {{formField systemFields.autodestruction.fields.piercing value=system.autodestruction.piercing}}
-      </div>
+      </div> -->

      {{formField systemFields.equipped value=system.equipped}}
Author	SHA1	Message	Date
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
LeRatierBretonnien	fa3054f24b	Some granted dice/favor fixes All checks were successful Release Creation / build (release) Successful in 2m48s Details	2025-10-01 17:17:33 +02:00
LeRatierBretonnien	59a891630e	Fix tooltip All checks were successful Release Creation / build (release) Successful in 38s Details	2025-09-20 09:34:13 +02:00
LeRatierBretonnien	35b88b3914	Poison/Contagion fixes again All checks were successful Release Creation / build (release) Successful in 42s Details	2025-09-19 23:32:15 +02:00
LeRatierBretonnien	cb8bcfd9ea	Ranged defense fixes again All checks were successful Release Creation / build (release) Successful in 43s Details	2025-09-19 22:30:26 +02:00
LeRatierBretonnien	eedce1a498	Latest fixes All checks were successful Release Creation / build (release) Successful in 46s Details	2025-09-17 07:47:40 +02:00
LeRatierBretonnien	76a99fe33f	Various fixes	2025-09-16 23:49:02 +02:00
LeRatierBretonnien	59a39850ce	Fix miracle/spell rolls + upadte compendiums All checks were successful Release Creation / build (release) Successful in 56s Details	2025-09-09 20:14:25 +02:00
LeRatierBretonnien	6eeb391d1a	Move aiming to attacker All checks were successful Release Creation / build (release) Successful in 1m9s Details	2025-09-05 23:26:11 +02:00
LeRatierBretonnien	c7727076bf	Various fixes and renamingé All checks were successful Release Creation / build (release) Successful in 1m30s Details	2025-09-02 21:06:33 +02:00
LeRatierBretonnien	d0411f9ec9	Various fixes and renamingé	2025-09-02 18:17:31 +02:00