From ef42f1f7829fb2035e0e1b66178836195d21cfa6 Mon Sep 17 00:00:00 2001
From: Dapoulp <74197441+Dapoulp@users.noreply.github.com>
Date: Sun, 3 Aug 2025 01:03:34 +0200
Subject: [PATCH] Remove DualityDie class (#535)

---
 daggerheart.mjs             |  8 +-------
 module/dice/_module.mjs     |  1 -
 module/dice/dualityDie.mjs  |  5 -----
 module/dice/dualityRoll.mjs | 20 ++++++++++----------
 4 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 module/dice/dualityDie.mjs

diff --git a/daggerheart.mjs b/daggerheart.mjs
index d0b003bc..af72e504 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -8,7 +8,7 @@ import RegisterHandlebarsHelpers from './module/helpers/handlebarsHelper.mjs';
 import { enricherConfig, enricherRenderSetup } from './module/enrichers/_module.mjs';
 import { getCommandTarget, rollCommandToJSON } from './module/helpers/utils.mjs';
 import { NarrativeCountdowns } from './module/applications/ui/countdowns.mjs';
-import { DHRoll, DualityRoll, D20Roll, DamageRoll, DualityDie } from './module/dice/_module.mjs';
+import { DHRoll, DualityRoll, D20Roll, DamageRoll } from './module/dice/_module.mjs';
 import { enrichedDualityRoll } from './module/enrichers/DualityRollEnricher.mjs';
 import { registerCountdownHooks } from './module/data/countdowns.mjs';
 import {
@@ -42,18 +42,12 @@ Hooks.once('init', () => {
     ];
 
     CONFIG.Dice.daggerheart = {
-        DualityDie: DualityDie,
         DHRoll: DHRoll,
         DualityRoll: DualityRoll,
         D20Roll: D20Roll,
         DamageRoll: DamageRoll
     };
 
-    CONFIG.Dice.terms = {
-        ...CONFIG.Dice.terms,
-        DualityDie
-    };
-
     CONFIG.Dice.rolls = [...CONFIG.Dice.rolls, DHRoll, DualityRoll, D20Roll, DamageRoll];
     Roll.CHAT_TEMPLATE = 'systems/daggerheart/templates/ui/chat/foundryRoll.hbs';
     Roll.TOOLTIP_TEMPLATE = 'systems/daggerheart/templates/ui/chat/foundryRollTooltip.hbs';
diff --git a/module/dice/_module.mjs b/module/dice/_module.mjs
index 93c8c53a..f34f32d3 100644
--- a/module/dice/_module.mjs
+++ b/module/dice/_module.mjs
@@ -1,5 +1,4 @@
 export { default as D20Roll } from './d20Roll.mjs';
 export { default as DamageRoll } from './damageRoll.mjs';
 export { default as DHRoll } from './dhRoll.mjs';
-export { default as DualityDie } from './dualityDie.mjs';
 export { default as DualityRoll } from './dualityRoll.mjs';
diff --git a/module/dice/dualityDie.mjs b/module/dice/dualityDie.mjs
deleted file mode 100644
index f8fa0410..00000000
--- a/module/dice/dualityDie.mjs
+++ /dev/null
@@ -1,5 +0,0 @@
-export default class DualityDie extends foundry.dice.terms.Die {
-    constructor({ number = 1, faces = 12, ...args } = {}) {
-        super({ number, faces, ...args });
-    }
-}
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index b180396e..35bae725 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -25,26 +25,26 @@ export default class DualityRoll extends D20Roll {
 
     get dHope() {
         // if ( !(this.terms[0] instanceof foundry.dice.terms.Die) ) return;
-        if (!(this.dice[0] instanceof CONFIG.Dice.daggerheart.DualityDie)) this.createBaseDice();
+        if (!(this.dice[0] instanceof foundry.dice.terms.Die)) this.createBaseDice();
         return this.dice[0];
         // return this.#hopeDice;
     }
 
     set dHope(faces) {
-        if (!(this.dice[0] instanceof CONFIG.Dice.daggerheart.DualityDie)) this.createBaseDice();
+        if (!(this.dice[0] instanceof foundry.dice.terms.Die)) this.createBaseDice();
         this.terms[0].faces = this.getFaces(faces);
         // this.#hopeDice = `d${face}`;
     }
 
     get dFear() {
         // if ( !(this.terms[1] instanceof foundry.dice.terms.Die) ) return;
-        if (!(this.dice[1] instanceof CONFIG.Dice.daggerheart.DualityDie)) this.createBaseDice();
+        if (!(this.dice[1] instanceof foundry.dice.terms.Die)) this.createBaseDice();
         return this.dice[1];
         // return this.#fearDice;
     }
 
     set dFear(faces) {
-        if (!(this.dice[1] instanceof CONFIG.Dice.daggerheart.DualityDie)) this.createBaseDice();
+        if (!(this.dice[1] instanceof foundry.dice.terms.Die)) this.createBaseDice();
         this.dice[1].faces = this.getFaces(faces);
         // this.#fearDice = `d${face}`;
     }
@@ -119,22 +119,22 @@ export default class DualityRoll extends D20Roll {
 
     /** @inheritDoc */
     static fromData(data) {
-        data.terms[0].class = game.system.api.dice.DualityDie.name;
-        data.terms[2].class = game.system.api.dice.DualityDie.name;
+        data.terms[0].class = foundry.dice.terms.Die.name;
+        data.terms[2].class = foundry.dice.terms.Die.name;
         return super.fromData(data);
     }
 
     createBaseDice() {
         if (
-            this.dice[0] instanceof CONFIG.Dice.daggerheart.DualityDie &&
-            this.dice[1] instanceof CONFIG.Dice.daggerheart.DualityDie
+            this.dice[0] instanceof foundry.dice.terms.Die &&
+            this.dice[1] instanceof foundry.dice.terms.Die
         ) {
             this.terms = [this.terms[0], this.terms[1], this.terms[2]];
             return;
         }
-        this.terms[0] = new CONFIG.Dice.daggerheart.DualityDie();
+        this.terms[0] = new foundry.dice.terms.Die({ faces: 12 });
         this.terms[1] = new foundry.dice.terms.OperatorTerm({ operator: '+' });
-        this.terms[2] = new CONFIG.Dice.daggerheart.DualityDie();
+        this.terms[2] = new foundry.dice.terms.Die({ faces: 12 });
     }
 
     applyAdvantage() {