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

Disposals fixed under station rotation (#5067)

Browse Source 
* Some sanity checks on disposals movement, fix the interpolator

* Technically fix disposal routing, but I'm not done here yet

* Remove disposals reliance on implicit direction sensing entirely.
This commit is contained in:
20kdc
2021-10-29 09:07:32 +01:00
committed by GitHub
parent 01d62baa64
commit 7cdb9dcf86
8 changed files with 64 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs
View File

@@ -25,15 +25,14 @@ namespace Content.Server.Disposal.Tube.Components
public override Direction NextDirection(DisposalHolderComponent holder)
{
var directions = ConnectableDirections();
var previousTube = holder.PreviousTube;
var previousDF = holder.PreviousDirectionFrom;
if (previousTube == null)
if (previousDF == Direction.Invalid)
{
return directions[0];
}
var previousDirection = DirectionTo(previousTube);
return previousDirection == directions[0] ? directions[1] : directions[0];
return previousDF == directions[0] ? directions[1] : directions[0];
}
}
}

2
Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs
View File

@@ -57,7 +57,7 @@ namespace Content.Server.Disposal.Tube.Components
/// </summary>
public override Direction NextDirection(DisposalHolderComponent holder)
{
if (holder.PreviousTube != null && DirectionTo(holder.PreviousTube) == ConnectableDirections()[0])
if (holder.PreviousDirectionFrom != Direction.Invalid && holder.PreviousDirectionFrom == ConnectableDirections()[0])
{
var invalidDirections = new[] { ConnectableDirections()[0], Direction.Invalid };
var directions = Enum.GetValues(typeof(Direction))

4
Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs
View File

@@ -37,8 +37,8 @@ namespace Content.Server.Disposal.Tube.Components
var next = Owner.Transform.LocalRotation.GetDir();
var directions = ConnectableDirections().Skip(1).ToArray();
if (holder.PreviousTube == null ||
DirectionTo(holder.PreviousTube) == next)
if (holder.PreviousDirectionFrom == Direction.Invalid ||
holder.PreviousDirectionFrom == next)
{
return _random.Pick(directions);
}

6
Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs
View File

@@ -23,16 +23,16 @@ namespace Content.Server.Disposal.Tube.Components
public override Direction NextDirection(DisposalHolderComponent holder)
{
var directions = ConnectableDirections();
var previousTube = holder.PreviousTube;
var previousDF = holder.PreviousDirectionFrom;
var forward = directions[0];
if (previousTube == null)
if (previousDF == Direction.Invalid)
{
return forward;
}
var backward = directions[1];
return DirectionTo(previousTube) == forward ? backward : forward;
return previousDF == forward ? backward : forward;
}
}
}

35
Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
View File

@@ -56,41 +56,6 @@ namespace Content.Server.Disposal.Tube.Components
return NextDirection(holder).ToVec();
}
protected Direction DirectionTo(IDisposalTubeComponent other)
{
return (other.Owner.Transform.WorldPosition - Owner.Transform.WorldPosition).GetDir();
}
public IDisposalTubeComponent? NextTube(DisposalHolderComponent holder)
{
var nextDirection = NextDirection(holder);
var oppositeDirection = new Angle(nextDirection.ToAngle().Theta + Math.PI).GetDir();
var grid = _mapManager.GetGrid(Owner.Transform.GridID);
var position = Owner.Transform.Coordinates;
foreach (var entity in grid.GetInDir(position, nextDirection))
{
if (!Owner.EntityManager.TryGetComponent(entity, out IDisposalTubeComponent? tube))
{
continue;
}
if (!tube.CanConnect(oppositeDirection, this))
{
continue;
}
if (!CanConnect(nextDirection, tube))
{
continue;
}
return tube;
}
return null;
}
public bool Remove(DisposalHolderComponent holder)
{
var removed = Contents.Remove(holder.Owner);

1
Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs
View File

@@ -11,7 +11,6 @@ namespace Content.Server.Disposal.Tube.Components
Direction NextDirection(DisposalHolderComponent holder);
Vector2 ExitVector(DisposalHolderComponent holder);
IDisposalTubeComponent? NextTube(DisposalHolderComponent holder);
bool Remove(DisposalHolderComponent holder);
bool TransferTo(DisposalHolderComponent holder, IDisposalTubeComponent to);
bool CanConnect(Direction direction, IDisposalTubeComponent with);

34
Content.Server/Disposal/Tube/DisposalTubeSystem.cs
View File

@@ -5,6 +5,8 @@ using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Localization;
using Robust.Shared.Player;
using Robust.Shared.Timing;
@@ -14,6 +16,7 @@ namespace Content.Server.Disposal.Tube
public sealed class DisposalTubeSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
public override void Initialize()
{
@@ -77,5 +80,36 @@ namespace Content.Server.Disposal.Tube
{
component.AnchoredChanged();
}
public IDisposalTubeComponent? NextTubeFor(EntityUid target, Direction nextDirection, IDisposalTubeComponent? targetTube = null)
{
if (!Resolve(target, ref targetTube))
return null;
var oppositeDirection = nextDirection.GetOpposite();
var grid = _mapManager.GetGrid(targetTube.Owner.Transform.GridID);
var position = targetTube.Owner.Transform.Coordinates;
foreach (var entity in grid.GetInDir(position, nextDirection))
{
if (!EntityManager.TryGetComponent(entity, out IDisposalTubeComponent? tube))
{
continue;
}
if (!tube.CanConnect(oppositeDirection, targetTube))
{
continue;
}
if (!targetTube.CanConnect(nextDirection, tube))
{
continue;
}
return tube;
}
return null;
}
}
}

