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

Aaaa (#337)

Browse Source
This commit is contained in:
Aviu00
2023-08-27 13:39:49 +03:00
committed by Aviu00
parent 275af726ab
commit 681b3dce36
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Shared/White/Crossbow/PenetratedSystem.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared.Interaction;
using Content.Shared.Movement.Events; using Content.Shared.Movement.Events;
using Content.Shared.Projectiles; using Content.Shared.Projectiles;
using Robust.Shared.Physics; using Robust.Shared.Physics;
@@ -17,20 +18,35 @@ public sealed class PenetratedSystem : EntitySystem
base.Initialize(); base.Initialize();
SubscribeLocalEvent<PenetratedComponent, MoveInputEvent>(OnMoveInput); SubscribeLocalEvent<PenetratedComponent, MoveInputEvent>(OnMoveInput);
SubscribeLocalEvent<PenetratedComponent, InteractHandEvent>(OnInteract);
} }
private void OnMoveInput(EntityUid uid, PenetratedComponent component, ref MoveInputEvent args) private bool AttemptEmbedRemove(EntityUid uid, EntityUid user, PenetratedComponent component)
{ {
if (component is {ProjectileUid: not null, IsPinned: true}) if (component is {ProjectileUid: not null, IsPinned: true})
{ {
if (!_projectile.AttemptEmbedRemove(component.ProjectileUid.Value, uid)) if (!_projectile.AttemptEmbedRemove(component.ProjectileUid.Value, user))
FreePenetrated(uid, component); FreePenetrated(uid, component);
else
return true;
} }
else if (component.ProjectileUid == null && TryComp(uid, out PhysicsComponent? physics) && else if (component.ProjectileUid == null && TryComp(uid, out PhysicsComponent? physics) &&
physics.BodyType == BodyType.Static) physics.BodyType == BodyType.Static)
{ {
FreePenetrated(uid, component, physics); FreePenetrated(uid, component, physics);
} }
return false;
}
private void OnInteract(EntityUid uid, PenetratedComponent component, InteractHandEvent args)
{
if (AttemptEmbedRemove(uid, args.User, component))
args.Handled = true;
}
private void OnMoveInput(EntityUid uid, PenetratedComponent component, ref MoveInputEvent args)
{
AttemptEmbedRemove(uid, uid, component);
} }
public void FreePenetrated(EntityUid uid, PenetratedComponent? penetrated = null, PhysicsComponent? physics = null) public void FreePenetrated(EntityUid uid, PenetratedComponent? penetrated = null, PhysicsComponent? physics = null)