From 301a040da25e83db24f7612d6782ee7779dd45e5 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Thu, 10 Jul 2025 13:10:47 +0200
Subject: [PATCH] PR fixes

---
 module/data/chat-message/dualityRoll.mjs | 13 -------------
 module/dice/dualityRoll.mjs              |  8 +-------
 module/helpers/utils.mjs                 |  6 +++---
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/module/data/chat-message/dualityRoll.mjs b/module/data/chat-message/dualityRoll.mjs
index 62b07d6f..63fa9fa3 100644
--- a/module/data/chat-message/dualityRoll.mjs
+++ b/module/data/chat-message/dualityRoll.mjs
@@ -1,19 +1,6 @@
 import DHAdversaryRoll from './adversaryRoll.mjs';
 
 export default class DHDualityRoll extends DHAdversaryRoll {
-    static defineSchema() {
-        const fields = foundry.data.fields;
-
-        return {
-            ...super.defineSchema(),
-            result: new fields.SchemaField({
-                duality: new fields.NumberField({ integer: true }),
-                label: new fields.StringField(),
-                total: new fields.NumberField({ integer: true })
-            })
-        };
-    }
-
     get messageTemplate() {
         return 'systems/daggerheart/templates/ui/chat/duality-roll.hbs';
     }
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 6b991f8a..e466b7fc 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -143,12 +143,6 @@ export default class DualityRoll extends D20Roll {
             label: roll.totalLabel
         };
 
-        const advantageState =
-            config.roll.advantage == this.ADV_MODE.ADVANTAGE
-                ? true
-                : config.roll.advantage == this.ADV_MODE.DISADVANTAGE
-                  ? false
-                  : null;
-        setDiceSoNiceForDualityRoll(roll, advantageState);
+        setDiceSoNiceForDualityRoll(roll, config.roll.advantage);
     }
 }
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 0bb2088e..81da1edb 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -122,14 +122,14 @@ export const getCommandTarget = () => {
     return target;
 };
 
-export const setDiceSoNiceForDualityRoll = (rollResult, advantageState) => {
+export const setDiceSoNiceForDualityRoll = (rollResult, advantage) => {
     const diceSoNicePresets = getDiceSoNicePresets();
     rollResult.dice[0].options = { appearance: diceSoNicePresets.hope };
     rollResult.dice[1].options = { appearance: diceSoNicePresets.fear }; //diceSoNicePresets.fear;
     if (rollResult.dice[2]) {
-        if (advantageState === true) {
+        if (advantage.type === 1) {
             rollResult.dice[2].options = { appearance: diceSoNicePresets.advantage };
-        } else if (advantageState === false) {
+        } else if (advantage.type === -1) {
             rollResult.dice[2].options = { appearance: diceSoNicePresets.disadvantage };
         }
     }