From 2ad4596d94ff25b0330fec8415869cb20439182a Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Sun, 14 Jun 2026 10:42:31 +0100
Subject: [PATCH] Use typed behavior metadata for modifier matching

---
 .voidbot/state/aetheria.cc                    | Bin 84184 -> 84509 bytes
 .../ServerShared/Behaviors/StatModifier.cs    |  21 +++++++++++-------
 docs/aetheria-perfect-machine-map.md          |  17 +++++++++-----
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc
index 2982fd915832afea3b0064c6c7819e30cb9a6585..e231886f5f3b9eda0d248417022b56b48add5dbc 100644
GIT binary patch
delta 640
zcmZ9KPfOfT6vesYSRBEHr6R?JPirkB%$U)MGa1Gz(htyXW-%1un!JgRN%Cy+P{*Ap
z2nvFX@F>NF;Gb=~3UpJt=(^j|E-Je46G#``n8Zm?v&)Zr&pqe9`|F_l=&<|qS*o|F
zREkPoD;4VpFwp*y+KWk9i3so7NXT?VdeXxw?P4pN_OodiC_qilsqms|pg@9-K@4h9
z69x51lLf!%=+qN#iwI6cYlRxbrUJw2{Hbmsvwy?B+)?4{RM@;kmvNPGH|m{ipv|ln
zu~F#D%rOb`5_KcglmA9x{1w55pe}K^Yoo<B!a|#wZeYP66K_IWf;Xw-AI(4p;HNw<
zfjUBh8S${3#dWmq><V1x4!0SVe@d_ohwXQ@q4xaRV7qob28+@!Lopi~MX%{S%0n6*
z-$`cqX&gQ*EWAa%i6+hQHRoP@q6gM2Zju0di5IehE_FmM+Fcx6_G@qj@8yjKm62%4
z@eVth532pi3S7c7RjnvWUb*|~Cjw3HqkLHf`t(Z@JeHBWRZueVElkPdS$G~lyB3{>
o{9lD{2`YDP<B9w`3p~PwU{oQ*(tZt_35uHizB%}wNm#jl3qpg_0ssI2

delta 473
zcmX|-Jxjw-6oxsq^=oiZ5$)gsKcGvEwn@{J+Wr6$KR~1oa@$-rHpz|2jiQ?re}F`|
zg6O1fg18i1#Mway2XS*3Cx3vknx66DJ@4T>=O>A`<HYTCtT&@*Qa+uVQ7gwVD9W?Y
z89c>~BAl7|#R2O$XcMJHy5plU^{kPKH&byKoQ9Gp$uKry*d8Z#jiOFC!RkKpeTV8;
zH*7t9RWpfUy+d7G$Z)^zF|?R&Y#7w_kT{MRh8glLiVM`;V6OGsv&;!cR^6sG9)@b%
zCuW%Qy|6PZcYT{17R4&vBD)52F*@(1Q8*fmh;Icx;YNJqKo+VB4G4n8m1I!f8xmhC
zjKiAf&qH=HJclmb@eP++)aFQR9XW9~DaY_1jwWMu-x2duFejJ>0t%w509v3W`<hMx
zUSS|3Ym$_f{-$!t$)<NIR*OKza}lJT$g&c=bPPu-v$@FmLxkk%f8U*AyacR`v#sP^
T2@cz+wcK1P!(&gx6sht9fxwc*

diff --git a/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs b/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs
index dd29718b4..394bcc1ca 100644
--- a/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs
@@ -4,6 +4,8 @@
 
 using System;
 using System.Linq;
+using GameCult.Aetheria.State.Unity;
+
 [Inspectable]
 public class StatModifierData : BehaviorData
 {
@@ -74,20 +76,23 @@ public class StatModifier : Behavior, IInitializableBehavior, IDisposable, IAlwa
     }
 
     private static bool BehaviorKindMatches(string runtimeKind, string expectedKind)
+    {
+        return AetheriaRuntimeBehaviorMetadataCatalog.IsKindOrDescendant(
+            runtimeKind,
+            NormalizeExpectedBehaviorKind(expectedKind));
+    }
+
+    private static string NormalizeExpectedBehaviorKind(string expectedKind)
     {
         if (string.IsNullOrWhiteSpace(expectedKind))
         {
-            return false;
-        }
-
-        if (string.Equals(runtimeKind, expectedKind, StringComparison.Ordinal))
-        {
-            return true;
+            return "";
         }
 
         const string legacyDataSuffix = "Data";
-        return expectedKind.EndsWith(legacyDataSuffix, StringComparison.Ordinal) &&
-               string.Equals(runtimeKind, expectedKind.Substring(0, expectedKind.Length - legacyDataSuffix.Length), StringComparison.Ordinal);
+        return expectedKind.EndsWith(legacyDataSuffix, StringComparison.Ordinal)
+            ? expectedKind.Substring(0, expectedKind.Length - legacyDataSuffix.Length)
+            : expectedKind;
     }
 
     private bool HasRequiredBehavior(EquippedItem gear)
diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md
index 1fb7fabc3..585e82efb 100644
--- a/docs/aetheria-perfect-machine-map.md
+++ b/docs/aetheria-perfect-machine-map.md
@@ -162,8 +162,9 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted.
   instances through `ItemManager.CreateRuntimeBehaviors`; the remaining
   `BehaviorData` config list is explicitly temporary and internal to behavior
   construction. `StatModifier` requirement and stat-target lookup now inspects
-  the live equipped behavior instances and their typed payload kinds, not a
-  freshly rebuilt config list. The unused `TradeMenuDebug` script has been
+  the live equipped behavior instances and asks package-owned typed behavior
+  metadata for kind/family matching, not a freshly rebuilt config list or a
+  behavior-local class taxonomy. The unused `TradeMenuDebug` script has been
   deleted instead of preserving an old uGUI debug path that
   turned typed trade rows back into legacy `ItemData` objects. That hydration
   now comes from typed state, not `AetherDB.msgpack`. The surviving trade menu
@@ -221,8 +222,9 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted.
   owner; bridge instances carry the typed behavior payload kind so runtime
   logic does not have to reselect behavior identity from the old class graph.
   `StatModifier` behavior requirements and behavior-stat targets compare typed
-  behavior kinds on the live equipped behavior instances instead of scanning
-  `BehaviorData` subclasses, rebuilding temporary configs, or hydrating
+  behavior kinds on the live equipped behavior instances through
+  `AetheriaRuntimeBehaviorMetadataCatalog` instead of scanning `BehaviorData`
+  subclasses, rebuilding temporary configs, or hydrating
   `EquippableItemData.Behaviors`. `ConsumableItemData` and
   `EquippableItemData` no longer expose legacy `Behaviors` lists at all. The
   old item-DTO stat branch was deleted after inspection showed no active
@@ -537,8 +539,8 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted.
   item rows and temporarily builds `BehaviorData` config objects from typed
   behavior payloads behind the `ItemManager.CreateRuntimeBehaviors` runtime
   construction primitive. Direct config reads no longer escape `ItemManager`;
-  gameplay stat modifiers target live behavior instances instead of rebuilding
-  config DTOs for lookup.
+  gameplay stat modifiers target live behavior instances and package-owned
+  behavior metadata instead of rebuilding config DTOs for lookup.
   `RuntimeItemReference.ItemId` is the only item reference value. The reader
   interface for this bridge is named `IRuntimeItemCatalogReader` so callers see
   typed catalog row ownership rather than old DTO projection ownership. Behavior
@@ -828,6 +830,9 @@ First Aetheria surfaces to publish:
      equipped behavior instances. It now modifies the `PerformanceStat` objects
      actually held by runtime behavior data instead of rebuilding temporary
      config DTOs from the catalog.
+   - Done: move `StatModifier` behavior kind/family matching onto
+     `AetheriaRuntimeBehaviorMetadataCatalog`; the behavior only normalizes
+     migrated `*Data` tokens before asking the package-owned metadata owner.
    - Done: delete the legacy `Behaviors` lists from `ConsumableItemData` and
      `EquippableItemData`; item DTOs can no longer carry behavior config state.
    - Done: move runtime blueprint price aggregation and conductivity restore