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

66
Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
View File

@@ -8,10 +8,9 @@ using Content.Shared.Damage;
using Content.Shared.FixedPoint;
using Content.Shared.Inventory.Events;
using Content.Shared.Verbs;
using Robust.Shared.Player;
using System.Threading;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.DoAfter;
namespace Content.Server.Medical
{
@@ -29,8 +28,7 @@ namespace Content.Server.Medical
SubscribeLocalEvent<WearingStethoscopeComponent, GetVerbsEvent<InnateVerb>>(AddStethoscopeVerb);
SubscribeLocalEvent<StethoscopeComponent, GetItemActionsEvent>(OnGetActions);
SubscribeLocalEvent<StethoscopeComponent, StethoscopeActionEvent>(OnStethoscopeAction);
SubscribeLocalEvent<ListenSuccessfulEvent>(OnListenSuccess);
SubscribeLocalEvent<ListenCancelledEvent>(OnListenCancelled);
SubscribeLocalEvent<StethoscopeComponent, DoAfterEvent>(OnDoAfter);
}
/// <summary>
@@ -81,7 +79,7 @@ namespace Content.Server.Medical
{
Act = () =>
{
StartListening(uid, args.Target, stetho); // start doafter
StartListening(component.Stethoscope, uid, args.Target, stetho); // start doafter
},
Text = Loc.GetString("stethoscope-verb"),
IconTexture = "Clothing/Neck/Misc/stethoscope.rsi/icon.png",
@@ -93,7 +91,7 @@ namespace Content.Server.Medical
private void OnStethoscopeAction(EntityUid uid, StethoscopeComponent component, StethoscopeActionEvent args)
{
StartListening(args.Performer, args.Target, component);
StartListening(uid, args.Performer, args.Target, component);
}
private void OnGetActions(EntityUid uid, StethoscopeComponent component, GetItemActionsEvent args)
@@ -101,27 +99,11 @@ namespace Content.Server.Medical
args.Actions.Add(component.Action);
}
// doafter succeeded / failed
private void OnListenSuccess(ListenSuccessfulEvent ev)
{
ev.Component.CancelToken = null;
ExamineWithStethoscope(ev.User, ev.Target);
}
private void OnListenCancelled(ListenCancelledEvent ev)
{
if (ev.Component == null)
return;
ev.Component.CancelToken = null;
}
// construct the doafter and start it
private void StartListening(EntityUid user, EntityUid target, StethoscopeComponent comp)
private void StartListening(EntityUid scope, EntityUid user, EntityUid target, StethoscopeComponent comp)
{
comp.CancelToken = new CancellationTokenSource();
_doAfterSystem.DoAfter(new DoAfterEventArgs(user, comp.Delay, comp.CancelToken.Token, target: target)
_doAfterSystem.DoAfter(new DoAfterEventArgs(user, comp.Delay, target: target, used:scope)
{
BroadcastFinishedEvent = new ListenSuccessfulEvent(user, target, comp),
BroadcastCancelledEvent = new ListenCancelledEvent(user, comp),
BreakOnTargetMove = true,
BreakOnUserMove = true,
BreakOnStun = true,
@@ -129,6 +111,14 @@ namespace Content.Server.Medical
});
}
private void OnDoAfter(EntityUid uid, StethoscopeComponent component, DoAfterEvent args)
{
if (args.Handled || args.Cancelled || args.Args.Target == null)
return;
ExamineWithStethoscope(args.Args.User, args.Args.Target.Value);
}
/// <summary>
/// Return a value based on the total oxyloss of the target.
/// Could be expanded in the future with reagent effects etc.
@@ -165,34 +155,6 @@ namespace Content.Server.Medical
};
return msg;
}
// events for the doafter
private sealed class ListenSuccessfulEvent : EntityEventArgs
{
public EntityUid User;
public EntityUid Target;
public StethoscopeComponent Component;
public ListenSuccessfulEvent(EntityUid user, EntityUid target, StethoscopeComponent component)
{
User = user;
Target = target;
Component = component;
}
}
private sealed class ListenCancelledEvent : EntityEventArgs
{
public EntityUid Uid;
public StethoscopeComponent Component;
public ListenCancelledEvent(EntityUid uid, StethoscopeComponent component)
{
Uid = uid;
Component = component;
}
}
}
public sealed class StethoscopeActionEvent : EntityTargetActionEvent {}