diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index c77d81680..298aa328e 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ 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,