From 9064df9b0556693d3d90562c0daf6d11b4f077ba Mon Sep 17 00:00:00 2001
From: Nikhil Nagarajan <potter.nikhil@gmail.com>
Date: Thu, 11 Dec 2025 10:31:16 -0500
Subject: [PATCH] Armor is buffed. Not Vampire-Slayer buffed.

---
 lang/en.json                              |  6 ++++++
 module/config/itemConfig.mjs              | 10 +++++-----
 module/data/item/armor.mjs                |  5 +++--
 module/data/item/loot.mjs                 | 11 -----------
 templates/sheets/items/armor/settings.hbs | 12 ++++++++++++
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/lang/en.json b/lang/en.json
index f1671bb2..2beb8db6 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -699,6 +699,12 @@
                 "loot": "Loot",
                 "feature": "Feature"
             },
+            "ItemArmor":{
+                "title":"Armor Properties",
+                "value":"Value",
+                "max":"Max",
+                "priority":"Priority"
+            },
             "ArmorFeature": {
                 "burning": {
                     "name": "Burning",
diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs
index d222f650..f14d2586 100644
--- a/module/config/itemConfig.mjs
+++ b/module/config/itemConfig.mjs
@@ -490,11 +490,11 @@ export const orderedArmorFeatures = () => {
 };
 
 export const armorPriorityKeys = {
-    armor: {label: 'DAGGERHEART.CONFIG.ArmorKeys.armor'},
-    weapon: {label: 'DAGGERHEART.CONFIG.ArmorKeys.weapon'},
-    consumable: {label: 'DAGGERHEART.CONFIG.ArmorKeys.consumable'},
-    loot: {label: 'DAGGERHEART.CONFIG.ArmorKeys.loot'},
-    features: {label: 'DAGGERHEART.CONFIG.ArmorKeys.features'}
+    armor: 'DAGGERHEART.CONFIG.ArmorKeys.armor',
+    weapon: 'DAGGERHEART.CONFIG.ArmorKeys.weapon',
+    consumable: 'DAGGERHEART.CONFIG.ArmorKeys.consumable',
+    loot: 'DAGGERHEART.CONFIG.ArmorKeys.loot',
+    feature: 'DAGGERHEART.CONFIG.ArmorKeys.feature'
 }
 
 export const allArmorKeys = () => {
diff --git a/module/data/item/armor.mjs b/module/data/item/armor.mjs
index 9f339f0d..3de8ddeb 100644
--- a/module/data/item/armor.mjs
+++ b/module/data/item/armor.mjs
@@ -1,4 +1,5 @@
 import AttachableItem from './attachableItem.mjs';
+import { armorPriorityKeys } from "../../config/itemConfig.mjs";
 
 export default class DHArmor extends AttachableItem {
     /** @inheritDoc */
@@ -37,8 +38,8 @@ export default class DHArmor extends AttachableItem {
                 max: new fields.NumberField({ required: true, integer: true, min: 0, initial: 0}),
                 priority: new fields.StringField({
                     required: true,
-                    choices: CONFIG.DH.ITEM.allArmorKeys,
-                    initial: CONFIG.DH.ITEM.armorPriorityKeys[0]
+                    choices: armorPriorityKeys,
+                    initial: 'armor'
                 })
             }),
             //End
diff --git a/module/data/item/loot.mjs b/module/data/item/loot.mjs
index 1fd1b547..d8f6ff26 100644
--- a/module/data/item/loot.mjs
+++ b/module/data/item/loot.mjs
@@ -17,17 +17,6 @@ export default class DHLoot extends BaseDataItem {
     static defineSchema() {
         return {
             ...super.defineSchema(),
-            //Testing new armor schema
-            armor: new fields.SchemaField({
-                value: new fields.NumberField({integer: true, min: 0, initial: 0}),
-                max: new fields.NumberField({ required: true, integer: true, min: 0, initial: 0}),
-                priority: new fields.StringField({
-                    required: true,
-                    choices: CONFIG.DH.ITEM.allArmorKeys,
-                    initial: CONFIG.DH.ITEM.armorPriorityKeys[0]
-                })
-            })
-            //End
         };
     }
 
diff --git a/templates/sheets/items/armor/settings.hbs b/templates/sheets/items/armor/settings.hbs
index e7bde6fe..b9678cd2 100644
--- a/templates/sheets/items/armor/settings.hbs
+++ b/templates/sheets/items/armor/settings.hbs
@@ -13,6 +13,18 @@
         <span>{{localize "TYPES.Item.feature"}}</span>
         <input type="text" class="features-input" value="{{features}}" />
 
+        <span>{{localize "DAGGERHEART.CONFIG.ItemArmor.title"}}</span>
+        <div class="nest-inputs">
+            {{formField systemFields.armor.fields.value value=source.system.armor.value label=(localize "DAGGERHEART.CONFIG.ItemArmor.value")}}
+            {{formField systemFields.armor.fields.max value=source.system.armor.max label=(localize "DAGGERHEART.CONFIG.ItemArmor.max")}}
+            {{formField 
+            systemFields.armor.fields.priority 
+            value=source.system.armor.priority 
+            label=(localize "DAGGERHEART.CONFIG.ItemArmor.priority")
+            localize=true
+            }}
+        </div>
+
         <span>{{localize "DAGGERHEART.ITEMS.Armor.baseThresholds.base"}}</span>
         <div class="nest-inputs">
             {{ formField systemFields.baseThresholds.fields.major value=source.system.baseThresholds.major label=(localize "DAGGERHEART.ITEMS.Armor.baseThresholds.major") }}