v1.0.20.1 (summer patch)

2023-06-15 16:46:54 +03:00
parent 6acac1d143
commit 83de72e3d2
209 changed files with 4497 additions and 2488 deletions
@@ -73,6 +73,7 @@ namespace Barotrauma.Items.Components
                Step = 0.05f,
                OnMoved = (GUIScrollBar scrollBar, float barScroll) =>
                {
+                    lastReceivedTargetForce = null;
                    float newTargetForce = barScroll * 200.0f - 100.0f;
                    if (Math.Abs(newTargetForce - targetForce) < 0.01) { return false; }

@@ -15,7 +15,7 @@ namespace Barotrauma.Items.Components
        private GUIFrame selectedItemFrame;
        private GUIFrame selectedItemReqsFrame;

-        private GUITextBlock amountTextMin, amountTextMax;
+        private GUITextBlock amountTextMax;
        private GUIScrollBar amountInput;

        public GUIButton ActivateButton
@@ -29,6 +29,9 @@ namespace Barotrauma.Items.Components
        private GUIComponent outputSlot;
        private GUIComponent inputInventoryHolder, outputInventoryHolder;

+        private readonly List<GUIButton> itemCategoryButtons = new List<GUIButton>();
+        private MapEntityCategory? selectedItemCategory;
+
        public FabricationRecipe SelectedItem
        {
            get { return selectedItem; }
@@ -77,7 +80,67 @@ namespace Barotrauma.Items.Components
                AutoScaleVertical = true
            };

-            var mainFrame = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.95f), paddedFrame.RectTransform, Anchor.Center), childAnchor: Anchor.TopCenter)
+            var innerArea = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.95f), paddedFrame.RectTransform, Anchor.Center), isHorizontal: true)
+            {
+                RelativeSpacing = 0.01f,
+                Stretch = true,
+                CanBeFocused = true
+            };
+
+            List<MapEntityCategory> itemCategories = Enum.GetValues<MapEntityCategory>().ToList();
+            itemCategories.Remove(MapEntityCategory.None);
+            itemCategories.RemoveAll(c => fabricationRecipes.None(f => f.Value?.TargetItem is ItemPrefab ti && ti.Category.HasFlag(c)));
+            itemCategoryButtons.Clear();
+
+            //only create category buttons if there's more than one category in addition to "All"
+            if (itemCategories.Count > 2)
+            {
+                // ===  Item category buttons ===
+                var categoryButtonContainer = new GUILayoutGroup(new RectTransform(new Vector2(0.05f, 1.0f), innerArea.RectTransform))
+                {
+                    RelativeSpacing = 0.01f
+                };
+
+                int buttonSize = Math.Min(categoryButtonContainer.Rect.Width, categoryButtonContainer.Rect.Height / itemCategories.Count);
+
+                var categoryButton = new GUIButton(new RectTransform(new Point(buttonSize), categoryButtonContainer.RectTransform), style: "CategoryButton.All")
+                {
+                    ToolTip = TextManager.Get("MapEntityCategory.All"),
+                    OnClicked = OnClickedCategoryButton
+                };
+                itemCategoryButtons.Add(categoryButton);
+                foreach (MapEntityCategory category in itemCategories)
+                {
+                    categoryButton = new GUIButton(new RectTransform(new Point(buttonSize), categoryButtonContainer.RectTransform),
+                        style: "CategoryButton." + category)
+                    {
+                        ToolTip = TextManager.Get("MapEntityCategory." + category),
+                        UserData = category,
+                        OnClicked = OnClickedCategoryButton
+                    };
+                    itemCategoryButtons.Add(categoryButton);
+                }
+                bool OnClickedCategoryButton(GUIButton button, object userData)
+                {
+                    MapEntityCategory? newCategory = !button.Selected ? (MapEntityCategory?)userData : null;
+                    if (newCategory.HasValue) { itemFilterBox.Text = ""; }
+                    selectedItemCategory = newCategory;
+                    FilterEntities(newCategory, itemFilterBox.Text);
+                    return true;
+                }
+                foreach (var btn in itemCategoryButtons)
+                {
+                    btn.RectTransform.SizeChanged += () =>
+                    {
+                        if (btn.Frame.sprites == null || !btn.Frame.sprites.TryGetValue(GUIComponent.ComponentState.None, out var spriteList)) { return; }
+                        var sprite = spriteList?.First();
+                        if (sprite == null) { return; }
+                        btn.RectTransform.NonScaledSize = new Point(btn.Rect.Width, (int)(btn.Rect.Width * ((float)sprite.Sprite.SourceRect.Height / sprite.Sprite.SourceRect.Width)));
+                    };
+                }
+            }            
+
+            var mainFrame = new GUILayoutGroup(new RectTransform(Vector2.One, innerArea.RectTransform), childAnchor: Anchor.TopCenter)
            {
                RelativeSpacing = 0.02f,
                Stretch = true,
@@ -105,10 +168,13 @@ namespace Barotrauma.Items.Components
                                Padding = Vector4.Zero, 
                                AutoScaleVertical = true
                            };
