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

52
Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
View File

@@ -1,6 +1,7 @@
using System.Threading;
using Content.Server.DoAfter;
using Content.Shared.Alert;
using Content.Shared.DoAfter;
using Content.Shared.Ensnaring.Components;
using Content.Shared.IdentityManagement;
using Content.Shared.StepTrigger.Systems;
@@ -27,7 +28,7 @@ public sealed partial class EnsnareableSystem
return;
if (ensnared.IsEnsnared)
ForceFree(component);
ForceFree(uid, component);
}
private void AttemptStepTrigger(EntityUid uid, EnsnaringComponent component, ref StepTriggerAttemptEvent args)
@@ -37,7 +38,7 @@ public sealed partial class EnsnareableSystem
private void OnStepTrigger(EntityUid uid, EnsnaringComponent component, ref StepTriggeredEvent args)
{
TryEnsnare(args.Tripper, component);
TryEnsnare(args.Tripper, uid, component);
}
private void OnThrowHit(EntityUid uid, EnsnaringComponent component, ThrowDoHitEvent args)
@@ -45,26 +46,27 @@ public sealed partial class EnsnareableSystem
if (!component.CanThrowTrigger)
return;
TryEnsnare(args.Target, component);
TryEnsnare(args.Target, uid, component);
}
/// <summary>
/// Used where you want to try to ensnare an entity with the <see cref="EnsnareableComponent"/>
/// </summary>
/// <param name="target">The entity that will be ensnared</param>
/// <paramref name="ensnare"> The entity that is used to ensnare</param>
/// <param name="component">The ensnaring component</param>
public void TryEnsnare(EntityUid target, EnsnaringComponent component)
public void TryEnsnare(EntityUid target, EntityUid ensnare, EnsnaringComponent component)
{
//Don't do anything if they don't have the ensnareable component.
if (!TryComp<EnsnareableComponent>(target, out var ensnareable))
return;
component.Ensnared = target;
ensnareable.Container.Insert(component.Owner);
ensnareable.Container.Insert(ensnare);
ensnareable.IsEnsnared = true;
Dirty(ensnareable);
UpdateAlert(ensnareable);
UpdateAlert(ensnare, ensnareable);
var ev = new EnsnareEvent(component.WalkSpeed, component.SprintSpeed);
RaiseLocalEvent(target, ev);
}
@@ -73,18 +75,14 @@ public sealed partial class EnsnareableSystem
/// Used where you want to try to free an entity with the <see cref="EnsnareableComponent"/>
/// </summary>
/// <param name="target">The entity that will be free</param>
/// <param name="ensnare">The entity used to ensnare</param>
/// <param name="component">The ensnaring component</param>
public void TryFree(EntityUid target, EnsnaringComponent component, EntityUid? user = null)
public void TryFree(EntityUid target, EntityUid ensnare, EnsnaringComponent component, EntityUid? user = null)
{
//Don't do anything if they don't have the ensnareable component.
if (!HasComp<EnsnareableComponent>(target))
return;
if (component.CancelToken != null)
return;
component.CancelToken = new CancellationTokenSource();
var isOwner = !(user != null && target != user);
var freeTime = isOwner ? component.BreakoutTime : component.FreeTime;
bool breakOnMove;
@@ -94,55 +92,47 @@ public sealed partial class EnsnareableSystem
else
breakOnMove = true;
var doAfterEventArgs = new DoAfterEventArgs(target, freeTime, component.CancelToken.Token, target)
var doAfterEventArgs = new DoAfterEventArgs(target, freeTime, target: target, used:ensnare)
{
BreakOnUserMove = breakOnMove,
BreakOnTargetMove = breakOnMove,
BreakOnDamage = false,
BreakOnStun = true,
NeedHand = true,
TargetFinishedEvent = new FreeEnsnareDoAfterComplete(component.Owner),
TargetCancelledEvent = new FreeEnsnareDoAfterCancel(component.Owner),
NeedHand = true
};
_doAfter.DoAfter(doAfterEventArgs);
if (isOwner)
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free", ("ensnare", component.Owner)), target, target);
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free", ("ensnare", ensnare)), target, target);
if (!isOwner && user != null)
{
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free-other", ("ensnare", component.Owner), ("user", Identity.Entity(target, EntityManager))), user.Value, user.Value);
}
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free-other", ("ensnare", ensnare), ("user", Identity.Entity(target, EntityManager))), user.Value, user.Value);
}
/// <summary>
/// Used to force free someone for things like if the <see cref="EnsnaringComponent"/> is removed
/// </summary>
public void ForceFree(EnsnaringComponent component)
public void ForceFree(EntityUid ensnare, EnsnaringComponent component)
{
if (!TryComp<EnsnareableComponent>(component.Ensnared, out var ensnareable))
return;
ensnareable.Container.ForceRemove(component.Owner);
ensnareable.Container.ForceRemove(ensnare);
ensnareable.IsEnsnared = false;
Dirty(ensnareable);
component.Ensnared = null;
UpdateAlert(ensnareable);
UpdateAlert(ensnare, ensnareable);
var ev = new EnsnareRemoveEvent();
RaiseLocalEvent(component.Owner, ev);
RaiseLocalEvent(ensnare, ev);
}
public void UpdateAlert(EnsnareableComponent component)
public void UpdateAlert(EntityUid ensnare, EnsnareableComponent component)
{
if (!component.IsEnsnared)
{
_alerts.ClearAlert(component.Owner, AlertType.Ensnared);
}
_alerts.ClearAlert(ensnare, AlertType.Ensnared);
else
{
_alerts.ShowAlert(component.Owner, AlertType.Ensnared);
}
_alerts.ShowAlert(ensnare, AlertType.Ensnared);
}
}

