Route runtime behavior construction through item manager
This commit is contained in:
parent
5196ee4c3c
commit
37f4ef4a12
6 changed files with 38 additions and 15 deletions
|
|
@ -9,7 +9,7 @@ using Unity.Mathematics;
|
|||
public interface IRuntimeItemCatalogReader
|
||||
{
|
||||
AetheriaRuntimeCatalogItem GetRuntimeItem(Guid guid);
|
||||
IReadOnlyList<BehaviorData> GetRuntimeBehaviorConfigs(Guid guid);
|
||||
IReadOnlyList<BehaviorData> GetTemporaryBehaviorConfigs(Guid guid);
|
||||
}
|
||||
|
||||
public sealed class AetheriaRuntimeItemCatalog : IRuntimeItemCatalogReader
|
||||
|
|
@ -65,7 +65,7 @@ public sealed class AetheriaRuntimeItemCatalog : IRuntimeItemCatalogReader
|
|||
return item;
|
||||
}
|
||||
|
||||
public IReadOnlyList<BehaviorData> GetRuntimeBehaviorConfigs(Guid guid)
|
||||
public IReadOnlyList<BehaviorData> GetTemporaryBehaviorConfigs(Guid guid)
|
||||
{
|
||||
var item = GetRuntimeItem(guid);
|
||||
return item == null
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ public class StatModifier : Behavior, IInitializableBehavior, IDisposable, IAlwa
|
|||
_stats = Entity.Equipment
|
||||
.Select(hp => hp.EquippableItem)
|
||||
.Where(HasRequiredBehavior)
|
||||
.SelectMany(gear => ItemManager.GetRuntimeBehaviorConfigs(gear))
|
||||
.SelectMany(gear => ItemManager.GetTemporaryRuntimeBehaviorConfigs(gear))
|
||||
.Where(behavior => BehaviorKindMatches(behavior.Kind, _data.Stat.Target))
|
||||
.Select(FindTargetStat)
|
||||
.Where(stat => stat != null)
|
||||
|
|
@ -93,7 +93,7 @@ public class StatModifier : Behavior, IInitializableBehavior, IDisposable, IAlwa
|
|||
private bool HasRequiredBehavior(EquippableItem gear)
|
||||
{
|
||||
return string.IsNullOrWhiteSpace(_data.RequireBehavior) ||
|
||||
ItemManager.GetRuntimeBehaviorConfigs(gear)
|
||||
ItemManager.GetTemporaryRuntimeBehaviorConfigs(gear)
|
||||
.Any(behavior => BehaviorKindMatches(behavior.Kind, _data.RequireBehavior));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1188,9 +1188,7 @@ public class ConsumableItemEffect
|
|||
_effectiveness = CreateEffectivenessCurve(RuntimeItem);
|
||||
RemainingDuration = _duration;
|
||||
|
||||
Behaviors = entity.ItemManager.GetRuntimeBehaviorConfigs(item)
|
||||
.Select(bd => bd.CreateInstance(this))
|
||||
.ToArray();
|
||||
Behaviors = entity.ItemManager.CreateRuntimeBehaviors(this);
|
||||
}
|
||||
|
||||
public void Update(float delta)
|
||||
|
|
@ -1393,9 +1391,7 @@ public class EquippedItem
|
|||
.CombineLatest(Online, (enabled, online) => enabled && online).DistinctUntilChanged());
|
||||
|
||||
|
||||
Behaviors = ItemManager.GetRuntimeBehaviorConfigs(item)
|
||||
.Select(bd => bd.CreateInstance(this))
|
||||
.ToArray();
|
||||
Behaviors = ItemManager.CreateRuntimeBehaviors(this);
|
||||
|
||||
BehaviorGroups = Behaviors
|
||||
.GroupBy(b => b.Data.Group)
|
||||
|
|
|
|||
|
|
@ -64,12 +64,31 @@ public class ItemManager
|
|||
return itemId == Guid.Empty ? null : _runtimeItems.GetRuntimeItem(itemId);
|
||||
}
|
||||
|
||||
public IReadOnlyList<BehaviorData> GetRuntimeBehaviorConfigs(ItemInstance item)
|
||||
public IReadOnlyList<BehaviorData> GetTemporaryRuntimeBehaviorConfigs(ItemInstance item)
|
||||
{
|
||||
var itemId = item?.Data?.ItemId ?? Guid.Empty;
|
||||
return itemId == Guid.Empty
|
||||
? Array.Empty<BehaviorData>()
|
||||
: _runtimeItems.GetRuntimeBehaviorConfigs(itemId);
|
||||
: _runtimeItems.GetTemporaryBehaviorConfigs(itemId);
|
||||
}
|
||||
|
||||
public Behavior[] CreateRuntimeBehaviors(EquippedItem item)
|
||||
{
|
||||
return CreateRuntimeBehaviorConfigs(item?.EquippableItem)
|
||||
.Select(config => config.CreateInstance(item))
|
||||
.ToArray();
|
||||
}
|
||||
|
||||
public Behavior[] CreateRuntimeBehaviors(ConsumableItemEffect effect)
|
||||
{
|
||||
return CreateRuntimeBehaviorConfigs(effect?.Item)
|
||||
.Select(config => config.CreateInstance(effect))
|
||||
.ToArray();
|
||||
}
|
||||
|
||||
private IReadOnlyList<BehaviorData> CreateRuntimeBehaviorConfigs(ItemInstance item)
|
||||
{
|
||||
return GetTemporaryRuntimeBehaviorConfigs(item);
|
||||
}
|
||||
|
||||
public Shape GetRuntimeShape(ItemInstance item)
|
||||
|
|
|
|||
Loading…
Reference in a new issue