-                            itemFilterBox = new GUITextBox(new RectTransform(new Vector2(0.8f, 1.0f), filterArea.RectTransform), createClearButton: true);
+                            itemFilterBox = new GUITextBox(new RectTransform(new Vector2(0.8f, 1.0f), filterArea.RectTransform), createClearButton: true)
+                            {
+                                OverflowClip = true
+                            };
                            itemFilterBox.OnTextChanged += (textBox, text) =>
                            {
-                                FilterEntities(text); 
+                                FilterEntities(selectedItemCategory, text); 
                                return true;
                            };
                            filterArea.RectTransform.MaxSize = new Point(int.MaxValue, itemFilterBox.Rect.Height);
@@ -174,7 +240,7 @@ namespace Barotrauma.Items.Components
                    Stretch = true
                };

-                amountTextMin = new GUITextBlock(new RectTransform(new Vector2(0.15f, 1.0f), amountInputHolder.RectTransform), "1", textAlignment: Alignment.Center);
+                new GUITextBlock(new RectTransform(new Vector2(0.15f, 1.0f), amountInputHolder.RectTransform), "1", textAlignment: Alignment.Center);

                amountInput = new GUIScrollBar(new RectTransform(new Vector2(0.7f, 1.0f), amountInputHolder.RectTransform), barSize: 0.1f, style: "GUISlider")
                {
@@ -489,15 +555,37 @@ namespace Barotrauma.Items.Components
                        inputContainer.Inventory.visualSlots[slotIndex].ShowBorderHighlight(GUIStyle.Green, 0.5f, 0.5f, 0.2f);
                    }

-                    var requiredItemPrefab = requiredItem.FirstMatchingPrefab;
-                    var itemIcon = requiredItemPrefab.InventoryIcon ?? requiredItemPrefab.Sprite;
                    Rectangle slotRect = inputContainer.Inventory.visualSlots[slotIndex].Rect;
-                    itemIcon.Draw(
-                        spriteBatch,
-                        slotRect.Center.ToVector2(),
-                        color: requiredItemPrefab.InventoryIconColor * 0.3f,
-                        scale: Math.Min(slotRect.Width / itemIcon.size.X, slotRect.Height / itemIcon.size.Y));
-                                        
+
+                    var requiredItemPrefab = requiredItem.FirstMatchingPrefab;
+
+                    float iconAlpha = 0.0f;
+                    ItemPrefab requiredItemToDisplay;
+                    int count = requiredItem.ItemPrefabs.Count();
+                    if (count > 1)
+                    {
+                        float iconCycleSpeed = 0.5f / count;
+                        float iconCycleT = (float)Timing.TotalTime * iconCycleSpeed;
+                        int iconIndex = (int)(iconCycleT % requiredItem.ItemPrefabs.Count());
+
+                        requiredItemToDisplay = requiredItem.ItemPrefabs.Skip(iconIndex).FirstOrDefault();
+                        iconAlpha = Math.Min(Math.Abs(MathF.Sin(iconCycleT * MathHelper.Pi)) * 2.0f, 1.0f);
+                    }
+                    else
+                    {
+                        requiredItemToDisplay = requiredItem.ItemPrefabs.FirstOrDefault();
+                        iconAlpha = 1.0f;
+                    }
+                    if (iconAlpha > 0.0f)
+                    {
+                        var itemIcon = requiredItemToDisplay.InventoryIcon ?? requiredItemToDisplay.Sprite;
+                        itemIcon.Draw(
+                            spriteBatch,
+                            slotRect.Center.ToVector2(),
+                            color: requiredItemToDisplay.InventoryIconColor * 0.3f * iconAlpha,
+                            scale: Math.Min(slotRect.Width * 0.9f / itemIcon.size.X, slotRect.Height * 0.9f / itemIcon.size.Y));
+                    }
+
                    if (missingCount > 1)
                    {
                        Vector2 stackCountPos = new Vector2(slotRect.Right, slotRect.Bottom);
@@ -552,7 +640,11 @@ namespace Barotrauma.Items.Components
                        }

                        toolTipText = $"‖color:{Color.White.ToStringHex()}‖{toolTipText}‖color:end‖";
