SUpression bonus degats, gestion armes à 2mains

modules/applications/donjon-et-cie-roll-dialog.mjs

@@ -202,16 +202,18 @@ export class DonjonEtCieRollDialog {
 
   static async createDamage(actor, item) {
     const damageContext = DonjonEtCieUtility.getMartialDamageContext(actor, item);
+    const isMeleeTwoHanded = item.type === "arme" && item.system.categorie === "melee" && Number(item.system.mains ?? 1) > 1;
+    const defaultMode = isMeleeTwoHanded ? "avantage" : "normal";
     const content = await foundry.applications.handlebars.renderTemplate(
       "systems/fvtt-donjon-et-cie/templates/dialogs/damage-roll.hbs",
       {
         actorName: actor?.name ?? item.actor?.name ?? "",
         item,
-        actorBonus: actor?.system?.combat?.degatsBonus ?? 0,
         damageFormula: damageContext.effectiveFormula || item.system.degats,
         damageBase: damageContext.baseFormula || item.system.degats,
         damageCapped: damageContext.capped,
-        martialDvLabel: damageContext.martialDvSides ? `d${damageContext.martialDvSides}` : damageContext.martialDvFormula
+        martialDvLabel: damageContext.martialDvSides ? `d${damageContext.martialDvSides}` : damageContext.martialDvFormula,
+        defaultMode
       }
     );
 

modules/donjon-et-cie-rolls.mjs

@@ -372,11 +372,15 @@ export class DonjonEtCieRolls {
     }
     if (!isUsageDie && !item.system.degats) return null;
 
+    // Arme à 2 mains de corps à corps : avantage automatique
+    const isMeleeTwoHanded = item.type === "arme" && item.system.categorie === "melee" && Number(item.system.mains ?? 1) > 1;
+    if (isMeleeTwoHanded && mode === "normal") {
+      mode = "avantage";
+    }
+
     const damageContext = DonjonEtCieUtility.getMartialDamageContext(actor, item);
-    const actorBonus = Number(actor?.system?.combat?.degatsBonus ?? 0);
-    const totalBonus = actorBonus;
     const effectiveDamage = damageContext.effectiveFormula || (isUsageDie ? `1d${degatsDelta}` : item.system.degats);
-    const formula = totalBonus ? `${effectiveDamage} + ${totalBonus}` : effectiveDamage;
+    const formula = effectiveDamage;
     const result = await this.#resolveFormulaRoll(formula, {}, { mode, favorable: "high" });
     const targets = DonjonEtCieUtility.getSceneDamageTargets();
     const rollDieLabels = result.rolls.map((roll) => {
@@ -427,6 +431,12 @@ export class DonjonEtCieRolls {
       return null;
     }
 
+    // Arme à 2 mains de corps à corps : avantage automatique
+    const isMeleeTwoHanded = item.type === "arme" && item.system.categorie === "melee" && Number(item.system.mains ?? 1) > 1;
+    if (isMeleeTwoHanded && mode === "normal") {
+      mode = "avantage";
+    }
+
     const resolved = await this.#resolveFormulaRoll(`1d${before}`, {}, { mode, favorable: "high" });
     const result = resolved.kept;
     const degraded = result <= 3;

modules/donjon-et-cie-utility.mjs

@@ -76,8 +76,8 @@ export class DonjonEtCieUtility {
     const scene = canvas?.scene ?? game.scenes?.current;
     const tokens = scene?.tokens?.contents ?? [];
     
-    const selectedTokens = canvas?.tokens?.controlled ?? [];
-    const selectedTokenUuid = selectedTokens.length === 1 ? selectedTokens[0]?.uuid : null;
+    const targetedTokens = game.user?.targets ?? [];
+    const targetedTokenUuid = targetedTokens[0]?.uuid ?? null;
 
     return tokens
       .map((token) => {
@@ -93,7 +93,7 @@ export class DonjonEtCieUtility {
           tokenUuid: token.uuid,
           actorUuid: actor.uuid,
           label,
-          isSelected: token.uuid === selectedTokenUuid
+          isSelected: token.uuid === targetedTokenUuid
         };
       })
       .filter(Boolean)

modules/models/employe.mjs

@@ -50,7 +50,6 @@ export default class EmployeDataModel extends foundry.abstract.TypeDataModel {
       }),
       combat: new fields.SchemaField({
         initiativeBonus: new fields.NumberField({ initial: 0, integer: true }),
-        degatsBonus: new fields.NumberField({ initial: 0, integer: true }),
         attaquesCorpsACorps: new fields.NumberField({ initial: 1, integer: true }),
         attaquesDistance: new fields.NumberField({ initial: 1, integer: true })
       }),