Use typed behavior keys for trade filters

This commit is contained in:
Meta Vens 2026-06-14 08:59:33 +01:00
commit 93ab0ae102
3 changed files with 59 additions and 28 deletions

View file

@ -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<BehaviorFilter> _behaviorFilters = new List<BehaviorFilter>();
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<RuntimeInspectable>() != null && _behaviorFilters.All(f => f.type != x))
ContextMenu.AddDropdown("Item Behavior", TypedBehaviorFilterOptions
.Where(option => _behaviorFilters.All(filter => filter.Kind != option.Name))
.Select<Type, (string, Action, bool)>(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<ItemFilter>();
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<RuntimeInspectable>() != null))
foreach (var field in behaviorFilter.MetadataType.GetFields().Where(f => f.GetCustomAttribute<RuntimeInspectable>() != 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<LegacyPayloadKeyAttribute>()?.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<Type> TypedBehaviorFilterOptions = BehaviorTypesByName.Values
.Where(type => type.GetCustomAttribute<RuntimeInspectable>() != 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;