Merge branch 'development' into feature-rollTableSheet

module/applications/dialogs/_module.mjs

@@ -1,5 +1,6 @@
 export { default as AttributionDialog } from './attributionDialog.mjs';
 export { default as BeastformDialog } from './beastformDialog.mjs';
+export { default as CharacterResetDialog } from './characterResetDialog.mjs';
 export { default as d20RollDialog } from './d20RollDialog.mjs';
 export { default as DamageDialog } from './damageDialog.mjs';
 export { default as DamageReductionDialog } from './damageReductionDialog.mjs';

module/applications/dialogs/characterResetDialog.mjs

@@ -0,0 +1,105 @@
+const { ApplicationV2, HandlebarsApplicationMixin } = foundry.applications.api;
+
+export default class CharacterResetDialog extends HandlebarsApplicationMixin(ApplicationV2) {
+    constructor(actor, options = {}) {
+        super(options);
+
+        this.actor = actor;
+        this.data = {
+            delete: {
+                class: { keep: false, label: 'TYPES.Item.class' },
+                subclass: { keep: false, label: 'TYPES.Item.subclass' },
+                ancestry: { keep: false, label: 'TYPES.Item.ancestry' },
+                community: { keep: false, label: 'TYPES.Item.community' }
+            },
+            optional: {
+                portrait: { keep: true, label: 'DAGGERHEART.GENERAL.portrait' },
+                name: { keep: true, label: 'Name' },
+                biography: { keep: true, label: 'DAGGERHEART.GENERAL.Tabs.biography' },
+                inventory: { keep: true, label: 'DAGGERHEART.GENERAL.inventory' }
+            }
+        };
+    }
+
+    static DEFAULT_OPTIONS = {
+        tag: 'form',
+        classes: ['daggerheart', 'dialog', 'dh-style', 'views', 'character-reset'],
+        window: {
+            icon: 'fa-solid fa-arrow-rotate-left',
+            title: 'DAGGERHEART.APPLICATIONS.CharacterReset.title'
+        },
+        actions: {
+            finishSelection: this.#finishSelection
+        },
+        form: {
+            handler: this.updateData,
+            submitOnChange: true,
+            submitOnClose: false
+        }
+    };
+
+    /** @override */
+    static PARTS = {
+        resourceDice: {
+            id: 'resourceDice',
+            template: 'systems/daggerheart/templates/dialogs/characterReset.hbs'
+        }
+    };
+
+    async _prepareContext(_options) {
+        const context = await super._prepareContext(_options);
+        context.data = this.data;
+
+        return context;
+    }
+
+    static async updateData(event, _, formData) {
+        const { data } = foundry.utils.expandObject(formData.object);
+
+        this.data = foundry.utils.mergeObject(this.data, data);
+        this.render();
+    }
+
+    static getUpdateData() {
+        const update = {};
+        if (!this.data.optional.portrait) update.if(!this.data.optional.biography);
+
+        if (!this.data.optional.inventory) return update;
+    }
+
+    static async #finishSelection() {
+        const update = {};
+        if (!this.data.optional.name.keep) {
+            const defaultName = game.system.api.documents.DhpActor.defaultName({ type: 'character' });
+            foundry.utils.setProperty(update, 'name', defaultName);
+            foundry.utils.setProperty(update, 'prototypeToken.name', defaultName);
+        }
+
+        if (!this.data.optional.portrait.keep) {
+            foundry.utils.setProperty(update, 'img', this.actor.schema.fields.img.initial(this.actor));
+            foundry.utils.setProperty(update, 'prototypeToken.==texture', {});
+            foundry.utils.setProperty(update, 'prototypeToken.==ring', {});
+        }
+
+        if (this.data.optional.biography.keep)
+            foundry.utils.setProperty(update, 'system.biography', this.actor.system.biography);
+
+        if (this.data.optional.inventory.keep) foundry.utils.setProperty(update, 'system.gold', this.actor.system.gold);
+
+        const { system, ...rest } = update;
+        await this.actor.update({
+            ...rest,
+            '==system': system ?? {}
+        });
+
+        const inventoryItemTypes = ['weapon', 'armor', 'consumable', 'loot'];
+        await this.actor.deleteEmbeddedDocuments(
+            'Item',
+            this.actor.items
+                .filter(x => !inventoryItemTypes.includes(x.type) || !this.data.optional.inventory.keep)
+                .map(x => x.id)
+        );
+
+        this.close();
+    }
+}

module/applications/dialogs/deathMove.mjs

