Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

StunnableComponent cleanup, proper prediction for stuns and slips. (#3552)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-03-08 05:00:50 +01:00
committed by GitHub
parent 0ad70d62ec
commit 6c77801d90
13 changed files with 243 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Reflection;

161
Content.Shared/GameObjects/Components/Mobs/SharedStunnableComponent.cs
View File

@@ -1,12 +1,15 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.Threading;
using Content.Shared.Alert;
using Content.Shared.GameObjects.Components.Mobs.State;
using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Players;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Timing;
@@ -22,17 +25,21 @@ namespace Content.Shared.GameObjects.Components.Mobs
public sealed override string Name => "Stunnable";
public override uint? NetID => ContentNetIDs.STUNNABLE;
protected TimeSpan? LastStun;
public (TimeSpan Start, TimeSpan End)? StunnedTimer { get; protected set; }
public (TimeSpan Start, TimeSpan End)? KnockdownTimer { get; protected set; }
public (TimeSpan Start, TimeSpan End)? SlowdownTimer { get; protected set; }
[ViewVariables] protected TimeSpan? StunStart => LastStun;
[ViewVariables] public float StunnedSeconds =>
StunnedTimer == null ? 0f : (float)(StunnedTimer.Value.End - StunnedTimer.Value.Start).TotalSeconds;
[ViewVariables] public float KnockdownSeconds =>
KnockdownTimer == null ? 0f : (float)(KnockdownTimer.Value.End - KnockdownTimer.Value.Start).TotalSeconds;
[ViewVariables] public float SlowdownSeconds =>
SlowdownTimer == null ? 0f : (float)(SlowdownTimer.Value.End - SlowdownTimer.Value.Start).TotalSeconds;
[ViewVariables]
protected TimeSpan? StunEnd => LastStun == null
? (TimeSpan?) null
: _gameTiming.CurTime +
(TimeSpan.FromSeconds(Math.Max(StunnedTimer, Math.Max(KnockdownTimer, SlowdownTimer))));
private bool _canHelp = true;
[ViewVariables] public bool AnyStunActive => Stunned || KnockedDown || SlowedDown;
[ViewVariables] public bool Stunned => StunnedTimer != null;
[ViewVariables] public bool KnockedDown => KnockdownTimer != null;
[ViewVariables] public bool SlowedDown => SlowdownTimer != null;
[DataField("stunCap")]
protected float _stunCap = 20f;
@@ -48,21 +55,15 @@ namespace Content.Shared.GameObjects.Components.Mobs
[DataField("helpInterval")]
private float _helpInterval = 1f;
protected float StunnedTimer;
protected float KnockdownTimer;
protected float SlowdownTimer;
[DataField("stunAlertId")] private string _stunAlertId = "stun";
private bool _canHelp = true;
protected CancellationTokenSource StatusRemoveCancellation = new();
[ViewVariables] protected float WalkModifierOverride = 0f;
[ViewVariables] protected float RunModifierOverride = 0f;
[ViewVariables] public bool Stunned => StunnedTimer > 0f;
[ViewVariables] public bool KnockedDown => KnockdownTimer > 0f;
[ViewVariables] public bool SlowedDown => SlowdownTimer > 0f;
private float StunTimeModifier
{
get
@@ -118,15 +119,14 @@ namespace Content.Shared.GameObjects.Components.Mobs
/// <returns>Whether or not the owner was stunned.</returns>
public bool Stun(float seconds)
{
seconds = MathF.Min(StunnedTimer + (seconds * StunTimeModifier), _stunCap);
seconds = MathF.Min(StunnedSeconds + (seconds * StunTimeModifier), _stunCap);
if (seconds <= 0f)
{
return false;
}
StunnedTimer = seconds;
LastStun = _gameTiming.CurTime;
StunnedTimer = (_gameTiming.CurTime, _gameTiming.CurTime.Add(TimeSpan.FromSeconds(seconds)));
SetAlert();
OnStun();
@@ -145,15 +145,14 @@ namespace Content.Shared.GameObjects.Components.Mobs
/// <returns>Whether or not the owner was knocked down.</returns>
public bool Knockdown(float seconds)
{
seconds = MathF.Min(KnockdownTimer + (seconds * KnockdownTimeModifier), _knockdownCap);
seconds = MathF.Min(KnockdownSeconds + (seconds * KnockdownTimeModifier), _knockdownCap);
if (seconds <= 0f)
{
return false;
}
KnockdownTimer = seconds;
LastStun = _gameTiming.CurTime;
KnockdownTimer = (_gameTiming.CurTime, _gameTiming.CurTime.Add(TimeSpan.FromSeconds(seconds)));;
SetAlert();
OnKnockdown();
@@ -183,7 +182,7 @@ namespace Content.Shared.GameObjects.Components.Mobs
/// <param name="runModifierOverride">Run speed modifier. Set to 0 or negative for default value. (0.5f)</param>
public void Slowdown(float seconds, float walkModifierOverride = 0f, float runModifierOverride = 0f)
{
seconds = MathF.Min(SlowdownTimer + (seconds * SlowdownTimeModifier), _slowdownCap);
seconds = MathF.Min(SlowdownSeconds + (seconds * SlowdownTimeModifier), _slowdownCap);
if (seconds <= 0f)
return;
@@ -191,8 +190,7 @@ namespace Content.Shared.GameObjects.Components.Mobs
WalkModifierOverride = walkModifierOverride;
RunModifierOverride = runModifierOverride;
SlowdownTimer = seconds;
LastStun = _gameTiming.CurTime;
SlowdownTimer = (_gameTiming.CurTime, _gameTiming.CurTime.Add(TimeSpan.FromSeconds(seconds)));
if (Owner.TryGetComponent(out MovementSpeedModifierComponent? movement))
movement.RefreshMovementSpeedModifiers();
@@ -201,6 +199,44 @@ namespace Content.Shared.GameObjects.Components.Mobs
Dirty();
}
private (TimeSpan, TimeSpan)? GetTimers()
{
// Don't do anything if no stuns are applied.
if (!AnyStunActive)
return null;
TimeSpan start = TimeSpan.MaxValue, end = TimeSpan.MinValue;
if (StunnedTimer != null)
{
if (StunnedTimer.Value.Start < start)
start = StunnedTimer.Value.Start;
if (StunnedTimer.Value.End > end)
end = StunnedTimer.Value.End;
}
if (KnockdownTimer != null)
{
if (KnockdownTimer.Value.Start < start)
start = KnockdownTimer.Value.Start;
if (KnockdownTimer.Value.End > end)
end = KnockdownTimer.Value.End;
}
if (SlowdownTimer != null)
{
if (SlowdownTimer.Value.Start < start)
start = SlowdownTimer.Value.Start;
if (SlowdownTimer.Value.End > end)
end = SlowdownTimer.Value.End;
}
return (start, end);
}
private void SetAlert()
{
if (!Owner.TryGetComponent(out SharedAlertsComponent? status))
@@ -208,8 +244,12 @@ namespace Content.Shared.GameObjects.Components.Mobs
return;
}
status.ShowAlert(AlertType.Stun, cooldown:
(StunStart == null || StunEnd == null) ? default : (StunStart.Value, StunEnd.Value));
var timers = GetTimers();
if (timers == null)
return;
status.ShowAlert(AlertType.Stun, cooldown:timers);
StatusRemoveCancellation.Cancel();
StatusRemoveCancellation = new CancellationTokenSource();
}
@@ -226,7 +266,7 @@ namespace Content.Shared.GameObjects.Components.Mobs
_canHelp = false;
Owner.SpawnTimer((int) _helpInterval * 1000, () => _canHelp = true);
KnockdownTimer -= _helpKnockdownRemove;
KnockdownTimer = (KnockdownTimer!.Value.Start, KnockdownTimer.Value.End.Subtract(TimeSpan.FromSeconds(_helpInterval)));
OnInteractHand();
@@ -236,6 +276,59 @@ namespace Content.Shared.GameObjects.Components.Mobs
return true;
}
public override ComponentState GetComponentState(ICommonSession player)
{
return new StunnableComponentState(StunnedTimer, KnockdownTimer, SlowdownTimer, WalkModifierOverride, RunModifierOverride);
}
protected virtual void OnKnockdownEnd()
{
}
public void Update(float delta)
{
var curTime = _gameTiming.CurTime;
if (StunnedTimer != null)
{
if (StunnedTimer.Value.End <= curTime)
{
StunnedTimer = null;
Dirty();
}
}
if (KnockdownTimer != null)
{
if (KnockdownTimer.Value.End <= curTime)
{
OnKnockdownEnd();
KnockdownTimer = null;
Dirty();
}
}
if (SlowdownTimer != null)
{
if (SlowdownTimer.Value.End <= curTime)
{
if (Owner.TryGetComponent(out MovementSpeedModifierComponent? movement))
{
movement.RefreshMovementSpeedModifiers();
}
SlowdownTimer = null;
Dirty();
}
}
if (AnyStunActive || !Owner.TryGetComponent(out SharedAlertsComponent? status) || !status.IsShowingAlert(AlertType.Stun))
return;
status.ClearAlert(AlertType.Stun);
}
#region ActionBlockers
public bool CanMove() => (!Stunned);
@@ -273,13 +366,15 @@ namespace Content.Shared.GameObjects.Components.Mobs
[Serializable, NetSerializable]
protected sealed class StunnableComponentState : ComponentState
{
public float StunnedTimer { get; }
public float KnockdownTimer { get; }
public float SlowdownTimer { get; }
public (TimeSpan Start, TimeSpan End)? StunnedTimer { get; }
public (TimeSpan Start, TimeSpan End)? KnockdownTimer { get; }
public (TimeSpan Start, TimeSpan End)? SlowdownTimer { get; }
public float WalkModifierOverride { get; }
public float RunModifierOverride { get; }
public StunnableComponentState(float stunnedTimer, float knockdownTimer, float slowdownTimer, float walkModifierOverride, float runModifierOverride) : base(ContentNetIDs.STUNNABLE)
public StunnableComponentState(
(TimeSpan Start, TimeSpan End)? stunnedTimer, (TimeSpan Start, TimeSpan End)? knockdownTimer,
(TimeSpan Start, TimeSpan End)? slowdownTimer, float walkModifierOverride, float runModifierOverride) : base(ContentNetIDs.STUNNABLE)
{
StunnedTimer = stunnedTimer;
KnockdownTimer = knockdownTimer;

13
Content.Shared/GameObjects/Components/Movement/NoSlipComponent.cs Normal file
View File

@@ -0,0 +1,13 @@
using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
using Robust.Shared.GameObjects;
namespace Content.Shared.GameObjects.Components.Movement
{
[RegisterComponent]
public class NoSlipComponent : Component, IEffectBlocker
{
public override string Name => "NoSlip";
bool IEffectBlocker.CanSlip() => false;
}
}

87
Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs
View File

@@ -7,6 +7,7 @@ using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
using Content.Shared.Physics;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Collision;
using Robust.Shared.Serialization;
@@ -19,6 +20,12 @@ namespace Content.Shared.GameObjects.Components.Movement
{
public sealed override string Name => "Slippery";
protected float _paralyzeTime = 3f;
protected float _intersectPercentage = 0.3f;
protected float _requiredSlipSpeed = 0.1f;
protected float _launchForwardsMultiplier = 1f;
protected bool _slippery = true;
/// <summary>
/// The list of entities that have been slipped by this component,
/// and which have not stopped colliding with its owner yet.
@@ -30,35 +37,85 @@ namespace Content.Shared.GameObjects.Components.Movement
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("paralyzeTime")]
public virtual float ParalyzeTime { get; set; } = 3f;
public float ParalyzeTime
{
get => _paralyzeTime;
set
{
if (MathHelper.CloseTo(_paralyzeTime, value)) return;
_paralyzeTime = value;
Dirty();
}
}
/// <summary>
/// Percentage of shape intersection for a slip to occur.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("intersectPercentage")]
public virtual float IntersectPercentage { get; set; } = 0.3f;
public float IntersectPercentage
{
get => _intersectPercentage;
set
{
if (MathHelper.CloseTo(_intersectPercentage, value)) return;
_intersectPercentage = value;
Dirty();
}
}
/// <summary>
/// Entities will only be slipped if their speed exceeds this limit.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("requiredSlipSpeed")]
public virtual float RequiredSlipSpeed { get; set; } = 0.1f;
public float RequiredSlipSpeed
{
get => _requiredSlipSpeed;
set
{
if (MathHelper.CloseTo(_requiredSlipSpeed, value)) return;
_requiredSlipSpeed = value;
Dirty();
}
}
/// <summary>
/// The entity's speed will be multiplied by this to slip it forwards.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("launchForwardsMultiplier")]
public virtual float LaunchForwardsMultiplier { get; set; } = 1f;
public float LaunchForwardsMultiplier
{
get => _launchForwardsMultiplier;
set
{
if (MathHelper.CloseTo(_launchForwardsMultiplier, value)) return;
_launchForwardsMultiplier = value;
Dirty();
}
}
/// <summary>
/// Whether or not this component will try to slip entities.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("slippery")]
public virtual bool Slippery { get; set; } = true;
public bool Slippery
{
get => _slippery;
set
{
if (_slippery == value) return;
_slippery = value;
Dirty();
}
}
private bool TrySlip(IPhysBody ourBody, IPhysBody otherBody)
{
@@ -106,6 +163,9 @@ namespace Content.Shared.GameObjects.Components.Movement
public void Update()
{
if (!Slippery)
return;
foreach (var uid in _slipped.ToArray())
{
if (!uid.IsValid() || !Owner.EntityManager.EntityExists(uid))
@@ -124,23 +184,6 @@ namespace Content.Shared.GameObjects.Components.Movement
}
}
}
public override void Initialize()
{
base.Initialize();
var physics = Owner.EnsureComponent<PhysicsComponent>();
physics.Hard = false;
var fixtures = physics.Fixtures.FirstOrDefault();
if (fixtures != null)
{
fixtures.CollisionLayer |= (int) CollisionGroup.SmallImpassable;
fixtures.CollisionMask = (int) CollisionGroup.None;
}
}
}
[Serializable, NetSerializable]