Engine Entity Anchoring Changes (#4195)
* Converted all SnapGridPositionChangedEvent subscriptions to AnchorStateChangedEvent. * Fixes power tests with new anchored requirements. * Moved AnchorableComponent into construction. AnchorableComponent now uses Transform.Anchored. * Fixed bug with nodes, power works again. * Adds lifetime stages to Component. * Update Engine to v0.4.70.
This commit is contained in:
207
Content.Server/Construction/Components/AnchorableComponent.cs
Normal file
207
Content.Server/Construction/Components/AnchorableComponent.cs
Normal file
@@ -0,0 +1,207 @@
|
||||
#nullable enable
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Content.Server.Coordinates.Helpers;
|
||||
using Content.Server.Pulling;
|
||||
using Content.Server.Tools.Components;
|
||||
using Content.Shared.Interaction;
|
||||
using Content.Shared.Tool;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Physics;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
using Robust.Shared.ViewVariables;
|
||||
|
||||
namespace Content.Server.Construction.Components
|
||||
{
|
||||
// TODO: Move this component's logic to an EntitySystem.
|
||||
[RegisterComponent]
|
||||
public class AnchorableComponent : Component, IInteractUsing
|
||||
{
|
||||
public override string Name => "Anchorable";
|
||||
|
||||
[ViewVariables]
|
||||
[DataField("tool")]
|
||||
public ToolQuality Tool { get; private set; } = ToolQuality.Anchoring;
|
||||
|
||||
[ViewVariables]
|
||||
int IInteractUsing.Priority => 1;
|
||||
|
||||
[ViewVariables(VVAccess.ReadWrite)]
|
||||
[DataField("snap")]
|
||||
public bool Snap { get; private set; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// Checks if a tool can change the anchored status.
|
||||
/// </summary>
|
||||
/// <param name="user">The user doing the action</param>
|
||||
/// <param name="utilizing">The tool being used</param>
|
||||
/// <param name="anchoring">True if we're anchoring, and false if we're unanchoring.</param>
|
||||
/// <returns>true if it is valid, false otherwise</returns>
|
||||
private async Task<bool> Valid(IEntity user, IEntity utilizing, bool anchoring)
|
||||
{
|
||||
if (!Owner.HasComponent<IPhysBody>())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
BaseAnchoredAttemptEvent attempt =
|
||||
anchoring ? new AnchorAttemptEvent(user, utilizing) : new UnanchorAttemptEvent(user, utilizing);
|
||||
|
||||
// Need to cast the event or it will be raised as BaseAnchoredAttemptEvent.
|
||||
if (anchoring)
|
||||
Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, (AnchorAttemptEvent) attempt, false);
|
||||
else
|
||||
Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, (UnanchorAttemptEvent) attempt, false);
|
||||
|
||||
if (attempt.Cancelled)
|
||||
return false;
|
||||
|
||||
return utilizing.TryGetComponent(out ToolComponent? tool) && await tool.UseTool(user, Owner, 0.5f + attempt.Delay, Tool);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Tries to anchor the owner of this component.
|
||||
/// </summary>
|
||||
/// <param name="user">The entity doing the anchoring</param>
|
||||
/// <param name="utilizing">The tool being used</param>
|
||||
/// <returns>true if anchored, false otherwise</returns>
|
||||
public async Task<bool> TryAnchor(IEntity user, IEntity utilizing)
|
||||
{
|
||||
if (!(await Valid(user, utilizing, true)))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Snap rotation to cardinal (multiple of 90)
|
||||
var rot = Owner.Transform.LocalRotation;
|
||||
Owner.Transform.LocalRotation = Math.Round(rot / (Math.PI / 2)) * (Math.PI / 2);
|
||||
|
||||
if (Owner.TryGetComponent(out PullableComponent? pullableComponent))
|
||||
{
|
||||
if (pullableComponent.Puller != null)
|
||||
{
|
||||
pullableComponent.TryStopPull();
|
||||
}
|
||||
}
|
||||
|
||||
if (Snap)
|
||||
Owner.SnapToGrid(Owner.EntityManager);
|
||||
|
||||
Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new BeforeAnchoredEvent(user, utilizing), false);
|
||||
|
||||
Owner.Transform.Anchored = true;
|
||||
|
||||
Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new AnchoredEvent(user, utilizing), false);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Tries to unanchor the owner of this component.
|
||||
/// </summary>
|
||||
/// <param name="user">The entity doing the unanchoring</param>
|
||||
/// <param name="utilizing">The tool being used, if any</param>
|
||||
/// <param name="force">Whether or not to ignore valid tool checks</param>
|
||||
/// <returns>true if unanchored, false otherwise</returns>
|
||||
public async Task<bool> TryUnAnchor(IEntity user, IEntity utilizing)
|
||||
{
|
||||
if (!(await Valid(user, utilizing, false)))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new BeforeUnanchoredEvent(user, utilizing), false);
|
||||
|
||||
Owner.Transform.Anchored = false;
|
||||
|
||||
Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new UnanchoredEvent(user, utilizing), false);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Tries to toggle the anchored status of this component's owner.
|
||||
/// </summary>
|
||||
/// <param name="user">The entity doing the unanchoring</param>
|
||||
/// <param name="utilizing">The tool being used</param>
|
||||
/// <returns>true if toggled, false otherwise</returns>
|
||||
public async Task<bool> TryToggleAnchor(IEntity user, IEntity utilizing)
|
||||
{
|
||||
return Owner.Transform.Anchored ?
|
||||
await TryUnAnchor(user, utilizing) :
|
||||
await TryAnchor(user, utilizing);
|
||||
}
|
||||
|
||||
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
|
||||
{
|
||||
return await TryToggleAnchor(eventArgs.User, eventArgs.Using);
|
||||
}
|
||||
}
|
||||
|
||||
public abstract class BaseAnchoredAttemptEvent : CancellableEntityEventArgs
|
||||
{
|
||||
public IEntity User { get; }
|
||||
public IEntity Tool { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Extra delay to add to the do_after.
|
||||
/// Add to this, don't replace it.
|
||||
/// Output parameter.
|
||||
/// </summary>
|
||||
public float Delay { get; set; } = 0f;
|
||||
|
||||
protected BaseAnchoredAttemptEvent(IEntity user, IEntity tool)
|
||||
{
|
||||
User = user;
|
||||
Tool = tool;
|
||||
}
|
||||
}
|
||||
|
||||
public class AnchorAttemptEvent : BaseAnchoredAttemptEvent
|
||||
{
|
||||
public AnchorAttemptEvent(IEntity user, IEntity tool) : base(user, tool) { }
|
||||
}
|
||||
|
||||
public class UnanchorAttemptEvent : BaseAnchoredAttemptEvent
|
||||
{
|
||||
public UnanchorAttemptEvent(IEntity user, IEntity tool) : base(user, tool) { }
|
||||
}
|
||||
|
||||
public abstract class BaseAnchoredEvent : EntityEventArgs
|
||||
{
|
||||
public IEntity User { get; }
|
||||
public IEntity Tool { get; }
|
||||
|
||||
protected BaseAnchoredEvent(IEntity user, IEntity tool)
|
||||
{
|
||||
User = user;
|
||||
Tool = tool;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Raised just before the entity's body type is changed.
|
||||
/// </summary>
|
||||
public class BeforeAnchoredEvent : BaseAnchoredEvent
|
||||
{
|
||||
public BeforeAnchoredEvent(IEntity user, IEntity tool) : base(user, tool) { }
|
||||
}
|
||||
|
||||
public class AnchoredEvent : BaseAnchoredEvent
|
||||
{
|
||||
public AnchoredEvent(IEntity user, IEntity tool) : base(user, tool) { }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Raised just before the entity's body type is changed.
|
||||
/// </summary>
|
||||
public class BeforeUnanchoredEvent : BaseAnchoredEvent
|
||||
{
|
||||
public BeforeUnanchoredEvent(IEntity user, IEntity tool) : base(user, tool) { }
|
||||
}
|
||||
|
||||
public class UnanchoredEvent : BaseAnchoredEvent
|
||||
{
|
||||
public UnanchoredEvent(IEntity user, IEntity tool) : base(user, tool) { }
|
||||
}
|
||||
}
|
||||
@@ -464,7 +464,7 @@ namespace Content.Server.Construction.Components
|
||||
return _containers.Add(id);
|
||||
}
|
||||
|
||||
public override void Initialize()
|
||||
protected override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ namespace Content.Server.Construction.Components
|
||||
private Container _boardContainer = default!;
|
||||
private Container _partContainer = default!;
|
||||
|
||||
public override void Initialize()
|
||||
protected override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ namespace Content.Server.Construction.Components
|
||||
|
||||
public IReadOnlyDictionary<string, GenericPartInfo> TagRequirements => _tagRequirements;
|
||||
|
||||
public override void Initialize()
|
||||
protected override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user