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
@@ -15,7 +15,8 @@ namespace Barotrauma.Items.Components
        public enum BlipType
        {
            Default,
-            Disruption
+            Disruption,
+            Destructible
        }

        private PathFinder pathFinder;
@@ -54,7 +55,7 @@ namespace Barotrauma.Items.Components
        private Sprite sonarBlip;
        private Sprite lineSprite;

-        private readonly Dictionary<string, Sprite> targetIcons = new Dictionary<string, Sprite>();
+        private readonly Dictionary<string, Tuple<Sprite, Color>> targetIcons = new Dictionary<string, Tuple<Sprite, Color>>();

        private float displayBorderSize;

@@ -70,6 +71,14 @@ namespace Barotrauma.Items.Components

        private float showDirectionalIndicatorTimer;

+        private readonly List<LevelObject> nearbyObjects = new List<LevelObject>();
+        private const float NearbyObjectUpdateInterval = 1.0f;
+        float nearbyObjectUpdateTimer;
+
+        private List<Submarine> connectedSubs = new List<Submarine>();
+        private const float ConnectedSubUpdateInterval = 1.0f;
+        float connectedSubUpdateTimer;
+
        //Vector2 = vector from the ping source to the position of the disruption
        //float = strength of the disruption, between 0-1
        private readonly List<Pair<Vector2, float>> disruptedDirections = new List<Pair<Vector2, float>>();
@@ -109,6 +118,10 @@ namespace Barotrauma.Items.Components
            {
                BlipType.Disruption,
                new Color[] { Color.TransparentBlack, new Color(254, 68, 19), new Color(255, 220, 62), new Color(255, 255, 255) }
+            },
+            {
+                BlipType.Destructible,
+                new Color[] { Color.TransparentBlack, new Color(74, 113, 75) * 0.8f, new Color(151, 236, 172) * 0.8f, new Color(153, 217, 234) * 0.8f }
            }
        };

@@ -124,11 +137,22 @@ namespace Barotrauma.Items.Components

        private readonly List<GUITextBlock> textBlocksToScaleAndNormalize = new List<GUITextBlock>();

+        private bool isConnectedToSteering;
+
+        private static string caveLabel;
+
+        private bool AllowUsingMineralScanner =>
+            HasMineralScanner && !isConnectedToSteering;
+
        partial void InitProjSpecific(XElement element)
        {
            System.Diagnostics.Debug.Assert(Enum.GetValues(typeof(BlipType)).Cast<BlipType>().All(t => blipColorGradient.ContainsKey(t)));
            sonarBlips = new List<SonarBlip>();

+            caveLabel = 
+                TextManager.Get("cave", returnNull: true) ?? 
+                TextManager.Get("missiontype.nest");
+
            foreach (XElement subElement in element.Elements())
            {
                switch (subElement.Name.ToString().ToLowerInvariant())
@@ -161,7 +185,9 @@ namespace Barotrauma.Items.Components
                        break;
                    case "icon":
                        var targetIconSprite = new Sprite(subElement);
-                        targetIcons.Add(subElement.GetAttributeString("identifier", ""), targetIconSprite);
+                        var color = subElement.GetAttributeColor("color", Color.White);
+                        targetIcons.Add(subElement.GetAttributeString("identifier", ""),
+                            new Tuple<Sprite, Color>(targetIconSprite, color));
                        break;
                }
            }
