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

More DoAfter Changes (#14609)

Browse Source 
* DoAfters

* Compact Clone()

* Fix mice and cuffables

* Try generalize attempt events

* moves climbabledoafter event to shared, fixes issue with climbable target

* Fix merge (cuffing)

* Make all events netserializable

* handful of doafter events moved

* moves the rest of the events to their respective shared folders

* Changes all mentions of server doafter to shared

* stop stripping cancellation

* fix merge errors

* draw paused doafters

* handle unpausing

* missing netserializable ref

* removes break on stun reference

* removes cuffing state reference

* Fix tools

* Fix door prying.

* Fix construction

* Fix dumping

* Fix wielding assert

* fix rev

* Fix test

* more test fixes

---------

Co-authored-by: keronshb <keronshb@live.com>
This commit is contained in:
Leon Friedrich
2023-04-03 13:13:48 +12:00
committed by GitHub
parent 9e66fac805
commit 19277a2276
170 changed files with 3042 additions and 2954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Content.Server/Mech/Systems/MechSystem.cs
View File

@@ -1,6 +1,5 @@
using System.Linq;
using Content.Server.Atmos.EntitySystems;
using Content.Server.DoAfter;
using Content.Server.Mech.Components;
using Content.Server.Power.Components;
using Content.Shared.ActionBlocker;
@@ -27,7 +26,7 @@ public sealed class MechSystem : SharedMechSystem
[Dependency] private readonly AtmosphereSystem _atmosphere = default!;
[Dependency] private readonly ContainerSystem _container = default!;
[Dependency] private readonly DamageableSystem _damageable = default!;
[Dependency] private readonly DoAfterSystem _doAfter = default!;
[Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
[Dependency] private readonly IMapManager _map = default!;
[Dependency] private readonly UserInterfaceSystem _ui = default!;
[Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
@@ -45,9 +44,9 @@ public sealed class MechSystem : SharedMechSystem
SubscribeLocalEvent<MechComponent, MapInitEvent>(OnMapInit);
SubscribeLocalEvent<MechComponent, GetVerbsEvent<AlternativeVerb>>(OnAlternativeVerb);
SubscribeLocalEvent<MechComponent, MechOpenUiEvent>(OnOpenUi);
SubscribeLocalEvent<MechComponent, DoAfterEvent<RemoveBatteryEvent>>(OnRemoveBattery);
SubscribeLocalEvent<MechComponent, DoAfterEvent<MechEntryEvent>>(OnMechEntry);
SubscribeLocalEvent<MechComponent, DoAfterEvent<MechExitEvent>>(OnMechExit);
SubscribeLocalEvent<MechComponent, RemoveBatteryEvent>(OnRemoveBattery);
SubscribeLocalEvent<MechComponent, MechEntryEvent>(OnMechEntry);
SubscribeLocalEvent<MechComponent, MechExitEvent>(OnMechExit);
SubscribeLocalEvent<MechComponent, DamageChangedEvent>(OnDamageChanged);
SubscribeLocalEvent<MechComponent, MechEquipmentRemoveMessage>(OnRemoveEquipmentMessage);
@@ -84,22 +83,17 @@ public sealed class MechSystem : SharedMechSystem
if (TryComp<ToolComponent>(args.Used, out var tool) && tool.Qualities.Contains("Prying") && component.BatterySlot.ContainedEntity != null)
{
var removeBattery = new RemoveBatteryEvent();
var doAfterEventArgs = new DoAfterEventArgs(args.User, component.BatteryRemovalDelay, target: uid, used: args.Target)
var doAfterEventArgs = new DoAfterArgs(args.User, component.BatteryRemovalDelay, new RemoveBatteryEvent(), uid, target: uid, used: args.Target)
{
BreakOnTargetMove = true,
BreakOnUserMove = true,
RaiseOnTarget = true,
RaiseOnUsed = false,
RaiseOnUser = false,
};
_doAfter.DoAfter(doAfterEventArgs, removeBattery);
_doAfter.TryStartDoAfter(doAfterEventArgs);
}
}
private void OnRemoveBattery(EntityUid uid, MechComponent component, DoAfterEvent<RemoveBatteryEvent> args)
private void OnRemoveBattery(EntityUid uid, MechComponent component, RemoveBatteryEvent args)
{
if (args.Cancelled || args.Handled)
return;
@@ -166,17 +160,12 @@ public sealed class MechSystem : SharedMechSystem
Text = Loc.GetString("mech-verb-enter"),
Act = () =>
{
var mechEntryEvent = new MechEntryEvent();
var doAfterEventArgs = new DoAfterEventArgs(args.User, component.EntryDelay, target: uid)
var doAfterEventArgs = new DoAfterArgs(args.User, component.EntryDelay, new MechEntryEvent(), uid, target: uid)
{
BreakOnUserMove = true,
BreakOnStun = true,
RaiseOnTarget = true,
RaiseOnUsed = false,
RaiseOnUser = false,
};
_doAfter.DoAfter(doAfterEventArgs, mechEntryEvent);
_doAfter.TryStartDoAfter(doAfterEventArgs);
}
};
var openUiVerb = new AlternativeVerb //can't hijack someone else's mech
@@ -201,25 +190,20 @@ public sealed class MechSystem : SharedMechSystem
return;
}
var mechExitEvent = new MechExitEvent();
var doAfterEventArgs = new DoAfterEventArgs(args.User, component.ExitDelay, target: uid)
var doAfterEventArgs = new DoAfterArgs(args.User, component.ExitDelay, new MechExitEvent(), uid, target: uid)
{
BreakOnUserMove = true,
BreakOnTargetMove = true,
BreakOnStun = true,
RaiseOnTarget = true,
RaiseOnUsed = false,
RaiseOnUser = false,
};
_doAfter.DoAfter(doAfterEventArgs, mechExitEvent);
_doAfter.TryStartDoAfter(doAfterEventArgs);
}
};
args.Verbs.Add(ejectVerb);
}
}
private void OnMechEntry(EntityUid uid, MechComponent component, DoAfterEvent<MechEntryEvent> args)
private void OnMechEntry(EntityUid uid, MechComponent component, MechEntryEvent args)
{
if (args.Cancelled || args.Handled)
return;
@@ -230,7 +214,7 @@ public sealed class MechSystem : SharedMechSystem
args.Handled = true;
}
private void OnMechExit(EntityUid uid, MechComponent component, DoAfterEvent<MechExitEvent> args)
private void OnMechExit(EntityUid uid, MechComponent component, MechExitEvent args)
{
if (args.Cancelled || args.Handled)
return;
@@ -454,27 +438,4 @@ public sealed class MechSystem : SharedMechSystem
args.Handled = true;
}
#endregion
/// <summary>
/// Event raised when the battery is successfully removed from the mech,
/// on both success and failure
/// </summary>
private sealed class RemoveBatteryEvent : EntityEventArgs
{
}
/// <summary>
/// Event raised when a person enters a mech, on both success and failure
/// </summary>
private sealed class MechEntryEvent : EntityEventArgs
{
}
/// <summary>
/// Event raised when a person removes someone from a mech,
/// on both success and failure
/// </summary>
private sealed class MechExitEvent : EntityEventArgs
{
}
}