From ed3c4a9da26e12216c897a27188bd6f3d01f2911 Mon Sep 17 00:00:00 2001
From: Dapoolp <elcatnet@gmail.com>
Date: Sat, 16 Aug 2025 13:38:03 +0200
Subject: [PATCH] l

---
 module/data/action/macroAction.mjs         |  4 ++--
 module/data/fields/action/effectsField.mjs | 12 ++++++++++++
 module/data/fields/action/macroField.mjs   |  2 +-
 module/data/fields/action/saveField.mjs    | 12 ++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/module/data/action/macroAction.mjs b/module/data/action/macroAction.mjs
index 58b8eba5..cca8a3a1 100644
--- a/module/data/action/macroAction.mjs
+++ b/module/data/action/macroAction.mjs
@@ -3,7 +3,7 @@ import DHBaseAction from './baseAction.mjs';
 export default class DHMacroAction extends DHBaseAction {
     static extraSchemas = [...super.extraSchemas, 'macro'];
 
-    async trigger(event, ...args) {
+    /* async trigger(event, ...args) {
         const fixUUID = !this.macro.includes('Macro.') ? `Macro.${this.macro}` : this.macro,
             macro = await fromUuid(fixUUID);
         try {
@@ -12,5 +12,5 @@ export default class DHMacroAction extends DHBaseAction {
         } catch (error) {
             ui.notifications.error(error);
         }
-    }
+    } */
 }
diff --git a/module/data/fields/action/effectsField.mjs b/module/data/fields/action/effectsField.mjs
index ddc69d2d..f6b736b5 100644
--- a/module/data/fields/action/effectsField.mjs
+++ b/module/data/fields/action/effectsField.mjs
@@ -1,6 +1,8 @@
 const fields = foundry.data.fields;
 
 export default class EffectsField extends fields.ArrayField {
+    static order = 100;
+
     constructor(options = {}, context = {}) {
         const element = new fields.SchemaField({
             _id: new fields.DocumentIdField(),
@@ -8,4 +10,14 @@ export default class EffectsField extends fields.ArrayField {
         });
         super(element, options, context);
     }
+
+    static async execute(config) {
+        if(!this.hasRoll) {
+            const roll = new CONFIG.Dice.daggerheart.DHRoll('');
+            roll._evaluated = true;
+            await CONFIG.Dice.daggerheart.DHRoll.toMessage(roll, config);
+        } else {
+            return;
+        }
+    }
 }
diff --git a/module/data/fields/action/macroField.mjs b/module/data/fields/action/macroField.mjs
index 57c13050..6556a404 100644
--- a/module/data/fields/action/macroField.mjs
+++ b/module/data/fields/action/macroField.mjs
@@ -1,7 +1,7 @@
 const fields = foundry.data.fields;
 
 export default class MacroField extends fields.DocumentUUIDField {
-    static order = 100;
+    static order = 200;
 
     constructor(context = {}) {
         super({ type: "Macro" }, context);
diff --git a/module/data/fields/action/saveField.mjs b/module/data/fields/action/saveField.mjs
index e93a82a9..12bf51f9 100644
--- a/module/data/fields/action/saveField.mjs
+++ b/module/data/fields/action/saveField.mjs
@@ -1,6 +1,8 @@
 const fields = foundry.data.fields;
 
 export default class SaveField extends fields.SchemaField {
+    static order = 75;
+
     constructor(options = {}, context = {}) {
         const saveFields = {
             trait: new fields.StringField({
@@ -16,4 +18,14 @@ export default class SaveField extends fields.SchemaField {
         };
         super(saveFields, options, context);
     }
+
+    static async execute(config) {
+        if(!this.hasRoll) {
+            const roll = new CONFIG.Dice.daggerheart.DHRoll('');
+            roll._evaluated = true;
+            await CONFIG.Dice.daggerheart.DHRoll.toMessage(roll, config);
+        } else {
+            return;
+        }
+    }
 }