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

Fixes explosive depressurization and improves high pressure movements (#1683)

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-08-15 22:43:55 +02:00
committed by GitHub
parent 33baa73f06
commit a7fc2bccbd
2 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Content.Server/Atmos/HighPressureMovementController.cs
View File

@@ -49,19 +49,23 @@ namespace Content.Server.Atmos
{
if (maxForce > ThrowForce && throwTarget != GridCoordinates.InvalidGrid)
if (maxForce > ThrowForce)
{
var moveForce = MathF.Min(maxForce * FloatMath.Clamp(moveProb, 0, 100) / 100f, 50f);
var pos = throwTarget.Position - transform.GridPosition.Position;
LinearVelocity = pos * moveForce;
}
else
{
var moveForce = MathF.Min(maxForce * FloatMath.Clamp(moveProb, 0, 100) / 100f, 25f);
LinearVelocity = direction.ToVec() * moveForce;
}
if (throwTarget != GridCoordinates.InvalidGrid)
{
var moveForce = maxForce * FloatMath.Clamp(moveProb, 0, 100) / 150f;
var pos = ((throwTarget.Position - transform.GridPosition.Position).Normalized + direction.ToVec()).Normalized;
LinearVelocity = pos * moveForce;
}
pressureComponent.LastHighPressureMovementAirCycle = cycle;
else
{
var moveForce = MathF.Min(maxForce * FloatMath.Clamp(moveProb, 0, 100) / 2500f, 20f);
LinearVelocity = direction.ToVec() * moveForce;
}
pressureComponent.LastHighPressureMovementAirCycle = cycle;
}
}
}
@@ -72,7 +76,7 @@ namespace Content.Server.Atmos
if (ControlledComponent != null && !_physicsManager.IsWeightless(ControlledComponent.Owner.Transform.GridPosition))
{
LinearVelocity *= 0.85f;
if (LinearVelocity.Length < 1f)
if (MathF.Abs(LinearVelocity.Length) < 1f)
Stop();
}
}