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

Enhance armor and weapon sheet
2026-01-11 19:25:21 +01:00 · 2025-05-28 09:12:28 -03:00 · 2025-05-28 09:12:28 -03:00 · b31d19a772
commit b31d19a772
parent 00a19d4840 66b800ea51
20 changed files with 364 additions and 379 deletions
--- a/lang/en.json
+++ b/lang/en.json
@ -154,52 +154,58 @@
            "Reaction": "Reaction"
        },
        "Abilities": {
-            "Agility": {
-                "Name": "Agility",
-                "Verb": {
-                    "Sprint": "Sprint",
-                    "Leap": "Leap",
-                    "Maneuver": "Maneuver"
+            "agility": {
+                "name": "Agility",
+                "short": "AGI",
+                "verb": {
+                    "sprint": "Sprint",
+                    "leap": "Leap",
+                    "maneuver": "Maneuver"
                }
            },
-            "Strength": {
-                "Name": "Strength",
-                "Verb": {
-                    "Lift": "Lift",
-                    "Smash": "Smash",
-                    "Grapple": "Grapple"
+            "strength": {
+                "name": "Strength",
+                "short": "STR",
+                "verb": {
+                    "lift": "Lift",
+                    "smash": "Smash",
+                    "grapple": "Grapple"
                }
            },
-            "Finesse": {
-                "Name": "Finesse",
-                "Verb": {
-                    "Control": "Control",
-                    "Hide": "Hide",
-                    "Tinker": "Tinker"
+            "finesse": {
+                "name": "Finesse",
+                "short": "FIN",
+                "verb": {
+                    "control": "Control",
+                    "hide": "Hide",
+                    "tinker": "Tinker"
                }
            },
-            "Instinct": {
-                "Name": "Instinct",
-                "Verb": {
-                    "Perceive": "Perceive",
-                    "Sense": "Sense",
-                    "Navigate": "Navigate"
+            "instinct": {
+                "name": "Instinct",
+                "short": "INS",
+                "verb": {
+                    "perceive": "Perceive",
+                    "sense": "Sense",
+                    "navigate": "Navigate"
                }
            },
-            "Presence": {
-                "Name": "Presence",
-                "Verb": {
-                    "Charm": "Charm",
-                    "Perform": "Perform",
-                    "Deceive": "Deceive"
+            "presence": {
+                "name": "Presence",
+                "short": "PRE",
+                "verb": {
+                    "charm": "Charm",
+                    "perform": "Perform",
+                    "deceive": "Deceive"
                }
            },
-            "Knowledge": {
-                "Name": "Knowledge",
-                "Verb": {
-                    "Recall": "Recall",
-                    "Analyze": "Analyze",
-                    "Comprehend": "Comprehend"
+            "knowledge": {
+                "name": "Knowledge",
+                "short": "KNO",
+                "verb": {
+                    "recall": "Recall",
+                    "analyze": "Analyze",
+                    "comprehend": "Comprehend"
                }
            }
        },
@ -394,39 +400,39 @@
            }
        },
        "Burden": {
-            "OneHanded": "One-Handed",
-            "TwoHanded": "Two-Handed"
+            "oneHanded": "One-Handed",
+            "twoHanded": "Two-Handed"
        },
        "Range": {
-            "Melee": {
-                "Name": "Melee",
-                "Description": "means a character is within touching distance of the target. PCs can generally touch targets up to a few feet away from them, but melee range may be greater for especially large NPCs."
+            "melee": {
+                "name": "Melee",
+                "description": "means a character is within touching distance of the target. PCs can generally touch targets up to a few feet away from them, but melee range may be greater for especially large NPCs."
            },
-            "VeryClose": {
-                "Name": "Very Close",
-                "Description": "means a distance where one can see fine details of a target- within moments of reaching, if need be. This is usually anywhere from about 5-10 feet away. While in danger, a PC can usually get to anything that’s very close as part of any other action they take. Anything on a battle map that is within the shortest length of a game card (~2-3 inches) can usually be considered very close."
+            "veryClose": {
+                "name": "Very Close",
+                "description": "means a distance where one can see fine details of a target- within moments of reaching, if need be. This is usually anywhere from about 5-10 feet away. While in danger, a PC can usually get to anything that’s very close as part of any other action they take. Anything on a battle map that is within the shortest length of a game card (~2-3 inches) can usually be considered very close."
            },
-            "Close": {
-                "Name": "Close",
-                "Description": "means a distance where one can see prominent details of a target-- across a room or to a neighboring market stall, generally about 10-30 feet away. While in danger, a PC can usually get to anything that’s close as part of any other action they take. Anything on a battle map that is within the length of a standard pen or pencil (~5-6 inches) can usually be considered close."
+            "close": {
+                "name": "Close",
+                "description": "means a distance where one can see prominent details of a target-- across a room or to a neighboring market stall, generally about 10-30 feet away. While in danger, a PC can usually get to anything that’s close as part of any other action they take. Anything on a battle map that is within the length of a standard pen or pencil (~5-6 inches) can usually be considered close."
            },
-            "Far": {
-                "Name": "Far",
-                "Description": "means a distance where one can see the appearance of a person or object, but probably not in great detail-- across a small battlefield or down a large corridor. This is usually about 30-100 feet away. While under danger, a PC will likely have to make an Agility check to get here safely. Anything on a battle map that is within the length of a standard piece of paper (~10-11 inches) can usually be considered far."
+            "far": {
+                "name": "Far",
+                "description": "means a distance where one can see the appearance of a person or object, but probably not in great detail-- across a small battlefield or down a large corridor. This is usually about 30-100 feet away. While under danger, a PC will likely have to make an Agility check to get here safely. Anything on a battle map that is within the length of a standard piece of paper (~10-11 inches) can usually be considered far."
            },
-            "VeryFar": {
-                "Name": "Very Far",
-                "Description": "means a distance where you can see the shape of a person or object, but probably not make outany details-- across a large battlefield or down a long street, generally about 100-300 feet away. While under danger, a PC likely has to make an Agility check to get here safely. Anything on a battle map that is beyond far distance, but still within sight of the characters can usually be considered very far."
+            "veryFar": {
+                "name": "Very Far",
+                "description": "means a distance where you can see the shape of a person or object, but probably not make outany details-- across a large battlefield or down a long street, generally about 100-300 feet away. While under danger, a PC likely has to make an Agility check to get here safely. Anything on a battle map that is beyond far distance, but still within sight of the characters can usually be considered very far."
            }
        },
        "DamageType": {
-            "Physical": {
-                "Name": "Physical",
-                "Abbreviation": "Phy"
+            "physical": {
+                "name": "Physical",
+                "abbreviation": "Phy"
            },
-            "Magical": {
-                "Name": "Magical",
-                "Abbreviation": "Mag"
+            "magical": {
+                "name": "Magical",
+                "abbreviation": "Mag"
            }
        },
        "HealingType": {
@ -934,13 +940,13 @@
                "NewFeature": "New Feature"
            },
            "Armor": {
-                "BaseScore": "Base Score",
-                "Feature": "Feature",
-                "Description": "Description",
-                "BaseThresholds": {
-                    "Base": "Base Thresholds",
-                    "Major": "Major Threshold",
-                    "Severe": "Severe Threshold"
+                "baseScore": "Base Score",
+                "feature": "Feature",
+                "description": "Description",
+                "baseThresholds": {
+                    "base": "Base Thresholds",
+                    "major": "Major Threshold",
+                    "severe": "Severe Threshold"
                }
            },
            "Class": {
@ -1062,6 +1068,7 @@
                }
            },
            "Weapon": {
+                "PrimaryWeapon": "Primary Weapon",
                "SecondaryWeapon": "Secondary Weapon",
                "Trait": "Trait",
                "Range": "Range",
--- a/module/applications/_module.mjs
+++ b/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';
--- a/module/applications/sheets/armor.mjs
+++ b/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();
-    }
-}
--- a/module/applications/sheets/items/armor.mjs
+++ b/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();
+    }
+}
--- a/module/applications/sheets/items/weapon.mjs
+++ b/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();
+    }
+}
--- a/module/applications/sheets/weapon.mjs
+++ b/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();
-    }
-}
--- a/module/config/actorConfig.mjs
+++ b/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: {
--- a/module/config/generalConfig.mjs
+++ b/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'
    }
 };

--- a/module/data/armor.mjs
+++ b/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({})
        };
    }
--- a/module/data/weapon.mjs
+++ b/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({})
--- a/styles/daggerheart.css
+++ b/styles/daggerheart.css
@ -3075,6 +3075,11 @@ div.daggerheart.views.multiclass {
  align-items: center;
  gap: 5px;
 }
+.application.sheet.dh-style fieldset .form-group label {
+  font-family: 'Montserrat', sans-serif;
+  font-weight: bold;
+  font-size: smaller;
+}
 .application.sheet.dh-style line-div {
  display: block;
  height: 1px;
@ -3177,6 +3182,7 @@ div.daggerheart.views.multiclass {
 }
 .application.sheet.daggerheart.dh-style .item-sheet-header .item-info .item-description {
  display: flex;
+  flex-direction: column;
  gap: 10px;
 }
 .application.sheet.daggerheart.dh-style .item-sheet-header .item-info h3 {
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@ -132,6 +132,14 @@
            align-items: center;
            gap: 5px;
        }
+
+        .form-group {
+            label {
+                font-family: @font-body;
+                font-weight: bold;
+                font-size: smaller;
+            }
+        }
    }

    line-div {
--- a/styles/less/global/item-header.less
+++ b/styles/less/global/item-header.less
@ -41,6 +41,7 @@

            .item-description {
                display: flex;
+                flex-direction: column;
                gap: 10px;
            }

--- a/templates/sheets/armor.hbs
+++ b/templates/sheets/armor.hbs
@ -1,42 +0,0 @@
-<div>
-    <header class="flexcol">
-         <div class="title-container">
-            <img class="flex0" src="{{document.img}}" data-edit="img" data-action="onEditImage" title="{{document.name}}" height="64" width="64"/>
-            <div class="title-name">
-                {{formInput fields.name value=source.name rootId=partId}}
-            </div>
-        </div>
-    </header>
-
-    <section class="sheet-body">
-        {{formField systemFields.baseScore value=source.system.baseScore label=(localize "DAGGERHEART.Sheets.Armor.BaseScore") }}
-        {{formField systemFields.feature value=source.system.feature label=(localize "DAGGERHEART.Sheets.Armor.Feature") localize=true blank=""}}
-        <div class="armor-thresholds">
-            <h2>{{localize "DAGGERHEART.Sheets.Armor.BaseThresholds.Base"}}</h2>
-            {{ formField systemFields.baseThresholds.fields.major value=source.system.baseThresholds.major label=(localize "DAGGERHEART.Sheets.Armor.BaseThresholds.Major") }}/
-            {{ formField systemFields.baseThresholds.fields.severe value=source.system.baseThresholds.severe label=(localize "DAGGERHEART.Sheets.Armor.BaseThresholds.Severe") }}
-        </div>
-        <div class="feature-description">
-            <h2>{{localize "DAGGERHEART.Sheets.Armor.Description"}}</h2>
-            {{formInput systemFields.description value=source.system.description enriched=source.system.description localize=true toggled=true}}
-        </div>
-        {{!-- <div class="form-group">
-            <label>{{localize "DAGGERHEART.Sheets.Armor.BaseScore"}}</label>
-            <div class="form-fields">
-                <input type="text" name="system.baseScore" value={{item.system.baseScore}} data-dtype="Number" />
-            </div>
-        </div> --}}
-        {{!-- <div class="form-group">
-            <label>{{localize "DAGGERHEART.Sheets.Armor.Feature"}}</label>
-            <div class="form-fields">
-                <select name="system.feature">
-                    {{selectOptions config.ITEM.armorFeatures selected=item.system.feature labelAttr="name" localize=true blank="" }}
-                </select>
-            </div>
-        </div>  
-        <div class="feature-description">
-            <h2>{{localize "DAGGERHEART.Sheets.Armor.Description"}}</h2>
-            {{editor item.system.description target="system.description" button=true}}
-        </div> --}}
-    </section>
-</div> 
--- a/templates/sheets/class.hbs
+++ b/templates/sheets/class.hbs
@ -80,13 +80,13 @@
                            </legend>

                            <div class="form-group flexrow">
-                                <label>{{localize "DAGGERHEART.Abilities.Agility.Name"}}</label>
+                                <label>{{localize "DAGGERHEART.Abilities.agility.name"}}</label>
                                <div class="form-fields flex0 trait-input">
                                    <input type="text" name="system.characterGuide.suggestedTraits.agility" value="{{source.system.characterGuide.suggestedTraits.agility}}" />
                                </div>
                            </div>
                            <div class="form-group flexrow">
-                                <label>{{localize "DAGGERHEART.Abilities.Strength.Name"}}</label>
+                                <label>{{localize "DAGGERHEART.Abilities.strength.Name"}}</label>
                                <div class="form-fields flex0 trait-input">
                                    <input type="text" name="system.characterGuide.suggestedTraits.strength" value="{{source.system.characterGuide.suggestedTraits.strength}}" />
                                </div>
--- a/templates/sheets/items/armor/header.hbs
+++ b/templates/sheets/items/armor/header.hbs
@ -0,0 +1,21 @@
+<header class='item-sheet-header'>
+    <img class='profile' src='{{source.img}}' data-action='editImage' data-edit='img' />
+    <div class='item-info'>
+        <line-div></line-div>
+        <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
+        <div class='item-description'>
+            <h3>
+                {{localize 'TYPES.Item.armor'}}
+            </h3>
+            <h3>
+                {{localize "DAGGERHEART.Sheets.Armor.baseScore"}}:
+                {{source.system.baseScore}}
+                <span>-</span>
+                {{localize "DAGGERHEART.Sheets.Armor.baseThresholds.base"}}:
+                {{source.system.baseThresholds.major}}
+                <span>/</span>
+                {{source.system.baseThresholds.severe}}
+            </h3>
+        </div>
+    </div>
+</header>
--- a/templates/sheets/items/armor/settings.hbs
+++ b/templates/sheets/items/armor/settings.hbs
@ -0,0 +1,21 @@
+<section
+    class='tab {{tabs.settings.cssClass}} {{tabs.settings.id}}'
+    data-tab='{{tabs.settings.id}}'
+    data-group='{{tabs.settings.group}}'
+>
+
+    <fieldset class="two-columns">
+        <legend>{{localize tabs.settings.label}}</legend>
+        <span>{{localize "DAGGERHEART.Sheets.Armor.baseScore"}}</span>
+        {{formField systemFields.baseScore value=source.system.baseScore}}
+
+        <span>{{localize "DAGGERHEART.Sheets.Armor.feature"}}</span>
+        {{formField systemFields.feature value=source.system.feature localize=true blank=""}}
+
+        <span>{{localize "DAGGERHEART.Sheets.Armor.baseThresholds.base"}}</span>
+        <div class="nest-inputs">
+            {{ formField systemFields.baseThresholds.fields.major value=source.system.baseThresholds.major label=(localize "DAGGERHEART.Sheets.Armor.baseThresholds.major") }}
+            {{ formField systemFields.baseThresholds.fields.severe value=source.system.baseThresholds.severe label=(localize "DAGGERHEART.Sheets.Armor.baseThresholds.severe") }}
+        </div>
+    </fieldset>
+</section>
--- a/templates/sheets/items/weapon/header.hbs
+++ b/templates/sheets/items/weapon/header.hbs
@ -0,0 +1,24 @@
+<header class='item-sheet-header'>
+    <img class='profile' src='{{source.img}}' data-action='editImage' data-edit='img' />
+    <div class='item-info'>
+        <line-div></line-div>
+        <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
+        <div class='item-description'>
+            {{#if source.system.secondary}}
+                <h3>{{localize "DAGGERHEART.Sheets.Weapon.SecondaryWeapon"}}</h3>
+            {{else}}
+                <h3>{{localize "DAGGERHEART.Sheets.Weapon.PrimaryWeapon"}}</h3>
+            {{/if}}
+            <h3>
+                {{localize (concat 'DAGGERHEART.Abilities.' source.system.trait '.short')}}
+                <span>-</span>
+                {{localize (concat 'DAGGERHEART.Range.' source.system.range '.name')}}
+                <span>-</span>
+                {{source.system.damage.value}}
+                ({{localize (concat 'DAGGERHEART.DamageType.' source.system.damage.type '.abbreviation')}})
+                <span>-</span>
+                {{localize (concat 'DAGGERHEART.Burden.' source.system.burden)}}
+            </h3>
+        </div>
+    </div>
+</header>
--- a/templates/sheets/items/weapon/settings.hbs
+++ b/templates/sheets/items/weapon/settings.hbs
@ -0,0 +1,30 @@
+<section
+    class='tab {{tabs.settings.cssClass}} {{tabs.settings.id}}'
+    data-tab='{{tabs.settings.id}}'
+    data-group='{{tabs.settings.group}}'
+>
+    <fieldset class="two-columns">
+        <legend>{{localize tabs.settings.label}}</legend>
+        <span>{{localize "DAGGERHEART.Sheets.Weapon.SecondaryWeapon"}}</span>
+        {{formField systemFields.secondary value=source.system.secondary}}
+        <span>{{localize "DAGGERHEART.Sheets.Weapon.Trait"}}</span>
+        {{formField systemFields.trait value=source.system.trait localize=true}}
+        <span>{{localize "DAGGERHEART.Sheets.Weapon.Range"}}</span>
+        {{formField systemFields.range value=source.system.range localize=true}}
+        <span>{{localize "DAGGERHEART.Sheets.Weapon.Burden"}}</span>
+        {{formField systemFields.burden value=source.system.burden localize=true}}
+    </fieldset>
+
+    <fieldset class="two-columns">
+        <legend>{{localize "DAGGERHEART.Sheets.Weapon.Damage.Title"}}</legend>
+        <span>{{localize "DAGGERHEART.Sheets.Weapon.Damage.Value"}}</span>
+        {{formGroup systemFields.damage.fields.value value=source.system.damage.value}}
+        <span>{{localize "DAGGERHEART.Sheets.Weapon.Damage.Type"}}</span>
+        {{formGroup systemFields.damage.fields.type value=source.system.damage.type localize=true}}
+    </fieldset>
+    <fieldset class="two-columns">
+        <legend>{{localize "DAGGERHEART.Sheets.Weapon.Feature"}}</legend>
+        <span>{{localize "DAGGERHEART.Sheets.Weapon.Feature"}}</span>
+        {{formField systemFields.feature value=source.system.feature localize=true}}
+    </fieldset>
+</section>
--- a/templates/sheets/weapon.hbs
+++ b/templates/sheets/weapon.hbs
@ -1,86 +0,0 @@
-<div>
-    <header class="flexcol">
-        {{!-- <div class="flexrow">
-            <img class="flex0" src="{{item.img}}" data-edit="img" title="{{item.name}}" height="64" width="64"/>
-            <div class="title-name">
-                <h2><input name="name" type="text" value="{{item.name}}" placeholder="{{ localize 'Name' }}"/></h2>
-            </div>
-        </div> --}}
-        <div class="title-container">
-            <img class="flex0" src="{{document.img}}" data-edit="img" data-action="onEditImage" title="{{document.name}}" height="64" width="64"/>
-            <div class="title-name">
-                {{formInput fields.name value=source.name rootId=partId}}
-            </div>
-        </div>
-    </header>
-
-    <section class="sheet-body">
-        {{formField systemFields.secondary value=source.system.secondary label=(localize "DAGGERHEART.Sheets.Weapon.SecondaryWeapon") }}
-        {{formField systemFields.trait value=source.system.trait label=(localize "DAGGERHEART.Sheets.Weapon.Trait") localize=true }}
-        {{formField systemFields.range value=source.system.range label=(localize "DAGGERHEART.Sheets.Weapon.Range") localize=true }}
-        <div class="form-group">
-            <label>{{localize "DAGGERHEART.Sheets.Weapon.Damage.Title"}}</label>
-            <div class="form-fields">
-                {{formGroup systemFields.damage.fields.value value=source.system.damage.value label=(localize "DAGGERHEART.Sheets.Weapon.Damage.Value") }}
-                {{formGroup systemFields.damage.fields.type value=source.system.damage.type label=(localize "DAGGERHEART.Sheets.Weapon.Damage.Type") localize=true }}
-            </div>
-        </div>
-        {{formField systemFields.burden value=source.system.burden label=(localize "DAGGERHEART.Sheets.Weapon.Burden") localize=true }}
-        {{formField systemFields.feature value=source.system.feature label=(localize "DAGGERHEART.Sheets.Weapon.Feature") localize=true }}
-        {{!-- <div class="form-group">
-            <label>{{localize "DAGGERHEART.Sheets.Weapon.SecondaryWeapon"}}</label>
-            <div class="form-fields">
-                <input type="checkbox" name="system.secondary" {{checked item.system.secondary}} />
-            </div>
-        </div> --}}
-        {{!-- <div class="form-group">
-            <label>{{localize "DAGGERHEART.Sheets.Weapon.Trait"}}</label>
-            <div class="form-fields">
-                <select name="system.trait">
-                    {{selectOptions config.ACTOR.abilities selected=item.system.trait labelAttr="name" localize=true }}
-                </select>
-            </div>
-        </div> --}}
-        {{!-- <div class="form-group">
-            <label>{{localize "DAGGERHEART.Sheets.Weapon.Range"}}</label>
-            <div class="form-fields">
-                <select name="system.range">
-                    {{selectOptions config.GENERAL.range selected=item.system.range labelAttr="name" localize=true }}
-                </select>
-            </div>
-        </div> --}}
-        {{!-- <div class="form-group">
-            <label>{{localize "DAGGERHEART.Sheets.Weapon.Damage.Title"}}</label>
-            <div class="form-fields">
-                <label>{{localize "DAGGERHEART.Sheets.Weapon.Damage.Value"}}</label>
-                <input type="text" name="system.damage.value" value="{{item.system.damage.value}}" />
-                <label>{{localize "DAGGERHEART.Sheets.Weapon.Damage.Type"}}</label>
-                <select name="system.damage.type">
-                    {{selectOptions config.GENERAL.damageTypes selected=item.system.damage.type labelAttr="name" localize=true }}
-                </select>
-            </div>
-        </div> --}}
-
-        {{!-- <div class="form-group">
-            <label>{{localize "DAGGERHEART.Sheets.Weapon.Burden"}}</label>
-            <div class="form-fields">
-                <select name="system.burden">
-                    {{selectOptions config.GENERAL.burden selected=item.system.burden localize=true }}
-                </select>
-            </div>
-        </div> --}}
-        {{!-- <div class="form-group">
-            <label>{{localize "DAGGERHEART.Sheets.Weapon.Feature"}}</label>
-            <div class="form-fields">
-                <select name="system.feature">
-                    {{selectOptions config.ITEM.weaponFeatures selected=item.system.feature labelAttr="name" localize=true blank="" }}
-                </select>
-            </div>
-        </div> --}}
-        <div class="feature-description">
-            <h2>{{localize "DAGGERHEART.Sheets.Weapon.Description"}}</h2>
-            {{formInput systemFields.description value=source.system.description enriched=source.system.description localize=true toggled=true}}
-            {{!-- {{editor item.system.description target="system.description" button=true}} --}}
-        </div>
-    </section>
-</div>