cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Thrown soap/banana/(etc?) will fail to slip until it lands (#24494) 

* throw miss

* event

* whoops

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* fix popup duplication

* Separate cancellable event

* no popup, no problem

* remove leftover stuff

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit e061cb3f8c9dc8ddc26624ead2086dfb41465aae)
This commit is contained in:
Errant 2024-03-20 12:57:39 +01:00 committed by NullWanderer
parent 20709972bd
commit e67d8e51f2
No known key found for this signature in database
GPG Key ID: 65CF92BD1D26F4AC
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Shared/Slippery/SlipperySystem.cs
View File

@ -1,9 +1,12 @@
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Content.Shared.Inventory;
using Robust.Shared.Network;
using Content.Shared.Popups;
using Content.Shared.StatusEffect;
using Content.Shared.StepTrigger.Systems;
using Content.Shared.Stunnable;
using Content.Shared.Throwing;
using JetBrains.Annotations;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
@ -30,6 +33,7 @@ public sealed class SlipperySystem : EntitySystem
SubscribeLocalEvent<SlipperyComponent, StepTriggerAttemptEvent>(HandleAttemptCollide);
SubscribeLocalEvent<SlipperyComponent, StepTriggeredEvent>(HandleStepTrigger);
SubscribeLocalEvent<NoSlipComponent, SlipAttemptEvent>(OnNoSlipAttempt);
SubscribeLocalEvent<ThrownItemComponent, SlipCausingAttemptEvent>(OnThrownSlipAttempt);
// as long as slip-resistant mice are never added, this should be fine (otherwise a mouse-hat will transfer it's power to the wearer).
SubscribeLocalEvent<NoSlipComponent, InventoryRelayedEvent<SlipAttemptEvent>>((e, c, ev) => OnNoSlipAttempt(e, c, ev.Args));
}
@ -52,6 +56,11 @@ public sealed class SlipperySystem : EntitySystem
args.Cancel();
}
private void OnThrownSlipAttempt(EntityUid uid, ThrownItemComponent comp, ref SlipCausingAttemptEvent args)
{
args.Cancelled = true;
}
private bool CanSlip(EntityUid uid, EntityUid toSlip)
{
return !_container.IsEntityInContainer(uid)
@ -68,6 +77,11 @@ public sealed class SlipperySystem : EntitySystem
if (attemptEv.Cancelled)
return;
var attemptCausingEv = new SlipCausingAttemptEvent();
RaiseLocalEvent(uid, ref attemptCausingEv);
if (attemptCausingEv.Cancelled)
return;
var ev = new SlipEvent(other);
RaiseLocalEvent(uid, ref ev);
@ -107,7 +121,13 @@ public sealed class SlipAttemptEvent : CancellableEntityEventArgs, IInventoryRel
}
/// <summary>
/// This event is raised directed at an entity that CAUSED some other entity to slip (e.g., the banana peel).
/// Raised on an entity that is causing the slip event (e.g, the banana peel), to determine if the slip attempt should be cancelled.
/// </summary>
/// <param name="Cancelled">If the slip should be cancelled</param>
[ByRefEvent]
public record struct SlipCausingAttemptEvent (bool Cancelled);
/// Raised on an entity that CAUSED some other entity to slip (e.g., the banana peel).
/// <param name="Slipped">The entity being slipped</param>
[ByRefEvent]
public readonly record struct SlipEvent(EntityUid Slipped);