Unstable v0.1300.0.0 (February 19th 2021)

2021-02-25 13:44:23 +02:00
parent b772654326
commit 24cbef485a
441 changed files with 21343 additions and 8562 deletions
@@ -22,7 +22,6 @@ namespace Barotrauma.Items.Components
        private const float AutoPilotMaxSpeed = 0.5f;
        private const float AIPilotMaxSpeed = 1.0f;

-        private Vector2 currVelocity;
        private Vector2 targetVelocity;

        private Vector2 steeringInput;
@@ -52,7 +51,13 @@ namespace Barotrauma.Items.Components
        private Sonar sonar;

        private Submarine controlledSub;
-                
+
+        private bool showIceSpireWarning;
+
+        private List<Submarine> connectedSubs = new List<Submarine>();
+        private const float ConnectedSubUpdateInterval = 1.0f;
+        float connectedSubUpdateTimer;
+
        public bool AutoPilot
        {
            get { return autoPilot; }
@@ -67,7 +72,10 @@ namespace Barotrauma.Items.Components
                {
                    if (pathFinder == null)
                    {
-                        pathFinder = new PathFinder(WayPoint.WayPointList, false);
+                        pathFinder = new PathFinder(WayPoint.WayPointList, false)
+                        {
+                            GetNodePenalty = GetNodePenalty
+                        };
                    }
                    MaintainPos = true;
                    if (posToMaintain == null)
@@ -87,7 +95,7 @@ namespace Barotrauma.Items.Components
            }
        }

-        [Editable(0.0f, 1.0f, decimals: 3),
+        [Editable(0.0f, 1.0f, decimals: 4),
        Serialize(0.5f, true, description: "How full the ballast tanks should be when the submarine is not being steered upwards/downwards."
            + " Can be used to compensate if the ballast tanks are too large/small relative to the size of the submarine.")]
        public float NeutralBallastLevel
@@ -299,6 +307,7 @@ namespace Barotrauma.Items.Components
            }
            else
            {
+                showIceSpireWarning = false;
                if (user != null && user.Info != null && 
                    user.SelectedConstruction == item && 
                    controlledSub != null && controlledSub.Velocity.LengthSquared() > 0.01f)
@@ -323,12 +332,13 @@ namespace Barotrauma.Items.Components
                    }
                }
            }
-            
-            item.SendSignal(0, targetVelocity.X.ToString(CultureInfo.InvariantCulture), "velocity_x_out", user);

-            float targetLevel = -targetVelocity.Y;
+            float targetLevel = targetVelocity.X;
+            if (controlledSub != null && controlledSub.FlippedX) { targetLevel *= -1; }
+            item.SendSignal(0, targetLevel.ToString(CultureInfo.InvariantCulture), "velocity_x_out", user);
+
+            targetLevel = -targetVelocity.Y;
            targetLevel += (neutralBallastLevel - 0.5f) * 100.0f;
-
            item.SendSignal(0, targetLevel.ToString(CultureInfo.InvariantCulture), "velocity_y_out", user);
        }

@@ -342,7 +352,7 @@ namespace Barotrauma.Items.Components
            user.Info.IncreaseSkillLevel(
                "helm",
                SkillSettings.Current.SkillIncreasePerSecondWhenSteering / userSkill * deltaTime,
-                user.WorldPosition + Vector2.UnitY * 150.0f);
+                user.Position + Vector2.UnitY * 150.0f);
        }

        private void UpdateAutoPilot(float deltaTime)
@@ -351,7 +361,8 @@ namespace Barotrauma.Items.Components
            if (posToMaintain != null)
            {
                Vector2 steeringVel = GetSteeringVelocity((Vector2)posToMaintain, 10.0f);
-                TargetVelocity = Vector2.Lerp(TargetVelocity, steeringVel, AutoPilotSteeringLerp);               
+                TargetVelocity = Vector2.Lerp(TargetVelocity, steeringVel, AutoPilotSteeringLerp);
+                showIceSpireWarning = false;
                return;
            }

@@ -365,9 +376,21 @@ namespace Barotrauma.Items.Components
                autopilotRecalculatePathTimer = RecalculatePathInterval;
            }

-            if (steeringPath == null) { return; }
+            if (steeringPath == null)
+            {
+                showIceSpireWarning = false;
+                return;
+            }
            steeringPath.CheckProgress(ConvertUnits.ToSimUnits(controlledSub.WorldPosition), 10.0f);

+            connectedSubUpdateTimer -= deltaTime;
+            if (connectedSubUpdateTimer <= 0.0f)
+            {
+                connectedSubs.Clear();
+                connectedSubs = controlledSub?.GetConnectedSubs();                
+                connectedSubUpdateTimer = ConnectedSubUpdateInterval;
+            }
+
            if (autopilotRayCastTimer <= 0.0f && steeringPath.NextNode != null)
            {
                Vector2 diff = ConvertUnits.ToSimUnits(steeringPath.NextNode.Position - controlledSub.WorldPosition);
@@ -417,27 +440,38 @@ namespace Barotrauma.Items.Components
                Math.Max(1000.0f * Math.Abs(controlledSub.Velocity.Y), controlledSub.Borders.Height * 0.75f));

            float avoidRadius = avoidDist.Length();
