v1.6.17.0 (Unto the Breach update)

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Controller.cs

@@ -11,6 +11,7 @@ namespace Barotrauma.Items.Components
 
         public override void DrawHUD(SpriteBatch spriteBatch, Character character)
         {
+            base.DrawHUD(spriteBatch, character);
             if (focusTarget != null && character.ViewTarget == focusTarget)
             {
                 foreach (ItemComponent ic in focusTarget.Components)
@@ -23,6 +24,15 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public override void AddToGUIUpdateList(int order = 0)
+        {
+            base.AddToGUIUpdateList(order);
+            if (focusTarget != null && Character.Controlled.ViewTarget == focusTarget)
+            {
+                focusTarget.AddToGUIUpdateList(order);
+            }
+        }
+
         partial void HideHUDs(bool value)
         {
             if (isHUDsHidden == value) { return; }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Deconstructor.cs

@@ -154,12 +154,14 @@ namespace Barotrauma.Items.Components
                 {
                     infoArea.Text = TextManager.Get(InfoText).Fallback(InfoText);
                 }
+                
                 if (IsActive)
                 {
                     activateButton.Text = TextManager.Get("DeconstructorCancel");
                     infoArea.Text = string.Empty;
                     return;
                 }
+                
                 bool outputsFound = false;
                 foreach (var (inputItem, deconstructItem) in GetAvailableOutputs(checkRequiredOtherItems: true))
                 {
@@ -174,27 +176,34 @@ namespace Barotrauma.Items.Components
                         }
                         inputItem.GetComponent<GeneticMaterial>()?.ModifyDeconstructInfo(this, ref buttonText, ref infoText);
                         activateButton.Text = buttonText;
-                        if (infoArea != null)
-                        {
-                            infoArea.Text = infoText;
-                        }
+                        infoArea.Text = infoText;
+                        
                         return;
                     }
                 }
+                
+                LocalizedString activateButtonText = TextManager.Get(ActivateButtonText);
+                activateButton.Enabled = outputsFound || !InputContainer.Inventory.IsEmpty();
+                activateButton.Text = activateButtonText;
+                
                 //no valid outputs found: check if we're missing some required items from the input slots and display a message about it if possible
                 if (!outputsFound && infoArea != null)
                 {
                     foreach (var (inputItem, deconstructItem) in GetAvailableOutputs(checkRequiredOtherItems: false))
                     {
+                        LocalizedString infoText =  string.Empty;
                         if (deconstructItem.RequiredOtherItem.Any() && !string.IsNullOrEmpty(deconstructItem.InfoTextOnOtherItemMissing))
                         {
                             LocalizedString missingItemName = TextManager.Get("entityname." + deconstructItem.RequiredOtherItem.First());
-                            infoArea.Text = TextManager.GetWithVariable(deconstructItem.InfoTextOnOtherItemMissing, "[itemname]", missingItemName);
+                            infoText = TextManager.GetWithVariable(deconstructItem.InfoTextOnOtherItemMissing, "[itemname]", missingItemName);
                         }
+                        
+                        inputItem.GetComponent<GeneticMaterial>()?.ModifyDeconstructInfo(this, ref activateButtonText, ref infoText);
+                        
+                        activateButton.Text = activateButtonText;
+                        infoArea.Text = infoText;
                     }
                 }
-                activateButton.Enabled = outputsFound || !InputContainer.Inventory.IsEmpty();
-                activateButton.Text = TextManager.Get(ActivateButtonText);
             };
         }
 
@@ -415,7 +424,7 @@ namespace Barotrauma.Items.Components
 
         public override void UpdateHUDComponentSpecific(Character character, float deltaTime, Camera cam)
         {
-            inSufficientPowerWarning.Visible = IsActive && !hasPower;
+            inSufficientPowerWarning.Visible = IsActive && !HasPower;
         }
 
         private bool OnActivateButtonClicked(GUIButton button, object obj)

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/MiniMap.cs

