Merge pull request #69 from Foundryborne/feature/enhance-armor-and-weapon-sheet

Enhance armor and weapon sheet

module/applications/_module.mjs

@@ -8,7 +8,7 @@ export { default as DhpAncestry } from './sheets/ancestry.mjs';
 export { default as DhpCommunity } from './sheets/community.mjs';
 export { default as DhpMiscellaneous } from './sheets/items/miscellaneous.mjs';
 export { default as DhpConsumable } from './sheets/items/consumable.mjs';
-export { default as DhpWeapon } from './sheets/weapon.mjs';
-export { default as DhpArmor } from './sheets/armor.mjs';
+export { default as DhpWeapon } from './sheets/items/weapon.mjs';
+export { default as DhpArmor } from './sheets/items/armor.mjs';
 export { default as DhpChatMessage } from './chatMessage.mjs';
 export { default as DhpEnvironment } from './sheets/environment.mjs';

module/applications/sheets/armor.mjs

@@ -1,63 +0,0 @@
-// import DhpApplicationMixin from '../daggerheart-sheet.mjs';
-
-// export default class ArmorSheet extends DhpApplicationMixin(ItemSheet) {
-//     static documentType = "armor";
-
-//     /** @override */
-//     static get defaultOptions() {
-//         return foundry.utils.mergeObject(super.defaultOptions, {
-//             classes: ["daggerheart", "sheet", "armor"],
-//             width: 400,
-//             height: 'auto',
-//         });
-//     }
-
-//     /** @override */
-//     getData() {
-//         const context = super.getData();
-//         context.config = CONFIG.daggerheart;
-
-//         return context;
-//     }
-
-//     async _handleAction(action, event, button) {
-//         switch(action){
-//         }
-//     }
-// }
-import DaggerheartSheet from './daggerheart-sheet.mjs';
-
-const { ItemSheetV2 } = foundry.applications.sheets;
-export default class ArmorSheet extends DaggerheartSheet(ItemSheetV2) {
-    static DEFAULT_OPTIONS = {
-        tag: 'form',
-        classes: ['daggerheart', 'sheet', 'armor'],
-        position: { width: 400 },
-        form: {
-            handler: this.updateForm,
-            submitOnChange: true,
-            closeOnSubmit: false
-        },
-        dragDrop: [{ dragSelector: null, dropSelector: null }]
-    };
-
-    static PARTS = {
-        form: {
-            id: 'feature',
-            template: 'systems/daggerheart/templates/sheets/armor.hbs'
-        }
-    };
-
-    async _prepareContext(_options) {
-        const context = await super._prepareContext(_options);
-        context.document = this.document;
-        context.config = CONFIG.daggerheart;
-
-        return context;
-    }
-
-    static async updateForm(event, _, formData) {
-        await this.document.update(formData.object);
-        this.render();
-    }
-}

module/applications/sheets/items/armor.mjs

@@ -0,0 +1,59 @@
+import DaggerheartSheet from '../daggerheart-sheet.mjs';
+
+const { ItemSheetV2 } = foundry.applications.sheets;
+export default class ArmorSheet extends DaggerheartSheet(ItemSheetV2) {
+    static DEFAULT_OPTIONS = {
+        tag: 'form',
+        classes: ['daggerheart', 'sheet', 'dh-style', 'armor'],
+        position: { width: 600 },
+        form: {
+            handler: this.updateForm,
+            submitOnChange: true,
+            closeOnSubmit: false
+        },
+        dragDrop: [{ dragSelector: null, dropSelector: null }]
+    };
+
+    static PARTS = {
+        header: { template: 'systems/daggerheart/templates/sheets/items/armor/header.hbs' },
+        tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
+        description: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-description.hbs' },
+        settings: {
+            template: 'systems/daggerheart/templates/sheets/items/armor/settings.hbs',
+            scrollable: ['.settings']
+        }
+    };
+
+    static TABS = {
+        description: {
+            active: true,
+            cssClass: '',
+            group: 'primary',
+            id: 'description',
+            icon: null,
+            label: 'DAGGERHEART.Sheets.Feature.Tabs.Description'
+        },
+        settings: {
+            active: false,
+            cssClass: '',
+            group: 'primary',
+            id: 'settings',
+            icon: null,
+            label: 'DAGGERHEART.Sheets.Feature.Tabs.Settings'
+        }
+    };
+
+    async _prepareContext(_options) {
+        const context = await super._prepareContext(_options);
+        context.document = this.document;
+        context.config = CONFIG.daggerheart;
+        context.tabs = super._getTabs(this.constructor.TABS);
+
+        return context;
+    }
+
+    static async updateForm(event, _, formData) {
+        await this.document.update(formData.object);
+        this.render();
+    }
+}

