Merged with main

module/applications/dialogs/CompendiumBrowserSettings.mjs

@@ -0,0 +1,143 @@
+const { ApplicationV2, HandlebarsApplicationMixin } = foundry.applications.api;
+
+export default class CompendiumBrowserSettings extends HandlebarsApplicationMixin(ApplicationV2) {
+    constructor() {
+        super();
+
+        this.browserSettings = game.settings
+            .get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.CompendiumBrowserSettings)
+            .toObject();
+    }
+
+    static DEFAULT_OPTIONS = {
+        tag: 'div',
+        classes: ['daggerheart', 'dialog', 'dh-style', 'views', 'compendium-brower-settings'],
+        window: {
+            icon: 'fa-solid fa-book',
+            title: 'DAGGERHEART.APPLICATIONS.CompendiumBrowserSettings.title'
+        },
+        position: {
+            width: 500
+        },
+        actions: {
+            toggleSource: CompendiumBrowserSettings.#toggleSource,
+            finish: CompendiumBrowserSettings.#finish
+        }
+    };
+
+    /** @override */
+    static PARTS = {
+        packs: {
+            id: 'packs',
+            template: 'systems/daggerheart/templates/dialogs/compendiumBrowserSettingsDialog/packs.hbs'
+        },
+        footer: { template: 'systems/daggerheart/templates/dialogs/compendiumBrowserSettingsDialog/footer.hbs' }
+    };
+
+    static #browserPackTypes = ['Actor', 'Item'];
+
+    _attachPartListeners(partId, htmlElement, options) {
+        super._attachPartListeners(partId, htmlElement, options);
+
+        for (const element of htmlElement.querySelectorAll('.pack-checkbox'))
+            element.addEventListener('change', this.toggleTypedPack.bind(this));
+    }
+
+    /**@inheritdoc */
+    async _prepareContext(_options) {
+        const context = await super._prepareContext(_options);
+
+        const excludedSourceData = this.browserSettings.excludedSources;
+        const excludedPackData = this.browserSettings.excludedPacks;
+        context.typePackCollections = game.packs.reduce((acc, pack) => {
+            const { type, label, packageType, packageName: basePackageName, id } = pack.metadata;
+            if (!CompendiumBrowserSettings.#browserPackTypes.includes(type)) return acc;
+
+            const isWorldPack = packageType === 'world';
+            const packageName = isWorldPack ? 'world' : basePackageName;
+            const sourceChecked =
+                !excludedSourceData[packageName] ||
+                !excludedSourceData[packageName].excludedDocumentTypes.includes(type);
+
+            const sourceLabel =
+                game.modules.get(packageName)?.title ??
+                (isWorldPack
+                    ? game.i18n.localize('DAGGERHEART.APPLICATIONS.CompendiumBrowserSettings.worldCompendiums')
+                    : game.system.title);
+            if (!acc[type]) acc[type] = { label: game.i18n.localize(`DOCUMENT.${type}s`), sources: {} };
+            if (!acc[type].sources[packageName])
+                acc[type].sources[packageName] = { label: sourceLabel, checked: sourceChecked, packs: [] };
+
+            const checked = !excludedPackData[id] || !excludedPackData[id].excludedDocumentTypes.includes(type);
+
+            acc[type].sources[packageName].packs.push({
+                pack: id,
+                type,
+                label: id === game.system.id ? game.system.title : game.i18n.localize(label),
+                checked: checked
+            });
+
+            return acc;
+        }, {});
+
+        return context;
+    }
+
+    static #toggleSource(event, button) {
+        event.stopPropagation();
+
+        const { type, source } = button.dataset;
+        const currentlyExcluded = this.browserSettings.excludedSources[source]
+            ? this.browserSettings.excludedSources[source].excludedDocumentTypes.includes(type)
+            : false;
+
+        if (!this.browserSettings.excludedSources[source])
+            this.browserSettings.excludedSources[source] = { excludedDocumentTypes: [] };
+        this.browserSettings.excludedSources[source].excludedDocumentTypes = currentlyExcluded
+            ? this.browserSettings.excludedSources[source].excludedDocumentTypes.filter(x => x !== type)
+            : [...(this.browserSettings.excludedSources[source]?.excludedDocumentTypes ?? []), type];
+
+        const toggleIcon = button.querySelector('a > i');
+        toggleIcon.classList.toggle('fa-toggle-off');
+        toggleIcon.classList.toggle('fa-toggle-on');
+        button.closest('.source-container').querySelector('.checks-container').classList.toggle('collapsed');
+    }
+
+    toggleTypedPack(event) {
+        event.stopPropagation();
+
+        const { type, pack } = event.target.dataset;
+        const currentlyExcluded = this.browserSettings.excludedPacks[pack]
+            ? this.browserSettings.excludedPacks[pack].excludedDocumentTypes.includes(type)
+            : false;
+
+        if (!this.browserSettings.excludedPacks[pack])
+            this.browserSettings.excludedPacks[pack] = { excludedDocumentTypes: [] };
+        this.browserSettings.excludedPacks[pack].excludedDocumentTypes = currentlyExcluded
+            ? this.browserSettings.excludedPacks[pack].excludedDocumentTypes.filter(x => x !== type)
+            : [...(this.browserSettings.excludedPacks[pack]?.excludedDocumentTypes ?? []), type];
+
+        this.render();
+    }
+
+    static async #finish() {
+        const settings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.CompendiumBrowserSettings);
+        await settings.updateSource(this.browserSettings);
+        await game.settings.set(
+            CONFIG.DH.id,
+            CONFIG.DH.SETTINGS.gameSettings.CompendiumBrowserSettings,
+            settings.toObject()
+        );
+
+        this.updated = true;
+        this.close();
+    }
+
+    static async configure() {
+        return new Promise(resolve => {
+            const app = new this();
+            app.addEventListener('close', () => resolve(app.updated), { once: true });
+            app.render({ force: true });
+        });
+    }
+}

module/applications/dialogs/_module.mjs

@@ -16,3 +16,4 @@ export { default as ActionSelectionDialog } from './actionSelectionDialog.mjs';
 export { default as GroupRollDialog } from './group-roll-dialog.mjs';
 export { default as TagTeamDialog } from './tagTeamDialog.mjs';
 export { default as RiskItAllDialog } from './riskItAllDialog.mjs';
+export { default as CompendiumBrowserSettingsDialog } from './CompendiumBrowserSettings.mjs';

module/applications/dialogs/attributionDialog.mjs

@@ -54,7 +54,11 @@ export default class AttributionDialog extends HandlebarsApplicationMixin(Applic
                     const after = label.slice(matchIndex + search.length, label.length);
 
                     const element = document.createElement('li');
-                    element.innerHTML = `${beforeText}${matchText ? `<strong>${matchText}</strong>` : ''}${after}`;
+                    element.innerHTML =
+                        `${beforeText}${matchText ? `<strong>${matchText}</strong>` : ''}${after}`.replaceAll(
+                            ' ',
+                            '&nbsp;'
+                        );
                     if (item.hint) {
                         element.dataset.tooltip = game.i18n.localize(item.hint);
                     }

module/applications/dialogs/d20RollDialog.mjs

@@ -165,9 +165,10 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         }
         if (rest.hasOwnProperty('trait')) {
             this.config.roll.trait = rest.trait;
-            this.config.title = game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
-                ability: game.i18n.localize(abilities[this.config.roll.trait]?.label)
-            });
+            if (!this.config.source.item)
+                this.config.title = game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
+                    ability: game.i18n.localize(abilities[this.config.roll.trait]?.label)
+                });
         }
         this.config.extraFormula = rest.extraFormula;
         this.render();

module/applications/dialogs/deathMove.mjs

@@ -43,7 +43,7 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
         return context;
     }
 
