Corrections sur degats - again

src/ui/rolling.js

@@ -374,7 +374,9 @@ export async function rollForActor(actor, rollKey) {
       const wpThrowMode   = Number(wParams.typeofthrow ?? 0)
       const wpDamageBase  = wpItem.system.damageBase ?? 0
 
-      const wpTotalDice = wpSkillDice + wpAspectDice + wpRangeMalus + wpBonusMalus - wpWoundMalus
+      const wpSpecialtyBonus = wpItem.system.hasSpeciality ? 1 : 0
+
+      const wpTotalDice = wpSkillDice + wpAspectDice + wpRangeMalus + wpBonusMalus - wpWoundMalus + wpSpecialtyBonus
       if (wpTotalDice <= 0) {
         ui.notifications.warn(game.i18n.localize("CDE.Error0"))
         return
@@ -394,9 +396,12 @@ export async function rollForActor(actor, rollKey) {
       if (wpWoundMalus !== 0) wpModParts.push(`-${wpWoundMalus} ${game.i18n.localize("CDE.WoundMalus")}`)
       if (wpBonusAusp  !== 0) wpModParts.push(`+${wpBonusAusp} ${game.i18n.localize("CDE.BonusAuspiciousDice")}`)
 
-      // Damage = character's aspect value + weapon base damage (additive, not multiplied by successes)
-      const wpDamageAspectValue = sys.aspect?.[ASPECT_NAMES[wpAspFinal]]?.value ?? 0
-      const wpDamageAspectLabel = game.i18n.localize(ASPECT_LABELS[ASPECT_NAMES[wpAspFinal]] ?? "")
+      // Damage = character's aspect value (from weapon's damageAspect) + weapon base damage
+      const wpDamageAspectRaw = wpItem.system.damageAspect ?? "metal"
+      const wpDamageAspectIdx = WEAPON_ASPECT_INDEX[wpDamageAspectRaw] ?? 0
+      const wpDamageAspectName = ASPECT_NAMES[wpDamageAspectIdx]
+      const wpDamageAspectValue = sys.aspect?.[wpDamageAspectName]?.value ?? 0
+      const wpDamageAspectLabel = game.i18n.localize(ASPECT_LABELS[wpDamageAspectName] ?? "")
 
       const wpMsg = await sendResultMessage(actor, {
         rollLabel:   `${wpItem.name}`,