From d5330348e2172b114e55e633a82c74c0ffd710a4 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 14 Jun 2026 01:09:31 +0100 Subject: [PATCH] Require typed consumable rows for action bar binding --- .voidbot/state/aetheria.cc | Bin 56550 -> 56726 bytes Assets/Scripts/Gameplay/ActionGameManager.cs | 6 +++--- docs/aetheria-perfect-machine-map.md | 12 +++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index c77d8168022a759ca69817a05ab9b402f69f3a3e..298aa328e1174c95899e5f7cd3e84e51e4b1a133 100644 GIT binary patch delta 1002 zcmZuwJ!lkB5XM}Bvu}C%-bLPh`7=tH>5&}Z3-tNxrJ=uMGdGBrFBILj{ zDXd(vuvLjh3+1XHf`}oNkkdjAtnJfSJ8yUIr?A_dnK$3h%>3CcJpWYqust*~bM5N1 zH8)jG+U+yR-q4dgFg-_s^GQ^Qj#9;pRjwol?NTx_d|~MO{nqI4=I8OPc}Me5jN43t z6ABdt%=Qs%E?h1=5aBvVT#dLy1uQw-C^ZMFBxP-^g%Y72yOL@1MAs2~^q3RF^23}%+UNepb@!b`npBao$;4zSIki7}JUgxO+{!D>JoO^E zwZD3Lr~mR@uXk&A|3ooAyfPi$!CCV&V@+PEq-R-df5`(=CXn7JWv6D-?4uu#vm2eP TB!`7k>)g+;#bWlpGQ08*38s6i delta 804 zcmYk4&ubGw6vt^&wDF*aidC`j@X~`enuOq{UKG5fDirmU+jRGBcI;$kJ2RV*i=~P; z5oJKUcoQlWLCC3yAZo3km$oO*f+sKe4}96(1h4PM_kG{zy%!&fe|C!Rw+b_rrFx}Y zysh%5pv+nWk?0Knr5NmZG zeQUt>V+?>>?0|__jNqdX?&+;FF7)P?o;PI|rB%8Qfo5&!a+5G&s8l5)fB-e`V&15H zKZ%+2`w(i?al;3vH%6)>Jp-EA2sPMj~F57MwV<3RF*~?u<&bPbL|0bJxC{+}OT}7=y2bV6jQ} z8Pi%}5=G7>K%bA6Fu;jq27EEwG`|8RAwm(OHdjF~OO88=xDt7ykh-T$+Uoxu3@9%Q zCj=K)nZHJd%s`N1(u#PTN@x`Q@-|(DsNTWQxWTcnZ>C)E?eFsPZ5Gq&zS6{Ua_h`} zHjBy0ic3Xxdiu+^{(3RPl&=br9!8UL!5KaQH9}G}7lD{5bqvDrIdAuk{b) Ck|~w| diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index e243bcd8b..c11452367 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -729,7 +729,7 @@ public class ActionGameManager : MonoBehaviour slot.Binding = new ActionBarGearBinding(CurrentEntity, slot, equippedItemDragAction.EquippedItem, trigger); return true; case ItemInstanceDragObject itemInstanceDragAction: - if (!IsTypedConsumable(itemInstanceDragAction.Item)) return false; + if (!IsRuntimeConsumableItem(itemInstanceDragAction.Item)) return false; if (!(ItemManager.GetData(itemInstanceDragAction.Item) is ConsumableItemData consumable)) return false; slot.Binding = new ActionBarConsumableBinding(CurrentEntity, slot, consumable); return true; @@ -749,10 +749,10 @@ public class ActionGameManager : MonoBehaviour return slot; } - bool IsTypedConsumable(ItemInstance item) + bool IsRuntimeConsumableItem(ItemInstance item) { var typedItem = FindTypedActionBarItem(item); - return typedItem == null || + return typedItem != null && string.Equals(typedItem.Category, nameof(ConsumableItemData), StringComparison.Ordinal); } diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index ed5672529..96bcd8de7 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -80,11 +80,13 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted. same typed player-settings commit after mutating the runtime projection. The action bar also uses typed runtime catalog category rows to reject non-consumable inventory drops before hydrating the legacy consumable DTO - still required by activation APIs. Gear action-bar bindings use typed weapon - and hardpoint facets for fallback icon selection instead of hydrating item - DTOs to classify the icon; legacy custom action-bar icon paths remain fallback - projection data. Unity boot reads typed player settings back through the - package-owned CultCache reader before falling back to defaults. + still required by activation APIs. Missing typed rows are rejected for + consumable binding instead of falling through to legacy DTO classification. + Gear action-bar bindings use typed weapon and hardpoint facets for fallback + icon selection instead of hydrating item DTOs to classify the icon; legacy + custom action-bar icon paths remain fallback projection data. Unity boot reads + typed player settings back through the package-owned CultCache reader before + 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`. Runtime weapon behavior still owns ammo counts, active range, cooldowns,