@@ -176,16 +202,20 @@ namespace Barotrauma.Items.Components

        protected override void CreateGUI()
        {
-            bool isConnectedToSteering = item.GetComponent<Steering>() != null;
-            Vector2 size = isConnectedToSteering ? controlBoxSize : new Vector2(controlBoxSize.X * 2.0f, controlBoxSize.Y);
+            isConnectedToSteering = item.GetComponent<Steering>() != null;
+            Vector2 size = isConnectedToSteering ? controlBoxSize : new Vector2(0.46f, 0.4f);

-            controlContainer = new GUIFrame(new RectTransform(size, GuiFrame.RectTransform, Anchor.BottomRight, Pivot.BottomLeft), "ItemUI");
+            controlContainer = new GUIFrame(new RectTransform(size, GuiFrame.RectTransform, Anchor.BottomLeft), "ItemUI");
+            if (!isConnectedToSteering && !GUI.IsFourByThree())
+            {
+                controlContainer.RectTransform.MaxSize = new Point((int)(380 * GUI.xScale), (int)(300 * GUI.yScale));
+            }
            var paddedControlContainer = new GUIFrame(new RectTransform(controlContainer.Rect.Size - GUIStyle.ItemFrameMargin, controlContainer.RectTransform, Anchor.Center)
            {
                AbsoluteOffset = GUIStyle.ItemFrameOffset
            }, style: null);
            // Based on the height difference to the steering control box so that the elements keep the same size
-            float extraHeight = 0.03f;
+            float extraHeight = 0.0694f;
            var sonarModeArea = new GUIFrame(new RectTransform(new Vector2(1, 0.4f + extraHeight), paddedControlContainer.RectTransform, Anchor.TopCenter), style: null);
            SonarModeSwitch = new GUIButton(new RectTransform(new Vector2(0.2f, 1), sonarModeArea.RectTransform), string.Empty, style: "SwitchVertical")
            {
@@ -224,6 +254,8 @@ namespace Barotrauma.Items.Components
            };
            passiveTickBox.TextBlock.OverrideTextColor(GUI.Style.TextColor);
            activeTickBox.TextBlock.OverrideTextColor(GUI.Style.TextColor);
+
+            textBlocksToScaleAndNormalize.Clear();
            textBlocksToScaleAndNormalize.Add(passiveTickBox.TextBlock);
            textBlocksToScaleAndNormalize.Add(activeTickBox.TextBlock);

@@ -249,7 +281,8 @@ namespace Barotrauma.Items.Components
                }
            };

-            new GUIFrame(new RectTransform(new Vector2(0.8f, 0.01f), paddedControlContainer.RectTransform, Anchor.Center), style: "HorizontalLine");
+            new GUIFrame(new RectTransform(new Vector2(0.8f, 0.01f), paddedControlContainer.RectTransform, Anchor.Center), style: "HorizontalLine")
+            { UserData = "horizontalline" };

            var directionalModeFrame = new GUIFrame(new RectTransform(new Vector2(1, 0.45f), lowerAreaFrame.RectTransform, Anchor.BottomCenter), style: null);
            directionalModeSwitch = new GUIButton(new RectTransform(new Vector2(0.3f, 0.8f), directionalModeFrame.RectTransform, Anchor.CenterLeft), string.Empty, style: "SwitchHorizontal")
@@ -270,6 +303,15 @@ namespace Barotrauma.Items.Components
                TextManager.Get("SonarDirectionalPing"), GUI.Style.TextColor, GUI.SubHeadingFont, Alignment.CenterLeft);
            textBlocksToScaleAndNormalize.Add(directionalModeSwitchText);

+            if (AllowUsingMineralScanner)
+            {
+                AddMineralScannerSwitchToGUI();
+            }
+            else
+            {
+                mineralScannerSwitch = null;
+            }
+
            GuiFrame.CanBeFocused = false;
            
            GUITextBlock.AutoScaleAndNormalize(textBlocksToScaleAndNormalize);
@@ -284,12 +326,17 @@ namespace Barotrauma.Items.Components
            if (isConnectedToSteering)
            {
                controlContainer.RectTransform.RelativeOffset = controlBoxOffset;
-                controlContainer.RectTransform.SetPosition(Anchor.TopLeft);
+                controlContainer.RectTransform.SetPosition(Anchor.TopRight);
                sonarView.RectTransform.ScaleBasis = ScaleBasis.Smallest;
-                sonarView.RectTransform.SetPosition(Anchor.CenterRight);
+                sonarView.RectTransform.SetPosition(Anchor.CenterLeft);
                sonarView.RectTransform.Resize(GUISizeCalculation);
                GUITextBlock.AutoScaleAndNormalize(textBlocksToScaleAndNormalize);
            }
