FIX - discarded dice don't count for fumble

Author: Julen-BZ

src/module/combat/ABFCombat.js

@@ -7,7 +7,7 @@ export default class ABFCombat extends Combat {
    */
   constructor(data, context) {
     super(data, context);
-    this.setFlag('world', 'newRound', true);
+    this.updateSource({ 'flags.world.newRound': true });
   }
 
   async startCombat() {
@@ -75,7 +75,8 @@ export default class ABFCombat extends Combat {
     for (const id of ids) {
       const combatant = this.combatants.get(id);
 
-      const baseInit = combatant.actor.system.characteristics.secondaries.initiative.final.value || 0;
+      const baseInit =
+        combatant.actor.system.characteristics.secondaries.initiative.final.value || 0;
       const formula = `${combatant._getInitiativeFormula()} + ${baseInit} + ${mod}`;
       await super.rollInitiative(id, { formula, updateTurn, messageOptions });
     }

src/module/rolls/ABFInitiativeRoll/ABFInitiativeRoll.js

@@ -13,12 +13,28 @@ export default class ABFInitiativeRoll extends ABFExploderRoll {
     });
   }
 
+  /** @private */
+  _getFinalDieResult() {
+    const d100 = this.foundryRoll.dice?.[0];
+    if (!d100 || !Array.isArray(d100.results)) return null;
+
+    const kept = d100.results.filter(
+      r => !r.discarded && r.active !== false && (r.count ?? 1) > 0
+    );
+
+    if (!kept.length) return null;
+
+    return kept[0].result;
+  }
+
   /** @private */
   calculateFumbledInitiativeMod() {
-    if (this.foundryRoll.firstResult === 1) return -126;
-    if (this.foundryRoll.firstResult === 2) return -102;
-    if (this.foundryRoll.firstResult <= this.fumbleRange)
-      return -75 - this.foundryRoll.firstResult;
+    const value = this._getFinalDieResult();
+    if (value == null) return 0;
+
+    if (value === 1) return -126;
+    if (value === 2) return -102;
+    if (value <= this.fumbleRange) return -75 - value;
 
     return 0;
   }