36
Content.Server/Ensnaring/EnsnareableSystem.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.Popups;
using Content.Shared.DoAfter;
using Content.Shared.Ensnaring;
using Content.Shared.Ensnaring.Components;
using Content.Shared.Popups;
@@ -19,43 +20,36 @@ public sealed partial class EnsnareableSystem : SharedEnsnareableSystem
InitializeEnsnaring();
SubscribeLocalEvent<EnsnareableComponent, ComponentInit>(OnEnsnareableInit);
SubscribeLocalEvent<EnsnareableComponent, FreeEnsnareDoAfterComplete>(OnFreeComplete);
SubscribeLocalEvent<EnsnareableComponent, FreeEnsnareDoAfterCancel>(OnFreeFail);
SubscribeLocalEvent<EnsnareableComponent, DoAfterEvent>(OnDoAfter);
}
private void OnEnsnareableInit(EntityUid uid, EnsnareableComponent component, ComponentInit args)
{
component.Container = _container.EnsureContainer<Container>(component.Owner, "ensnare");
component.Container = _container.EnsureContainer<Container>(uid, "ensnare");
}
private void OnFreeComplete(EntityUid uid, EnsnareableComponent component, FreeEnsnareDoAfterComplete args)
private void OnDoAfter(EntityUid uid, EnsnareableComponent component, DoAfterEvent args)
{
if (!TryComp<EnsnaringComponent>(args.EnsnaringEntity, out var ensnaring))
if (args.Handled || !TryComp<EnsnaringComponent>(args.Args.Used, out var ensnaring))
return;
component.Container.Remove(args.EnsnaringEntity);
if (args.Cancelled)
{
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free-fail", ("ensnare", args.Args.Used)), uid, uid, PopupType.Large);
return;
}
component.Container.Remove(args.Args.Used.Value);
component.IsEnsnared = false;
Dirty(component);
ensnaring.Ensnared = null;
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free-complete", ("ensnare", args.EnsnaringEntity)),
uid, uid, PopupType.Large);
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free-complete", ("ensnare", args.Args.Used)), uid, uid, PopupType.Large);
UpdateAlert(component);
UpdateAlert(args.Args.Used.Value, component);
var ev = new EnsnareRemoveEvent();
RaiseLocalEvent(uid, ev);
ensnaring.CancelToken = null;
}
private void OnFreeFail(EntityUid uid, EnsnareableComponent component, FreeEnsnareDoAfterCancel args)
{
if (!TryComp<EnsnaringComponent>(args.EnsnaringEntity, out var ensnaring))
return;
ensnaring.CancelToken = null;
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free-fail", ("ensnare", args.EnsnaringEntity)),
uid, uid, PopupType.Large);
args.Handled = true;
}
}