@@ -10,45 +10,27 @@ using Microsoft.Xna.Framework.Input;
 
 namespace Barotrauma.Items.Components
 {
-    internal readonly struct MiniMapGUIComponent
+    internal readonly record struct MiniMapGUIComponent(GUIComponent RectComponent, GUIComponent BorderComponent)
     {
-        public readonly GUIComponent RectComponent;
-        public readonly GUIComponent BorderComponent;
-
-        public MiniMapGUIComponent(GUIComponent rectComponent)
+        public MiniMapGUIComponent(GUIComponent rectComponent) : this(rectComponent, rectComponent)
         {
-            RectComponent = rectComponent;
-            BorderComponent = rectComponent;
         }
-
-        public MiniMapGUIComponent(GUIComponent frame, GUIComponent linkedHullComponent)
-        {
-            RectComponent = frame;
-            BorderComponent = linkedHullComponent;
-        }
-
+        
         public void Deconstruct(out GUIComponent component, out GUIComponent borderComponent)
         {
             component = RectComponent;
             borderComponent = BorderComponent;
         }
     }
-
-    internal readonly struct MiniMapSprite
+    
+    internal readonly record struct MiniMapSprite(Sprite? Sprite, Color Color)
     {
-        public readonly Sprite? Sprite;
-        public readonly Color Color;
-
-        public MiniMapSprite(JobPrefab prefab)
+        public MiniMapSprite(JobPrefab prefab) : this(prefab.IconSmall, prefab.UIColor)
         {
-            Sprite = prefab.IconSmall;
-            Color = prefab.UIColor;
         }
-
-        public MiniMapSprite(Order order)
+        
+        public MiniMapSprite(Order order) : this(order.SymbolSprite, order.Color)
         {
-            Sprite = order.SymbolSprite;
-            Color = order.Color;
         }
     }
 
@@ -223,7 +205,27 @@ namespace Barotrauma.Items.Components
                                       NoPowerColor = MiniMapBaseColor * 0.1f,
                                       ElectricalBaseColor = GUIStyle.Orange,
                                       NoPowerElectricalColor = ElectricalBaseColor * 0.1f;
-
+        
+        // If this is portable, only allow displaying data in the player sub (not enemy subs, ruins, wrecks or other unknown places)
+        private bool IsPortableItemAllowed
+        {
+            get
+            {
+                if (IsUsableOutsidePlayerSub) { return true; }
+                if (item.Submarine == null) { return false; }
+                if (item.GetComponent<Pickable>() is not Pickable handheldItem) { return true; }
+                // This will effectively make sure wherever we are, it belongs to the player
+                return handheldItem.Picker?.TeamID == item.Submarine.TeamID;
+            }
+        }
+        
+        [Serialize(false, IsPropertySaveable.No, description: "If this item is portable, should it be usable outside the player submarine?")]
+        public bool IsUsableOutsidePlayerSub
+        {
+            get;
+            set;
+        }
+        
         partial void InitProjSpecific()
         {
             hullDatas = new Dictionary<Hull, HullData>();
@@ -425,22 +427,25 @@ namespace Barotrauma.Items.Components
             return false;
         }
 
-        private bool VisibleOnItemFinder(Item it)
+        private bool VisibleOnItemFinder(Item targetItem)
         {
-            if (it?.Submarine == null) { return false; }
-            if (item.Submarine == null || !item.Submarine.IsEntityFoundOnThisSub(it, includingConnectedSubs: true)) { return false; }
-            if (it.NonInteractable || it.IsHidden) { return false; }
-            if (it.GetComponent<Pickable>() == null) { return false; }
+            if (targetItem?.Submarine == null || item.Submarine == null) { return false; }
 
-            var holdable = it.GetComponent<Holdable>();
+            if (!IsPortableItemAllowed) { return false; }
+
+            if (!item.Submarine.IsEntityFoundOnThisSub(targetItem, includingConnectedSubs: true)) { return false; }
+            if (targetItem.NonInteractable || targetItem.IsHidden) { return false; }
+            if (targetItem.GetComponent<Pickable>() == null) { return false; }
+
+            var holdable = targetItem.GetComponent<Holdable>();
             if (holdable != null && holdable.Attached) { return false; }
 
-            var wire = it.GetComponent<Wire>();
+            var wire = targetItem.GetComponent<Wire>();
             if (wire != null && wire.Connections.Any(c => c != null)) { return false; }
 
-            if (it.Container?.GetComponent<ItemContainer>() is { DrawInventory: false } or { AllowAccess: false }) { return false; }
+            if (targetItem.Container?.GetComponent<ItemContainer>() is { DrawInventory: false } or { AllowAccess: false }) { return false; }
 
-            if (it.HasTag(Tags.TraitorMissionItem)) { return false; }
+            if (targetItem.HasTag(Tags.TraitorMissionItem)) { return false; }
 
             return true;
         }
@@ -454,18 +459,24 @@ namespace Barotrauma.Items.Components
                 searchAutoComplete?.AddToGUIUpdateList(order: order + 1);
             }
         }
