GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Centralize catalog item object lookup

Browse source
This commit is contained in:
Meta Vens 2026-06-28 12:21:38 +01:00
commit 0cf4591b8f
11 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assets/Scripts/Gameplay/AetheriaUnityActionBarPresentation.cs
View file

@ -53,7 +53,7 @@ public sealed class AetheriaUnityActionBarPresentation
{
ActionBarWeaponGroupBinding weaponGroup => $"G{weaponGroup.Group + 1}",
ActionBarConsumableBinding consumable => consumable.Target?.Name ?? "Consumable",
ActionBarGearBinding gear => _catalog?.FindItem(gear.Item?.EquippableItem?.ItemKey ?? "")?.Name ?? "Gear",
ActionBarGearBinding gear => _catalog?.FindItem(gear.Item?.EquippableItem, x => x.ItemKey)?.Name ?? "Gear",
_ => "Empty"
};
}
@ -257,7 +257,7 @@ public sealed class AetheriaUnityActionBarPresentation
private AetheriaRuntimeCatalogItem FindConsumable(ItemInstance item)
{
var typedItem = _catalog?.FindItem(item?.ItemKey ?? "");
var typedItem = _catalog?.FindItem(item, x => x.ItemKey);
return typedItem != null &&
string.Equals(typedItem.Category, AetheriaRuntimeItemCategories.Consumable, StringComparison.Ordinal)
? typedItem