module/applications/sheets/items/weapon.mjs

@@ -0,0 +1,58 @@
+import DaggerheartSheet from '../daggerheart-sheet.mjs';
+
+const { ItemSheetV2 } = foundry.applications.sheets;
+export default class WeaponSheet extends DaggerheartSheet(ItemSheetV2) {
+    static DEFAULT_OPTIONS = {
+        tag: 'form',
+        classes: ['daggerheart', 'sheet', 'dh-style', 'weapon'],
+        position: { width: 600 },
+        form: {
+            handler: this.updateForm,
+            submitOnChange: true,
+            closeOnSubmit: false
+        }
+    };
+
+    static PARTS = {
+        header: { template: 'systems/daggerheart/templates/sheets/items/weapon/header.hbs' },
+        tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
+        description: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-description.hbs' },
+        settings: {
+            template: 'systems/daggerheart/templates/sheets/items/weapon/settings.hbs',
+            scrollable: ['.settings']
+        }
+    };
+
+    static TABS = {
+        description: {
+            active: true,
+            cssClass: '',
+            group: 'primary',
+            id: 'description',
+            icon: null,
+            label: 'DAGGERHEART.Sheets.Feature.Tabs.Description'
+        },
+        settings: {
+            active: false,
+            cssClass: '',
+            group: 'primary',
+            id: 'settings',
+            icon: null,
+            label: 'DAGGERHEART.Sheets.Feature.Tabs.Settings'
+        }
+    };
+
+    async _prepareContext(_options) {
+        const context = await super._prepareContext(_options);
+        context.document = this.document;
+        context.config = CONFIG.daggerheart;
+        context.tabs = super._getTabs(this.constructor.TABS);
+
+        return context;
+    }
+
+    static async updateForm(event, _, formData) {
+        await this.document.update(formData.object);
+        this.render();
+    }
+}

module/applications/sheets/weapon.mjs

@@ -1,63 +0,0 @@
-// import DhpApplicationMixin from '../daggerheart-sheet.mjs';
-
-// export default class WeaponSheet extends DhpApplicationMixin(ItemSheet) {
-//     static documentType = "weapon";
-
-//     /** @override */
-//     static get defaultOptions() {
-//         return foundry.utils.mergeObject(super.defaultOptions, {
-//             classes: ["daggerheart", "sheet", "weapon"],
-//             width: 400,
-//             height: 'auto',
-//         });
-//     }
-
-//     /** @override */
-//     getData() {
-//         const context = super.getData();
-//         context.config = CONFIG.daggerheart;
-
-//         return context;
-//     }
-
-//     async _handleAction(action, event, button) {
-//         switch(action){
-//         }
-//     }
-// }
-
-import DaggerheartSheet from './daggerheart-sheet.mjs';
-
-const { ItemSheetV2 } = foundry.applications.sheets;
-export default class WeaponSheet extends DaggerheartSheet(ItemSheetV2) {
-    static DEFAULT_OPTIONS = {
-        tag: 'form',
-        classes: ['daggerheart', 'sheet', 'weapon'],
-        position: { width: 400 },
-        form: {
-            handler: this.updateForm,
-            submitOnChange: true,
-            closeOnSubmit: false
-        }
-    };
-
-    static PARTS = {
-        form: {
-            id: 'feature',
-            template: 'systems/daggerheart/templates/sheets/weapon.hbs'
-        }
-    };
-
-    async _prepareContext(_options) {
-        const context = await super._prepareContext(_options);
-        context.document = this.document;
-        context.config = CONFIG.daggerheart;
-
-        return context;
-    }
-
-    static async updateForm(event, _, formData) {
-        await this.document.update(formData.object);
-        this.render();
-    }
-}

