[Feature] Downtime Improvements (#411)

* Initial * Fixed dialog again * Fix healing targeted resource in setting * Removed unused templates --------- Co-authored-by: Dapoolp <elcatnet@gmail.com>
2026-01-12 03:31:07 +01:00 · 2025-07-25 21:31:05 +02:00 · 2025-07-25 21:31:05 +02:00 · 62b9a8fbee
commit 62b9a8fbee
parent 3f95740b7a
25 changed files with 538 additions and 457 deletions
--- a/lang/en.json
+++ b/lang/en.json
@ -1472,6 +1472,7 @@
            "Appearance": {
                "FIELDS": {
                    "displayFear": { "label": "Fear Display" },
+                    "dualityColorScheme": { "label": "Chat Style" },
                    "showGenericStatusEffects": { "label": "Show Foundry Status Effects" }
                },
                "fearDisplay": {
@ -1552,7 +1553,7 @@
                    "duality": "Duality Rolls",
                    "diceSoNice": {
                        "title": "Dice So Nice",
-                        "hint": "Coloration of Hope and Fear dice if the Dice So Nice module is used.",
+                        "hint": "Coloration of Duality dice if the Dice So Nice module is used.",
                        "foreground": "Foreground",
                        "background": "Background",
                        "outline": "Outline",
--- a/module/applications/dialogs/downtime.mjs
+++ b/module/applications/dialogs/downtime.mjs
@ -64,8 +64,8 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
        context.selectedActivity = this.selectedActivity;
        context.moveData = this.moveData;

-        const shortRestMovesSelected = this.#nrSelectedMoves('shortRest');
-        const longRestMovesSelected = this.#nrSelectedMoves('longRest');
+        const shortRestMovesSelected = this.nrSelectedMoves('shortRest');
+        const longRestMovesSelected = this.nrSelectedMoves('longRest');
        context.nrChoices = {
            ...this.nrChoices,
            shortRest: {
@ -89,7 +89,7 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
    static selectMove(_, target) {
        const { category, move } = target.dataset;

-        const nrSelected = this.#nrSelectedMoves(category);
+        const nrSelected = this.nrSelectedMoves(category);

        if (nrSelected + this.nrChoices[category].taken >= this.nrChoices[category].max) {
            ui.notifications.error(game.i18n.localize('DAGGERHEART.UI.Notifications.noMoreMoves'));
@ -176,7 +176,7 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
        this.render();
    }

-    #nrSelectedMoves(category) {
+    nrSelectedMoves(category) {
        return Object.values(this.moveData[category].moves).reduce((acc, x) => acc + (x.selected ?? 0), 0);
    }
 }
--- a/module/applications/settings/appearanceSettings.mjs
+++ b/module/applications/settings/appearanceSettings.mjs
@ -36,10 +36,37 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
        }
    };

+    /** @inheritdoc */
+    static TABS = {
+        diceSoNice: {
+            tabs: [
+                { id: 'hope', label: 'DAGGERHEART.GENERAL.hope' },
+                { id: 'fear', label: 'DAGGERHEART.GENERAL.fear' },
+                { id: 'advantage', label: 'DAGGERHEART.GENERAL.Advantage.full' },
+                { id: 'disadvantage', label: 'DAGGERHEART.GENERAL.Advantage.full' }
+            ],
+            initial: 'hope'
+        }
+    };
+
+    changeTab(tab, group, options) {
+        super.changeTab(tab, group, options);
+
+        this.render();
+    }
+
    async _prepareContext(_options) {
        const context = await super._prepareContext(_options);
        context.settingFields = this.settings;

+        context.diceSoNiceTextures = game.dice3d?.exports?.TEXTURELIST ?? {};
+        context.diceSoNiceColorsets = game.dice3d?.exports?.COLORSETS ?? {};
+        context.diceTab = {
+            key: this.tabGroups.diceSoNice,
+            source: this.settings._source.diceSoNice[this.tabGroups.diceSoNice],
+            fields: this.settings.schema.fields.diceSoNice.fields[this.tabGroups.diceSoNice].fields
+        };
+
        return context;
    }

@ -65,4 +92,13 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App

        this.close();
    }
+
+    _getTabs(tabs) {
+        for (const v of Object.values(tabs)) {
+            v.active = this.tabGroups[v.group] ? this.tabGroups[v.group] === v.id : v.active;
+            v.cssClass = v.active ? 'active' : '';
+        }
+
+        return tabs;
+    }
 }
--- a/module/applications/settings/components/settingsActionsView.mjs
+++ b/module/applications/settings/components/settingsActionsView.mjs
@ -1,148 +0,0 @@
-import { actionsTypes } from '../../../data/action/_module.mjs';
-import DHActionConfig from '../../sheets-configs/action-config.mjs';
-
-const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
-
-export default class DhSettingsActionView extends HandlebarsApplicationMixin(ApplicationV2) {
-    constructor(resolve, reject, title, name, icon, img, description, actions) {
-        super({});
-
-        this.resolve = resolve;
-        this.reject = reject;
-        this.viewTitle = title;
-        this.name = name;
-        this.icon = icon;
-        this.img = img;
-        this.description = description;
-        this.actions = actions;
-    }
-
-    get title() {
-        return this.viewTitle;
-    }
-
-    static DEFAULT_OPTIONS = {
-        tag: 'form',
-        classes: ['daggerheart', 'setting', 'dh-style'],
-        position: { width: 440, height: 'auto' },
-        actions: {
-            editImage: this.onEditImage,
-            addItem: this.addItem,
-            editItem: this.editItem,
-            removeItem: this.removeItem,
-            resetMoves: this.resetMoves,
-            saveForm: this.saveForm
-        },
-        form: { handler: this.updateData, submitOnChange: true, closeOnSubmit: false }
-    };
-
-    static PARTS = {
-        header: { template: 'systems/daggerheart/templates/settings/components/action-view-header.hbs' },
-        main: {
-            template: 'systems/daggerheart/templates/settings/components/action-view.hbs'
-        },
-        footer: { template: 'systems/daggerheart/templates/settings/components/action-view-footer.hbs' }
-    };
-
-    async _prepareContext(_options) {
-        const context = await super._prepareContext(_options);
-        context.name = this.name;
-        context.icon = this.icon;
-        context.img = this.img;
-        context.description = this.description;
-        context.enrichedDescription = await foundry.applications.ux.TextEditor.enrichHTML(context.description);
-        context.actions = this.actions;
-
-        return context;
-    }
-
-    static async updateData(event, element, formData) {
-        const { name, icon, description } = foundry.utils.expandObject(formData.object);
-        this.name = name;
-        this.icon = icon;
-        this.description = description;
-
-        this.render();
-    }
-
-    static async saveForm(event) {
-        this.resolve({
-            name: this.name,
-            icon: this.icon,
-            img: this.img,
-            description: this.description,
-            actions: this.actions
-        });
-        this.close(true);
-    }
-
-    static close(fromSave) {
-        if (!fromSave) {
-            this.reject();
-        }
-
-        super.close();
-    }
-
-    static onEditImage() {
-        const fp = new foundry.applications.apps.FilePicker.implementation({
-            current: this.img,
-            type: 'image',
-            callback: async path => {
-                this.img = path;
-                this.render();
-            },
-            top: this.position.top + 40,
-            left: this.position.left + 10
-        });
-        return fp.browse();
-    }
-
-    async selectActionType() {
-        const content = await foundry.applications.handlebars.renderTemplate(
-                'systems/daggerheart/templates/actionTypes/actionType.hbs',
-                { types: CONFIG.DH.ACTIONS.actionTypes }
-            ),
-            title = 'Select Action Type',
-            type = 'form',
-            data = {};
-        return Dialog.prompt({
-            title,
-            label: title,
-            content,
-            type,
-            callback: html => {
-                const form = html[0].querySelector('form'),
-                    fd = new foundry.applications.ux.FormDataExtended(form);
-                foundry.utils.mergeObject(data, fd.object, { inplace: true });
-                return data;
-            },
-            rejectClose: false
-        });
-    }
-
-    static async addItem() {
-        const actionType = await this.selectActionType();
-        const cls = actionsTypes[actionType?.type] ?? actionsTypes.attack,
-            action = new cls({
-                _id: foundry.utils.randomID(),
-                type: actionType.type,
-                name: game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[actionType.type].name),
-                ...cls.getSourceConfig(this.document)
-            });
-
-        this.actions.push(action);
-        this.render();
-    }
-
-    static async editItem(_, button) {
-        await new DHActionConfig(this.actions[button.dataset.id]).render(true);
-    }
-
-    static removeItem(event, button) {
-        this.actions = this.actions.filter((_, index) => index !== Number.parseInt(button.dataset.id));
-        this.render();
-    }
-
-    static resetMoves() {}
-}
--- a/module/applications/settings/homebrewSettings.mjs
+++ b/module/applications/settings/homebrewSettings.mjs
@ -1,6 +1,4 @@
 import { DhHomebrew } from '../../data/settings/_module.mjs';
-import DhSettingsActionView from './components/settingsActionsView.mjs';
-
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;

 export default class DhHomebrewSettings extends HandlebarsApplicationMixin(ApplicationV2) {
@ -73,23 +71,21 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli

    static async editItem(_, target) {
        const move = this.settings.restMoves[target.dataset.type].moves[target.dataset.id];
-        new Promise((resolve, reject) => {
-            new DhSettingsActionView(
-                resolve,
-                reject,
-                game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.downtimeMoves'),
-                move.name,
-                move.icon,
-                move.img,
-                move.description,
-                move.actions
-            ).render(true);
-        }).then(data => this.updateAction.bind(this)(data, target.dataset.type, target.dataset.id));
+        const path = `restMoves.${target.dataset.type}.moves.${target.dataset.id}`;
+        const editedMove = await game.system.api.applications.sheetConfigs.DowntimeConfig.configure(
+            move,
+            path,
+            this.settings
+        );
+        if (!editedMove) return;
+
+        await this.updateAction.bind(this)(editedMove, target.dataset.type, target.dataset.id);
    }

    async updateAction(data, type, id) {
        await this.settings.updateSource({
            [`restMoves.${type}.moves.${id}`]: {
+                actions: data.actions,
                name: data.name,
                icon: data.icon,
                img: data.img,
@ -139,7 +135,11 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
                acc[key] = {
                    ...move,
                    name: game.i18n.localize(move.name),
-                    description: game.i18n.localize(move.description)
+                    description: game.i18n.localize(move.description),
+                    actions: move.actions.map(action => ({
+                        ...action,
+                        name: game.i18n.localize(action.name)
+                    }))
                };

                return acc;
--- a/module/applications/sheets-configs/_module.mjs
+++ b/module/applications/sheets-configs/_module.mjs
@ -1,6 +1,7 @@
 export { default as ActionConfig } from './action-config.mjs';
 export { default as AdversarySettings } from './adversary-settings.mjs';
 export { default as CompanionSettings } from './companion-settings.mjs';
+export { default as DowntimeConfig } from './downtimeConfig.mjs';
 export { default as EnvironmentSettings } from './environment-settings.mjs';
 export { default as ActiveEffectConfig } from './activeEffectConfig.mjs';
 export { default as DhTokenConfig } from './token-config.mjs';
--- a/module/applications/sheets-configs/action-config.mjs
+++ b/module/applications/sheets-configs/action-config.mjs
@ -2,10 +2,11 @@ import DaggerheartSheet from '../sheets/daggerheart-sheet.mjs';

 const { ApplicationV2 } = foundry.applications.api;
 export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
-    constructor(action) {
+    constructor(action, sheetUpdate) {
        super({});

        this.action = action;
+        this.sheetUpdate = sheetUpdate;
        this.openSection = null;
    }

@ -171,6 +172,8 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
        const submitData = this._prepareSubmitData(event, formData),
            data = foundry.utils.mergeObject(this.action.toObject(), submitData);
        this.action = await this.action.update(data);
+
+        this.sheetUpdate?.(this.action);
        this.render();
    }

--- a/module/applications/sheets-configs/downtimeConfig.mjs
+++ b/module/applications/sheets-configs/downtimeConfig.mjs
@ -0,0 +1,162 @@
+import { actionsTypes } from '../../data/action/_module.mjs';
+import DHActionConfig from './action-config.mjs';
+
+const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
+
+export default class DowntimeConfig extends HandlebarsApplicationMixin(ApplicationV2) {
+    constructor(move, movePath, settings, options) {
+        super(options);
+
+        this.move = move;
+
+        this.movePath = movePath;
+        this.actionsPath = `${movePath}.actions`;
+        this.settings = settings;
+    }
+
+    get title() {
+        return game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.downtimeMoves');
+    }
+
+    static DEFAULT_OPTIONS = {
+        tag: 'form',
+        classes: ['daggerheart', 'setting', 'dh-style'],
+        position: { width: 440, height: 'auto' },
+        window: {
+            icon: 'fa-solid fa-gears'
+        },
+        actions: {
+            editImage: this.onEditImage,
+            addItem: this.addItem,
+            editItem: this.editItem,
+            removeItem: this.removeItem,
+            resetMoves: this.resetMoves,
+            saveForm: this.saveForm
+        },
+        form: { handler: this.updateData, submitOnChange: true, closeOnSubmit: false }
+    };
+
+    static PARTS = {
+        header: { template: 'systems/daggerheart/templates/settings/downtime-config/header.hbs' },
+        tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
+        main: { template: 'systems/daggerheart/templates/settings/downtime-config/main.hbs' },
+        actions: { template: 'systems/daggerheart/templates/settings/downtime-config/actions.hbs' },
+        footer: { template: 'systems/daggerheart/templates/settings/downtime-config/footer.hbs' }
+    };
+
+    /** @inheritdoc */
+    static TABS = {
+        primary: {
+            tabs: [{ id: 'main' }, { id: 'actions' }],
+            initial: 'main',
+            labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
+        }
+    };
+
+    async _prepareContext(_options) {
+        const context = await super._prepareContext(_options);
+        context.move = this.move;
+        context.move.enrichedDescription = await foundry.applications.ux.TextEditor.enrichHTML(
+            context.move.description
+        );
+
+        return context;
+    }
+
+    static async updateData(event, element, formData) {
+        const data = foundry.utils.expandObject(formData.object);
+        foundry.utils.mergeObject(this.move, data);
+
+        this.render();
+    }
+
+    static async saveForm() {
+        this.close({ submitted: true });
+    }
+
+    static onEditImage() {
+        const fp = new foundry.applications.apps.FilePicker.implementation({
+            current: this.img,
+            type: 'image',
+            callback: async path => {
+                this.move.img = path;
+                this.render();
+            },
+            top: this.position.top + 40,
+            left: this.position.left + 10
+        });
+        return fp.browse();
+    }
+
+    async selectActionType() {
+        return (
+            (await foundry.applications.api.DialogV2.input({
+                window: { title: game.i18n.localize('DAGGERHEART.CONFIG.SelectAction.selectType') },
+                content: await foundry.applications.handlebars.renderTemplate(
+                    'systems/daggerheart/templates/actionTypes/actionType.hbs',
+                    { types: CONFIG.DH.ACTIONS.actionTypes }
+                ),
+                ok: {
+                    label: game.i18n.format('DOCUMENT.Create', {
+                        type: game.i18n.localize('DAGGERHEART.GENERAL.Action.single')
+                    })
+                }
+            })) ?? {}
+        );
+    }
+
+    static async addItem() {
+        const { type: actionType } = await this.selectActionType();
+        if (!actionType) return;
+
+        const cls = actionsTypes[actionType] ?? actionsTypes.attack,
+            action = new cls(
+                {
+                    type: actionType,
+                    name: game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[actionType].name),
+                    img: 'icons/magic/life/cross-worn-green.webp',
+                    actionType: 'action',
+                    systemPath: this.actionsPath
+                },
+                {
+                    parent: this.settings
+                }
+            );
+
+        await this.settings.updateSource({ [`${this.actionsPath}.${action.id}`]: action });
+        this.move = foundry.utils.getProperty(this.settings, this.movePath);
+
+        this.render();
+    }
+
+    static async editItem(_, target) {
+        const actionId = target.dataset.id;
+        const action = this.move.actions.get(actionId);
+        await new DHActionConfig(action, async updatedMove => {
+            await this.settings.updateSource({ [`${this.actionsPath}.${actionId}`]: updatedMove });
+            this.move = foundry.utils.getProperty(this.settings, this.movePath);
+            this.render();
+        }).render(true);
+    }
+
+    static async removeItem(_, target) {
+        await this.settings.updateSource({ [`${this.actionsPath}.-=${target.dataset.id}`]: null });
+        this.move = foundry.utils.getProperty(this.settings, this.movePath);
+        this.render();
+    }
+
+    static resetMoves() {}
+
+    /** @override */
+    _onClose(options = {}) {
+        if (!options.submitted) this.move = null;
+    }
+
+    static async configure(move, movePath, settings, options = {}) {
+        return new Promise(resolve => {
+            const app = new this(move, movePath, settings, options);
+            app.addEventListener('close', () => resolve(app.move), { once: true });
+            app.render({ force: true });
+        });
+    }
+}
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@ -138,8 +138,8 @@ export const defaultRestOptions = {
            icon: 'fa-solid fa-bandage',
            img: 'icons/magic/life/cross-worn-green.webp',
            description: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.shortRest.tendToWounds.description'),
-            actions: [
-                {
+            actions: {
+                tendToWounds: {
                    type: 'healing',
                    name: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.shortRest.tendToWounds.name'),
                    img: 'icons/magic/life/cross-worn-green.webp',
@ -154,7 +154,7 @@ export const defaultRestOptions = {
                        }
                    }
                }
-            ]
+            }
        },
        clearStress: {
            id: 'clearStress',
@ -162,8 +162,8 @@ export const defaultRestOptions = {
            icon: 'fa-regular fa-face-surprise',
            img: 'icons/magic/perception/eye-ringed-green.webp',
            description: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.shortRest.clearStress.description'),
-            actions: [
-                {
+            actions: {
+                clearStress: {
                    type: 'healing',
                    name: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.shortRest.clearStress.name'),
                    img: 'icons/magic/perception/eye-ringed-green.webp',
@ -178,7 +178,7 @@ export const defaultRestOptions = {
                        }
                    }
                }
-            ]
+            }
        },
        repairArmor: {
            id: 'repairArmor',
@ -186,8 +186,8 @@ export const defaultRestOptions = {
            icon: 'fa-solid fa-hammer',
            img: 'icons/skills/trades/smithing-anvil-silver-red.webp',
            description: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.shortRest.repairArmor.description'),
-            actions: [
-                {
+            actions: {
+                repairArmor: {
                    type: 'healing',
                    name: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.shortRest.repairArmor.name'),
                    img: 'icons/skills/trades/smithing-anvil-silver-red.webp',
@ -202,7 +202,7 @@ export const defaultRestOptions = {
                        }
                    }
                }
-            ]
+            }
        },
        prepare: {
            id: 'prepare',
@ -210,7 +210,7 @@ export const defaultRestOptions = {
            icon: 'fa-solid fa-dumbbell',
            img: 'icons/skills/trades/academics-merchant-scribe.webp',
            description: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.shortRest.prepare.description'),
-            actions: []
+            actions: {}
        }
    }),
    longRest: () => ({
@ -220,7 +220,23 @@ export const defaultRestOptions = {
            icon: 'fa-solid fa-bandage',
            img: 'icons/magic/life/cross-worn-green.webp',
            description: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.longRest.tendToWounds.description'),
-            actions: []
+            actions: {
+                tendToWounds: {
+                    type: 'healing',
+                    name: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.longRest.tendToWounds.name'),
+                    img: 'icons/magic/life/cross-worn-green.webp',
+                    actionType: 'action',
+                    healing: {
+                        applyTo: healingTypes.hitPoints.id,
+                        value: {
+                            custom: {
+                                enabled: true,
+                                formula: '@system.resources.hitPoints.max'
+                            }
+                        }
+                    }
+                }
+            }
        },
        clearStress: {
            id: 'clearStress',
@ -228,7 +244,23 @@ export const defaultRestOptions = {
            icon: 'fa-regular fa-face-surprise',
            img: 'icons/magic/perception/eye-ringed-green.webp',
            description: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.longRest.clearStress.description'),
-            actions: []
+            actions: {
+                clearStress: {
+                    type: 'healing',
+                    name: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.longRest.clearStress.name'),
+                    img: 'icons/magic/perception/eye-ringed-green.webp',
+                    actionType: 'action',
+                    healing: {
+                        applyTo: healingTypes.stress.id,
+                        value: {
+                            custom: {
+                                enabled: true,
+                                formula: '@system.resources.stress.max'
+                            }
+                        }
+                    }
+                }
+            }
        },
        repairArmor: {
            id: 'repairArmor',
@ -236,7 +268,23 @@ export const defaultRestOptions = {
            icon: 'fa-solid fa-hammer',
            img: 'icons/skills/trades/smithing-anvil-silver-red.webp',
            description: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.longRest.repairArmor.description'),
-            actions: []
+            actions: {
+                repairArmor: {
+                    type: 'healing',
+                    name: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.longRest.repairArmor.name'),
+                    img: 'icons/skills/trades/smithing-anvil-silver-red.webp',
+                    actionType: 'action',
+                    healing: {
+                        applyTo: healingTypes.armorStack.id,
+                        value: {
+                            custom: {
+                                enabled: true,
+                                formula: '@system.armorScore'
+                            }
+                        }
+                    }
+                }
+            }
        },
        prepare: {
            id: 'prepare',
@ -244,7 +292,7 @@ export const defaultRestOptions = {
            icon: 'fa-solid fa-dumbbell',
            img: 'icons/skills/trades/academics-merchant-scribe.webp',
            description: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.longRest.prepare.description'),
-            actions: []
+            actions: {}
        },
        workOnAProject: {
            id: 'workOnAProject',
@ -252,7 +300,7 @@ export const defaultRestOptions = {
            icon: 'fa-solid fa-diagram-project',
            img: 'icons/skills/social/thumbsup-approval-like.webp',
            description: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.longRest.workOnAProject.description'),
-            actions: []
+            actions: {}
        }
    })
 };
--- a/module/data/fields/actionField.mjs
+++ b/module/data/fields/actionField.mjs
@ -1,5 +1,5 @@
-import DHActionConfig from "../../applications/sheets-configs/action-config.mjs";
-import MappingField from "./mappingField.mjs";
+import DHActionConfig from '../../applications/sheets-configs/action-config.mjs';
+import MappingField from './mappingField.mjs';

 /**
 * Specialized collection type for stored actions.
@ -81,7 +81,10 @@ export class ActionsField extends MappingField {
 */
 export class ActionField extends foundry.data.fields.ObjectField {
    getModel(value) {
-        return game.system.api.models.actions.actionsTypes[value.type] ?? game.system.api.models.actions.actionsTypes.attack;
+        return (
+            game.system.api.models.actions.actionsTypes[value.type] ??
+            game.system.api.models.actions.actionsTypes.attack
+        );
    }

    /* -------------------------------------------- */
@ -122,8 +125,8 @@ export class ActionField extends foundry.data.fields.ObjectField {
 export function ActionMixin(Base) {
    class Action extends Base {
        static metadata = Object.freeze({
-          name: "Action",
-          label: "DAGGERHEART.GENERAL.Action.single",
+            name: 'Action',
+            label: 'DAGGERHEART.GENERAL.Action.single',
            sheetClass: DHActionConfig
        });

@ -167,15 +170,12 @@ export function ActionMixin(Base) {
            if (!type || !game.system.api.models.actions.actionsTypes[type]) {
                ({ type } =
                    (await foundry.applications.api.DialogV2.input({
-                    window: { title: 'Select Action Type' },
+                        window: { title: game.i18n.localize('DAGGERHEART.CONFIG.SelectAction.selectType') },
                        position: { width: 300 },
                        classes: ['daggerheart', 'dh-style'],
                        content: await foundry.applications.handlebars.renderTemplate(
                            'systems/daggerheart/templates/actionTypes/actionType.hbs',
-                        {
-                          types: CONFIG.DH.ACTIONS.actionTypes,
-                          itemName: parent.parent?.name
-                        }
+                            { types: CONFIG.DH.ACTIONS.actionTypes }
                        ),
                        ok: {
                            label: game.i18n.format('DOCUMENT.Create', {
@ -204,9 +204,20 @@ export function ActionMixin(Base) {
        }

        async update(updates, options = {}) {
-          const path = this.inCollection ? `system.${this.systemPath}.${this.id}` : `system.${this.systemPath}`,
+            const isSetting = !this.parent.parent;
+            const basePath = isSetting ? this.systemPath : `system.${this.systemPath}`;
+            const path = this.inCollection ? `${basePath}.${this.id}` : basePath;
+            let result = null;
+            if (isSetting) {
+                await this.parent.updateSource({ [path]: updates }, options);
+                result = this.parent;
+            } else {
                result = await this.item.update({ [path]: updates }, options);
-          return this.inCollection ? foundry.utils.getProperty(result, `system.${this.systemPath}`).get(this.id) : foundry.utils.getProperty(result, `system.${this.systemPath}`);
+            }
+
+            return this.inCollection
+                ? foundry.utils.getProperty(result, basePath).get(this.id)
+                : foundry.utils.getProperty(result, basePath);
        }

        delete() {
--- a/module/data/settings/Appearance.mjs
+++ b/module/data/settings/Appearance.mjs
@ -13,7 +13,8 @@ export default class DhAppearance extends foundry.abstract.DataModel {
            dualityColorScheme: new fields.StringField({
                required: true,
                choices: DualityRollColor,
-                initial: DualityRollColor.normal.value
+                initial: DualityRollColor.normal.value,
+                label: 'DAGGERHEART.SETTINGS.Appearance.FIELDS.dualityColorScheme.label'
            }),
            diceSoNice: new fields.SchemaField({
                hope: new fields.SchemaField({
--- a/module/data/settings/Homebrew.mjs
+++ b/module/data/settings/Homebrew.mjs
@ -1,4 +1,5 @@
 import { defaultRestOptions } from '../../config/generalConfig.mjs';
+import { ActionsField } from '../fields/actionField.mjs';

 export default class DhHomebrew extends foundry.abstract.DataModel {
    static LOCALIZATION_PREFIXES = ['DAGGERHEART.SETTINGS.Homebrew']; // Doesn't work for some reason
@ -61,7 +62,7 @@ export default class DhHomebrew extends foundry.abstract.DataModel {
                                base64: false
                            }),
                            description: new fields.HTMLField(),
-                            actions: new fields.ArrayField(new fields.ObjectField())
+                            actions: new ActionsField()
                        }),
                        { initial: defaultRestOptions.longRest() }
                    )
@ -78,7 +79,7 @@ export default class DhHomebrew extends foundry.abstract.DataModel {
                                base64: false
                            }),
                            description: new fields.HTMLField(),
-                            actions: new fields.ArrayField(new fields.ObjectField())
+                            actions: new ActionsField()
                        }),
                        { initial: defaultRestOptions.shortRest() }
                    )
--- a/styles/less/global/tab-form-footer.less
+++ b/styles/less/global/tab-form-footer.less
@ -1,7 +1,15 @@
-.sheet.daggerheart.dh-style {
+.daggerheart.dh-style {
    .tab-form-footer {
        display: flex;
+        gap: 8px;
+
+        &.spaced {
+            margin-top: 8px;
+        }
+
+        &.padded {
            padding: 0 10px;
+        }

        button {
            flex: 1;
--- a/styles/less/ui/settings/settings.less
+++ b/styles/less/ui/settings/settings.less
@ -29,6 +29,7 @@
    }

    .settings-items {
+        width: 100%;
        display: flex;
        flex-direction: column;
        gap: 8px;
--- a/templates/actionTypes/healing.hbs
+++ b/templates/actionTypes/healing.hbs
@ -24,7 +24,7 @@
    {{else}}
        {{> formula fields=fields.value.fields source=source.value target="value"}}
    {{/if}}
-    {{formField fields.applyTo value=source.type name="healing.applyTo" localize=true}}
+    {{formField fields.applyTo value=source.applyTo name="healing.applyTo" localize=true}}
 </fieldset>

 {{#*inline "formula"}}
--- a/templates/settings/appearance-settings.hbs
+++ b/templates/settings/appearance-settings.hbs
@ -5,111 +5,49 @@
    {{formGroup settingFields.schema.fields.displayFear value=settingFields._source.displayFear localize=true}}
    {{formGroup settingFields.schema.fields.showGenericStatusEffects value=settingFields._source.showGenericStatusEffects localize=true}}

+    {{formGroup settingFields.schema.fields.dualityColorScheme value=settingFields._source.dualityColorScheme localize=true}}
+
    <fieldset>
-        <legend>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.duality"}}</legend>
-
-        {{formInput settingFields.schema.fields.dualityColorScheme value=settingFields._source.dualityColorScheme localize=true}}
-
-        <h2>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.title"}}</h2>
+        <legend>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.title"}}</legend>
        <div class="title-hint">{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.hint"}}</div>

-        <fieldset>
-            <legend>{{localize "DAGGERHEART.GENERAL.hope"}}</legend>
+        <section class='tab-navigation'>
+            <div class='navigation-container'>
+                <div class="navigation-inner-container">
+                    <line-div></line-div>
+                    <nav class='feature-tab sheet-tabs tabs' data-group='diceSoNice'>
+                        {{#each tabs as |tab|}}
+                            <a class='{{tab.id}} {{tab.cssClass}}' data-action='tab' data-group='{{tab.group}}' data-tab='{{tab.id}}'>
+                                {{localize tab.label}}
+                            </a>
+                        {{/each}}
+                    </nav>
+                    <line-div></line-div>
+                </div>
+            </div>
+        </section>

        <div class="field-section">
            <div class="split-section">
                <div class="label-container">
                    <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.foreground"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.hope.fields.foreground value=settingFields._source.diceSoNice.hope.foreground localize=true}}
+                    {{formInput diceTab.fields.foreground value=diceTab.source.foreground localize=true}}
                </div>
                <div class="label-container">
                    <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.background"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.hope.fields.background value=settingFields._source.diceSoNice.hope.background localize=true}}
+                    {{formInput diceTab.fields.background value=diceTab.source.background localize=true}}
                </div>
                <div class="label-container">
                    <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.outline"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.hope.fields.outline value=settingFields._source.diceSoNice.hope.outline localize=true}}
+                    {{formInput diceTab.fields.outline value=diceTab.source.outline localize=true}}
                </div>
                <div class="label-container">
                    <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.edge"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.hope.fields.edge value=settingFields._source.diceSoNice.hope.edge localize=true}}
+                    {{formInput diceTab.fields.edge value=diceTab.source.edge localize=true}}
                </div>
            </div>
        </div>
    </fieldset>
-        <fieldset>
-            <legend>{{localize "DAGGERHEART.GENERAL.fear"}}</legend>
-
-            <div class="field-section">
-                <div class="split-section">
-                    <div class="label-container">
-                        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.foreground"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.fear.fields.foreground value=settingFields._source.diceSoNice.fear.foreground localize=true}}
-                    </div>
-                    <div class="label-container">
-                        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.background"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.fear.fields.background value=settingFields._source.diceSoNice.fear.background localize=true}}
-                    </div>
-                    <div class="label-container">
-                        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.outline"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.fear.fields.outline value=settingFields._source.diceSoNice.fear.outline localize=true}}
-                    </div>
-                    <div class="label-container">
-                        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.edge"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.fear.fields.edge value=settingFields._source.diceSoNice.fear.edge localize=true}}
-                    </div>
-                </div>
-            </div>
-        </fieldset>
-        <fieldset>
-            <legend>{{localize "DAGGERHEART.GENERAL.Advantage.full"}}</legend>
-
-            <div class="field-section">
-                <div class="split-section">
-                    <div class="label-container">
-                        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.foreground"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.advantage.fields.foreground value=settingFields._source.diceSoNice.advantage.foreground localize=true}}
-                    </div>
-                    <div class="label-container">
-                        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.background"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.advantage.fields.background value=settingFields._source.diceSoNice.advantage.background localize=true}}
-                    </div>
-                    <div class="label-container">
-                        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.outline"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.advantage.fields.outline value=settingFields._source.diceSoNice.advantage.outline localize=true}}
-                    </div>
-                    <div class="label-container">
-                        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.edge"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.advantage.fields.edge value=settingFields._source.diceSoNice.advantage.edge localize=true}}
-                    </div>
-                </div>
-            </div>
-        </fieldset>
-        <fieldset>
-            <legend>{{localize "DAGGERHEART.GENERAL.Disadvantage.full"}}</legend>
-
-            <div class="field-section">
-                <div class="split-section">
-                    <div class="label-container">
-                        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.foreground"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.disadvantage.fields.foreground value=settingFields._source.diceSoNice.disadvantage.foreground localize=true}}
-                    </div>
-                    <div class="label-container">
-                        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.background"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.disadvantage.fields.background value=settingFields._source.diceSoNice.disadvantage.background localize=true}}
-                    </div>
-                    <div class="label-container">
-                        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.outline"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.disadvantage.fields.outline value=settingFields._source.diceSoNice.disadvantage.outline localize=true}}
-                    </div>
-                    <div class="label-container">
-                        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.edge"}}</label>
-                        {{formInput settingFields.schema.fields.diceSoNice.fields.disadvantage.fields.edge value=settingFields._source.diceSoNice.disadvantage.edge localize=true}}
-                    </div>
-                </div>
-            </div>
-        </fieldset>
-    </fieldset>

    <footer class="form-footer">
        <button data-action="reset">
--- a/templates/settings/components/action-view.hbs
+++ b/templates/settings/components/action-view.hbs
@ -1,17 +0,0 @@
-<div>
-    <div class="form-group">
-        <label>{{localize "Icon"}}</label>
-
-        <div class="form-field">
-            <input type="text" name="icon" value="{{icon}}" />
-        </div>
-    </div>
-
-    <fieldset>
-        <legend>{{localize "Description"}}</legend>
-        
-        <prose-mirror name="description" value="{{description}}">
-            {{{ enrichedDescription }}}
-        </prose-mirror>
-    </fieldset>
-</div>
--- a/templates/settings/downtime-config/actions.hbs
+++ b/templates/settings/downtime-config/actions.hbs
@ -0,0 +1,15 @@
+<section
+    class='tab {{tabs.actions.cssClass}} {{tabs.actions.id}}'
+    data-tab='{{tabs.actions.id}}'
+    data-group='{{tabs.actions.group}}'
+>
+    <fieldset class="one-column">
+        <legend>{{localize "DAGGERHEART.GENERAL.Action.plural"}} <a><i class="fa-solid fa-plus icon-button" data-action="addItem"></i></a></legend>
+
+        <div class="settings-items">
+            {{#each move.actions as |action|}}
+                {{> "systems/daggerheart/templates/settings/components/settings-item-line.hbs" id=action.id }}
+            {{/each}}
+        </div>
+    </fieldset>
+</section>
--- a/templates/settings/components/action-view-footer.hbs
+++ b/templates/settings/components/action-view-footer.hbs
@ -1,3 +1,4 @@
-<section class='tab-form-footer'>
+<section class='tab-form-footer spaced'>
+    <button data-action="close">{{localize "Cancel"}}</button>
    <button data-action="saveForm"><i class="fa-solid fa-floppy-disk"></i> {{localize "Save"}}</button>
 </section>
--- a/templates/settings/components/action-view-header.hbs
+++ b/templates/settings/components/action-view-header.hbs
@ -1,6 +1,6 @@
 <header class='settings-item-header'>
-    <img class='profile' src='{{this.img}}' data-action='editImage' data-edit='img' />
+    <img class='profile' src='{{move.img}}' data-action='editImage' data-edit='img' />
    <div class='item-info'>
-        <h1 class='item-name'><input type='text' name='name' value='{{this.name}}' /></h1>
+        <h1 class='item-name'><input type='text' name='name' value='{{move.name}}' /></h1>
    </div>
 </header>
--- a/templates/settings/downtime-config/main.hbs
+++ b/templates/settings/downtime-config/main.hbs
@ -0,0 +1,19 @@
+<section
+    class='tab {{tabs.main.cssClass}} {{tabs.main.id}}'
+    data-tab='{{tabs.main.id}}'
+    data-group='{{tabs.main.group}}'
+>
+    <fieldset class="one-column">
+        <legend>{{localize "Icon"}}</legend>
+
+        <input type="text" name="icon" value="{{move.icon}}" />
+    </fieldset>
+
+    <fieldset class="one-column">
+        <legend>{{localize "Description"}}</legend>
+        
+        <prose-mirror name="description" value="{{move.description}}">
+            {{{ move.enrichedDescription }}}
+        </prose-mirror>
+    </fieldset>
+</section>
--- a/templates/sheets-settings/action-settings/base.hbs
+++ b/templates/sheets-settings/action-settings/base.hbs
@ -12,6 +12,6 @@
    </fieldset>
    <fieldset class="action-category">
        <legend>{{localize "DAGGERHEART.GENERAL.description"}}</legend>
-        {{formInput fields.description value=source.description name="description" }}
+        {{formInput fields.description value=source.description enriched=source.description name="description" toggled=true }}
    </fieldset>
 </section>
--- a/templates/sheets/actors/adversary/sidebar.hbs
+++ b/templates/sheets/actors/adversary/sidebar.hbs
@ -9,7 +9,7 @@
        <div class="resources-section">
            <div class="status-bar">
                <div class='status-value'>
-                    <p><input class="bar-input" name="system.resources.hitPoints.value"
+                    <p><input class="bar-input" name="system.resources.hitPoints.value" min="0" max='{{source.system.resources.hitPoints.max}}'
                            value="{{source.system.resources.hitPoints.value}}" type="number"></p>
                    <p>/</p>
                    <p class="bar-label">{{source.system.resources.hitPoints.max}}</p>
@ -23,7 +23,7 @@
            </div>
            <div class="status-bar">
                <div class='status-value'>
-                    <p><input class="bar-input" name="system.resources.stress.value"
+                    <p><input class="bar-input" name="system.resources.stress.value" min="0" max='{{source.system.resources.stress.max}}'
                            value="{{source.system.resources.stress.value}}" type="number"></p>
                    <p>/</p>
                    <p class="bar-label">{{source.system.resources.stress.max}}</p>
--- a/templates/sheets/actors/companion/header.hbs
+++ b/templates/sheets/actors/companion/header.hbs
@ -19,7 +19,7 @@
        </div>
        <div class="status-bar">
            <div class='status-value'>
-                <p><input class="bar-input" name="system.resources.stress.value" value="{{document.system.resources.stress.value}}" type="number"></p>
+                <p><input class="bar-input" name="system.resources.stress.value" value="{{document.system.resources.stress.value}}" min="0" max='{{document.system.resources.stress.max}}' type="number"></p>
                <p>/</p>
                <p class="bar-label">{{document.system.resources.stress.max}}</p>
            </div>
--- a/templates/sheets/global/tabs/tab-form-footer.hbs
+++ b/templates/sheets/global/tabs/tab-form-footer.hbs
@ -1,3 +1,3 @@
-<section class='tab-form-footer'>
+<section class='tab-form-footer padded'>
    <button type="submit"><i class="fa-solid fa-floppy-disk"></i> {{localize "Save"}}</button>
 </section>