-
-        private void CreateHUD()
+        
+        private void ClearHUD()
         {
             subEntities.Clear();
-            prevResolution = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
             submarineContainer.ClearChildren();
+            displayedSubs.Clear();
+        }
 
-            if (item.Submarine is null) 
+        private void RefreshHUD()
+        {
+            ClearHUD();
+            
+            if (item.Submarine is null || !IsPortableItemAllowed)
             {
-                displayedSubs.Clear();
                 return; 
             }
+            
+            prevResolution = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
 
             scissorComponent = new GUIScissorComponent(new RectTransform(Vector2.One, submarineContainer.RectTransform, Anchor.Center));
             miniMapContainer = new GUIFrame(new RectTransform(Vector2.One, scissorComponent.Content.RectTransform, Anchor.Center), style: null) { CanBeFocused = false };
@@ -574,18 +585,25 @@ namespace Barotrauma.Items.Components
 
         public override void UpdateHUDComponentSpecific(Character character, float deltaTime, Camera cam)
         {
-            //recreate HUD if the subs we should display have changed
-            if (item.Submarine == null && displayedSubs.Count > 0 ||                                         // item not inside a sub anymore, but display is still showing subs
+            // Refresh HUD (including possibly just clearing it away) if the subs we should display have changed
+            if (item.Submarine == null && displayedSubs.Count > 0 || // item not inside a sub anymore, but display is still showing subs
                 item.Submarine is { } itemSub &&
                 (
-                    !displayedSubs.Contains(itemSub) ||                                                                     // current sub not displayed
-                    itemSub.DockedTo.Where(s => s.TeamID == item.Submarine.TeamID).Any(s => !displayedSubs.Contains(s) && itemSub.ConnectedDockingPorts[s].IsLocked) ||   // some of the docked subs not displayed
-                    displayedSubs.Any(s => s != itemSub && !itemSub.DockedTo.Contains(s))                                   // displaying a sub that shouldn't be displayed
+                    // current sub not displayed
+                    !displayedSubs.Contains(itemSub) ||
+                    // some of the docked subs not displayed
+                    itemSub.DockedTo.Where(s => s.TeamID == item.Submarine.TeamID).Any(s => !displayedSubs.Contains(s) && itemSub.ConnectedDockingPorts[s].IsLocked) ||
+                    // displaying a sub that shouldn't be displayed
+                    displayedSubs.Any(s => s != itemSub && !itemSub.DockedTo.Contains(s))
                 ) ||
-                prevResolution.X != GameMain.GraphicsWidth || prevResolution.Y != GameMain.GraphicsHeight || // resolution changed
-                !submarineContainer.Children.Any())                                                          // We lack a GUI
+                // If this item is portable and not in a player sub and using it otherwise is disallowed
+                !IsPortableItemAllowed ||
+                // resolution changed
+                prevResolution.X != GameMain.GraphicsWidth || prevResolution.Y != GameMain.GraphicsHeight ||
+                // We lack a GUI
+                !submarineContainer.Children.Any())
             {
-                CreateHUD();
+                RefreshHUD();
             }
 
             //reset data if we haven't received anything in a while
@@ -737,7 +755,7 @@ namespace Barotrauma.Items.Components
                 return;
             }
 
-            if (Voltage < MinVoltage)
+            if (!HasPower)
             {
                 Vector2 textSize = GUIStyle.Font.MeasureString(noPowerTip);
                 Vector2 textPos = GuiFrame.Rect.Center.ToVector2();
@@ -747,7 +765,7 @@ namespace Barotrauma.Items.Components
                 return;
             }
 
-            if (currentMode == MiniMapMode.HullStatus && item.Submarine != null)
+            if (currentMode == MiniMapMode.HullStatus && item.Submarine != null && IsPortableItemAllowed)
             {
                 Rectangle prevScissorRect = spriteBatch.GraphicsDevice.ScissorRectangle;
                 spriteBatch.End();
@@ -958,19 +976,19 @@ namespace Barotrauma.Items.Components
 
             MiniMapBlips = positions.ToImmutableHashSet();
 
-            if (searchAutoComplete is null) { return; }
-            searchAutoComplete.Visible = false;
+            HideGUIComponent(searchAutoComplete);
         }
 
         private void UpdateHUDBack()
         {
-            if (item.Submarine == null) { return; }
-
-            if (hullInfoFrame != null) { hullInfoFrame.Visible = false; }
-            reportFrame.Visible = false;
-            searchBarFrame.Visible = false;
-            electricalFrame.Visible = false;
-            miniMapFrame.Visible = false;
+            // Clear up mode-specific elements before checking if drawing should continue, so they'll be gone if not
+            HideModeSpecificFrames();
+            
+            if (item.Submarine == null || !IsPortableItemAllowed)
+            {
+                ClearHUD();
+                return;
+            }
 
             switch (currentMode)
             {
@@ -988,7 +1006,24 @@ namespace Barotrauma.Items.Components
                     break;
             }
         }
-
+        
+        private void HideModeSpecificFrames()
+        {
+            HideGUIComponent(hullInfoFrame);
+            HideGUIComponent(reportFrame);
+            HideGUIComponent(searchBarFrame);
+            HideGUIComponent(electricalFrame);
+            HideGUIComponent(miniMapFrame);
+        }
+        
+        private static void HideGUIComponent(GUIComponent? component)
+        {
+            if (component != null)
+            {
+                component.Visible = false;
+            }
+        }
+        
         private void UpdateHullStatus()
         {
             bool canHoverOverHull = true;
@@ -1007,7 +1042,7 @@ namespace Barotrauma.Items.Components
                         child.Color = child.OutlineColor = NoPowerDoorColor;
                     }
 
-                    if (Voltage < MinVoltage) { continue; }
+                    if (!HasPower) { continue; }
 
                     child.Color = child.OutlineColor = DoorIndicatorColor;
                     if (GUI.MouseOn == child)
@@ -1037,7 +1072,7 @@ namespace Barotrauma.Items.Components
                     }
                 }
 