module/config/actorConfig.mjs

@@ -1,77 +1,77 @@
 export const abilities = {
     agility: {
-        label: 'DAGGERHEART.Abilities.Agility.Name',
+        label: 'DAGGERHEART.Abilities.agility.name',
         verbs: [
-            'DAGGERHEART.Abilities.Agility.Verb.Sprint',
-            'DAGGERHEART.Abilities.Agility.Verb.Leap',
-            'DAGGERHEART.Abilities.Agility.Verb.Maneuver'
+            'DAGGERHEART.Abilities.agility.verb.sprint',
+            'DAGGERHEART.Abilities.agility.verb.leap',
+            'DAGGERHEART.Abilities.agility.verb.maneuver'
         ]
     },
     strength: {
-        label: 'DAGGERHEART.Abilities.Strength.Name',
+        label: 'DAGGERHEART.Abilities.strength.name',
         verbs: [
-            'DAGGERHEART.Abilities.Strength.Verb.Lift',
-            'DAGGERHEART.Abilities.Strength.Verb.Smash',
-            'DAGGERHEART.Abilities.Strength.Verb.Grapple'
+            'DAGGERHEART.Abilities.strength.verb.lift',
+            'DAGGERHEART.Abilities.strength.verb.smash',
+            'DAGGERHEART.Abilities.strength.verb.grapple'
         ]
     },
     finesse: {
-        label: 'DAGGERHEART.Abilities.Finesse.Name',
+        label: 'DAGGERHEART.Abilities.finesse.name',
         verbs: [
-            'DAGGERHEART.Abilities.Finesse.Verb.Control',
-            'DAGGERHEART.Abilities.Finesse.Verb.Hide',
-            'DAGGERHEART.Abilities.Finesse.Verb.Tinker'
+            'DAGGERHEART.Abilities.finesse.verb.control',
+            'DAGGERHEART.Abilities.finesse.verb.hide',
+            'DAGGERHEART.Abilities.finesse.verb.tinker'
         ]
     },
     instinct: {
-        label: 'DAGGERHEART.Abilities.Instinct.Name',
+        label: 'DAGGERHEART.Abilities.instinct.name',
         verbs: [
-            'DAGGERHEART.Abilities.Instinct.Verb.Perceive',
-            'DAGGERHEART.Abilities.Instinct.Verb.Sense',
-            'DAGGERHEART.Abilities.Instinct.Verb.Navigate'
+            'DAGGERHEART.Abilities.instinct.verb.perceive',
+            'DAGGERHEART.Abilities.instinct.verb.sense',
+            'DAGGERHEART.Abilities.instinct.verb.navigate'
         ]
     },
     presence: {
-        label: 'DAGGERHEART.Abilities.Presence.Name',
+        label: 'DAGGERHEART.Abilities.presence.name',
         verbs: [
-            'DAGGERHEART.Abilities.Presence.Verb.Charm',
-            'DAGGERHEART.Abilities.Presence.Verb.Perform',
-            'DAGGERHEART.Abilities.Presence.Verb.Deceive'
+            'DAGGERHEART.Abilities.presence.verb.charm',
+            'DAGGERHEART.Abilities.presence.verb.perform',
+            'DAGGERHEART.Abilities.presence.verb.deceive'
         ]
     },
     knowledge: {
-        label: 'DAGGERHEART.Abilities.Knowledge.Name',
+        label: 'DAGGERHEART.Abilities.knowledge.name',
         verbs: [
-            'DAGGERHEART.Abilities.Knowledge.Verb.Recall',
-            'DAGGERHEART.Abilities.Knowledge.Verb.Analyze',
-            'DAGGERHEART.Abilities.Knowledge.Verb.Comprehend'
+            'DAGGERHEART.Abilities.knowledge.verb.recall',
+            'DAGGERHEART.Abilities.knowledge.verb.analyze',
+            'DAGGERHEART.Abilities.knowledge.verb.comprehend'
         ]
     }
 };
 
 export const featureProperties = {
     agility: {
-        name: 'DAGGERHEART.Abilities.Agility.Name',
+        name: 'DAGGERHEART.Abilities.agility.name',
         path: actor => actor.system.attributes.agility.data.value
     },
     strength: {
-        name: 'DAGGERHEART.Abilities.Strength.Name',
+        name: 'DAGGERHEART.Abilities.strength.name',
         path: actor => actor.system.attributes.strength.data.value
     },
     finesse: {
-        name: 'DAGGERHEART.Abilities.Finesse.Name',
+        name: 'DAGGERHEART.Abilities.finesse.name',
         path: actor => actor.system.attributes.finesse.data.value
     },
     instinct: {
-        name: 'DAGGERHEART.Abilities.Instinct.Name',
+        name: 'DAGGERHEART.Abilities.instinct.name',
         path: actor => actor.system.attributes.instinct.data.value
     },
     presence: {
-        name: 'DAGGERHEART.Abilities.Presence.Name',
+        name: 'DAGGERHEART.Abilities.presence.name',
         path: actor => actor.system.attributes.presence.data.value
     },
     knowledge: {
-        name: 'DAGGERHEART.Abilities.Knowledge.Name',
+        name: 'DAGGERHEART.Abilities.knowledge.name',
         path: actor => actor.system.attributes.knowledge.data.value
     },
     spellcastingTrait: {

module/config/generalConfig.mjs

@@ -1,27 +1,27 @@
 export const range = {
     melee: {
-        label: 'DAGGERHEART.Range.Melee.Name',
-        description: 'DAGGERHEART.Range.Melee.Description',
+        label: 'DAGGERHEART.Range.melee.name',
+        description: 'DAGGERHEART.Range.melee.description',
         distance: 1
     },
     veryClose: {
-        label: 'DAGGERHEART.Range.VeryClose.Name',
-        description: 'DAGGERHEART.Range.VeryClose.Description',
+        label: 'DAGGERHEART.Range.veryClose.name',
+        description: 'DAGGERHEART.Range.veryClose.description',
         distance: 3
     },
     close: {
-        label: 'DAGGERHEART.Range.Close.Name',
-        description: 'DAGGERHEART.Range.Close.Description',
+        label: 'DAGGERHEART.Range.close.name',
+        description: 'DAGGERHEART.Range.close.description',
         distance: 10
     },
     far: {
-        label: 'DAGGERHEART.Range.Far.Name',
-        description: 'DAGGERHEART.Range.Far.Description',
+        label: 'DAGGERHEART.Range.far.name',
+        description: 'DAGGERHEART.Range.far.description',
         distance: 20
     },
     veryFar: {
-        label: 'DAGGERHEART.Range.VeryFar.Name',
-        description: 'DAGGERHEART.Range.VeryFar.Description',
+        label: 'DAGGERHEART.Range.veryFar.name',
+        description: 'DAGGERHEART.Range.veryFar.description',
         distance: 30
     }
 };
@@ -29,24 +29,24 @@ export const range = {
 export const burden = {
     oneHanded: {
         value: 'oneHanded',
-        label: 'DAGGERHEART.Burden.OneHanded'
+        label: 'DAGGERHEART.Burden.oneHanded'
     },
     twoHanded: {
         value: 'twoHanded',
-        label: 'DAGGERHEART.Burden.TwoHanded'
+        label: 'DAGGERHEART.Burden.twoHanded'
     }
 };
 
 export const damageTypes = {
     physical: {
         id: 'physical',
-        label: 'DAGGERHEART.DamageType.Physical.Name',
-        abbreviation: 'DAGGERHEART.DamageType.Physical.Abbreviation'
+        label: 'DAGGERHEART.DamageType.physical.name',
+        abbreviation: 'DAGGERHEART.DamageType.physical.abbreviation'
     },
     magical: {
         id: 'magical',
-        label: 'DAGGERHEART.DamageType.Magical.Name',
-        abbreviation: 'DAGGERHEART.DamageType.Magical.Abbreviation'
+        label: 'DAGGERHEART.DamageType.magical.name',
+        abbreviation: 'DAGGERHEART.DamageType.magical.abbreviation'
     }
 };
 

module/data/armor.mjs

@@ -3,7 +3,7 @@ export default class DhpArmor extends foundry.abstract.TypeDataModel {
         const fields = foundry.data.fields;
         return {
             equipped: new fields.BooleanField({ initial: false }),
-            baseScore: new fields.NumberField({ initial: 1, integer: true }),
+            baseScore: new fields.NumberField({ integer: true, initial: 0 }),
             feature: new fields.StringField({
                 choices: SYSTEM.ITEM.armorFeatures,
                 integer: false,
@@ -14,10 +14,10 @@ export default class DhpArmor extends foundry.abstract.TypeDataModel {
                 value: new fields.NumberField({ initial: 0, integer: true })
             }),
             baseThresholds: new fields.SchemaField({
-                major: new fields.NumberField({ initial: 0, integer: true }),
-                severe: new fields.NumberField({ initial: 0, integer: true })
+                major: new fields.NumberField({ integer: true, initial: 0 }),
+                severe: new fields.NumberField({ integer: true, initial: 0 })
             }),
-            quantity: new fields.NumberField({ initial: 1, integer: true }),
+            quantity: new fields.NumberField({ integer: true, initial: 1 }),
             description: new fields.HTMLField({})
         };
     }

module/data/weapon.mjs

@@ -5,13 +5,17 @@ export default class DhpWeapon extends foundry.abstract.TypeDataModel {
             equipped: new fields.BooleanField({ initial: false }),
             inventoryWeapon: new fields.NumberField({ initial: null, nullable: true, integer: true }),
             secondary: new fields.BooleanField({ initial: false }),
-            trait: new fields.StringField({ choices: SYSTEM.ACTOR.abilities, integer: false }),
-            range: new fields.StringField({ choices: SYSTEM.GENERAL.range, integer: false }),
+            trait: new fields.StringField({ choices: SYSTEM.ACTOR.abilities, integer: false, initial: 'agility' }),
+            range: new fields.StringField({ choices: SYSTEM.GENERAL.range, integer: false, initial: 'melee' }),
             damage: new fields.SchemaField({
-                value: new fields.StringField({}),
-                type: new fields.StringField({ choices: SYSTEM.GENERAL.damageTypes, integer: false })
+                value: new fields.StringField({ initial: 'd6' }),
+                type: new fields.StringField({
+                    choices: SYSTEM.GENERAL.damageTypes,
+                    integer: false,
+                    initial: 'physical'
+                })
             }),
-            burden: new fields.StringField({ choices: SYSTEM.GENERAL.burden, integer: false }),
+            burden: new fields.StringField({ choices: SYSTEM.GENERAL.burden, integer: false, initial: 'oneHanded' }),
             feature: new fields.StringField({ choices: SYSTEM.ITEM.weaponFeatures, integer: false, blank: true }),
             quantity: new fields.NumberField({ initial: 1, integer: true }),
             description: new fields.HTMLField({})