ItemMapper ECS (#9867)

This commit is contained in:
metalgearsloth
2022-08-08 12:35:57 +10:00
committed by GitHub
parent b55b806c6b
commit 189d49a51f
13 changed files with 112 additions and 156 deletions

View File

@@ -0,0 +1,65 @@
using System.Linq;
using Content.Shared.Storage.Components;
using Content.Shared.Storage.EntitySystems;
using Robust.Client.GameObjects;
using Robust.Shared.Utility;
namespace Content.Client.Storage.Systems;
public sealed class ItemMapperSystem : SharedItemMapperSystem
{
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<ItemMapperComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<ItemMapperComponent, AppearanceChangeEvent>(OnAppearance);
}
private void OnStartup(EntityUid uid, ItemMapperComponent component, ComponentStartup args)
{
if (TryComp<SpriteComponent>(uid, out var sprite))
{
component.RSIPath ??= sprite.BaseRSI!.Path!;
}
}
private void OnAppearance(EntityUid uid, ItemMapperComponent component, ref AppearanceChangeEvent args)
{
if (TryComp<SpriteComponent>(component.Owner, out var spriteComponent))
{
if (component.SpriteLayers.Count == 0)
{
InitLayers(component, spriteComponent, args.Component);
}
EnableLayers(component, spriteComponent, args.Component);
}
}
private void InitLayers(ItemMapperComponent component, SpriteComponent spriteComponent, AppearanceComponent appearance)
{
if (!appearance.TryGetData<ShowLayerData>(StorageMapVisuals.InitLayers, out var wrapper))
return;
component.SpriteLayers.AddRange(wrapper.QueuedEntities);
foreach (var sprite in component.SpriteLayers)
{
spriteComponent.LayerMapReserveBlank(sprite);
spriteComponent.LayerSetSprite(sprite, new SpriteSpecifier.Rsi(component.RSIPath!, sprite));
spriteComponent.LayerSetVisible(sprite, false);
}
}
private void EnableLayers(ItemMapperComponent component, SpriteComponent spriteComponent, AppearanceComponent appearance)
{
if (!appearance.TryGetData<ShowLayerData>(StorageMapVisuals.LayerChanged, out var wrapper))
return;
foreach (var layerName in component.SpriteLayers)
{
var show = wrapper.QueuedEntities.Contains(layerName);
spriteComponent.LayerSetVisible(layerName, show);
}
}
}

View File

@@ -0,0 +1,37 @@
using Content.Client.Animations;
using Content.Shared.Storage;
namespace Content.Client.Storage.Systems;
// TODO kill this is all horrid.
public sealed class StorageSystem : EntitySystem
{
public override void Initialize()
{
base.Initialize();
SubscribeNetworkEvent<AnimateInsertingEntitiesEvent>(HandleAnimatingInsertingEntities);
}
/// <summary>
/// Animate the newly stored entities in <paramref name="msg"/> flying towards this storage's position
/// </summary>
/// <param name="msg"></param>
public void HandleAnimatingInsertingEntities(AnimateInsertingEntitiesEvent msg)
{
if (!TryComp(msg.Storage, out ClientStorageComponent? storage))
return;
TryComp(msg.Storage, out TransformComponent? transformComp);
for (var i = 0; msg.StoredEntities.Count > i; i++)
{
var entity = msg.StoredEntities[i];
var initialPosition = msg.EntityPositions[i];
if (EntityManager.EntityExists(entity) && transformComp != null)
{
ReusableAnimations.AnimateEntityPickup(entity, initialPosition, transformComp.LocalPosition, EntityManager);
}
}
}
}