Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

4
Content.Server/Forensics/Components/ForensicPadComponent.cs
View File

@@ -1,5 +1,3 @@
using System.Threading;
namespace Content.Server.Forensics
{
/// <summary>
@@ -8,8 +6,6 @@ namespace Content.Server.Forensics
[RegisterComponent]
public sealed class ForensicPadComponent : Component
{
public CancellationTokenSource? CancelToken;
[DataField("scanDelay")]
public float ScanDelay = 3.0f;

86
Content.Server/Forensics/Systems/ForensicPadSystem.cs
View File

@@ -1,11 +1,11 @@
using System.Threading;
using Content.Shared.Examine;
using Content.Shared.Interaction;
using Content.Shared.Inventory;
using Content.Server.DoAfter;
using Content.Server.Popups;
using Content.Shared.DoAfter;
using Content.Shared.IdentityManagement;
using Robust.Shared.Player;
using Robust.Shared.Serialization;
namespace Content.Server.Forensics
{
@@ -16,7 +16,6 @@ namespace Content.Server.Forensics
{
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly InventorySystem _inventory = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!;
public override void Initialize()
@@ -24,8 +23,7 @@ namespace Content.Server.Forensics
base.Initialize();
SubscribeLocalEvent<ForensicPadComponent, ExaminedEvent>(OnExamined);
SubscribeLocalEvent<ForensicPadComponent, AfterInteractEvent>(OnAfterInteract);
SubscribeLocalEvent<TargetPadSuccessfulEvent>(OnTargetPadSuccessful);
SubscribeLocalEvent<PadCancelledEvent>(OnPadCancelled);
SubscribeLocalEvent<ForensicPadComponent, DoAfterEvent<ForensicPadData>>(OnDoAfter);
}
private void OnExamined(EntityUid uid, ForensicPadComponent component, ExaminedEvent args)
@@ -44,7 +42,7 @@ namespace Content.Server.Forensics
private void OnAfterInteract(EntityUid uid, ForensicPadComponent component, AfterInteractEvent args)
{
if (component.CancelToken != null || !args.CanReach || args.Target == null)
if (!args.CanReach || args.Target == null)
return;
if (HasComp<ForensicScannerComponent>(args.Target))
@@ -71,74 +69,58 @@ namespace Content.Server.Forensics
_popupSystem.PopupEntity(Loc.GetString("forensic-pad-start-scan-user", ("target", Identity.Entity(args.Target.Value, EntityManager))), args.Target.Value, args.User);
_popupSystem.PopupEntity(Loc.GetString("forensic-pad-start-scan-target", ("user", Identity.Entity(args.User, EntityManager))), args.Target.Value, args.Target.Value);
}
StartScan(args.User, args.Target.Value, component, fingerprint.Fingerprint);
StartScan(uid, args.User, args.Target.Value, component, fingerprint.Fingerprint);
return;
}
if (TryComp<FiberComponent>(args.Target, out var fiber))
StartScan(args.User, args.Target.Value, component, string.IsNullOrEmpty(fiber.FiberColor) ? Loc.GetString("forensic-fibers", ("material", fiber.FiberMaterial)) : Loc.GetString("forensic-fibers-colored", ("color", fiber.FiberColor), ("material", fiber.FiberMaterial)));
StartScan(uid, args.User, args.Target.Value, component, string.IsNullOrEmpty(fiber.FiberColor) ? Loc.GetString("forensic-fibers", ("material", fiber.FiberMaterial)) : Loc.GetString("forensic-fibers-colored", ("color", fiber.FiberColor), ("material", fiber.FiberMaterial)));
}
private void StartScan(EntityUid user, EntityUid target, ForensicPadComponent pad, string sample)
private void StartScan(EntityUid used, EntityUid user, EntityUid target, ForensicPadComponent pad, string sample)
{
pad.CancelToken = new CancellationTokenSource();
_doAfterSystem.DoAfter(new DoAfterEventArgs(user, pad.ScanDelay, pad.CancelToken.Token, target: target)
var padData = new ForensicPadData(sample);
var doAfterEventArgs = new DoAfterEventArgs(user, pad.ScanDelay, target: target, used: used)
{
BroadcastFinishedEvent = new TargetPadSuccessfulEvent(user, target, pad.Owner, sample),
BroadcastCancelledEvent = new PadCancelledEvent(pad.Owner),
BreakOnTargetMove = true,
BreakOnUserMove = true,
BreakOnStun = true,
NeedHand = true
});
};
_doAfterSystem.DoAfter(doAfterEventArgs, padData);
}
/// <summary>
/// When the forensic pad is successfully used, take their fingerprint sample and flag the pad as used.
/// </summary>
private void OnTargetPadSuccessful(TargetPadSuccessfulEvent ev)
private void OnDoAfter(EntityUid uid, ForensicPadComponent component, DoAfterEvent<ForensicPadData> args)
{
if (!EntityManager.TryGetComponent(ev.Pad, out ForensicPadComponent? component))
return;
if (HasComp<FingerprintComponent>(ev.Target))
MetaData(component.Owner).EntityName = Loc.GetString("forensic-pad-fingerprint-name", ("entity", ev.Target));
else
MetaData(component.Owner).EntityName = Loc.GetString("forensic-pad-gloves-name", ("entity", ev.Target));
component.CancelToken = null;
component.Sample = ev.Sample;
component.Used = true;
}
private void OnPadCancelled(PadCancelledEvent ev)
{
if (!EntityManager.TryGetComponent(ev.Pad, out ForensicPadComponent? component))
return;
component.CancelToken = null;
}
private sealed class PadCancelledEvent : EntityEventArgs
{
public EntityUid Pad;
public PadCancelledEvent(EntityUid pad)
if (args.Handled
|| args.Cancelled
|| !EntityManager.TryGetComponent(args.Args.Used, out ForensicPadComponent? padComponent))
{
Pad = pad;
return;
}
if (args.Args.Target != null)
{
if (HasComp<FingerprintComponent>(args.Args.Target))
MetaData(uid).EntityName = Loc.GetString("forensic-pad-fingerprint-name", ("entity", args.Args.Target));
else
MetaData(uid).EntityName = Loc.GetString("forensic-pad-gloves-name", ("entity", args.Args.Target));
}
padComponent.Sample = args.AdditionalData.Sample;
padComponent.Used = true;
args.Handled = true;
}
private sealed class TargetPadSuccessfulEvent : EntityEventArgs
private sealed class ForensicPadData
{
public EntityUid User;
public EntityUid Target;
public EntityUid Pad;
public string Sample = string.Empty;
public string Sample;
public TargetPadSuccessfulEvent(EntityUid user, EntityUid target, EntityUid pad, string sample)
public ForensicPadData(string sample)
{
User = user;
Target = target;
Pad = pad;
Sample = sample;
}
}

