Merged with main

module/applications/dialogs/CompendiumBrowserSettings.mjs

@@ -50,13 +50,20 @@ export default class CompendiumBrowserSettings extends HandlebarsApplicationMixi
         const excludedSourceData = this.browserSettings.excludedSources;
         const excludedPackData = this.browserSettings.excludedPacks;
         context.typePackCollections = game.packs.reduce((acc, pack) => {
-            const { type, label, packageType, packageName, id } = pack.metadata;
-            if (packageType === 'world' || !CompendiumBrowserSettings.#browserPackTypes.includes(type)) return acc;
+            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 ?? game.system.title;
+
+            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: [] };

module/applications/dialogs/deathMove.mjs

@@ -200,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/sheets-configs/activeEffectConfig.mjs

@@ -30,22 +30,27 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
             const group = game.i18n.localize(model.metadata.label);
             const attributes = CONFIG.Token.documentClass.getTrackedAttributes(model.metadata.type);
 
-            const getLabel = path => {
-                const label = model.schema.getField(path)?.label;
-                return label ? game.i18n.localize(label) : path;
+            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`;
-                const label =
-                    joined === 'resources.hope.max'
-                        ? 'DAGGERHEART.SETTINGS.Homebrew.FIELDS.maxHope.label'
-                        : getLabel(joined);
-                return { value: joined, label, group };
+                return { value: joined, ...getTranslations(joined), group };
             });
             const values = attributes.value.flatMap(x => {
                 const joined = x.join('.');
-                return { value: joined, label: getLabel(joined), group };
+                return { value: joined, ...getTranslations(joined), group };
             });
 
             const bonuses = getAllLeaves(model.schema.fields.bonuses, group);

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/sceneNavigation.mjs

@@ -64,7 +64,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(