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:
@@ -38,29 +38,21 @@ public sealed class CuffableComponent : Component
|
||||
/// </summary>
|
||||
[DataField("canStillInteract"), ViewVariables(VVAccess.ReadWrite)]
|
||||
public bool CanStillInteract = true;
|
||||
|
||||
/// <summary>
|
||||
/// Whether or not the entity is currently in the process of being uncuffed.
|
||||
/// </summary>
|
||||
[DataField("uncuffing"), ViewVariables(VVAccess.ReadWrite)]
|
||||
public bool Uncuffing;
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class CuffableComponentState : ComponentState
|
||||
{
|
||||
public readonly bool CanStillInteract;
|
||||
public readonly bool Uncuffing;
|
||||
public readonly int NumHandsCuffed;
|
||||
public readonly string? RSI;
|
||||
public readonly string? IconState;
|
||||
public readonly Color? Color;
|
||||
|
||||
public CuffableComponentState(int numHandsCuffed, bool canStillInteract, bool uncuffing, string? rsiPath, string? iconState, Color? color)
|
||||
public CuffableComponentState(int numHandsCuffed, bool canStillInteract, string? rsiPath, string? iconState, Color? color)
|
||||
{
|
||||
NumHandsCuffed = numHandsCuffed;
|
||||
CanStillInteract = canStillInteract;
|
||||
Uncuffing = uncuffing;
|
||||
RSI = rsiPath;
|
||||
IconState = iconState;
|
||||
Color = color;
|
||||
|
||||
Reference in New Issue
Block a user