From 809bdc8678e6b17bb787462348ee4ae8378f91dd Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <cfern1990@gmail.com>
Date: Sat, 21 Mar 2026 04:20:13 -0400
Subject: [PATCH] Add current back to schema

---
 module/data/activeEffect/changeTypes/armor.mjs       | 12 ++++++++++++
 styles/less/sheets/activeEffects/activeEffects.less  |  2 +-
 templates/sheets/activeEffect/changes.hbs            |  1 +
 .../sheets/activeEffect/typeChanges/armorChange.hbs  |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/module/data/activeEffect/changeTypes/armor.mjs b/module/data/activeEffect/changeTypes/armor.mjs
index d0546dbc..731fa387 100644
--- a/module/data/activeEffect/changeTypes/armor.mjs
+++ b/module/data/activeEffect/changeTypes/armor.mjs
@@ -9,6 +9,7 @@ export default class ArmorChange extends foundry.abstract.DataModel {
             priority: new fields.NumberField(),
             phase: new fields.StringField({ required: true, blank: false, initial: 'initial' }),
             value: new fields.SchemaField({
+                current: new fields.NumberField({ integer: true, min: 0, initial: 0 }),
                 max: new fields.StringField({
                     required: true,
                     nullable: false,
@@ -31,6 +32,16 @@ export default class ArmorChange extends foundry.abstract.DataModel {
         defaultPriority: 20,
         handler: (actor, change, _options, _field, replacementData) => {
             const parsedMax = itemAbleRollParse(change.value.max, actor, change.effect.parent);
+            game.system.api.documents.DhActiveEffect.applyChange(
+                actor,
+                {
+                    ...change,
+                    key: 'system.armorScore.value',
+                    type: CONFIG.DH.GENERAL.activeEffectModes.add.id,
+                    value: change.value.current
+                },
+                replacementData
+            );
             game.system.api.documents.DhActiveEffect.applyChange(
                 actor,
                 {
@@ -62,6 +73,7 @@ export default class ArmorChange extends foundry.abstract.DataModel {
             key: 'Armor',
             type: CONFIG.DH.GENERAL.activeEffectModes.armor.id,
             value: {
+                current: 0,
                 max: 0,
                 locked
             },
diff --git a/styles/less/sheets/activeEffects/activeEffects.less b/styles/less/sheets/activeEffects/activeEffects.less
index b66dbfd7..a37daa04 100644
--- a/styles/less/sheets/activeEffects/activeEffects.less
+++ b/styles/less/sheets/activeEffects/activeEffects.less
@@ -50,7 +50,7 @@
 
             header,
             ol {
-                grid-template-columns: 7rem 12rem 4rem;
+                grid-template-columns: 5rem 7rem 12rem 4rem;
             }
         }
     }
diff --git a/templates/sheets/activeEffect/changes.hbs b/templates/sheets/activeEffect/changes.hbs
index 07c94069..ac5cd0ec 100644
--- a/templates/sheets/activeEffect/changes.hbs
+++ b/templates/sheets/activeEffect/changes.hbs
@@ -18,6 +18,7 @@
         <legend>{{localize "DAGGERHEART.GENERAL.armor"}} <input type="checkbox" class="armor-change-checkbox" data-index="{{typedChanges.armor.index}}" {{checked typedChanges.armor}} /></legend>
         {{#if typedChanges.armor}}
         <header>
+            <div>{{localize "EFFECT.FIELDS.changes.element.value.label"}}</div>
             <div>{{localize "DAGGERHEART.GENERAL.max"}}</div>
             <div>{{localize "DAGGERHEART.EFFECTS.ChangeTypes.armor.FIELDS.interaction.label"}}</div>
             <div>{{localize "EFFECT.FIELDS.changes.element.priority.label"}}</div>
diff --git a/templates/sheets/activeEffect/typeChanges/armorChange.hbs b/templates/sheets/activeEffect/typeChanges/armorChange.hbs
index 8aaab677..7bf21734 100644
--- a/templates/sheets/activeEffect/typeChanges/armorChange.hbs
+++ b/templates/sheets/activeEffect/typeChanges/armorChange.hbs
@@ -1,6 +1,7 @@
 <li data-index="{{index}}">
     <input type="hidden" name="{{concat "system.changes." index ".type"}}" value="{{type}}" />
     <input type="hidden" name="{{concat "system.changes." index ".phase"}}" value="{{phase}}" />
+    {{formInput fields.value.fields.current name=(concat "system.changes." index ".value.current") value=value.current data-dtype="Number"}}
     {{formInput fields.value.fields.max name=(concat "system.changes." index ".value.max") value=value.max data-dtype="Number"}}
     {{formInput fields.value.fields.interaction name=(concat "system.changes." index ".value.interaction") value=value.interaction localize=true}}
     {{formInput fields.priority name=(concat "system.changes." index ".priority") value=priority}}