Weapons and Armor are now stored like any other item on the PC. Added equip/unequip logic.

lang/en.json

@@ -94,7 +94,9 @@
                 "LacksDomain": "Your character doesn't have the domain of the card!",
                 "MaxLoadoutReached": "You can't have any more domain cards at this level!",
                 "DuplicateDomainCard": "You already have a domain card with that name!",
-                "ActionRequiresTarget": "The action requires at least one target"
+                "ActionRequiresTarget": "The action requires at least one target",
+                "TwoHandedWeaponEquipped": "You have a two-handed weapon equipped",
+                "SecondaryWeaponEquipped": "You have a secondary weapon equipped"
             }
         },
         "General": {
@@ -843,9 +845,10 @@
                     "InventoryWeapon": "Inventory Weapon"
                 },
                 "InventoryTab": {
-                    "EquipmentTitle": "Equipment",
                     "ConsumableTitle": "Consumables",
                     "MiscellaneousTitle": "Miscellaneous",
+                    "WeaponsTitle": "Weapons",
+                    "ArmorsTitle": "Armors",
                     "QuantityTitle": "Quantity"
                 },
                 "Weapons": {

module/applications/sheets/pc.mjs

@@ -48,8 +48,6 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
             useFeature: this.useFeature,
             takeShortRest: this.takeShortRest,
             takeLongRest: this.takeLongRest,
-            removeActiveItem: this.removeActiveItem,
-            removeInventoryWeapon: this.removeInventoryWeapon,
             addMiscItem: this.addMiscItem,
             deleteItem: this.deleteItem,
             addScar: this.addScar,
@@ -63,18 +61,12 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
             useAbility: this.useAbility,
             useAdvancementCard: this.useAdvancementCard,
             useAdvancementAbility: this.useAdvancementAbility,
-            selectFeatureSet: this.selectFeatureSet
+            selectFeatureSet: this.selectFeatureSet,
+            toggleEquipItem: this.toggleEquipItem
         },
         window: {
-            //frame: boolean;
-            //positioned: boolean;
-            //title: string;
-            //icon: string | false;
-            //controls: ApplicationHeaderControlsEntry[];
             minimizable: false,
             resizable: true
-            //contentTag: string;
-            //contentClasses: string[];
         },
         form: {
             handler: this.updateForm,
@@ -280,6 +272,20 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
                     quantity: game.i18n.localize('DAGGERHEART.Sheets.PC.InventoryTab.QuantityTitle')
                 },
                 items: this.document.items.filter(x => x.type === 'miscellaneous')
+            },
+            weapons: {
+                titles: {
+                    name: game.i18n.localize('DAGGERHEART.Sheets.PC.InventoryTab.WeaponsTitle'),
+                    quantity: game.i18n.localize('DAGGERHEART.Sheets.PC.InventoryTab.QuantityTitle')
+                },
+                items: this.document.items.filter(x => x.type === 'weapon')
+            },
+            armor: {
+                titles: {
+                    name: game.i18n.localize('DAGGERHEART.Sheets.PC.InventoryTab.ArmorsTitle'),
+                    quantity: game.i18n.localize('DAGGERHEART.Sheets.PC.InventoryTab.QuantityTitle')
+                },
+                items: this.document.items.filter(x => x.type === 'armor')
             }
         };
 
@@ -690,7 +696,7 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
         (await game.packs.get('daggerheart.playtest-communities'))?.render(true);
     }
 
