diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index 8966cb30d..e325b02b4 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index 69e163748..b37f2dfd9 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -30,7 +30,7 @@ public class TradeMenu : MonoBehaviour private (ItemFilter filter, HardpointType type) _hardpointFilter; private (ItemFilter filter, SimpleCommodityCategory type) _commodityFilter; private (ItemFilter filter, CompoundCommodityCategory type) _compoundCommodityFilter; - private List<(ItemFilter filter, Type type)> _behaviorFilters = new List<(ItemFilter filter, Type type)>(); + private List _behaviorFilters = new List(); public EquippedCargoBay Inventory { get; set; } @@ -150,20 +150,22 @@ public class TradeMenu : MonoBehaviour _compoundCommodityFilter.type = x; Populate(); }, true))); - ContextMenu.AddDropdown("Item Behavior", typeof(BehaviorData).GetAllChildClasses() - .Where(x=> x.GetCustomAttribute() != null && _behaviorFilters.All(f => f.type != x)) + ContextMenu.AddDropdown("Item Behavior", TypedBehaviorFilterOptions + .Where(option => _behaviorFilters.All(filter => filter.Kind != option.Name)) .Select(x=> (x.Name.FormatTypeName(), () => { - var matchingType = _behaviorFilters.FirstOrDefault(y => y.type.IsAssignableFrom(x) || x.IsAssignableFrom(y.type)); - if (matchingType.filter != null) matchingType.filter.DisableButton.onClick.Invoke(); + var matchingType = _behaviorFilters.FirstOrDefault(y => + y.MetadataType.IsAssignableFrom(x) || x.IsAssignableFrom(y.MetadataType)); + if (matchingType?.Filter != null) matchingType.Filter.DisableButton.onClick.Invoke(); var filter = FilterPrototype.Instantiate(); filter.Label.text = x.Name.FormatTypeName(); + var behaviorFilter = new BehaviorFilter(filter, x.Name, x); filter.OnDisable += () => { - _behaviorFilters.Remove((filter, x)); + _behaviorFilters.Remove(behaviorFilter); Populate(); }; - _behaviorFilters.Add((filter, x)); + _behaviorFilters.Add(behaviorFilter); Populate(); }, true))); if(!MinimumSizeFilter.gameObject.activeSelf) @@ -249,40 +251,40 @@ public class TradeMenu : MonoBehaviour if (_hardpointFilter.filter != null) items = items.Where(i => i.TryGetTypedHardpoint(out var hardpointType) && hardpointType == _hardpointFilter.type); - foreach (var (_, type) in _behaviorFilters) + foreach (var behaviorFilter in _behaviorFilters) { - items = items.Where(i => i.TypedItem?.BehaviorKinds.Contains(type.Name, StringComparer.Ordinal) ?? false); + items = items.Where(i => HasTypedBehavior(i.TypedItem, behaviorFilter)); - foreach (var field in type.GetFields().Where(f => f.GetCustomAttribute() != null)) + foreach (var field in behaviorFilter.MetadataType.GetFields().Where(f => f.GetCustomAttribute() != null)) { var fieldType = field.FieldType; if (fieldType == typeof(float)) columns.Add((field.Name, 1, x => { - var value = GetTypedBehaviorNumber(x, type, field); + var value = GetTypedBehaviorNumber(x, behaviorFilter, field); return () => ActionGameManager.RuntimePlayerSettings.Format((float)value); }, x => { - return (float)GetTypedBehaviorNumber(x, type, field); + return (float)GetTypedBehaviorNumber(x, behaviorFilter, field); })); else if (fieldType == typeof(int)) columns.Add((field.Name, 1, x => { - var value = GetTypedBehaviorNumber(x, type, field); + var value = GetTypedBehaviorNumber(x, behaviorFilter, field); return () => ((int)value).ToString(); }, x => { - return (int)GetTypedBehaviorNumber(x, type, field); + return (int)GetTypedBehaviorNumber(x, behaviorFilter, field); })); else if (fieldType == typeof(PerformanceStat)) { columns.Add((field.Name, 1, x => { - var value = GetTypedBehaviorNumber(x, type, field); + var value = GetTypedBehaviorNumber(x, behaviorFilter, field); return () => ActionGameManager.RuntimePlayerSettings.Format((float)value); }, x => { - return (float)GetTypedBehaviorNumber(x, type, field); + return (float)GetTypedBehaviorNumber(x, behaviorFilter, field); })); } } @@ -387,8 +389,7 @@ public class TradeMenu : MonoBehaviour return false; } - return _behaviorFilters.All(filter => - typedItem.BehaviorKinds.Contains(filter.type.Name, StringComparer.Ordinal)); + return _behaviorFilters.All(filter => HasTypedBehavior(typedItem, filter)); } private static AetheriaRuntimeCatalogItem FindTypedTradeItem(ItemInstance item) @@ -401,7 +402,7 @@ public class TradeMenu : MonoBehaviour return ActionGameManager.RuntimeCatalog?.FindItemByLegacyId(item.Data.ItemId.ToString("D")); } - private static double GetTypedBehaviorNumber(TradeRow row, Type behaviorType, FieldInfo field) + private static double GetTypedBehaviorNumber(TradeRow row, BehaviorFilter behaviorFilter, FieldInfo field) { var key = field.GetCustomAttribute()?.Key; if (key == null) @@ -409,7 +410,7 @@ public class TradeMenu : MonoBehaviour return 0; } - var payload = FindTypedBehaviorPayload(row.TypedItem, behaviorType); + var payload = FindTypedBehaviorPayload(row.TypedItem, behaviorFilter); var payloadField = payload?.Fields.FirstOrDefault(candidate => candidate.Key == key.Value); if (payloadField == null) { @@ -426,25 +427,30 @@ public class TradeMenu : MonoBehaviour return payloadField.Value.NumberValue; } - private static AetheriaRuntimeBehaviorPayload FindTypedBehaviorPayload(AetheriaRuntimeCatalogItem typedItem, Type behaviorType) + private static AetheriaRuntimeBehaviorPayload FindTypedBehaviorPayload(AetheriaRuntimeCatalogItem typedItem, BehaviorFilter behaviorFilter) { if (typedItem == null) { return null; } - return typedItem.BehaviorPayloads.FirstOrDefault(payload => TypedBehaviorMatches(payload, behaviorType)); + return typedItem.BehaviorPayloads.FirstOrDefault(payload => TypedBehaviorMatches(payload, behaviorFilter)); } - private static bool TypedBehaviorMatches(AetheriaRuntimeBehaviorPayload payload, Type behaviorType) + private static bool HasTypedBehavior(AetheriaRuntimeCatalogItem typedItem, BehaviorFilter behaviorFilter) { - if (string.Equals(payload.Kind, behaviorType.Name, StringComparison.Ordinal)) + return typedItem?.BehaviorPayloads.Any(payload => TypedBehaviorMatches(payload, behaviorFilter)) ?? false; + } + + private static bool TypedBehaviorMatches(AetheriaRuntimeBehaviorPayload payload, BehaviorFilter behaviorFilter) + { + if (string.Equals(payload.Kind, behaviorFilter.Kind, StringComparison.Ordinal)) { return true; } var payloadType = ResolveBehaviorType(payload.Kind); - return payloadType != null && behaviorType.IsAssignableFrom(payloadType); + return payloadType != null && behaviorFilter.MetadataType.IsAssignableFrom(payloadType); } private static Type ResolveBehaviorType(string kind) @@ -462,6 +468,25 @@ public class TradeMenu : MonoBehaviour .GroupBy(type => type.Name) .ToDictionary(group => group.Key, group => group.First(), StringComparer.Ordinal); + private static readonly IReadOnlyList TypedBehaviorFilterOptions = BehaviorTypesByName.Values + .Where(type => type.GetCustomAttribute() != null) + .OrderBy(type => type.Name, StringComparer.Ordinal) + .ToArray(); + + private sealed class BehaviorFilter + { + public BehaviorFilter(ItemFilter filter, string kind, Type metadataType) + { + Filter = filter ?? throw new ArgumentNullException(nameof(filter)); + Kind = string.IsNullOrWhiteSpace(kind) ? "" : kind; + MetadataType = metadataType ?? throw new ArgumentNullException(nameof(metadataType)); + } + + public ItemFilter Filter { get; } + public string Kind { get; } + public Type MetadataType { get; } + } + private sealed class TradeRow { private readonly ItemManager _itemManager; diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index bdf5a6cbf..8b933c254 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -165,9 +165,11 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted. now comes from typed state, not `AetherDB.msgpack`. The surviving trade menu wraps rows in a typed `TradeRow`: name, mass, price, size, hardpoint type, commodity subtype, hull ownership, and behavior-kind filters read typed - catalog rows before any legacy projection is hydrated. Dynamic behavior - columns read typed behavior payload fields by legacy payload key instead of - hydrating `BehaviorData` DTOs. Trade buy decisions for crafted price, + catalog rows before any legacy projection is hydrated. Active behavior + filters store typed behavior kind keys and match typed behavior payloads; + `BehaviorData` reflection is only temporary option/column metadata. Dynamic + behavior columns read typed behavior payload fields by legacy payload key + instead of hydrating `BehaviorData` DTOs. Trade buy decisions for crafted price, ship-hull classification, simple commodity base price, and simple commodity stack size also read typed catalog rows; the existing inventory transfer and ship-construction paths still own the actual runtime mutation. @@ -711,6 +713,10 @@ First Aetheria surfaces to publish: - Done: move trade menu row presentation for name, mass, price, size, hardpoint type, commodity subtype, hull-owned counts, and behavior-kind filtering onto typed `TradeRow` fields. + - Done: demote TradeMenu behavior filters from `BehaviorData` `Type` + authority to typed behavior kind keys matched against typed payloads; + `BehaviorData` reflection remains only for temporary filter labels and + dynamic column metadata. - Done: move trade menu buy price, ship-hull classification, and simple commodity stack-size decisions onto typed catalog rows; inventory transfer and ship construction remain the runtime mutation owners.