tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove mob pushing (#13191)

Browse Source
This commit is contained in:
metalgearsloth
2022-12-27 12:47:59 +11:00
committed by GitHub
parent 181e16db53
commit 95e72e61d8
2 changed files with 0 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Content.Shared/Movement/Systems/SharedMoverController.Pushing.cs
View File

@@ -1,59 +0,0 @@
using Content.Shared.CCVar;
using Content.Shared.Movement.Components;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Dynamics;
namespace Content.Shared.Movement.Systems;
public abstract partial class SharedMoverController
{
private bool _pushingEnabled;
private void InitializePushing()
{
_configManager.OnValueChanged(CCVars.MobPushing, SetPushing, true);
}
private void SetPushing(bool value)
{
if (_pushingEnabled == value) return;
_pushingEnabled = value;
if (_pushingEnabled)
{
PhysicsSystem.KinematicControllerCollision += OnMobCollision;
}
else
{
PhysicsSystem.KinematicControllerCollision -= OnMobCollision;
}
}
private void ShutdownPushing()
{
if (_pushingEnabled)
PhysicsSystem.KinematicControllerCollision -= OnMobCollision;
_configManager.UnsubValueChanged(CCVars.MobPushing, SetPushing);
}
/// <summary>
/// Fake pushing for player collisions.
/// </summary>
private void OnMobCollision(Fixture ourFixture, Fixture otherFixture, float frameTime, Vector2 worldNormal)
{
if (!_pushingEnabled)
return;
var otherBody = otherFixture.Body;
if (otherBody.BodyType != BodyType.Dynamic || !otherFixture.Hard)
return;
if (!EntityManager.TryGetComponent(ourFixture.Body.Owner, out MobMoverComponent? mobMover) || worldNormal == Vector2.Zero)
return;
PhysicsSystem.ApplyLinearImpulse(otherBody, -worldNormal * mobMover.PushStrengthVV * frameTime);
}
}

2
Content.Shared/Movement/Systems/SharedMoverController.cs
View File

@@ -69,7 +69,6 @@ namespace Content.Shared.Movement.Systems
InitializeFootsteps(); InitializeFootsteps();
InitializeInput(); InitializeInput();
InitializeMob(); InitializeMob();
InitializePushing();
InitializeRelay(); InitializeRelay();
_configManager.OnValueChanged(CCVars.RelativeMovement, SetRelativeMovement, true); _configManager.OnValueChanged(CCVars.RelativeMovement, SetRelativeMovement, true);
_configManager.OnValueChanged(CCVars.StopSpeed, SetStopSpeed, true); _configManager.OnValueChanged(CCVars.StopSpeed, SetStopSpeed, true);
@@ -83,7 +82,6 @@ namespace Content.Shared.Movement.Systems
{ {
base.Shutdown(); base.Shutdown();
ShutdownInput(); ShutdownInput();
ShutdownPushing();
_configManager.UnsubValueChanged(CCVars.RelativeMovement, SetRelativeMovement); _configManager.UnsubValueChanged(CCVars.RelativeMovement, SetRelativeMovement);
_configManager.UnsubValueChanged(CCVars.StopSpeed, SetStopSpeed); _configManager.UnsubValueChanged(CCVars.StopSpeed, SetStopSpeed);
} }