From bf6befa7d8a1b73b17ec54f9cc1049ef3f7f7118 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Mon, 25 May 2026 17:42:46 +0200
Subject: [PATCH] Fixed so that advantage dice do not get duplicated

---
 module/applications/dialogs/d20RollDialog.mjs | 14 +++++------
 module/dice/dualityRoll.mjs                   | 24 ++++++++++++-------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/module/applications/dialogs/d20RollDialog.mjs b/module/applications/dialogs/d20RollDialog.mjs
index 067aa473..76b2e751 100644
--- a/module/applications/dialogs/d20RollDialog.mjs
+++ b/module/applications/dialogs/d20RollDialog.mjs
@@ -175,14 +175,14 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         this.disadvantage = advantage === -1;
 
         this.config.roll.advantage = this.config.roll.advantage === advantage ? 0 : advantage;
+        if (this.config.roll.advantage === 0) return this.render();
 
-        if (this.config.roll.advantage === 1 && this.config.data.rules.roll.defaultAdvantageDice) {
-            const faces = Number.parseInt(this.config.data.rules.roll.defaultAdvantageDice);
-            this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
-        } else if (this.config.roll.advantage === -1 && this.config.data.rules.roll.defaultDisadvantageDice) {
-            const faces = Number.parseInt(this.config.data.rules.roll.defaultDisadvantageDice);
-            this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
-        }
+        const defaultFaces =
+            this.config.roll.advantage === 1
+                ? this.config.data.rules.roll.defaultAdvantageDice
+                : this.config.data.rules.roll.defaultDisadvantageDice;
+        const faces = Number.parseInt(defaultFaces);
+        this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
 
         this.render();
     }
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 5e03a680..d58811fe 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -148,14 +148,22 @@ export default class DualityRoll extends D20Roll {
     }
 
     applyAdvantage() {
-        if (this.hasAdvantage || this.hasDisadvantage) {
-            const dieFaces = this.advantageFaces,
-                advDie = new foundry.dice.terms.Die({ faces: dieFaces, number: this.advantageNumber });
-            if (this.advantageNumber > 1) advDie.modifiers = ['kh'];
-            this.terms.push(
-                new foundry.dice.terms.OperatorTerm({ operator: this.hasDisadvantage ? '-' : '+' }),
-                advDie
-            );
+        const advDieClass = this.hasAdvantage
+            ? game.system.api.dice.diceTypes.AdvantageDie
+            : this.hasDisadvantage
+              ? game.system.api.dice.diceTypes.DisadvantageDie
+              : null;
+        if (advDieClass) {
+            const advDie = new advDieClass({ faces: this.advantageFaces, number: this.advantageNumber });
+            if (this.terms.length < 4) {
+                if (this.advantageNumber > 1) advDie.modifiers = ['kh'];
+                this.terms.push(
+                    new foundry.dice.terms.OperatorTerm({ operator: this.hasDisadvantage ? '-' : '+' }),
+                    advDie
+                );
+            } else {
+                this.terms[4] = advDie;
+            }
         }
         if (this.rallyFaces)
             this.terms.push(