-                if (Voltage < MinVoltage) { continue; }
+                if (!HasPower) { continue; }
 
                 hullDatas.TryGetValue(hull, out HullData? hullData);
                 if (hullData is null)
@@ -1187,7 +1222,7 @@ namespace Barotrauma.Items.Components
                     component.Color = component.OutlineColor = NoPowerElectricalColor;
                 }
 
-                if (Voltage < MinVoltage || !miniMapGuiComponent.RectComponent.Visible) { continue; }
+                if (!HasPower || !miniMapGuiComponent.RectComponent.Visible) { continue; }
 
                 int durability = (int)(it.Condition / (it.MaxCondition / it.MaxRepairConditionMultiplier) * 100f);
                 Color color = ToolBox.GradientLerp(durability / 100f, GUIStyle.Red, GUIStyle.Orange, GUIStyle.Green, GUIStyle.Green);
@@ -1229,11 +1264,11 @@ namespace Barotrauma.Items.Components
 
         private void DrawHUDBack(SpriteBatch spriteBatch, GUICustomComponent container)
         {
-            if (item.Submarine == null) { return; }
+            if (item.Submarine == null || !IsPortableItemAllowed) { return; }
             
-            DrawSubmarine(spriteBatch);            
+            DrawSubmarine(spriteBatch);
 
-            if (Voltage < MinVoltage) { return; }
+            if (!HasPower) { return; }
             Rectangle prevScissorRect = spriteBatch.GraphicsDevice.ScissorRectangle;
             spriteBatch.End();
             spriteBatch.Begin(SpriteSortMode.Deferred, samplerState: GUI.SamplerState, rasterizerState: GameMain.ScissorTestEnable);

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Sonar.cs

@@ -144,6 +144,7 @@ namespace Barotrauma.Items.Components
         private bool isConnectedToSteering;
 
         private static LocalizedString caveLabel;
+        private static LocalizedString enemyLabel;
 
 
         [Serialize(false, IsPropertySaveable.Yes)]
@@ -164,6 +165,8 @@ namespace Barotrauma.Items.Components
                 TextManager.Get("cave").Fallback( 
                 TextManager.Get("missiontype.nest"));
 
+            enemyLabel = TextManager.Get("enemysubmarine");
+
             foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
@@ -1019,6 +1022,38 @@ namespace Barotrauma.Items.Components
                         cave.StartPos.ToVector2(), transducerCenter,
                         DisplayScale, center, DisplayRadius);
                 }