-    async handleAvoidDeath() {
+    async handleAvoidDeath(useAutomation) {
         const target = this.actor.uuid;
         const config = await enrichedFateRoll({
             target,
@@ -53,6 +53,7 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
         });
 
         if (!config.roll.fate) return;
+        if (!useAutomation) return '';
 
         let returnMessage = game.i18n.localize('DAGGERHEART.UI.Chat.deathMove.avoidScar');
         if (config.roll.fate.value <= this.actor.system.levelData.level.current) {
@@ -75,7 +76,7 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
         return returnMessage;
     }
 
-    async handleRiskItAll() {
+    async handleRiskItAll(useAutomation) {
         const config = await enrichedDualityRoll({
             reaction: true,
             traitValue: null,
@@ -90,6 +91,7 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
         });
 
         if (!config.roll.result) return;
+        if (!useAutomation) return '';
 
         const clearAllStressAndHitpointsUpdates = [
             { key: 'hitPoints', clear: true },
@@ -128,7 +130,9 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
         return chatMessage;
     }
 
-    async handleBlazeOfGlory() {
+    async handleBlazeOfGlory(useAutomation) {
+        if (!useAutomation) return '';
+
         this.actor.createEmbeddedDocuments('ActiveEffect', [
             {
                 name: game.i18n.localize('DAGGERHEART.CONFIG.DeathMoves.blazeOfGlory.name'),
@@ -160,19 +164,23 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
 
         let result = '';
 
+        const deathMoveAutomation = game.settings.get(
+            CONFIG.DH.id,
+            CONFIG.DH.SETTINGS.gameSettings.Automation
+        ).deathMoveAutomation;
         if (CONFIG.DH.GENERAL.deathMoves.blazeOfGlory === this.selectedMove) {
-            result = await this.handleBlazeOfGlory();
+            result = await this.handleBlazeOfGlory(deathMoveAutomation.blazeOfGlory);
         }
 
         if (CONFIG.DH.GENERAL.deathMoves.avoidDeath === this.selectedMove) {
-            result = await this.handleAvoidDeath();
+            result = await this.handleAvoidDeath(deathMoveAutomation.avoidDeath);
         }
 
         if (CONFIG.DH.GENERAL.deathMoves.riskItAll === this.selectedMove) {
-            result = await this.handleRiskItAll();
+            result = await this.handleRiskItAll(deathMoveAutomation.riskItAll);
         }
 
-        if (!result) return;
+        if (result === undefined) return;
 
         const autoExpandDescription = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance)
             .expandRollMessage?.desc;
@@ -192,7 +200,6 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
                     description: game.i18n.localize(this.selectedMove.description),
                     result: result,
                     open: autoExpandDescription ? 'open' : '',
-                    chevron: autoExpandDescription ? 'fa-chevron-up' : 'fa-chevron-down',
                     showRiskItAllButton: this.showRiskItAllButton,
                     riskItAllButtonLabel: this.riskItAllButtonLabel,
                     riskItAllHope: this.riskItAllHope

module/applications/dialogs/downtime.mjs

@@ -196,6 +196,9 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
             .filter(x => x.testUserPermission(game.user, 'LIMITED'))
             .filter(x => x.uuid !== this.actor.uuid);
 
+        const autoExpandDescription = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance)
+            .expandRollMessage?.desc;
+
         const cls = getDocumentClass('ChatMessage');
         const msg = {
             user: game.user.id,
@@ -216,7 +219,8 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
                     actor: { name: this.actor.name, img: this.actor.img },
                     moves: moves,
                     characters: characters,
-                    selfId: this.actor.uuid
+                    selfId: this.actor.uuid,
+                    open: autoExpandDescription ? 'open' : ''
                 }
             ),
             flags: {

module/applications/dialogs/group-roll-dialog.mjs

@@ -70,7 +70,11 @@ export default class GroupRollDialog extends HandlebarsApplicationMixin(Applicat
                     element.appendChild(img);
 
                     const label = document.createElement('span');
-                    label.innerHTML = `${beforeText}${matchText ? `<strong>${matchText}</strong>` : ''}${after}`;
+                    label.innerHTML =
+                        `${beforeText}${matchText ? `<strong>${matchText}</strong>` : ''}${after}`.replaceAll(
+                            ' ',
+                            '&nbsp;'
+                        );
                     element.appendChild(label);
 
                     return element;
@@ -119,7 +123,11 @@ export default class GroupRollDialog extends HandlebarsApplicationMixin(Applicat
                     element.appendChild(img);
 
                     const label = document.createElement('span');
-                    label.innerHTML = `${beforeText}${matchText ? `<strong>${matchText}</strong>` : ''}${after}`;
+                    label.innerHTML =
+                        `${beforeText}${matchText ? `<strong>${matchText}</strong>` : ''}${after}`.replaceAll(
+                            ' ',
+                            '&nbsp;'
+                        );
                     element.appendChild(label);
 
                     return element;

module/applications/scene/sceneConfigSettings.mjs

@@ -103,7 +103,11 @@ export default class DhSceneConfigSettings extends foundry.applications.sheets.S
 
     /** @override */
     async _processSubmitData(event, form, submitData, options) {
-        submitData.flags.daggerheart = this.daggerheartFlag.toObject();
+        if (!submitData.flags) submitData.flags = {};
+        submitData.flags.daggerheart = foundry.utils.mergeObject(
+            this.daggerheartFlag.toObject(),
+            submitData.flags.daggerheart
+        );
         submitData.flags.daggerheart.sceneEnvironments = submitData.flags.daggerheart.sceneEnvironments.filter(x =>
             foundry.utils.fromUuidSync(x)
         );

module/applications/settings/automationSettings.mjs

@@ -34,7 +34,7 @@ export default class DhAutomationSettings extends HandlebarsApplicationMixin(App
         tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
         header: { template: 'systems/daggerheart/templates/settings/automation-settings/header.hbs' },
         general: { template: 'systems/daggerheart/templates/settings/automation-settings/general.hbs' },
-        rules: { template: 'systems/daggerheart/templates/settings/automation-settings/rules.hbs' },
+        rules: { template: 'systems/daggerheart/templates/settings/automation-settings/deathMoves.hbs' },
         roll: { template: 'systems/daggerheart/templates/settings/automation-settings/roll.hbs' },
         footer: { template: 'systems/daggerheart/templates/settings/automation-settings/footer.hbs' }
     };
@@ -42,7 +42,7 @@ export default class DhAutomationSettings extends HandlebarsApplicationMixin(App
     /** @inheritdoc */
     static TABS = {
         main: {
-            tabs: [{ id: 'general' }, { id: 'rules' }, { id: 'roll' }],
+            tabs: [{ id: 'general' }, { id: 'deathMoves' }, { id: 'roll' }],
             initial: 'general',
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }

module/applications/settings/homebrewSettings.mjs

@@ -103,6 +103,12 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
                     ? { id: this.selected.adversaryType, ...this.settings.adversaryTypes[this.selected.adversaryType] }
                     : null;
                 break;
+            case 'downtime':
+                context.restOptions = {
+                    shortRest: CONFIG.DH.GENERAL.defaultRestOptions.shortRest(),
+                    longRest: CONFIG.DH.GENERAL.defaultRestOptions.longRest()
+                };
+                break;
         }
 
         return context;
@@ -165,7 +171,8 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
                     name: game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.newDowntimeMove'),
                     img: 'icons/magic/life/cross-worn-green.webp',
                     description: '',
-                    actions: []
+                    actions: [],
+                    effects: []
                 }
             });
         } else if (['armorFeatures', 'weaponFeatures'].includes(type)) {
@@ -224,6 +231,15 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
     }
 
     static async removeItem(_, target) {
+        const confirmed = await foundry.applications.api.DialogV2.confirm({
+            window: {
+                title: game.i18n.localize(`DAGGERHEART.SETTINGS.Homebrew.deleteItemTitle`)
+            },
+            content: game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.deleteItemText')
+        });
+
+        if (!confirmed) return;
+
         const { type, id } = target.dataset;
         const isDowntime = ['shortRest', 'longRest'].includes(type);
         const path = isDowntime ? `restMoves.${type}.moves` : `itemFeatures.${type}`;

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

@@ -314,7 +314,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         const index = Number.parseInt(button.dataset.index);
         const toggle = (element, codeMirror) => {
             codeMirror.classList.toggle('revealed');
-            const button = element.querySelector('a > i');
+            const button = element.querySelector('.expand-trigger > i');
             button.classList.toggle('fa-angle-up');
             button.classList.toggle('fa-angle-down');
         };

module/applications/sheets-configs/activeEffectConfig.mjs

@@ -4,20 +4,60 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
     constructor(options) {
         super(options);
 
-        const ignoredActorKeys = ['config', 'DhEnvironment'];
-        this.changeChoices = Object.keys(game.system.api.models.actors).reduce((acc, key) => {
-            if (!ignoredActorKeys.includes(key)) {
-                const model = game.system.api.models.actors[key];
-                const attributes = CONFIG.Token.documentClass.getTrackedAttributes(model);
-                // As per DHToken._getTrackedAttributesFromSchema, attributes.bar have a max version as well.
-                const maxAttributes = attributes.bar.map(x => [...x, 'max']);
-                attributes.value.push(...maxAttributes);
-                const group = game.i18n.localize(model.metadata.label);
-                const choices = CONFIG.Token.documentClass
-                    .getTrackedAttributeChoices(attributes, model)
-                    .map(x => ({ ...x, group: group }));
-                acc.push(...choices);
+        const ignoredActorKeys = ['config', 'DhEnvironment', 'DhParty'];
+
+        const getAllLeaves = (root, group, parentPath = '') => {
+            const leaves = [];
+            const rootKey = `${parentPath ? `${parentPath}.` : ''}${root.name}`;
+            for (const field of Object.values(root.fields)) {
+                if (field instanceof foundry.data.fields.SchemaField)
+                    leaves.push(...getAllLeaves(field, group, rootKey));
+                else
+                    leaves.push({
+                        value: `${rootKey}.${field.name}`,
+                        label: game.i18n.localize(field.label),
+                        hint: game.i18n.localize(field.hint),
+                        group
+                    });
             }
+
+            return leaves;
+        };
+        this.changeChoices = Object.keys(game.system.api.models.actors).reduce((acc, key) => {
+            if (ignoredActorKeys.includes(key)) return acc;
+
+            const model = game.system.api.models.actors[key];
+            const group = game.i18n.localize(model.metadata.label);
+            const attributes = CONFIG.Token.documentClass.getTrackedAttributes(model.metadata.type);
+
+            const getTranslations = path => {
+                if (path === 'resources.hope.max')
+                    return {
+                        label: game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.FIELDS.maxHope.label'),
+                        hint: ''
+                    };
+
+                const field = model.schema.getField(path);
+                return {
+                    label: field ? game.i18n.localize(field.label) : path,
+                    hint: field ? game.i18n.localize(field.hint) : ''
+                };
+            };
+
+            const bars = attributes.bar.flatMap(x => {
+                const joined = `${x.join('.')}.max`;
+                return { value: joined, ...getTranslations(joined), group };
+            });
+            const values = attributes.value.flatMap(x => {
+                const joined = x.join('.');
+                return { value: joined, ...getTranslations(joined), group };
+            });
+
+            const bonuses = getAllLeaves(model.schema.fields.bonuses, group);
+            const rules = getAllLeaves(model.schema.fields.rules, group);
+
+            acc.push(...bars, ...values, ...rules, ...bonuses);
+
             return acc;
         }, []);
     }
@@ -68,14 +108,18 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
                 },
                 render: function (item, search) {
                     const label = game.i18n.localize(item.label);
-                    const matchIndex = label.toLowerCase().indexOf(search);
+                    const matchIndex = label.toLowerCase().indexOf(search.toLowerCase());
 
                     const beforeText = label.slice(0, matchIndex);
                     const matchText = label.slice(matchIndex, matchIndex + search.length);
                     const after = label.slice(matchIndex + search.length, label.length);
 
                     const element = document.createElement('li');
-                    element.innerHTML = `${beforeText}${matchText ? `<strong>${matchText}</strong>` : ''}${after}`;
+                    element.innerHTML =
+                        `${beforeText}${matchText ? `<strong>${matchText}</strong>` : ''}${after}`.replaceAll(
+                            ' ',
+                            '&nbsp;'
+                        );
                     if (item.hint) {
                         element.dataset.tooltip = game.i18n.localize(item.hint);
                     }

module/applications/sheets-configs/setting-active-effect-config.mjs

@@ -103,7 +103,11 @@ export default class SettingActiveEffectConfig extends HandlebarsApplicationMixi
                     const after = label.slice(matchIndex + search.length, label.length);
 
                     const element = document.createElement('li');
-                    element.innerHTML = `${beforeText}${matchText ? `<strong>${matchText}</strong>` : ''}${after}`;
+                    element.innerHTML =
+                        `${beforeText}${matchText ? `<strong>${matchText}</strong>` : ''}${after}`.replaceAll(
+                            ' ',
+                            '&nbsp;'
+                        );
                     if (item.hint) {
                         element.dataset.tooltip = game.i18n.localize(item.hint);
                     }

module/applications/sheets/api/application-mixin.mjs

@@ -431,18 +431,18 @@ export default function DHApplicationMixin(Base) {
                 {
                     name: 'disableEffect',
                     icon: 'fa-solid fa-lightbulb',
-                    condition: target => {
-                        const doc = getDocFromElementSync(target);
-                        return doc && !doc.disabled;
+                    condition: element => {
+                        const target = element.closest('[data-item-uuid]');
+                        return !target.dataset.disabled && target.dataset.itemType !== 'beastform';
                     },
                     callback: async target => (await getDocFromElement(target)).update({ disabled: true })
                 },
                 {
                     name: 'enableEffect',
                     icon: 'fa-regular fa-lightbulb',
-                    condition: target => {
-                        const doc = getDocFromElementSync(target);
-                        return doc && doc.disabled;
+                    condition: element => {
+                        const target = element.closest('[data-item-uuid]');
+                        return target.dataset.disabled && target.dataset.itemType !== 'beastform';
                     },
                     callback: async target => (await getDocFromElement(target)).update({ disabled: false })
                 }
@@ -570,6 +570,10 @@ export default function DHApplicationMixin(Base) {
                 options.push({
                     name: 'CONTROLS.CommonDelete',
                     icon: 'fa-solid fa-trash',
+                    condition: element => {
+                        const target = element.closest('[data-item-uuid]');
+                        return target.dataset.itemType !== 'beastform';
+                    },
                     callback: async (target, event) => {
                         const doc = await getDocFromElement(target);
                         if (event.shiftKey) return doc.delete();

module/applications/sheets/api/item-attachment-sheet.mjs

@@ -1,7 +1,6 @@
 export default function ItemAttachmentSheet(Base) {
     return class extends Base {
         static DEFAULT_OPTIONS = {
-            ...super.DEFAULT_OPTIONS,
             dragDrop: [
                 ...(super.DEFAULT_OPTIONS.dragDrop || []),
                 { dragSelector: null, dropSelector: '.attachments-section' }

module/applications/sidebar/tabs/actorDirectory.mjs

@@ -43,4 +43,54 @@ export default class DhActorDirectory extends foundry.applications.sidebar.tabs.
             event.dataTransfer.setDragImage(preview, w / 2, h / 2);
         }
     }
+
+    _getEntryContextOptions() {
+        const options = super._getEntryContextOptions();
+        options.push({
+            name: 'DAGGERHEART.UI.Sidebar.actorDirectory.duplicateToNewTier',
+            icon: `<i class="fa-solid fa-arrow-trend-up" inert></i>`,
+            condition: li => {
+                const actor = game.actors.get(li.dataset.entryId);
+                return actor?.type === 'adversary' && actor.system.type !== 'social';
+            },
+            callback: async li => {
+                const actor = game.actors.get(li.dataset.entryId);
+                if (!actor) throw new Error('Unexpected missing actor');
+
+                const tiers = [1, 2, 3, 4].filter(t => t !== actor.system.tier);
+                const content = document.createElement('div');
+                const select = document.createElement('select');
+                select.name = 'tier';
+                select.append(
+                    ...tiers.map(t => {
+                        const option = document.createElement('option');
+                        option.value = t;
+                        option.textContent = game.i18n.localize(`DAGGERHEART.GENERAL.Tiers.${t}`);
+                        return option;
+                    })
+                );
+                content.append(select);
+
+                const tier = await foundry.applications.api.Dialog.input({
+                    classes: ['dh-style', 'dialog'],
+                    window: { title: 'DAGGERHEART.UI.Sidebar.actorDirectory.pickTierTitle' },
+                    content,
+                    ok: {
+                        label: 'Create Adversary',
+                        callback: (event, button, dialog) => Number(button.form.elements.tier.value)
+                    }
+                });
+
+                if (tier === actor.system.tier) {
+                    ui.notifications.warn('This actor is already at this tier');
+                } else if (tier) {
+                    const source = actor.system.adjustForTier(tier);
+                    await Actor.create(source);
+                    ui.notifications.info(`Tier ${tier} ${actor.name} created`);
+                }
+            }
+        });
+
+        return options;
+    }
 }

module/applications/ui/fearTracker.mjs

@@ -34,8 +34,6 @@ export default class FearTracker extends HandlebarsApplicationMixin(ApplicationV
         position: {
             width: 222,
             height: 222
-            // top: "200px",
-            // left: "120px"
         }
     };
 
@@ -66,7 +64,7 @@ export default class FearTracker extends HandlebarsApplicationMixin(ApplicationV
             max = this.maxFear,
             percent = (current / max) * 100,
             isGM = game.user.isGM;
-        // Return the data for rendering
+
         return { display, current, max, percent, isGM };
     }
 

module/applications/ui/itemBrowser.mjs

@@ -1,3 +1,5 @@
+import { RefreshType, socketEvent } from '../../systemRegistration/socket.mjs';
+
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 
 /**
@@ -17,6 +19,15 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
         this.config = CONFIG.DH.ITEMBROWSER.compendiumConfig;
         this.presets = {};
         this.compendiumBrowserTypeKey = 'compendiumBrowserDefault';
+
+        this.setupHooks = Hooks.on(socketEvent.Refresh, ({ refreshType }) => {
+            if (refreshType === RefreshType.CompendiumBrowser) {
+                if (this.rendered) {
+                    this.render();
+                    this.loadItems();
+                }
+            }
+        });
     }
 
     /** @inheritDoc */
@@ -35,7 +46,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
             selectFolder: this.selectFolder,
             expandContent: this.expandContent,
             resetFilters: this.resetFilters,
-            sortList: this.sortList
+            sortList: this.sortList,
+            openSettings: this.openSettings
         },
         position: {
             left: 100,
@@ -157,6 +169,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
         context.formatChoices = this.formatChoices;
         context.items = this.items;
         context.presets = this.presets;
+        context.isGM = game.user.isGM;
+
         return context;
     }
 
@@ -214,6 +228,10 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
     loadItems() {
         let loadTimeout = this.toggleLoader(true);
 
+        const browserSettings = game.settings.get(
+            CONFIG.DH.id,
+            CONFIG.DH.SETTINGS.gameSettings.CompendiumBrowserSettings
+        );
         const promises = [];
 
         game.packs.forEach(pack => {
@@ -227,7 +245,7 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
 
         Promise.all(promises).then(async result => {
             this.items = ItemBrowser.sortBy(
-                result.flatMap(r => r),
+                result.flatMap(r => r).filter(r => !browserSettings.isEntryExcluded.bind(browserSettings)(r)),
                 'name'
             );
 
@@ -512,6 +530,22 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
         itemListContainer.replaceChildren(...newOrder);
     }
 
+    static async openSettings() {
+        const settingsUpdated = await game.system.api.applications.dialogs.CompendiumBrowserSettingsDialog.configure();
+        if (settingsUpdated) {
+            if (this.rendered) {
+                this.render();
+                this.loadItems();
+            }
+            await game.socket.emit(`system.${CONFIG.DH.id}`, {
+                action: socketEvent.Refresh,
+                data: {
+                    refreshType: RefreshType.CompendiumBrowser
+                }
+            });
+        }
+    }
+
     _createDragProcess() {
         new foundry.applications.ux.DragDrop.implementation({
             dragSelector: '.item-container',
@@ -571,4 +605,9 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
             headerActions.append(button);
         }
     }
+
+    async close(options = {}) {
+        Hooks.off(socketEvent.Refresh, this.setupHooks);
+        await super.close(options);
+    }
 }

module/applications/ui/sceneNavigation.mjs

@@ -63,7 +63,8 @@ export default class DhSceneNavigation extends foundry.applications.ui.SceneNavi
                         if (scene.flags.daggerheart.sceneEnvironments[0] !== environment.uuid) {
                             const newEnvironments = scene.flags.daggerheart.sceneEnvironments;
                             const newFirst = newEnvironments.splice(
-                                newEnvironments.findIndex(x => x === environment.uuid)
+                                newEnvironments.findIndex(x => x === environment.uuid),
+                                1
                             )[0];
                             newEnvironments.unshift(newFirst);
                             emitAsGM(

module/canvas/placeables/measuredTemplate.mjs

@@ -18,8 +18,9 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur
 
     static getRangeLabels(distanceValue, settings) {
         let result = { distance: distanceValue, units: '' };
-        const sceneRangeMeasurement = canvas.scene.flags.daggerheart?.rangeMeasurement;
+        if (!settings.enabled) return result;
 
+        const sceneRangeMeasurement = canvas.scene.flags.daggerheart?.rangeMeasurement;
         const { disable, custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting;
         if (sceneRangeMeasurement?.setting === disable.id) {
             result.distance = distanceValue;
@@ -27,31 +28,9 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur
             return result;
         }
 
-        const melee = sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement.melee : settings.melee;
-        const veryClose =
-            sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement.veryClose : settings.veryClose;
-        const close = sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement.close : settings.close;
-        const far = sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement.far : settings.far;
-        if (distanceValue <= melee) {
-            result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.melee.name');
-            return result;
-        }
-        if (distanceValue <= veryClose) {
-            result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.veryClose.name');
-            return result;
-        }
-        if (distanceValue <= close) {
-            result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.close.name');
-            return result;
-        }
-        if (distanceValue <= far) {
-            result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.far.name');
-            return result;
-        }
-        if (distanceValue > far) {
-            result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.veryFar.name');
-        }
-
+        const ranges = sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement : settings;
+        const distanceKey = ['melee', 'veryClose', 'close', 'far'].find(r => ranges[r] >= distanceValue);
+        result.distance = game.i18n.localize(`DAGGERHEART.CONFIG.Range.${distanceKey ?? 'veryFar'}.name`);
         return result;
     }
 }

module/canvas/placeables/token.mjs

@@ -1,3 +1,5 @@
+import DhMeasuredTemplate from './measuredTemplate.mjs';
+
 export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
     /** @inheritdoc */
     async _draw(options) {
@@ -52,30 +54,111 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
         if (this === target) return 0;
 
         const originPoint = this.center;
-        const destinationPoint = target.center;
+        const targetPoint = target.center;
+        const thisBounds = this.bounds;
+        const targetBounds = target.bounds;
+        const adjacencyBuffer = canvas.grid.distance * 1.75; // handles diagonals with one square elevation difference
+
+        // Figure out the elevation difference.
+        // This intends to return "grid distance" for adjacent ones, so we add that number if not overlapping.
+        const sizePerUnit = canvas.grid.size / canvas.grid.distance;
+        const thisHeight = Math.max(thisBounds.width, thisBounds.height) / sizePerUnit;
+        const targetHeight = Math.max(targetBounds.width, targetBounds.height) / sizePerUnit;
+        const thisElevation = [this.document.elevation, this.document.elevation + thisHeight];
+        const targetElevation = [target.document.elevation, target.document.elevation + targetHeight];
+        const isSameAltitude =
+            thisElevation[0] < targetElevation[1] && // bottom of this must be at or below the top of target
+            thisElevation[1] > targetElevation[0]; // top of this must be at or above the bottom of target
+        const [lower, higher] = [targetElevation, thisElevation].sort((a, b) => a[1] - b[1]);
+        const elevation = isSameAltitude ? 0 : higher[0] - lower[1] + canvas.grid.distance;
 
         // Compute for gridless. This version returns circular edge to edge + grid distance,
         // so that tokens that are touching return 5.
         if (canvas.grid.type === CONST.GRID_TYPES.GRIDLESS) {
             const boundsCorrection = canvas.grid.distance / canvas.grid.size;
-            const originRadius = (this.bounds.width * boundsCorrection) / 2;
-            const targetRadius = (target.bounds.width * boundsCorrection) / 2;
-            const distance = canvas.grid.measurePath([originPoint, destinationPoint]).distance;
-            return distance - originRadius - targetRadius + canvas.grid.distance;
+            const originRadius = (thisBounds.width * boundsCorrection) / 2;
+            const targetRadius = (targetBounds.width * boundsCorrection) / 2;
+            const measuredDistance = canvas.grid.measurePath([
+                { ...originPoint, elevation: 0 },
+                { ...targetPoint, elevation }
+            ]).distance;
+            const distance = Math.floor(measuredDistance - originRadius - targetRadius + canvas.grid.distance);
+            return Math.min(distance, distance > adjacencyBuffer ? Infinity : canvas.grid.distance);
         }
 
         // Compute what the closest grid space of each token is, then compute that distance
-        const originEdge = this.#getEdgeBoundary(this.bounds, originPoint, destinationPoint);
-        const targetEdge = this.#getEdgeBoundary(target.bounds, originPoint, destinationPoint);
-        const adjustedOriginPoint = canvas.grid.getTopLeftPoint({
-            x: originEdge.x + Math.sign(originPoint.x - originEdge.x),
-            y: originEdge.y + Math.sign(originPoint.y - originEdge.y)
-        });
-        const adjustDestinationPoint = canvas.grid.getTopLeftPoint({
-            x: targetEdge.x + Math.sign(destinationPoint.x - targetEdge.x),
-            y: targetEdge.y + Math.sign(destinationPoint.y - targetEdge.y)
-        });
-        return canvas.grid.measurePath([adjustedOriginPoint, adjustDestinationPoint]).distance;
+        const originEdge = this.#getEdgeBoundary(thisBounds, originPoint, targetPoint);
+        const targetEdge = this.#getEdgeBoundary(targetBounds, originPoint, targetPoint);
+        const adjustedOriginPoint = originEdge
+            ? canvas.grid.getTopLeftPoint({
+                  x: originEdge.x + Math.sign(originPoint.x - originEdge.x),
+                  y: originEdge.y + Math.sign(originPoint.y - originEdge.y)
+              })
+            : originPoint;
+        const adjustDestinationPoint = targetEdge
+            ? canvas.grid.getTopLeftPoint({
+                  x: targetEdge.x + Math.sign(targetPoint.x - targetEdge.x),
+                  y: targetEdge.y + Math.sign(targetPoint.y - targetEdge.y)
+              })
+            : targetPoint;
+        const distance = canvas.grid.measurePath([
+            { ...adjustedOriginPoint, elevation: 0 },
+            { ...adjustDestinationPoint, elevation }
+        ]).distance;
+        return Math.min(distance, distance > adjacencyBuffer ? Infinity : canvas.grid.distance);
+    }
+
+    _onHoverIn(event, options) {
+        super._onHoverIn(event, options);
+
+        // Check if the setting is enabled
+        const setting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance).showTokenDistance;
+        if (setting === 'never' || (setting === 'encounters' && !game.combat?.started)) return;
+
+        // Check if this token isn't invisible and is actually being hovered
+        const isTokenValid =
+            this.visible &&
+            this.hover &&
+            !this.isPreview &&
+            !this.document.isSecret &&
+            !this.controlled &&
+            !this.animation;
+        if (!isTokenValid) return;
+
+        // Ensure we have a single controlled token
+        const originToken = canvas.tokens.controlled[0];
+        if (!originToken || canvas.tokens.controlled.length > 1) return;
+
+        // Determine the actual range
+        const ranges = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).rangeMeasurement;
+        const distanceResult = DhMeasuredTemplate.getRangeLabels(originToken.distanceTo(this), ranges);
+        const distanceLabel = `${distanceResult.distance} ${distanceResult.units}`.trim();
+
+        // Create the element
+        const element = document.createElement('div');
+        element.id = 'token-hover-distance';
+        element.classList.add('waypoint-label', 'last');
+        const ruler = document.createElement('i');
+        ruler.classList.add('fa-solid', 'fa-ruler');
+        element.appendChild(ruler);
+        const labelEl = document.createElement('span');
+        labelEl.classList.add('total-measurement');
+        labelEl.textContent = distanceLabel;
+        element.appendChild(labelEl);
+
+        // Position the element and add to the DOM
+        const center = this.getCenterPoint();
+        element.style.setProperty('--transformY', 'calc(-100% - 10px)');
+        element.style.setProperty('--position-y', `${this.y}px`);
+        element.style.setProperty('--position-x', `${center.x}px`);
+        element.style.setProperty('--ui-scale', String(canvas.dimensions.uiScale));
+        document.querySelector('#token-hover-distance')?.remove();
+        document.querySelector('#measurement').appendChild(element);
+    }
+
+    _onHoverOut(...args) {
+        super._onHoverOut(...args);
+        document.querySelector('#token-hover-distance')?.remove();
     }
 
     /** Returns the point at which a line starting at origin and ending at destination intersects the edge of the bounds */
@@ -100,11 +183,6 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
         return null;
     }
 
-    /** Tests if the token is at least adjacent with another, with some leeway for diagonals */
-    isAdjacentWith(token) {
-        return this.distanceTo(token) <= canvas.grid.distance * 1.5;
-    }
-
     /** @inheritDoc */
     _drawBar(number, bar, data) {
         const val = Number(data.value);

module/config/actorConfig.mjs

@@ -494,3 +494,275 @@ export const subclassFeatureLabels = {
     2: 'DAGGERHEART.ITEMS.DomainCard.specializationTitle',
     3: 'DAGGERHEART.ITEMS.DomainCard.masteryTitle'
 };
+
+/**
+ * @typedef {Object} TierData
+ * @property {number} difficulty
+ * @property {number} majorThreshold
+ * @property {number} severeThreshold
+ * @property {number} hp
+ * @property {number} stress
+ * @property {number} attack
+ * @property {number[]} damage
+ */
+
+/**
+ * @type {Record<string, Record<2 | 3 | 4, TierData>}
+ * Scaling data used to change an adversary's tier. Each rank is applied incrementally.
+ */
+export const adversaryScalingData = {
+    bruiser: {
+        2: {
+            difficulty: 2,
+            majorThreshold: 5,
+            severeThreshold: 10,
+            hp: 1,
+            stress: 2,
+            attack: 2
+        },
+        3: {
+            difficulty: 2,
+            majorThreshold: 7,
+            severeThreshold: 15,
+            hp: 1,
+            stress: 0,
+            attack: 2
+        },
+        4: {
+            difficulty: 2,
+            majorThreshold: 12,
+            severeThreshold: 25,
+            hp: 1,
+            stress: 0,
+            attack: 2
+        }
+    },
+    horde: {
+        2: {
+            difficulty: 2,
+            majorThreshold: 5,
+            severeThreshold: 8,
+            hp: 2,
+            stress: 0,
+            attack: 0
+        },
+        3: {
+            difficulty: 2,
+            majorThreshold: 5,
+            severeThreshold: 12,
+            hp: 0,
+            stress: 1,
+            attack: 1
+        },
+        4: {
+            difficulty: 2,
+            majorThreshold: 10,
+            severeThreshold: 15,
+            hp: 2,
+            stress: 0,
+            attack: 0
+        }
+    },
+    leader: {
+        2: {
+            difficulty: 2,
+            majorThreshold: 6,
+            severeThreshold: 10,
+            hp: 0,
+            stress: 0,
+            attack: 1
+        },
+        3: {
+            difficulty: 2,
+            majorThreshold: 6,
+            severeThreshold: 15,
+            hp: 1,
+            stress: 0,
+            attack: 2
+        },
+        4: {
+            difficulty: 2,
+            majorThreshold: 12,
+            severeThreshold: 25,
+            hp: 1,
+            stress: 1,
+            attack: 3
+        }
+    },
+    minion: {
+        2: {
+            difficulty: 2,
+            majorThreshold: 0,
+            severeThreshold: 0,
+            hp: 0,
+            stress: 0,
+            attack: 1
+        },
+        3: {
+            difficulty: 2,
+            majorThreshold: 0,
+            severeThreshold: 0,
+            hp: 0,
+            stress: 1,
+            attack: 1
+        },
+        4: {
+            difficulty: 2,
+            majorThreshold: 0,
+            severeThreshold: 0,
+            hp: 0,
+            stress: 0,
+            attack: 1
+        }
+    },
+    ranged: {
+        2: {
+            difficulty: 2,
+            majorThreshold: 3,
+            severeThreshold: 6,
+            hp: 1,
+            stress: 0,
+            attack: 1
+        },
+        3: {
+            difficulty: 2,
+            majorThreshold: 7,
+            severeThreshold: 14,
+            hp: 1,
+            stress: 1,
+            attack: 2
+        },
+        4: {
+            difficulty: 2,
+            majorThreshold: 5,
+            severeThreshold: 10,
+            hp: 1,
+            stress: 1,
+            attack: 1
+        }
+    },
+    skulk: {
+        2: {
+            difficulty: 2,
+            majorThreshold: 3,
+            severeThreshold: 8,
+            hp: 1,
+            stress: 1,
+            attack: 1
+        },
+        3: {
+            difficulty: 2,
+            majorThreshold: 8,
+            severeThreshold: 12,
+            hp: 1,
+            stress: 1,
+            attack: 1
+        },
+        4: {
+            difficulty: 2,
+            majorThreshold: 8,
+            severeThreshold: 10,
+            hp: 1,
+            stress: 1,
+            attack: 1
+        }
+    },
+    solo: {
+        2: {
+            difficulty: 2,
+            majorThreshold: 5,
+            severeThreshold: 10,
+            hp: 0,
+            stress: 1,
+            attack: 2
+        },
+        3: {
+            difficulty: 2,
+            majorThreshold: 7,
+            severeThreshold: 15,
+            hp: 2,
+            stress: 1,
+            attack: 2
+        },
+        4: {
+            difficulty: 2,
+            majorThreshold: 12,
+            severeThreshold: 25,
+            hp: 0,
+            stress: 1,
+            attack: 3
+        }
+    },
+    standard: {
+        2: {
+            difficulty: 2,
+            majorThreshold: 3,
+            severeThreshold: 8,
+            hp: 0,
+            stress: 0,
+            attack: 1
+        },
+        3: {
+            difficulty: 2,
+            majorThreshold: 7,
+            severeThreshold: 15,
+            hp: 1,
+            stress: 1,
+            attack: 1
+        },
+        4: {
+            difficulty: 2,
+            majorThreshold: 10,
+            severeThreshold: 15,
+            hp: 0,
+            stress: 1,
+            attack: 1
+        }
+    },
+    support: {
+        2: {
+            difficulty: 2,
+            majorThreshold: 3,
+            severeThreshold: 8,
+            hp: 1,
+            stress: 1,
+            attack: 1
+        },
+        3: {
+            difficulty: 2,
+            majorThreshold: 7,
+            severeThreshold: 12,
+            hp: 0,
+            stress: 0,
+            attack: 1
+        },
+        4: {
+            difficulty: 2,
+            majorThreshold: 8,
+            severeThreshold: 10,
+            hp: 1,
+            stress: 1,
+            attack: 1
+        }
+    }
+};
+
+/**
+ * Scaling data used for an adversary's damage.
+ * Tier 4 is missing certain adversary types and therefore skews upwards.
+ * We manually set tier 4 data to hopefully lead to better results
+ */
+export const adversaryExpectedDamage = {
+    basic: {
+        1: { mean: 7.321428571428571, deviation: 1.962519002770912 },
+        2: { mean: 12.444444444444445, deviation: 2.0631069425529676 },
+        3: { mean: 15.722222222222221, deviation: 2.486565208464823 },
+        4: { mean: 26, deviation: 5.2 }
+    },
+    minion: {
+        1: { mean: 2.142857142857143, deviation: 1.0690449676496976 },
+        2: { mean: 5, deviation: 0.816496580927726 },
+        3: { mean: 6.5, deviation: 2.1213203435596424 },
+        4: { mean: 11, deviation: 1 }
+    }
+};

module/config/generalConfig.mjs

@@ -236,6 +236,7 @@ export const defaultRestOptions = {
                     actionType: 'action',
                     chatDisplay: false,
                     target: {
+                        amount: 1,
                         type: 'friendly'
                     },
                     damage: {
@@ -252,7 +253,8 @@ export const defaultRestOptions = {
                         ]
                     }
                 }
-            }
+            },
+            effects: []
         },
         clearStress: {
             id: 'clearStress',
@@ -285,7 +287,8 @@ export const defaultRestOptions = {
                         ]
                     }
                 }
-            }
+            },
+            effects: []
         },
         repairArmor: {
             id: 'repairArmor',
@@ -302,6 +305,7 @@ export const defaultRestOptions = {
                     actionType: 'action',
                     chatDisplay: false,
                     target: {
+                        amount: 1,
                         type: 'friendly'
                     },
                     damage: {
@@ -318,7 +322,8 @@ export const defaultRestOptions = {
                         ]
                     }
                 }
-            }
+            },
+            effects: []
         },
         prepare: {
             id: 'prepare',
@@ -326,7 +331,57 @@ 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: {
+                prepare: {
+                    type: 'healing',
+                    systemPath: 'restMoves.shortRest.moves.prepare.actions',
+                    name: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.shortRest.prepare.name'),
+                    img: 'icons/skills/trades/academics-merchant-scribe.webp',
+                    actionType: 'action',
+                    chatDisplay: false,
+                    target: {
+                        type: 'self'
+                    },
+                    damage: {
+                        parts: [
+                            {
+                                applyTo: healingTypes.hope.id,
+                                value: {
+                                    custom: {
+                                        enabled: true,
+                                        formula: '1'
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                },
+                prepareWithFriends: {
+                    type: 'healing',
+                    systemPath: 'restMoves.shortRest.moves.prepare.actions',
+                    name: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.shortRest.prepareWithFriends.name'),
+                    img: 'icons/skills/trades/academics-merchant-scribe.webp',
+                    actionType: 'action',
+                    chatDisplay: false,
+                    target: {
+                        type: 'self'
+                    },
+                    damage: {
+                        parts: [
+                            {
+                                applyTo: healingTypes.hope.id,
+                                value: {
+                                    custom: {
+                                        enabled: true,
+                                        formula: '2'
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                }
+            },
+            effects: []
         }
     }),
     longRest: () => ({
@@ -345,6 +400,7 @@ export const defaultRestOptions = {
                     actionType: 'action',
                     chatDisplay: false,
                     target: {
+                        amount: 1,
                         type: 'friendly'
                     },
                     damage: {
@@ -361,7 +417,8 @@ export const defaultRestOptions = {
                         ]
                     }
                 }
-            }
+            },
+            effects: []
         },
         clearStress: {
             id: 'clearStress',
@@ -394,7 +451,8 @@ export const defaultRestOptions = {
                         ]
                     }
                 }
-            }
+            },
+            effects: []
         },
         repairArmor: {
             id: 'repairArmor',
@@ -411,6 +469,7 @@ export const defaultRestOptions = {
                     actionType: 'action',
                     chatDisplay: false,
                     target: {
+                        amount: 1,
                         type: 'friendly'
                     },
                     damage: {
@@ -427,7 +486,8 @@ export const defaultRestOptions = {
                         ]
                     }
                 }
-            }
+            },
+            effects: []
         },
         prepare: {
             id: 'prepare',
@@ -435,7 +495,57 @@ 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: {
+                prepare: {
+                    type: 'healing',
+                    systemPath: 'restMoves.longRest.moves.prepare.actions',
+                    name: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.longRest.prepare.name'),
+                    img: 'icons/skills/trades/academics-merchant-scribe.webp',
+                    actionType: 'action',
+                    chatDisplay: false,
+                    target: {
+                        type: 'self'
+                    },
+                    damage: {
+                        parts: [
+                            {
+                                applyTo: healingTypes.hope.id,
+                                value: {
+                                    custom: {
+                                        enabled: true,
+                                        formula: '1'
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                },
+                prepareWithFriends: {
+                    type: 'healing',
+                    systemPath: 'restMoves.longRest.moves.prepare.actions',
+                    name: game.i18n.localize('DAGGERHEART.APPLICATIONS.Downtime.longRest.prepareWithFriends.name'),
+                    img: 'icons/skills/trades/academics-merchant-scribe.webp',
+                    actionType: 'action',
+                    chatDisplay: false,
+                    target: {
+                        type: 'self'
+                    },
+                    damage: {
+                        parts: [
+                            {
+                                applyTo: healingTypes.hope.id,
+                                value: {
+                                    custom: {
+                                        enabled: true,
+                                        formula: '2'
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                }
+            },
+            effects: []
         },
         workOnAProject: {
             id: 'workOnAProject',
@@ -443,7 +553,8 @@ 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: {},
+            effects: []
         }
     })
 };

module/config/settingsConfig.mjs

@@ -30,6 +30,7 @@ export const gameSettings = {
     LastMigrationVersion: 'LastMigrationVersion',
     TagTeamRoll: 'TagTeamRoll',
     SpotlightRequestQueue: 'SpotlightRequestQueue',
+    CompendiumBrowserSettings: 'CompendiumBrowserSettings'
 };
 
 export const actionAutomationChoices = {

module/data/_module.mjs

@@ -3,6 +3,7 @@ export { default as DhCombatant } from './combatant.mjs';
 export { default as DhTagTeamRoll } from './tagTeamRoll.mjs';
 export { default as DhRollTable } from './rollTable.mjs';
 export { default as RegisteredTriggers } from './registeredTriggers.mjs';
+export { default as CompendiumBrowserSettings } from './compendiumBrowserSettings.mjs';
 
 export * as countdowns from './countdowns.mjs';
 export * as actions from './action/_module.mjs';

module/data/action/attackAction.mjs

@@ -34,6 +34,20 @@ export default class DHAttackAction extends DHDamageAction {
         };
     }
 
+    get damageFormula() {
+        const hitPointsPart = this.damage.parts.find(x => x.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id);
+        if (!hitPointsPart) return '0';
+
+        return hitPointsPart.value.getFormula();
+    }
+
+    get altDamageFormula() {
+        const hitPointsPart = this.damage.parts.find(x => x.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id);
+        if (!hitPointsPart) return '0';
+
+        return hitPointsPart.valueAlt.getFormula();
+    }
+
     async use(event, options) {
         const result = await super.use(event, options);
         if (!result.message) return;

module/data/action/baseAction.mjs

@@ -114,9 +114,24 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
      * Return Item the action is attached too.
      */
     get item() {
+        if (!this.parent.parent && this.systemPath)
+            return foundry.utils.getProperty(this.parent, this.systemPath).get(this.id);
+
         return this.parent.parent;
     }
 
+    get applyEffects() {
+        if (this.item.systemPath) {
+            const itemEffectIds = this.item.effects.map(x => x._id);
+            const movePathSplit = this.item.systemPath.split('.');
+            movePathSplit.pop();
+            const move = foundry.utils.getProperty(this.parent, movePathSplit.join('.'));
+            return new Collection(itemEffectIds.map(id => [id, move.effects.find(x => x.id === id)]));
+        }
+
+        return this.item.effects;
+    }
+
     /**
      * Return the first Actor parent found.
      */
@@ -125,7 +140,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
             ? this.item
             : this.item?.parent instanceof DhpActor
               ? this.item.parent
-              : this.item?.actor;
+              : null;
     }
 
     static getRollType(parent) {
@@ -214,7 +229,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
 
         if (Hooks.call(`${CONFIG.DH.id}.postUseAction`, this, config) === false) return;
 
-        if (this.chatDisplay) await this.toChat();
+        if (this.chatDisplay && !config.actionChatMessageHandled) await this.toChat();
 
         return config;
     }
@@ -225,9 +240,13 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
      * @returns {object}
      */
     prepareBaseConfig(event) {
+        const isActor = this.item instanceof CONFIG.Actor.documentClass;
+        const actionTitle = game.i18n.localize(this.name);
+        const itemTitle = isActor || this.item.name === actionTitle ? '' : `${this.item.name} - `;
+
         const config = {
             event,
-            title: `${this.item instanceof CONFIG.Actor.documentClass ? '' : `${this.item.name}: `}${game.i18n.localize(this.name)}`,
+            title: `${itemTitle}${actionTitle}`,
             source: {
                 item: this.item._id,
                 originItem: this.originItem,

module/data/actor/adversary.mjs

@@ -1,9 +1,12 @@
 import DHAdversarySettings from '../../applications/sheets-configs/adversary-settings.mjs';
 import { ActionField } from '../fields/actionField.mjs';
-import BaseDataActor, { commonActorRules } from './base.mjs';
+import { commonActorRules } from './base.mjs';
+import DhCreature from './creature.mjs';
 import { resourceField, bonusField } from '../fields/actorField.mjs';
+import { calculateExpectedValue, parseTermsFromSimpleFormula } from '../../helpers/utils.mjs';
+import { adversaryExpectedDamage, adversaryScalingData } from '../../config/actorConfig.mjs';
 
-export default class DhpAdversary extends BaseDataActor {
+export default class DhpAdversary extends DhCreature {
     static LOCALIZATION_PREFIXES = ['DAGGERHEART.ACTORS.Adversary'];
 
     static get metadata() {
@@ -40,7 +43,14 @@ export default class DhpAdversary extends BaseDataActor {
                 integer: true,
                 label: 'DAGGERHEART.GENERAL.hordeHp'
             }),
-            criticalThreshold: new fields.NumberField({ required: true, integer: true, min: 1, max: 20, initial: 20 }),
+            criticalThreshold: new fields.NumberField({
+                required: true,
+                integer: true,
+                min: 1,
+                max: 20,
+                initial: 20,
+                label: 'DAGGERHEART.ACTIONS.Settings.criticalThreshold'
+            }),
             damageThresholds: new fields.SchemaField({
                 major: new fields.NumberField({
                     required: true,
@@ -180,6 +190,10 @@ export default class DhpAdversary extends BaseDataActor {
         }
     }
 
+    prepareDerivedData() {
+        this.attack.roll.isStandardAttack = true;
+    }
+
     _getTags() {
         const tags = [
             game.i18n.localize(`DAGGERHEART.GENERAL.Tiers.${this.tier}`),
@@ -188,4 +202,211 @@ export default class DhpAdversary extends BaseDataActor {
         ];
         return tags;
     }
+
+    /** Returns source data for this actor adjusted to a new tier, which can be used to create a new actor. */
+    adjustForTier(tier) {
+        const source = this.parent.toObject(true);
+
+        /** @type {(2 | 3 | 4)[]} */
+        const tiers = new Array(Math.abs(tier - this.tier))
+            .fill(0)
+            .map((_, idx) => idx + Math.min(tier, this.tier) + 1);
+        if (tier < this.tier) tiers.reverse();
+        const typeData = adversaryScalingData[source.system.type] ?? adversaryScalingData[source.system.standard];
+        const tierEntries = tiers.map(t => ({ tier: t, ...typeData[t] }));
+
+        // Apply simple tier changes
+        const scale = tier > this.tier ? 1 : -1;
+        for (const entry of tierEntries) {
+            source.system.difficulty += scale * entry.difficulty;
+            source.system.damageThresholds.major += scale * entry.majorThreshold;
+            source.system.damageThresholds.severe += scale * entry.severeThreshold;
+            source.system.resources.hitPoints.max += scale * entry.hp;
+            source.system.resources.stress.max += scale * entry.stress;
+            source.system.attack.roll.bonus += scale * entry.attack;
+        }
+
+        // Get the mean and standard deviation of expected damage in the previous and new tier
+        // The data we have is for attack scaling, but we reuse this for action scaling later
+        const expectedDamageData = adversaryExpectedDamage[source.system.type] ?? adversaryExpectedDamage.basic;
+        const damageMeta = {
+            currentDamageRange: { tier: source.system.tier, ...expectedDamageData[source.system.tier] },
+            newDamageRange: { tier, ...expectedDamageData[tier] },
+            type: 'attack'
+        };
+
+        // Update damage of base attack
+        try {
+            this.#adjustActionDamage(source.system.attack, damageMeta);
+        } catch (err) {
+            ui.notifications.warn('Failed to convert attack damage of adversary');
+            console.error(err);
+        }
+
+        // Update damage of each item action, making sure to also update the description if possible
+        const damageRegex = /@Damage\[([^\[\]]*)\]({[^}]*})?/g;
+        for (const item of source.items) {
+            // Replace damage inlines with new formulas
+            for (const withDescription of [item.system, ...Object.values(item.system.actions)]) {
+                withDescription.description = withDescription.description.replace(damageRegex, (match, inner) => {
+                    const { value: formula } = parseInlineParams(inner);
+                    if (!formula || !type) return match;
+
+                    try {
+                        const adjusted = this.#calculateAdjustedDamage(formula, { ...damageMeta, type: 'action' });
+                        const newFormula = [
+                            adjusted.diceQuantity ? `${adjusted.diceQuantity}d${adjusted.faces}` : null,
+                            adjusted.bonus
+                        ]
+                            .filter(p => !!p)
+                            .join('+');
+                        return match.replace(formula, newFormula);
+                    } catch {
+                        return match;
+                    }
+                });
+            }
+
+            // Update damage in item actions
+            for (const action of Object.values(item.system.actions)) {
+                if (!action.damage) continue;
+
+                // Parse damage, and convert all formula matches in the descriptions to the new damage
+                try {
+                    const result = this.#adjustActionDamage(action, { ...damageMeta, type: 'action' });
+                    for (const { previousFormula, formula } of Object.values(result)) {
+                        const oldFormulaRegexp = new RegExp(
+                            previousFormula.replace(' ', '').replace('+', '(?:\\s)?\\+(?:\\s)?')
+                        );
+                        item.system.description = item.system.description.replace(oldFormulaRegexp, formula);
+                        action.description = action.description.replace(oldFormulaRegexp, formula);
+                    }
+                } catch (err) {
+                    ui.notifications.warn(`Failed to convert action damage for item ${item.name}`);
+                    console.error(err);
+                }
+            }
+        }
+
+        // Finally set the tier of the source data, now that everything is complete
+        source.system.tier = tier;
+        return source;
+    }
+
+    /**
+     * Converts a damage object to a new damage range
+     * @returns {{ diceQuantity: number; faces: number; bonus: number }} the adjusted result as a combined term
+     * @throws error if the formula is the wrong type
+     */
+    #calculateAdjustedDamage(formula, { currentDamageRange, newDamageRange, type }) {
+        const terms = parseTermsFromSimpleFormula(formula);
+        const flatTerms = terms.filter(t => t.diceQuantity === 0);
+        const diceTerms = terms.filter(t => t.diceQuantity > 0);
+        if (flatTerms.length > 1 || diceTerms.length > 1) {
+            throw new Error('invalid formula for conversion');
+        }
+        const value = {
+            ...(diceTerms[0] ?? { diceQuantity: 0, faces: 1 }),
+            bonus: flatTerms[0]?.bonus ?? 0
+        };
+        const previousExpected = calculateExpectedValue(value);
+        if (previousExpected === 0) return value; // nothing to do
+
+        const dieSizes = [4, 6, 8, 10, 12, 20];
+        const steps = newDamageRange.tier - currentDamageRange.tier;
+        const increasing = steps > 0;
+        const deviation = (previousExpected - currentDamageRange.mean) / currentDamageRange.deviation;
+        const expected = Math.max(1, newDamageRange.mean + newDamageRange.deviation * deviation);
+
+        // If this was just a flat number, convert to the expected damage and exit
+        if (value.diceQuantity === 0) {
+            value.bonus = Math.round(expected);
+            return value;
+        }
+
+        const getExpectedDie = () => calculateExpectedValue({ diceQuantity: 1, faces: value.faces }) || 1;
+        const getBaseAverage = () => calculateExpectedValue({ ...value, bonus: 0 });
+
+        // Check the number of base overages over the expected die. In the end, if the bonus inflates too much, we add a die
+        const baseOverages = Math.floor(value.bonus / getExpectedDie());
+
+        // Prestep. Change number of dice for attacks, bump up/down for actions
+        // We never bump up to d20, though we might bump down from it
+        if (type === 'attack') {
+            const minimum = increasing ? value.diceQuantity : 0;
+            value.diceQuantity = Math.max(minimum, newDamageRange.tier);
+        } else {
+            const currentIdx = dieSizes.indexOf(value.faces);
+            value.faces = dieSizes[Math.clamp(currentIdx + steps, 0, 4)];
+        }
+
+        value.bonus = Math.round(expected - getBaseAverage());
+
+        // Attempt to handle negative values.
+        // If we can do it with only step downs, do so. Otherwise remove tier dice, and try again
+        if (value.bonus < 0) {
+            let stepsRequired = Math.ceil(Math.abs(value.bonus) / value.diceQuantity);
+            const currentIdx = dieSizes.indexOf(value.faces);
+
+            // If step downs alone don't suffice, change the flat modifier, then calculate steps required again
+            // If this isn't sufficient, the result will be slightly off. This is unlikely to happen
+            if (type !== 'attack' && stepsRequired > currentIdx && value.diceQuantity > 0) {
+                value.diceQuantity -= increasing ? 1 : Math.abs(steps);
+                value.bonus = Math.round(expected - getBaseAverage());
+                if (value.bonus >= 0) return value; // complete
+            }
+
+            stepsRequired = Math.ceil(Math.abs(value.bonus) / value.diceQuantity);
+            value.faces = dieSizes[Math.max(0, currentIdx - stepsRequired)];
+            value.bonus = Math.max(0, Math.round(expected - getBaseAverage()));
+        }
+
+        // If value is really high, we add a number of dice based on the number of overages
+        // This attempts to preserve a similar amount of variance when increasing an action
+        const overagesToRemove = Math.floor(value.bonus / getExpectedDie()) - baseOverages;
+        if (type !== 'attack' && increasing && overagesToRemove > 0) {
+            value.diceQuantity += overagesToRemove;
+            value.bonus = Math.round(expected - getBaseAverage());
+        }
+
+        return value;
+    }
+
+    /**
+     * Updates damage to reflect a specific value.
+     * @throws if damage structure is invalid for conversion
+     * @returns the converted formula and value as a simplified term
+     */
+    #adjustActionDamage(action, damageMeta) {
+        // The current algorithm only returns a value if there is a single damage part
+        const hpDamageParts = action.damage.parts.filter(d => d.applyTo === 'hitPoints');
+        if (hpDamageParts.length !== 1) throw new Error('incorrect number of hp parts');
+
+        const result = {};
+        for (const property of ['value', 'valueAlt']) {
+            const data = hpDamageParts[0][property];
+            const previousFormula = data.custom.enabled
+                ? data.custom.formula
+                : [data.flatMultiplier ? `${data.flatMultiplier}${data.dice}` : 0, data.bonus ?? 0]
+                      .filter(p => !!p)
+                      .join('+');
+            const value = this.#calculateAdjustedDamage(previousFormula, damageMeta);
+            const formula = [value.diceQuantity ? `${value.diceQuantity}d${value.faces}` : null, value.bonus]
+                .filter(p => !!p)
+                .join('+');
+            if (value.diceQuantity) {
+                data.custom.enabled = false;
+                data.bonus = value.bonus;
+                data.dice = `d${value.faces}`;
+                data.flatMultiplier = value.diceQuantity;
+            } else if (!value.diceQuantity) {
+                data.custom.enabled = true;
+                data.custom.formula = formula;
+            }
+
+            result[property] = { previousFormula, formula, value };
+        }
+
+        return result;
+    }
 }

module/data/actor/base.mjs

@@ -29,17 +29,40 @@ const resistanceField = (resistanceLabel, immunityLabel, reductionLabel) =>
 /* Common rules applying to Characters and Adversaries */
 export const commonActorRules = (extendedData = { damageReduction: {}, attack: { damage: {} } }) => ({
     conditionImmunities: new fields.SchemaField({
-        hidden: new fields.BooleanField({ initial: false }),
-        restrained: new fields.BooleanField({ initial: false }),
-        vulnerable: new fields.BooleanField({ initial: false })
+        hidden: new fields.BooleanField({
+            initial: false,
+            label: 'DAGGERHEART.GENERAL.Rules.conditionImmunities.hidden'
+        }),
+        restrained: new fields.BooleanField({
+            initial: false,
+            label: 'DAGGERHEART.GENERAL.Rules.conditionImmunities.restrained'
+        }),
+        vulnerable: new fields.BooleanField({
+            initial: false,
+            label: 'DAGGERHEART.GENERAL.Rules.conditionImmunities.vulnerable'
+        })
     }),
     damageReduction: new fields.SchemaField({
         thresholdImmunities: new fields.SchemaField({
-            minor: new fields.BooleanField({ initial: false })
+            minor: new fields.BooleanField({
+                initial: false,
+                label: 'DAGGERHEART.GENERAL.Rules.damageReduction.thresholdImmunities.minor.label',
+                hint: 'DAGGERHEART.GENERAL.Rules.damageReduction.thresholdImmunities.minor.hint'
+            })
         }),
         reduceSeverity: new fields.SchemaField({
-            magical: new fields.NumberField({ initial: 0, min: 0 }),
-            physical: new fields.NumberField({ initial: 0, min: 0 })
+            magical: new fields.NumberField({
+                initial: 0,
+                min: 0,
+                label: 'DAGGERHEART.GENERAL.Rules.damageReduction.reduceSeverity.magical.label',
+                hint: 'DAGGERHEART.GENERAL.Rules.damageReduction.reduceSeverity.magical.hint'
+            }),
+            physical: new fields.NumberField({
+                initial: 0,
+                min: 0,
+                label: 'DAGGERHEART.GENERAL.Rules.damageReduction.reduceSeverity.physical.label',
+                hint: 'DAGGERHEART.GENERAL.Rules.damageReduction.reduceSeverity.physical.hint'
+            })
         }),
         ...(extendedData.damageReduction ?? {})
     }),
@@ -49,12 +72,16 @@ export const commonActorRules = (extendedData = { damageReduction: {}, attack: {
             hpDamageMultiplier: new fields.NumberField({
                 required: true,
                 nullable: false,
-                initial: 1
+                initial: 1,
+                label: 'DAGGERHEART.GENERAL.Attack.hpDamageMultiplier.label',
+                hint: 'DAGGERHEART.GENERAL.Attack.hpDamageMultiplier.hint'
             }),
             hpDamageTakenMultiplier: new fields.NumberField({
                 required: true,
                 nullable: false,
-                initial: 1
+                initial: 1,
+                label: 'DAGGERHEART.GENERAL.Attack.hpDamageTakenMultiplier.label',
+                hint: 'DAGGERHEART.GENERAL.Attack.hpDamageTakenMultiplier.hint'
             }),
             ...(extendedData.attack?.damage ?? {})
         })

module/data/actor/character.mjs

@@ -1,13 +1,14 @@
 import { burden } from '../../config/generalConfig.mjs';
 import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
 import DhLevelData from '../levelData.mjs';
-import BaseDataActor, { commonActorRules } from './base.mjs';
+import { commonActorRules } from './base.mjs';
+import DhCreature from './creature.mjs';
 import { attributeField, resourceField, stressDamageReductionRule, bonusField } from '../fields/actorField.mjs';
 import { ActionField } from '../fields/actionField.mjs';
 import DHCharacterSettings from '../../applications/sheets-configs/character-settings.mjs';
 import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
 
-export default class DhCharacter extends BaseDataActor {
+export default class DhCharacter extends DhCreature {
     /**@override */
     static LOCALIZATION_PREFIXES = ['DAGGERHEART.ACTORS.Character'];
 
@@ -36,14 +37,18 @@ export default class DhCharacter extends BaseDataActor {
                     'DAGGERHEART.ACTORS.Character.maxHPBonus'
                 ),
                 stress: resourceField(6, 0, 'DAGGERHEART.GENERAL.stress', true),
-                hope: new fields.SchemaField({
-                    value: new fields.NumberField({
-                        initial: 2,
-                        min: 0,
-                        integer: true,
-                        label: 'DAGGERHEART.GENERAL.hope'
-                    })
-                })
+                hope: new fields.SchemaField(
+                    {
+                        value: new fields.NumberField({
+                            initial: 2,
+                            min: 0,
+                            integer: true,
+                            label: 'DAGGERHEART.GENERAL.hope'
+                        }),
+                        isReversed: new fields.BooleanField({ initial: false })
+                    },
+                    { label: 'DAGGERHEART.GENERAL.hope' }
+                )
             }),
             traits: new fields.SchemaField({
                 agility: attributeField('DAGGERHEART.CONFIG.Traits.agility.name'),
@@ -128,14 +133,6 @@ export default class DhCharacter extends BaseDataActor {
                     }
                 }
             }),
-            advantageSources: new fields.ArrayField(new fields.StringField(), {
-                label: 'DAGGERHEART.ACTORS.Character.advantageSources.label',
-                hint: 'DAGGERHEART.ACTORS.Character.advantageSources.hint'
-            }),
-            disadvantageSources: new fields.ArrayField(new fields.StringField(), {
-                label: 'DAGGERHEART.ACTORS.Character.disadvantageSources.label',
-                hint: 'DAGGERHEART.ACTORS.Character.disadvantageSources.hint'
-            }),
             levelData: new fields.EmbeddedDataField(DhLevelData),
             bonuses: new fields.SchemaField({
                 roll: new fields.SchemaField({
@@ -222,8 +219,16 @@ export default class DhCharacter extends BaseDataActor {
             rules: new fields.SchemaField({
                 ...commonActorRules({
                     damageReduction: {
-                        magical: new fields.BooleanField({ initial: false }),
-                        physical: new fields.BooleanField({ initial: false }),
+                        magical: new fields.BooleanField({
+                            initial: false,
+                            label: 'DAGGERHEART.GENERAL.Rules.damageReduction.magical.label',
+                            hint: 'DAGGERHEART.GENERAL.Rules.damageReduction.magical.hint'
+                        }),
+                        physical: new fields.BooleanField({
+                            initial: false,
+                            label: 'DAGGERHEART.GENERAL.Rules.damageReduction.physical.label',
+                            hint: 'DAGGERHEART.GENERAL.Rules.damageReduction.physical.hint'
+                        }),
                         maxArmorMarked: new fields.SchemaField({
                             value: new fields.NumberField({
                                 required: true,
@@ -253,7 +258,10 @@ export default class DhCharacter extends BaseDataActor {
                             label: 'DAGGERHEART.GENERAL.Rules.damageReduction.increasePerArmorMark.label',
                             hint: 'DAGGERHEART.GENERAL.Rules.damageReduction.increasePerArmorMark.hint'
                         }),
-                        disabledArmor: new fields.BooleanField({ intial: false })
+                        disabledArmor: new fields.BooleanField({
+                            intial: false,
+                            label: 'DAGGERHEART.GENERAL.Rules.damageReduction.disabledArmor.label'
+                        })
                     },
                     attack: {
                         damage: {
@@ -301,12 +309,14 @@ export default class DhCharacter extends BaseDataActor {
                         label: 'DAGGERHEART.ACTORS.Character.defaultFearDice'
                     })
                 }),
-                runeWard: new fields.BooleanField({ initial: false }),
                 burden: new fields.SchemaField({
-                    ignore: new fields.BooleanField()
+                    ignore: new fields.BooleanField({ label: 'DAGGERHEART.ACTORS.Character.burden.ignore.label' })
                 }),
                 roll: new fields.SchemaField({
-                    guaranteedCritical: new fields.BooleanField()
+                    guaranteedCritical: new fields.BooleanField({
+                        label: 'DAGGERHEART.ACTORS.Character.roll.guaranteedCritical.label',
+                        hint: 'DAGGERHEART.ACTORS.Character.roll.guaranteedCritical.hint'
+                    })
                 })
             }),
             sidebarFavorites: new ForeignDocumentUUIDArrayField({ type: 'Item' })
@@ -640,7 +650,7 @@ export default class DhCharacter extends BaseDataActor {
         };
 
         const globalHopeMax = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).maxHope;
-        this.resources.hope.max = globalHopeMax - this.scars;
+        this.resources.hope.max = globalHopeMax;
         this.resources.hitPoints.max += this.class.value?.system?.hitPoints ?? 0;
 
         /* Companion Related Data */
@@ -664,6 +674,7 @@ export default class DhCharacter extends BaseDataActor {
             }
         }
 
+        this.resources.hope.max -= this.scars;
         this.resources.hope.value = Math.min(baseHope, this.resources.hope.max);
         this.attack.roll.trait = this.rules.attack.roll.trait ?? this.attack.roll.trait;
 

module/data/actor/companion.mjs

@@ -1,4 +1,4 @@
-import BaseDataActor from './base.mjs';
+import DhCreature from './creature.mjs';
 import DhLevelData from '../levelData.mjs';
 import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
 import { ActionField } from '../fields/actionField.mjs';
@@ -6,7 +6,7 @@ import { adjustDice, adjustRange } from '../../helpers/utils.mjs';
 import DHCompanionSettings from '../../applications/sheets-configs/companion-settings.mjs';
 import { resourceField, bonusField } from '../fields/actorField.mjs';
 
-export default class DhCompanion extends BaseDataActor {
+export default class DhCompanion extends DhCreature {
     static LOCALIZATION_PREFIXES = ['DAGGERHEART.ACTORS.Companion'];
 
     /**@inheritdoc */
@@ -53,9 +53,18 @@ export default class DhCompanion extends BaseDataActor {
             ),
             rules: new fields.SchemaField({
                 conditionImmunities: new fields.SchemaField({
-                    hidden: new fields.BooleanField({ initial: false }),
-                    restrained: new fields.BooleanField({ initial: false }),
-                    vulnerable: new fields.BooleanField({ initial: false })
+                    hidden: new fields.BooleanField({
+                        initial: false,
+                        label: 'DAGGERHEART.GENERAL.Rules.conditionImmunities.hidden'
+                    }),
+                    restrained: new fields.BooleanField({
+                        initial: false,
+                        label: 'DAGGERHEART.GENERAL.Rules.conditionImmunities.restrained'
+                    }),
+                    vulnerable: new fields.BooleanField({
+                        initial: false,
+                        label: 'DAGGERHEART.GENERAL.Rules.conditionImmunities.vulnerable'
+                    })
                 })
             }),
             attack: new ActionField({

module/data/actor/creature.mjs

@@ -0,0 +1,20 @@
+import BaseDataActor from './base.mjs';
+
+export default class DhCreature extends BaseDataActor {
+    /**@inheritdoc */
+    static defineSchema() {
+        const fields = foundry.data.fields;
+
+        return {
+            ...super.defineSchema(),
+            advantageSources: new fields.ArrayField(new fields.StringField(), {
+                label: 'DAGGERHEART.ACTORS.Character.advantageSources.label',
+                hint: 'DAGGERHEART.ACTORS.Character.advantageSources.hint'
+            }),
+            disadvantageSources: new fields.ArrayField(new fields.StringField(), {
+                label: 'DAGGERHEART.ACTORS.Character.disadvantageSources.label',
+                hint: 'DAGGERHEART.ACTORS.Character.disadvantageSources.hint'
+            })
+        };
+    }
+}

module/data/chat-message/actorRoll.mjs

@@ -31,6 +31,7 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
     static defineSchema() {
         return {
             title: new fields.StringField(),
+            actionDescription: new fields.HTMLField(),
             roll: new fields.ObjectField(),
             targets: targetsField(),
             hasRoll: new fields.BooleanField({ initial: false }),

module/data/compendiumBrowserSettings.mjs

@@ -0,0 +1,36 @@
+export default class CompendiumBrowserSettings extends foundry.abstract.DataModel {
+    static defineSchema() {
+        const fields = foundry.data.fields;
+
+        return {
+            excludedSources: new fields.TypedObjectField(
+                new fields.SchemaField({
+                    excludedDocumentTypes: new fields.ArrayField(
+                        new fields.StringField({ required: true, choices: CONST.SYSTEM_SPECIFIC_COMPENDIUM_TYPES })
+                    )
+                })
+            ),
+            excludedPacks: new fields.TypedObjectField(
+                new fields.SchemaField({
+                    excludedDocumentTypes: new fields.ArrayField(
+                        new fields.StringField({ required: true, choices: CONST.SYSTEM_SPECIFIC_COMPENDIUM_TYPES })
+                    )
+                })
+            )
+        };
+    }
+
+    isEntryExcluded(item) {
+        const pack = game.packs.get(item.pack);
+        if (!pack) return false;
+
+        const packageName = pack.metadata.packageType === 'world' ? 'world' : pack.metadata.packageName;
+        const excludedSourceData = this.excludedSources[packageName];
+        if (excludedSourceData && excludedSourceData.excludedDocumentTypes.includes(pack.metadata.type)) return true;
+
+        const excludedPackData = this.excludedPacks[item.pack];
+        if (excludedPackData && excludedPackData.excludedDocumentTypes.includes(pack.metadata.type)) return true;
+
+        return false;
+    }
+}

module/data/fields/action/damageField.mjs

@@ -68,6 +68,8 @@ export default class DamageField extends fields.SchemaField {
 
         const damageResult = await CONFIG.Dice.daggerheart.DamageRoll.build(damageConfig);
         if (!damageResult) return false;
+        if (damageResult.actionChatMessageHandled) config.actionChatMessageHandled = true;
+
         config.damage = damageResult.damage;
         config.message ??= damageConfig.message;
     }
@@ -107,8 +109,8 @@ export default class DamageField extends fields.SchemaField {
                 );
             else {
                 const configDamage = foundry.utils.deepClone(config.damage);
-                const hpDamageMultiplier = config.actionActor?.system.rules.attack.damage.hpDamageMultiplier ?? 1;
-                const hpDamageTakenMultiplier = actor.system.rules.attack.damage.hpDamageTakenMultiplier;
+                const hpDamageMultiplier = config.actionActor?.system.rules?.attack?.damage?.hpDamageMultiplier ?? 1;
+                const hpDamageTakenMultiplier = actor.system.rules?.attack?.damage?.hpDamageTakenMultiplier;
                 if (configDamage.hitPoints) {
                     for (const part of configDamage.hitPoints.parts) {
                         part.total = Math.ceil(part.total * hpDamageMultiplier * hpDamageTakenMultiplier);
@@ -163,7 +165,8 @@ export default class DamageField extends fields.SchemaField {
         if (data.hasRoll && part.resultBased && data.roll.result.duality === -1) return part.valueAlt;
 
         const isAdversary = this.actor.type === 'adversary';
-        if (isAdversary && this.actor.system.type === CONFIG.DH.ACTOR.adversaryTypes.horde.id) {
+        const isHorde = this.actor.system.type === CONFIG.DH.ACTOR.adversaryTypes.horde.id;
+        if (isAdversary && isHorde && this.roll?.isStandardAttack) {
             const hasHordeDamage = this.actor.effects.find(x => x.type === 'horde');
             if (hasHordeDamage && !hasHordeDamage.disabled) return part.valueAlt;
         }

module/data/fields/action/effectsField.mjs

@@ -73,7 +73,7 @@ export default class EffectsField extends fields.ArrayField {
             });
 
             effects.forEach(async e => {
-                const effect = this.item.effects.get(e._id);
+                const effect = (this.item.applyEffects ?? this.item.effects).get(e._id);
                 if (!token.actor || !effect) return;
                 await EffectsField.applyEffect(effect, token.actor);
             });
@@ -96,7 +96,7 @@ export default class EffectsField extends fields.ArrayField {
             content: await foundry.applications.handlebars.renderTemplate(
                 'systems/daggerheart/templates/ui/chat/effectSummary.hbs',
                 {
-                    effects: this.effects.map(e => this.item.effects.get(e._id)),
+                    effects: this.effects.map(e => (this.item.applyEffects ?? this.item.effects).get(e._id)),
                     targets: messageTargets
                 }
             )
@@ -123,7 +123,7 @@ export default class EffectsField extends fields.ArrayField {
 
         // Otherwise, create a new effect on the target
         const effectData = foundry.utils.mergeObject({
-            ...effect.toObject(),
+            ...(effect.toObject?.() ?? effect),
             disabled: false,
             transfer: false,
             origin: effect.uuid

module/data/fields/actionField.mjs

@@ -152,7 +152,9 @@ export function ActionMixin(Base) {
         }
 
         get uuid() {
-            return `${this.item.uuid}.${this.documentName}.${this.id}`;
+            const isItem = this.item instanceof game.system.api.documents.DHItem;
+            const isActor = this.item instanceof game.system.api.documents.DhpActor;
+            return isItem || isActor ? `${this.item.uuid}.${this.documentName}.${this.id}` : null;
         }
 
         get sheet() {
@@ -260,6 +262,9 @@ export function ActionMixin(Base) {
         }
 
         async toChat(origin) {
+            const autoExpandDescription = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance)
+                .expandRollMessage?.desc;
+
             const cls = getDocumentClass('ChatMessage');
             const systemData = {
                 title: game.i18n.localize('DAGGERHEART.CONFIG.FeatureForm.action'),
@@ -288,7 +293,7 @@ export function ActionMixin(Base) {
                 system: systemData,
                 content: await foundry.applications.handlebars.renderTemplate(
                     'systems/daggerheart/templates/ui/chat/action.hbs',
-                    systemData
+                    { ...systemData, open: autoExpandDescription ? 'open' : '' }
                 ),
                 flags: {
                     daggerheart: {

module/data/fields/actorField.mjs

@@ -7,16 +7,20 @@ const attributeField = label =>
     });
 
 const resourceField = (max = 0, initial = 0, label, reverse = false, maxLabel) =>
-    new fields.SchemaField({
-        value: new fields.NumberField({ initial: initial, min: 0, integer: true, label }),
-        max: new fields.NumberField({
-            initial: max,
-            integer: true,
-            label:
-                maxLabel ?? game.i18n.format('DAGGERHEART.GENERAL.maxWithThing', { thing: game.i18n.localize(label) })
-        }),
-        isReversed: new fields.BooleanField({ initial: reverse })
-    });
+    new fields.SchemaField(
+        {
+            value: new fields.NumberField({ initial: initial, min: 0, integer: true, label }),
+            max: new fields.NumberField({
+                initial: max,
+                integer: true,
+                label:
+                    maxLabel ??
+                    game.i18n.format('DAGGERHEART.GENERAL.maxWithThing', { thing: game.i18n.localize(label) })
+            }),
+            isReversed: new fields.BooleanField({ initial: reverse })
+        },
+        { label }
+    );
 
 const stressDamageReductionRule = localizationPath =>
     new fields.SchemaField({

module/data/item/ancestry.mjs

@@ -1,5 +1,6 @@
 import BaseDataItem from './base.mjs';
 import ItemLinkFields from '../../data/fields/itemLinkFields.mjs';
+import { getFeaturesHTMLData } from '../../helpers/utils.mjs';
 
 export default class DHAncestry extends BaseDataItem {
     /** @inheritDoc */
@@ -19,7 +20,6 @@ export default class DHAncestry extends BaseDataItem {
         };
     }
 
-
     /* -------------------------------------------- */
 
     /**@override */
@@ -42,4 +42,18 @@ export default class DHAncestry extends BaseDataItem {
     get secondaryFeature() {
         return this.features.find(x => x.type === CONFIG.DH.ITEM.featureSubTypes.secondary)?.item;
     }
+
+    /**@inheritdoc */
+    async getDescriptionData() {
+        const baseDescription = this.description;
+        const features = await getFeaturesHTMLData(this.features);
+
+        if (!features.length) return { prefix: null, value: baseDescription, suffix: null };
+        const suffix = await foundry.applications.handlebars.renderTemplate(
+            'systems/daggerheart/templates/sheets/items/description.hbs',
+            { label: 'DAGGERHEART.ITEMS.Ancestry.featuresLabel', features }
+        );
+
+        return { prefix: null, value: baseDescription, suffix };
+    }
 }

module/data/item/armor.mjs

@@ -59,11 +59,10 @@ export default class DHArmor extends AttachableItem {
         const baseDescription = this.description;
         const allFeatures = CONFIG.DH.ITEM.allArmorFeatures();
         const features = this.armorFeatures.map(x => allFeatures[x.value]);
-        if (!features.length) return { prefix: null, value: baseDescription, suffix: null };
 
         const prefix = await foundry.applications.handlebars.renderTemplate(
             'systems/daggerheart/templates/sheets/items/armor/description.hbs',
-            { features }
+            { item: this.parent, features }
         );
 
         return { prefix, value: baseDescription, suffix: null };

module/data/item/beastform.mjs

@@ -253,4 +253,20 @@ export default class DHBeastform extends BaseDataItem {
 
         return false;
     }
+
+    _onCreate(_data, _options, userId) {
+        if (!this.actor && game.user.id === userId) {
+            const hasBeastformEffect = this.parent.effects.some(x => x.type === 'beastform');
+            if (!hasBeastformEffect)
+                this.parent.createEmbeddedDocuments('ActiveEffect', [
+                    {
+                        type: 'beastform',
+                        name: game.i18n.localize('DAGGERHEART.ITEMS.Beastform.beastformEffect'),
+                        img: 'icons/creatures/abilities/paw-print-pair-purple.webp'
+                    }
+                ]);
+
+            return;
+        }
+    }
 }

module/data/item/class.mjs

@@ -2,7 +2,7 @@ import BaseDataItem from './base.mjs';
 import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
 import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
 import ItemLinkFields from '../fields/itemLinkFields.mjs';
-import { addLinkedItemsDiff, updateLinkedItemApps } from '../../helpers/utils.mjs';
+import { addLinkedItemsDiff, getFeaturesHTMLData, updateLinkedItemApps } from '../../helpers/utils.mjs';
 
 export default class DHClass extends BaseDataItem {
     /** @inheritDoc */
@@ -163,4 +163,56 @@ export default class DHClass extends BaseDataItem {
 
         updateLinkedItemApps(options, this.parent.sheet);
     }
+
+    /**@inheritdoc */
+    async getDescriptionData() {
+        const baseDescription = this.description;
+
+        const getDomainLabel = domain => {
+            const data = CONFIG.DH.DOMAIN.allDomains()[domain];
+            return data ? game.i18n.localize(data.label) : '';
+        };
+        let domainsLabel = '';
+        if (this.domains.length) {
+            if (this.domains.length === 1) domainsLabel = getDomainLabel(this.domains[0]);
+            else {
+                const firstDomains = this.domains
+                    .slice(0, this.domains.length - 1)
+                    .map(getDomainLabel)
+                    .join(', ');
+                const lastDomain = getDomainLabel(this.domains[this.domains.length - 1]);
+                domainsLabel = game.i18n.format('DAGGERHEART.GENERAL.thingsAndThing', {
+                    things: firstDomains,
+                    thing: lastDomain
+                });
+            }
+        }
+
+        const classItems = [];
+        for (const itemData of this.inventory.choiceB) {
+            const linkData = [
+                undefined,
+                'UUID', // type
+                itemData.uuid // target
+            ];
+            const contentLink = await foundry.applications.ux.TextEditor.implementation._createContentLink(linkData);
+            classItems.push(contentLink.outerHTML);
+        }
+
+        const hopeFeatures = await getFeaturesHTMLData(this.hopeFeatures);
+        const classFeatures = await getFeaturesHTMLData(this.classFeatures);
+
+        const suffix = await foundry.applications.handlebars.renderTemplate(
+            'systems/daggerheart/templates/sheets/items/class/description.hbs',
+            {
+                class: this.parent,
+                domains: domainsLabel,
+                classItems,
+                hopeFeatures,
+                classFeatures
+            }
+        );
+
+        return { prefix: null, value: baseDescription, suffix };
+    }
 }

module/data/item/community.mjs

@@ -1,3 +1,4 @@
+import { getFeaturesHTMLData } from '../../helpers/utils.mjs';
 import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
 import BaseDataItem from './base.mjs';
 
@@ -24,4 +25,17 @@ export default class DHCommunity extends BaseDataItem {
     /**@override */
     static DEFAULT_ICON = 'systems/daggerheart/assets/icons/documents/items/village.svg';
 
+    /**@inheritdoc */
+    async getDescriptionData() {
+        const baseDescription = this.description;
+        const features = await getFeaturesHTMLData(this.features);
+
+        if (!features.length) return { prefix: null, value: baseDescription, suffix: null };
+        const suffix = await foundry.applications.handlebars.renderTemplate(
+            'systems/daggerheart/templates/sheets/items/description.hbs',
+            { label: 'DAGGERHEART.ITEMS.Community.featuresLabel', features }
+        );
+
+        return { prefix: null, value: baseDescription, suffix };
+    }
 }

module/data/item/domainCard.mjs

@@ -94,8 +94,10 @@ export default class DHDomainCard extends BaseDataItem {
                 return false;
             }
 
-            if (!this.actor.system.loadoutSlot.available) {
+            if (!this.actor.system.loadoutSlot.available && !this.loadoutIgnore) {
                 data.system.inVault = true;
+                await this.updateSource({ inVault: true });
+                ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.loadoutMaxReached'));
             }
         }
     }

module/data/item/subclass.mjs

@@ -1,3 +1,4 @@
+import { getFeaturesHTMLData } from '../../helpers/utils.mjs';
 import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
 import ItemLinkFields from '../fields/itemLinkFields.mjs';
 import BaseDataItem from './base.mjs';
@@ -89,4 +90,28 @@ export default class DHSubclass extends BaseDataItem {
         const allowed = await super._preCreate(data, options, user);
         if (allowed === false) return;
     }
+
+    /**@inheritdoc */
+    async getDescriptionData() {
+        const baseDescription = this.description;
+
+        const spellcastTrait = this.spellcastingTrait
+            ? game.i18n.localize(CONFIG.DH.ACTOR.abilities[this.spellcastingTrait].label)
+            : null;
+        const foundationFeatures = await getFeaturesHTMLData(this.foundationFeatures);
+        const specializationFeatures = await getFeaturesHTMLData(this.specializationFeatures);
+        const masteryFeatures = await getFeaturesHTMLData(this.masteryFeatures);
+
+        const suffix = await foundry.applications.handlebars.renderTemplate(
+            'systems/daggerheart/templates/sheets/items/subclass/description.hbs',
+            {
+                spellcastTrait,
+                foundationFeatures,
+                specializationFeatures,
+                masteryFeatures
+            }
+        );
+
+        return { prefix: null, value: baseDescription, suffix };
+    }
 }

module/data/item/weapon.mjs

@@ -113,13 +113,26 @@ export default class DHWeapon extends AttachableItem {
     /**@inheritdoc */
     async getDescriptionData() {
         const baseDescription = this.description;
+
+        const tier = game.i18n.localize(`DAGGERHEART.GENERAL.Tiers.${this.tier}`);
+        const trait = game.i18n.localize(CONFIG.DH.ACTOR.abilities[this.attack.roll.trait].label);
+        const range = game.i18n.localize(`DAGGERHEART.CONFIG.Range.${this.attack.range}.name`);
+        const damage = Roll.replaceFormulaData(this.attack.damageFormula, this.parent.parent ?? this.parent);
+        const burden = game.i18n.localize(CONFIG.DH.GENERAL.burden[this.burden].label);
+
         const allFeatures = CONFIG.DH.ITEM.allWeaponFeatures();
         const features = this.weaponFeatures.map(x => allFeatures[x.value]);
-        if (!features.length) return { prefix: null, value: baseDescription, suffix: null };
 
         const prefix = await foundry.applications.handlebars.renderTemplate(
             'systems/daggerheart/templates/sheets/items/weapon/description.hbs',
-            { features }
+            {
+                features,
+                tier,
+                trait,
+                range,
+                damage,
+                burden
+            }
         );
 
         return { prefix, value: baseDescription, suffix: null };

module/data/levelData.mjs

@@ -6,7 +6,12 @@ export default class DhLevelData extends foundry.abstract.DataModel {
 
         return {
             level: new fields.SchemaField({
-                current: new fields.NumberField({ required: true, integer: true, initial: 1 }),
+                current: new fields.NumberField({
+                    required: true,
+                    integer: true,
+                    initial: 1,
+                    label: 'DAGGERHEART.GENERAL.currentLevel'
+                }),
                 changed: new fields.NumberField({ required: true, integer: true, initial: 1 }),
                 bonuses: new fields.TypedObjectField(new fields.NumberField({ integer: true, nullable: false }))
             }),

module/data/settings/Appearance.mjs

@@ -37,11 +37,30 @@ export default class DhAppearance extends foundry.abstract.DataModel {
             extendEnvironmentDescriptions: new BooleanField(),
             extendItemDescriptions: new BooleanField(),
             expandRollMessage: new SchemaField({
-                desc: new BooleanField(),
+                desc: new BooleanField({ initial: true }),
                 roll: new BooleanField(),
                 damage: new BooleanField(),
                 target: new BooleanField()
             }),
+            showTokenDistance: new StringField({
+                required: true,
+                choices: {
+                    always: {
+                        value: 'always',
+                        label: 'DAGGERHEART.SETTINGS.Appearance.FIELDS.showTokenDistance.choices.always'
+                    },
+                    encounters: {
+                        value: 'encounters',
+                        label: 'DAGGERHEART.SETTINGS.Appearance.FIELDS.showTokenDistance.choices.encounters'
+                    },
+                    never: {
+                        value: 'never',
+                        label: 'DAGGERHEART.SETTINGS.Appearance.FIELDS.showTokenDistance.choices.never'
+                    }
+                },
+                nullable: false,
+                initial: 'always'
+            }),
             hideAttribution: new BooleanField(),
             showGenericStatusEffects: new BooleanField({ initial: true })
         };

module/data/settings/Automation.mjs

@@ -55,6 +55,23 @@ export default class DhAutomation extends foundry.abstract.DataModel {
                 initial: true,
                 label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.resourceScrollTexts.label'
             }),
+            deathMoveAutomation: new fields.SchemaField({
+                avoidDeath: new fields.BooleanField({
+                    required: true,
+                    initial: true,
+                    label: 'DAGGERHEART.CONFIG.DeathMoves.avoidDeath.name'
+                }),
+                riskItAll: new fields.BooleanField({
+                    required: true,
+                    initial: true,
+                    label: 'DAGGERHEART.CONFIG.DeathMoves.riskItAll.name'
+                }),
+                blazeOfGlory: new fields.BooleanField({
+                    required: true,
+                    initial: true,
+                    label: 'DAGGERHEART.CONFIG.DeathMoves.blazeOfGlory.name'
+                })
+            }),
             defeated: new fields.SchemaField({
                 enabled: new fields.BooleanField({
                     required: true,

module/data/settings/Homebrew.mjs

@@ -12,6 +12,20 @@ const currencyField = (initial, label, icon) =>
         icon: new foundry.data.fields.StringField({ required: true, nullable: false, blank: true, initial: icon })
     });
 
+const restMoveField = () =>
+    new foundry.data.fields.SchemaField({
+        name: new foundry.data.fields.StringField({ required: true }),
+        icon: new foundry.data.fields.StringField({ required: true }),
+        img: new foundry.data.fields.FilePathField({
+            initial: 'icons/magic/life/cross-worn-green.webp',
+            categories: ['IMAGE'],
+            base64: false
+        }),
+        description: new foundry.data.fields.HTMLField(),
+        actions: new ActionsField(),
+        effects: new foundry.data.fields.ArrayField(new foundry.data.fields.ObjectField())
+    });
+
 export default class DhHomebrew extends foundry.abstract.DataModel {
     static defineSchema() {
         const fields = foundry.data.fields;
@@ -105,37 +119,11 @@ export default class DhHomebrew extends foundry.abstract.DataModel {
             restMoves: new fields.SchemaField({
                 longRest: new fields.SchemaField({
                     nrChoices: new fields.NumberField({ required: true, integer: true, min: 1, initial: 2 }),
-                    moves: new fields.TypedObjectField(
-                        new fields.SchemaField({
-                            name: new fields.StringField({ required: true }),
-                            icon: new fields.StringField({ required: true }),
-                            img: new fields.FilePathField({
-                                initial: 'icons/magic/life/cross-worn-green.webp',
-                                categories: ['IMAGE'],
-                                base64: false
-                            }),
-                            description: new fields.HTMLField(),
-                            actions: new ActionsField()
-                        }),
-                        { initial: defaultRestOptions.longRest() }
-                    )
+                    moves: new fields.TypedObjectField(restMoveField(), { initial: defaultRestOptions.longRest() })
                 }),
                 shortRest: new fields.SchemaField({
                     nrChoices: new fields.NumberField({ required: true, integer: true, min: 1, initial: 2 }),
-                    moves: new fields.TypedObjectField(
-                        new fields.SchemaField({
-                            name: new fields.StringField({ required: true }),
-                            icon: new fields.StringField({ required: true }),
-                            img: new fields.FilePathField({
-                                initial: 'icons/magic/life/cross-worn-green.webp',
-                                categories: ['IMAGE'],
-                                base64: false
-                            }),
-                            description: new fields.HTMLField(),
-                            actions: new ActionsField()
-                        }),
-                        { initial: defaultRestOptions.shortRest() }
-                    )
+                    moves: new fields.TypedObjectField(restMoveField(), { initial: defaultRestOptions.shortRest() })
                 })
             }),
             domains: new fields.TypedObjectField(

module/dice/dhRoll.mjs

@@ -96,6 +96,19 @@ export default class DHRoll extends Roll {
     }
 
     static async toMessage(roll, config) {
+        const item = config.data.parent?.items?.get?.(config.source.item) ?? null;
+        const action = item ? item.system.actions.get(config.source.action) : null;
+        let actionDescription = null;
+        if (action?.chatDisplay) {
+            actionDescription = action
+                ? await foundry.applications.ux.TextEditor.implementation.enrichHTML(action.description, {
+                      relativeTo: config.data,
+                      rollData: config.data.getRollData?.() ?? {}
+                  })
+                : null;
+            config.actionChatMessageHandled = true;
+        }
+
         const cls = getDocumentClass('ChatMessage'),
             msgData = {
                 type: this.messageType,
@@ -103,7 +116,7 @@ export default class DHRoll extends Roll {
                 title: roll.title,
                 speaker: cls.getSpeaker({ actor: roll.data?.parent }),
                 sound: config.mute ? null : CONFIG.sounds.dice,
-                system: config,
+                system: { ...config, actionDescription },
                 rolls: [roll]
             };
 

module/dice/dualityRoll.mjs

@@ -409,7 +409,9 @@ export default class DualityRoll extends D20Roll {
                 difficulty: message.system.roll.difficulty ? Number(message.system.roll.difficulty) : null
             }
         });
-        newRoll.extra = newRoll.extra.slice(2);
+
+        const extraIndex = newRoll.advantage ? 3 : 2;
+        newRoll.extra = newRoll.extra.slice(extraIndex);
 
         const tagTeamSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.TagTeamRoll);
 

module/documents/activeEffect.mjs

@@ -61,14 +61,15 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
             update.img = 'icons/magic/life/heart-cross-blue.webp';
         }
 
+        const statuses = Object.keys(data.statuses ?? {});
         const immuneStatuses =
-            data.statuses?.filter(
+            statuses.filter(
                 status =>
                     this.parent.system.rules?.conditionImmunities &&
                     this.parent.system.rules.conditionImmunities[status]
             ) ?? [];
         if (immuneStatuses.length > 0) {
-            update.statuses = data.statuses.filter(x => !immuneStatuses.includes(x));
+            update.statuses = statuses.filter(x => !immuneStatuses.includes(x));
             const conditions = CONFIG.DH.GENERAL.conditions();
             const scrollingTexts = immuneStatuses.map(status => ({
                 text: game.i18n.format('DAGGERHEART.ACTIVEEFFECT.immuneStatusText', {
@@ -113,6 +114,11 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
         super.applyField(model, change, field);
     }
 
+    _applyLegacy(actor, change, changes) {
+        change.value = DhActiveEffect.getChangeValue(actor, change, change.effect);
+        super._applyLegacy(actor, change, changes);
+    }
+
     /** */
     static getChangeValue(model, change, effect) {
         let value = change.value;

module/documents/chatMessage.mjs

@@ -110,6 +110,8 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
                 } else if (s.classList.contains('damage-section'))
                     s.classList.toggle('expanded', autoExpandRoll.damage);
                 else if (s.classList.contains('target-section')) s.classList.toggle('expanded', autoExpandRoll.target);
+                else if (s.classList.contains('description-section'))
+                    s.classList.toggle('expanded', autoExpandRoll.desc);
             });
             if (itemDesc && autoExpandRoll.desc) itemDesc.setAttribute('open', '');
         }

module/documents/item.mjs

@@ -185,7 +185,10 @@ export default class DHItem extends foundry.documents.Item {
                 tags: this._getTags()
             },
             actions: item.system.actionsList,
-            description: this.system.description
+            description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.system.description, {
+                relativeTo: this.parent,
+                rollData: this.parent?.getRollData() ?? {}
+            })
         };
 
         const msg = {

module/documents/token.mjs

@@ -1,78 +1,30 @@
 export default class DHToken extends CONFIG.Token.documentClass {
-    /**
-     * Inspect the Actor data model and identify the set of attributes which could be used for a Token Bar.
-     * @param {object} attributes       The tracked attributes which can be chosen from
-     * @returns {object}                A nested object of attribute choices to display
-     */
-    static getTrackedAttributeChoices(attributes, model) {
+    /**@inheritdoc */
+    static getTrackedAttributeChoices(attributes, typeKey) {
         attributes = attributes || this.getTrackedAttributes();
         const barGroup = game.i18n.localize('TOKEN.BarAttributes');
         const valueGroup = game.i18n.localize('TOKEN.BarValues');
+        const actorModel = typeKey ? game.system.api.data.actors[`Dh${typeKey.capitalize()}`] : null;
+        const getLabel = path => {
+            const label = actorModel?.schema.getField(path)?.label;
+            return label ? game.i18n.localize(label) : path;
+        };
 
         const bars = attributes.bar.map(v => {
             const a = v.join('.');
-            const modelLabel = model ? game.i18n.localize(model.schema.getField(`${a}.value`).label) : null;
-            return { group: barGroup, value: a, label: modelLabel ? modelLabel : a };
+            return { group: barGroup, value: a, label: getLabel(a) };
         });
-        bars.sort((a, b) => a.label.compare(b.label));
+        bars.sort((a, b) => a.value.compare(b.value));
 
-        const invalidAttributes = [
-            'gold',
-            'levelData',
-            'actions',
-            'biography',
-            'class',
-            'multiclass',
-            'companion',
-            'notes',
-            'partner',
-            'description',
-            'impulses',
-            'tier',
-            'type'
-        ];
-        const values = attributes.value.reduce((acc, v) => {
+        const values = attributes.value.map(v => {
             const a = v.join('.');
-            if (invalidAttributes.some(x => a.startsWith(x))) return acc;
-
-            const field = model ? model.schema.getField(a) : null;
-            const modelLabel = field ? game.i18n.localize(field.label) : null;
-            const hint = field ? game.i18n.localize(field.hint) : null;
-            acc.push({ group: valueGroup, value: a, label: modelLabel ? modelLabel : a, hint: hint });
-
-            return acc;
-        }, []);
-        values.sort((a, b) => a.label.compare(b.label));
+            return { group: valueGroup, value: a, label: getLabel(a) };
+        });
 
+        values.sort((a, b) => a.value.compare(b.value));
         return bars.concat(values);
     }
 
-    static _getTrackedAttributesFromSchema(schema, _path = []) {
-        const attributes = { bar: [], value: [] };
-        for (const [name, field] of Object.entries(schema.fields)) {
-            const p = _path.concat([name]);
-            if (field instanceof foundry.data.fields.NumberField) attributes.value.push(p);
-            if (field instanceof foundry.data.fields.BooleanField && field.options.isAttributeChoice)
-                attributes.value.push(p);
-            if (field instanceof foundry.data.fields.StringField) attributes.value.push(p);
-            if (field instanceof foundry.data.fields.ArrayField) attributes.value.push(p);
-            const isSchema = field instanceof foundry.data.fields.SchemaField;
-            const isModel = field instanceof foundry.data.fields.EmbeddedDataField;
-
-            if (isSchema || isModel) {
-                const schema = isModel ? field.model.schema : field;
-                const isBar = schema.has && schema.has('value') && schema.has('max');
-                if (isBar) attributes.bar.push(p);
-                else {
-                    const inner = this.getTrackedAttributes(schema, p);
-                    attributes.bar.push(...inner.bar);
-                    attributes.value.push(...inner.value);
-                }
-            }
-        }
-        return attributes;
-    }
-
     _shouldRecordMovementHistory() {
         return false;
     }
@@ -269,7 +221,7 @@ export default class DHToken extends CONFIG.Token.documentClass {
 
         // Hexagon symmetry
         if (columns) {
-            const rowData = BaseToken.#getHexagonalShape(height, width, shape, false);
+            const rowData = DHToken.#getHexagonalShape(height, width, shape, false);
             if (!rowData) return null;
 
             // Transpose the offsets/points of the shape in row orientation

module/enrichers/DualityRollEnricher.mjs

@@ -86,19 +86,22 @@ export const enrichedDualityRoll = async (
     { reaction, traitValue, target, difficulty, title, label, advantage, grantResources, customConfig },
     event
 ) => {
+    const shouldGrantResources = grantResources === undefined ? true : grantResources;
+
     const config = {
         event: event ?? {},
         title: title,
         headerTitle: label,
+        actionType: reaction ? 'reaction' : null,
         roll: {
             trait: traitValue && target ? traitValue : null,
             difficulty: difficulty,
-            advantage,
-            type: reaction ? 'reaction' : null
+            advantage
+            // type: reaction ? 'reaction' : null //not needed really but keeping it for troubleshooting
         },
         skips: {
-            resources: !grantResources,
-            triggers: !grantResources
+            resources: !shouldGrantResources,
+            triggers: !shouldGrantResources
         },
         type: 'trait',
         hasRoll: true,

module/enrichers/TemplateEnricher.mjs

@@ -4,6 +4,7 @@ export default function DhTemplateEnricher(match, _options) {
     const params = parseInlineParams(match[1]);
     const { type, angle = CONFIG.MeasuredTemplate.defaults.angle, inline = false } = params;
     const direction = Number(params.direction) || 0;
+    params.range = params.range?.toLowerCase();
     const range =
         params.range && Number.isNaN(Number(params.range))
             ? Object.values(CONFIG.DH.GENERAL.templateRanges).find(

module/helpers/utils.mjs

@@ -12,7 +12,7 @@ export function rollCommandToJSON(text) {
     const flavor = flavorMatch ? flavorMatch[1] : null;
 
     // Match key="quoted string"  OR  key=unquotedValue
-    const PAIR_RE = /(\w+)=("(?:[^"\\]|\\.)*"|\S+)/g;
+    const PAIR_RE = /(\w+)\s*=\s*("(?:[^"\\]|\\.)*"|[^\]\}\s]+)/g; //updated regex to allow escaped quotes in quoted strings and avoid matching closing brackets/braces
     const result = {};
     for (const [, key, raw] of text.matchAll(PAIR_RE)) {
         let value;
@@ -495,3 +495,65 @@ export function htmlToText(html) {
 
     return tempDivElement.textContent || tempDivElement.innerText || '';
 }
+
+export async function getFeaturesHTMLData(features) {
+    const result = [];
+    for (const feature of features) {
+        if (feature) {
+            const base = feature.item ?? feature;
+            const item = base.system ? base : await foundry.utils.fromUuid(base.uuid);
+            const itemDescription = await foundry.applications.ux.TextEditor.implementation.enrichHTML(
+                item.system.description
+            );
+            result.push({ label: item.name, description: itemDescription });
+        }
+    }
+
+    return result;
+}
+
+/**
+ * Given a simple flavor-less formula with only +/- operators, returns a list of damage partial terms.
+ * All subtracted terms become negative terms.
+ * If there are no dice, it returns 0d1 for that term.
+ */
+export function parseTermsFromSimpleFormula(formula) {
+    const roll = formula instanceof Roll ? formula : new Roll(formula);
+
+    // Parse from right to left so that when we hit an operator, we already have the term.
+    return roll.terms.reduceRight((result, term) => {
+        // Ignore + terms, we assume + by default
+        if (term.expression === ' + ') return result;
+
+        // - terms modify the last term we parsed
+        if (term.expression === ' - ') {
+            const termToModify = result[0];
+            if (termToModify) {
+                if (termToModify.bonus) termToModify.bonus *= -1;
+                if (termToModify.dice) termToModify.dice *= -1;
+            }
+            return result;
+        }
+
+        result.unshift({
+            bonus: term instanceof foundry.dice.terms.NumericTerm ? term.number : 0,
+            diceQuantity: term instanceof foundry.dice.terms.Die ? term.number : 0,
+            faces: term.faces ?? 1
+        });
+
+        return result;
+    }, []);
+}
+
+/**
+ * Calculates the expectede value from a formula or the results of parseTermsFromSimpleFormula.
+ * @returns {number} the average result of rolling the given dice
+ */
+export function calculateExpectedValue(formulaOrTerms) {
+    const terms = Array.isArray(formulaOrTerms)
+        ? formulaOrTerms
+        : typeof formulaOrTerms === 'string'
+          ? parseTermsFromSimpleFormula(formulaOrTerms)
+          : [formulaOrTerms];
+    return terms.reduce((r, t) => r + (t.bonus ?? 0) + (t.diceQuantity ? (t.diceQuantity * (t.faces + 1)) / 2 : 0), 0);
+}

module/systemRegistration/handlebars.mjs

@@ -39,6 +39,7 @@ export const preloadHandlebarsTemplates = async function () {
         'systems/daggerheart/templates/dialogs/downtime/activities.hbs',
         'systems/daggerheart/templates/dialogs/dice-roll/costSelection.hbs',
         'systems/daggerheart/templates/ui/chat/parts/roll-part.hbs',
+        'systems/daggerheart/templates/ui/chat/parts/description-part.hbs',
         'systems/daggerheart/templates/ui/chat/parts/damage-part.hbs',
         'systems/daggerheart/templates/ui/chat/parts/target-part.hbs',
         'systems/daggerheart/templates/ui/chat/parts/button-part.hbs',

module/systemRegistration/settings.mjs

@@ -7,7 +7,7 @@ import {
     DhHomebrewSettings,
     DhVariantRuleSettings
 } from '../applications/settings/_module.mjs';
-import { DhTagTeamRoll } from '../data/_module.mjs';
+import { CompendiumBrowserSettings, DhTagTeamRoll } from '../data/_module.mjs';
 
 export const registerDHSettings = () => {
     registerMenuSettings();
@@ -126,7 +126,7 @@ const registerNonConfigSettings = () => {
         type: Number,
         default: 0,
         onChange: () => {
-            if (ui.resources) ui.resources.render({ force: true });
+            if (ui.resources) ui.resources.render();
             ui.combat.render({ force: true });
         }
     });
@@ -142,6 +142,12 @@ const registerNonConfigSettings = () => {
         config: false,
         type: DhTagTeamRoll
     });
+
+    game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.CompendiumBrowserSettings, {
+        scope: 'client',
+        config: false,
+        type: CompendiumBrowserSettings
+    });
 };
 
 /**

module/systemRegistration/socket.mjs

@@ -38,7 +38,8 @@ export const RefreshType = {
     Countdown: 'DhCoundownRefresh',
     TagTeamRoll: 'DhTagTeamRollRefresh',
     EffectsDisplay: 'DhEffectsDisplayRefresh',
-    Scene: 'DhSceneRefresh'
+    Scene: 'DhSceneRefresh',
+    CompendiumBrowser: 'DhCompendiumBrowserRefresh'
 };
 
 export const registerSocketHooks = () => {