-                        if (!requiredItemPrefab.Description.IsNullOrEmpty())
+                        if (!requiredItem.OverrideDescription.IsNullOrEmpty())
+                        {
+                            toolTipText += '\n' + requiredItem.OverrideDescription;
+                        }
+                        else if (!requiredItemPrefab.Description.IsNullOrEmpty())
                        {
                            toolTipText += '\n' + requiredItemPrefab.Description;
                        }
@@ -601,22 +693,21 @@ namespace Barotrauma.Items.Components
            }
        }

-        private bool FilterEntities(string filter)
+        private bool FilterEntities(MapEntityCategory? category, string filter)
        {
-            if (string.IsNullOrWhiteSpace(filter))
+            foreach (GUIComponent child in itemList.Content.Children)
            {
-                itemList.Content.Children.ForEach(c => c.Visible = true);
-            }
-            else
-            {
-                foreach (GUIComponent child in itemList.Content.Children)
-                {
-                    FabricationRecipe recipe = child.UserData as FabricationRecipe;
-                    if (recipe?.DisplayName == null) { continue; }
-                    child.Visible = recipe.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase);
-                }
-            }
+                FabricationRecipe recipe = child.UserData as FabricationRecipe;
+                if (recipe?.DisplayName == null) { continue; }
+                child.Visible =
+                    (string.IsNullOrWhiteSpace(filter) || recipe.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase)) &&
+                    (!category.HasValue || recipe.TargetItem.Category.HasFlag(category.Value));
+            }            

+            foreach (GUIButton btn in itemCategoryButtons)
+            {
+                btn.Selected = (MapEntityCategory?)btn.UserData == selectedItemCategory;
+            }
            HideEmptyItemListCategories();

            return true;