-    static async viewObject(button) {
+    static async viewObject(_, button) {
         const object = await fromUuid(button.dataset.value);
         if (!object) return;
 
@@ -712,18 +718,6 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
         await this.minimize();
     }
 
-    static async removeActiveItem(_, event) {
-        event.stopPropagation();
-        const item = await fromUuid(event.currentTarget.dataset.item);
-        await item.delete();
-    }
-
-    static async removeInventoryWeapon(_, event) {
-        event.stopPropagation();
-        const item = await fromUuid(event.currentTarget.dataset.item);
-        await item.delete();
-    }
-
     static async addMiscItem() {
         const result = await this.document.createEmbeddedDocuments('Item', [
             {
@@ -941,6 +935,57 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
         this.render();
     }
 
+    static async toggleEquipItem(_, button) {
+        const item = this.document.items.get(button.id);
+        if (item.system.equipped) {
+            await item.update({ 'system.equipped': false });
+            return;
+        }
+
+        switch (item.type) {
+            case 'armor':
+                const currentArmor = this.document.system.armor;
+                if (currentArmor) {
+                    await currentArmor.update({ 'system.equipped': false });
+                }
+
+                await item.update({ 'system.equipped': true });
+                break;
+            case 'weapon':
+                const currentWeapons = this.document.system.equippedWeapons;
+                if (item.system.secondary) {
+                    if (
+                        currentWeapons.primary &&
+                        currentWeapons.primary.burden === SYSTEM.GENERAL.burden.twoHanded.value
+                    ) {
+                        ui.notifications.error(
+                            game.i18n.localize('DAGGERHEART.Notification.Error.TwoHandedWeaponEquipped')
+                        );
+                        return;
+                    }
+
+                    if (currentWeapons.secondary) {
+                        await this.document.items.get(currentWeapons.secondary.id).update({ 'system.equipped': false });
+                    }
+                } else {
+                    if (currentWeapons.secondary && item.system.burden === SYSTEM.GENERAL.burden.twoHanded.value) {
+                        ui.notifications.error(
+                            game.i18n.localize('DAGGERHEART.Notification.Error.SecondaryWeaponEquipped')
+                        );
+                        return;
+                    }
+
+                    if (currentWeapons.primary) {
+                        await this.document.items.get(currentWeapons.primary.id).update({ 'system.equipped': false });
+                    }
+                }
+
+                await item.update({ 'system.equipped': true });
+                break;
+        }
+        this.render();
+    }
+
     static async close(options) {
         this.onVaultTab = false;
         super.close(options);
@@ -984,14 +1029,17 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
                 const itemObject = await fromUuid(item.uuid);
                 switch (target) {
                     case 'weapon-section':
-                        if (itemObject.system.secondary && this.document.system.activeWeapons.burden === 'twoHanded') {
+                        if (
+                            itemObject.system.secondary &&
+                            this.document.system.equippedWeapons.burden === 'twoHanded'
+                        ) {
                             ui.notifications.info(
                                 game.i18n.localize('DAGGERHEART.Notification.Info.SecondaryEquipWhileTwohanded')
                             );
                             return;
                         } else if (
                             itemObject.system.burden === 'twoHanded' &&
-                            this.document.system.activeWeapons.secondary
+                            this.document.system.equippedWeapons.secondary
                         ) {
                             ui.notifications.info(
                                 game.i18n.localize('DAGGERHEART.Notification.Info.TwohandedEquipWhileSecondary')
@@ -1160,12 +1208,18 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
                 if (!element) return;
 
                 if (element.classList.contains('weapon-section')) {
-                    if (item.system.secondary && this.document.system.activeWeapons.burden === 'twoHanded') {
+                    if (
+                        item.system.secondary &&
+                        this.document.system.equippedWeapons.burden === SYSTEM.GENERAL.burden.twoHanded.value
+                    ) {
                         ui.notifications.info(
                             game.i18n.localize('DAGGERHEART.Notification.Info.SecondaryEquipWhileTwohanded')
                         );
                         return;
-                    } else if (item.system.burden === 'twoHanded' && this.document.system.activeWeapons.secondary) {
+                    } else if (
+                        item.system.burden === SYSTEM.GENERAL.burden.twoHanded.value &&
+                        this.document.system.equippedWeapons.secondary
+                    ) {
                         ui.notifications.info(
                             game.i18n.localize('DAGGERHEART.Notification.Info.TwohandedEquipWhileSecondary')
                         );
@@ -1173,10 +1227,10 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
                     }
 
                     const existing =
-                        this.document.system.activeWeapons.primary && !item.system.secondary
+                        this.document.system.equippedWeapons.primary && !item.system.secondary
-                            ? await fromUuid(this.document.system.activeWeapons.primary.uuid)
+                            ? await fromUuid(this.document.system.equippedWeapons.primary.uuid)
-                            : this.document.system.activeWeapons.secondary && item.system.secondary
+                            : this.document.system.equippedWeapons.secondary && item.system.secondary
-                              ? await fromUuid(this.document.system.activeWeapons.secondary.uuid)
+                              ? await fromUuid(this.document.system.equippedWeapons.secondary.uuid)
                               : null;
                     await existing?.delete();
                     itemData.system.active = true;
@@ -1194,7 +1248,7 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
                     await existing?.delete();
 
                     itemData.system.inventoryWeapon = 2;
-                } else return [];
+                }
             }
 
             if (item.type === 'armor') {
@@ -1205,7 +1259,7 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
                         ? await fromUuid(this.document.system.armor.uuid)
                         : null;
                     await existing?.delete();
-                } else return;
+                }
             }
 
             const createdItem = await this._onDropItemCreate(itemData);

module/config/generalConfig.mjs

@@ -27,8 +27,14 @@ export const range = {
 };
 
 export const burden = {
-    oneHanded: 'DAGGERHEART.Burden.OneHanded',
+    oneHanded: {
-    twoHanded: 'DAGGERHEART.Burden.TwoHanded'
+        value: 'oneHanded',
+        label: 'DAGGERHEART.Burden.OneHanded'
+    },
+    twoHanded: {
+        value: 'twoHanded',
+        label: 'DAGGERHEART.Burden.TwoHanded'
+    }
 };
 
 export const damageTypes = {

module/data/armor.mjs

@@ -2,6 +2,7 @@ export default class DhpArmor extends foundry.abstract.TypeDataModel {
     static defineSchema() {
         const fields = foundry.data.fields;
         return {
+            equipped: new fields.BooleanField({ initial: false }),
             baseScore: new fields.NumberField({ initial: 1, integer: true }),
             feature: new fields.StringField({
                 choices: SYSTEM.ITEM.armorFeatures,
@@ -16,6 +17,7 @@ export default class DhpArmor extends foundry.abstract.TypeDataModel {
                 major: new fields.NumberField({ initial: 0, integer: true }),
                 severe: new fields.NumberField({ initial: 0, integer: true })
             }),
+            quantity: new fields.NumberField({ initial: 1, integer: true }),
             description: new fields.HTMLField({})
         };
     }

module/data/pc.mjs

@@ -242,15 +242,15 @@ export default class DhpPC extends foundry.abstract.TypeDataModel {
     }
 
     get armor() {
-        return this.parent.items.find(x => x.type === 'armor');
+        return this.parent.items.find(x => x.type === 'armor' && x.system.equipped);
     }
 
-    get activeWeapons() {
+    get equippedWeapons() {
         const primaryWeapon = this.parent.items.find(
-            x => x.type === 'weapon' && x.system.active && !x.system.secondary
+            x => x.type === 'weapon' && x.system.equipped && !x.system.secondary
         );
         const secondaryWeapon = this.parent.items.find(
-            x => x.type === 'weapon' && x.system.active && x.system.secondary
+            x => x.type === 'weapon' && x.system.equipped && x.system.secondary
         );
         return {
             primary: this.#weaponData(primaryWeapon),
@@ -325,16 +325,19 @@ export default class DhpPC extends foundry.abstract.TypeDataModel {
         );
     }
 
+    //Should not be done in data?
     #weaponData(weapon) {
         return weapon
             ? {
+                  id: weapon.id,
                   name: weapon.name,
-                  trait: CONFIG.daggerheart.ACTOR.abilities[weapon.system.trait].name, //Should not be done in data?
+                  trait: game.i18n.localize(CONFIG.daggerheart.ACTOR.abilities[weapon.system.trait].label),
                   range: CONFIG.daggerheart.GENERAL.range[weapon.system.range],
                   damage: {
                       value: weapon.system.damage.value,
                       type: CONFIG.daggerheart.GENERAL.damageTypes[weapon.system.damage.type]
                   },
+                  burden: weapon.system.burden,
                   feature: CONFIG.daggerheart.ITEM.weaponFeatures[weapon.system.feature],
                   img: weapon.img,
                   uuid: weapon.uuid

module/data/weapon.mjs

@@ -2,7 +2,7 @@ export default class DhpWeapon extends foundry.abstract.TypeDataModel {
     static defineSchema() {
         const fields = foundry.data.fields;
         return {
-            active: new fields.BooleanField({ initial: false }),
+            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 }),

styles/daggerheart.css

@@ -1250,7 +1250,7 @@
   filter: drop-shadow(0 0 3px gold);
 }
 .daggerheart.sheet.pc div[data-application-part] .sheet-body .inventory-container .inventory-item-list .inventory-item .inventory-item-quantity {
-  width: 48px;
+  width: 60px;
   display: flex;
   align-items: center;
 }

styles/pc.less

@@ -1455,7 +1455,7 @@
                         }
 
                         .inventory-item-quantity {
-                            width: 48px;
+                            width: 60px;
                             display: flex;
                             align-items: center;
 

templates/sheets/parts/armor.hbs

@@ -1,12 +1,6 @@
 <fieldset class="left-main-container armor-section active-item-section item-section">
     <legend class="legend armor-container">
         <span>{{localize "DAGGERHEART.Sheets.PC.Armor.Title"}}</span>
-        {{#if armor}}
-            <div data-action="viewObject" data-value="{{armor.uuid}}" class="active-item-label-chip">
-                <img src="{{armor.img}}" />
-                <button data-action="removeActiveItem" data-item="{{armor.uuid}}"><i class="fa-solid fa-x"></i></button>
-            </div>
-        {{/if}} 
     </legend>
 
     <div class="active-item-container">

templates/sheets/parts/inventory.hbs

@@ -6,12 +6,6 @@
         <div class="inventory-weapon-section-first item-section">
             <h2 class="armor-container">
                 {{localize "DAGGERHEART.Sheets.PC.Inventory.InventoryWeapon"}}
-                {{#if weapons.first}}
-                    <div data-action="viewObject" data-value="{{weapons.first.uuid}}" class="active-item-label-chip">
-                        <img src="{{weapons.first.img}}" />
-                        <button data-action="removeInventoryWeapon" data-item="{{weapons.first.uuid}}"><i class="fa-solid fa-x"></i></button>
-                    </div>
-                {{/if}} 
             </h2>
             <div class="active-item-container">
                 <div class="flexrow">

templates/sheets/parts/weapons.hbs

@@ -20,37 +20,29 @@
         <h2 class="weapons-label-row">
             {{localize "DAGGERHEART.Sheets.PC.Weapons.PrimaryTitle"}} 
             {{#if weapons.primary}}
-                <div data-action="viewObject" data-value="{{weapons.primary.uuid}}" class="active-item-label-chip">
-                    <img src="{{weapons.primary.img}}" />
-                    <button data-action="removeActiveItem" data-item="{{weapons.primary.uuid}}"><i class="fa-solid fa-x"></i></button>
-                </div> 
                 <img class="damage-roll" data-action="attackRoll" data-weapon="{{weapons.primary.uuid}}" src="icons/svg/d12-grey.svg" />
             {{/if}}
         </h2>
         <div class="flexrow">
             <input value="{{weapons.primary.name}}" type="text" />
             <input value="{{localize weapons.primary.trait}}" type="text" />
-            <input value="{{localize weapons.primary.range.name}}" type="text" />
+            <input value="{{localize weapons.primary.range.label}}" type="text" />
             <input value="{{weapons.primary.damage.value}} {{#if weapons.primary}}({{localize weapons.primary.damage.type.abbreviation}}){{/if}}" type="text" />
         </div>
-        <input value="{{localize weapons.primary.feature.name}} {{#if weapons.primary.feature}}({{localize weapons.primary.feature.description}}){{/if}}" type="text" />
+        <input value="{{localize weapons.primary.feature.label}} {{#if weapons.primary.feature}}({{localize weapons.primary.feature.description}}){{/if}}" type="text" />
     </div>
     <div class="active-item-container">
         <h2 class="weapons-label-row">
             {{localize "DAGGERHEART.Sheets.PC.Weapons.SecondaryTitle"}}
             {{#if weapons.secondary}}
-                <div data-action="viewObject" data-value="{{weapons.secondary.uuid}}" class="active-item-label-chip">
-                    <img src="{{weapons.secondary.img}}" />
-                    <button data-action="removeActiveItem" data-item="{{weapons.secondary.uuid}}"><i class="fa-solid fa-x"></i></button>
-                </div> 
                 <img class="damage-roll" data-action="damageRoll" data-value="{{weapons.secondary.damage.value}}" src="icons/svg/d12-grey.svg" />
             {{/if}}
         </h2>
         <div class="flexrow">
             <input value="{{weapons.secondary.name}}" type="text" />
             <input value="{{localize weapons.secondary.trait}}" type="text" />
-            <input value="{{localize weapons.secondary.range.name}}" type="text" />
+            <input value="{{localize weapons.secondary.range.label}}" type="text" />
-            <input value="{{weapons.secondary.damage.value}} {{#if weapons.secondary}}({{localize weapons.secondary.damage.type.abbreviation}}){{/if}}" type="text" />
+            <input value="{{weapons.secondary.damage.label}} {{#if weapons.secondary}}({{localize weapons.secondary.damage.type.abbreviation}}){{/if}}" type="text" />
         </div>
         <input value="{{localize weapons.secondary.feature.name}} {{#if weapons.secondary.feature}}({{localize weapons.secondary.feature.description}}){{/if}}" style="text-overflow: ellipsis;" type="text" />
     </div>

templates/sheets/pc/pc.hbs

@@ -88,7 +88,7 @@
                         </div>
                         <div class="body-section flex3">
                             {{> "systems/daggerheart/templates/sheets/parts/attributes.hbs" }}
-                            {{> "systems/daggerheart/templates/sheets/parts/weapons.hbs" weapons=document.system.activeWeapons proficiency=document.system.proficiency.value }}
+                            {{> "systems/daggerheart/templates/sheets/parts/weapons.hbs" weapons=document.system.equippedWeapons proficiency=document.system.proficiency.value }}
                             {{> "systems/daggerheart/templates/sheets/parts/armor.hbs" armor=document.system.armor }}
                             {{> "systems/daggerheart/templates/sheets/parts/inventory.hbs" weapons=document.system.inventoryWeapons }}
                         </div>

templates/sheets/pc/sections/inventory.hbs

@@ -18,6 +18,9 @@
                                 {{item.name}}
                             </div>
                         </div>
+                        <div class="flexrow">
+                            <button data-action="toggleEquipItem" id="{{item.id}}">{{localize "Equip"}}</button>
+                        </div>
                         <div class="inventory-item-quantity spaced">
                             <i data-action="itemQuantityDecrease" class="fa-solid fa-chevron-left icon-button {{#if (lte item.system.quantity 1)}}disabled{{/if}}"></i>
                             <input type="text" data-item="system.quantity" value="{{item.system.quantity}}" data-dtype="Number" />