More DoAfter Changes (#14609)
* 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:
@@ -43,46 +43,12 @@ namespace Content.Shared.Tools.Components
|
||||
[ByRefEvent]
|
||||
public struct ToolUserAttemptUseEvent
|
||||
{
|
||||
public EntityUid User;
|
||||
public EntityUid? Target;
|
||||
public bool Cancelled = false;
|
||||
|
||||
public ToolUserAttemptUseEvent(EntityUid user, EntityUid? target)
|
||||
public ToolUserAttemptUseEvent(EntityUid? target)
|
||||
{
|
||||
User = user;
|
||||
Target = target;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Attempt event called *after* any do afters to see if the tool usage should succeed or not.
|
||||
/// You can use this event to consume any fuel needed.
|
||||
/// </summary>
|
||||
public sealed class ToolUseFinishAttemptEvent : CancellableEntityEventArgs
|
||||
{
|
||||
public float Fuel { get; }
|
||||
public EntityUid User { get; }
|
||||
|
||||
public ToolUseFinishAttemptEvent(float fuel, EntityUid user)
|
||||
{
|
||||
User = user;
|
||||
Fuel = fuel;
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class ToolEventData
|
||||
{
|
||||
public readonly Object? Ev;
|
||||
public readonly Object? CancelledEv;
|
||||
public readonly float Fuel;
|
||||
public readonly EntityUid? TargetEntity;
|
||||
|
||||
public ToolEventData(Object? ev, float fuel = 0f, Object? cancelledEv = null, EntityUid? targetEntity = null)
|
||||
{
|
||||
Ev = ev;
|
||||
CancelledEv = cancelledEv;
|
||||
Fuel = fuel;
|
||||
TargetEntity = targetEntity;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user