@@ -648,7 +739,7 @@ namespace Barotrauma.Items.Components

        public bool ClearFilter()
        {
-            FilterEntities("");
+            FilterEntities(selectedItemCategory, "");
            itemList.UpdateScrollBarSize();
            itemList.BarScroll = 0.0f;
            itemFilterBox.Text = "";
@@ -737,6 +828,7 @@ namespace Barotrauma.Items.Components
                    TextManager.Get("FabricatorRequiredSkills"), textColor: inadequateSkills.Any() ? GUIStyle.Red : GUIStyle.Green, font: GUIStyle.SubHeadingFont)
                {
                    AutoScaleHorizontal = true,
+                    ToolTip = TextManager.Get("fabricatorrequiredskills.tooltip")
                };
                foreach (Skill skill in selectedItem.RequiredSkills)
                {
@@ -125,18 +125,15 @@ namespace Barotrauma.Items.Components
    {
        public static MiniMapSettings Default = new MiniMapSettings
        (
-            ignoreOutposts: false,
            createHullElements: true,
            elementColor: MiniMap.MiniMapBaseColor
        );

-        public readonly bool IgnoreOutposts;
        public readonly bool CreateHullElements;
        public readonly Color ElementColor;

-        public MiniMapSettings(bool ignoreOutposts = false, bool createHullElements = false, Color? elementColor = null)
+        public MiniMapSettings(bool createHullElements = false, Color? elementColor = null)
        {
-            IgnoreOutposts = ignoreOutposts;
            CreateHullElements = createHullElements;
            ElementColor = elementColor ?? MiniMap.MiniMapBaseColor;
        }
@@ -437,7 +434,11 @@ namespace Barotrauma.Items.Components
            prevResolution = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
            submarineContainer.ClearChildren();

-            if (item.Submarine is null) { return; }
+            if (item.Submarine is null) 
+            {
+                displayedSubs.Clear();
+                return; 
+            }

            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 };
@@ -445,8 +446,8 @@ namespace Barotrauma.Items.Components
            ImmutableHashSet<Item> hullPointsOfInterest = Item.ItemList.Where(it => item.Submarine.IsEntityFoundOnThisSub(it, includingConnectedSubs: true) && !it.HiddenInGame && !it.NonInteractable && it.Prefab.ShowInStatusMonitor && (it.GetComponent<Door>() != null || it.GetComponent<Turret>() != null)).ToImmutableHashSet();
            miniMapFrame = CreateMiniMap(item.Submarine, submarineContainer, MiniMapSettings.Default, hullPointsOfInterest, out hullStatusComponents);

-            IEnumerable<Item> electrialPointsOfInterest = Item.ItemList.Where(it => item.Submarine.IsEntityFoundOnThisSub(it, includingConnectedSubs: true) && !it.HiddenInGame && !it.NonInteractable && it.GetComponent<Repairable>() != null);
-            electricalFrame = CreateMiniMap(item.Submarine, miniMapContainer, new MiniMapSettings(createHullElements: false), electrialPointsOfInterest, out electricalMapComponents);
+            IEnumerable<Item> electricalPointsOfInterest = Item.ItemList.Where(it => item.Submarine.IsEntityFoundOnThisSub(it, includingConnectedSubs: true) && !it.HiddenInGame && !it.NonInteractable && it.GetComponent<Repairable>() != null);
+            electricalFrame = CreateMiniMap(item.Submarine, miniMapContainer, new MiniMapSettings(createHullElements: false), electricalPointsOfInterest, out electricalMapComponents);

            Dictionary<MiniMapGUIComponent, GUIComponent> electricChildren = new Dictionary<MiniMapGUIComponent, GUIComponent>();

@@ -536,7 +537,7 @@ namespace Barotrauma.Items.Components

            displayedSubs.Clear();
            displayedSubs.Add(item.Submarine);
-            displayedSubs.AddRange(item.Submarine.DockedTo);
+            displayedSubs.AddRange(item.Submarine.DockedTo.Where(s => s.TeamID == item.Submarine.TeamID));

            subEntities = MapEntity.mapEntityList.Where(me => (item.Submarine is { } sub && sub.IsEntityFoundOnThisSub(me, includingConnectedSubs: true, allowDifferentType: false)) && !me.HiddenInGame).OrderByDescending(w => w.SpriteDepth).ToList();

@@ -551,7 +552,7 @@ namespace Barotrauma.Items.Components
                item.Submarine is { } itemSub &&
                (
                    !displayedSubs.Contains(itemSub) ||                                                                     // current sub not displayed
-                    itemSub.DockedTo.Any(s => !displayedSubs.Contains(s) && itemSub.ConnectedDockingPorts[s].IsLocked) ||   // 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) ||   // some of the docked subs not displayed
                    displayedSubs.Any(s => s != itemSub && !itemSub.DockedTo.Contains(s))                                   // displaying a sub that shouldn't be displayed
                ) ||
                prevResolution.X != GameMain.GraphicsWidth || prevResolution.Y != GameMain.GraphicsHeight || // resolution changed
@@ -731,7 +732,7 @@ namespace Barotrauma.Items.Components
                if (sprite != null && ShowHullIntegrity)
                {
                    Vector2 spriteSize = sprite.size;
-                    Rectangle worldBorders = item.Submarine.GetDockedBorders();
+                    Rectangle worldBorders = item.Submarine.GetDockedBorders(allowDifferentTeam: false);
                    worldBorders.Location += item.Submarine.WorldPosition.ToPoint();
                    foreach (Gap gap in Gap.GapList)
                    {
@@ -915,7 +916,7 @@ namespace Barotrauma.Items.Components
            }


-            RectangleF dockedBorders = item.Submarine.GetDockedBorders();
+            RectangleF dockedBorders = item.Submarine.GetDockedBorders(allowDifferentTeam: false);
            dockedBorders.Location += item.Submarine.WorldPosition;
            RectangleF parentRect = miniMapFrame.Rect;

@@ -1305,7 +1306,7 @@ namespace Barotrauma.Items.Components
            GameMain.Instance.GraphicsDevice.SetRenderTarget(rt);
            GameMain.Instance.GraphicsDevice.Clear(Color.Transparent);
            spriteBatch.Begin(SpriteSortMode.Deferred, samplerState: GUI.SamplerState, rasterizerState: GameMain.ScissorTestEnable);
-            Rectangle worldBorders = sub.GetDockedBorders();
+            Rectangle worldBorders = sub.GetDockedBorders(allowDifferentTeam: false);
            worldBorders.Location += sub.WorldPosition.ToPoint();

            parentRect.Inflate(-inflate, -inflate);
@@ -1526,7 +1527,7 @@ namespace Barotrauma.Items.Components

            Dictionary<MapEntity, MiniMapGUIComponent> pointsOfInterestCollection = new Dictionary<MapEntity, MiniMapGUIComponent>();

-            RectangleF worldBorders = sub.GetDockedBorders();
+            RectangleF worldBorders = sub.GetDockedBorders(allowDifferentTeam: false);
            worldBorders.Location += sub.WorldPosition;

            // create a container that has the same "aspect ratio" as the sub
@@ -1539,7 +1540,7 @@ namespace Barotrauma.Items.Components

            GUIFrame hullContainer = new GUIFrame(new RectTransform(containerScale * elementPadding, parent.RectTransform, Anchor.Center), style: null);

-            ImmutableHashSet<Submarine> connectedSubs = sub.GetConnectedSubs().ToImmutableHashSet();
+            ImmutableHashSet<Submarine> connectedSubs = sub.GetConnectedSubs().Where(s => s.TeamID == sub.TeamID).ToImmutableHashSet();
            ImmutableArray<Hull> hullList = ImmutableArray<Hull>.Empty;
            ImmutableDictionary<Hull, ImmutableArray<Hull>> combinedHulls = ImmutableDictionary<Hull, ImmutableArray<Hull>>.Empty;

@@ -1686,7 +1687,7 @@ namespace Barotrauma.Items.Components
            bool IsPartofSub(MapEntity entity)
            {
                if (entity.Submarine != sub && !connectedSubs.Contains(entity.Submarine) || entity.HiddenInGame) { return false; }
-                return !settings.IgnoreOutposts || sub.IsEntityFoundOnThisSub(entity, true);
+                return sub.IsEntityFoundOnThisSub(entity, true);
            }

            bool IsStandaloneHull(Hull hull)
@@ -80,7 +80,7 @@ namespace Barotrauma.Items.Components
        private const float NearbyObjectUpdateInterval = 1.0f;
        float nearbyObjectUpdateTimer;

-        private List<Submarine> connectedSubs = new List<Submarine>();
+        private readonly List<Submarine> connectedSubs = new List<Submarine>();
        private const float ConnectedSubUpdateInterval = 1.0f;
        float connectedSubUpdateTimer;

@@ -335,9 +335,11 @@ namespace Barotrauma.Items.Components
            // Setup layout for nav terminal
            if (isConnectedToSteering || RightLayout)
            {
+                controlContainer.RectTransform.AbsoluteOffset = Point.Zero;
                controlContainer.RectTransform.RelativeOffset = controlBoxOffset;
                controlContainer.RectTransform.SetPosition(Anchor.TopRight);
                sonarView.RectTransform.ScaleBasis = ScaleBasis.Smallest;
+                if (HasMineralScanner) { PreventMineralScannerOverlap(); }
                sonarView.RectTransform.SetPosition(Anchor.CenterLeft);
                sonarView.RectTransform.Resize(GUISizeCalculation);
                GUITextBlock.AutoScaleAndNormalize(textBlocksToScaleAndNormalize);
@@ -431,10 +433,11 @@ namespace Barotrauma.Items.Components
            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")
            {
+                Selected = UseMineralScanner,
                OnClicked = (button, data) =>
                {
-                    useMineralScanner = !useMineralScanner;
-                    button.Selected = useMineralScanner;
+                    UseMineralScanner = !UseMineralScanner;
+                    button.Selected = UseMineralScanner;
                    if (GameMain.Client != null)
                    {
                        unsentChanges = true;
@@ -496,12 +499,12 @@ namespace Barotrauma.Items.Components
                    {
                        if (transducer.Transducer.Item.Submarine == null) { continue; }
                        if (connectedSubs.Contains(transducer.Transducer.Item.Submarine)) { continue; }
-                        connectedSubs = transducer.Transducer.Item.Submarine?.GetConnectedSubs();
+                        connectedSubs.AddRange(transducer.Transducer.Item.Submarine.GetConnectedSubs());
                    }
                }
                else if (item.Submarine != null)
                {
-                    connectedSubs = item.Submarine?.GetConnectedSubs();
+                    connectedSubs.AddRange(item.Submarine?.GetConnectedSubs());
                }
                connectedSubUpdateTimer = ConnectedSubUpdateInterval;
            }
@@ -1032,7 +1035,7 @@ namespace Barotrauma.Items.Components
                missionIndex++;
            }

-            if (HasMineralScanner && useMineralScanner && CurrentMode == Mode.Active && MineralClusters != null &&
+            if (HasMineralScanner && UseMineralScanner && CurrentMode == Mode.Active && MineralClusters != null &&
                (item.CurrentHull == null || !DetectSubmarineWalls))
            {
                foreach (var c in MineralClusters)
@@ -1512,9 +1515,10 @@ namespace Barotrauma.Items.Components
                }
            }

-            foreach (Item item in Item.ItemList)
+            foreach (Item item in Item.SonarVisibleItems)
            {
-                if (item.CurrentHull == null && item.Prefab.SonarSize > 0.0f)
+                System.Diagnostics.Debug.Assert(item.Prefab.SonarSize > 0.0f);
+                if (item.CurrentHull == null)
                {
                    float pointDist = ((item.WorldPosition - pingSource) * displayScale).LengthSquared();
                    if (pointDist > prevPingRadiusSqr && pointDist < pingRadiusSqr)
@@ -1922,7 +1926,7 @@ namespace Barotrauma.Items.Components
                    float pingAngle = MathUtils.WrapAngleTwoPi(MathUtils.VectorToAngle(pingDirection));
                    msg.WriteRangedSingle(MathUtils.InverseLerp(0.0f, MathHelper.TwoPi, pingAngle), 0.0f, 1.0f, 8);
                }
-                msg.WriteBoolean(useMineralScanner);
+                msg.WriteBoolean(UseMineralScanner);
            }
        }
        
@@ -1934,7 +1938,7 @@ namespace Barotrauma.Items.Components
            float zoomT             = 1.0f;
            bool directionalPing    = useDirectionalPing;
            float directionT        = 0.0f;
-            bool mineralScanner     = useMineralScanner;
+            bool mineralScanner     = UseMineralScanner;
            if (isActive)
            {
                zoomT = msg.ReadRangedSingle(0.0f, 1.0f, 8);
@@ -1965,7 +1969,7 @@ namespace Barotrauma.Items.Components
                    pingDirection = new Vector2((float)Math.Cos(pingAngle), (float)Math.Sin(pingAngle));
                }
                useDirectionalPing = directionalModeSwitch.Selected = directionalPing;
-                useMineralScanner = mineralScanner;
+                UseMineralScanner = mineralScanner;
                if (mineralScannerSwitch != null)
                {
                    mineralScannerSwitch.Selected = mineralScanner;
@@ -1982,7 +1986,7 @@ namespace Barotrauma.Items.Components
            directionalModeSwitch.Selected = useDirectionalPing;
            if (mineralScannerSwitch != null)
            {
-                mineralScannerSwitch.Selected = useMineralScanner;
+                mineralScannerSwitch.Selected = UseMineralScanner;
            }
        }
    }
@@ -178,8 +178,9 @@ namespace Barotrauma.Items.Components
            var autoPilotControls = new GUIFrame(new RectTransform(new Vector2(0.75f, 0.62f), paddedControlContainer.RectTransform, Anchor.BottomCenter), "OutlineFrame");
            var paddedAutoPilotControls = new GUIFrame(new RectTransform(new Vector2(0.92f, 0.88f), autoPilotControls.RectTransform, Anchor.Center), style: null);

+            int textLimit = (int)(paddedAutoPilotControls.Rect.Width * 0.75f);
            maintainPosTickBox = new GUITickBox(new RectTransform(new Vector2(1, 0.333f), paddedAutoPilotControls.RectTransform, Anchor.TopCenter),
-                TextManager.Get("SteeringMaintainPos"), font: GUIStyle.SmallFont, style: "GUIRadioButton")
+                ToolBox.LimitString(TextManager.Get("SteeringMaintainPos"), GUIStyle.SmallFont, textLimit), font: GUIStyle.SmallFont, style: "GUIRadioButton")
            {
                UserData = UIHighlightAction.ElementId.MaintainPosTickBox,
                Enabled = autoPilot,
@@ -214,7 +215,6 @@ namespace Barotrauma.Items.Components
                    return true;
                }
            };
-            int textLimit = (int)(paddedAutoPilotControls.Rect.Width * 0.75f);
            levelStartTickBox = new GUITickBox(new RectTransform(new Vector2(1, 0.333f), paddedAutoPilotControls.RectTransform, Anchor.Center),
                GameMain.GameSession?.StartLocation == null ? "" : ToolBox.LimitString(GameMain.GameSession.StartLocation.Name, GUIStyle.SmallFont, textLimit),
                font: GUIStyle.SmallFont, style: "GUIRadioButton")