Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Landing velocity threshold (#4606)

Browse Source 
* landing threshold

* on bodystatus change

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
mirrorcult
2021-09-15 03:58:45 -07:00
committed by GitHub
parent 03260c2de7
commit 7cee263955
3 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Content.Shared/Throwing/ThrownItemSystem.cs
View File

@@ -1,9 +1,11 @@
using System.Collections.Generic;
using System.Linq;
using Content.Shared.CCVar;
using Content.Shared.Collections;
using Content.Shared.Hands.Components;
using Content.Shared.Physics;
using Content.Shared.Physics.Pull;
using Robust.Shared.Configuration;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
@@ -19,6 +21,7 @@ namespace Content.Shared.Throwing
/// </summary>
public class ThrownItemSystem : EntitySystem
{
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly SharedBroadphaseSystem _broadphaseSystem = default!;
private const string ThrowingFixture = "throw-fixture";
@@ -33,27 +36,6 @@ namespace Content.Shared.Throwing
SubscribeLocalEvent<PullStartedMessage>(HandlePullStarted);
}
public override void Update(float frameTime)
{
base.Update(frameTime);
var toRemove = new RemQueue<ThrownItemComponent>();
// We can't just use sleeping unfortunately because there's a delay of the sleep timer. ThrownItemComponent
// is transient while the entity is thrown so this shouldn't be too bad.
foreach (var (thrown, physics) in ComponentManager.EntityQuery<ThrownItemComponent, PhysicsComponent>())
{
if (!physics.LinearVelocity.Equals(Vector2.Zero)) continue;
toRemove.Add(thrown);
}
foreach (var comp in toRemove)
{
if (comp.Deleted) continue;
LandComponent(comp);
}
}
private void ThrowItem(EntityUid uid, ThrownItemComponent component, ThrownEvent args)
{
if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent) ||
@@ -98,7 +80,7 @@ namespace Content.Shared.Throwing
LandComponent(thrownItem);
}
private void LandComponent(ThrownItemComponent thrownItem)
public void LandComponent(ThrownItemComponent thrownItem)
{
if (thrownItem.Owner.Deleted) return;
@@ -125,7 +107,8 @@ namespace Content.Shared.Throwing
var coordinates = landing.Transform.Coordinates;
var landMsg = new LandEvent(user, landing, coordinates);
RaiseLocalEvent(landing.Uid, landMsg);
RaiseLocalEvent(landing.Uid, landMsg, false);
ComponentManager.RemoveComponent(landing.Uid, thrownItem);
}