Update fight options

Fix licence
Fight helper !
2025-11-11 19:56:33 +01:00 · 2025-10-01 15:14:58 +02:00 · 2025-10-01 11:24:41 +02:00 · 2025-09-30 17:44:39 +02:00 · 2025-08-10 19:33:28 +02:00 · 2025-07-29 18:29:02 +02:00
58 changed files with 1637 additions and 248 deletions
--- a/6
+++ b/6
@@ -0,0 +1,6 @@
+ Code license : 
+
+Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
+
+This license requires that reusers give credit to the creator. It allows reusers to distribute, remix, adapt, and build upon the material in any medium or format, for noncommercial purposes only. If others modify or adapt the material, they must license the modified material under identical terms.
+
--- a/compendiums/fr/fvtt-cthulhu-eternal.skills.json
+++ b/compendiums/fr/fvtt-cthulhu-eternal.skills.json
@@ -20,7 +20,7 @@
  "entries": {
    "Pilot (Type)": {
      "name": "Pilotage (Type)",
-      "description": "<pPiloter, naviguer et diriger des véhicules nautiques ou aériens. Utilisez cette compétence pour assurer la sécurité d'un navire en cas de danger, par exemple lors d'une tempête ou d'une poursuite dangereuse. Chaque type de véhicule requiert une compétence distincte : Avion, Drone, Hélicoptère, Dirigeable, Petite embarcation, Navire, etc.</p>"
+      "description": "<p>Piloter, naviguer et diriger des véhicules nautiques ou aériens. Utilisez cette compétence pour assurer la sécurité d'un navire en cas de danger, par exemple lors d'une tempête ou d'une poursuite dangereuse. Chaque type de véhicule requiert une compétence distincte : Avion, Drone, Hélicoptère, Dirigeable, Petite embarcation, Navire, etc.</p>"
    },
    "Anthropology": {
      "name": "Anthropologie",
--- a/compendiums/fr/fvtt-cthulhu-eternal.weapons.json
+++ b/compendiums/fr/fvtt-cthulhu-eternal.weapons.json
@@ -0,0 +1,389 @@
+{
+  "label": "Armes",
+  "folders": {
+    "Automatic and Heavy Weapons": "Automatiques et armes lourdes",
+    "Firearms": "Armes à feu",
+    "Melee Weapons": "Armes de mêlée",
+    "Ranged Weapons": "Armes à distance",
+    "Ranged weapons": "Armes à distance",
+    "Thermal Weapons": "Armes thermiques",
+    "Weapons - Age Of Revolutions": "Armes - Âge des Révolutions",
+    "Weapons - Age Of Sails": "Armes - Âge de la Voile",
+    "Weapons - Classical Era": "Armes - Époque Classique",
+    "Weapons - Cold War": "Armes - Guerre Froide",
+    "Weapons - Future": "Armes - Futur",
+    "Weapons - Jazz": "Armes - Jazz/Années folles",
+    "Weapons - Medieval": "Armes - Médiévales",
+    "Weapons - Modern": "Armes - Modernes",
+    "Weapons - Post Apocalyptic": "Armes - Post-apocalyptiques",
+    "Weapons - Victorian": "Armes - Victoriennes",
+    "Weapons - World War I": "Armes - Première Guerre mondiale",
+    "Weapons - World War II": "Armes - Seconde Guerre mondiale"
+  },
+  "mapping": {
+    "rangeUnit": {
+      "path": "system.rangeUnit",
+      "converter": "translateRangeUnit"
+    },
+    "baseRange": {
+      "path": "system.baseRange",
+      "converter": "translateRange"
+    }
+  },
+  "entries": {
+    "Anti-tank rifle": {
+      "name": "Arme antichar"
+    },
+    "Assault rifle": {
+      "name": "Fusil d'assaut"
+    },
+    "Axe": {
+      "name": "Hache"
+    },
+    "Bare hands and feet": {
+      "name": "Mains et pieds nus"
+    },
+    "Baseball Bat": {
+      "name": "Batte de baseball"
+    },
+    "Baseball bat": {
+      "name": "Batte de baseball"
+    },
+    "Battle laser": {
+      "name": "Laser de combat"
+    },
+    "Battle rifle": {
+      "name": "Fusil de combat"
+    },
+    "Bayonet": {
+      "name": "Baïonnette"
+    },
+    "Blackjack": {
+      "name": "Blackjack"
+    },
+    "Blunderbuss Pistol": {
+      "name": "Pistolet tromblon"
+    },
+    "Bow": {
+      "name": "Arc"
+    },
+    "Brass knuckles": {
+      "name": "Poings américains"
+    },
+    "Broad sword": {
+      "name": "Épée large"
+    },
+    "Buffalo Rifle": {
+      "name": "Fusil Buffalo"
+    },
+    "Cane Gun": {
+      "name": "Pistolet canne"
+    },
+    "Cannon Barrel Pistol": {
+      "name": "Pistolet canon"
+    },
+    "Carbine": {
+      "name": "Carabine"
+    },
+    "Cavalry lance": {
+      "name": "Lance de cavalerie"
+    },
+    "Cavalry sabre": {
+      "name": "Sabre de cavalerie"
+    },
+    "Ceramic Grenade": {
+      "name": "Grenade en céramique"
+    },
+    "Chainsaw": {
+      "name": "Tronçonneuse"
+    },
+    "Claymore": {
+      "name": "Claymore"
+    },
+    "Club": {
+      "name": "Gourdin"
+    },
+    "Combat knife": {
+      "name": "Couteau de combat"
+    },
+    "Cosh": {
+      "name": "Matraque"
+    },
+    "Cricket bat": {
+      "name": "Batte de cricket"
+    },
+    "Crossbow": {
+      "name": "Arbalète"
+    },
+    "Cutlass": {
+      "name": "Coutelas"
+    },
+    "Dagger": {
+      "name": "Dague"
+    },
+    "Derringer": {
+      "name": "Derringer"
+    },
+    "Dueling Pistol": {
+      "name": "Pistolet de duel"
+    },
+    "Dutch (long) Pistol": {
+      "name": "Pistolet néerlandais (long)"
+    },
+    "Elephant Gun": {
+      "name": "Fusil à éléphant"
+    },
+    "Flintlock Pistol": {
+      "name": "Pistolet à silex"
+    },
+    "Fowling Piece": {
+      "name": "Fusil de chasse"
+    },
+    "Garotte": {
+      "name": "Garrot"
+    },
+    "Gatling Gun": {
+      "name": "Gatling Gun"
+    },
+    "Guntō": {
+      "name": "Guntō"
+    },
+    "Hand Grenade": {
+      "name": "Grenade à main"
+    },
+    "Hand grenade": {
+      "name": "Grenade à main"
+    },
+    "Hatchet": {
+      "name": "Hachette"
+    },
+    "Heavy Pistol": {
+      "name": "Pistolet lourd"
+    },
+    "Heavy Spear": {
+      "name": "Lance lourde"
+    },
+    "Heavy axe": {
+      "name": "Hache lourde"
+    },
+    "Heavy hammer": {
+      "name": "Marteau lourd"
+    },
+    "Heavy pistol": {
+      "name": "Pistolet gros calibre"
+    },
+    "Heavy spear": {
+      "name": "Lance lourde"
+    },
+    "Incendiary Grenade": {
+      "name": "Grenade incendiaire"
+    },
+    "Javelin": {
+      "name": "Javelot"
+    },
+    "Katana": {
+      "name": "Katana"
+    },
+    "Knife": {
+      "name": "Couteau"
+    },
+    "Large Caliber Pistol": {
+      "name": "Pistolet gros calibre"
+    },
+    "Large sword": {
+      "name": "Grande épée"
+    },
+    "Laser carbine": {
+      "name": "Carabine laser"
+    },
+    "Life preserver": {
+      "name": "Gilet de sauvetage"
+    },
+    "Light Spear": {
+      "name": "Lance légère"
+    },
+    "Light axe": {
+      "name": "Hache légère"
+    },
+    "Light spear": {
+      "name": "Lance légère"
+    },
+    "Long spear": {
+      "name": "Lance longue"
+    },
+    "Long sword": {
+      "name": "Epée longue"
+    },
+    "Longrifle": {
+      "name": "Fusil long"
+    },
+    "Mace": {
+      "name": "Masse"
+    },
+    "Machete": {
+      "name": "Machette"
+    },
+    "Maxim": {
+      "name": "Maxime"
+    },
+    "Medium Pistol": {
+      "name": "Pistolet moyen"
+    },
+    "Musket": {
+      "name": "Mousquet"
+    },
+    "Nightstick": {
+      "name": "Matraque"
+    },
+    "Oil": {
+      "name": "Huile"
+    },
+    "Ordinary knife": {
+      "name": "Couteau ordinaire"
+    },
+    "Plasma rifle": {
+      "name": "Fusil à plasma"
+    },
+    "Polearm": {
+      "name": "Arme d'hast"
+    },
+    "Power sword": {
+      "name": "Epée énergétique"
+    },
+    "Rapier": {
+      "name": "Rapière"
+    },
+    "Rifle": {
+      "name": "Fusil"
+    },
+    "Sabre": {
+      "name": "Sabre"
+    },
+    "Scimitar": {
+      "name": "Cimeterre"
+    },
+    "Seax": {
+      "name": "Seax"
+    },
+    "Shield bash": {
+      "name": "Coup de bouclier"
+    },
+    "Shiv": {
+      "name": "Shiv"
+    },
+    "Short spear": {
+      "name": "Lance courte"
+    },
+    "Short sword": {
+      "name": "Epée courte"
+    },
+    "Shotgun": {
+      "name": "Shotgun"
+    },
+    "Shuriken": {
+      "name": "Shuriken"
+    },
+    "Sickle": {
+      "name": "Faucille"
+    },
+    "Sling": {
+      "name": "Fronde"
+    },
+    "Small-caliber pistol": {
+      "name": "Pistolet de petit calibre"
+    },
+    "Small‐caliber pistol": {
+      "name": "Pistolet de petit calibre"
+    },
+    "Staff": {
+      "name": "Bâton"
+    },
+    "Steel-toe boot": {
+      "name": "Botte à embout en acier"
+    },
+    "Steel‐toe boot": {
+      "name": "Botte à embout en acier"
+    },
+    "Submachine gun": {
+      "name": "Pistolet-mitrailleur"
+    },
+    "Sulphur soaked cloth": {
+      "name": "Tissu imbibé de soufre"
+    },
+    "Switchblade": {
+      "name": "Couteau à cran d'arrêt"
+    },
+    "Sword cane": {
+      "name": "Canne épée"
+    },
+    "Taser": {
+      "name": "Taser"
+    },
+    "Thompson": {
+      "name": "Thompson"
+    },
+    "Thrown Axe": {
+      "name": "Hache de lancer"
+    },
+    "Thrown Hand Grenade": {
+      "name": "Grenade à main de lancer"
+    },
+    "Thrown Heavy Spear": {
+      "name": "Lance lourde lancée"
+    },
+    "Thrown Knife": {
+      "name": "Couteau de lancer"
+    },
+    "Thrown Light Spear": {
+      "name": "Lance légère lancée"
+    },
+    "Thrown Long Spear": {
+      "name": "Lance longue lancée"
+    },
+    "Thrown Net": {
+      "name": "Filet"
+    },
+    "Thrown Rock": {
+      "name": "Pierre lancée"
+    },
+    "Thrown Short Spear": {
+      "name": "Lance courte lancée"
+    },
+    "Thrown Spear": {
+      "name": "Lance lancée"
+    },
+    "Thrown Spear, Heavy": {
+      "name": "Lance lancée, lourde"
+    },
+    "Thrown Spear, Light": {
+      "name": "Lance lancée, légère"
+    },
+    "Tomahawk": {
+      "name": "Tomahawk"
+    },
+    "Trident": {
+      "name": "Trident"
+    },
+    "Two-Handed sword": {
+      "name": "Epée à deux mains"
+    },
+    "Two-handed sword": {
+      "name": "Epée à deux mains"
+    },
+    "Very heavy sniper laser": {
+      "name": "Laser lourd de sniper"
+    },
+    "Very heavy sniper rifle": {
+      "name": "Fusil lourd de sniper"
+    },
+    "Very large pistol": {
+      "name": "Pistolet très gros calibre"
+    },
+    "WW1 Machinegun": {
+      "name": "Mitrailleuse de la Première Guerre mondiale"
+    },
+    "War club": {
+      "name": "Massue de guerre"
+    }
+  }
+}
--- a/css/fvtt-cthulhu-eternal.css
+++ b/css/fvtt-cthulhu-eternal.css
@@ -183,6 +183,25 @@ i.fvtt-cthulhu-eternal {
  color: var(--color-critical-failure);
  font-family: var(--font-title);
 }
+.chat-san-request ul .san-type-buttons,
+.chat-lethal-damage ul .san-type-buttons {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 10px 0;
+}
+.chat-san-request ul .san-type-buttons button,
+.chat-lethal-damage ul .san-type-buttons button {
+  margin: 0 2px;
+  font-family: var(--font-primary);
+  font-size: calc(var(--font-size-standard) * 0.9);
+  border: none;
+  padding: 2px 2px;
+  cursor: pointer;
+  transition: background-color 0.3s;
+  min-width: 6rem;
+  max-width: 6rem;
+}
 .chat-san-request ul .san-loose-buttons,
 .chat-lethal-damage ul .san-loose-buttons {
  display: flex;
@@ -804,7 +823,7 @@ i.fvtt-cthulhu-eternal {
 }
 .fvtt-cthulhu-eternal .tab.protagonist-equipment .main-div .weapons {
  display: grid;
-  grid-template-columns: repeat(2, 1fr);
+  grid-template-columns: repeat(1, 1fr);
  gap: 4px;
 }
 .fvtt-cthulhu-eternal .tab.protagonist-equipment .main-div .weapons .weapon {
@@ -824,10 +843,24 @@ i.fvtt-cthulhu-eternal {
  min-width: 1.8rem;
  max-width: 1.8rem;
 }
-.fvtt-cthulhu-eternal .tab.protagonist-equipment .main-div .weapons .weapon .damage {
+.fvtt-cthulhu-eternal .tab.protagonist-equipment .main-div .weapons .weapon .range {
  min-width: 6rem;
  max-width: 6rem;
 }
+.fvtt-cthulhu-eternal .tab.protagonist-equipment .main-div .weapons .weapon .ammo {
+  min-width: 4rem;
+  max-width: 4rem;
+}
+.fvtt-cthulhu-eternal .tab.protagonist-equipment .main-div .weapons .weapon .lethality {
+  display: flex;
+  min-width: 3.2rem;
+  max-width: 3.2rem;
+}
+.fvtt-cthulhu-eternal .tab.protagonist-equipment .main-div .weapons .weapon .damage {
+  display: flex;
+  min-width: 12rem;
+  max-width: 12rem;
+}
 .fvtt-cthulhu-eternal .tab.protagonist-equipment .main-div .weapons .weapon .name {
  min-width: 10rem;
  max-width: 10rem;
@@ -2153,6 +2186,24 @@ i.fvtt-cthulhu-eternal {
  margin-top: 8px;
  background-color: var(--color-light-1);
 }
+.fvtt-cthulhu-eternal .weapon-content fieldset input {
+  max-width: 5rem;
+  min-width: 5rem;
+}
+.fvtt-cthulhu-eternal .weapon-content fieldset select {
+  max-width: 14rem;
+  min-width: 14rem;
+}
+.fvtt-cthulhu-eternal .weapon-content fieldset input[type="checkbox"] {
+  max-width: 1.5rem;
+  min-width: 1.5rem;
+}
+.fvtt-cthulhu-eternal .weapon-content fieldset .flexrow > *:not(:first-child) {
+  margin-left: 1rem;
+}
+.fvtt-cthulhu-eternal .weapon-content fieldset .damage-distance {
+  margin-left: 2rem;
+}
 .fvtt-cthulhu-eternal .weapon-content label {
  flex: 10%;
 }
@@ -2990,6 +3041,9 @@ i.fvtt-cthulhu-eternal {
  font-size: calc(var(--font-size-standard) * 2);
  color: var(--color-dark-1);
 }
+.li-apply-wounds {
+  display: none;
+}
 .dice-roll {
  flex-direction: column;
 }
--- a/cthulhu-eternal.mjs
+++ b/cthulhu-eternal.mjs
@@ -29,6 +29,12 @@ Hooks.once("init", function () {
    models,
    documents,
  }
+  // Set an initiative formula for the system
+  CONFIG.Combat.initiative = {
+    formula: "@characteristics.dex.value",
+    decimals: 1
+  };
+

  CONFIG.Actor.documentClass = documents.CthulhuEternalActor
  CONFIG.Actor.dataModels = {
@@ -93,13 +99,14 @@ Hooks.once("init", function () {
  CthulhuEternalUtils.registerSettings()
  CthulhuEternalUtils.registerHandlebarsHelpers()
  CthulhuEternalUtils.setupCSSRootVariables()
-
+  CONFIG.debug.hooks = false;

  console.info("CTHULHU ETERNAL | System Initialized")
 })

 Hooks.once('babele.init', (babele) => {
-    babele.setSystemTranslationsDir("compendiums");
+  babele.setSystemTranslationsDir("compendiums");
+  CthulhuEternalUtils.registerBabeleTranslations(babele);
 });

 /**
@@ -151,7 +158,8 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
      CthulhuEternalUtils.nudgeRoll(message)
    })
    $(html).find(".damage-roll").click((event) => {
-      CthulhuEternalUtils.damageRoll(message)
+      let formula = $(event.currentTarget).data("roll-value")
+      CthulhuEternalUtils.damageRoll(message, formula)
    })
    $(html).find(".healing-roll").click((event) => {
      CthulhuEternalUtils.healingRoll(message)
@@ -163,6 +171,15 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
      CthulhuEternalUtils.applySANType(message, event)
    })
  }
+  if (game.user.isGM) {
+    $(html).find(".li-apply-wounds").each((i, btn) => {
+      btn.style.display = "inline"
+    })
+    $(html).find(".li-apply-wounds-select").click((event) => {
+      CthulhuEternalUtils.applyWounds(message, event)
+    })
+  }
+
 })

 /**
--- a/lang/en.json
+++ b/lang/en.json
@@ -205,6 +205,7 @@
      "Struggle": "Struggle"
    },
    "Skill": {
+      "DodgeName": "Dodge",
      "Unnatural": "Unnatural",
      "Melee": "Melee Weapons",
      "Firearms": "Firearms",
@@ -212,6 +213,7 @@
      "UnarmedCombat": "Unarmed Combat",
      "RangedWeapons": "Ranged Weapons",
      "FirearmsBeams": "Firearms / Beam Weapons",
+      "MilitaryTrainingExplosive": "Military Training (Explosives)",
      "FIELDS": {
        "isHealing": {
          "label": "Healing skill"
@@ -268,7 +270,8 @@
        "rangedprimitive": "Ranged Primitive",
        "rangedthrown": "Ranged Thrown",
        "rangedfirearm": "Ranged Firearm",
-        "unarmed": "Unarmed"
+        "unarmed": "Unarmed",
+        "rangedexplosive": "Explosive"
      },
      "WeaponSubtype": {
        "basicfirearm": "Basic Firearm",
@@ -283,7 +286,41 @@
        "shortspray": "Short Spray",
        "longspray": "Long Spray"
      },
+      "Target": {
+        "Normal": "Normal",
+        "Stationary": "Stationary",
+        "MovingRange": "Moving or on the ground",
+        "MovingFast": "Moving Fast (ie running)",
+        "MovingVeryFast": "Moving Very Fast",
+        "HalfCovered": "Half Covered",
+        "Covered": "Full Covered"
+      },
+      "Range": {
+        "PointBlank": "Point Blank",
+        "Normal": "Normal",
+        "Range2x": "Up to Range x2",
+        "Range5x": "Up to Range x5"
+      },
+      "Visibility": {
+        "Clear": "Clear",
+        "Obscured": "Obscured",
+        "Darkness": "Darkness"
+      },
+      "Attacker": {
+        "Normal": "Normal",
+        "Irritated": "Irritated/Annoyed",
+        "Corrosive": "Deeply Annoyed"
+      },
      "FIELDS": {
+        "hasDamageDistance": {
+          "label": "Is damage distance based?"
+        },
+        "hasSight": {
+          "label": "Has sight"
+        },
+        "isStunning": {
+          "label": "Is Stunning"
+        },
        "hasDirectSkill": {
          "label": "Has direct skill"
        },
@@ -516,6 +553,10 @@
      }
    },
    "Label": {
+      "noTarget": "No target selected",
+      "noDefenseRoll": "No defense roll available",
+      "opposedRoll": "Opposed Roll",
+      "Target": "Target",
      "sanLoss5": "You suffered a SAN loss of 5+ ({value}) : you suffer a temporary insanity (Flee, Submit, Struggle or understanding the Unnatural).",
      "sanViolenceReset": "The violence SAN loss count has been reset.",
      "sanHelplessnessReset": "The helplessness SAN loss count has been reset.",
@@ -526,11 +567,14 @@
      "Unnatural": "Unnatural",
      "sanLossViolence": "You suffered a SAN loss due to violence : violence progress path has evolved.",
      "sanLossHelplessness": "You suffered a SAN loss due to helplessness : helplessness progress path has evolved.",
+      "SANLossUnnatural": "You suffered a SAN loss due to unnatural : you may gain an Unnatural skill, check with the GM.",
+      "SANLossNone": "You suffered a SAN loss, but no special consequences apply.",
      "adaptedToViolence": "You are now : Adapted to Violence.",
      "adaptedToViolenceShort": "Adapted to Violence",
      "adaptedToHelplessness": "You are now : Adapted to Helplessness.",
      "adaptedToHelplessnessShort": "Adapted to Helplessness",
-      "SANTest": "You just rolled a SAN test : please select the SAN loss with the buttons below.",
+      "SANTestSuccess": "You just rolled a SAN test with success, but you may still loose SAN points. Select the value of SAN loss with the buttons below.",
+      "SANTestFailure": "You just rolled a SAN test with failure, you loose SAN points. Select the value of SAN loss with the buttons below.",
      "breakingPointReached": "Your SAN has reached your Breaking Point : you suffer a disorder (to be discussed with the GM). Reset the BP to its new value.",
      "rollNudge": "Roll Nudge",
      "rollDamage": "Roll Damage",
@@ -613,6 +657,11 @@
      "biography": "Biography",
      "notes": "Notes",
      "weapons": "Weapons",
+      "melee": "Melee",
+      "Lethality": "Lethality",
+      "baseRange": "Base Range",
+      "Ammo": "Ammo",
+      "armorPiercing": "Armor Piercing",
      "HP": "HP",
      "SAN": "SAN",
      "current": "Current",
@@ -678,7 +727,16 @@
      "killRadiusInfo": "All targets within the kill radius suffer the damage",
      "ammoUsed": "Ammo used",
      "lethalityLethal": "Lethal !!",
-      "lethalityNotLethal": "Non-Lethal"
+      "lethalityNotLethal": "Non-Lethal",
+      "WPSpent": "WP Spent",
+      "targetMove": "Target Move",
+      "attackerState": "Attacker State",
+      "targetSize": "Target Size",
+      "visibility": "Visibility",
+      "rangedRange": "Range",
+      "aimingLastRound": "Aiming Last Round (+20)",
+      "aimingWithSight": "Aiming with Sight (+20)",
+      "applyWounds": "Apply To"
    },
    "ChatMessage": {
      "exhausted": "Your protagonist is exhausted. He loses [[/r 1d6]] Willpower Points."
@@ -699,11 +757,16 @@
    "Tooltip": {
      "sanBP": ">5 SAN lost in one roll, temporary insanity. If SAN less reaches BP = a Disorder unconscious Breaking and AND reset BP.",
      "setBP": "Set the current Breaking Point based on the current SAN value",
-      "addBond": "Add a new Bond"
+      "addBond": "Add a new Bond",
+      "rollDamage": "Roll Damage"
    },
    "Chat": {
+      "noArmor": "No armor absorbed damage.",
+      "armorAbsorbed": "Armor absorbed {armor} damage.",
+      "woundsApplied": "Wounds applied to {name}: {effectiveWounds} (armor absorbed : {armorText})"
    },
    "Notifications": {
+      "AttackNoTarget": "No target selected for the attack, please select one target to get automations.",
      "NoWeaponSkill": "No weapon skill found for this weapon. Check Weapon definition or available skills/era",
      "NoWeaponType": "No weapon type found for this weapon subtype. Check Weapon definition or available skills/era",
      "skillAlreadyExists": "Skill already exists",
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -217,6 +217,7 @@
      "Struggle": "Lutter"
    },
    "Skill": {
+      "DodgeName": "Esquive",
      "Unnatural": "Inconcevable",
      "Melee": "Armes de mêlée",
      "Firearms": "Armes à feu",
@@ -224,6 +225,7 @@
      "UnarmedCombat": "Combat à mains nues",
      "RangedWeapons": "Armes de tir",
      "FirearmsBeams": "Armes à feu / à rayons",
+      "MilitaryTrainingExplosive": "Entraînement militaire (Explosifs)",
      "FIELDS": {
        "isHealing": {
          "label": "Compétence de soin"
@@ -280,7 +282,8 @@
        "rangedprimitive": "A distance - Primitive",
        "rangedthrown": "A distance - Lancer",
        "rangedfirearm": "A distance - Arme à feu",
-        "unarmed": "Non armé"
+        "unarmed": "Non armé",
+        "rangedexplosive": "Explosif"
      },
      "WeaponSubtype": {
        "basicfirearm": "Arme à feu de base",
@@ -295,7 +298,41 @@
        "shortspray": "Barrage court",
        "longspray": "Barrage long"
      },
+      "Target": {
+        "Normal": "Normal",
+        "Stationary": "Immobile (+20)",
+        "MovingRange": "En mouvement ou au sol (-20)",
+        "MovingFast": "En mouvement rapide (ie course) (-20)",
+        "MovingVeryFast": "En mouvement très rapide (ie véhicule) (-40)",
+        "HalfCovered": "A moitié couvert (-20)",
+        "Covered": "A Couvert (-40)"
+      },
+      "Range": {
+        "PointBlank": "Bout portant (+20)",
+        "Normal": "Normal",
+        "Range2x": "de portée à portée x2 (-20)",
+        "Range5x": "de portéex2 à portée x5 (-40)"
+      },
+      "Visibility": {
+        "Clear": "Normale",
+        "Obscured": "Obscurci (-20)",
+        "Darkness": "Obscurité (-40)"
+      },
+      "Attacker": {
+        "Normal": "Normal",
+        "Irritated": "Irrité/Gêné (-20)",
+        "Corrosive": "Fortement gêné (-40)"
+      },
      "FIELDS": {
+        "hasDamageDistance": {
+          "label": "Dégâts basés sur la distance ?"
+        },
+        "hasSight": {
+          "label": "Lunette de visée"
+        },
+        "isStunning": {
+          "label": "Etourdissante"
+        },
        "ammo": {
          "label": "Munitions",
          "value": {
@@ -528,20 +565,34 @@
      }
    },
    "Label": {
+      "noTarget": "Aucune cible sélectionnée",
+      "noDefenseRoll": "Aucun jet de défense existant",
+      "opposedRoll": "Jet opposé",
+      "Target": "Cible",
+      "feet": "pieds (ie 30cm)",
+      "feets": "pieds (ie 30cm)",
+      "yard": "mètres",
+      "Yard": "mètres",
+      "yards": "mètres",
+      "Feet": "Pieds",
+      "Yards": "Mètres",
      "sanLoss5": "Perte de SAN de 5+ ({value}) : vous souffrez d'une folie temporaire (Fuite, Soumission, Lutte ou compréhension de l'Inconcevable).",
      "sanViolenceReset": "Le décompte des pertes de SAN de violence a été réinitialisé.",
      "sanHelplessnessReset": "Le décompte des pertes de SAN d'impuissance a été réinitialisé.",
-      "sanLoss": "Perte de SAN",
+      "sanLoss": "Vous venez de perdre des points de SAN",
      "noSanLoss": "Aucune perte de SAN",
      "sanLossInfo": "Sélectionnez la perte de SAN à l'aide des boutons ci-dessous.",
-      "selectSANType": "Sélectionnez le type de perte de SAN à l'aide des boutons ci-dessous.",
+      "selectSANType": "Sélectionnez maintenant le type SAN perdue à l'aide des boutons ci-dessous.",
      "sanLossViolence": "Vous avez subi une perte de SAN due à la violence : le chemin de progression de la violence a évolué.",
      "sanLossHelplessness": "Vous avez subi une perte de SAN due à l'impuissance : le chemin de progression de l'impuissance a évolué.",
+      "SANLossUnnatural": "Vous avez subi une perte de SAN due à l'inconcevable : vous pouvez peut-être faire progresser la compétence Inconcevable, vérifiez avec le MJ.",
+      "SANLossNone": "Vous avez subi une perte de SAN, mais aucune conséquence spéciale n'est appliquée.",
      "adaptedToViolence": "Vous êtes maintenant : Habitué à la violence",
      "adaptedToViolenceShort": "Habitué à la violence",
      "adaptedToHelplessness": "Vous êtes maintenant : Habitué à l'impuissance",
      "adaptedToHelplessnessShort": "Habitué à l'impuissance",
-      "SANTest": "Vous venez de faire un jet de SAN : selectionnez la perte de SAN à l'aide des boutons ci-dessous.",
+      "SANTestSuccess": "Vous venez de réussir votre jet de SAN, mais vous pouvez toujours perdre des points de SAN. Sélectionnez la valeur à l'aide des boutons ci-dessous.",
+      "SANTestFailure": "Vous venez d'échouer votre test de SAN, vous perdez des points de SAN. Sélectionnez la valeur à l'aide des boutons ci-dessous.",
      "breakingPointReached": "Vous avez atteint votre Point de Rupture (PR) : vous souffrez d'un trouble mental. Vous devez re-initialiser votre PR à l'aide du bouton disponible dans la section SAN de la fiche de PJ.",
      "Violence"  : "Violence",
      "Helplessness": "Impuissance",
@@ -627,6 +678,11 @@
      "biography": "Biographie",
      "notes": "Notes",
      "weapons": "Armes",
+      "melee": "Mêlée",
+      "Lethality": "Létalité",
+      "baseRange": "Portée de base",
+      "Ammo": "Munitions",
+      "armorPiercing": "Pénétration d'armure",
      "HP": "PV",
      "SAN": "SAN",
      "current": "Actuel",
@@ -692,7 +748,16 @@
      "killRadiusInfo": "Si la cible est dans le rayon de mortalité, elle subit les dommages.",
      "ammoUsed": "Munitions utilisées",
      "lethalityLethal": "Létal !!",
-      "lethalityNotLethal": "Non létal"
+      "lethalityNotLethal": "Non létal",
+      "WPSpent": "PVO dépensés",
+      "targetMove": "Mouvement de la cible",
+      "attackerState": "Etat de l'attaquant",
+      "targetSize": "Taille de la cible",
+      "visibility": "Visibilité",
+      "rangedRange": "Portée",
+      "aimingLastRound": "Visée lors du dernier round (+20)",
+      "aimingWithSight": "Visée avec lunette (+20)",
+      "applyWounds": "Appliquer à"
    },
    "ChatMessage": {
      "exhausted": "Votre protagoniste est épuisé. Il perd [[/r 1d6]] Points de Volonté."
@@ -713,11 +778,16 @@
    "Tooltip": {
      "sanBP": "Perte de 5+ SAN en 1 jet : folie temporaire. SI la SAN atteint le PR : trouble mental, perte de conscience et reset du PR.",
      "setBP": "Positionner le Point de Rupture à la valeur courant de la SAN",
-      "addBond": "Ajouter une Attache"
+      "addBond": "Ajouter une Attache",
+      "rollDamage": "Lancer les dégâts"
    },
    "Chat": {
+      "armorAbsorbed": "L'armure a absorbé {armor} points de dégâts.",
+      "noArmor": "Pas d'armure.",
+      "woundsApplied": "Blessures appliquées à {name} : {effectiveWounds} (armure absorbée : {armorText})"
    },
    "Notifications": {
+      "AttackNoTarget": "Aucune cible n'a été sélectionnée pour cette attaque, veuillez sélectionner une cible pour bénéficier des automatisations.",
      "NoWeaponSkill": "Aucune compétence associée n'a été trouvé pour cette arme. Vérifier la définition de l'arme ainsi que l'époque configurée.",
      "NoWeaponType": "Aucun type d'arme trouvé pour ce sous-type. Vérifier la définition de l'arme ainsi que l'époque configurée.",
      "skillAlreadyExists": "La compétence existe déja",
--- a/macro_roll.js
+++ b/macro_roll.js
@@ -0,0 +1,19 @@
+let nb = 10000
+let sum = 0
+let results = []
+for (let i = 0; i < nb; i++) {
+  let r = new Roll("1d100")
+  await r.evaluate()
+  sum += r.total
+  results.push(r.total)
+}
+
+let mean = sum / nb
+let variance = results.reduce((acc, val) => acc + Math.pow(val - mean, 2), 0) / nb
+let stddev = Math.sqrt(variance)
+
+console.log("Average : ", mean)
+console.log("Standard deviation : ", stddev)
+console.log("Coefficient of variation : ", stddev / mean  )
+console.log("Min : ", Math.min(...results))
+console.log("Max : ", Math.max(...results))
--- a/module/applications/sheets/protagonist-sheet.mjs
+++ b/module/applications/sheets/protagonist-sheet.mjs
@@ -98,10 +98,20 @@ export default class CthulhuEternalProtagonistSheet extends CthulhuEternalActorS
    switch (partId) {
      case "main":
        break
-      case "skills":
+      case "skills": {
        context.tab = context.tabs.skills
-        context.skills = doc.itemTypes.skill
-        context.skills.sort((a, b) => a.name.localeCompare(b.name))
+        let tmpSkills = doc.itemTypes.skill
+        tmpSkills.sort((a, b) => a.name.localeCompare(b.name))
+        const nbCols = 3;
+        const nbRows = Math.ceil(tmpSkills.length / nbCols);
+        let skillsColumns = Array.from({ length: nbRows }, (_, rowIdx) =>
+          Array.from({ length: nbCols }, (_, colIdx) => tmpSkills[rowIdx + colIdx * nbRows]).filter(Boolean)
+        );
+        // Merge skillsColumns in a single flat array
+        skillsColumns = skillsColumns.flat().filter(Boolean);
+        //DEBUG : console.log("Skills columns:", skillsColumns);
+        context.skills = skillsColumns
+      }
        break
      case "equipment":
        context.tab = context.tabs.equipment
@@ -225,6 +235,7 @@ export default class CthulhuEternalProtagonistSheet extends CthulhuEternalActorS
      case "damage":
        li = $(event.currentTarget).parents(".item");
        item = this.actor.items.get(li.data("item-id"));
+        item.damageFormula = $(event.currentTarget).data("roll-value") || item.system.damage
        item.damageBonus = this.actor.system.damageBonus
        break
      case "san":
--- a/module/config/system.mjs
+++ b/module/config/system.mjs
@@ -77,6 +77,96 @@ export const RESOURCE_RATING = {
    19: {name: "Very Rich", description: "CTHULHUETERNAL.Resource.VeryRich", income: 500000, assets: "CTHULHUETERNAL.Resource.VeryRichModern"},
    20: {name: "Super Rich", description: "CTHULHUETERNAL.Resource.SuperRich", income: 1000000, assets: "CTHULHUETERNAL.Resource.SuperRichModern"}
  },
+  future: {
+    0: {name: "Penury", description: "CTHULHUETERNAL.Resource.Penury", income: 0, assets: "CTHULHUETERNAL.Resource.NoAssets"},
+    4: {name: "Poor", description: "CTHULHUETERNAL.Resource.Poor", income: 20000, assets: "CTHULHUETERNAL.Resource.PoorModern"},
+    8: {name: "Average", description: "CTHULHUETERNAL.Resource.Average", income: 50000, assets: "CTHULHUETERNAL.Resource.AverageModern"},
+    12: {name: "Above Average", description: "CTHULHUETERNAL.Resource.AboveAverage", income: 100000, assets: "CTHULHUETERNAL.Resource.AboveAverageModern"},
+    16: {name: "Well Off", description: "CTHULHUETERNAL.Resource.WellOff", income: 150000, assets: "CTHULHUETERNAL.Resource.WellOffModern"},
+    18: {name: "Rich", description: "CTHULHUETERNAL.Resource.Rich", income: 20000, assets: "CTHULHUETERNAL.Resource.RichModern"},
+    19: {name: "Very Rich", description: "CTHULHUETERNAL.Resource.VeryRich", income: 500000, assets: "CTHULHUETERNAL.Resource.VeryRichModern"},
+    20: {name: "Super Rich", description: "CTHULHUETERNAL.Resource.SuperRich", income: 1000000, assets: "CTHULHUETERNAL.Resource.SuperRichModern"}
+  },
+  coldwar: {
+    0: {name: "Penury", description: "CTHULHUETERNAL.Resource.Penury", income: 0, assets: "CTHULHUETERNAL.Resource.NoAssets"},
+    4: {name: "Poor", description: "CTHULHUETERNAL.Resource.Poor", income: 20000, assets: "CTHULHUETERNAL.Resource.PoorColdWar"},
+    8: {name: "Average", description: "CTHULHUETERNAL.Resource.Average", income: 50000, assets: "CTHULHUETERNAL.Resource.AverageColdWar"},
+    12: {name: "Above Average", description: "CTHULHUETERNAL.Resource.AboveAverage", income: 100000, assets: "CTHULHUETERNAL.Resource.AboveAverageColdWar"},
+    16: {name: "Well Off", description: "CTHULHUETERNAL.Resource.WellOff", income: 150000, assets: "CTHULHUETERNAL.Resource.WellOffColdWar"},
+    18: {name: "Rich", description: "CTHULHUETERNAL.Resource.Rich", income: 200000, assets: "CTHULHUETERNAL.Resource.RichColdWar"},
+    19: {name: "Very Rich", description: "CTHULHUETERNAL.Resource.VeryRich", income: 500000, assets: "CTHULHUETERNAL.Resource.VeryRichColdWar"},
+    20: {name: "Super Rich", description: "CTHULHUETERNAL.Resource.SuperRich", income: 1000000, assets: "CTHULHUETERNAL.Resource.SuperRichColdWar"}
+  },
+  ww1: {
+    0: {name: "Penury", description: "CTHULHUETERNAL.Resource.Penury", income: 0, assets: "CTHULHUETERNAL.Resource.NoAssets"},
+    4: {name: "Poor", description: "CTHULHUETERNAL.Resource.Poor", income: 20000, assets: "CTHULHUETERNAL.Resource.PoorColdWar"},
+    8: {name: "Average", description: "CTHULHUETERNAL.Resource.Average", income: 50000, assets: "CTHULHUETERNAL.Resource.AverageColdWar"},
+    12: {name: "Above Average", description: "CTHULHUETERNAL.Resource.AboveAverage", income: 100000, assets: "CTHULHUETERNAL.Resource.AboveAverageColdWar"},
+    16: {name: "Well Off", description: "CTHULHUETERNAL.Resource.WellOff", income: 150000, assets: "CTHULHUETERNAL.Resource.WellOffColdWar"},
+    18: {name: "Rich", description: "CTHULHUETERNAL.Resource.Rich", income: 200000, assets: "CTHULHUETERNAL.Resource.RichColdWar"},
+    19: {name: "Very Rich", description: "CTHULHUETERNAL.Resource.VeryRich", income: 500000, assets: "CTHULHUETERNAL.Resource.VeryRichColdWar"},
+    20: {name: "Super Rich", description: "CTHULHUETERNAL.Resource.SuperRich", income: 1000000, assets: "CTHULHUETERNAL.Resource.SuperRichColdWar"}
+  },
+  ww2: {
+    0: {name: "Penury", description: "CTHULHUETERNAL.Resource.Penury", income: 0, assets: "CTHULHUETERNAL.Resource.NoAssets"},
+    4: {name: "Poor", description: "CTHULHUETERNAL.Resource.Poor", income: 20000, assets: "CTHULHUETERNAL.Resource.PoorColdWar"},
+    8: {name: "Average", description: "CTHULHUETERNAL.Resource.Average", income: 50000, assets: "CTHULHUETERNAL.Resource.AverageColdWar"},
+    12: {name: "Above Average", description: "CTHULHUETERNAL.Resource.AboveAverage", income: 100000, assets: "CTHULHUETERNAL.Resource.AboveAverageColdWar"},
+    16: {name: "Well Off", description: "CTHULHUETERNAL.Resource.WellOff", income: 150000, assets: "CTHULHUETERNAL.Resource.WellOffColdWar"},
+    18: {name: "Rich", description: "CTHULHUETERNAL.Resource.Rich", income: 200000, assets: "CTHULHUETERNAL.Resource.RichColdWar"},
+    19: {name: "Very Rich", description: "CTHULHUETERNAL.Resource.VeryRich", income: 500000, assets: "CTHULHUETERNAL.Resource.VeryRichColdWar"},
+    20: {name: "Super Rich", description: "CTHULHUETERNAL.Resource.SuperRich", income: 1000000, assets: "CTHULHUETERNAL.Resource.SuperRichColdWar"}
+  },
+  medieval: {
+    0: {name: "Penury", description: "CTHULHUETERNAL.Resource.Penury", income: 0, assets: "CTHULHUETERNAL.Resource.NoAssets"},
+    4: {name: "Poor", description: "CTHULHUETERNAL.Resource.Poor", income: 20000, assets: "CTHULHUETERNAL.Resource.PoorColdWar"},
+    8: {name: "Average", description: "CTHULHUETERNAL.Resource.Average", income: 50000, assets: "CTHULHUETERNAL.Resource.AverageColdWar"},
+    12: {name: "Above Average", description: "CTHULHUETERNAL.Resource.AboveAverage", income: 100000, assets: "CTHULHUETERNAL.Resource.AboveAverageColdWar"},
+    16: {name: "Well Off", description: "CTHULHUETERNAL.Resource.WellOff", income: 150000, assets: "CTHULHUETERNAL.Resource.WellOffColdWar"},
+    18: {name: "Rich", description: "CTHULHUETERNAL.Resource.Rich", income: 200000, assets: "CTHULHUETERNAL.Resource.RichColdWar"},
+    19: {name: "Very Rich", description: "CTHULHUETERNAL.Resource.VeryRich", income: 500000, assets: "CTHULHUETERNAL.Resource.VeryRichColdWar"},
+    20: {name: "Super Rich", description: "CTHULHUETERNAL.Resource.SuperRich", income: 1000000, assets: "CTHULHUETERNAL.Resource.SuperRichColdWar"}
+  },
+  revolution: {
+    0: {name: "Penury", description: "CTHULHUETERNAL.Resource.Penury", income: 0, assets: "CTHULHUETERNAL.Resource.NoAssets"},
+    4: {name: "Poor", description: "CTHULHUETERNAL.Resource.Poor", income: 20000, assets: "CTHULHUETERNAL.Resource.PoorColdWar"},
+    8: {name: "Average", description: "CTHULHUETERNAL.Resource.Average", income: 50000, assets: "CTHULHUETERNAL.Resource.AverageColdWar"},
+    12: {name: "Above Average", description: "CTHULHUETERNAL.Resource.AboveAverage", income: 100000, assets: "CTHULHUETERNAL.Resource.AboveAverageColdWar"},
+    16: {name: "Well Off", description: "CTHULHUETERNAL.Resource.WellOff", income: 150000, assets: "CTHULHUETERNAL.Resource.WellOffColdWar"},
+    18: {name: "Rich", description: "CTHULHUETERNAL.Resource.Rich", income: 200000, assets: "CTHULHUETERNAL.Resource.RichColdWar"},
+    19: {name: "Very Rich", description: "CTHULHUETERNAL.Resource.VeryRich", income: 500000, assets: "CTHULHUETERNAL.Resource.VeryRichColdWar"},
+    20: {name: "Super Rich", description: "CTHULHUETERNAL.Resource.SuperRich", income: 1000000, assets: "CTHULHUETERNAL.Resource.SuperRichColdWar"}
+  },
+  ageofsail: {
+    0: {name: "Penury", description: "CTHULHUETERNAL.Resource.Penury", income: 0, assets: "CTHULHUETERNAL.Resource.NoAssets"},
+    4: {name: "Poor", description: "CTHULHUETERNAL.Resource.Poor", income: 20000, assets: "CTHULHUETERNAL.Resource.PoorColdWar"},
+    8: {name: "Average", description: "CTHULHUETERNAL.Resource.Average", income: 50000, assets: "CTHULHUETERNAL.Resource.AverageColdWar"},
+    12: {name: "Above Average", description: "CTHULHUETERNAL.Resource.AboveAverage", income: 100000, assets: "CTHULHUETERNAL.Resource.AboveAverageColdWar"},
+    16: {name: "Well Off", description: "CTHULHUETERNAL.Resource.WellOff", income: 150000, assets: "CTHULHUETERNAL.Resource.WellOffColdWar"},
+    18: {name: "Rich", description: "CTHULHUETERNAL.Resource.Rich", income: 200000, assets: "CTHULHUETERNAL.Resource.RichColdWar"},
+    19: {name: "Very Rich", description: "CTHULHUETERNAL.Resource.VeryRich", income: 500000, assets: "CTHULHUETERNAL.Resource.VeryRichColdWar"},
+    20: {name: "Super Rich", description: "CTHULHUETERNAL.Resource.SuperRich", income: 1000000, assets: "CTHULHUETERNAL.Resource.SuperRichColdWar"}
+  },
+  classical: {
+    0: {name: "Penury", description: "CTHULHUETERNAL.Resource.Penury", income: 0, assets: "CTHULHUETERNAL.Resource.NoAssets"},
+    4: {name: "Poor", description: "CTHULHUETERNAL.Resource.Poor", income: 20000, assets: "CTHULHUETERNAL.Resource.PoorColdWar"},
+    8: {name: "Average", description: "CTHULHUETERNAL.Resource.Average", income: 50000, assets: "CTHULHUETERNAL.Resource.AverageColdWar"},
+    12: {name: "Above Average", description: "CTHULHUETERNAL.Resource.AboveAverage", income: 100000, assets: "CTHULHUETERNAL.Resource.AboveAverageColdWar"},
+    16: {name: "Well Off", description: "CTHULHUETERNAL.Resource.WellOff", income: 150000, assets: "CTHULHUETERNAL.Resource.WellOffColdWar"},
+    18: {name: "Rich", description: "CTHULHUETERNAL.Resource.Rich", income: 200000, assets: "CTHULHUETERNAL.Resource.RichColdWar"},
+    19: {name: "Very Rich", description: "CTHULHUETERNAL.Resource.VeryRich", income: 500000, assets: "CTHULHUETERNAL.Resource.VeryRichColdWar"},
+    20: {name: "Super Rich", description: "CTHULHUETERNAL.Resource.SuperRich", income: 1000000, assets: "CTHULHUETERNAL.Resource.SuperRichColdWar"}
+  },
+  postapo: {
+    0: {name: "Penury", description: "CTHULHUETERNAL.Resource.Penury", income: 0, assets: "CTHULHUETERNAL.Resource.NoAssets"},
+    4: {name: "Poor", description: "CTHULHUETERNAL.Resource.Poor", income: 20000, assets: "CTHULHUETERNAL.Resource.PoorColdWar"},
+    8: {name: "Average", description: "CTHULHUETERNAL.Resource.Average", income: 50000, assets: "CTHULHUETERNAL.Resource.AverageColdWar"},
+    12: {name: "Above Average", description: "CTHULHUETERNAL.Resource.AboveAverage", income: 100000, assets: "CTHULHUETERNAL.Resource.AboveAverageColdWar"},
+    16: {name: "Well Off", description: "CTHULHUETERNAL.Resource.WellOff", income: 150000, assets: "CTHULHUETERNAL.Resource.WellOffColdWar"},
+    18: {name: "Rich", description: "CTHULHUETERNAL.Resource.Rich", income: 200000, assets: "CTHULHUETERNAL.Resource.RichColdWar"},
+    19: {name: "Very Rich", description: "CTHULHUETERNAL.Resource.VeryRich", income: 500000, assets: "CTHULHUETERNAL.Resource.VeryRichColdWar"},
+    20: {name: "Super Rich", description: "CTHULHUETERNAL.Resource.SuperRich", income: 1000000, assets: "CTHULHUETERNAL.Resource.SuperRichColdWar"}
+  },
  victorian: {
    0: {name: "Penury", description: "CTHULHUETERNAL.Resource.Penury", income: 0, assets: "CTHULHUETERNAL.Resource.NoAssets"},
    4: {name: "Poor", description: "CTHULHUETERNAL.Resource.Poor", income: 30, assets: "CTHULHUETERNAL.Resource.PoorVictorian"},
@@ -154,7 +244,8 @@ export const WEAPON_SKILL_MAPPING = {
    "rangedprimitive": "CTHULHUETERNAL.Skill.Firearms",
    "rangedthrown": "CTHULHUETERNAL.Skill.Athletics",
    "rangedfirearm": "CTHULHUETERNAL.Skill.Firearms",
-    "unarmed": "CTHULHUETERNAL.Skill.UnarmedCombat"
+    "unarmed": "CTHULHUETERNAL.Skill.UnarmedCombat",
+    "rangedexplosive": "CTHULHUETERNAL.Skill.MilitaryTrainingExplosive"
  },
  victorian: {
    "melee": "CTHULHUETERNAL.Skill.Melee",
@@ -245,6 +336,45 @@ export const WEAPON_SELECTIVE_FIRE_CHOICES = {
  "longspray": { id: "longspray", label: "CTHULHUETERNAL.Weapon.SelectiveFire.longspray", ammoUsed: 20, lethality: 10, killRadius: 3},
 }

+// Melee stuff
+export const WEAPON_MELEE_TARGET_MOVE = {
+  "normal": { id: "normal", label: "CTHULHUETERNAL.Weapon.Target.Normal", modifier: 0 },
+  "stationary": { id: "stationary", label: "CTHULHUETERNAL.Weapon.Target.Stationary", modifier: 20 },
+  "movingfast": { id: "movingfast", label: "CTHULHUETERNAL.Weapon.Target.MovingFast", modifier: -20 },
+  "movingveryfast": { id: "movingveryfast", label: "CTHULHUETERNAL.Weapon.Target.MovingVeryFast", modifier: -40 },
+}
+// Ranged stuff
+export const WEAPON_RANGED_RANGE = {
+  "pointblank": { id: "pointblank", label: "CTHULHUETERNAL.Weapon.Range.PointBlank", modifier: +20 },
+  "normal": { id: "normal", label: "CTHULHUETERNAL.Weapon.Range.Normal", modifier: 0 },
+  "range2x": { id: "range2x", label: "CTHULHUETERNAL.Weapon.Range.Range2x", modifier: -20 },
+  "range5x": { id: "range5x", label: "CTHULHUETERNAL.Weapon.Range.Range5x", modifier: -40 }
+}
+export const WEAPON_RANGED_TARGET_MOVE = {
+  "normal": { id: "normal", label: "CTHULHUETERNAL.Weapon.Target.Normal", modifier: 0 },
+  "stationary": { id: "stationary", label: "CTHULHUETERNAL.Weapon.Target.Stationary", modifier: 20 },
+  "movingfast": { id: "movingfast", label: "CTHULHUETERNAL.Weapon.Target.MovingRange", modifier: -20 },
+  "movingveryfast": { id: "movingveryfast", label: "CTHULHUETERNAL.Weapon.Target.MovingVeryFast", modifier: -40 },
+}
+
+// Common stuff
+export const WEAPON_ATTACKER_STATE = {
+  "normal": { id: "normal", label: "CTHULHUETERNAL.Weapon.Target.Normal", modifier: 0 },
+  "irritated": { id: "irritated", label: "CTHULHUETERNAL.Weapon.Attacker.Irritated", modifier: -20 },
+  "corrosive": { id: "corrosive", label: "CTHULHUETERNAL.Weapon.Attacker.Corrosive", modifier: -40 },
+}
+export const WEAPON_TARGET_SIZE = {
+  "normal": { id: "normal", label: "CTHULHUETERNAL.Weapon.Target.Normal", modifier: 0 },
+  "halfcovered": { id: "halfcovered", label: "CTHULHUETERNAL.Weapon.Target.HalfCovered", modifier: -20 },
+  "covered": { id: "covered", label: "CTHULHUETERNAL.Weapon.Target.Covered", modifier: -40 },
+}
+export const WEAPON_VISIBILITY = {
+  "clear": { id: "clear", label: "CTHULHUETERNAL.Weapon.Visibility.Clear", modifier: 0 },
+  "obscured": { id: "obscured", label: "CTHULHUETERNAL.Weapon.Visibility.Obscured", modifier: -20 },
+  "darkness": { id: "darkness", label: "CTHULHUETERNAL.Weapon.Visibility.Darkness", modifier: -40 },
+}
+
+
 export const RITUAL_TYPES = {
  "simple": "CTHULHUETERNAL.Ritual.Simple",
  "difficult": "CTHULHUETERNAL.Ritual.Difficult",
@@ -277,5 +407,11 @@ export const SYSTEM = {
  MULTIPLIER_CHOICES,
  ASCII,
  DAMAGE_BONUS,
-  RITUAL_TYPES
+  RITUAL_TYPES,
+  WEAPON_MELEE_TARGET_MOVE,
+  WEAPON_RANGED_RANGE,
+  WEAPON_RANGED_TARGET_MOVE,
+  WEAPON_ATTACKER_STATE,
+  WEAPON_TARGET_SIZE,
+  WEAPON_VISIBILITY
 }
--- a/module/config/weapon.mjs
+++ b/module/config/weapon.mjs
@@ -3,7 +3,8 @@ export const WEAPON_TYPE = {
  "rangedprimitive": "CTHULHUETERNAL.Weapon.WeaponType.rangedprimitive",
  "rangedthrown": "CTHULHUETERNAL.Weapon.WeaponType.rangedthrown",
  "rangedfirearm": "CTHULHUETERNAL.Weapon.WeaponType.rangedfirearm",
-  "unarmed": "CTHULHUETERNAL.Weapon.WeaponType.unarmed"
+  "unarmed": "CTHULHUETERNAL.Weapon.WeaponType.unarmed",
+  "rangedexplosive": "CTHULHUETERNAL.Weapon.WeaponType.rangedexplosive",
 }

 export const WEAPON_SUBTYPE = {
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -23,8 +23,10 @@ export default class CthulhuEternalActor extends Actor {
          data.items.push(skill.toObject())
        }
      }
-      data.items.push({ type:"weapon", img: "systems/fvtt-cthulhu-eternal/assets/icons/icon_fist.svg",
-        name: game.i18n.localize("CTHULHUETERNAL.Label.Unarmed"), system: { damage: "1d4-1", weaponType: "unarmed" } })
+      data.items.push({
+        type: "weapon", img: "systems/fvtt-cthulhu-eternal/assets/icons/icon_fist.svg",
+        name: game.i18n.localize("CTHULHUETERNAL.Label.Unarmed"), system: { damage: "1d4-1", weaponType: "unarmed", applyDamageBonus: true }
+      })
    }

    return super.create(data, options);
@@ -43,6 +45,43 @@ export default class CthulhuEternalActor extends Actor {
    return super._onUpdate(changed, options, userId)
  }

+  setLastDefenseRoll(rollData) {
+    this.setFlag("fvtt-cthulhu-eternal", "last-defense-roll", rollData)
+  }
+
+  getLastDefenseRoll() {
+    return this.getFlag("fvtt-cthulhu-eternal", "last-defense-roll")
+  }
+
+  applyWounds(woundData) {
+    // Get available armor
+    let armors = this.items.filter(i => i.type === "armor" && i.system.equipped)
+    let totalArmor = 0
+    for (let armor of armors) {
+      totalArmor += armor.system.protection
+    }
+    let effectiveWounds = Math.max(woundData.rollResult - totalArmor, 0)
+    if (woundData.isLethal) {
+      effectiveWounds = this.system.hp.value // Killed!
+    }
+    // Apply armor reduction
+    let hp = Math.max(this.system.hp.value - effectiveWounds, 0)
+    if (this.system.hp.value !== hp) {
+      this.update({ "system.hp.value": hp })
+    }
+    // Chat message for GM only
+    if (game.user.isGM) {
+      let armorText = totalArmor > 0 ? game.i18n.format("CTHULHUETERNAL.Chat.armorAbsorbed", { armor: totalArmor }) : game.i18n.localize("CTHULHUETERNAL.Chat.noArmor")
+      ChatMessage.create({
+        user: game.user.id,
+        speaker: { alias: this.name },
+        rollMode: "gmroll",
+        content: game.i18n.format("CTHULHUETERNAL.Chat.woundsApplied", { name: this.name, effectiveWounds, armorText }),
+      })
+    }
+  }
+
+
  async createEmbeddedDocuments(embeddedName, data, operation) {
    let newData = []
    if (embeddedName === "Item") {
@@ -71,18 +110,18 @@ export default class CthulhuEternalActor extends Actor {
  }

  async _preCreate(data, options, user) {
-  await super._preCreate(data, options, user)
+    await super._preCreate(data, options, user)

-  // Configure prototype token settings
-  const prototypeToken = {}
-  if (this.type === "protagonist") {
-    Object.assign(prototypeToken, {
-      sight: { enabled: true },
-      actorLink: true,
-      disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY,
-    })
-    this.updateSource({ prototypeToken })
+    // Configure prototype token settings
+    const prototypeToken = {}
+    if (this.type === "protagonist") {
+      Object.assign(prototypeToken, {
+        sight: { enabled: true },
+        actorLink: true,
+        disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY,
+      })
+      this.updateSource({ prototypeToken })
+    }
  }
-}

 }
--- a/module/documents/roll.mjs
+++ b/module/documents/roll.mjs
@@ -1,5 +1,6 @@

 import { SYSTEM } from "../config/system.mjs"
+import CthulhuEternalUtils from "../utils.mjs"

 export default class CthulhuEternalRoll extends Roll {
  /**
@@ -106,7 +107,7 @@ export default class CthulhuEternalRoll extends Roll {
  }

  static buildSelectiveFireChoices(actor, weapon) {
-    if (!weapon || !weapon?.system?.hasSelectiveFire) {
+    if (!weapon?.system?.hasSelectiveFire) {
      return {}
    }
    // Loop thru the selective fire choices and build the choices object when enough ammo in the weapon
@@ -128,20 +129,23 @@ export default class CthulhuEternalRoll extends Roll {
  static async processWeaponDamage(actor, options) {
    let isLethal = false
    let weapon = options.rollItem
-    let ammoUsed = weapon.system.weaponType.includes("ranged") ? 1 : 0 // Default ammo used for melee weapons is 0
    options.isNudge = false

    // Selective fire management
    if (weapon.system.hasSelectiveFire && weapon.selectiveFireChoice) {
      let choice = SYSTEM.WEAPON_SELECTIVE_FIRE_CHOICES[weapon.selectiveFireChoice]
-      if (choice.ammoUsed > weapon.system.ammo.value) {
-        ui.notifications.warn(game.i18n.localize("CTHULHUETERNAL.Notifications.NoAmmo"))
-        return
-      }
      weapon.system.selectiveFireChoiceLabel = choice.label // Store the choice in the weapon
      weapon.system.lethality = choice.lethality // Override lethality
      weapon.system.killRadius = choice.killRadius // Override kill radius
-      ammoUsed = choice.ammoUsed // Override ammo used
+    }
+
+    let combatants = []
+    if (game?.combat?.combatants) {
+      for (let c of game.combat.combatants) {
+        if (c.actor.id !== actor.id) {
+          combatants.push({ id: c.id, name: c.name })
+        }
+      }
    }

    if (weapon.system.lethality > 0) {
@@ -149,60 +153,87 @@ export default class CthulhuEternalRoll extends Roll {
      await lethalityRoll.evaluate()
      let lethalScore = (options?.previousResultType === "successCritical") ? weapon.system.lethality * 2 : weapon.system.lethality
      isLethal = (lethalityRoll.total <= lethalScore)
-      if (ammoUsed > 0) {
-        await actor.updateEmbeddedDocuments("Item", [{
-          _id: weapon._id,
-          "system.ammo.value": Math.max(0, weapon.system.ammo.value - ammoUsed)
-        }])
-      }
      let wounds = Math.floor(lethalityRoll.total / 10) + (lethalityRoll.total % 10)
      let msgData = {
+        actorId: actor.id,
        weapon,
        wounds,
        lethalScore,
        isLethal,
-        ammoUsed,
+        ammoUsed: weapon?.ammoUsed || 0,
        rollResult: lethalityRoll.total,
+        combatants: combatants
      }
      let flavor = await foundry.applications.handlebars.renderTemplate("systems/fvtt-cthulhu-eternal/templates/chat-lethal-damage.hbs", msgData)
-      ChatMessage.create({
+      let msg = await ChatMessage.create({
        user: game.user.id,
        content: flavor,
        speaker: ChatMessage.getSpeaker({ actor: actor }),
      }, { rollMode: options.rollMode, create: true })
-
+      await msg.setFlag("fvtt-cthulhu-eternal", "woundData", msgData)
      return
    }

    // If the weapon is not lethal, we can proceed with the regular damage roll
-    let formula = weapon.system.damage
-    if (weapon.system.weaponType === "melee" || weapon.system.weaponType === "unarmed") {
+    let formula = weapon?.damageFormula || weapon.system.damage || "0"
+    if (weapon.system.applyDamageBonus) {
      formula += ` + ${actor.system?.damageBonus}`
    }
    if (options?.previousResultType === "successCritical") {
      formula = `( ${formula} ) * 2`
    }
+
+    let damageRoll = new Roll(formula)
+    await damageRoll.evaluate()
+    let msgData = {
+      actorId: actor.id,
+      weapon,
+      formula,
+      ammoUsed: weapon?.ammoUsed || 0,
+      rollResult: damageRoll.total,
+      combatants: combatants
+    }
+    let flavor = await foundry.applications.handlebars.renderTemplate("systems/fvtt-cthulhu-eternal/templates/chat-regular-damage.hbs", msgData)
+    let msg = await ChatMessage.create({
+      user: game.user.id,
+      content: flavor,
+      speaker: ChatMessage.getSpeaker({ actor: actor }),
+    }, { rollMode: options.rollMode, create: true })
+    await msg.setFlag("fvtt-cthulhu-eternal", "woundData", msgData)
+  }
+
+
+  static computeWeaponModifiers(rollData) {
+    let modifier = SYSTEM.WEAPON_MELEE_TARGET_MOVE[rollData.meleeTargetMoveChoice]?.modifier || 0
+    modifier += SYSTEM.WEAPON_RANGED_RANGE[rollData.rangedRangeChoice]?.modifier || 0
+    modifier += SYSTEM.WEAPON_RANGED_TARGET_MOVE[rollData.rangedTargetMoveChoice]?.modifier || 0
+    modifier += SYSTEM.WEAPON_VISIBILITY[rollData.visibilityChoice]?.modifier || 0
+    modifier += SYSTEM.WEAPON_ATTACKER_STATE[rollData.attackerStateChoice]?.modifier || 0
+    modifier += SYSTEM.WEAPON_TARGET_SIZE[rollData.targetSizeChoice]?.modifier || 0
+    modifier += (rollData.aimingLastRound) ? 20 : 0
+    modifier += (rollData.aimingWithSight) ? 20 : 0
+    return modifier
+  }
+
+  static async processAmmoUsed(actor, weapon) {
+    let ammoUsed = weapon.system.weaponType.includes("ranged") ? 1 : 0 // Default ammo used for melee weapons is 0
+    // Selective fire management
+    if (weapon.system.hasSelectiveFire && weapon.selectiveFireChoice) {
+      let choice = SYSTEM.WEAPON_SELECTIVE_FIRE_CHOICES[weapon.selectiveFireChoice]
+      if (choice.ammoUsed > weapon.system.ammo.value) {
+        ui.notifications.warn(game.i18n.localize("CTHULHUETERNAL.Notifications.NoAmmo"))
+        return
+      }
+      ammoUsed = choice.ammoUsed // Override ammo used
+    }
+    ammoUsed = Number(ammoUsed)
    if (ammoUsed > 0) {
      await actor.updateEmbeddedDocuments("Item", [{
        _id: weapon._id,
        "system.ammo.value": Math.max(0, weapon.system.ammo.value - ammoUsed)
      }])
    }
-    console.log("Weapon damage formula", formula, weapon, ammoUsed)
-    let damageRoll = new Roll(formula)
-    await damageRoll.evaluate()
-    let msgData = {
-        weapon,
-        formula,
-        ammoUsed,
-        rollResult: damageRoll.total,
-      }
-      let flavor = await foundry.applications.handlebars.renderTemplate("systems/fvtt-cthulhu-eternal/templates/chat-regular-damage.hbs", msgData)
-      ChatMessage.create({
-        user: game.user.id,
-        content: flavor,
-        speaker: ChatMessage.getSpeaker({ actor: actor }),
-      }, { rollMode: options.rollMode, create: true })
+    weapon.ammoUsed = ammoUsed
  }

  /**
@@ -226,9 +257,10 @@ export default class CthulhuEternalRoll extends Roll {
    options.isNudge = true
    let actor = game.actors.get(options.actorId)

+    let target = CthulhuEternalUtils.getTarget()
+
    switch (options.rollType) {
      case "skill":
-        console.log(options.rollItem)
        options.initialScore = options.rollItem.system.computeScore()
        break
      case "luck":
@@ -266,12 +298,16 @@ export default class CthulhuEternalRoll extends Roll {
          console.log("WP Not found", era, options.rollItem.system.weaponType)
          return
        }
+        if (!target) {
+          ui.notifications.warn(game.i18n.localize("CTHULHUETERNAL.Notifications.AttackNoTarget"))
+        }
        // Check if the weapon has enouth ammo in case of a firearm
        if (options.rollItem.system.isFireArm() && options.rollItem.system.ammo.value <= 0) {
          ui.notifications.warn(game.i18n.localize("CTHULHUETERNAL.Notifications.NoAmmo"))
          return
        }
        options.weapon = options.rollItem
+
        if (options.rollItem.system.hasDirectSkill) {
          let skillName = options.rollItem.name
          options.rollItem = { type: "skill", name: skillName, system: { base: 0, bonus: options.weapon.system.directSkillValue } }
@@ -311,6 +347,7 @@ export default class CthulhuEternalRoll extends Roll {
      rollType: options.rollType,
      rollItem: foundry.utils.duplicate(options.rollItem), // Object only, no class
      weapon: options?.weapon,
+      isRangedWeapon: options?.weapon?.system?.isRanged(),
      initialScore: options.initialScore,
      targetScore: options.initialScore,
      isLowWP: options.isLowWP,
@@ -324,12 +361,27 @@ export default class CthulhuEternalRoll extends Roll {
      choiceModifier,
      choiceMultiplier,
      choiceSelectiveFire,
+      choiceMeleeTargetMove: SYSTEM.WEAPON_MELEE_TARGET_MOVE,
+      choiceRangedRange: SYSTEM.WEAPON_RANGED_RANGE,
+      choiceRangedTargetMove: SYSTEM.WEAPON_RANGED_TARGET_MOVE,
+      choiceVisibility: SYSTEM.WEAPON_VISIBILITY,
+      choiceAttackerState: SYSTEM.WEAPON_ATTACKER_STATE,
+      choiceTargetSize: SYSTEM.WEAPON_TARGET_SIZE,
+      selectiveFireChoice: "shortburst",
+      meleeTargetMoveChoice: "normal",
+      rangedRangeChoice: "normal",
+      rangedTargetMoveChoice: "normal",
+      visibilityChoice: "clear",
+      attackerStateChoice: "normal",
+      targetSizeChoice: "normal",
+      aimingLastRound: false,
+      aimingWithSight: false,
+      modifier,
      formula,
+      targetName: target?.name,
      hasTarget: options.hasTarget,
      hasModifier,
      hasMultiplier,
-      modifier,
-      selectiveFireChoice: "shortburst",
      multiplier
    }
    const content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-cthulhu-eternal/templates/roll-dialog.hbs", dialogContext)
@@ -379,14 +431,20 @@ export default class CthulhuEternalRoll extends Roll {
    if (rollContext === null) return

    let rollData = foundry.utils.mergeObject(foundry.utils.duplicate(options), rollContext)
+    // If we have a target, get its data
+    rollData.targetId = target?.id
+    rollData.targetName = target?.name
    rollData.rollMode = rollContext.visibility

    // Update target score
-    console.log("Rolldata", rollData, options)
+    console.log("Rolldata", rollData)
+
    if (options.rollType === "resource") {
      rollData.targetScore = options.initialScore * Number(rollContext.multiplier)
    } else {
-      rollData.targetScore = Math.min(Math.max(options.initialScore + Number(rollData.modifier), 0), 100)
+      let totalModifier = this.computeWeaponModifiers(rollData) + Number(rollData.modifier)
+      rollData.totalModifier = Math.min(totalModifier, 40)
+      rollData.targetScore = Math.min(Math.max(options.initialScore + Number(rollData.totalModifier), 0), 100)
      if (rollData.isLowWP || rollData.isExhausted) {
        rollData.targetScore -= 20
      }
@@ -395,11 +453,15 @@ export default class CthulhuEternalRoll extends Roll {
      }
      rollData.targetScore = Math.min(Math.max(rollData.targetScore, 0), 100)
    }
-    if (!rollData.targetScore) {
+    if (rollData.targetScore === undefined || rollData.targetScore === null) {
      rollData.targetScore = options.initialScore
      rollData.modifier = "0"
    }

+    if (options.rollType === "weapon") {
+      await this.processAmmoUsed(actor, rollData.weapon)
+    }
+
    if (Hooks.call("fvtt-cthulhu-eternal.preRoll", options, rollData) === false) return

    const roll = new this(formula, options.data, rollData)
@@ -456,10 +518,68 @@ export default class CthulhuEternalRoll extends Roll {
      this.options.isCritical = resultType === "successCritical" || resultType === "failureCritical"
    }
    rollData.resultType = resultType
+
    this.options.isLowWP = rollData.isLowWP
    this.options.isZeroWP = rollData.isZeroWP
    this.options.isExhausted = rollData.isExhausted
+    rollData.isSuccess = this.options.isSuccess
+    rollData.isFailure = this.options.isFailure
+    rollData.isCritical = this.options.isCritical
+    rollData.resultType = resultType
    this.options.rollData = foundry.utils.duplicate(rollData)
+
+    // Keep track of the last defense roll for the actor
+    if (game.combat && (rollData?.weapon?.system.type === "melee" || (rollData?.rollItem.type === "skill" && rollData?.rollItem.name?.toLowerCase().includes(game.i18n.localize("CTHULHUETERNAL.Skill.dodgeName").toLowerCase())))) {
+      let actor = game.actors.get(options.actorId)
+      rollData.round = game.combat.round
+      actor.setLastDefenseRoll(foundry.utils.duplicate(rollData))
+    }
+
+    if (game.combat && rollData?.weapon) { // An attack roll
+      rollData.isAttackRoll = true
+    }
+
+    // Now check if we have a target for the current roll, and if the target has done its defense roll this round
+    if (rollData.targetId) {
+      let token = game.scenes.current.tokens.get(rollData.targetId)
+      let defender = token.actor
+      let lastDefenseRoll = defender?.getLastDefenseRoll()
+      // Now compare opposition
+      this.compareRolls(rollData, lastDefenseRoll)
+      rollData.defenseRoll = lastDefenseRoll
+    }
+
+  }
+
+  compareRolls(attackRoll, defenseRoll) {
+    if (!defenseRoll || defenseRoll.round !== game?.combat?.round) {
+      ui.notifications.info(game.i18n.localize("CTHULHUETERNAL.Notifications.NoDefenseRoll"))
+      return
+    }
+    if (attackRoll.isFailure) {
+      attackRoll.attackSucess = false
+    }
+    if (attackRoll.isSuccess && defenseRoll.isFailure) {
+      attackRoll.attackSucess = true
+    }
+    if (attackRoll.isSuccess && defenseRoll.isSuccess) {
+      if (attackRoll.isCritical && !defenseRoll.isCritical) {
+        attackRoll.attackSucess = true
+      }
+      else if (!attackRoll.isCritical && defenseRoll.isCritical) {
+        attackRoll.attackSucess = false
+      }
+      else {
+        // Both are normal success, compare the roll results
+        if (attackRoll.total >= defenseRoll.total) {
+          // Attack successful
+          attackRoll.attackSucess = true
+        } else {
+          // Defense successful
+          attackRoll.attackSucess = false
+        }
+      }
+    }
  }

  /**
@@ -601,12 +721,14 @@ export default class CthulhuEternalRoll extends Roll {
        rollItem: rollItem,
        rollData: rollData
      }
+      // Get array of gamemaster ID
      let msg = await foundry.applications.handlebars.renderTemplate("systems/fvtt-cthulhu-eternal/templates/chat-san-request.hbs", msgData)
      let chatMsg = await ChatMessage.create({
        user: game.user.id,
        content: msg,
-        speaker: ChatMessage.getSpeaker({ actor: rollData.actor })
-      }, { rollMode: rollData.rollMode, create: true })
+        speaker: ChatMessage.getSpeaker({ actor: rollData.actor }),
+        whisper: game.users.filter(u => u.isGM).map(u => u.id),
+      })
      await chatMsg.setFlag("fvtt-cthulhu-eternal", "rollData", rollData)
    }
  }
--- a/module/models/protagonist.mjs
+++ b/module/models/protagonist.mjs
@@ -90,6 +90,10 @@ export default class CthulhuEternalProtagonist extends foundry.abstract.TypeData
  prepareDerivedData() {
    super.prepareDerivedData();

+    if (!game.user.isGM) {
+      return
+    }
+
    let updates = {}
    if (this.wp.max !== this.characteristics.pow.value) {
      updates[`system.wp.max`] = this.characteristics.pow.value
@@ -123,8 +127,6 @@ export default class CthulhuEternalProtagonist extends foundry.abstract.TypeData
      dmgBonus = -2
    } else if (this.characteristics.str.value <= 8) {
      dmgBonus = -1
-    } else if (this.characteristics.str.value <= 12) {
-      dmgBonus = 0
    } else if (this.characteristics.str.value <= 16) {
      dmgBonus = 1
    } else if (this.characteristics.str.value <= 20) {
@@ -137,10 +139,16 @@ export default class CthulhuEternalProtagonist extends foundry.abstract.TypeData
    // BP (Breaking Point) management
    if (!this.san.breakingPointReached && this.san.value <= this.san.breakingPoint) {
      updates[`system.san.breakingPointReached`] = true
-      ChatMessage.create({
-        content: `<p>${game.i18n.format("CTHULHUETERNAL.Label.breakingPointReached", { bp: this.san.breakingPoint, san: this.san.value })}</p>`,
-        speaker: ChatMessage.getSpeaker({ actor: this.parent })
-      })
+      this.san.breakingPointReached = true // Force local update to true
+      let w = game.users.find(u => u.character?.name === this.parent?.name)
+      if (w) {
+        ChatMessage.create({
+          content: `<p>${game.i18n.format("CTHULHUETERNAL.Label.breakingPointReached", { bp: this.san.breakingPoint, san: this.san.value })}</p>`,
+          speaker: ChatMessage.getSpeaker({ actor: this.parent }),
+          // Get the user id of the actor owner
+          whisper: [w.id]
+        })
+      }
    }

    // Unconsciousness management
@@ -195,10 +203,6 @@ export default class CthulhuEternalProtagonist extends foundry.abstract.TypeData
  }

  async applySANConsequences(rollData) {
-    // If sanType is "non", do nothing
-    if (rollData.sanType === "none") {
-      return
-    }
    let msgData = {
      sanType: rollData.sanType,
      sanLoss: rollData.sanLoss,
@@ -206,7 +210,7 @@ export default class CthulhuEternalProtagonist extends foundry.abstract.TypeData
      actorName: this.parent.name,
      adaptedToHelplessness: this.biodata.adaptedToHelplessness,
      adaptedToViolence: this.biodata.adaptedToViolence,
-      ... rollData
+      ...rollData
    }
    let updates = {}
    let template = ""
@@ -223,7 +227,7 @@ export default class CthulhuEternalProtagonist extends foundry.abstract.TypeData
      }
      template = "systems/fvtt-cthulhu-eternal/templates/chat-san-temp-insanity.hbs"

-    } else  if (rollData.sanLoss === 0) {   // Manage if sanLoss is 0
+    } else if (rollData.sanLoss === 0) {   // Manage if sanLoss is 0
      rollData.resetMsg = false
      if (rollData.sanType === "violence" && !this.biodata.adaptedToViolence) {
        updates[`system.san.violence`] = [false, false, false]
@@ -235,7 +239,7 @@ export default class CthulhuEternalProtagonist extends foundry.abstract.TypeData
      }
      template = "systems/fvtt-cthulhu-eternal/templates/chat-san-loss-0.hbs"

-    } else if (rollData.sanType === "violence" ) {
+    } else if (rollData.sanType === "violence") {
      // Set the first false element of the violence array to true
      let violence = this.san.violence.slice()
      let index = violence.findIndex(v => !v)
@@ -250,7 +254,7 @@ export default class CthulhuEternalProtagonist extends foundry.abstract.TypeData
        updates[`system.san.violence`] = [false, false, false]
        msgData.adaptedToViolence = true
      }
-    } else if (rollData.sanType === "helplessness" ) {
+    } else if (rollData.sanType === "helplessness") {
      // If sanType is "helplessness" and adapted to helplessness, set the first false element of the helplessness array to true
      let helplessness = this.san.helplessness.slice()
      let index = helplessness.findIndex(h => !h)
@@ -265,14 +269,21 @@ export default class CthulhuEternalProtagonist extends foundry.abstract.TypeData
        updates[`system.san.helplessness`] = [false, false, false]
        msgData.adaptedToHelplessness = true
      }
+    } else if (rollData.sanType === "unnatural") {
+      template = "systems/fvtt-cthulhu-eternal/templates/chat-san-loss-unnatural.hbs"
+    } else {
+      template = "systems/fvtt-cthulhu-eternal/templates/chat-san-loss-none.hbs"
    }

+    console.log("CthulhuEternalProtagonist.applySANConsequences", rollData, updates, template)
    let content = await foundry.applications.handlebars.renderTemplate(template, msgData)
    let msg = await ChatMessage.create({
      content: content,
-      speaker: ChatMessage.getSpeaker({ actor: this.parent })
+      speaker: ChatMessage.getSpeaker({ actor: this.parent }),
+      whisper: game.users.filter(u => u.isGM).map(u => u.id),
    })
-    msg.setFlag("fvtt-cthulhu-eternal", "rollData", msgData)
+    await msg.setFlag("fvtt-cthulhu-eternal", "rollData", msgData)
+
    if (Object.keys(updates).length > 0) {
      this.parent.update(updates)
    }
@@ -284,12 +295,14 @@ export default class CthulhuEternalProtagonist extends foundry.abstract.TypeData
    let san = Math.max(Math.min(this.san.value + rollData.sanLoss, this.san.max), 0)
    if (this.san.value !== san) {
      updates[`system.san.value`] = san
+      rollData.sanValue = san
      const content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-cthulhu-eternal/templates/chat-san-type-request.hbs", rollData)
      let msg = await ChatMessage.create({
        content: content,
-        speaker: ChatMessage.getSpeaker({ actor: this.parent })
+        speaker: ChatMessage.getSpeaker({ actor: this.parent }),
+        whisper: game.users.filter(u => u.isGM).map(u => u.id)
      })
-      msg.setFlag("fvtt-cthulhu-eternal", "rollData", rollData)
+      await msg.setFlag("fvtt-cthulhu-eternal", "rollData", rollData)
    }
    if (Object.keys(updates).length > 0) {
      this.parent.update(updates)
@@ -344,15 +357,15 @@ export default class CthulhuEternalProtagonist extends foundry.abstract.TypeData
   */
  async roll(rollType, rollItem) {

-    if (this.hp.dead ) {
+    if (this.hp.dead) {
      // Warn with chat message
      ChatMessage.create({
-        content: `<p>${game.i18n.format("CTHULHUETERNAL.Label.deadWarning", {con: this.characteristics.con.value} )}</p>`,
+        content: `<p>${game.i18n.format("CTHULHUETERNAL.Label.deadWarning", { con: this.characteristics.con.value })}</p>`,
        speaker: ChatMessage.getSpeaker({ actor: this.parent })
      })
      return null
    }
-    if (this.hp.unconscious ) {
+    if (this.hp.unconscious) {
      // Warn with chat message
      ChatMessage.create({
        content: `<p>${game.i18n.localize("CTHULHUETERNAL.Label.unconsciousWarning")}</p>`,
--- a/module/models/weapon.mjs
+++ b/module/models/weapon.mjs
@@ -13,12 +13,23 @@ export default class CthulhuEternalWeapon extends foundry.abstract.TypeDataModel

    schema.weaponType = new fields.StringField({ required: true, initial: "melee", choices: SYSTEM.WEAPON_TYPE })
    schema.hasDirectSkill = new fields.BooleanField({ required: true, initial: false })
-    schema.directSkillValue = new fields.NumberField({ required: true, initial: 0, min: 0, max:99 })
+    schema.directSkillValue = new fields.NumberField({ required: true, initial: 0, min: 0, max: 99 })
+
+    schema.hasDamageDistance = new fields.BooleanField({ required: true, initial: false })
+    schema.damageDistance = new fields.SchemaField(Array.fromRange(6, 1).reduce((damageDistance, i) => {
+      damageDistance[`dist${i}`] = new fields.SchemaField({
+        damage: new fields.StringField({ required: true, initial: "1d6" }),
+        distance: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 })
+      })
+      return damageDistance
+    }, {}));

    schema.hasSelectiveFire = new fields.BooleanField({ required: true, initial: false })
-    schema.damage = new fields.StringField({required: true, initial: "1d6"})
+    schema.hasSight = new fields.BooleanField({ required: true, initial: false })
+    schema.isStunning = new fields.BooleanField({ required: true, initial: false })
+    schema.damage = new fields.StringField({ required: true, initial: "1d6" })
    schema.applyDamageBonus = new fields.BooleanField({ required: true, initial: false })
-    schema.baseRange = new fields.StringField({required: true, initial: ""})
+    schema.baseRange = new fields.StringField({ required: true, initial: "" })
    schema.rangeUnit = new fields.StringField({ required: true, initial: "yard", choices: SYSTEM.WEAPON_RANGE_UNIT })
    schema.lethality = new fields.NumberField({ required: true, initial: 0, min: 0 })
    schema.killRadius = new fields.NumberField({ required: true, initial: 0, min: 0 })
@@ -43,7 +54,8 @@ export default class CthulhuEternalWeapon extends foundry.abstract.TypeDataModel
  }

  isRanged() {
-    return this.weaponType.includes("ranged")
+    console.log("isRanged", this.weaponType, this)
+    return this.weaponType.match("ranged")
  }

  isFireArm() {
--- a/module/utils.mjs
+++ b/module/utils.mjs
@@ -196,11 +196,6 @@ export default class CthulhuEternalUtils {
      ui.notifications.error(game.i18n.localize("CTHULHUETERNAL.Notifications.noSanTypeFound"))
      return
    }
-    // If the sanType is "none", we don't apply any SAN processing
-    if (sanType === "none") {
-      ui.notifications.info(game.i18n.localize("CTHULHUETERNAL.Notifications.noSanLossApplied"))
-      return
-    }
    rollData.sanType = sanType
    await actor.system.applySANConsequences(rollData)
    // Delete the roll message
@@ -234,7 +229,7 @@ export default class CthulhuEternalUtils {
    let healingFormula = rollData.rollItem.system.healingFormula
    let healingMsg = "CTHULHUETERNAL.Label.healingRoll"
    if (rollData.resultType === "successCritical") {
-      healingFormula +=  " * 2"
+      healingFormula += " * 2"
    }
    if (rollData.resultType === "failureCritical") {
      healingMsg = "CTHULHUETERNAL.Label.healingRollFailure"
@@ -253,9 +248,39 @@ export default class CthulhuEternalUtils {
    })
  }

-  static async damageRoll(rollMessage) {
+  static translateRangeUnit(range) {
+    if (typeof range === 'string') {
+      return game.i18n.localize(`CTHULHUETERNAL.Label.${range}`)
+    } else if (typeof range === 'number') {
+      return range
+    } else {
+      console.warn("CTHULHU ETERNAL | translateRange called with an unknown type", range)
+      return range
+    }
+  }
+
+  static translateRange(range) {
+    // If the range is a string, replace STR with FOR
+    if (typeof range === 'string') {
+      return range.replace(/STR/g, "FOR").replace(/str/g, "for")
+    }
+    return range
+  }
+
+  static async registerBabeleTranslations(babele) {
+    babele.registerConverters({
+      'translateRangeUnit': (originalValue) => {
+        return CthulhuEternalUtils.translateRangeUnit(originalValue)
+      },
+      'translateRange': (originalValue) => {
+        return CthulhuEternalUtils.translateRange(originalValue)
+      }
+    })
+  }
+
+  static async damageRoll(rollMessage, formula = null) {
    let rollData = rollMessage.rolls[0]?.options?.rollData
-    let actor  = game.actors.get(rollData.actorId)
+    let actor = game.actors.get(rollData.actorId)
    if (!actor) {
      ui.notifications.error(game.i18n.localize("CTHULHUETERNAL.Label.noActorFound"))
      return
@@ -263,6 +288,7 @@ export default class CthulhuEternalUtils {
    console.log("Damage roll data", rollData)
    rollData.weapon.resultType = rollData.resultType // Keep the result type from the roll message
    rollData.weapon.selectiveFireChoice = rollData.selectiveFireChoice // Keep the selected fire choice from the roll message
+    rollData.weapon.damageFormula = formula || rollData.weapon.system.damage
    actor.system.roll("damage", rollData.weapon)
  }

@@ -310,8 +336,8 @@ export default class CthulhuEternalUtils {
      rejectClose: false, // Click on Close button will not launch an error
      render: (event, dialog) => {
        $(".nudged-score-select").change(event => {
-          dialogContext.nudgedValue = Number(event.target.value)+1
-          dialogContext.wpCost = Math.ceil(Math.abs(rollMessage.rolls[0].total  - dialogContext.nudgedValue) / 5)
+          dialogContext.nudgedValue = Number(event.target.value) + 1
+          dialogContext.wpCost = Math.ceil(Math.abs(rollMessage.rolls[0].total - dialogContext.nudgedValue) / 5)
          $("#nudged-wp-cost").val(dialogContext.wpCost)
        })
      }
@@ -349,4 +375,34 @@ export default class CthulhuEternalUtils {
    document.documentElement.style.setProperty('--background-image-base', `linear-gradient(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.8)), url("../assets/ui/${era}_background_main.webp")`);
  }

+  static getTarget() {
+    if (game.user.targets && game.user.targets.size === 1) {
+      for (let target of game.user.targets) {
+        return target
+      }
+    }
+    return undefined;
+  }
+
+  static applyWounds(message, event) {
+    let woundData = message.getFlag("fvtt-cthulhu-eternal", "woundData")
+    if (!woundData) {
+      ui.notifications.error(game.i18n.localize("CTHULHUETERNAL.Notifications.noRollDataFound"))
+      return
+    }
+    let actor = game.actors.get(woundData.actorId)
+    if (!actor) {
+      ui.notifications.error(game.i18n.localize("CTHULHUETERNAL.Notifications.noActorFound"))
+      return
+    }
+    // Get the targetted actorId from the HTML select event
+    let targetCombatantId = event.target.value
+    let combatant = game.combat.combatants.get(targetCombatantId)
+    let targetActor = combatant.token?.actor || game.actors.get(combatant.actorId)
+    if (!targetActor) {
+      ui.notifications.error(game.i18n.localize("CTHULHUETERNAL.Notifications.noTargetActorFound") + targetCombatantId)
+      return
+    }
+    targetActor.applyWounds(woundData)
+  }
 }
--- a/packs-system/rituals/000248.ldb
+++ b/packs-system/rituals/000248.ldb
--- a/packs-system/rituals/000263.log
+++ b/packs-system/rituals/000263.log
--- a/packs-system/rituals/CURRENT
+++ b/packs-system/rituals/CURRENT
@@ -1 +1 @@
-MANIFEST-000171
+MANIFEST-000261
--- a/packs-system/rituals/LOG
+++ b/packs-system/rituals/LOG
@@ -1,7 +1,7 @@
-2025/07/09-17:04:59.082095 7f2a0effd6c0 Recovering log #169
-2025/07/09-17:04:59.092675 7f2a0effd6c0 Delete type=3 #167
-2025/07/09-17:04:59.092780 7f2a0effd6c0 Delete type=0 #169
-2025/07/09-17:18:46.206680 7f276ffff6c0 Level-0 table #174: started
-2025/07/09-17:18:46.206717 7f276ffff6c0 Level-0 table #174: 0 bytes OK
-2025/07/09-17:18:46.235941 7f276ffff6c0 Delete type=0 #172
-2025/07/09-17:18:46.287862 7f276ffff6c0 Manual compaction at level-0 from '!items!4oyPRBWPBWAChrJP' @ 72057594037927935 : 1 .. '!items!zVFfp3o0G0Zg3Ia4' @ 0 : 0; will stop at (end)
+2025/10/08-22:08:44.664871 7f77151f96c0 Recovering log #259
+2025/10/08-22:08:44.675676 7f77151f96c0 Delete type=3 #257
+2025/10/08-22:08:44.675773 7f77151f96c0 Delete type=0 #259
+2025/10/08-23:43:02.763720 7f770f3ff6c0 Level-0 table #264: started
+2025/10/08-23:43:02.763751 7f770f3ff6c0 Level-0 table #264: 0 bytes OK
+2025/10/08-23:43:02.770330 7f770f3ff6c0 Delete type=0 #262
+2025/10/08-23:43:02.770574 7f770f3ff6c0 Manual compaction at level-0 from '!items!4oyPRBWPBWAChrJP' @ 72057594037927935 : 1 .. '!items!zVFfp3o0G0Zg3Ia4' @ 0 : 0; will stop at (end)
--- a/packs-system/rituals/LOG.old
+++ b/packs-system/rituals/LOG.old
@@ -1,7 +1,7 @@
-2025/06/29-22:25:29.091880 7fda6d9f96c0 Recovering log #165
-2025/06/29-22:25:29.103184 7fda6d9f96c0 Delete type=3 #163
-2025/06/29-22:25:29.103305 7fda6d9f96c0 Delete type=0 #165
-2025/06/29-22:26:56.370766 7fda5bbff6c0 Level-0 table #170: started
-2025/06/29-22:26:56.370832 7fda5bbff6c0 Level-0 table #170: 0 bytes OK
-2025/06/29-22:26:56.379673 7fda5bbff6c0 Delete type=0 #168
-2025/06/29-22:26:56.380010 7fda5bbff6c0 Manual compaction at level-0 from '!items!4oyPRBWPBWAChrJP' @ 72057594037927935 : 1 .. '!items!zVFfp3o0G0Zg3Ia4' @ 0 : 0; will stop at (end)
+2025/10/01-17:34:00.770173 7fc4987f86c0 Recovering log #255
+2025/10/01-17:34:00.786532 7fc4987f86c0 Delete type=3 #253
+2025/10/01-17:34:00.786591 7fc4987f86c0 Delete type=0 #255
+2025/10/01-20:52:25.677932 7fc497ff76c0 Level-0 table #260: started
+2025/10/01-20:52:25.677997 7fc497ff76c0 Level-0 table #260: 0 bytes OK
+2025/10/01-20:52:26.027584 7fc497ff76c0 Delete type=0 #258
+2025/10/01-20:52:26.508239 7fc497ff76c0 Manual compaction at level-0 from '!items!4oyPRBWPBWAChrJP' @ 72057594037927935 : 1 .. '!items!zVFfp3o0G0Zg3Ia4' @ 0 : 0; will stop at (end)
--- a/packs-system/rituals/MANIFEST-000171
+++ b/packs-system/rituals/MANIFEST-000171
--- a/packs-system/rituals/MANIFEST-000261
+++ b/packs-system/rituals/MANIFEST-000261
--- a/packs-system/rituals/lost/000223.log
+++ b/packs-system/rituals/lost/000223.log
--- a/packs-system/rituals/lost/000240.log
+++ b/packs-system/rituals/lost/000240.log
--- a/packs-system/skills/000417.ldb
+++ b/packs-system/skills/000417.ldb
--- a/packs-system/skills/000432.log
+++ b/packs-system/skills/000432.log
--- a/packs-system/skills/CURRENT
+++ b/packs-system/skills/CURRENT
@@ -1 +1 @@
-MANIFEST-000340
+MANIFEST-000430
--- a/packs-system/skills/LOG
+++ b/packs-system/skills/LOG
@@ -1,7 +1,7 @@
-2025/07/09-17:04:59.062504 7f2a0dffb6c0 Recovering log #338
-2025/07/09-17:04:59.072990 7f2a0dffb6c0 Delete type=3 #336
-2025/07/09-17:04:59.073130 7f2a0dffb6c0 Delete type=0 #338
-2025/07/09-17:18:46.236069 7f276ffff6c0 Level-0 table #343: started
-2025/07/09-17:18:46.236095 7f276ffff6c0 Level-0 table #343: 0 bytes OK
-2025/07/09-17:18:46.287671 7f276ffff6c0 Delete type=0 #341
-2025/07/09-17:18:46.287875 7f276ffff6c0 Manual compaction at level-0 from '!folders!5PrT9QmN1cFPzDFP' @ 72057594037927935 : 1 .. '!items!zvoUByzWSWZ87fxA' @ 0 : 0; will stop at (end)
+2025/10/08-22:08:44.633139 7f77159fa6c0 Recovering log #428
+2025/10/08-22:08:44.643368 7f77159fa6c0 Delete type=3 #426
+2025/10/08-22:08:44.643480 7f77159fa6c0 Delete type=0 #428
+2025/10/08-23:43:02.756716 7f770f3ff6c0 Level-0 table #433: started
+2025/10/08-23:43:02.756789 7f770f3ff6c0 Level-0 table #433: 0 bytes OK
+2025/10/08-23:43:02.763557 7f770f3ff6c0 Delete type=0 #431
+2025/10/08-23:43:02.770557 7f770f3ff6c0 Manual compaction at level-0 from '!folders!5PrT9QmN1cFPzDFP' @ 72057594037927935 : 1 .. '!items!zvoUByzWSWZ87fxA' @ 0 : 0; will stop at (end)
--- a/packs-system/skills/LOG.old
+++ b/packs-system/skills/LOG.old
@@ -1,7 +1,7 @@
-2025/06/29-22:25:29.069935 7fda6d1f86c0 Recovering log #334
-2025/06/29-22:25:29.081064 7fda6d1f86c0 Delete type=3 #332
-2025/06/29-22:25:29.081192 7fda6d1f86c0 Delete type=0 #334
-2025/06/29-22:26:56.360514 7fda5bbff6c0 Level-0 table #339: started
-2025/06/29-22:26:56.360577 7fda5bbff6c0 Level-0 table #339: 0 bytes OK
-2025/06/29-22:26:56.370559 7fda5bbff6c0 Delete type=0 #337
-2025/06/29-22:26:56.379992 7fda5bbff6c0 Manual compaction at level-0 from '!folders!5PrT9QmN1cFPzDFP' @ 72057594037927935 : 1 .. '!items!zvoUByzWSWZ87fxA' @ 0 : 0; will stop at (end)
+2025/10/01-17:34:00.727436 7fc499ffb6c0 Recovering log #424
+2025/10/01-17:34:00.744993 7fc499ffb6c0 Delete type=3 #422
+2025/10/01-17:34:00.745065 7fc499ffb6c0 Delete type=0 #424
+2025/10/01-20:52:26.571766 7fc497ff76c0 Level-0 table #429: started
+2025/10/01-20:52:26.571816 7fc497ff76c0 Level-0 table #429: 0 bytes OK
+2025/10/01-20:52:26.607301 7fc497ff76c0 Delete type=0 #427
+2025/10/01-20:52:26.607477 7fc497ff76c0 Manual compaction at level-0 from '!folders!5PrT9QmN1cFPzDFP' @ 72057594037927935 : 1 .. '!items!zvoUByzWSWZ87fxA' @ 0 : 0; will stop at (end)
--- a/packs-system/skills/MANIFEST-000340
+++ b/packs-system/skills/MANIFEST-000340
--- a/packs-system/skills/MANIFEST-000430
+++ b/packs-system/skills/MANIFEST-000430
--- a/packs-system/skills/lost/000392.log
+++ b/packs-system/skills/lost/000392.log
--- a/packs-system/skills/lost/000409.log
+++ b/packs-system/skills/lost/000409.log
--- a/packs-system/weapons/000063.ldb
+++ b/packs-system/weapons/000063.ldb
--- a/packs-system/weapons/000078.log
+++ b/packs-system/weapons/000078.log
--- a/packs-system/weapons/CURRENT
+++ b/packs-system/weapons/CURRENT
@@ -0,0 +1 @@
+MANIFEST-000076
--- a/packs-system/weapons/LOCK
+++ b/packs-system/weapons/LOCK
--- a/packs-system/weapons/LOG
+++ b/packs-system/weapons/LOG
@@ -0,0 +1,7 @@
+2025/10/08-22:08:44.648914 7f770ffff6c0 Recovering log #74
+2025/10/08-22:08:44.660220 7f770ffff6c0 Delete type=3 #72
+2025/10/08-22:08:44.660388 7f770ffff6c0 Delete type=0 #74
+2025/10/08-23:43:02.832863 7f770f3ff6c0 Level-0 table #79: started
+2025/10/08-23:43:02.832918 7f770f3ff6c0 Level-0 table #79: 0 bytes OK
+2025/10/08-23:43:02.839997 7f770f3ff6c0 Delete type=0 #77
+2025/10/08-23:43:02.852551 7f770f3ff6c0 Manual compaction at level-0 from '!folders!0DI3T2jve3nsmsfZ' @ 72057594037927935 : 1 .. '!items!zyxA9DhO36t5OBDv' @ 0 : 0; will stop at (end)
--- a/packs-system/weapons/LOG.old
+++ b/packs-system/weapons/LOG.old
@@ -0,0 +1,7 @@
+2025/10/01-17:34:00.750882 7fc4997fa6c0 Recovering log #70
+2025/10/01-17:34:00.765634 7fc4997fa6c0 Delete type=3 #68
+2025/10/01-17:34:00.765703 7fc4997fa6c0 Delete type=0 #70
+2025/10/01-20:52:26.472838 7fc497ff76c0 Level-0 table #75: started
+2025/10/01-20:52:26.472892 7fc497ff76c0 Level-0 table #75: 0 bytes OK
+2025/10/01-20:52:26.508046 7fc497ff76c0 Delete type=0 #73
+2025/10/01-20:52:26.508280 7fc497ff76c0 Manual compaction at level-0 from '!folders!0DI3T2jve3nsmsfZ' @ 72057594037927935 : 1 .. '!items!zyxA9DhO36t5OBDv' @ 0 : 0; will stop at (end)
--- a/packs-system/weapons/MANIFEST-000076
+++ b/packs-system/weapons/MANIFEST-000076
--- a/packs-system/weapons/lost/000038.log
+++ b/packs-system/weapons/lost/000038.log
--- a/packs-system/weapons/lost/000055.log
+++ b/packs-system/weapons/lost/000055.log
--- a/styles/fvtt-cthulhu-eternal.less
+++ b/styles/fvtt-cthulhu-eternal.less
@@ -11,8 +11,8 @@
  @import "weapon.less";
  @import "armor.less";
  @import "motivation.less";
-  @import "mentaldisorder.less";  
-  @import "bond.less";  
+  @import "mentaldisorder.less";
+  @import "bond.less";
  @import "chat.less";
  @import "gear.less";
  @import "arcane.less";
@@ -21,4 +21,4 @@
  @import "tome.less";
 }

-@import "roll.less";
+@import "roll.less";
--- a/styles/global.less
+++ b/styles/global.less
@@ -98,6 +98,23 @@ i.fvtt-cthulhu-eternal {
      color: var(--color-critical-failure);
      font-family: var(--font-title);
    }
+    .san-type-buttons {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin: 10px 0;
+      button {
+        margin: 0 2px;
+        font-family: var(--font-primary);
+        font-size: calc(var(--font-size-standard) * 0.9);
+        border: none;
+        padding: 2px 2px;
+        cursor: pointer;
+        transition: background-color 0.3s;
+        min-width: 6.0rem;
+        max-width: 6.0rem;
+      }
+    }
    .san-loose-buttons {
      display: flex;
      justify-content: center;
--- a/styles/protagonist.less
+++ b/styles/protagonist.less
@@ -478,7 +478,7 @@
  }
  .weapons {
    display: grid;
-    grid-template-columns: repeat(2, 1fr);
+    grid-template-columns: repeat(1, 1fr);
    gap: 4px;
    .weapon {
      display: flex;
@@ -496,10 +496,24 @@
        min-width: 1.8rem;
        max-width: 1.8rem;
      }
-      .damage {
+      .range {
        min-width: 6rem;
        max-width: 6rem;
      }
+      .ammo {
+        min-width: 4rem;
+        max-width: 4rem;
+      }
+      .lethality {
+        display: flex;
+        min-width: 3.2rem;
+        max-width: 3.2rem;
+      }
+      .damage {
+        display: flex;
+        min-width: 12rem;
+        max-width: 12rem;
+      }
      .name {
        min-width: 10rem;
        max-width: 10rem;
--- a/styles/roll.less
+++ b/styles/roll.less
@@ -53,6 +53,10 @@
  color: var(--color-dark-1);
 }

+.li-apply-wounds {
+  display: none;
+}
+
 &.dice-roll {
  flex-direction: column;

@@ -70,7 +74,7 @@
    border: 0px;
  }
  .intro-chat {
-    color:var(--color-dark-1);
+    color: var(--color-dark-1);
    border-radius: 20px;
    display: flex;
    flex-direction: row;
@@ -91,20 +95,20 @@
        li {
          margin: 0 10px;
          font-family: var(--font-primary);
-          font-size: calc(var(--font-size-standard) * 1.0);
+          font-size: calc(var(--font-size-standard) * 1);
        }
        .nudge-roll {
-          font-size: calc(var(--font-size-standard) * 1.0);
+          font-size: calc(var(--font-size-standard) * 1);
          margin-left: 2rem;
          display: none;
        }
        .healing-roll {
-          font-size: calc(var(--font-size-standard) * 1.0);
+          font-size: calc(var(--font-size-standard) * 1);
          margin-left: 2rem;
          display: none;
        }
        .roll-damage {
-          font-size: calc(var(--font-size-standard) * 1.0);
+          font-size: calc(var(--font-size-standard) * 1);
          margin-left: 2rem;
          display: none;
        }
--- a/styles/weapon.less
+++ b/styles/weapon.less
@@ -14,6 +14,24 @@
  fieldset {
    margin-top: 8px;
    background-color: var(--color-light-1);
+    input {
+      max-width: 5rem;
+      min-width: 5rem;
+    }
+    select {
+      max-width: 14rem;
+      min-width: 14rem;
+    }
+    input[type="checkbox"] {
+      max-width: 1.5rem;
+      min-width: 1.5rem;
+    }
+    .flexrow > *:not(:first-child) {
+       margin-left: 1rem;
+    }
+    .damage-distance {
+      margin-left: 2rem;
+    }
  }

  label {
--- a/system.json
+++ b/system.json
@@ -6,7 +6,7 @@
  "download": "#{DOWNLOAD}#",
  "url": "https://www.uberwald.me/gitea/public/fvtt-cthulhu-eternal",
  "license": "LICENSE",
-  "version": "13.0.1",
+  "version": "13.0.2",
  "authors": [
    {
      "name": "Uberwald",
@@ -152,6 +152,18 @@
      },
      "flags": {}
    },
+    {
+      "name": "weapons",
+      "label": "Weapons",
+      "system": "fvtt-cthulhu-eternal",
+      "path": "packs-system/weapons",
+      "type": "Item",
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      },
+      "flags": {}
+    },
    {
      "name": "rituals",
      "label": "Rituals",
--- a/templates/chat-lethal-damage.hbs
+++ b/templates/chat-lethal-damage.hbs
@@ -2,27 +2,39 @@
  <div class="chat-lethal-damage">
    <ul>
      <li><strong>{{weapon.name}} : {{localize "CTHULHUETERNAL.Label.lethalityRoll"}}</strong></li>
-      <li>{{localize "CTHULHUETERNAL.Label.result"}}  :{{rollResult}} ({{lethalScore}})</li>
+      <li>{{localize "CTHULHUETERNAL.Label.result"}} :{{rollResult}} ({{lethalScore}})</li>


      {{#if weapon.system.selectiveFireChoice}}
      <li>{{weapon.system.selectiveFireChoiceLabel}}</li>
      {{/if}}
-      {{#if weapon.system.killRadius}}
+      {{#if (gt weapon.system.killRadius 0)}}
      <li>{{localize "CTHULHUETERNAL.Label.killRadius"}} : {{weapon.system.killRadius}} {{weapon.system.rangeUnit}}</li>
      <li>{{localize "CTHULHUETERNAL.Label.killRadiusInfo"}}</li>
      {{/if}}

+      {{#if (gt weapon.system.armorPiercing 0)}}
+      <li>{{localize "CTHULHUETERNAL.Label.armorPiercing"}} : {{weapon.system.armorPiercing}}</li>
+      {{/if}}
+
      {{#if ammoUsed}}
      <li>{{localize "CTHULHUETERNAL.Label.ammoUsed"}}: {{ammoUsed}} / {{weapon.system.ammo.value}}</li>
      {{/if}}

+      <li class="li-apply-wounds">
+        <button type="button" class="apply-wounds">{{localize "CTHULHUETERNAL.Label.applyWounds"}}</button>
+        <select name="combatant" class="roll-skill-modifier">
+          {{selectOptions combatants valueAttr="id" labelAttr="name"}}
+        </select>
+      </li>
+
      {{#if isLethal}}
      <li class="result-lethal">{{localize "CTHULHUETERNAL.Label.lethalityLethal"}}</li>
      <li class="result-lethal">{{localize "CTHULHUETERNAL.Label.lethalityWounded"}}</li>
      {{else}}
      <li class="result-non-lethal">{{localize "CTHULHUETERNAL.Label.lethalityNotLethal"}}</li>
-      <li class="result-non-lethal">{{localize "CTHULHUETERNAL.Label.lethalityNotWounded"}}: <strong>{{wounds}}</strong></li>
+      <li class="result-non-lethal">{{localize "CTHULHUETERNAL.Label.lethalityNotWounded"}}: <strong>{{wounds}}</strong>
+      </li>
      {{/if}}

    </ul>
--- a/templates/chat-message.hbs
+++ b/templates/chat-message.hbs
@@ -7,118 +7,218 @@
    <div class="intro-right">
      <ul>
        {{#if (eq rollType "char")}}
-        <li><strong>{{localize "CTHULHUETERNAL.Label.charRoll"}}</strong></li>
+          <li><strong>{{localize "CTHULHUETERNAL.Label.charRoll"}}</strong></li>
        {{/if}}

        {{#if (eq rollType "skill")}}
-        <li><strong>{{localize "CTHULHUETERNAL.Label.skillRoll"}}</strong></li>
+          <li><strong>{{localize
+                "CTHULHUETERNAL.Label.skillRoll"
+              }}</strong></li>
        {{/if}}

        {{#if isNudgedRoll}}
-        <li><strong>{{localize "CTHULHUETERNAL.Label.nudgedRoll"}} : {{wpCost}} WP spent</strong></li>
+          <li><strong>{{localize "CTHULHUETERNAL.Label.nudgedRoll"}}
+              :
+              {{wpCost}}
+              {{localize "CTHULHUETERNAL.Label.WPSpent"}}</strong></li>
        {{/if}}

        {{#if weapon}}
-        <li><strong>{{localize "CTHULHUETERNAL.Label.Weapon"}} : {{weapon.name}}</strong></li>
+          <li><strong>{{localize "CTHULHUETERNAL.Label.Weapon"}}
+              :
+              {{weapon.name}}</strong></li>
        {{/if}}

        {{#if (eq rollType "resource")}}
-        <li><strong>{{rollItem.name}} : {{initialScore}}</strong></li>
+          <li><strong>{{rollItem.name}} : {{initialScore}}</strong></li>
        {{else}}
-        <li><strong>{{rollItem.name}} : {{initialScore}}%</strong></li>
+          <li><strong>{{rollItem.name}} : {{initialScore}}%</strong></li>
        {{/if}}

        {{#if isZeroWP}}
-        <li class="red-warning">{{localize "CTHULHUETERNAL.Label.ZeroWP"}}</li>
+          <li class="red-warning">{{localize
+              "CTHULHUETERNAL.Label.ZeroWP"
+            }}</li>
        {{else}}
-        {{#if isLowWP}}
-        <li class="orange-warning">{{localize "CTHULHUETERNAL.Label.LowWP"}} : -20%</li>
-        {{/if}}
+          {{#if isLowWP}}
+            <li class="orange-warning">{{localize "CTHULHUETERNAL.Label.LowWP"}}
+              : -20%</li>
+          {{/if}}
        {{/if}}

        {{#if isExhausted}}
-        <li class="orange-warning">{{localize "CTHULHUETERNAL.Label.Exhausted"}} : -20%</li>
+          <li class="orange-warning">{{localize
+              "CTHULHUETERNAL.Label.Exhausted"
+            }}
+            : -20%</li>
        {{/if}}

-        {{#if  (eq rollType "resource")}}
-        <li>{{localize "CTHULHUETERNAL.Label.multiplier"}} : {{multiplier}}</li>
+        {{#if (eq rollType "resource")}}
+          <li>{{localize "CTHULHUETERNAL.Label.multiplier"}}
+            :
+            {{multiplier}}</li>
        {{else}}
-        <li>{{localize "CTHULHUETERNAL.Label.modifier"}} : {{modifier}}%</li>
+          <li>{{localize "CTHULHUETERNAL.Label.modifier"}}
+            :
+            {{totalModifier}}%</li>
        {{/if}}

-        <li>{{localize "CTHULHUETERNAL.Label.targetScore"}} : {{targetScore}}%</li>
+        <li>{{localize "CTHULHUETERNAL.Label.targetScore"}}
+          :
+          {{targetScore}}%</li>
        {{#if isSuccess}}
          {{#if isCritical}}
-            <li class="result-critical-success">{{localize "CTHULHUETERNAL.Label.criticalSuccess"}}
-              {{#if  (eq rollType "weapon")}}
-                {{#if (eq weapon.system.weaponType "rangedfirearm")}}
-                <a class="damage-roll" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollDamage"}}"><i class="fa-solid fa-gun"></i></a>
-                {{else}}
-                <a class="damage-roll" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollDamage"}}"><i class="fa-solid fa-sword"></i></a>
-                {{/if}}
-              {{/if}}
-              {{#if (eq rollType "skill") }}
-                {{#if rollItem.system.isHealing}}
-                  <a class="healing-roll" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollHealing"}}"><i class="fa-solid fa-heart"></i></a>
-                {{/if}}
+            <li class="result-critical-success">{{localize
+                "CTHULHUETERNAL.Label.criticalSuccess"
+              }}
+            </li>
+          {{else}}
+            <li class="result-success">
+              {{localize "CTHULHUETERNAL.Label.success"}}
+              {{#if isNudge}}
+                <a
+                  class="nudge-roll"
+                  data-tooltip="{{localize ' CTHULHUETERNAL.Label.rollNudge'}}"
+                ><i class="fa-solid fa-circle-sort-down"></i></a>
              {{/if}}

            </li>
-          {{else}}
-          <li class="result-success">
-            {{localize "CTHULHUETERNAL.Label.success"}}
-            {{#if isNudge}}
-              <a class="nudge-roll" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollNudge"}}"><i class="fa-solid fa-circle-sort-down"></i></a>
-            {{/if}}
-                {{#if (eq weapon.system.weaponType "rangedfirearm")}}
-                <a class="damage-roll" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollDamage"}}"><i class="fa-solid fa-gun"></i></a>
+          {{/if}}
+          {{#if (eq rollType "weapon")}}
+            <li>
+              {{#if (eq weapon.system.weaponType "rangedfirearm")}}
+                {{#if weapon.system.hasDamageDistance}}
+                  {{#each weapon.system.damageDistance as |damageDistance|}}
+                    {{#if (gt damageDistance.distance 0)}}
+                      <a
+                        class="damage-roll"
+                        data-item-id="{{weapon.id}}"
+                        data-action="roll"
+                        data-roll-type="damage"
+                        data-roll-value="{{damageDistance.damage}}"
+                      >
+                        <i class="fa-solid fa-gun"></i>
+                        <span
+                          class="damage-distance"
+                        >{{damageDistance.distance}}:{{damageDistance.damage}}&nbsp;&nbsp;</span>
+                      </a>
+                    {{/if}}
+                  {{/each}}
                {{else}}
-                <a class="damage-roll" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollDamage"}}"><i class="fa-solid fa-sword"></i></a>
+                  <a
+                    class="damage-roll"
+                    data-roll-value="{{weapon.system.damage}}"
+                    data-tooltip="{{localize
+                      '
+            CTHULHUETERNAL.Label.rollDamage'
+                    }}"
+                  ><i class="fa-solid fa-gun"></i></a>
                {{/if}}
-            {{#if (eq rollType "skill") }}
-              {{#if rollItem.system.isHealing}}
-                <a class="healing-roll" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollHealing"}}"><i class="fa-solid fa-heart"></i></a>
+              {{else}}
+                <a
+                  class="damage-roll"
+                  data-roll-value="{{weapon.system.damage}}"
+                  data-tooltip="{{localize
+                    '
+            CTHULHUETERNAL.Label.rollDamage'
+                  }}"
+                ><i class="fa-solid fa-sword"></i></a>
              {{/if}}
+            </li>
+          {{/if}}
+          {{#if (eq rollType "skill")}}
+            {{#if rollItem.system.isHealing}}
+              <li>
+                <a
+                  class="healing-roll"
+                  data-tooltip="{{localize
+                    ' CTHULHUETERNAL.Label.rollHealing'
+                  }}"
+                ><i class="fa-solid fa-heart"></i></a>
+              </li>
            {{/if}}
-          </li>
          {{/if}}

        {{/if}}

        {{#if isFailure}}
-        {{#if isCritical}}
-          <li class="result-critical-failure">{{localize "CTHULHUETERNAL.Label.criticalFailure"}}
-          {{#if (eq rollType "skill") }}
-            {{#if rollItem.system.isHealing}}
-              <a class="healing-roll" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollHealing"}}"><i class="fa-solid fa-heart"></i></a>
+          {{#if isCritical}}
+            <li class="result-critical-failure">{{localize
+                "CTHULHUETERNAL.Label.criticalFailure"
+              }}
+            </li>
+          {{else}}
+            <li class="result-failure">
+              {{localize "CTHULHUETERNAL.Label.failure"}}
+            </li>
+          {{/if}}
+
+          {{#if isNudge}}
+            <li>
+              <a
+                class="nudge-roll"
+                data-tooltip="{{localize 'CTHULHUETERNAL.Label.rollNudge'}}"
+              ><i class="fa-solid fa-circle-sort-down"></i></a>
+            </li>
+          {{/if}}
+
+        {{/if}}
+
+        {{#if isAttackRoll}}
+          {{#if defenseRoll}}
+            <li>{{localize "CTHULHUETERNAL.Label.defenseRoll"}}</li>
+            {{#if attackSuccess}}
+              <li class="result-success">{{localize
+                  "CTHULHUETERNAL.Label.attackSuccess"
+                }}</li>
+            {{else}}
+              <li class="result-failure">{{localize
+                  "CTHULHUETERNAL.Label.attackFailure"
+                }}</li>
+            {{/if}}
+          {{else}}
+            {{#if targetId}}
+              <li class="orange-warning">{{localize
+                  "CTHULHUETERNAL.Label.noDefenseRoll"
+                }}</li>
+              <a
+                class="opposed-roll"
+                data-tooltip="{{localize 'CTHULHUETERNAL.Label.opposedRoll'}}"
+              >
+                <i class="fa-duotone fa-light fa-arrows-to-line"></i></a>
+            {{else}}
+              <li class="orange-warning">{{localize
+                  "CTHULHUETERNAL.Label.noTarget"
+                }}</li>
+              <a
+                class="opposed-roll"
+                data-tooltip="{{localize 'CTHULHUETERNAL.Label.opposedRoll'}}"
+              >
+                <i class="fa-duotone fa-light fa-arrows-to-line"></i></a>
            {{/if}}
          {{/if}}
-          </li>
-        {{else}}
-        <li class="result-failure">
-          {{localize "CTHULHUETERNAL.Label.failure"}}
-          {{#if isNudge}}
-            <a class="nudge-roll" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollNudge"}}"><i class="fa-solid fa-circle-sort-down"></i></a>
-          {{/if}}
-        </li>
-        {{/if}}
        {{/if}}
+
      </ul>
    </div>
  </div>
  {{#if isDamage}}
-  <div>
-    {{#if (and isGM hasTarget)}}
-    {{{localize "CTHULHUETERNAL.Roll.displayArmor" targetName=targetName targetArmor=targetArmor
-    realDamage=realDamage}}}
-    {{/if}}
-  </div>
+    <div>
+      {{#if (and isGM hasTarget)}}
+        {{{localize
+          "CTHULHUETERNAL.Roll.displayArmor"
+          targetName=targetName
+          targetArmor=targetArmor
+          realDamage=realDamage
+        }}}
+      {{/if}}
+    </div>
  {{/if}}
  {{#unless isPrivate}}
-  <div class="dice-result">
-    <h4 class="dice-total">{{total}}</h4>
-    <div class="dice-formula">{{formula}}</div>
-    {{{tooltip}}}
-  </div>
+    <div class="dice-result">
+      <h4 class="dice-total">{{total}}</h4>
+      <div class="dice-formula">{{formula}}</div>
+      {{{tooltip}}}
+    </div>
  {{/unless}}
 </div>
--- a/templates/chat-regular-damage.hbs
+++ b/templates/chat-regular-damage.hbs
@@ -2,17 +2,34 @@
  <div class="chat-lethal-damage">
    <ul>
      <li><strong>{{weapon.name}} : {{localize "CTHULHUETERNAL.Label.damageRoll"}}</strong></li>
-      <li>{{localize "CTHULHUETERNAL.Label.result"}}  :{{rollResult}} ({{formula}})</li>
+      <li>{{localize "CTHULHUETERNAL.Label.result"}} :{{rollResult}} ({{formula}})</li>

-      {{#if weapon.system.killRadius}}
+      {{#if (gt weapon.system.killRadius 0)}}
      <li>{{localize "CTHULHUETERNAL.Label.killRadius"}} : {{weapon.system.killRadius}} {{weapon.system.rangeUnit}}</li>
      <li>{{localize "CTHULHUETERNAL.Label.killRadiusInfo"}}</li>
      {{/if}}

+      {{#if (gt weapon.system.armorPiercing 0)}}
+      <li>{{localize "CTHULHUETERNAL.Label.armorPiercing"}} : {{weapon.system.armorPiercing}}</li>
+      {{/if}}
+      {{#if (gt weapon.system.penetration 0)}}
+      <li>{{localize "CTHULHUETERNAL.Label.penetration"}} : {{weapon.system.penetration}}</li>
+      {{/if}}
+
      {{#if ammoUsed}}
      <li>{{localize "CTHULHUETERNAL.Label.ammoUsed"}}: {{ammoUsed}} / {{weapon.system.ammo.value}}</li>
      {{/if}}
-      <li class="result-non-lethal">{{localize "CTHULHUETERNAL.Label.damageMessage"}}: <strong>{{rollResult}}</strong></li>
+
+      <li class="li-apply-wounds">
+        {{localize "CTHULHUETERNAL.Label.applyWounds"}}
+        <select name="combatant" class="li-apply-wounds-select">
+          <option value="none"></option>
+          {{selectOptions combatants valueAttr="id" labelAttr="name"}}
+        </select>
+      </li>
+
+      <li class="result-non-lethal">{{localize "CTHULHUETERNAL.Label.damageMessage"}}: <strong>{{rollResult}}</strong>
+      </li>

    </ul>

--- a/templates/chat-san-loss-none.hbs
+++ b/templates/chat-san-loss-none.hbs
@@ -0,0 +1,8 @@
+<div class="{{cssClass}}">
+  <div class="chat-san-request">
+    <ul>
+      <li><strong>{{localize "CTHULHUETERNAL.Label.SANLossNone"}}</strong></li>
+    </ul>
+
+  </div>
+</div>
--- a/templates/chat-san-loss-unnatural.hbs
+++ b/templates/chat-san-loss-unnatural.hbs
@@ -0,0 +1,8 @@
+<div class="{{cssClass}}">
+  <div class="chat-san-request">
+    <ul>
+      <li><strong>{{localize "CTHULHUETERNAL.Label.SANLossUnnatural"}}</strong></li>
+    </ul>
+
+  </div>
+</div>
--- a/templates/chat-san-request.hbs
+++ b/templates/chat-san-request.hbs
@@ -1,7 +1,11 @@
 <div class="{{cssClass}}">
  <div class="chat-san-request">
    <ul>
-      <li><strong>{{localize "CTHULHUETERNAL.Label.SANTest"}}</strong></li>
+      {{#if rollData.isSuccess}}
+        <li><strong>{{localize "CTHULHUETERNAL.Label.SANTestSuccess"}}</strong></li>
+      {{else}}
+        <li><strong>{{localize "CTHULHUETERNAL.Label.SANTestFailure"}}</strong></li>
+      {{/if}}

      <li class="san-loose-buttons">
        <button class="san-loose" data-san-value="0">0</button>
--- a/templates/protagonist-equipment.hbs
+++ b/templates/protagonist-equipment.hbs
@@ -16,11 +16,64 @@
          {{item.name}}
        </div>

-        <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
-        <a class="damage rollable" data-item-id="{{item.id}}" data-action="roll" data-roll-type="damage"
-          data-roll-value="{{item.system.damage}}">
-          {{localize "CTHULHUETERNAL.Label.damageShort"}} :
-          {{item.system.damage}}</a>
+        <div class="damage" data-tooltip="{{localize 'CTHULHUETERNAL.Tooltip.rollDamage'}}">
+          {{#if (eq system.lethality 0)}}
+            <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
+
+            {{#if item.system.hasDamageDistance}}
+              {{#each item.system.damageDistance as |damageDistance|}}
+                {{#if (gt damageDistance.distance 0)}}
+                <a class="rollable" data-item-id="{{item.id}}" data-action="roll" data-roll-type="damage"
+                    data-roll-value="{{damageDistance.damage}}" >
+                  <span class="damage-distance">{{damageDistance.distance}}:{{damageDistance.damage}}&nbsp;&nbsp;</span>
+                </a>
+                {{/if}}
+              {{/each}}
+            {{else}}
+              <a class="rollable" data-item-id="{{item.id}}" data-action="roll" data-roll-type="damage"
+                    data-roll-value="{{item.system.damage}}" >
+              {{item.system.damage}}
+              </a>
+            {{/if}}
+          {{else}}
+            N/A
+          {{/if}}
+        </div>
+
+        {{#if (gt system.baseRange 0)}}
+        <span class="range" data-tooltip="CTHULHUETERNAL.Label.baseRange">{{item.system.baseRange}} {{item.system.rangeUnit}}</span>
+        {{else}}
+        <span class="range">{{localize "CTHULHUETERNAL.Label.melee"}}</span>
+        {{/if}}
+
+        {{#if (gt system.lethality 0)}}
+         <a class="lethality rollable" data-item-id="{{item.id}}" data-action="roll" data-roll-type="damage"
+                  data-tooltip="CTHULHUETERNAL.Label.Lethality" >
+          <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
+          {{item.system.lethality}}%
+         </a>
+        {{else}}
+        <span class="lethality" data-tooltip="CTHULHUETERNAL.Label.Lethality">-</span>
+        {{/if}}
+
+        {{#if (gt system.killRadius 0)}}
+        <span class="lethality" data-tooltip="CTHULHUETERNAL.Label.killRadius" >{{item.system.killRadius}}</span>
+        {{else}}
+        <span class="lethality" data-tooltip="CTHULHUETERNAL.Label.killRadius">-</span>
+        {{/if}}
+
+        {{#if (gt system.armorPiercing 0)}}
+        <span class="lethality" data-tooltip="CTHULHUETERNAL.Label.armorPiercing" >{{item.system.armorPiercing}}</span>
+        {{else}}
+        <span class="lethality" data-tooltip="CTHULHUETERNAL.Label.armorPiercing">-</span>
+        {{/if}}
+
+        {{#if (eq system.weaponType "rangedfirearm")}}
+        <span class="ammo" data-tooltip="CTHULHUETERNAL.Label.Ammo" >{{item.system.ammo.value}}/{{item.system.ammo.max}}</span>
+        {{else}}
+        <span class="ammo" data-tooltip="CTHULHUETERNAL.Label.Ammo">N/A</span>
+        {{/if}}
+
        <div class="controls">
          <a data-tooltip="{{localize 'CTHULHUETERNAL.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
            data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
--- a/templates/roll-dialog.hbs
+++ b/templates/roll-dialog.hbs
@@ -9,23 +9,94 @@

    {{#if (eq rollType "resource")}}
    <legend>{{localize "CTHULHUETERNAL.Label.resourceRating"}}</legend>
-    <div class="dialog-skill">{{rollItem.name}} : <span class="resource-score">{{initialScore}} ({{mul initialScore 5}}%)</span></div>
-    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Hand"}} : {{rollItem.hand}} <input type="checkbox" data-action="selectHand" {{checked rollItem.enableHand}}></div>
-    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Stowed"}} : {{rollItem.stowed}} <input type="checkbox" data-action="selectStowed" {{checked rollItem.enableStowed}}></div>
-    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Storage"}} : {{rollItem.storage}} <input type="checkbox" data-action="selectStorage" {{checked rollItem.enableStorage}}></div>
+    <div class="dialog-skill">{{rollItem.name}} : <span class="resource-score">{{initialScore}} ({{mul initialScore
+        5}}%)</span></div>
+    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Hand"}} : {{rollItem.hand}} <input type="checkbox"
+        data-action="selectHand" {{checked rollItem.enableHand}}></div>
+    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Stowed"}} : {{rollItem.stowed}} <input type="checkbox"
+        data-action="selectStowed" {{checked rollItem.enableStowed}}></div>
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.Storage"}} : {{rollItem.storage}}
+      <input type="checkbox" data-action="selectStorage" {{checked rollItem.enableStorage}}>
+    </div>
    {{else}}
    <div class="dialog-skill">{{rollItem.name}} : {{initialScore}}%</div>
    {{/if}}

    {{#if weapon}}
    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Weapon"}} : {{weapon.name}}</div>
-      {{#if weapon.system.hasSelectiveFire}}
-      <div class="dialog-skill">Selective Fire :
-        <select name="selectiveFireChoice" class="roll-skill-modifier">
-          {{selectOptions choiceSelectiveFire localize=true selected=selectiveFireChoice nameAttr="id" labelAttr="label"}}
-        </select>
-      </div>
-      {{/if}}
+
+    {{#if targetName}}
+    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Target"}} : {{targetName}}</div>
+    {{/if}}
+
+
+    {{#if (eq weapon.system.weaponType "melee")}}
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.targetMove"}}
+      <select name="meleeTargetMoveChoice" class="roll-skill-modifier">
+        {{selectOptions choiceMeleeTargetMove localize=true selected=meleeTargetMoveChoice valueAttr="id"
+        labelAttr="label"}}
+      </select>
+    </div>
+    {{/if}}
+    {{#if isRangedWeapon}}
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.rangedRange"}}
+      <select name="rangedRangeChoice" class="roll-skill-modifier">
+        {{selectOptions choiceRangedRange localize=true selected=rangedRangeChoice valueAttr="id" labelAttr="label"}}
+      </select>
+    </div>
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.targetMove"}}
+      <select name="rangedTargetMoveChoice" class="roll-skill-modifier">
+        {{selectOptions choiceRangedTargetMove localize=true selected=rangedTargetMoveChoice valueAttr="id"
+        labelAttr="label"}}
+      </select>
+    </div>
+
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.aimingLastRound"}}
+      <input type="checkbox" name="aimingLastRound">
+    </div>
+    {{#if weapon.system.hasSight}}
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.aimingWithSight"}}
+      <input type="checkbox" name="aimingWithSight">
+    </div>
+    {{/if}}
+
+    {{/if}}
+
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.visibility"}}
+      <select name="visibilityChoice" class="roll-skill-modifier">
+        {{selectOptions choiceVisibility localize=true selected=visibilityChoice valueAttr="id" labelAttr="label"}}
+      </select>
+    </div>
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.attackerState"}}
+      <select name="attackerStateChoice" class="roll-skill-modifier">
+        {{selectOptions choiceAttackerState localize=true selected=attackerStateChoice valueAttr="id"
+        labelAttr="label"}}
+      </select>
+    </div>
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.targetSize"}}
+      <select name="targetSizeChoice" class="roll-skill-modifier">
+        {{selectOptions choiceTargetSize localize=true selected=targetSizeChoice valueAttr="id" labelAttr="label"}}
+      </select>
+    </div>
+
+    {{#if weapon.system.hasSelectiveFire}}
+    <div class="dialog-skill">Selective Fire :
+      <select name="selectiveFireChoice" class="roll-skill-modifier">
+        {{selectOptions choiceSelectiveFire localize=true selected=selectiveFireChoice valueAttr="id"
+        labelAttr="label"}}
+      </select>
+    </div>
+    {{/if}}
+
    {{/if}}

    {{#if isZeroWP}}
--- a/templates/weapon.hbs
+++ b/templates/weapon.hbs
@@ -12,32 +12,60 @@
    {{/if}}

    {{formField systemFields.state value=system.state localize=true}}
+    {{formField systemFields.isStunning value=system.isStunning localize=true}}

+    <div class="flexrow">
    {{formField systemFields.hasDirectSkill value=system.hasDirectSkill }}
    {{#if system.hasDirectSkill}}
      {{formField systemFields.directSkillValue value=system.directSkillValue }}
    {{/if}}
+    </div>

-    {{formField systemFields.applyDamageBonus value=system.applyDamageBonus}}
-    {{formField systemFields.damage value=system.damage}}
+    <div class="flexrow">
+      {{formField systemFields.hasDamageDistance value=system.hasDamageDistance localize=true}}
+    </div>

-    {{#if isRanged}}
-      {{formField systemFields.baseRange value=system.baseRange}}
-      {{formField systemFields.rangeUnit value=system.rangeUnit localize=true}}
+    {{#if system.hasDamageDistance}}
+        {{#each system.damageDistance as |damageDistance idx|}}
+          <div class="flexrow">
+            <label class="damage-distance">Distance</label><input type="number" name="system.damageDistance.{{idx}}.distance" value="{{damageDistance.distance}}" min="0" />
+            <label>Damage</label><input type="text" name="system.damageDistance.{{idx}}.damage" value="{{damageDistance.damage}}" />
+          </div>
+        {{/each}}
+    {{else}}
+      <div class="flexrow">
+        {{formField systemFields.damage value=system.damage}}
+        {{formField systemFields.applyDamageBonus value=system.applyDamageBonus}}
+      </div>
+      {{#if isRanged}}
+          <div class="flexrow">
+        {{formField systemFields.baseRange value=system.baseRange}}
+        {{formField systemFields.rangeUnit value=system.rangeUnit localize=true}}
+          </div>
+      {{/if}}
    {{/if}}

    {{#if isFireArm}}
+        <div class="flexrow">
      {{formField systemFields.hasSelectiveFire value=system.hasSelectiveFire}}
+      {{formField systemFields.hasSight value=system.hasSight}}
+      </div>
+      <div class="flexrow">
      {{formField systemFields.ammo.fields.value value=system.ammo.value}}
      {{formField systemFields.ammo.fields.max value=system.ammo.max}}
+      </div>
    {{/if}}

-    {{formField systemFields.lethality value=system.lethality}}
-    {{formField systemFields.killRadius value=system.killRadius}}
+    <div class="flexrow">
+      {{formField systemFields.lethality value=system.lethality}}
+      {{formField systemFields.killRadius value=system.killRadius}}
+    </div>

+    <div class="flexrow">
    {{formField systemFields.armorPiercing value=system.armorPiercing}}
-
    {{formField systemFields.resourceLevel value=system.resourceLevel}}
+    </div>
+
  </fieldset>

  <fieldset>
Author	SHA1	Message	Date
LeRatierBretonnien	68a0d03740	Update fight options All checks were successful Release Creation / build (release) Successful in 53s Details	2025-11-11 19:56:33 +01:00
LeRatierBretonnien	8d9cc1045c	Fix licence	2025-10-01 15:14:58 +02:00
LeRatierBretonnien	4af277d8a2	Fight helper !	2025-10-01 11:24:41 +02:00
LeRatierBretonnien	bc9f397755	Fix initiative	2025-09-30 17:44:39 +02:00
LeRatierBretonnien	264a5c7a4c	Fix HP and other derivated values not computed anymore All checks were successful Release Creation / build (release) Successful in 2m57s Details	2025-08-10 19:33:28 +02:00
LeRatierBretonnien	4edbc9b618	Translate weapons + skills in columns All checks were successful Release Creation / build (release) Successful in 3m43s Details	2025-07-29 18:29:02 +02:00
LeRatierBretonnien	47c2aea941	New weapon management, including shotgun All checks were successful Release Creation / build (release) Successful in 1m14s Details	2025-07-14 21:36:08 +02:00
LeRatierBretonnien	cdefecdeba	New weapon management, including shotgun	2025-07-14 21:33:32 +02:00