30
Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs
View File

@@ -4,11 +4,13 @@ using System.Linq;
using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Disposal.Tube.Components;
using Content.Server.Disposal.Tube;
using Content.Server.Items;
using Content.Shared.Atmos;
using Content.Shared.Body.Components;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Serialization.Manager.Attributes;
@@ -41,10 +43,17 @@ namespace Content.Server.Disposal.Unit.Components
public IDisposalTubeComponent? PreviousTube { get; set; }
[ViewVariables]
public IDisposalTubeComponent? CurrentTube { get; private set; }
public Direction PreviousDirection { get; private set; } = Direction.Invalid;
[ViewVariables]
public IDisposalTubeComponent? NextTube { get; set; }
public Direction PreviousDirectionFrom => (PreviousDirection == Direction.Invalid) ? Direction.Invalid : PreviousDirection.GetOpposite();
[ViewVariables]
public IDisposalTubeComponent? CurrentTube { get; private set; }
// CurrentDirection is not null when CurrentTube isn't null.
[ViewVariables]
public Direction CurrentDirection { get; private set; } = Direction.Invalid;
/// <summary>
/// A list of tags attached to the content, used for sorting
@@ -100,11 +109,12 @@ namespace Content.Server.Disposal.Unit.Components
if (CurrentTube != null)
{
PreviousTube = CurrentTube;
PreviousDirection = CurrentDirection;
}
Owner.Transform.Coordinates = tube.Owner.Transform.Coordinates;
CurrentTube = tube;
NextTube = tube.NextTube(this);
CurrentDirection = tube.NextDirection(this);
StartingTime = 0.1f;
TimeLeft = 0.1f;
}
@@ -115,8 +125,9 @@ namespace Content.Server.Disposal.Unit.Components
return;
PreviousTube = null;
PreviousDirection = Direction.Invalid;
CurrentTube = null;
NextTube = null;
CurrentDirection = Direction.Invalid;
StartingTime = 0;
TimeLeft = 0;
@@ -159,7 +170,7 @@ namespace Content.Server.Disposal.Unit.Components
TimeLeft -= time;
frameTime -= time;
if (CurrentTube == null)
if (CurrentTube == null || CurrentTube.Deleted)
{
ExitDisposals();
break;
@@ -168,16 +179,17 @@ namespace Content.Server.Disposal.Unit.Components
if (TimeLeft > 0)
{
var progress = 1 - TimeLeft / StartingTime;
var origin = CurrentTube.Owner.Transform.WorldPosition;
var destination = CurrentTube.NextDirection(this).ToVec();
var origin = CurrentTube.Owner.Transform.Coordinates;
var destination = CurrentDirection.ToVec();
var newPosition = destination * progress;
Owner.Transform.WorldPosition = origin + newPosition;
Owner.Transform.Coordinates = origin.Offset(newPosition);
continue;
}
if (NextTube == null || !CurrentTube.TransferTo(this, NextTube))
var nextTube = EntitySystem.Get<DisposalTubeSystem>().NextTubeFor(CurrentTube.Owner.Uid, CurrentDirection);
if (nextTube == null || nextTube.Deleted || !CurrentTube.TransferTo(this, nextTube))
{
CurrentTube.Remove(this);
break;