3fc9f96b75
* Move placeable check to PlaceableSurfaceSystem This check stops entities from being inserted into a storage entity when it has a PlaceableSurfaceComponent. The entity is instead placed on top of the entity like a table. * Move SetPlaceable to PlaceableSurfaceSystem * Update to transform system and consolidate code * Fix interaction with storage that has a placeable component * deadlock --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
91 lines
3.0 KiB
C#
91 lines
3.0 KiB
C#
using System.Numerics;
|
|
using Content.Shared.Hands.EntitySystems;
|
|
using Content.Shared.Interaction;
|
|
using Content.Shared.Storage;
|
|
using Content.Shared.Storage.Components;
|
|
|
|
namespace Content.Shared.Placeable;
|
|
|
|
public sealed class PlaceableSurfaceSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
|
|
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<PlaceableSurfaceComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
|
|
SubscribeLocalEvent<PlaceableSurfaceComponent, StorageInteractUsingAttemptEvent>(OnStorageInteractUsingAttempt);
|
|
SubscribeLocalEvent<PlaceableSurfaceComponent, StorageAfterOpenEvent>(OnStorageAfterOpen);
|
|
SubscribeLocalEvent<PlaceableSurfaceComponent, StorageAfterCloseEvent>(OnStorageAfterClose);
|
|
}
|
|
|
|
public void SetPlaceable(EntityUid uid, bool isPlaceable, PlaceableSurfaceComponent? surface = null)
|
|
{
|
|
if (!Resolve(uid, ref surface, false))
|
|
return;
|
|
|
|
if (surface.IsPlaceable == isPlaceable)
|
|
return;
|
|
|
|
surface.IsPlaceable = isPlaceable;
|
|
Dirty(uid, surface);
|
|
}
|
|
|
|
public void SetPlaceCentered(EntityUid uid, bool placeCentered, PlaceableSurfaceComponent? surface = null)
|
|
{
|
|
if (!Resolve(uid, ref surface))
|
|
return;
|
|
|
|
surface.PlaceCentered = placeCentered;
|
|
Dirty(uid, surface);
|
|
}
|
|
|
|
public void SetPositionOffset(EntityUid uid, Vector2 offset, PlaceableSurfaceComponent? surface = null)
|
|
{
|
|
if (!Resolve(uid, ref surface))
|
|
return;
|
|
|
|
surface.PositionOffset = offset;
|
|
Dirty(uid, surface);
|
|
}
|
|
|
|
private void OnAfterInteractUsing(EntityUid uid, PlaceableSurfaceComponent surface, AfterInteractUsingEvent args)
|
|
{
|
|
if (args.Handled || !args.CanReach)
|
|
return;
|
|
|
|
if (!surface.IsPlaceable)
|
|
return;
|
|
|
|
// 99% of the time they want to dump the stuff inside on the table, they can manually place with q if they really need to.
|
|
// Just causes prediction CBT otherwise.
|
|
if (HasComp<DumpableComponent>(args.Used))
|
|
return;
|
|
|
|
if (!_handsSystem.TryDrop(args.User, args.Used))
|
|
return;
|
|
|
|
_transformSystem.SetCoordinates(args.Used,
|
|
surface.PlaceCentered ? Transform(uid).Coordinates.Offset(surface.PositionOffset) : args.ClickLocation);
|
|
|
|
args.Handled = true;
|
|
}
|
|
|
|
private void OnStorageInteractUsingAttempt(Entity<PlaceableSurfaceComponent> ent, ref StorageInteractUsingAttemptEvent args)
|
|
{
|
|
args.Cancelled = true;
|
|
}
|
|
|
|
private void OnStorageAfterOpen(Entity<PlaceableSurfaceComponent> ent, ref StorageAfterOpenEvent args)
|
|
{
|
|
SetPlaceable(ent.Owner, true, ent.Comp);
|
|
}
|
|
|
|
private void OnStorageAfterClose(Entity<PlaceableSurfaceComponent> ent, ref StorageAfterCloseEvent args)
|
|
{
|
|
SetPlaceable(ent.Owner, false, ent.Comp);
|
|
}
|
|
}
|