From e9752f5461e31617ca0434d624ac175870915244 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 6 Dec 2025 15:15:52 +0100
Subject: [PATCH] Moved the damageFormula function to damageAction

---
 module/data/action/damageAction.mjs       | 13 +++++++++++++
 module/data/fields/action/damageField.mjs | 16 ----------------
 module/helpers/handlebarsHelper.mjs       |  2 +-
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/module/data/action/damageAction.mjs b/module/data/action/damageAction.mjs
index b4b3e17c..51735543 100644
--- a/module/data/action/damageAction.mjs
+++ b/module/data/action/damageAction.mjs
@@ -2,4 +2,17 @@ import DHBaseAction from './baseAction.mjs';
 
 export default class DHDamageAction extends DHBaseAction {
     static extraSchemas = [...super.extraSchemas, 'damage', 'target', 'effects'];
+
+    /**
+     * Return a display ready damage formula string
+     * @returns Formula string
+     */
+    getDamageFormula() {
+        const strings = [];
+        for (const { value } of this.damage.parts) {
+            strings.push(Roll.replaceFormulaData(value.getFormula(), this.actor?.getRollData() ?? {}));
+        }
+
+        return strings.join(' + ');
+    }
 }
diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs
index a7e313f1..bb81c702 100644
--- a/module/data/fields/action/damageField.mjs
+++ b/module/data/fields/action/damageField.mjs
@@ -161,22 +161,6 @@ export default class DamageField extends fields.SchemaField {
         return formulaValue;
     }
 
-    /**
-     * Return a display ready damage formula string
-     * Must be called within Action context or similar.
-     * @param {Array<object>} parts Damage Parts
-     * @param {object} data Action getRollData
-     * @returns Formula string
-     */
-    static getFormulaString(parts) {
-        const strings = [];
-        for (const { value } of parts) {
-            strings.push(Roll.replaceFormulaData(value.getFormula(), this.actor?.getRollData() ?? {}));
-        }
-
-        return strings.join(' + ');
-    }
-
     /**
      * Prepare formulas for Damage Roll
      * Must be called within Action context or similar.
diff --git a/module/helpers/handlebarsHelper.mjs b/module/helpers/handlebarsHelper.mjs
index 05f33b11..2faea830 100644
--- a/module/helpers/handlebarsHelper.mjs
+++ b/module/helpers/handlebarsHelper.mjs
@@ -36,7 +36,7 @@ export default class RegisterHandlebarsHelpers {
     }
 
     static damageFormula(attack) {
-        return game.system.api.fields.ActionFields.DamageField.getFormulaString.bind(attack)(attack.damage.parts);
+        return attack.getDamageFormula();
     }
 
     static formulaValue(formula, item) {