75
Content.Server/Forensics/Systems/ForensicScannerSystem.cs
View File

@@ -1,14 +1,13 @@
using System.Linq;
using System.Text; // todo: remove this stinky LINQy
using System.Threading;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.Player;
using Robust.Shared.Timing;
using Content.Server.DoAfter;
using Content.Server.Paper;
using Content.Server.Popups;
using Content.Server.UserInterface;
using Content.Shared.DoAfter;
using Content.Shared.Forensics;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction;
@@ -40,8 +39,7 @@ namespace Content.Server.Forensics
SubscribeLocalEvent<ForensicScannerComponent, GetVerbsEvent<UtilityVerb>>(OnUtilityVerb);
SubscribeLocalEvent<ForensicScannerComponent, ForensicScannerPrintMessage>(OnPrint);
SubscribeLocalEvent<ForensicScannerComponent, ForensicScannerClearMessage>(OnClear);
SubscribeLocalEvent<TargetScanSuccessfulEvent>(OnTargetScanSuccessful);
SubscribeLocalEvent<ScanCancelledEvent>(OnScanCancelled);
SubscribeLocalEvent<ForensicScannerComponent, DoAfterEvent>(OnDoAfter);
}
private void UpdateUserInterface(EntityUid uid, ForensicScannerComponent component)
@@ -54,40 +52,35 @@ namespace Content.Server.Forensics
component.PrintReadyAt);
if (!_uiSystem.TrySetUiState(uid, ForensicScannerUiKey.Key, state))
{
_sawmill.Warning($"{ToPrettyString(uid)} was unable to set UI state.");
}
}
private void OnScanCancelled(ScanCancelledEvent ev)
private void OnDoAfter(EntityUid uid, ForensicScannerComponent component, DoAfterEvent args)
{
if (!EntityManager.TryGetComponent(ev.Scanner, out ForensicScannerComponent? scanner))
if (args.Handled || args.Cancelled)
return;
scanner.CancelToken = null;
}
private void OnTargetScanSuccessful(TargetScanSuccessfulEvent ev)
{
if (!EntityManager.TryGetComponent(ev.Scanner, out ForensicScannerComponent? scanner))
if (!EntityManager.TryGetComponent(uid, out ForensicScannerComponent? scanner))
return;
scanner.CancelToken = null;
if (args.Args.Target != null)
{
if (!TryComp<ForensicsComponent>(args.Args.Target, out var forensics))
{
scanner.Fingerprints = new();
scanner.Fibers = new();
}
if (!TryComp<ForensicsComponent>(ev.Target, out var forensics))
{
scanner.Fingerprints = new();
scanner.Fibers = new();
}
else
{
scanner.Fingerprints = forensics.Fingerprints.ToList();
scanner.Fibers = forensics.Fibers.ToList();
else
{
scanner.Fingerprints = forensics.Fingerprints.ToList();
scanner.Fibers = forensics.Fibers.ToList();
}
scanner.LastScannedName = MetaData(args.Args.Target.Value).EntityName;
}
scanner.LastScannedName = MetaData(ev.Target).EntityName;
OpenUserInterface(ev.User, scanner);
OpenUserInterface(args.Args.User, scanner);
}
/// <remarks>
@@ -95,11 +88,8 @@ namespace Content.Server.Forensics
/// </remarks>
private void StartScan(EntityUid uid, ForensicScannerComponent component, EntityUid user, EntityUid target)
{
component.CancelToken = new CancellationTokenSource();
_doAfterSystem.DoAfter(new DoAfterEventArgs(user, component.ScanDelay, component.CancelToken.Token, target: target)
_doAfterSystem.DoAfter(new DoAfterEventArgs(user, component.ScanDelay, target: target, used: uid)
{
BroadcastFinishedEvent = new TargetScanSuccessfulEvent(user, target, component.Owner),
BroadcastCancelledEvent = new ScanCancelledEvent(component.Owner),
BreakOnTargetMove = true,
BreakOnUserMove = true,
BreakOnStun = true,
@@ -244,28 +234,5 @@ namespace Content.Server.Forensics
UpdateUserInterface(uid, component);
}
private sealed class ScanCancelledEvent : EntityEventArgs
{
public EntityUid Scanner;
public ScanCancelledEvent(EntityUid scanner)
{
Scanner = scanner;
}
}
private sealed class TargetScanSuccessfulEvent : EntityEventArgs
{
public EntityUid User;
public EntityUid Target;
public EntityUid Scanner;
public TargetScanSuccessfulEvent(EntityUid user, EntityUid target, EntityUid scanner)
{
User = user;
Target = target;
Scanner = scanner;
}
}
}
}