diff --git a/lang/en.json b/lang/en.json index 4355140e..19317228 100755 --- a/lang/en.json +++ b/lang/en.json @@ -355,8 +355,7 @@ "CompendiumBrowserSettings": { "title": "Enable Compendiums", "enableSource": "Enable Source", - "disableSource": "Disable Source", - "worldCompendiums": "World Compendiums" + "disableSource": "Disable Source" }, "ContextMenu": { "disableEffect": "Disable Effect", diff --git a/module/applications/dialogs/CompendiumBrowserSettings.mjs b/module/applications/dialogs/CompendiumBrowserSettings.mjs index bef54a6f..42d0e256 100644 --- a/module/applications/dialogs/CompendiumBrowserSettings.mjs +++ b/module/applications/dialogs/CompendiumBrowserSettings.mjs @@ -50,20 +50,13 @@ 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: basePackageName, id } = pack.metadata; - if (!CompendiumBrowserSettings.#browserPackTypes.includes(type)) return acc; + const { type, label, packageType, packageName, id } = pack.metadata; + if (packageType === 'world' || !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); + const sourceLabel = game.modules.get(packageName)?.title ?? 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: [] }; diff --git a/module/applications/ui/fearTracker.mjs b/module/applications/ui/fearTracker.mjs index 82dda215..e9c816db 100644 --- a/module/applications/ui/fearTracker.mjs +++ b/module/applications/ui/fearTracker.mjs @@ -34,6 +34,8 @@ export default class FearTracker extends HandlebarsApplicationMixin(ApplicationV position: { width: 222, height: 222 + // top: "200px", + // left: "120px" } }; @@ -64,7 +66,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 }; } diff --git a/module/applications/ui/sceneNavigation.mjs b/module/applications/ui/sceneNavigation.mjs index 67bfe0b4..0a3e08a5 100644 --- a/module/applications/ui/sceneNavigation.mjs +++ b/module/applications/ui/sceneNavigation.mjs @@ -63,8 +63,7 @@ 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), - 1 + newEnvironments.findIndex(x => x === environment.uuid) )[0]; newEnvironments.unshift(newFirst); emitAsGM( diff --git a/module/data/compendiumBrowserSettings.mjs b/module/data/compendiumBrowserSettings.mjs index ea71c439..9e8025dd 100644 --- a/module/data/compendiumBrowserSettings.mjs +++ b/module/data/compendiumBrowserSettings.mjs @@ -24,8 +24,7 @@ export default class CompendiumBrowserSettings extends foundry.abstract.DataMode 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]; + const excludedSourceData = this.excludedSources[pack.metadata.packageName]; if (excludedSourceData && excludedSourceData.excludedDocumentTypes.includes(pack.metadata.type)) return true; const excludedPackData = this.excludedPacks[item.pack]; diff --git a/module/systemRegistration/settings.mjs b/module/systemRegistration/settings.mjs index c4acf7ed..49361877 100644 --- a/module/systemRegistration/settings.mjs +++ b/module/systemRegistration/settings.mjs @@ -126,7 +126,7 @@ const registerNonConfigSettings = () => { type: Number, default: 0, onChange: () => { - if (ui.resources) ui.resources.render(); + if (ui.resources) ui.resources.render({ force: true }); ui.combat.render({ force: true }); } });