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

Inline Transform

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:20:34 +01:00
parent 69b270017b
commit a5b57c8e10
283 changed files with 742 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
View File

@@ -54,17 +54,17 @@ namespace Content.Server.Disposal.Unit.EntitySystems
holder.Container.ForceRemove(entity);
if (entity.Transform.Parent == holderTransform)
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).Parent == holderTransform)
{
if (duc != null)
{
// Insert into disposal unit
entity.Transform.Coordinates = new EntityCoordinates(duc.OwnerUid, Vector2.Zero);
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).Coordinates = new EntityCoordinates(duc.OwnerUid, Vector2.Zero);
duc.Container.Insert(entity);
}
else
{
entity.Transform.AttachParentToContainerOrGrid();
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).AttachParentToContainerOrGrid();
}
}
}
@@ -161,11 +161,11 @@ namespace Content.Server.Disposal.Unit.EntitySystems
if (holder.TimeLeft > 0)
{
var progress = 1 - holder.TimeLeft / holder.StartingTime;
var origin = currentTube.Owner.Transform.Coordinates;
var origin = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(currentTube.Owner.Uid).Coordinates;
var destination = holder.CurrentDirection.ToVec();
var newPosition = destination * progress;
holder.Owner.Transform.Coordinates = origin.Offset(newPosition);
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(holder.Owner.Uid).Coordinates = origin.Offset(newPosition);
continue;
}