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

Require typed consumable activation

Browse source
This commit is contained in:
Meta Vens 2026-06-14 08:04:05 +01:00
commit bc04526d35
3 changed files with 7 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Assets/Scripts/ServerShared/Entity.cs
View file

@ -314,48 +314,17 @@ public abstract class Entity
_activeConsumables.Add(new ConsumableItemEffect(item, this));
}
public ConsumableItemEffect FindActiveConsumable(ConsumableItemData data)
{
return data == null ? null : FindActiveConsumable(data.ID);
}
public ConsumableItemEffect FindActiveConsumable(Guid itemId)
{
return _activeConsumables.FirstOrDefault(ac => ac.Item?.Data?.ItemId == itemId);
}
public bool CanActivateConsumable(ConsumableItemData data)
{
var typedItem = ItemManager.GetRuntimeItem(data?.ID ?? Guid.Empty);
if (typedItem == null)
return data != null && (data.Stackable || FindActiveConsumable(data) == null);
return CanActivateConsumable(typedItem);
}
public bool CanActivateConsumable(AetheriaRuntimeCatalogItem item)
{
var itemId = GetLegacyGuid(item);
return item != null && itemId != Guid.Empty && (item.Stackable || FindActiveConsumable(itemId) == null);
}
public bool TryActivateConsumable(ConsumableItemData data)
{
var typedItem = ItemManager.GetRuntimeItem(data?.ID ?? Guid.Empty);
if (typedItem != null)
return TryActivateConsumable(typedItem);
if (!CanActivateConsumable(data)) return false;
var bay = FindItemInCargo(data.ID);
if (bay == null) return false;
var item = (ConsumableItem) bay.ItemsOfType[data.ID].First();
ActivateConsumable(item);
bay.Remove(item);
return true;
}
public bool TryActivateConsumable(AetheriaRuntimeCatalogItem typedItem)
{
if (!CanActivateConsumable(typedItem)) return false;