diff --git a/module/sheets/agent-sheet.js b/module/sheets/agent-sheet.js index f2fb0d4..c4f12cb 100644 --- a/module/sheets/agent-sheet.js +++ b/module/sheets/agent-sheet.js @@ -31,15 +31,9 @@ export default class DGAgentSheet extends DGActorSheet { }); static PARTS = /** @type {const} */ ({ - header: { - template: `${this.TEMPLATE_PATH}/parts/header.html`, - }, - tabs: super.PARTS.tabs, - skills: { - template: `${this.TEMPLATE_PATH}/parts/skills-tab.html`, - templates: [`${this.TEMPLATE_PATH}/partials/custom-skills-partial.html`], - scrollable: [""], - }, + header: this.BASE_PARTS.header, + tabs: this.BASE_PARTS.tabs, + skills: this.BASE_PARTS.skills, physical: { template: `${this.TEMPLATE_PATH}/parts/physical-tab.html`, templates: [ @@ -50,10 +44,7 @@ export default class DGAgentSheet extends DGActorSheet { motivations: { template: `${this.TEMPLATE_PATH}/parts/motivations-tab.html`, }, - gear: { - template: `${this.TEMPLATE_PATH}/parts/gear-tab.html`, - scrollable: [""], - }, + gear: this.BASE_PARTS.gear, bio: { template: `${this.TEMPLATE_PATH}/parts/bio-tab.html`, templates: [`${this.TEMPLATE_PATH}/partials/cv-partial.html`], @@ -63,10 +54,7 @@ export default class DGAgentSheet extends DGActorSheet { template: `${this.TEMPLATE_PATH}/parts/bonds-tab.html`, scrollable: [""], }, - about: { - template: `${this.TEMPLATE_PATH}/parts/about-tab.html`, - scrollable: [""], - }, + about: this.BASE_PARTS.about, }); /* -------------------------------------------- */ diff --git a/module/sheets/base-actor-sheet.js b/module/sheets/base-actor-sheet.js index f42fbee..f8e23dd 100644 --- a/module/sheets/base-actor-sheet.js +++ b/module/sheets/base-actor-sheet.js @@ -30,13 +30,31 @@ export default class DGActorSheet extends DGSheetMixin(ActorSheetV2) { }, }); - static TEMPLATE_PATH = `${super.TEMPLATE_PATH}/actor`; + /** @override - Singular reference to the actor templates path */ + static TEMPLATE_PATH = /** @type {const} */ (`${super.TEMPLATE_PATH}/actor`); - static PARTS = { + /** Holds base/shared parts of sheets for subclasses to reference. */ + static BASE_PARTS = /** @type {const} */ ({ + header: { + template: `${this.TEMPLATE_PATH}/parts/header.html`, + }, tabs: { template: `templates/generic/tab-navigation.hbs`, // From FoundryVTT }, - }; + skills: { + template: `${this.TEMPLATE_PATH}/parts/skills-tab.html`, + templates: [`${this.TEMPLATE_PATH}/partials/custom-skills-partial.html`], + scrollable: [""], + }, + gear: { + template: `${this.TEMPLATE_PATH}/parts/gear-tab.html`, + scrollable: [""], + }, + about: { + template: `${this.TEMPLATE_PATH}/parts/about-tab.html`, + scrollable: [""], + }, + }); /** @override */ async _prepareContext(options) { diff --git a/module/sheets/npc-sheet.js b/module/sheets/npc-sheet.js index 79260ad..ef19520 100644 --- a/module/sheets/npc-sheet.js +++ b/module/sheets/npc-sheet.js @@ -17,26 +17,14 @@ export default class DGNPCSheet extends DGActorSheet { /** @override */ static PARTS = /** @type {const} */ ({ - header: { - template: `${this.TEMPLATE_PATH}/parts/header.html`, - }, - physical: { + header: this.BASE_PARTS.header, + statistics: { template: `${this.TEMPLATE_PATH}/partials/attributes-grid-partial.html`, }, - tabs: super.PARTS.tabs, - skills: { - template: `${this.TEMPLATE_PATH}/parts/skills-tab.html`, - templates: [`${this.TEMPLATE_PATH}/partials/custom-skills-partial.html`], - scrollable: [""], - }, - gear: { - template: `${this.TEMPLATE_PATH}/parts/gear-tab.html`, - scrollable: [""], - }, - about: { - template: `${this.TEMPLATE_PATH}/parts/about-tab.html`, - scrollable: [""], - }, + tabs: this.BASE_PARTS.tabs, + skills: this.BASE_PARTS.skills, + gear: this.BASE_PARTS.gear, + about: this.BASE_PARTS.about, }); /* -------------------------------------------- */ diff --git a/templates/actor/partials/sanity-npc.html b/templates/actor/partials/sanity-npc.html index 1055dcf..861cda8 100644 --- a/templates/actor/partials/sanity-npc.html +++ b/templates/actor/partials/sanity-npc.html @@ -1,11 +1,13 @@ - + data-tooltip="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{actor.system.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" /> {{localize 'DG.NPCSheet.BreakPointAbbreviation'}}: - + data-tooltip="{{localize 'DG.Tooltip.BreakPoint'}}" /> diff --git a/templates/actor/partials/sanity-unnatural.html b/templates/actor/partials/sanity-unnatural.html index 838996c..852a9cf 100644 --- a/templates/actor/partials/sanity-unnatural.html +++ b/templates/actor/partials/sanity-unnatural.html @@ -1,7 +1,9 @@ - / -