FIX - mastery die formula replace

Author: Julen-BZ

src/module/actor/ABFActor.js

@@ -113,11 +113,13 @@ export class ABFActor extends Actor {
     const abilityValue = this.system.secondaries[groupPath][ability].final.value;
     const label = name ? `Rolling ${name}` : '';
     const mod = await openModDialog();
-    let formula = `1d100xa + ${abilityValue} + ${mod ?? 0}`;
+    let formula = `${
+      this.system.general.diceSettings.abilityDie.value
+    } + ${abilityValue} + ${mod ?? 0}`;
     if (abilityValue >= 200)
       formula = formula.replace(
-        this.system.general.diceSettings.abilityDie,
-        this.system.general.diceSettings.abilityMasteryDie
+        this.system.general.diceSettings.abilityDie.value,
+        this.system.general.diceSettings.abilityMasteryDie.value
       );
     const roll = new ABFFoundryRoll(formula, this.system);
     await roll.roll();

src/module/actor/ABFActorSheet.js

@@ -177,7 +177,18 @@ export default class ABFActorSheet extends ActorSheet {
       const label = dataset.label ? `Rolling ${dataset.label}` : '';
       const mod = await openModDialog();
       let formula = `${dataset.roll}+ ${mod}`;
-      if (parseInt(dataset.extra) >= 200) formula = formula.replace('xa', 'xamastery');
+      if (parseInt(dataset.extra) >= 200) {
+        formula = formula.replace(
+          this.actor.system.general.diceSettings.abilityDie.value,
+          this.actor.system.general.diceSettings.abilityMasteryDie.value
+        );
+        // let splittedFormula = formula.split(
+        //   this.actor.system.general.diceSettings.abilityDie.value
+        // );
+        // formula = splittedFormula.join(
+        //   this.actor.system.general.diceSettings.abilityMasteryDie.value
+        // );
+      }
       const roll = new ABFFoundryRoll(formula, this.actor.system);
 
       roll.toMessage({