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

DoAfter Refactor (#13225)

Browse Source 
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
This commit is contained in:
keronshb
2023-02-24 19:01:25 -05:00
committed by GitHub
parent 7a9baa79c2
commit 9ebb452a3c
129 changed files with 2624 additions and 4132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Content.Server/Construction/PartExchangerSystem.cs
View File

@@ -1,15 +1,14 @@
using System.Linq;
using System.Threading;
using Content.Server.Construction.Components;
using Content.Server.DoAfter;
using Content.Server.Storage.Components;
using Content.Server.Storage.EntitySystems;
using Content.Server.Wires;
using Content.Shared.DoAfter;
using Content.Shared.Construction.Components;
using Content.Shared.Interaction;
using Content.Shared.Popups;
using Robust.Shared.Containers;
using Robust.Shared.Player;
using Robust.Shared.Utility;
namespace Content.Server.Construction;
@@ -27,16 +26,20 @@ public sealed class PartExchangerSystem : EntitySystem
public override void Initialize()
{
SubscribeLocalEvent<PartExchangerComponent, AfterInteractEvent>(OnAfterInteract);
SubscribeLocalEvent<PartExchangerComponent, RpedExchangeFinishedEvent>(OnFinished);
SubscribeLocalEvent<PartExchangerComponent, RpedExchangeCancelledEvent>(OnCancelled);
SubscribeLocalEvent<PartExchangerComponent, DoAfterEvent>(OnDoAfter);
}
private void OnFinished(EntityUid uid, PartExchangerComponent component, RpedExchangeFinishedEvent args)
private void OnDoAfter(EntityUid uid, PartExchangerComponent component, DoAfterEvent args)
{
component.Token = null;
if (args.Cancelled || args.Handled || args.Args.Target == null)
{
component.AudioStream?.Stop();
return;
}
component.AudioStream?.Stop();
if (!TryComp<MachineComponent>(args.Target, out var machine))
if (!TryComp<MachineComponent>(args.Args.Target.Value, out var machine))
return;
if (!TryComp<ServerStorageComponent>(uid, out var storage) || storage.Storage == null)
@@ -59,7 +62,7 @@ public sealed class PartExchangerSystem : EntitySystem
if (TryComp<MachinePartComponent>(ent, out var part))
{
machineParts.Add(part);
_container.RemoveEntity(machine.Owner, ent);
_container.RemoveEntity(args.Args.Target.Value, ent);
}
}
@@ -85,19 +88,12 @@ public sealed class PartExchangerSystem : EntitySystem
_storage.Insert(uid, unused.Owner, null, false);
}
_construction.RefreshParts(machine);
}
private void OnCancelled(EntityUid uid, PartExchangerComponent component, RpedExchangeCancelledEvent args)
{
component.Token = null;
component.AudioStream?.Stop();
args.Handled = true;
}
private void OnAfterInteract(EntityUid uid, PartExchangerComponent component, AfterInteractEvent args)
{
if (component.Token != null)
return;
if (component.DoDistanceCheck && !args.CanReach)
return;
@@ -116,28 +112,11 @@ public sealed class PartExchangerSystem : EntitySystem
component.AudioStream = _audio.PlayPvs(component.ExchangeSound, uid);
component.Token = new CancellationTokenSource();
_doAfter.DoAfter(new DoAfterEventArgs(args.User, component.ExchangeDuration, component.Token.Token, args.Target, args.Used)
_doAfter.DoAfter(new DoAfterEventArgs(args.User, component.ExchangeDuration, target:args.Target, used:args.Used)
{
BreakOnDamage = true,
BreakOnStun = true,
BreakOnUserMove = true,
UsedFinishedEvent = new RpedExchangeFinishedEvent(args.Target.Value),
UsedCancelledEvent = new RpedExchangeCancelledEvent()
BreakOnUserMove = true
});
}
}
public sealed class RpedExchangeFinishedEvent : EntityEventArgs
{
public readonly EntityUid Target;
public RpedExchangeFinishedEvent(EntityUid target)
{
Target = target;
}
}
public readonly struct RpedExchangeCancelledEvent
{
}