Replace Houdini's magical piloting locker with buckle (#1336)
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using Content.Shared.GameObjects.EntitySystems;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Interfaces.GameObjects;
|
||||
using Robust.Shared.Serialization;
|
||||
|
||||
namespace Content.Shared.GameObjects.Components.Buckle
|
||||
@@ -50,4 +51,62 @@ namespace Content.Shared.GameObjects.Components.Buckle
|
||||
{
|
||||
Buckled
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public abstract class BuckleChangeMessage : ComponentMessage
|
||||
{
|
||||
/// <summary>
|
||||
/// Constructs a new instance of <see cref="BuckleChangeMessage"/>
|
||||
/// </summary>
|
||||
/// <param name="entity">The entity that had its buckling status changed</param>
|
||||
/// <param name="strap">The strap that the entity was buckled to or unbuckled from</param>
|
||||
/// <param name="buckled">True if the entity was buckled, false otherwise</param>
|
||||
protected BuckleChangeMessage(IEntity entity, IEntity strap, bool buckled)
|
||||
{
|
||||
Entity = entity;
|
||||
Strap = strap;
|
||||
Buckled = buckled;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The entity that had its buckling status changed
|
||||
/// </summary>
|
||||
public IEntity Entity { get; }
|
||||
|
||||
/// <summary>
|
||||
/// The strap that the entity was buckled to or unbuckled from
|
||||
/// </summary>
|
||||
public IEntity Strap { get; }
|
||||
|
||||
/// <summary>
|
||||
/// True if the entity was buckled, false otherwise.
|
||||
/// </summary>
|
||||
public bool Buckled { get; }
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public class BuckleMessage : BuckleChangeMessage
|
||||
{
|
||||
/// <summary>
|
||||
/// Constructs a new instance of <see cref="BuckleMessage"/>
|
||||
/// </summary>
|
||||
/// <param name="entity">The entity that had its buckling status changed</param>
|
||||
/// <param name="strap">The strap that the entity was buckled to or unbuckled from</param>
|
||||
public BuckleMessage(IEntity entity, IEntity strap) : base(entity, strap, true)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public class UnbuckleMessage : BuckleChangeMessage
|
||||
{
|
||||
/// <summary>
|
||||
/// Constructs a new instance of <see cref="UnbuckleMessage"/>
|
||||
/// </summary>
|
||||
/// <param name="entity">The entity that had its buckling status changed</param>
|
||||
/// <param name="strap">The strap that the entity was buckled to or unbuckled from</param>
|
||||
public UnbuckleMessage(IEntity entity, IEntity strap) : base(entity, strap, false)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,5 +58,6 @@ namespace Content.Shared.GameObjects.Components.Mobs
|
||||
Thirst,
|
||||
Stun,
|
||||
Buckled,
|
||||
Piloting
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Interfaces.GameObjects;
|
||||
using Robust.Shared.Serialization;
|
||||
|
||||
namespace Content.Shared.GameObjects.Components.Strap
|
||||
@@ -29,9 +30,81 @@ namespace Content.Shared.GameObjects.Components.Strap
|
||||
public sealed override uint? NetID => ContentNetIDs.STRAP;
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class StrapComponentState : ComponentState
|
||||
{
|
||||
public StrapComponentState(StrapPosition position) : base(ContentNetIDs.BUCKLE)
|
||||
{
|
||||
Position = position;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The change in position that this strap makes to the strapped mob
|
||||
/// </summary>
|
||||
public StrapPosition Position { get; }
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public enum StrapVisuals
|
||||
{
|
||||
RotationAngle
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public abstract class StrapChangeMessage : ComponentMessage
|
||||
{
|
||||
/// <summary>
|
||||
/// Constructs a new instance of <see cref="StrapChangeMessage"/>
|
||||
/// </summary>
|
||||
/// <param name="entity">The entity that had its buckling status changed</param>
|
||||
/// <param name="strap">The strap that the entity was buckled to or unbuckled from</param>
|
||||
/// <param name="buckled">True if the entity was buckled, false otherwise</param>
|
||||
protected StrapChangeMessage(IEntity entity, IEntity strap, bool buckled)
|
||||
{
|
||||
Entity = entity;
|
||||
Strap = strap;
|
||||
Buckled = buckled;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The entity that had its buckling status changed
|
||||
/// </summary>
|
||||
public IEntity Entity { get; }
|
||||
|
||||
/// <summary>
|
||||
/// The strap that the entity was buckled to or unbuckled from
|
||||
/// </summary>
|
||||
public IEntity Strap { get; }
|
||||
|
||||
/// <summary>
|
||||
/// True if the entity was buckled, false otherwise.
|
||||
/// </summary>
|
||||
public bool Buckled { get; }
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public class StrapMessage : StrapChangeMessage
|
||||
{
|
||||
/// <summary>
|
||||
/// Constructs a new instance of <see cref="StrapMessage"/>
|
||||
/// </summary>
|
||||
/// <param name="entity">The entity that had its buckling status changed</param>
|
||||
/// <param name="strap">The strap that the entity was buckled to or unbuckled from</param>
|
||||
public StrapMessage(IEntity entity, IEntity strap) : base(entity, strap, true)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public class UnStrapMessage : StrapChangeMessage
|
||||
{
|
||||
/// <summary>
|
||||
/// Constructs a new instance of <see cref="UnStrapMessage"/>
|
||||
/// </summary>
|
||||
/// <param name="entity">The entity that had its buckling status changed</param>
|
||||
/// <param name="strap">The strap that the entity was buckled to or unbuckled from</param>
|
||||
public UnStrapMessage(IEntity entity, IEntity strap) : base(entity, strap, false)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user