From d21a8b5cfd2a17c42611ec79ac77bb1e67206460 Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Sun, 14 Jun 2026 01:19:42 +0100
Subject: [PATCH] Use typed durability in schematic HUD

---
 .voidbot/state/aetheria.cc                | Bin 56946 -> 57072 bytes
 Assets/Scripts/UI/HUD/SchematicDisplay.cs |  22 +++++++++++++++++++---
 docs/aetheria-perfect-machine-map.md      |   2 ++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc
index 6994eb2fe1eb3dc9bddb30ed8d7ca08ef9c83edf..ddfda4c06027b6ad3501265a1515aad7efd78aeb 100644
GIT binary patch
delta 877
zcmZ9L&ubGw6vr_s+JHnsNW_E8tq3L|n)HXQCj+(6daw%8+hq48JFq*m%*-ZT1dE7>
zASeuqg5H#ZA}GO|1rPqHH!)uFM+mKV(KpGaNqd~foA>>E-+brK$Mnut`rT&g$n1r3
zwOBrHcDi}<CG}u(aITy)yWN}->6^nswO^Q=IDP0tXKLck*8IIy$Af@s=8((RYs8Cu
zpHS`+rXe71Bx#-bOvfYy=>XTX35syhCXoWOdn=y}==xZjdANMiG-i)qd*%3)1--kg
zEC_udYM;p1SQoem7^hlDMW_T4N>EluGr>uNI$9CY=HQZgZ1s*x(N<@XK-<FYueps)
z4P0S!@BYY1AKnA1iOW>z)0imD&=?1B74e}-otU6($<m`yG)HxW>P{qEXfWc~PP8W!
zkUDs@#e^&=P*x{_!XgkIhZ~3{ZGV6+BZ<VIitmvdTbIx~bNW_#&n^jU;t`NQv>0z5
zSc!6|Ph~P&3p*JHd*CCQnnz?Smw+!JagAz91oz`Bq#@)U<j{b9!6EO^z&=-Y)e`Cv
z^L6nx<&G!hRcNRuor|CUrp&)HIa66K6>cnoUZLx?Q4Azd+~9!jKt$}@pBS<gM|aHJ
zx8Dm3D>OtwM@YOrO2b$Z#sfwZi9&-(rA?`vH_`Ugu|cTI)wP$HL-oSE*?yjVyEm-h
zMQ&&Ddp46~y<9av(x;L`b*>-$$3H(Mh3QK2H4dA&8xD)M>uK_tW;&04^)i`(=*;xm
Ee@0bH*#H0l

delta 856
zcmZWoJ!lj`6ef2;atMkTQ55twB7)v|NAxbH(-a02iN@x-x!t#WV`gX8nc19&U_h}D
z1kuGVr5dmj4y+7FG-x^@T3l^wp*B{6Z|8Oc(e~T7@B4Y*{8%ghdRu<ITB<b8*Xz|Y
zQ&a6HV+YcW(xV(W+i-v?-zk8W1183gjx`4-#_z99KfaEhRT^TgV$_zS0b`lvO4e+m
zHQJi#@)$goNNYf<9%#IkaE<BDy9bYT6CuD8%orYU&;4eAOJkAwpn`PY`k@P#Xl9mK
zR((N(JQ}{q8BG#JO!tWy4ayPc_AZi<?KTi-6=hV**_wrZjG(0G&p^b9Q-)v(@<FQ}
z>F%mT_+SzpFb{#5e}*z&c#1q&=pYy_h*k8-Pt3@V51l^DS&W?4Rg2P42*Zb$F=SpJ
zmYvnvg{xUUoLu{wFJ)VzL^$8TB<Vouqt0}pFxcy&Cc;i);l>>48u_(4vE4#!CMIHL
zkwWuS6brPNTcR|XP$78;H4&7QOy}QEE<e4fq~$U};)>K#MkPiHi=1}`8ZaR`%v&@w
zU^Oyg+Yy{|MRCz>U0#k$N$@eCUKp?n0)Cs+!AK8;z@u1cTcg6<q!G%f`ie=ftMoMt
z%(KDn4}VJO%a7luTUS_2B0Z&j%Iv?EIp(}pMD6Z)I=gK(ogYr7-#(q(J8E^K-hOUb
zXjalAn=6Bj%{`Tg;zRnmd^m4*v+kO`f9qWVj2?q3?@E7f#Rb@OQxCq}%Yl}AA%o*z
K*DD2buKgEVdpgVj

diff --git a/Assets/Scripts/UI/HUD/SchematicDisplay.cs b/Assets/Scripts/UI/HUD/SchematicDisplay.cs
index 6aae59a08..9f20950b3 100644
--- a/Assets/Scripts/UI/HUD/SchematicDisplay.cs
+++ b/Assets/Scripts/UI/HUD/SchematicDisplay.cs
@@ -223,8 +223,7 @@ public class SchematicDisplay : MonoBehaviour
             if(HullDurabilityFill)
             {
                 _hull = _entity.Hull;
-                var hullData = _entity.ItemManager.GetData(_hull);
-                var dur = _hull.Durability / hullData.Durability;
+                var dur = _hull.Durability / GetMaxDurability(_hull);
                 HullDurabilityFill.anchorMax = new Vector2(dur, 1);
                 HullDurabilityLabel.text = $"{ActionGameManager.RuntimePlayerSettings.Format(dur * 100)}%";
             }
@@ -237,7 +236,7 @@ public class SchematicDisplay : MonoBehaviour
                     x.ListElement.HeatFill.anchorMax = new Vector2(unlerp(itemData.MinimumTemperature, itemData.MaximumTemperature, x.Item.Temperature), 0);
                     if (x.Cooldown != null)
                         x.ListElement.CooldownFill.anchorMax = new Vector2(x.Cooldown.Progress, 1);
-                    x.ListElement.DurabilityLabel.text = $"{(int)(x.Item.EquippableItem.Durability / itemData.Durability * 100)}%";
+                    x.ListElement.DurabilityLabel.text = $"{(int)(x.Item.EquippableItem.Durability / GetMaxDurability(x.Item.EquippableItem) * 100)}%";
                     if (x.Weapon.WeaponData.AmmoType != Guid.Empty)
                     {
                         if(x.Weapon.WeaponData.MagazineSize > 1)
@@ -255,4 +254,21 @@ public class SchematicDisplay : MonoBehaviour
             }
         }
     }
+
+    private float GetMaxDurability(ItemInstance item)
+    {
+        var typedItem = FindTypedItem(item);
+        if (typedItem != null && typedItem.Durability > 0)
+            return (float)typedItem.Durability;
+
+        return _entity.ItemManager.GetData(item).Durability;
+    }
+
+    private static AetheriaRuntimeCatalogItem FindTypedItem(ItemInstance item)
+    {
+        var itemId = item?.Data?.ItemId ?? Guid.Empty;
+        return itemId == Guid.Empty
+            ? null
+            : ActionGameManager.RuntimeCatalog?.FindItemByLegacyId(itemId.ToString("D"));
+    }
 }
diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md
index c8783c149..e2fccabfd 100644
--- a/docs/aetheria-perfect-machine-map.md
+++ b/docs/aetheria-perfect-machine-map.md
@@ -89,6 +89,8 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted.
   falling back to defaults.
 - The combat schematic HUD uses typed runtime catalog weapon facets for its
   static weapon icon strip before falling back to legacy `WeaponItemData`.
+  Hull and item durability percentages use typed max durability before falling
+  back to legacy `ItemData.Durability`.
   Runtime weapon behavior still owns ammo counts, active range, cooldowns,
   temperature, and durability display until those session facts have typed
   runtime surfaces.