+
+                if (GameMain.NetworkMember is { } networkMember && GameMain.GameSession?.GameMode is PvPMode)
+                {
+                    if (networkMember.ServerSettings.TrackOpponentInPvP
+                        && Submarine.MainSubs[0] is { } coalitionSub
+                        && Submarine.MainSubs[1] is { } separatistSub
+                        && Character.Controlled is { } player)
+                    {
+                        Submarine whichSubToDraw = player.TeamID switch
+                        {
+                            CharacterTeamType.Team1 => separatistSub,
+                            CharacterTeamType.Team2 => coalitionSub,
+                            _                       => null
+                        };
+
+                        if (whichSubToDraw != null)
+                        {
+                            DrawOffsetMarker(spriteBatch,
+                                       enemyLabel.Value,
+                                       Tags.Submarine,
+                                       Tags.Enemy,
+                                       whichSubToDraw.WorldPosition,
+                                       transducerCenter,
+                                       distanceThresholds: new Range<float>(start: MetersToUnits(150), end: MetersToUnits(1600)),
+                                       offset: new Range<float>(start: MetersToUnits(100), end: MetersToUnits(400)),
+                                       minOffset: MetersToUnits(10));
+
+                            static float MetersToUnits(float m)
+                                => m / Physics.DisplayToRealWorldRatio;
+                        }
+                    }
+                }
             }
 
             int missionIndex = 0;
