From 014b14d80cdd5d784d4a8b07c48cb3e00bbbe63d Mon Sep 17 00:00:00 2001
From: Kevin Garner <kevinleegarner@gmail.com>
Date: Sun, 12 Jan 2025 01:00:11 -0600
Subject: [PATCH] Fixed an issue where simplifying formulas evaluates to NaN.
 When this occurs, default to unaltered formula.

---
 src/features/actions/actions.svelte.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/features/actions/actions.svelte.ts b/src/features/actions/actions.svelte.ts
index 3e706ecbe..4203224f3 100644
--- a/src/features/actions/actions.svelte.ts
+++ b/src/features/actions/actions.svelte.ts
@@ -223,14 +223,20 @@ async function mapActionItem(item: Item5e): Promise<ActionItem> {
       ? [...item.labels.damages].map(
           ({ formula, label, damageType }: any, i: number) => {
             const damage = getActivityFirstDamage(item);
-            const rawDamagePartFormula = damage.parts?.[0]?.formula;
+            const rawDamagePartFormula = damage.parts?.[0]?.[0];
 
             if (rawDamagePartFormula?.trim() === '') {
               formula = '';
             }
 
+            const formulaBeforeSimplificaton = formula;
+
             formula = simplifyFormula(formula, true);
 
+            if (formula.includes('NaN')) {
+              formula = formulaBeforeSimplificaton;
+            }
+
             const damageHealingTypeLabel =
               FoundryAdapter.lookupDamageType(damageType) ??
               FoundryAdapter.lookupHealingType(damageType) ??