@@ -54,10 +54,9 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
 
         if (!config.roll.fate) return;
 
+        let returnMessage = game.i18n.localize('DAGGERHEART.UI.Chat.deathMove.avoidScar');
         if (config.roll.fate.value <= this.actor.system.levelData.level.current) {
-            // apply scarring - for now directly apply - later add a button.
             const newScarAmount = this.actor.system.scars + 1;
-
             await this.actor.update({
                 system: {
                     scars: newScarAmount
@@ -65,13 +64,15 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
             });
 
             if (newScarAmount >= this.actor.system.resources.hope.max) {
+                await this.actor.setDeathMoveDefeated(CONFIG.DH.GENERAL.defeatedConditionChoices.dead.id);
                 return game.i18n.format('DAGGERHEART.UI.Chat.deathMove.journeysEnd', { scars: newScarAmount });
             }
 
-            return game.i18n.localize('DAGGERHEART.UI.Chat.deathMove.gainScar');
+            returnMessage = game.i18n.localize('DAGGERHEART.UI.Chat.deathMove.gainScar');
         }
 
-        return game.i18n.localize('DAGGERHEART.UI.Chat.deathMove.avoidScar');
+        await this.actor.setDeathMoveDefeated(CONFIG.DH.GENERAL.defeatedConditionChoices.unconscious.id);
+        return returnMessage;
     }
 
     async handleRiskItAll() {
@@ -84,6 +85,7 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
             label: game.i18n.localize('DAGGERHEART.GENERAL.dualityDice'),
             actionType: null,
             advantage: null,
+            grantResources: false,
             customConfig: { skips: { resources: true, reaction: true } }
         });
 
@@ -118,6 +120,7 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
         }
 
         if (config.roll.result.duality == -1) {
+            await this.actor.setDeathMoveDefeated(CONFIG.DH.GENERAL.defeatedConditionChoices.dead.id);
             chatMessage = game.i18n.localize('DAGGERHEART.UI.Chat.deathMove.riskItAllFailure');
         }
 
@@ -141,6 +144,7 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
             }
         ]);
 
+        await this.actor.setDeathMoveDefeated(CONFIG.DH.GENERAL.defeatedConditionChoices.dead.id);
         return game.i18n.localize('DAGGERHEART.UI.Chat.deathMove.blazeOfGlory');
     }
 

module/applications/levelup/levelupViewMode.mjs

@@ -70,7 +70,10 @@ export default class DhlevelUpViewMode extends HandlebarsApplicationMixin(Applic
                         return checkbox;
                     });
 
-                    let label = game.i18n.localize(option.label);
+                    let label =
+                        optionKey === 'domainCard'
+                            ? game.i18n.format(option.label, { maxLevel: tier.levels.end })
+                            : game.i18n.localize(option.label);
                     return {
                         label: label,
                         checkboxGroups: chunkify(checkboxes, option.minCost, chunkedBoxes => {

module/applications/sheets/actors/character.mjs

@@ -669,26 +669,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
      * Resets the character data and removes all embedded documents.
      */
     static async #resetCharacter() {
-        const confirmed = await foundry.applications.api.DialogV2.confirm({
-            window: {
-                title: game.i18n.localize('DAGGERHEART.ACTORS.Character.resetCharacterConfirmationTitle')
-            },
-            content: game.i18n.localize('DAGGERHEART.ACTORS.Character.resetCharacterConfirmationContent')
-        });
-
-        if (!confirmed) return;
-
-        await this.document.update({
-            '==system': {}
-        });
-        await this.document.deleteEmbeddedDocuments(
-            'Item',
-            this.document.items.map(x => x.id)
-        );
-        await this.document.deleteEmbeddedDocuments(
-            'ActiveEffect',
-            this.document.effects.map(x => x.id)
-        );
+        new game.system.api.applications.dialogs.CharacterResetDialog(this.document).render({ force: true });
     }
 
     /**
@@ -753,8 +734,9 @@ export default class CharacterSheet extends DHBaseActorSheet {
         if (!result) return;
 
         /* This could be avoided by baking config.costs into config.resourceUpdates. Didn't feel like messing with it at the time */
-        const costResources = result.costs?.filter(x => x.enabled)
-            .map(cost => ({ ...cost, value: -cost.value, total: -cost.total })) || {};
+        const costResources =
+            result.costs?.filter(x => x.enabled).map(cost => ({ ...cost, value: -cost.value, total: -cost.total })) ||
+            {};
         config.resourceUpdates.addResources(costResources);
         await config.resourceUpdates.updateResources();
     }