-            float damagingWallAvoidRadius = avoidRadius * 1.5f;
+            float damagingWallAvoidRadius = MathHelper.Clamp(avoidRadius * 1.5f, 5000.0f, 10000.0f);

            Vector2 newAvoidStrength = Vector2.Zero;

            debugDrawObstacles.Clear();

            //steer away from nearby walls
+            showIceSpireWarning = false;
            var closeCells = Level.Loaded.GetCells(controlledSub.WorldPosition, 4);
            foreach (VoronoiCell cell in closeCells)
            {
-                if (Level.Loaded?.ExtraWalls.Any(w => w.WallDamageOnTouch > 0.0f && w.Cells.Contains(cell)) ?? false)
+                if (cell.DoesDamage)
                {
                    foreach (GraphEdge edge in cell.Edges)
                    {
                        Vector2 closestPoint = MathUtils.GetClosestPointOnLineSegment(edge.Point1 + cell.Translation, edge.Point2 + cell.Translation, controlledSub.WorldPosition);
-                        float dist = Vector2.Distance(closestPoint, controlledSub.WorldPosition);
+                        Vector2 diff = closestPoint - controlledSub.WorldPosition;
+                        float dist = diff.Length() - Math.Max(controlledSub.Borders.Width, controlledSub.Borders.Height) / 2;
                        if (dist > damagingWallAvoidRadius) { continue; }
-                        Vector2 diff = controlledSub.WorldPosition - cell.Center;
-                        Vector2 avoid =  Vector2.Normalize(diff) * (damagingWallAvoidRadius - dist) / damagingWallAvoidRadius;
+
+                        Vector2 normalizedDiff = Vector2.Normalize(diff);
+                        float dot = Vector2.Dot(normalizedDiff, controlledSub.Velocity);
+
+                        float avoidStrength = MathHelper.Clamp(MathHelper.Lerp(1.0f, 0.0f, dist / damagingWallAvoidRadius - dot), 0.0f, 1.0f);
+                        Vector2 avoid = -normalizedDiff * avoidStrength;
                        newAvoidStrength += avoid;
                        debugDrawObstacles.Add(new ObstacleDebugInfo(edge, edge.Center, 1.0f, avoid, cell.Translation));
+
+                        if (dot > 0.0f)
+                        {
+                            showIceSpireWarning = true;
+                        }
                    }
                    continue;
                }
@@ -453,7 +487,7 @@ namespace Barotrauma.Items.Components
                            debugDrawObstacles.Add(new ObstacleDebugInfo(edge, intersection, 0.0f, Vector2.Zero, Vector2.Zero));
                            continue;
                        }
-                        if (diff.LengthSquared() < 1.0f) diff = Vector2.UnitY;
+                        if (diff.LengthSquared() < 1.0f) { diff = Vector2.UnitY; }

                        Vector2 normalizedDiff = Vector2.Normalize(diff);
                        float dot = controlledSub.Velocity == Vector2.Zero ?
@@ -480,8 +514,7 @@ namespace Barotrauma.Items.Components
            //steer away from other subs
            foreach (Submarine sub in Submarine.Loaded)
            {
-                if (sub == controlledSub) { continue; }
-                if (controlledSub.DockedTo.Contains(sub)) { continue; }
+                if (sub == controlledSub || connectedSubs.Contains(sub)) { continue; }
                Point sizeSum = controlledSub.Borders.Size + sub.Borders.Size;
                Vector2 minDist = sizeSum.ToVector2() / 2;
                Vector2 diff = controlledSub.WorldPosition - sub.WorldPosition;
@@ -512,6 +545,15 @@ namespace Barotrauma.Items.Components
            }
        }

+        private float? GetNodePenalty(PathNode node, PathNode nextNode)
+        {
+            if (node.Waypoint?.Tunnel == null || controlledSub == null || node.Waypoint.Tunnel.Type == Level.TunnelType.MainPath) { return 0.0f; }
+            //never navigate from the main path to another type of path
+            if (node.Waypoint.Tunnel.Type == Level.TunnelType.MainPath && nextNode.Waypoint?.Tunnel?.Type != Level.TunnelType.MainPath) { return null; }
+            //higher cost for side paths (= autopilot prefers the main path, but can still navigate side paths if it ends up on one)
+            return 1000.0f;
+        }
+
        private void UpdatePath()
        {
            if (Level.Loaded == null) { return; }
@@ -584,7 +626,7 @@ namespace Barotrauma.Items.Components
        {
            if (objective.Override)
            {
-                if (user != character && user != null && user.SelectedConstruction == item)
+                if (user != character && user != null && user.SelectedConstruction == item && character.IsOnPlayerTeam)
                {
                    character.Speak(TextManager.Get("DialogSteeringTaken"), null, 0.0f, "steeringtaken", 10.0f);
                }
@@ -647,6 +689,10 @@ namespace Barotrauma.Items.Components
                    break;
            }
            sonar?.AIOperate(deltaTime, character, objective);
+            if (!MaintainPos && showIceSpireWarning && character.IsOnPlayerTeam)
+            {
+                character.Speak(TextManager.Get("dialogicespirespottedsonar"), null, 0.0f, "icespirespottedsonar", 60.0f);
+            }
            return false;
        }

@@ -654,7 +700,7 @@ namespace Barotrauma.Items.Components
        {
            if (connection.Name == "velocity_in")
            {
-                currVelocity = XMLExtensions.ParseVector2(signal, false);
+                TargetVelocity = XMLExtensions.ParseVector2(signal, errorMessages: false);
            }
            else
            {