+            else if (GUI.RelativeHorizontalAspectRatio > 0.75f)
+            {
+                sonarView.RectTransform.RelativeOffset = new Vector2(0.13f * GUI.RelativeHorizontalAspectRatio, 0);
+                sonarView.RectTransform.SetPosition(Anchor.BottomRight);
+            }
        }

        private void SetPingDirection(Vector2 direction)
@@ -306,20 +353,39 @@ namespace Barotrauma.Items.Components
        {
            base.OnItemLoaded();
            zoomSlider.BarScroll = MathUtils.InverseLerp(MinZoom, MaxZoom, zoom);
-            if (HasMineralScanner) { AddMineralScannerSwitchToGUI(); }
+            if (AllowUsingMineralScanner && mineralScannerSwitch == null)
+            {
+                AddMineralScannerSwitchToGUI();
+                GUITextBlock.AutoScaleAndNormalize(textBlocksToScaleAndNormalize);
+            }
            //make the sonarView customcomponent render the steering view so it gets drawn in front of the sonar
            item.GetComponent<Steering>()?.AttachToSonarHUD(sonarView);
        }

        private void AddMineralScannerSwitchToGUI()
        {
-            // First adjust other elements of the lower area
-            zoomSlider.Parent.RectTransform.RelativeSize = new Vector2(1.0f, 0.3f);
-            directionalModeSwitch.Parent.RectTransform.RelativeSize = new Vector2(1.0f, 0.3f);
+            // First adjust other elements to make room for the additional switch
+            controlContainer.RectTransform.RelativeSize = new Vector2(
+                controlContainer.RectTransform.RelativeSize.X,
+                controlContainer.RectTransform.RelativeSize.Y * 1.25f);
+            SonarModeSwitch.Parent.RectTransform.RelativeSize = new Vector2(
+                SonarModeSwitch.Parent.RectTransform.RelativeSize.X,
+                SonarModeSwitch.Parent.RectTransform.RelativeSize.Y * 0.8f);
+            lowerAreaFrame.Parent.GetChildByUserData("horizontalline").RectTransform.RelativeOffset =
+                new Vector2(0.0f, -0.1f);
+            lowerAreaFrame.RectTransform.RelativeSize = new Vector2(
+                lowerAreaFrame.RectTransform.RelativeSize.X,
+                lowerAreaFrame.RectTransform.RelativeSize.Y * 1.2f);
+            zoomSlider.Parent.RectTransform.RelativeSize = new Vector2(
+                zoomSlider.Parent.RectTransform.RelativeSize.X,
+                zoomSlider.Parent.RectTransform.RelativeSize.Y * (2.0f / 3.0f));
+            directionalModeSwitch.Parent.RectTransform.RelativeSize = new Vector2(
+                directionalModeSwitch.Parent.RectTransform.RelativeSize.X,
+                zoomSlider.Parent.RectTransform.RelativeSize.Y);
            directionalModeSwitch.Parent.RectTransform.SetPosition(Anchor.Center);

            // Then add the scanner switch
-            var mineralScannerFrame = new GUIFrame(new RectTransform(new Vector2(1, 0.3f), lowerAreaFrame.RectTransform, Anchor.BottomCenter), style: null);
+            var mineralScannerFrame = new GUIFrame(new RectTransform(new Vector2(1.0f, zoomSlider.Parent.RectTransform.RelativeSize.Y), lowerAreaFrame.RectTransform, Anchor.BottomCenter), style: null);
            mineralScannerSwitch = new GUIButton(new RectTransform(new Vector2(0.3f, 0.8f), mineralScannerFrame.RectTransform, Anchor.CenterLeft), string.Empty, style: "SwitchHorizontal")
            {
                OnClicked = (button, data) =>
@@ -337,7 +403,6 @@ namespace Barotrauma.Items.Components
            var mineralScannerSwitchText = new GUITextBlock(new RectTransform(new Vector2(0.7f, 1), mineralScannerFrame.RectTransform, Anchor.CenterRight),
                TextManager.Get("SonarMineralScanner"), GUI.Style.TextColor, GUI.SubHeadingFont, Alignment.CenterLeft);
            textBlocksToScaleAndNormalize.Add(mineralScannerSwitchText);
-            GUITextBlock.AutoScaleAndNormalize(textBlocksToScaleAndNormalize);
        }

        public override void UpdateHUD(Character character, float deltaTime, Camera cam)
@@ -358,6 +423,26 @@ namespace Barotrauma.Items.Components
                networkUpdateTimer -= deltaTime;
            }