@@ -1042,7 +1077,8 @@ namespace Barotrauma.Items.Components
             }
 
             if (HasMineralScanner && UseMineralScanner && CurrentMode == Mode.Active && MineralClusters != null &&
-                (item.CurrentHull == null || !DetectSubmarineWalls))
+                (item.CurrentHull == null || !DetectSubmarineWalls) &&
+                HasPower)
             {
                 foreach (var c in MineralClusters)
                 {
@@ -1076,7 +1112,7 @@ namespace Barotrauma.Items.Components
             {
                 if (!sub.ShowSonarMarker) { continue; }
                 if (connectedSubs.Contains(sub)) { continue; }
-                if (Level.Loaded != null && sub.WorldPosition.Y > Level.Loaded.Size.Y) { continue; }
+                if (sub.IsAboveLevel) { continue; }
 
                 if (item.Submarine != null || Character.Controlled != null)
                 {
@@ -1185,7 +1221,7 @@ namespace Barotrauma.Items.Components
 
             foreach (DockingPort dockingPort in DockingPort.List)
             {
-                if (Level.Loaded != null && dockingPort.Item.Submarine.WorldPosition.Y > Level.Loaded.Size.Y) { continue; }
+                if (dockingPort.Item.Submarine.IsAboveLevel) { continue; }
                 if (dockingPort.Item.IsHidden) { continue; }
                 if (dockingPort.Item.Submarine == null) { continue; }
                 if (dockingPort.Item.Submarine.Info.IsWreck) { continue; }
@@ -1198,8 +1234,8 @@ namespace Barotrauma.Items.Components
 
                 //don't show the docking ports of the opposing team on the sonar
                 if (item.Submarine != null && 
-                    item.Submarine != GameMain.NetworkMember?.RespawnManager?.RespawnShuttle &&
-                    dockingPort.Item.Submarine != GameMain.NetworkMember?.RespawnManager?.RespawnShuttle &&
+                    !item.Submarine.IsRespawnShuttle &&
+                    !dockingPort.Item.Submarine.IsRespawnShuttle &&
                     !dockingPort.Item.Submarine.Info.IsOutpost &&
                     !dockingPort.Item.Submarine.Info.IsBeacon)
                 {
@@ -1792,8 +1828,47 @@ namespace Barotrauma.Items.Components
             sonarBlip.Draw(spriteBatch, center + pos, color * 0.5f * blip.Alpha, sonarBlip.Origin, 0, scale, SpriteEffects.None, 0);
         }
 
+        /// <summary>
+        /// Used in DrawOffsetMarker to cache the randomized location of the marker
+        /// </summary>
+        private readonly Dictionary<Identifier, CachedLocation> cachedLocations = new Dictionary<Identifier, CachedLocation>();
+
+        private void DrawOffsetMarker(SpriteBatch spriteBatch, string label, Identifier iconIdentifier, Identifier targetIdentifier, Vector2 worldPosition, Vector2 transducerPosition, Range<float> distanceThresholds, Range<float> offset, float minOffset)
+        {
+            Vector2 pos;
+
+            if (!cachedLocations.TryGetValue(targetIdentifier, out CachedLocation cachedLocation))
+            {
+                cachedLocation = CreateCachedLocation();
+                cachedLocations.Add(targetIdentifier, cachedLocation);
+                pos = cachedLocation.Location;
+            }
+            else
+            {
+                if (Timing.TotalTime > cachedLocation.RecalculationTime)
+                {
+                    cachedLocation = CreateCachedLocation();
+                    cachedLocations[targetIdentifier] = cachedLocation;
+                }
+
+                pos = cachedLocation.Location;
+            }
+
+            DrawMarker(spriteBatch, label, iconIdentifier, targetIdentifier, pos, transducerPosition, DisplayScale, center, DisplayRadius);
+
+            CachedLocation CreateCachedLocation()
+            {
+                float distance = Vector2.Distance(worldPosition, transducerPosition);
+
+                float maxOffset = MathHelper.Lerp(offset.Start, offset.End, MathHelper.Clamp((distance - distanceThresholds.Start) / (distanceThresholds.End - distanceThresholds.Start), 0.0f, 1.0f));
+
+                Vector2 randomPos = Rand.Vector(Rand.Range(minOffset, maxOffset));
+                return new CachedLocation(worldPosition + randomPos, Timing.TotalTime + Rand.Range(10.0f, 30.0f));
+            }
+        }
+
         private void DrawMarker(SpriteBatch spriteBatch, string label, Identifier iconIdentifier, object targetIdentifier, Vector2 worldPosition, Vector2 transducerPosition, float scale, Vector2 center, float radius,
-            bool onlyShowTextOnMouseOver = false)
+                                bool onlyShowTextOnMouseOver = false)
         {
             float linearDist = Vector2.Distance(worldPosition, transducerPosition);
             float dist = linearDist;

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Steering.cs

@@ -554,7 +554,7 @@ namespace Barotrauma.Items.Components
             int x = rect.X;
             int y = rect.Y;
 
-            if (Voltage < MinVoltage) { return; }
+            if (!HasPower) { return; }
 
             Rectangle velRect = new Rectangle(x + 20, y + 20, width - 40, height - 40);
             Vector2 steeringOrigin = steerArea.Rect.Center.ToVector2();
@@ -759,7 +759,7 @@ namespace Barotrauma.Items.Components
                 dockingButton.Text = dockText;
             }
 
-            if (Voltage < MinVoltage)
+            if (!HasPower)
             {
                 tipContainer.Visible = true;
                 tipContainer.Text = noPowerTip;
@@ -829,7 +829,7 @@ namespace Barotrauma.Items.Components
             }
             if (!AutoPilot && Character.DisableControls && GUI.KeyboardDispatcher.Subscriber == null)
             {
-                steeringAdjustSpeed = character == null ? DefaultSteeringAdjustSpeed : MathHelper.Lerp(0.2f, 1.0f, character.GetSkillLevel("helm") / 100.0f);
+                steeringAdjustSpeed = character == null ? DefaultSteeringAdjustSpeed : MathHelper.Lerp(0.2f, 1.0f, character.GetSkillLevel(Tags.HelmSkill) / 100.0f);
                 Vector2 input = Vector2.Zero;
                 if (PlayerInput.KeyDown(InputType.Left)) { input -= Vector2.UnitX; }
                 if (PlayerInput.KeyDown(InputType.Right)) { input += Vector2.UnitX; }
@@ -909,7 +909,7 @@ namespace Barotrauma.Items.Components
                     if (targetPort.Docked || targetPort.Item.Submarine == null) { continue; }
                     if (targetPort.Item.Submarine == controlledSub || targetPort.IsHorizontal != sourcePort.IsHorizontal) { continue; }
                     if (targetPort.Item.Submarine.DockedTo?.Contains(sourcePort.Item.Submarine) ?? false) { continue; }
-                    if (Level.Loaded != null && targetPort.Item.Submarine.WorldPosition.Y > Level.Loaded.Size.Y) { continue; }
+                    if (targetPort.Item.Submarine.IsAboveLevel) { continue; }
                     if (sourceDir == targetPort.GetDir()) { continue; }
 
                     float dist = Vector2.DistanceSquared(sourcePort.Item.WorldPosition, targetPort.Item.WorldPosition);