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

space doafters, like doafters but in space (#16670)

Browse Source 
Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-06-03 19:33:41 +00:00
committed by GitHub
parent a2318532e0
commit 10932cc384
4 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared.Gravity;
using Content.Shared.Hands.Components;
using Robust.Shared.Utility;
@@ -6,6 +7,7 @@ namespace Content.Shared.DoAfter;
public abstract partial class SharedDoAfterSystem : EntitySystem
{
[Dependency] private readonly IDynamicTypeFactory _factory = default!;
[Dependency] private readonly SharedGravitySystem _gravity = default!;
public override void Update(float frameTime)
{
@@ -151,18 +153,23 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
if (args.Used is { } @using && !xformQuery.TryGetComponent(@using, out usedXform))
return true;
// TODO: Handle Inertia in space
// TODO: Re-use existing xform query for these calculations.
if (args.BreakOnUserMove && !userXform.Coordinates
.InRange(EntityManager, _transform, doAfter.UserPosition, args.MovementThreshold))
// when there is no gravity you will be drifting 99% of the time making many doafters impossible
// so this just ignores your movement if you are weightless (unless the doafter sets BreakOnWeightlessMove then moving will still break it)
if (args.BreakOnUserMove
&& !userXform.Coordinates.InRange(EntityManager, _transform, doAfter.UserPosition, args.MovementThreshold)
&& (args.BreakOnWeightlessMove || !_gravity.IsWeightless(args.User, xform: userXform)))
return true;
if (args.BreakOnTargetMove)
{
DebugTools.Assert(targetXform != null, "Break on move is true, but no target specified?");
if (targetXform != null && !targetXform.Coordinates.InRange(EntityManager, _transform,
doAfter.TargetPosition, args.MovementThreshold))
return true;
if (targetXform != null && targetXform.Coordinates.TryDistance(EntityManager, userXform.Coordinates, out var distance))
{
// once the target moves too far from you the do after breaks
if (Math.Abs(distance - doAfter.TargetDistance) > args.MovementThreshold)
return true;
}
}
if (args.AttemptFrequency == AttemptFrequency.EveryTick && !TryAttemptEvent(doAfter))