(bf212a41f) v0.9.2.0 pre-release test version

2019-07-27 21:06:07 +03:00
parent afa2137bd2
commit 0f63da27b2
154 changed files with 3959 additions and 1428 deletions
@@ -25,12 +25,12 @@ namespace Barotrauma.Items.Components
        {
            noPowerTip = TextManager.Get("SteeringNoPowerTip");

-            GuiFrame.RectTransform.RelativeOffset = new Vector2(0.4f, 0.0f);
-            new GUICustomComponent(new RectTransform(new Vector2(0.9f, 0.85f), GuiFrame.RectTransform, Anchor.Center),
+            GuiFrame.RectTransform.RelativeOffset = new Vector2(0.05f, 0.0f);
+            new GUICustomComponent(new RectTransform(new Vector2(0.95f, 0.9f), GuiFrame.RectTransform, Anchor.Center),
                DrawHUDBack, null);
-            submarineContainer = new GUIFrame(new RectTransform(new Vector2(0.9f, 0.85f), GuiFrame.RectTransform, Anchor.Center), style: null);
+            submarineContainer = new GUIFrame(new RectTransform(new Vector2(0.95f, 0.9f), GuiFrame.RectTransform, Anchor.Center), style: null);

-            new GUICustomComponent(new RectTransform(new Vector2(0.9f, 0.85f), GuiFrame.RectTransform, Anchor.Center),
+            new GUICustomComponent(new RectTransform(new Vector2(0.95f, 0.9f), GuiFrame.RectTransform, Anchor.Center),
                DrawHUDFront, null)
            {
                CanBeFocused = false
@@ -179,11 +179,21 @@ namespace Barotrauma.Items.Components
                    GetLinkedHulls(hull, hullData.LinkedHulls);
                    hullDatas.Add(hull, hullData);
                }
+                
+                Color neutralColor = Color.DarkCyan;
+                if (hull.RoomName != null)
+                {
+                    if (hull.RoomName.Contains("ballast") || hull.RoomName.Contains("Ballast") ||
+                        hull.RoomName.Contains("airlock") || hull.RoomName.Contains("Airlock"))
+                    {
+                        neutralColor = new Color(9, 80, 159);
+                    }
+                }

                if (hullData.Distort)
                {
                    hullFrame.Children.First().Color = Color.Lerp(Color.Black, Color.DarkGray * 0.5f, Rand.Range(0.0f, 1.0f));
-                    hullFrame.Color = Color.DarkGray * 0.5f;
+                    hullFrame.Color = neutralColor * 0.5f;
                    continue;
                }
                
@@ -192,20 +202,23 @@ namespace Barotrauma.Items.Components
                    hullFrame.Parent.Rect.Width / (float)hull.Submarine.Borders.Width, 
                    hullFrame.Parent.Rect.Height / (float)hull.Submarine.Borders.Height);
                
-                Color borderColor = Color.DarkCyan;
+                Color borderColor = neutralColor;
                
                float? gapOpenSum = 0.0f;
                if (ShowHullIntegrity)
                {
                    gapOpenSum = hull.ConnectedGaps.Where(g => !g.IsRoomToRoom).Sum(g => g.Open);
-                    borderColor = Color.Lerp(Color.DarkCyan, Color.Red, Math.Min((float)gapOpenSum, 1.0f));
+                    borderColor = Color.Lerp(neutralColor, Color.Red, Math.Min((float)gapOpenSum, 1.0f));
                }

                float? oxygenAmount = null;
                if (!RequireOxygenDetectors || hullData?.Oxygen != null)
                {
                    oxygenAmount = RequireOxygenDetectors ? hullData.Oxygen : hull.OxygenPercentage;
-                    GUI.DrawRectangle(spriteBatch, hullFrame.Rect, Color.Lerp(Color.Red * 0.5f, Color.Green * 0.3f, (float)oxygenAmount / 100.0f), true);
+                    GUI.DrawRectangle(
+                        spriteBatch, hullFrame.Rect, 
+                        Color.Lerp(Color.Red * 0.5f, Color.Green * 0.3f, (float)oxygenAmount / 100.0f), 
+                        true);
                }

                float? waterAmount = null;
@@ -234,7 +247,7 @@ namespace Barotrauma.Items.Components
                }
                else
                {
-                    hullFrame.Children.First().Color = Color.DarkCyan * 0.8f;
+                    hullFrame.Children.First().Color = neutralColor * 0.8f;
                }

                if (mouseOnHull == hull)
@@ -291,8 +304,6 @@ namespace Barotrauma.Items.Components
                    GUI.DrawLine(spriteBatch, center + start, center + end, Color.DarkCyan * Rand.Range(0.3f, 0.35f), width: (int)(10 * GUI.Scale));
                }
            }
