Stair improvements, inventory "tooltip" & condition progressbar, reactor tries to match the highest load of the connected junction boxes (instead of the sum of the loads)

2015-11-25 17:58:17 +02:00
parent 4b5126675c
commit f1e1b0b4f0
9 changed files with 65 additions and 187 deletions
@@ -303,6 +303,11 @@ namespace Barotrauma
            }
            else if (structure.StairDirection!=Direction.None && lowestLimb != null)
            {
+                float stairPosY = structure.StairDirection == Direction.Right ? 
+                    lowestLimb.Position.X - structure.Rect.X : structure.Rect.Width - (lowestLimb.Position.X - structure.Rect.X);
+
+                if (lowestLimb.Position.Y < stairPosY) return;
+
                if (targetMovement.Y < 0.5f)
                {
                    if (inWater || lowestLimb.Position.Y < structure.Rect.Y - structure.Rect.Height + 50.0f)