From 87a7a7505b8d8b2be76957b63d8098c88ade6e84 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <cfern1990@gmail.com>
Date: Fri, 15 May 2026 20:23:59 -0400
Subject: [PATCH] Cleanup of damage outcomes add/remove

---
 .../sheets-configs/action-base-config.mjs     | 45 ++++++-------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/module/applications/sheets-configs/action-base-config.mjs b/module/applications/sheets-configs/action-base-config.mjs
index dda9a2b4..5fa37915 100644
--- a/module/applications/sheets-configs/action-base-config.mjs
+++ b/module/applications/sheets-configs/action-base-config.mjs
@@ -388,10 +388,8 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         if (!this.action.damage.parts) return;
 
         const outcome = button.dataset.outcome;
-        const outcomeParts =
-            outcome === 'default'
-                ? this.action._source.damage.parts
-                : this.action._source.damage.altOutcomes[outcome].parts;
+        const source = this.action._source;
+        const outcomeParts = outcome === 'default' ? source.damage.parts : source.damage.altOutcomes[outcome].parts;
         const choices = getUnusedDamageTypes(outcomeParts);
         const content = new foundry.data.fields.StringField({
             label: game.i18n.localize('Damage Type'),
@@ -412,32 +410,23 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
             const type = choices[button.form.elements.type.value].value;
             const part = this.action.schema.fields.damage.fields.parts.element.getInitialValue();
             part.applyTo = type;
-            if (type === CONFIG.DH.GENERAL.healingTypes.hitPoints.id)
+            if (type === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) {
                 part.type = this.action.schema.fields.damage.fields.parts.element.fields.type.element.initial;
-
-            if (outcome === 'default') data.damage.parts[type] = part;
-            else {
-                if (!data.damage.altOutcomes[outcome]) {
-                    data.damage.altOutcomes[outcome] = new AltDamageOutcome();
-                }
-
-                data.damage.altOutcomes[outcome].parts[type] = part;
             }
-
+            if (outcome !== 'default') data.damage.altOutcomes[outcome] ??= new AltDamageOutcome();
+            (outcome === 'default' ? data.damage.parts : data.damage.altOutcomes[outcome])[type] = part;
             this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
         };
 
         const typeDialog = new foundry.applications.api.DialogV2({
             buttons: [
-                foundry.utils.mergeObject(
-                    {
-                        action: 'ok',
-                        label: 'Confirm',
-                        icon: 'fas fa-check',
-                        default: true
-                    },
-                    { callback: callback }
-                )
+                {
+                    action: 'ok',
+                    label: 'Confirm',
+                    icon: 'fas fa-check',
+                    default: true,
+                    callback
+                }
             ],
             content: content,
             rejectClose: false,
@@ -455,14 +444,8 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         if (!this.action.damage.parts) return;
         const data = this.action.toObject();
         const { key, outcome } = button.dataset;
-        if (outcome === 'default') {
-            delete data.damage.parts[key];
-            data.damage.parts[`${key}`] = _del;
-        } else {
-            delete data.damage.altOutcomes[outcome].parts[key];
-            data.damage.altOutcomes[outcome].parts[`${key}`] = _del;
-        }
-
+        const parts = outcome === 'default' ? data.damage.parts : data.damage.altOutcomes[outcome].parts;
+        parts[key] = _del;
         this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
     }