-
-
        }

        private void GetLinkedHulls(Hull hull, List<Hull> linkedHulls)
@@ -58,6 +58,10 @@ namespace Barotrauma.Items.Components
        private GUIFrame inventoryContainer;

        private GUIComponent leftHUDColumn;
+        private GUIComponent midHUDColumn;
+        private GUIComponent rightHUDColumn;
+
+        private GUILayoutGroup sliderControlsContainer;

        private Dictionary<string, GUIButton> warningButtons = new Dictionary<string, GUIButton>();

@@ -107,11 +111,13 @@ namespace Barotrauma.Items.Components
                RelativeSpacing = 0.012f,
                Stretch = true
            };
-            
+
            GUIFrame columnLeft = new GUIFrame(new RectTransform(new Vector2(0.25f, 1.0f), paddedFrame.RectTransform), style: null);
-            leftHUDColumn = columnLeft;
            GUIFrame columnMid = new GUIFrame(new RectTransform(new Vector2(0.45f, 1.0f), paddedFrame.RectTransform), style: null);
            GUIFrame columnRight = new GUIFrame(new RectTransform(new Vector2(0.3f, 1.0f), paddedFrame.RectTransform), style: null);
+            leftHUDColumn = columnLeft;
+            midHUDColumn = columnMid;
+            rightHUDColumn = columnRight;

            //----------------------------------------------------------
            //left column
@@ -180,9 +186,16 @@ namespace Barotrauma.Items.Components
                ToolTip = TextManager.Get("ReactorTipTurbineOutput")
            };

