vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
Regalis
2016-10-14 01:10:46 +03:00
parent 62c88be214
commit 9d9c50a520
3 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Animation/Ragdoll.cs
+20 -10
View File
@@ -361,20 +361,30 @@ namespace Barotrauma
}
else if (structure.StairDirection != Direction.None)
{
stairs = null;
//---------------
float stairBottomPos = ConvertUnits.ToSimUnits(structure.Rect.Y - structure.Rect.Height + 10);
if (colliderBottom.Y < stairBottomPos && targetMovement.Y < 0.5f)
{
stairs = null;
return false;
}
if (colliderBottom.Y < stairBottomPos && targetMovement.Y < 0.5f) return false;
if (targetMovement.Y >= 0.0f && colliderBottom.Y > ConvertUnits.ToSimUnits(structure.Rect.Y - Submarine.GridSize.Y * 8.0f))
{
stairs = null;
return false;
}
//---------------
if (targetMovement.Y >= 0.0f && colliderBottom.Y >= ConvertUnits.ToSimUnits(structure.Rect.Y - Submarine.GridSize.Y*5)) return false;
//---------------
if (contact.Manifold.LocalNormal.Y < 0.0f) return false;
//---------------
Vector2 normal; FarseerPhysics.Common.FixedArray2<Vector2> points;
contact.GetWorldManifold(out normal, out points);
if (points[0].Y > collider.SimPosition.Y) return false;
//---------------
stairs = structure;
//float stairPosY = structure.StairDirection == Direction.Right ?