(f2e516dfe) v0.9.3.2

2019-09-20 20:11:18 +03:00
parent 80698b58b0
commit 9aa12bcac2
144 changed files with 1653 additions and 1559 deletions
@@ -387,14 +387,17 @@ namespace Barotrauma

        private void UpdateIdle(float deltaTime)
        {
-            if (Character.Submarine == null && SimPosition.Y < ConvertUnits.ToSimUnits(Character.CharacterHealth.CrushDepth * 0.75f))
+            if (Character.Submarine == null && 
+                SimPosition.Y < ConvertUnits.ToSimUnits(Character.CharacterHealth.CrushDepth * 0.75f))
            {
                //steer straight up if very deep
                steeringManager.SteeringManual(deltaTime, Vector2.UnitY);
                return;
            }

-            if (wallTarget != null) return;
+            SteerInsideLevel(deltaTime);
+
+            if (wallTarget != null) { return; }
            
            if (SelectedAiTarget != null)
            {
@@ -451,6 +454,10 @@ namespace Barotrauma
                    }
                }
            }
+            else
+            {
+                SteerInsideLevel(deltaTime);
+            }
            if (escapePoint != Vector2.Zero && Vector2.DistanceSquared(Character.SimPosition, escapePoint) > 1)
            {
                SteeringManager.SteeringSeek(escapePoint);
@@ -1396,6 +1403,30 @@ namespace Barotrauma
            AttackingLimb = null;
        }

+        private void SteerInsideLevel(float deltaTime)
+        {
+            if (Level.Loaded == null) { return; } 
+            
+            Vector2 levelSimSize = new Vector2(
+                ConvertUnits.ToSimUnits(Level.Loaded.Size.X),
+                ConvertUnits.ToSimUnits(Level.Loaded.Size.Y));
+
+            float margin = 10.0f;
+
+            if (SimPosition.Y < 0.0f)
+            {
+                steeringManager.SteeringManual(deltaTime, Vector2.UnitY * MathUtils.InverseLerp(0.0f, -margin, SimPosition.Y));
+            }
+            if (SimPosition.X < 0.0f)
+            {
+                steeringManager.SteeringManual(deltaTime, Vector2.UnitX * MathUtils.InverseLerp(0.0f, -margin, SimPosition.X));
+            }
+            if (SimPosition.X > levelSimSize.X)
+            {
+                steeringManager.SteeringManual(deltaTime, Vector2.UnitX * MathUtils.InverseLerp(levelSimSize.X, levelSimSize.X + margin, SimPosition.X));
+            }            
+        }
+
        private int GetMinimumPassableHoleCount()
        {
            return (int)Math.Ceiling(ConvertUnits.ToDisplayUnits(colliderSize) / Structure.WallSectionSize);
@@ -81,7 +81,7 @@ namespace Barotrauma

        public override void Update(float deltaTime)
        {
-            if (DisableCrewAI || Character.IsUnconscious) return;
+            if (DisableCrewAI || Character.IsUnconscious || Character.Removed) { return; }

            float maxDistanceToSub = 3000;
            if (Character.Submarine != null || SelectedAiTarget?.Entity?.Submarine != null && 
@@ -312,8 +312,10 @@ namespace Barotrauma
                Vector2 colliderBottom = character.AnimController.GetColliderBottom();
                Vector2 colliderSize = collider.GetSize();
                Vector2 velocity = collider.LinearVelocity;
+                // If the character is smaller than this, it fails to use the waypoint nodes, because they are always too high.
+                float minHeight = 1;
                // Cannot use the head position, because not all characters have head or it can be below the total height of the character
-                float characterHeight = colliderSize.Y + character.AnimController.ColliderHeightFromFloor;
+                float characterHeight = Math.Max(colliderSize.Y + character.AnimController.ColliderHeightFromFloor, minHeight);
                float horizontalDistance = Math.Abs(collider.SimPosition.X - currentPath.CurrentNode.SimPosition.X);
                bool isAboveFeet = currentPath.CurrentNode.SimPosition.Y > colliderBottom.Y;
                bool isNotTooHigh = currentPath.CurrentNode.SimPosition.Y < colliderBottom.Y + characterHeight;