Reworked ActionConfig damage ui

module/applications/sheets-configs/action-base-config.mjs

@@ -1,4 +1,4 @@
-import { getNextUnusedDamageType } from '../../helpers/utils.mjs';
+import { getUnusedDamageTypes } from '../../helpers/utils.mjs';
 import DaggerheartSheet from '../sheets/daggerheart-sheet.mjs';
 
 const { ApplicationV2 } = foundry.applications.api;
@@ -269,12 +269,53 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
 
     static addDamage(_event) {
         if (!this.action.damage.parts) return;
+
+        const choices = getUnusedDamageTypes(this.action.damage.parts);
+        const content = new foundry.data.fields.StringField({
+            label: game.i18n.localize('Damage Type'),
+            choices,
+            required: true
+        }).toFormGroup(
+            {},
+            {
+                name: 'type',
+                localize: true,
+                nameAttr: 'value',
+                labelAttr: 'label'
+            }
+        ).outerHTML;
+
+        const callback = (_, button) => {
             const data = this.action.toObject();
-        const type = getNextUnusedDamageType(this.action.damage.parts);
+            const type = choices[button.form.elements.type.value].value;
             const part = { applyTo: type };
             if (this.action.actor?.isNPC) part.value = { multiplier: 'flat' };
             data.damage.parts[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 }
+                )
+            ],
+            content: content,
+            rejectClose: false,
+            modal: false,
+            window: {
+                title: game.i18n.localize('Add Damage')
+            },
+            position: { width: 300 }
+        });
+
+        typeDialog.render(true);
     }
 
     static removeDamage(_event, button) {

module/data/fields/action/damageField.mjs

@@ -287,6 +287,7 @@ export class DHDamageData extends DHResourceData {
         return {
             ...super.defineSchema(),
             base: new fields.BooleanField({ initial: false, readonly: true, label: 'Base' }),
+            // direct: new fields.BooleanField({ initial: false, label: 'DAGGERHEART.CONFIG.DamageType.direct.name' }),
             type: new fields.SetField(
                 new fields.StringField({
                     choices: CONFIG.DH.GENERAL.damageTypes,

module/helpers/utils.mjs

@@ -558,11 +558,15 @@ export function calculateExpectedValue(formulaOrTerms) {
     return terms.reduce((r, t) => r + (t.bonus ?? 0) + (t.diceQuantity ? (t.diceQuantity * (t.faces + 1)) / 2 : 0), 0);
 }
 
-export function getNextUnusedDamageType(parts) {
+export function getUnusedDamageTypes(parts) {
     const usedKeys = Object.keys(parts);
-    for (const key of Object.keys(CONFIG.DH.GENERAL.healingTypes)) {
+    return Object.keys(CONFIG.DH.GENERAL.healingTypes).reduce((acc, key) => {
-        if (!usedKeys.includes(key)) return key;
+        if (!usedKeys.includes(key))
-    }
+            acc.push({
+                value: key,
+                label: game.i18n.localize(CONFIG.DH.GENERAL.healingTypes[key].label)
+            });
 
-    return null;
+        return acc;
+    }, []);
 }

styles/less/global/elements.less

@@ -333,6 +333,15 @@
         legend {
             font-weight: bold;
             color: light-dark(@dark-blue, @golden);
+
+            &.with-icon {
+                display: flex;
+                align-items: center;
+
+                i {
+                    padding: 0 4px;
+                }
+            }
         }
 
         input[type='text'],

templates/actionTypes/damage.hbs

@@ -1,6 +1,6 @@
 
 <fieldset class="one-column">
-    <legend>
+    <legend class="with-icon">
         {{#if (eq @root.source.type 'healing')}}
             {{localize "DAGGERHEART.GENERAL.healing"}}
         {{else}}
@@ -19,6 +19,8 @@
     {{#each source.parts as |dmg key|}}
         <div class="nest-inputs">
             <fieldset{{#if dmg.base}} disabled{{/if}} class="one-column{{#if ../path}} no-style{{/if}}">
+                <legend class="with-icon">{{localize (concat "DAGGERHEART.CONFIG.HealingType." key ".name")}}{{#unless (or dmg.base ../path)}}<a data-action="removeDamage" data-key="{{key}}"><i class="fas fa-trash"></i></a>{{/unless}}</legend>
+
                 {{#if (and (not @root.isNPC) @root.hasRoll (not dmg.base))}}
                     {{formField ../fields.resultBased value=dmg.resultBased name=(concat "damage.parts." key ".resultBased") localize=true classes="checkbox"}}
                 {{/if}}
@@ -34,17 +36,13 @@
                         </fieldset>
                     </div>
                 {{else}}
-                    <fieldset{{#if dmg.base}} disabled{{/if}} class="one-column">
-                        <legend>{{localize "DAGGERHEART.GENERAL.formula"}}</legend>
                     {{> formula fields=../fields.value.fields type=../fields.type dmg=dmg source=dmg.value target="value" key=key path=../path}}
-                    </fieldset>
                 {{/if}}
-                <div class="nest-inputs">
+
-                    {{formField ../fields.applyTo value=dmg.applyTo name=(concat ../path "damage.parts." key ".applyTo") localize=true}}
                 {{#if (and (eq dmg.applyTo 'hitPoints') (ne @root.source.type 'healing'))}}
                     {{formField ../fields.type value=dmg.type name=(concat ../path "damage.parts." key ".type") localize=true}}
                 {{/if}}
-                </div>
+
                 {{#if ../horde}}
                     <fieldset class="one-column">
                         <legend>{{localize "DAGGERHEART.ACTORS.Adversary.hordeDamage"}}</legend>
@@ -58,7 +56,6 @@
                 {{/if}}
                 <input type="hidden" name="damage.parts.{{key}}.base" value="{{dmg.base}}">
             </fieldset>
-            {{#unless (or dmg.base ../path)}}<div class="fas fa-trash" data-action="removeDamage" data-key="{{key}}"></div>{{/unless}}
         </div>
     {{/each}}
 </fieldset>