+            connectedSubUpdateTimer -= deltaTime;
+            if (connectedSubUpdateTimer <= 0.0f)
+            {
+                connectedSubs.Clear();
+                if (UseTransducers)
+                {
+                    foreach (var transducer in connectedTransducers)
+                    {
+                        if (transducer.Transducer.Item.Submarine == null) { continue; }
+                        if (connectedSubs.Contains(transducer.Transducer.Item.Submarine)) { continue; }
+                        connectedSubs = transducer.Transducer.Item.Submarine?.GetConnectedSubs();
+                    }
+                }
+                else if (item.Submarine != null)
+                {
+                    connectedSubs = item.Submarine?.GetConnectedSubs();
+                }
+                connectedSubUpdateTimer = ConnectedSubUpdateInterval;
+            }
+
            if (sonarView.Rect.Contains(PlayerInput.MousePosition))
            {
                float scrollSpeed = PlayerInput.ScrollWheelSpeed / 1000.0f;
@@ -382,7 +467,7 @@ namespace Barotrauma.Items.Components
                Vector2.DistanceSquared(sonarView.Rect.Center.ToVector2(), PlayerInput.MousePosition) <
                (sonarView.Rect.Width / 2 * sonarView.Rect.Width / 2);

-            if (HasMineralScanner && Level.Loaded != null && !Level.Loaded.Generating)
+            if (AllowUsingMineralScanner && Level.Loaded != null && !Level.Loaded.Generating)
            {
                if (MineralClusters == null)
                {
@@ -417,26 +502,42 @@ namespace Barotrauma.Items.Components

            if (Level.Loaded != null)
            {
+                nearbyObjectUpdateTimer -= deltaTime;
+                if (nearbyObjectUpdateTimer <= 0.0f)
+                {
+                    nearbyObjects.Clear();
+                    foreach (var nearbyObject in Level.Loaded.LevelObjectManager.GetAllObjects(transducerCenter, range * zoom))
+                    {
+                        if (!nearbyObject.VisibleOnSonar) { continue; }
+                        float objectRange = range + nearbyObject.SonarRadius;
+                        if (Vector2.DistanceSquared(transducerCenter, nearbyObject.WorldPosition) < objectRange * objectRange)
+                        {
+                            nearbyObjects.Add(nearbyObject);
+                        }
+                    }
+                    nearbyObjectUpdateTimer = NearbyObjectUpdateInterval;
+                }
+
                List<LevelTrigger> ballastFloraSpores = new List<LevelTrigger>();
                Dictionary<LevelTrigger, Vector2> levelTriggerFlows = new Dictionary<LevelTrigger, Vector2>();
                for (var pingIndex = 0; pingIndex < activePingsCount; ++pingIndex)
                {
                    var activePing = activePings[pingIndex];
-                    LevelObjectManager objManager = Level.Loaded.LevelObjectManager;
                    float pingRange = range * activePing.State / zoom;
-                    foreach (LevelObject levelObject in objManager.GetAllObjects(transducerCenter, pingRange))
+                    foreach (LevelObject levelObject in nearbyObjects)
                    {
                        if (levelObject.Triggers == null) { continue; }
                        //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))
+                            //ignore ones that are barely doing anything (flow^2 <= 1)
+                            if (flow.LengthSquared() >= 1.0f && !levelTriggerFlows.ContainsKey(trigger))
                            {
                                levelTriggerFlows.Add(trigger, flow);
                            }
-                            if (!string.IsNullOrWhiteSpace(trigger.InfectIdentifier) && Vector2.DistanceSquared(transducerCenter, trigger.WorldPosition) < pingRange / 2 * pingRange / 2)
+                            if (!string.IsNullOrWhiteSpace(trigger.InfectIdentifier) && 
+                                Vector2.DistanceSquared(transducerCenter, trigger.WorldPosition) < pingRange / 2 * pingRange / 2)
                            {
                                ballastFloraSpores.Add(trigger);
                            }
@@ -727,8 +828,8 @@ namespace Barotrauma.Items.Components
            float directionalPingVisibility = useDirectionalPing && currentMode == Mode.Active ? 1.0f : showDirectionalIndicatorTimer;
            if (directionalPingVisibility > 0.0f)
            {
-                Vector2 sector1 = MathUtils.RotatePointAroundTarget(pingDirection * DisplayRadius, Vector2.Zero, DirectionalPingSector * 0.5f);
-                Vector2 sector2 = MathUtils.RotatePointAroundTarget(pingDirection * DisplayRadius, Vector2.Zero, -DirectionalPingSector * 0.5f);
+                Vector2 sector1 = MathUtils.RotatePointAroundTarget(pingDirection * DisplayRadius, Vector2.Zero, MathHelper.ToRadians(DirectionalPingSector * 0.5f));
+                Vector2 sector2 = MathUtils.RotatePointAroundTarget(pingDirection * DisplayRadius, Vector2.Zero, MathHelper.ToRadians(-DirectionalPingSector * 0.5f));
                DrawLine(spriteBatch, Vector2.Zero, sector1, Color.LightCyan * 0.2f * directionalPingVisibility, width: 3);
                DrawLine(spriteBatch, Vector2.Zero, sector2, Color.LightCyan * 0.2f * directionalPingVisibility, width: 3);
            }
@@ -761,7 +862,7 @@ namespace Barotrauma.Items.Components
            {
                DrawMarker(spriteBatch,
                    Level.Loaded.StartLocation.Name,
-                    "outpost",
+                    Level.Loaded.StartOutpost != null ? "outpost" : "location",
                    Level.Loaded.StartLocation.Name,
                    Level.Loaded.StartPosition, transducerCenter,
                    displayScale, center, DisplayRadius);
@@ -771,16 +872,28 @@ namespace Barotrauma.Items.Components
            {
                DrawMarker(spriteBatch,
                    Level.Loaded.EndLocation.Name,
-                    "outpost",
+                    Level.Loaded.EndOutpost != null ? "outpost" : "location",
                    Level.Loaded.EndLocation.Name,
                    Level.Loaded.EndPosition, transducerCenter,
                    displayScale, center, DisplayRadius);
            }

+            for (int i = 0; i < Level.Loaded.Caves.Count; i++)
+            {
+                var cave = Level.Loaded.Caves[i];
+                if (!cave.DisplayOnSonar) { continue; }
+                DrawMarker(spriteBatch,
+                    caveLabel,
+                    "cave",
+                    "cave" + i,
+                    cave.StartPos.ToVector2(), transducerCenter,
+                    displayScale, center, DisplayRadius);
+            }
+
            foreach (AITarget aiTarget in AITarget.List)
            {
-                if (!aiTarget.Enabled) continue;
-                if (string.IsNullOrEmpty(aiTarget.SonarLabel) || aiTarget.SoundRange <= 0.0f) continue;
+                if (!aiTarget.Enabled) { continue; }
+                if (string.IsNullOrEmpty(aiTarget.SonarLabel) || aiTarget.SoundRange <= 0.0f) { continue; }

                if (Vector2.DistanceSquared(aiTarget.WorldPosition, transducerCenter) < aiTarget.SoundRange * aiTarget.SoundRange)
                {
@@ -793,10 +906,8 @@ namespace Barotrauma.Items.Components
                }
            }
            
-            if (GameMain.GameSession.Mission != null)
+            foreach (Mission mission in GameMain.GameSession.Missions)
            {
-                var mission = GameMain.GameSession.Mission;
-
                if (!string.IsNullOrWhiteSpace(mission.SonarLabel))
                {
                    foreach (Vector2 sonarPosition in mission.SonarPositions)
@@ -811,18 +922,17 @@ namespace Barotrauma.Items.Components
                }
            }

-            if (HasMineralScanner && useMineralScanner && CurrentMode == Mode.Active && MineralClusters != null)
+            if (AllowUsingMineralScanner && useMineralScanner && CurrentMode == Mode.Active && MineralClusters != null)
            {
-                var maxMineralScanRangeSquared = Range * Range;
                foreach (var t in MineralClusters)
                {
                    var unobtainedMinerals = t.Item2.Where(i => i != null && i.GetRootInventoryOwner() == i);
                    if (unobtainedMinerals.None()) { continue; }
-                    if (Vector2.DistanceSquared(transducerCenter, t.Item1) > maxMineralScanRangeSquared) { continue; }
+                    if (!CheckResourceMarkerVisibility(t.Item1, transducerCenter)) { continue; }
                    var i = unobtainedMinerals.FirstOrDefault();
                    if (i == null) { continue; }
                    DrawMarker(spriteBatch,
-                        i.Name, null, i,
+                        i.Name, "mineral", i,
                        t.Item1, transducerCenter,
                        displayScale, center, DisplayRadius * 0.95f,
                        onlyShowTextOnMouseOver: true);
@@ -832,16 +942,11 @@ namespace Barotrauma.Items.Components
            foreach (Submarine sub in Submarine.Loaded)
            {
                if (!sub.ShowSonarMarker) { continue; }
-                if (UseTransducers ?
-                    connectedTransducers.Any(t => sub == t.Transducer.Item.Submarine || sub.DockedTo.Contains(t.Transducer.Item.Submarine)) :
-                    (sub == item.Submarine || sub.DockedTo.Contains(item.Submarine)))
-                {
-                    continue;
-                }
+                if (connectedSubs.Contains(sub)) { continue; }
                if (sub.WorldPosition.Y > Level.Loaded.Size.Y) { continue; }
-                             
-                DrawMarker(spriteBatch, 
-                    sub.Info.DisplayName, 
+
+                DrawMarker(spriteBatch,
+                    sub.Info.DisplayName,
                    sub.Info.HasTag(SubmarineTag.Shuttle) ? "shuttle" : "submarine",
                    sub,
                    sub.WorldPosition, transducerCenter, 
@@ -861,10 +966,8 @@ namespace Barotrauma.Items.Components

            foreach (Submarine submarine in Submarine.Loaded)
            {
-                if (UseTransducers ?
-                    !connectedTransducers.Any(t => submarine == t.Transducer.Item.Submarine || submarine.DockedTo.Contains(t.Transducer.Item.Submarine)) :
-                    submarine != item.Submarine && !submarine.DockedTo.Contains(item.Submarine)) continue;
-                if (submarine.HullVertices == null) continue;
+                if (!connectedSubs.Contains(submarine)) { continue; }
+                if (submarine.HullVertices == null) { continue; }

                Vector2 offset = ConvertUnits.ToSimUnits(submarine.WorldPosition - transducerCenter);

@@ -948,8 +1051,8 @@ namespace Barotrauma.Items.Components
                //don't show the docking ports of the opposing team on the sonar
                if (item.Submarine != null)
                {
-                    if ((dockingPort.Item.Submarine.TeamID == Character.TeamType.Team1 && item.Submarine.TeamID == Character.TeamType.Team2) ||
-                        (dockingPort.Item.Submarine.TeamID == Character.TeamType.Team2 && item.Submarine.TeamID == Character.TeamType.Team1))
+                    if ((dockingPort.Item.Submarine.TeamID == CharacterTeamType.Team1 && item.Submarine.TeamID == CharacterTeamType.Team2) ||
+                        (dockingPort.Item.Submarine.TeamID == CharacterTeamType.Team2 && item.Submarine.TeamID == CharacterTeamType.Team1))
                    {
                        continue;
                    }
@@ -1075,8 +1178,7 @@ namespace Barotrauma.Items.Components

            for (var pingIndex = 0; pingIndex < activePingsCount; ++pingIndex)
            {
-                var activePing = activePings[pingIndex];
-                foreach (LevelObject levelObject in Level.Loaded.LevelObjectManager.GetAllObjects(pingSource, range * activePing.State))
+                foreach (LevelObject levelObject in nearbyObjects)
                {
                    if (levelObject.ActivePrefab?.SonarDisruption <= 0.0f) { continue; }

@@ -1157,19 +1259,10 @@ namespace Barotrauma.Items.Components

            foreach (Submarine submarine in Submarine.Loaded)
            {
-                if (submarine.HullVertices == null) continue;
+                if (submarine.HullVertices == null) { continue; }
                if (!DetectSubmarineWalls)
                {
-                    if (UseTransducers)
-                    {
-                        if (connectedTransducers.Any(t => submarine == t.Transducer.Item.Submarine || 
-                            submarine.DockedTo.Contains(t.Transducer.Item.Submarine))) continue;
-                    }
-                    else
-                    {
-                        if (item.Submarine == submarine) continue;
-                        if (item.Submarine != null && item.Submarine.DockedTo.Contains(submarine)) continue;
-                    }
+                    if (connectedSubs.Contains(submarine)) { continue; }                    
                }

                for (int i = 0; i < submarine.HullVertices.Count; i++)
@@ -1209,9 +1302,9 @@ namespace Barotrauma.Items.Components
                {
                    foreach (Voronoi2.GraphEdge edge in cell.Edges)
                    {
-                        if (!edge.IsSolid) continue;
+                        if (!edge.IsSolid) { continue; }
                        float cellDot = Vector2.Dot(cell.Center - pingSource, (edge.Center + cell.Translation) - cell.Center);
-                        if (cellDot > 0) continue;
+                        if (cellDot > 0) { continue; }

                        float facingDot = Vector2.Dot(
                            Vector2.Normalize(edge.Point1 - edge.Point2),
@@ -1222,7 +1315,8 @@ namespace Barotrauma.Items.Components
                            edge.Point2 + cell.Translation,
                            pingSource, transducerPos,
                            pingRadius, prevPingRadius,
-                            350.0f, 3.0f * (Math.Abs(facingDot) + 1.0f), range, pingStrength, passive);
+                            350.0f, 3.0f * (Math.Abs(facingDot) + 1.0f), range, pingStrength, passive,
+                            blipType : cell.IsDestructible ? BlipType.Destructible : BlipType.Default);
                    }
                }

@@ -1311,7 +1405,7 @@ namespace Barotrauma.Items.Components
        }
        
        private void CreateBlipsForLine(Vector2 point1, Vector2 point2, Vector2 pingSource, Vector2 transducerPos, float pingRadius, float prevPingRadius,
-            float lineStep, float zStep, float range, float pingStrength, bool passive)
+            float lineStep, float zStep, float range, float pingStrength, bool passive, BlipType blipType = BlipType.Default)
        {
            lineStep /= zoom;
            zStep /= zoom;
@@ -1327,13 +1421,13 @@ namespace Barotrauma.Items.Components
                //ignore if outside the display
                Vector2 transducerDiff = point - transducerPos;
                Vector2 transducerDisplayDiff = transducerDiff * displayScale;
-                if (transducerDisplayDiff.LengthSquared() > DisplayRadius * DisplayRadius) continue;
+                if (transducerDisplayDiff.LengthSquared() > DisplayRadius * DisplayRadius) { continue; }

                //ignore if the point is not within the ping
                Vector2 pointDiff = point - pingSource;
                Vector2 displayPointDiff = pointDiff * displayScale;
                float displayPointDistSqr = displayPointDiff.LengthSquared();
-                if (displayPointDistSqr < prevPingRadius * prevPingRadius || displayPointDistSqr > pingRadius * pingRadius) continue;
+                if (displayPointDistSqr < prevPingRadius * prevPingRadius || displayPointDistSqr > pingRadius * pingRadius) { continue; }

                //ignore if direction is disrupted
                float transducerDist = transducerDiff.Length();
@@ -1348,7 +1442,7 @@ namespace Barotrauma.Items.Components
                        break;
                    }
                }
-                if (disrupted) continue;
+                if (disrupted) { continue; }

                float displayPointDist = (float)Math.Sqrt(displayPointDistSqr);
                float alpha = pingStrength * Rand.Range(1.5f, 2.0f);
@@ -1360,8 +1454,8 @@ namespace Barotrauma.Items.Components
                    int minDist = (int)(200 / zoom);
                    sonarBlips.RemoveAll(b => b.FadeTimer < fadeTimer && Math.Abs(pos.X - b.Position.X) < minDist && Math.Abs(pos.Y - b.Position.Y) < minDist);

-                    var blip = new SonarBlip(pos, fadeTimer, 1.0f + ((displayPointDist + z) / DisplayRadius));
-                    if (!passive && !CheckBlipVisibility(blip, transducerPos)) continue;
+                    var blip = new SonarBlip(pos, fadeTimer, 1.0f + ((displayPointDist + z) / DisplayRadius), blipType);
+                    if (!passive && !CheckBlipVisibility(blip, transducerPos)) { continue; }

                    sonarBlips.Add(blip);
                    zStep += 0.5f / zoom;
@@ -1375,7 +1469,7 @@ namespace Barotrauma.Items.Components
                        alpha -= 0.1f;
                    }

-                    if (alpha < 0) break;
+                    if (alpha < 0) { break; }
                }
            }
        }
@@ -1404,6 +1498,30 @@ namespace Barotrauma.Items.Components
            return true;
        }

+        /// <summary>
+        /// Based largely on existing CheckBlipVisibility() code
+        /// </summary>
+        private bool CheckResourceMarkerVisibility(Vector2 resourcePos, Vector2 transducerPos)
+        {
+            var distSquared = Vector2.DistanceSquared(transducerPos, resourcePos);
+            if (distSquared > Range * Range)
+            {
+                return false;
+            }
+            if (currentPingIndex != -1 && activePings[currentPingIndex].IsDirectional)
+            {
+                var pos = (resourcePos - transducerPos) * displayScale * zoom;
+                pos.Y = -pos.Y;
+                var length = pos.Length();
+                var dir = pos / length;
+                if (Vector2.Dot(activePings[currentPingIndex].Direction, dir) < DirectionalPingDotProduct)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
        private void DrawBlip(SpriteBatch spriteBatch, SonarBlip blip, Vector2 transducerPos, Vector2 center, float strength, float blipScale)
        {
            strength = MathHelper.Clamp(strength, 0.0f, 1.0f);
@@ -1524,13 +1642,14 @@ namespace Barotrauma.Items.Components
                }
            }

-            if (string.IsNullOrEmpty(iconIdentifier) || !targetIcons.ContainsKey(iconIdentifier))
+            if (iconIdentifier == null || !targetIcons.ContainsKey(iconIdentifier))
            {
                GUI.DrawRectangle(spriteBatch, new Rectangle((int)markerPos.X - 3, (int)markerPos.Y - 3, 6, 6), markerColor, thickness: 2);
            }
            else
            {
-                targetIcons[iconIdentifier].Draw(spriteBatch, markerPos);
+                var iconInfo = targetIcons[iconIdentifier];
+                iconInfo.Item1.Draw(spriteBatch, markerPos, iconInfo.Item2);
            }

            if (alpha <= 0.0f) { return; }
@@ -1561,9 +1680,9 @@ namespace Barotrauma.Items.Components
            screenBackground?.Remove();
            lineSprite?.Remove();

-            foreach (Sprite sprite in targetIcons.Values)
+            foreach (var t in targetIcons.Values)
            {
-                sprite.Remove();
+                t.Item1.Remove();
            }
            targetIcons.Clear();