Slipping tweaks + remove EffectBlocker (#4955)

* Slipping tweaks + remove EffectBlocker

* mfw failed merge conflict resolution

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
mirrorcult
2021-10-24 23:43:49 -07:00
committed by GitHub
parent e016fc9906
commit c0ecdb09af
16 changed files with 69 additions and 112 deletions

View File

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Shared.EffectBlocker;
using Content.Shared.StatusEffect;
using Content.Shared.Stunnable;
using JetBrains.Annotations;
@@ -26,6 +25,7 @@ namespace Content.Shared.Slippery
{
base.Initialize();
SubscribeLocalEvent<SlipperyComponent, StartCollideEvent>(HandleCollide);
SubscribeLocalEvent<NoSlipComponent, SlipAttemptEvent>(OnNoSlipAttempt);
}
private void HandleCollide(EntityUid uid, SlipperyComponent component, StartCollideEvent args)
@@ -40,6 +40,11 @@ namespace Content.Shared.Slippery
component.Colliding.Add(otherUid);
}
private void OnNoSlipAttempt(EntityUid uid, NoSlipComponent component, SlipAttemptEvent args)
{
args.Cancel();
}
/// <inheritdoc />
public override void Update(float frameTime)
{
@@ -80,10 +85,10 @@ namespace Content.Shared.Slippery
return false;
}
if (!EffectBlockerSystem.CanSlip(otherBody.Owner))
{
var ev = new SlipAttemptEvent();
RaiseLocalEvent(otherBody.Owner.Uid, ev, false);
if (ev.Cancelled)
return false;
}
otherBody.LinearVelocity *= component.LaunchForwardsMultiplier;
@@ -136,4 +141,11 @@ namespace Content.Shared.Slippery
return false;
}
}
/// <summary>
/// Raised on an entity to determine if it can slip or not.
/// </summary>
public class SlipAttemptEvent : CancellableEntityEventArgs
{
}
}