380d76f4cd
* Pulling: Migrate critical pull state from PullController to SharedPullableComponent, fixing two bugs in the process Bug 1: PullController can be just summoned for no reason when the verb is queried Bug 2: PullController keeps it's own independent pull state which can (and will) go out of sync (See https://github.com/space-wizards/space-station-14/issues/2619 ) * Pulling: Fix issues with previous commit (or possibly in general?) causing transferring a pull to cause alerts to go wrong The primary problem is that there is one "pulling slot" for a puller, so SharedPullableComponent needs to stop the existing pull. * Pulling: Remove debug logs (whoops)
97 lines
2.8 KiB
C#
97 lines
2.8 KiB
C#
#nullable enable
|
|
using Content.Shared.Alert;
|
|
using Content.Shared.GameObjects.Components.Mobs;
|
|
using Content.Shared.GameObjects.Components.Movement;
|
|
using Content.Shared.GameObjects.EntitySystems;
|
|
using Content.Shared.Physics.Pull;
|
|
using Robust.Shared.GameObjects;
|
|
using Robust.Shared.GameObjects.Systems;
|
|
using Robust.Shared.Interfaces.GameObjects;
|
|
using Component = Robust.Shared.GameObjects.Component;
|
|
using Robust.Shared.Log;
|
|
|
|
namespace Content.Shared.GameObjects.Components.Pulling
|
|
{
|
|
[RegisterComponent]
|
|
public class SharedPullerComponent : Component, IMoveSpeedModifier
|
|
{
|
|
public override string Name => "Puller";
|
|
|
|
private IEntity? _pulling;
|
|
|
|
public float WalkSpeedModifier => Pulling == null ? 1.0f : 0.75f;
|
|
|
|
public float SprintSpeedModifier => Pulling == null ? 1.0f : 0.75f;
|
|
|
|
public IEntity? Pulling
|
|
{
|
|
get => _pulling;
|
|
private set
|
|
{
|
|
if (_pulling == value)
|
|
{
|
|
return;
|
|
}
|
|
|
|
_pulling = value;
|
|
|
|
if (Owner.TryGetComponent(out MovementSpeedModifierComponent? speed))
|
|
{
|
|
speed.RefreshMovementSpeedModifiers();
|
|
}
|
|
}
|
|
}
|
|
|
|
public override void OnRemove()
|
|
{
|
|
if (Pulling != null &&
|
|
Pulling.TryGetComponent(out SharedPullableComponent? pullable))
|
|
{
|
|
pullable.TryStopPull();
|
|
}
|
|
|
|
base.OnRemove();
|
|
}
|
|
|
|
public override void HandleMessage(ComponentMessage message, IComponent? component)
|
|
{
|
|
base.HandleMessage(message, component);
|
|
|
|
if (message is not PullMessage pullMessage ||
|
|
pullMessage.Puller.Owner != Owner)
|
|
{
|
|
return;
|
|
}
|
|
|
|
SharedAlertsComponent? ownerStatus = Owner.GetComponentOrNull<SharedAlertsComponent>();
|
|
|
|
switch (message)
|
|
{
|
|
case PullStartedMessage msg:
|
|
Pulling = msg.Pulled.Owner;
|
|
if (ownerStatus != null)
|
|
{
|
|
ownerStatus.ShowAlert(AlertType.Pulling, onClickAlert: OnClickAlert);
|
|
}
|
|
break;
|
|
case PullStoppedMessage _:
|
|
Pulling = null;
|
|
if (ownerStatus != null)
|
|
{
|
|
ownerStatus.ClearAlert(AlertType.Pulling);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
private void OnClickAlert(ClickAlertEventArgs args)
|
|
{
|
|
EntitySystem
|
|
.Get<SharedPullingSystem>()
|
|
.GetPulled(args.Player)?
|
|
.GetComponentOrNull<SharedPullableComponent>()?
|
|
.TryStopPull();
|
|
}
|
|
}
|
|
}
|