-            new GUITextBlock(new RectTransform(new Point(0, (int)(20 * GUI.Scale)), columnMid.RectTransform, Anchor.BottomLeft) { AbsoluteOffset = new Point(0, (int)(90 * GUI.Scale)) },
+            GUILayoutGroup sliderControls = new GUILayoutGroup(new RectTransform(new Point(columnMid.Rect.Width, (int)(114 * GUI.Scale)), columnMid.RectTransform, Anchor.BottomCenter))
+            {
+                Stretch = true,
+                AbsoluteSpacing = (int)(5 * GUI.Scale)
+            };
+            sliderControlsContainer = sliderControls;
+
+            new GUITextBlock(new RectTransform(new Point(0, (int)(20 * GUI.Scale)), sliderControls.RectTransform, Anchor.TopLeft),
                TextManager.Get("ReactorFissionRate"));
-            fissionRateScrollBar = new GUIScrollBar(new RectTransform(new Point(columnMid.Rect.Width, (int)(30 * GUI.Scale)), columnMid.RectTransform, Anchor.BottomCenter) { AbsoluteOffset = new Point(0, (int)(60 * GUI.Scale)) },
+            fissionRateScrollBar = new GUIScrollBar(new RectTransform(new Point(sliderControls.Rect.Width, (int)(30 * GUI.Scale)), sliderControls.RectTransform, Anchor.TopCenter),
                style: "GUISlider", barSize: 0.1f)
            {
                OnMoved = (GUIScrollBar bar, float scrollAmount) =>
@@ -194,10 +207,10 @@ namespace Barotrauma.Items.Components
                    return false;
                }
            };
-                        
-            new GUITextBlock(new RectTransform(new Point(0, (int)(20 * GUI.Scale)), columnMid.RectTransform, Anchor.BottomLeft) { AbsoluteOffset = new Point(0, (int)(30 * GUI.Scale)) },
+
+            new GUITextBlock(new RectTransform(new Point(0, (int)(20 * GUI.Scale)), sliderControls.RectTransform, Anchor.BottomLeft),
                TextManager.Get("ReactorTurbineOutput"));
-            turbineOutputScrollBar = new GUIScrollBar(new RectTransform(new Point(columnMid.Rect.Width, (int)(30 * GUI.Scale)), columnMid.RectTransform, Anchor.BottomCenter),
+            turbineOutputScrollBar = new GUIScrollBar(new RectTransform(new Point(sliderControls.Rect.Width, (int)(30 * GUI.Scale)), sliderControls.RectTransform, Anchor.BottomCenter),
                style: "GUISlider", barSize: 0.1f, isHorizontal: true)
            {
                OnMoved = (GUIScrollBar bar, float scrollAmount) =>
@@ -263,11 +276,11 @@ namespace Barotrauma.Items.Components
                "Load", textColor: Color.LightBlue, textAlignment: Alignment.CenterLeft)
            {
                ToolTip = TextManager.Get("ReactorTipLoad")
-            };            
+            };
            string loadStr = TextManager.Get("ReactorLoad");
            loadText.TextGetter += () => { return loadStr.Replace("[kw]", ((int)load).ToString()); };

-            var outputText = new GUITextBlock(new RectTransform(textSize, graphArea.RectTransform, Anchor.BottomLeft, Pivot.TopLeft), 
+            var outputText = new GUITextBlock(new RectTransform(textSize, graphArea.RectTransform, Anchor.BottomLeft, Pivot.TopLeft),
                "Output", textColor: Color.LightGreen, textAlignment: Alignment.CenterLeft)
            {
                ToolTip = TextManager.Get("ReactorTipPower")
@@ -321,9 +334,9 @@ namespace Barotrauma.Items.Components

            if (temperature > optimalTemperature.Y)
            {
-                GUI.DrawRectangle(spriteBatch, 
-                    new Vector2(graphArea.X - 30, graphArea.Y), 
-                    new Vector2(tempMeterFrame.SourceRect.Width, (graphArea.Bottom - graphArea.Height * optimalTemperature.Y / 100.0f) - graphArea.Y), 
+                GUI.DrawRectangle(spriteBatch,
+                    new Vector2(graphArea.X - 30, graphArea.Y),
+                    new Vector2(tempMeterFrame.SourceRect.Width, (graphArea.Bottom - graphArea.Height * optimalTemperature.Y / 100.0f) - graphArea.Y),
                    Color.Red * (float)Math.Sin(Timing.TotalTime * 5.0f) * 0.7f, isFilled: true);
            }
            if (temperature < optimalTemperature.X)
@@ -415,15 +428,52 @@ namespace Barotrauma.Items.Components
            warningButtons["ReactorWarningLowFuel"].Selected = prevAvailableFuel < fissionRate && lightOn;
            warningButtons["ReactorWarningMeltdown"].Selected = meltDownTimer > MeltdownDelay * 0.5f || item.Condition == 0.0f && lightOn;
            warningButtons["ReactorWarningSCRAM"].Selected = temperature > 0.1f && onOffSwitch.BarScroll > 0.5f;
-                        
+
            AutoTemp = autoTempSlider.BarScroll < 0.5f;
            shutDown = onOffSwitch.BarScroll > 0.5f;

+            if ((sliderControlsContainer.Rect.Contains(PlayerInput.MousePosition) || sliderControlsContainer.Children.Contains(GUIScrollBar.draggingBar)) &&
+                !PlayerInput.KeyDown(InputType.Deselect) && !PlayerInput.KeyHit(InputType.Deselect))
+            {
+                Character.DisableControls = true;
+            }
+
            if (shutDown)
            {
                fissionRateScrollBar.BarScroll = FissionRate / 100.0f;
                turbineOutputScrollBar.BarScroll = TurbineOutput / 100.0f;
-            }            
+            }
+            else if (!autoTemp && Character.DisableControls && GUI.KeyboardDispatcher.Subscriber == null)
+            {
+                Vector2 input = Vector2.Zero;
+                float rate = 50.0f; //percentage per second
+
+                if (PlayerInput.KeyDown(InputType.Left)) input.X += -1.0f;
+                if (PlayerInput.KeyDown(InputType.Right)) input.X += 1.0f;
+                if (PlayerInput.KeyDown(InputType.Up)) input.Y += 1.0f;
+                if (PlayerInput.KeyDown(InputType.Down)) input.Y += -1.0f;
+                if (PlayerInput.KeyDown(InputType.Run)) rate = 200.0f;
+
+                rate *= deltaTime;
+                input.X *= rate;
+                input.Y *= rate;
+
+                if (input.LengthSquared() > 0)
+                {
+                    LastUser = Character.Controlled;
+                    unsentChanges = true;
+                    if (input.X != 0.0f && GUIScrollBar.draggingBar != fissionRateScrollBar)
+                    {
+                        targetFissionRate = MathHelper.Clamp(targetFissionRate + input.X, 0.0f, 100.0f);
+                        fissionRateScrollBar.BarScroll += input.X / 100.0f;
+                    }
+                    if (input.Y != 0.0f && GUIScrollBar.draggingBar != turbineOutputScrollBar)
+                    {
+                        targetTurbineOutput = MathHelper.Clamp(targetTurbineOutput + input.Y, 0.0f, 100.0f);
+                        turbineOutputScrollBar.BarScroll += input.Y / 100.0f;
+                    }
+                }
+            }
        }

        private bool ToggleAutoTemp(GUITickBox tickBox)
@@ -11,12 +11,6 @@ namespace Barotrauma.Items.Components
 {
    partial class Sonar : Powered, IServerSerializable, IClientSerializable
    {
-        enum Mode
-        {
-            Active,
-            Passive
-        };
-
        private bool dynamicDockingIndicator = true;

        private bool unsentChanges;
@@ -43,8 +37,6 @@ namespace Barotrauma.Items.Components

        private List<SonarBlip> sonarBlips;

-        private float prevPingRadius;
-
        private float prevPassivePingRadius;

        private Vector2 center;
@@ -102,7 +94,7 @@ namespace Barotrauma.Items.Components
                ToolTip = TextManager.Get("SonarTipActive"),
                OnSelected = (GUITickBox box) =>
                {
-                    IsActive = box.Selected;
+                    CurrentMode = box.Selected ? Mode.Active : Mode.Passive;
                    if (GameMain.Client != null)
                    {
                        unsentChanges = true;
@@ -262,7 +254,7 @@ namespace Barotrauma.Items.Components
            {
                if (component is GUITextBlock textBlock)
                {
-                    textBlock.TextColor = IsActive ? textBlock.Style.textColor : textBlock.Style.textColor * 0.5f;
+                    textBlock.TextColor = currentMode == Mode.Active ? textBlock.Style.textColor : textBlock.Style.textColor * 0.5f;
                }
            }

@@ -281,14 +273,21 @@ namespace Barotrauma.Items.Components
            if (Level.Loaded != null)
            {
                Dictionary<LevelTrigger, Vector2> levelTriggerFlows = new Dictionary<LevelTrigger, Vector2>();
-                foreach (LevelObject levelObject in Level.Loaded.LevelObjectManager.GetAllObjects(transducerCenter, range * pingState / zoom))
+                for (var pingIndex = 0; pingIndex < activePingsCount; ++pingIndex)
                {
-                    //gather all nearby triggers that are causing the water to flow into the dictionary
-                    foreach (LevelTrigger trigger in levelObject.Triggers)
+                    var activePing = activePings[pingIndex];
+                    foreach (LevelObject levelObject in Level.Loaded.LevelObjectManager.GetAllObjects(transducerCenter, range * activePing.State / zoom))
                    {
-                        Vector2 flow = trigger.GetWaterFlowVelocity();
-                        //ignore ones that are barely doing anything (flow^2 < 1)
-                        if (flow.LengthSquared() > 1.0f) levelTriggerFlows.Add(trigger, flow);
+                        //gather all nearby triggers that are causing the water to flow into the dictionary
+                        foreach (LevelTrigger trigger in levelObject.Triggers)
+                        {
+                            Vector2 flow = trigger.GetWaterFlowVelocity();
+                            //ignore ones that are barely doing anything (flow^2 < 1)
+                            if (flow.LengthSquared() > 1.0f && !levelTriggerFlows.ContainsKey(trigger))
+                            {
+                                levelTriggerFlows.Add(trigger, flow);
+                            }
+                        }
                    }
                }

@@ -350,13 +349,18 @@ namespace Barotrauma.Items.Components
                prevDockingDist = float.MaxValue;
            }

-            if (IsActive)
+            for (var pingIndex = 0; pingIndex < activePingsCount; ++pingIndex)
+            {
+                var activePing = activePings[pingIndex];
+                float pingRadius = DisplayRadius * activePing.State / zoom;
+                UpdateDisruptions(transducerCenter, pingRadius / displayScale, activePing.PrevPingRadius / displayScale);
+                Ping(transducerCenter, transducerCenter,
+                    pingRadius, activePing.PrevPingRadius, displayScale, range / zoom, passive: false, pingStrength: 2.0f);
+                activePing.PrevPingRadius = pingRadius;
+
+            }
+            if (currentMode == Mode.Active && currentPingIndex != -1)
            {
-                float pingRadius = DisplayRadius * pingState / zoom;
-                UpdateDisruptions(transducerCenter, pingRadius / displayScale, prevPingRadius / displayScale);
-                Ping(transducerCenter, transducerCenter, 
-                    pingRadius, prevPingRadius, displayScale, range / zoom, passive: false, pingStrength: 2.0f);
-                prevPingRadius = pingRadius;
                return;
            }

@@ -396,17 +400,18 @@ namespace Barotrauma.Items.Components
                screenBackground.Draw(spriteBatch, center, 0.0f, rect.Width / screenBackground.size.X);
            }

-            if (IsActive)
+            if (currentMode == Mode.Active && currentPingIndex != -1)
            {
-                if (isLastPingDirectional && directionalPingCircle != null)
+                var activePing = activePings[currentPingIndex];
+                if (activePing.IsDirectional && directionalPingCircle != null)
                {
-                    directionalPingCircle.Draw(spriteBatch, center, Color.White * (1.0f - pingState),
-                        rotate: MathUtils.VectorToAngle(lastPingDirection),
-                        scale: (DisplayRadius / directionalPingCircle.size.X) * pingState);
+                    directionalPingCircle.Draw(spriteBatch, center, Color.White * (1.0f - activePing.State),
+                    rotate: MathUtils.VectorToAngle(activePing.Direction),
+                    scale: (DisplayRadius / directionalPingCircle.size.X) * activePing.State);
                }
                else
                {
-                    pingCircle.Draw(spriteBatch, center, Color.White * (1.0f - pingState), 0.0f, (DisplayRadius * 2 / pingCircle.size.X) * pingState);
+                    pingCircle.Draw(spriteBatch, center, Color.White * (1.0f - activePing.State), 0.0f, (DisplayRadius * 2 / pingCircle.size.X) * activePing.State);
                }
            }

@@ -448,7 +453,7 @@ namespace Barotrauma.Items.Components
                spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend);
            }

-            float directionalPingVisibility = useDirectionalPing && IsActive ? 1.0f : showDirectionalIndicatorTimer;
+            float directionalPingVisibility = useDirectionalPing && currentMode == Mode.Active ? 1.0f : showDirectionalIndicatorTimer;
            if (directionalPingVisibility > 0.0f)
            {
                Vector2 sector1 = MathUtils.RotatePointAroundTarget(pingDirection * DisplayRadius, Vector2.Zero, DirectionalPingSector * 0.5f);
@@ -753,24 +758,47 @@ namespace Barotrauma.Items.Components
            disruptedDirections.Clear();
            if (Level.Loaded == null) { return; }

-            foreach (LevelObject levelObject in Level.Loaded.LevelObjectManager.GetAllObjects(pingSource, range * pingState))
+            for (var pingIndex = 0; pingIndex < activePingsCount; ++pingIndex)
            {
-                if (levelObject.ActivePrefab?.SonarDisruption <= 0.0f) { continue; }
-
-                float disruptionStrength = levelObject.ActivePrefab.SonarDisruption;
-                Vector2 disruptionPos = new Vector2(levelObject.Position.X, levelObject.Position.Y);
-
-                float disruptionDist = Vector2.Distance(pingSource, disruptionPos);
-                disruptedDirections.Add(new Pair<Vector2, float>((disruptionPos - pingSource) / disruptionDist, disruptionStrength));
-
-                if (disruptionDist > worldPrevPingRadius && disruptionDist <= worldPingRadius)
+                var activePing = activePings[pingIndex];
+                foreach (LevelObject levelObject in Level.Loaded.LevelObjectManager.GetAllObjects(pingSource, range * activePing.State))
                {
-                    for (int i = 0; i < disruptionStrength * Level.GridCellSize * 0.02f; i++)
+                    if (levelObject.ActivePrefab?.SonarDisruption <= 0.0f) { continue; }
+
+                    float disruptionStrength = levelObject.ActivePrefab.SonarDisruption;
+                    Vector2 disruptionPos = new Vector2(levelObject.Position.X, levelObject.Position.Y);
+
+                    float disruptionDist = Vector2.Distance(pingSource, disruptionPos);
+                    disruptedDirections.Add(new Pair<Vector2, float>((disruptionPos - pingSource) / disruptionDist, disruptionStrength));
+
+                    if (disruptionDist > worldPrevPingRadius && disruptionDist <= worldPingRadius)
                    {
-                        var blip = new SonarBlip(disruptionPos + Rand.Vector(Rand.Range(0.0f, Level.GridCellSize * 4 * disruptionStrength)), MathHelper.Lerp(1.0f, 1.5f, disruptionStrength), Rand.Range(1.0f, 2.0f + disruptionStrength));
-                        sonarBlips.Add(blip);
+                        CreateBlipsForDisruption(disruptionPos, disruptionStrength);
                    }
                }
+                foreach (AITarget aiTarget in AITarget.List)
+                {
+                    if (aiTarget.SonarDisruption <= 0.0f || !aiTarget.Enabled) { continue; }
+                    float distSqr = Vector2.DistanceSquared(aiTarget.WorldPosition, pingSource);
+                    if (distSqr > worldPingRadiusSqr) { continue; }
+
+                    float disruptionDist = (float)Math.Sqrt(distSqr);
+                    disruptedDirections.Add(new Pair<Vector2, float>((aiTarget.WorldPosition - pingSource) / disruptionDist, aiTarget.SonarDisruption));
+
+                    if (disruptionDist > worldPrevPingRadius && disruptionDist <= worldPingRadius)
+                    {
+                        CreateBlipsForDisruption(aiTarget.WorldPosition, aiTarget.SonarDisruption);
+                    }
+                }
+            }
+
+            void CreateBlipsForDisruption(Vector2 disruptionPos, float disruptionStrength)
+            {
+                for (int i = 0; i < disruptionStrength * Level.GridCellSize * 0.02f; i++)
+                {
+                    var blip = new SonarBlip(disruptionPos + Rand.Vector(Rand.Range(0.0f, Level.GridCellSize * 4 * disruptionStrength)), MathHelper.Lerp(1.0f, 1.5f, disruptionStrength), Rand.Range(1.0f, 2.0f + disruptionStrength));
+                    sonarBlips.Add(blip);
+                }
            }
        }

@@ -1045,9 +1073,9 @@ namespace Barotrauma.Items.Components
            }

            Vector2 dir = pos / (float)Math.Sqrt(posDistSqr);
-            if (isLastPingDirectional)
+            if (currentPingIndex != -1 && activePings[currentPingIndex].IsDirectional)
            {
-                if (Vector2.Dot(lastPingDirection, dir) < DirectionalPingDotProduct)
+                if (Vector2.Dot(activePings[currentPingIndex].Direction, dir) < DirectionalPingDotProduct)
                {
                    blip.FadeTimer = 0.0f;
                    return false;
@@ -1155,8 +1183,8 @@ namespace Barotrauma.Items.Components
        
        public void ClientWrite(Lidgren.Network.NetBuffer msg, object[] extraData = null)
        {
-            msg.Write(IsActive);
-            if (IsActive)
+            msg.Write(currentMode == Mode.Active);
+            if (currentMode == Mode.Active)
            {
                msg.WriteRangedSingle(zoom, MinZoom, MaxZoom, 8);
                msg.Write(useDirectionalPing);
@@ -1192,8 +1220,8 @@ namespace Barotrauma.Items.Components
                StartDelayedCorrection(type, msg.ExtractBits(msgLength), sendingTime);
                return;
            }
-            
-            IsActive = isActive;
+
+            CurrentMode = isActive ? Mode.Active : Mode.Passive;
            if (isActive)
            {
                activeTickBox.Selected = true;
@@ -735,9 +735,7 @@ namespace Barotrauma.Items.Components
                if (sourcePort.Docked || sourcePort.Item.Submarine == null) { continue; }
                if (sourcePort.Item.Submarine != controlledSub) { continue; }

-                int sourceDir = sourcePort.IsHorizontal ?
-                    Math.Sign(sourcePort.Item.WorldPosition.X - sourcePort.Item.Submarine.WorldPosition.X) :
-                    Math.Sign(sourcePort.Item.WorldPosition.Y - sourcePort.Item.Submarine.WorldPosition.Y);
+                int sourceDir = sourcePort.GetDir();

                foreach (DockingPort targetPort in DockingPort.List)
                {
@@ -745,9 +743,7 @@ namespace Barotrauma.Items.Components
                    if (targetPort.Item.Submarine == controlledSub || targetPort.IsHorizontal != sourcePort.IsHorizontal) { continue; }
                    if (Level.Loaded != null && targetPort.Item.Submarine.WorldPosition.Y > Level.Loaded.Size.Y) { continue; }

-                    int targetDir = targetPort.IsHorizontal ?
-                        Math.Sign(targetPort.Item.WorldPosition.X - targetPort.Item.Submarine.WorldPosition.X) :
-                        Math.Sign(targetPort.Item.WorldPosition.Y - targetPort.Item.Submarine.WorldPosition.Y);
+                    int targetDir = targetPort.GetDir();

                    if (sourceDir == targetDir) { continue; }