tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Transform cleanups (#25963)

Browse Source 
* Transform cleanups

* Fix build

* ascension
This commit is contained in:
metalgearsloth
2024-03-29 17:26:30 +11:00
committed by GitHub
parent d830922603
commit cdfee5aa0c
5 changed files with 40 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Content.Shared/Storage/EntitySystems/DumpableSystem.cs
View File

@@ -19,17 +19,16 @@ public sealed class DumpableSystem : EntitySystem
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
[Dependency] private readonly SharedDisposalUnitSystem _disposalUnitSystem = default!;
[Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
private EntityQuery<TransformComponent> _xformQuery;
private EntityQuery<ItemComponent> _itemQuery;
public override void Initialize()
{
base.Initialize();
_xformQuery = GetEntityQuery<TransformComponent>();
_itemQuery = GetEntityQuery<ItemComponent>();
SubscribeLocalEvent<DumpableComponent, AfterInteractEvent>(OnAfterInteract, after: new[]{ typeof(SharedEntityStorageSystem) });
SubscribeLocalEvent<DumpableComponent, GetVerbsEvent<AlternativeVerb>>(AddDumpVerb);
SubscribeLocalEvent<DumpableComponent, GetVerbsEvent<UtilityVerb>>(AddUtilityVerbs);
@@ -111,7 +110,7 @@ public sealed class DumpableSystem : EntitySystem
}
}
private void StartDoAfter(EntityUid storageUid, EntityUid? targetUid, EntityUid userUid, DumpableComponent dumpable)
private void StartDoAfter(EntityUid storageUid, EntityUid targetUid, EntityUid userUid, DumpableComponent dumpable)
{
if (!TryComp<StorageComponent>(storageUid, out var storage))
return;
@@ -120,7 +119,7 @@ public sealed class DumpableSystem : EntitySystem
foreach (var entity in storage.Container.ContainedEntities)
{
if (!TryComp<ItemComponent>(entity, out var itemComp) ||
if (!_itemQuery.TryGetComponent(entity, out var itemComp) ||
!_prototypeManager.TryIndex(itemComp.Size, out var itemSize))
{
continue;
@@ -138,33 +137,16 @@ public sealed class DumpableSystem : EntitySystem
});
}
private void OnDoAfter(EntityUid uid, DumpableComponent component, DoAfterEvent args)
private void OnDoAfter(EntityUid uid, DumpableComponent component, DumpableDoAfterEvent args)
{
if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage))
if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage) || storage.Container.ContainedEntities.Count == 0)
return;
Queue<EntityUid> dumpQueue = new();
foreach (var entity in storage.Container.ContainedEntities)
{
dumpQueue.Enqueue(entity);
}
if (dumpQueue.Count == 0)
return;
foreach (var entity in dumpQueue)
{
var transform = Transform(entity);
_container.AttachParentToContainerOrGrid((entity, transform));
_transformSystem.SetLocalPositionRotation(entity, transform.LocalPosition + _random.NextVector2Box() / 2, _random.NextAngle(), transform);
}
if (args.Args.Target == null)
return;
var dumpQueue = new Queue<EntityUid>(storage.Container.ContainedEntities);
var dumped = false;
if (_disposalUnitSystem.HasDisposals(args.Args.Target.Value))
if (_disposalUnitSystem.HasDisposals(args.Args.Target))
{
dumped = true;
@@ -173,22 +155,31 @@ public sealed class DumpableSystem : EntitySystem
_disposalUnitSystem.DoInsertDisposalUnit(args.Args.Target.Value, entity, args.Args.User);
}
}
else if (HasComp<PlaceableSurfaceComponent>(args.Args.Target.Value))
else if (HasComp<PlaceableSurfaceComponent>(args.Args.Target))
{
dumped = true;
var targetPos = _xformQuery.GetComponent(args.Args.Target.Value).LocalPosition;
var targetPos = _transformSystem.GetWorldPosition(args.Args.Target.Value);
foreach (var entity in dumpQueue)
{
_transformSystem.SetLocalPosition(entity, targetPos + _random.NextVector2Box() / 4);
_transformSystem.SetWorldPosition(entity, targetPos + _random.NextVector2Box() / 4);
}
}
else
{
var targetPos = _transformSystem.GetWorldPosition(uid);
foreach (var entity in dumpQueue)
{
var transform = Transform(entity);
_transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, _random.NextAngle(), transform);
}
}
if (dumped)
{
// TODO: Predicted when above predicted
_audio.PlayPvs(component.DumpSound, uid);
_audio.PlayPredicted(component.DumpSound, uid, args.User);
}
}
}