Unstable 0.1300.0.3

2021-03-25 15:40:24 +02:00
parent 874616027b
commit 58c50a235d
136 changed files with 2486 additions and 1008 deletions
@@ -168,6 +168,7 @@ namespace Barotrauma
            {
                chatBox.ToggleButton = new GUIButton(new RectTransform(new Point((int)(182f * GUI.Scale * 0.4f), (int)(99f * GUI.Scale * 0.4f)), chatBox.GUIFrame.Parent.RectTransform), style: "ChatToggleButton")
                {
+                    ToolTip = TextManager.Get("chat"),
                    ClampMouseRectToParent = false
                };
                chatBox.ToggleButton.RectTransform.AbsoluteOffset = new Point(0, HUDLayoutSettings.ChatBoxArea.Height - chatBox.ToggleButton.Rect.Height);
@@ -289,19 +290,7 @@ namespace Barotrauma
                new RectTransform(crewListEntrySize, parent: crewList.Content.RectTransform, anchor: Anchor.TopRight),
                style: "CrewListBackground")
            {
-                UserData = character,
-                OnSecondaryClicked = (comp, data) =>
-                {
-                    if (data == null) { return false; }
-                    
-                    var client = GameMain.NetworkMember?.ConnectedClients?.Find(c => c.Character == data);
-                    if (client != null)
-                    {
-                        CreateModerationContextMenu(PlayerInput.MousePosition.ToPoint(), client);
-                        return true;
-                    }
-                    return false;
-                }
+                UserData = character
            };

            var iconRelativeWidth = (float)crewListEntrySize.Y / background.Rect.Width;
@@ -379,7 +368,17 @@ namespace Barotrauma
                    background.RectTransform),
                style: null)
            {
-                UserData = character
+                UserData = character,
+                OnSecondaryClicked = (comp, data) =>
+                {
+                    if (data == null) { return false; }
+                    if (GameMain.NetworkMember?.ConnectedClients?.Find(c => c.Character == data) is Client client)
+                    {
+                        CreateModerationContextMenu(PlayerInput.MousePosition.ToPoint(), client);
+                        return true;
+                    }
+                    return false;
+                }
            };
            SetCharacterButtonTooltip(characterButton);

@@ -389,7 +388,6 @@ namespace Barotrauma
            }
            else
            {
-                characterButton.CanBeFocused = false;
                characterButton.CanBeSelected = false;
            }

@@ -1089,7 +1087,8 @@ namespace Barotrauma
        public void CreateModerationContextMenu(Point mousePos, Client client)
        {
            if (GUIContextMenu.CurrentContextMenu != null) { return; }
-            if (IsSinglePlayer || client == null || (!GameMain.Client?.PreviouslyConnectedClients?.Contains(client) ?? true)) { return; }
+            if (IsSinglePlayer || client == null || ((!GameMain.Client?.PreviouslyConnectedClients?.Contains(client)) ?? true)) { return; }
+

            bool hasSteam = client.SteamID > 0 && SteamManager.IsInitialized,
                 canKick  = GameMain.Client.HasPermission(ClientPermissions.Kick),
@@ -1638,7 +1637,8 @@ namespace Barotrauma
 #if DEBUG
            if (Character.Controlled == null) { return true; }
 #endif
-            return Character.Controlled != null && characters.Any(c => c != Character.Controlled && c.CanHearCharacter(Character.Controlled));
+            return Character.Controlled != null && 
+                (characters.Any(c => c != Character.Controlled && c.CanHearCharacter(Character.Controlled)) || GetOrderableFriendlyNPCs().Any(c => c != Character.Controlled && c.CanHearCharacter(Character.Controlled)));
        }

        private Entity FindEntityContext()
@@ -124,22 +124,22 @@ namespace Barotrauma
                {
                    var backgroundSprite = GUI.Style.GetComponentStyle("CommandBackground").GetDefaultSprite();
                    Vector2 centerPos = new Vector2(GameMain.GraphicsWidth, GameMain.GraphicsHeight) / 2;
+                    string wrappedText = ToolBox.WrapText(overlayText, GameMain.GraphicsWidth / 3, GUI.Font);
+                    Vector2 textSize = GUI.Font.MeasureString(wrappedText);
+                    Vector2 textPos = centerPos - textSize / 2;
                    backgroundSprite.Draw(spriteBatch, 
                        centerPos, 
                        Color.White * (overlayTextColor.A / 255.0f), 
                        origin: backgroundSprite.size / 2,
                        rotate: 0.0f,
-                        scale: new Vector2(1.5f, 0.7f) * (GameMain.GraphicsWidth / 3 / backgroundSprite.size.X));
+                        scale: new Vector2(GameMain.GraphicsWidth / 2 / backgroundSprite.size.X, textSize.Y / backgroundSprite.size.Y * 1.5f));

-                    string wrappedText = ToolBox.WrapText(overlayText, GameMain.GraphicsWidth / 3, GUI.Font);
-                    Vector2 textSize = GUI.Font.MeasureString(wrappedText);
-                    Vector2 textPos = centerPos - textSize / 2;
                    GUI.DrawString(spriteBatch, textPos + Vector2.One, wrappedText, Color.Black * (overlayTextColor.A / 255.0f));
                    GUI.DrawString(spriteBatch, textPos, wrappedText, overlayTextColor);

                    if (!string.IsNullOrEmpty(overlayTextBottom))
                    {
-                        Vector2 bottomTextPos = centerPos + new Vector2(0.0f, textSize.Y + 30 * GUI.Scale) - GUI.Font.MeasureString(overlayTextBottom) / 2;
+                        Vector2 bottomTextPos = centerPos + new Vector2(0.0f, textSize.Y / 2 + 40 * GUI.Scale) - GUI.Font.MeasureString(overlayTextBottom) / 2;
                        GUI.DrawString(spriteBatch, bottomTextPos + Vector2.One, overlayTextBottom, Color.Black * (overlayTextColor.A / 255.0f));
                        GUI.DrawString(spriteBatch, bottomTextPos, overlayTextBottom, overlayTextColor);
                    }
@@ -152,7 +152,7 @@ namespace Barotrauma
                if (ReadyCheckButton != null) { ReadyCheckButton.Visible = false; }
                return; 
            }
-            if (Submarine.MainSub == null) { return; }
+            if (Submarine.MainSub == null || Level.Loaded == null) { return; }

            endRoundButton.Visible = false;
            var availableTransition = GetAvailableTransition(out _, out Submarine leavingSub);
@@ -211,6 +211,7 @@ namespace Barotrauma
                    HintManager.OnAvailableTransition(availableTransition);
                    //opening the campaign map pauses the game and prevents HintManager from running -> update it manually to get the hint to show up immediately
                    HintManager.Update();
+                    Map.SelectLocation(-1);
                    endRoundButton.OnClicked(EndRoundButton, null);
                    prevCampaignUIAutoOpenType = availableTransition;
                }
@@ -239,11 +239,20 @@ namespace Barotrauma
                    timer = Math.Min(timer + CoroutineManager.DeltaTime, textDuration);
                    yield return CoroutineStatus.Running;
                }
+                var outpost = GameMain.GameSession.Level.StartOutpost;
+                var borders = outpost.GetDockedBorders();
+                borders.Location += outpost.WorldPosition.ToPoint();
+                GameMain.GameScreen.Cam.Position = new Vector2(borders.X + borders.Width / 2, borders.Y - borders.Height / 2);
+                float startZoom = 0.8f /
+                    ((float)Math.Max(borders.Width, borders.Height) / (float)GameMain.GameScreen.Cam.Resolution.X);
+                GameMain.GameScreen.Cam.MinZoom = Math.Min(startZoom, GameMain.GameScreen.Cam.MinZoom);
                var transition = new CameraTransition(prevControlled, GameMain.GameScreen.Cam,
                    null, null,
                    fadeOut: false,
-                    duration: 5,
-                    startZoom: 1.5f, endZoom: 1.0f)
+                    losFadeIn: true,
+                    waitDuration: 1,
+                    panDuration: 5,
+                    startZoom: startZoom, endZoom: 1.0f)
                {
                    AllowInterrupt = true,
                    RemoveControlFromCharacter = false
@@ -274,7 +283,8 @@ namespace Barotrauma
                var transition = new CameraTransition(Submarine.MainSub, GameMain.GameScreen.Cam,
                    null, null,
                    fadeOut: false,
-                    duration: 5,
+                    losFadeIn: true,
+                    panDuration: 5,
                    startZoom: 0.5f, endZoom: 1.0f)
                {
                    AllowInterrupt = true,
@@ -327,7 +337,7 @@ namespace Barotrauma
            var endTransition = new CameraTransition(Submarine.MainSub, GameMain.GameScreen.Cam, null,
                Alignment.Center,
                fadeOut: false,
-                duration: EndTransitionDuration);
+                panDuration: EndTransitionDuration);
            GameMain.Client.EndCinematic = endTransition;

            Location portraitLocation = Map?.SelectedLocation ?? Map?.CurrentLocation ?? Level.Loaded?.StartLocation;
@@ -335,7 +345,7 @@ namespace Barotrauma
            {
                overlaySprite = portraitLocation.Type.GetPortrait(portraitLocation.PortraitId);
            }
-            float fadeOutDuration = endTransition.Duration;
+            float fadeOutDuration = endTransition.PanDuration;
            float t = 0.0f;
            while (t < fadeOutDuration || endTransition.Running)
            {
@@ -498,7 +508,7 @@ namespace Barotrauma
            var transition = new CameraTransition(endObject ?? Submarine.MainSub, GameMain.GameScreen.Cam,
                null, Alignment.Center,
                fadeOut: true,
-                duration: 10,
+                panDuration: 10,
                startZoom: null, endZoom: 0.2f);

            while (transition.Running)
@@ -298,11 +298,20 @@ namespace Barotrauma
                    timer = Math.Min(timer + CoroutineManager.DeltaTime, textDuration);
                    yield return CoroutineStatus.Running;
                }
+                var outpost = GameMain.GameSession.Level.StartOutpost;
+                var borders = outpost.GetDockedBorders();
+                borders.Location += outpost.WorldPosition.ToPoint();
+                GameMain.GameScreen.Cam.Position = new Vector2(borders.X + borders.Width / 2, borders.Y - borders.Height / 2);
+                float startZoom = 0.8f /
+                    ((float)Math.Max(borders.Width, borders.Height) / (float)GameMain.GameScreen.Cam.Resolution.X);
+                GameMain.GameScreen.Cam.MinZoom = Math.Min(startZoom, GameMain.GameScreen.Cam.MinZoom);
                var transition = new CameraTransition(prevControlled, GameMain.GameScreen.Cam,
                    null, null,
                    fadeOut: false,
-                    duration: 5,
-                    startZoom: 1.5f, endZoom: 1.0f)
+                    losFadeIn: true,
+                    waitDuration: 1,
+                    panDuration: 5,
+                    startZoom: startZoom, endZoom: 1.0f)
                {
                    AllowInterrupt = true,
                    RemoveControlFromCharacter = false
@@ -327,19 +336,13 @@ namespace Barotrauma
            else
            {
                ISpatialEntity transitionTarget;
-                if (prevControlled != null)
-                {
-                    transitionTarget = prevControlled;
-                }
-                else
-                {
-                    transitionTarget = Submarine.MainSub;
-                }
+                transitionTarget = (ISpatialEntity)prevControlled ?? Submarine.MainSub;

                var transition = new CameraTransition(transitionTarget, GameMain.GameScreen.Cam,
                    null, null,
                    fadeOut: false,
-                    duration: 5,
+                    losFadeIn: prevControlled != null,
+                    panDuration: 5,
                    startZoom: 0.5f, endZoom: 1.0f)
                {
                    AllowInterrupt = true,
@@ -409,13 +412,13 @@ namespace Barotrauma
            var endTransition = new CameraTransition(Submarine.MainSub, GameMain.GameScreen.Cam, null,
                transitionType == TransitionType.LeaveLocation ? Alignment.BottomCenter : Alignment.Center,
                fadeOut: false,
-                duration: EndTransitionDuration);
+                panDuration: EndTransitionDuration);

            GUI.ClearMessages();

            Location portraitLocation = Map.SelectedLocation ?? Map.CurrentLocation;
            overlaySprite = portraitLocation.Type.GetPortrait(portraitLocation.PortraitId);
-            float fadeOutDuration = endTransition.Duration;
+            float fadeOutDuration = endTransition.PanDuration;
            float t = 0.0f;
            while (t < fadeOutDuration || endTransition.Running)
            {
@@ -509,7 +512,7 @@ namespace Barotrauma
            var transition = new CameraTransition(endObject ?? Submarine.MainSub, GameMain.GameScreen.Cam,
                null, Alignment.Center,
                fadeOut: true,
-                duration: 10,
+                panDuration: 10,
                startZoom: null, endZoom: 0.2f);

            while (transition.Running)
@@ -614,7 +614,7 @@ namespace Barotrauma.Tutorials
            GameMain.GameScreen.Cam.TargetPos = Vector2.Zero;
            GameMain.LightManager.LosEnabled = false;

-            var cinematic = new CameraTransition(Submarine.MainSub, GameMain.GameScreen.Cam, Alignment.CenterLeft, Alignment.CenterRight, duration: 5.0f);
+            var cinematic = new CameraTransition(Submarine.MainSub, GameMain.GameScreen.Cam, Alignment.CenterLeft, Alignment.CenterRight, panDuration: 5.0f);

            while (cinematic.Running)
            {
@@ -288,7 +288,7 @@ namespace Barotrauma.Tutorials

            yield return new WaitForSeconds(waitBeforeFade);

-            var endCinematic = new CameraTransition(Submarine.MainSub, GameMain.GameScreen.Cam, null, Alignment.Center, duration: fadeOutTime);
+            var endCinematic = new CameraTransition(Submarine.MainSub, GameMain.GameScreen.Cam, null, Alignment.Center, panDuration: fadeOutTime);
            currentTutorialCompleted = Completed = true;
            while (endCinematic.Running) yield return null;
            Stop();
@@ -40,56 +40,82 @@ namespace Barotrauma

        private GUILayoutGroup topLeftButtonGroup;
        private GUIButton crewListButton, commandButton, tabMenuButton;
-        private GUILayoutGroup TopLeftButtonGroup
-        {
-            get
-            {
-                if (topLeftButtonGroup == null)
-                {
-                    topLeftButtonGroup = new GUILayoutGroup(HUDLayoutSettings.ToRectTransform(HUDLayoutSettings.ButtonAreaTop, GUI.Canvas), isHorizontal: true, childAnchor: Anchor.CenterLeft)
-                    {
-                        AbsoluteSpacing = HUDLayoutSettings.Padding,
-                        CanBeFocused = false
-                    };

-                    int buttonHeight = GUI.IntScale(40);
-                    Vector2 buttonSpriteSize = GUI.Style.GetComponentStyle("CrewListToggleButton").GetDefaultSprite().size;
-                    int buttonWidth = (int)((buttonHeight / buttonSpriteSize.Y) * buttonSpriteSize.X);
-                    Point buttonSize = new Point(buttonWidth, buttonHeight);
-                    // Crew list button
-                    crewListButton = new GUIButton(new RectTransform(buttonSize, parent: topLeftButtonGroup.RectTransform), style: "CrewListToggleButton")
-                    {
-                        ToolTip = TextManager.GetWithVariable("hudbutton.crewlist", "[key]", GameMain.Config.KeyBindText(InputType.CrewOrders)),
-                        OnClicked = (GUIButton btn, object userdata) =>
-                        {
-                            if (CrewManager == null) { return false; }
-                            CrewManager.IsCrewMenuOpen = !CrewManager.IsCrewMenuOpen;
-                            return true;
-                        }
-                    };
-                    // Command interface button
-                    commandButton = new GUIButton(new RectTransform(buttonSize, parent: topLeftButtonGroup.RectTransform),style: "CommandButton")
-                    {
-                        ToolTip = TextManager.GetWithVariable("hudbutton.commandinterface", "[key]", GameMain.Config.KeyBindText(InputType.Command)),
-                        OnClicked = (button, userData) =>
-                        {
-                            if (CrewManager == null) { return false; }
-                            CrewManager.ToggleCommandUI();
-                            return true;
-                        }
-                    };
-                    // Tab menu button
-                    tabMenuButton = new GUIButton(new RectTransform(buttonSize, parent: topLeftButtonGroup.RectTransform), style: "TabMenuButton")
-                    {
-                        ToolTip = TextManager.GetWithVariable("hudbutton.tabmenu", "[key]", GameMain.Config.KeyBindText(InputType.InfoTab)),
-                        OnClicked = (button, userData) =>
-                        {
-                            return ToggleTabMenu();
-                        }
-                    };
-                }
-                return topLeftButtonGroup;
+        private GUIComponent respawnInfoFrame, respawnButtonContainer;
+        private GUITextBlock respawnInfoText;
+        private GUITickBox respawnTickBox;
+        private GUILayoutGroup TopLeftButtonGroup;
+        private void CreateTopLeftButtons()
+        {
+            if (topLeftButtonGroup != null)
+            {
+                topLeftButtonGroup.RectTransform.Parent = null;
+                topLeftButtonGroup = null;
+                crewListButton = commandButton = tabMenuButton = null;
            }
+            topLeftButtonGroup = new GUILayoutGroup(HUDLayoutSettings.ToRectTransform(HUDLayoutSettings.ButtonAreaTop, GUI.Canvas), isHorizontal: true, childAnchor: Anchor.CenterLeft)
+            {
+                AbsoluteSpacing = HUDLayoutSettings.Padding,
+                CanBeFocused = false
+            };
+            topLeftButtonGroup.RectTransform.ParentChanged += (_) =>
+            {
+                GameMain.Instance.ResolutionChanged -= CreateTopLeftButtons;
+            };
+            int buttonHeight = GUI.IntScale(40);
+            Vector2 buttonSpriteSize = GUI.Style.GetComponentStyle("CrewListToggleButton").GetDefaultSprite().size;
+            int buttonWidth = (int)((buttonHeight / buttonSpriteSize.Y) * buttonSpriteSize.X);
+            Point buttonSize = new Point(buttonWidth, buttonHeight);
+            crewListButton = new GUIButton(new RectTransform(buttonSize, parent: topLeftButtonGroup.RectTransform), style: "CrewListToggleButton")
+            {
+                ToolTip = TextManager.GetWithVariable("hudbutton.crewlist", "[key]", GameMain.Config.KeyBindText(InputType.CrewOrders)),
+                OnClicked = (GUIButton btn, object userdata) =>
+                {
+                    if (CrewManager == null) { return false; }
+                    CrewManager.IsCrewMenuOpen = !CrewManager.IsCrewMenuOpen;
+                    return true;
+                }
+            };
+            commandButton = new GUIButton(new RectTransform(buttonSize, parent: topLeftButtonGroup.RectTransform), style: "CommandButton")
+            {
+                ToolTip = TextManager.GetWithVariable("hudbutton.commandinterface", "[key]", GameMain.Config.KeyBindText(InputType.Command)),
+                OnClicked = (button, userData) =>
+                {
+                    if (CrewManager == null) { return false; }
+                    CrewManager.ToggleCommandUI();
+                    return true;
+                }
+            };
+            tabMenuButton = new GUIButton(new RectTransform(buttonSize, parent: topLeftButtonGroup.RectTransform), style: "TabMenuButton")
+            {
+                ToolTip = TextManager.GetWithVariable("hudbutton.tabmenu", "[key]", GameMain.Config.KeyBindText(InputType.InfoTab)),
+                OnClicked = (button, userData) =>
+                {
+                    return ToggleTabMenu();
+                }
+            };
+            GameMain.Instance.ResolutionChanged += CreateTopLeftButtons;
+
+            respawnInfoFrame = new GUIFrame(new RectTransform(new Vector2(0.5f, 1.0f), parent: topLeftButtonGroup.RectTransform)
+            { MaxSize = new Point(HUDLayoutSettings.ButtonAreaTop.Width / 3, int.MaxValue) }, style: null)
+            {
+                Visible = false
+            };
+            respawnInfoText = new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), respawnInfoFrame.RectTransform), "", wrap: true);
+            respawnButtonContainer = new GUILayoutGroup(new RectTransform(new Vector2(0.5f, 1.0f), respawnInfoFrame.RectTransform, Anchor.CenterRight), isHorizontal: true, childAnchor: Anchor.CenterLeft)
+            {
+                AbsoluteSpacing = HUDLayoutSettings.Padding,
+                Stretch = true
+            };
+            respawnTickBox = new GUITickBox(new RectTransform(Vector2.One * 0.9f, respawnButtonContainer.RectTransform, Anchor.Center), TextManager.Get("respawnquestionpromptrespawn"))
+            {
+                ToolTip = TextManager.Get("respawnquestionprompt"),
+                OnSelected = (tickbox) =>
+                {
+                    GameMain.Client?.SendRespawnPromptResponse(waitForNextRoundRespawn: !tickbox.Selected);
+                    return true;
+                }
+            };
        }

        public void AddToGUIUpdateList()
@@ -101,20 +127,15 @@ namespace Barotrauma
            if ((!(GameMode is CampaignMode campaign) || (!campaign.ForceMapUI && !campaign.ShowCampaignUI)) &&
                !CoroutineManager.IsCoroutineRunning("LevelTransition") && !CoroutineManager.IsCoroutineRunning("SubmarineTransition"))
            {
-                if (crewListButton != null)
+                if (topLeftButtonGroup == null)
                {
-                    crewListButton.Selected = CrewManager != null && CrewManager.IsCrewMenuOpen;
+                    CreateTopLeftButtons();
                }
-                if (commandButton != null)
-                {
-                    commandButton.Selected = CrewManager.IsCommandInterfaceOpen;
-                    commandButton.Enabled = CrewManager.CanIssueOrders;
-                }
-                if (tabMenuButton != null)
-                {
-                    tabMenuButton.Selected = IsTabMenuOpen;
-                }
-                TopLeftButtonGroup.AddToGUIUpdateList();
+                crewListButton.Selected = CrewManager != null && CrewManager.IsCrewMenuOpen;
+                commandButton.Selected = CrewManager.IsCommandInterfaceOpen;
+                commandButton.Enabled = CrewManager.CanIssueOrders;
+                tabMenuButton.Selected = IsTabMenuOpen;
+                topLeftButtonGroup.AddToGUIUpdateList();
            }

            if (GameMain.NetworkMember != null)
@@ -130,7 +151,7 @@ namespace Barotrauma

            if (tabMenu == null)
            {
-                if (PlayerInput.KeyHit(InputType.InfoTab) && GUI.KeyboardDispatcher.Subscriber is GUITextBox == false)
+                if (PlayerInput.KeyHit(InputType.InfoTab) && !(GUI.KeyboardDispatcher.Subscriber is GUITextBox))
                {
                    ToggleTabMenu();
                }
@@ -138,8 +159,8 @@ namespace Barotrauma
            else
            {
                tabMenu.Update();
-
-                if (PlayerInput.KeyHit(InputType.InfoTab) && GUI.KeyboardDispatcher.Subscriber is GUITextBox == false)
+                if ((PlayerInput.KeyHit(InputType.InfoTab) || PlayerInput.KeyHit(Microsoft.Xna.Framework.Input.Keys.Escape)) && 
+                    !(GUI.KeyboardDispatcher.Subscriber is GUITextBox))
                {
                    ToggleTabMenu();
                }
@@ -167,6 +188,17 @@ namespace Barotrauma
            HintManager.Update();
        }

+        public void SetRespawnInfo(bool visible, string text, Color textColor, bool buttonsVisible, bool waitForNextRoundRespawn)
+        {
+            if (topLeftButtonGroup == null) { return; }
+            respawnInfoFrame.Visible = visible;
+            if (!visible) { return; }
+            respawnInfoText.Text = text;
+            respawnInfoText.TextColor = textColor;
+            respawnButtonContainer.Visible = buttonsVisible;
+            respawnTickBox.Selected = !waitForNextRoundRespawn;
+        }
+
        public void Draw(SpriteBatch spriteBatch)
        {
            GameMode?.Draw(spriteBatch);
@@ -1,4 +1,5 @@
-using Barotrauma.IO;
+using Barotrauma.Extensions;
+using Barotrauma.IO;
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using System;
@@ -21,41 +22,16 @@ namespace Barotrauma
        private static GUIMessageBox ActiveHintMessageBox { get; set; }
        private static Action OnUpdate { get; set; }
        private static double TimeStoppedInteracting { get; set; }
-
+        private static double TimeRoundStarted { get; set; }
        /// <summary>
        /// Seconds before any reminders can be shown
        /// </summary>
        private static int TimeBeforeReminders { get; set; }
-
        /// <summary>
        /// Seconds before another reminder can be shown
        /// </summary>
        private static int ReminderCooldown { get; set; }
-
        private static double TimeReminderLastDisplayed { get; set; }
-
-        private static Queue<HintInfo> HintQueue { get; } = new Queue<HintInfo>();
-
-        public struct HintInfo
-        {
-            public string Identifier { get; }
-            public string Text { get; }
-            public Sprite Icon { get; }
-            public Color? IconColor { get; }
-            public Action OnDisplay { get; }
-            public Action OnUpdate { get; }
-
-            public HintInfo(string hintIdentifier, string text, Sprite icon, Color? iconColor, Action onDisplay, Action onUpdate)
-            {
-                Identifier = hintIdentifier;
-                Text = text;
-                Icon = icon;
-                IconColor = iconColor;
-                OnDisplay = onDisplay;
-                OnUpdate = onUpdate;
-            }
-        }
-
        private static HashSet<Hull> BallastHulls { get; } = new HashSet<Hull>();

        public static void Init()
@@ -127,15 +103,6 @@ namespace Barotrauma
                    return;
                }
            }
-            else if (HintQueue.TryDequeue(out var hint))
-            {
-                ActiveHintMessageBox = new GUIMessageBox(hint.Identifier, hint.Text, hint.Icon);
-                if (hint.IconColor.HasValue) { ActiveHintMessageBox.IconColor = hint.IconColor.Value; }
-                OnUpdate = hint.OnUpdate;
-                ActiveHintMessageBox.InnerFrame.Flash(color: hint.IconColor ?? Color.Orange, flashDuration: 0.75f);
-                SoundPlayer.PlayUISound(GUISoundType.UIMessage);
-                hint.OnDisplay?.Invoke();
-            }

            CheckIsInteracting();
            CheckIfDivingGearOutOfOxygen();
@@ -166,21 +133,21 @@ namespace Barotrauma
            // onstartedinteracting.brokenitem
            if (item.Repairables.Any(r => item.ConditionPercentage < r.RepairThreshold))
            {
-                if (EnqueueHint($"{hintIdentifierBase}.brokenitem")) { return; }
+                if (DisplayHint($"{hintIdentifierBase}.brokenitem")) { return; }
            }

            // onstartedinteracting.lootingisstealing
            if (item.Submarine?.Info?.Type == SubmarineType.Outpost &&
                item.ContainedItems.Any(i => i.SpawnedInOutpost))
            {
-                if (EnqueueHint($"{hintIdentifierBase}.lootingisstealing")) { return; }
+                if (DisplayHint($"{hintIdentifierBase}.lootingisstealing")) { return; }
            }

            // onstartedinteracting.turretperiscope
            if (item.HasTag("periscope") &&
                item.GetConnectedComponents<Turret>().FirstOrDefault(t => t.Item.HasTag("turret")) is Turret)
            {
-                if (EnqueueHint($"{hintIdentifierBase}.turretperiscope",
+                if (DisplayHint($"{hintIdentifierBase}.turretperiscope",
                        variableTags: new string[] { "[shootkey]", "[deselectkey]", },
                        variableValues: new string[] { GameMain.Config.KeyBindText(InputType.Shoot), GameMain.Config.KeyBindText(InputType.Deselect) }))
                { return; }
@@ -193,7 +160,7 @@ namespace Barotrauma
                if (!hintIdentifier.StartsWith(hintIdentifierBase)) { continue; }
                if (!HintTags.TryGetValue(hintIdentifier, out var hintTags)) { continue; }
                if (!item.HasTag(hintTags)) { continue; }
-                if (EnqueueHint(hintIdentifier)) { return; }
+                if (DisplayHint(hintIdentifier)) { return; }
            }
        }

@@ -206,7 +173,7 @@ namespace Barotrauma
                Character.Controlled.SelectedConstruction.OwnInventory?.AllItems is IEnumerable<Item> containedItems &&
                containedItems.Count(i => i.HasTag("reactorfuel")) > 1)
            {
-                if (EnqueueHint("onisinteracting.reactorwithextrarods")) { return; }
+                if (DisplayHint("onisinteracting.reactorwithextrarods")) { return; }
            }
        }

@@ -214,6 +181,7 @@ namespace Barotrauma
        {
            // Make sure everything's been reset properly, OnRoundEnded() isn't always called when exiting a game
            Reset();
+            TimeRoundStarted = GameMain.GameScreen.GameTime;

            var initRoundHandle = CoroutineManager.StartCoroutine(InitRound(), "HintManager.InitRound");
            if (!CanDisplayHints(requireGameScreen: false, requireControllingCharacter: false)) { return; }
@@ -252,10 +220,15 @@ namespace Barotrauma

                OnStartedControlling();

+                while (ActiveHintMessageBox != null)
+                {
+                    yield return CoroutineStatus.Running;
+                }
+
                if (!GameMain.GameSession.GameMode.IsSinglePlayer &&
                    GameMain.Config.VoiceSetting == GameSettings.VoiceMode.Disabled)
                {
-                    EnqueueHint("onroundstarted.voipdisabled", onUpdate: () =>
+                    DisplayHint("onroundstarted.voipdisabled", onUpdate: () =>
                    {
                        if (GameMain.Config.VoiceSetting == GameSettings.VoiceMode.Disabled) { return; }
                        ActiveHintMessageBox.Close();
@@ -281,7 +254,6 @@ namespace Barotrauma
                ActiveHintMessageBox = null;
            }
            OnUpdate = null;
-            HintQueue.Clear();
            HintsIgnoredThisRound.Clear();
        }

@@ -292,7 +264,7 @@ namespace Barotrauma
            if (spottedCharacter == null || spottedCharacter.Removed || spottedCharacter.IsDead) { return; }
            if (Character.Controlled.SelectedConstruction != sonar) { return; }
            if (HumanAIController.IsFriendly(Character.Controlled, spottedCharacter)) { return; }
-            EnqueueHint("onsonarspottedenemy");
+            DisplayHint("onsonarspottedenemy");
        }

        public static void OnAfflictionDisplayed(Character character, List<Affliction> displayedAfflictions)
@@ -305,7 +277,8 @@ namespace Barotrauma
                if (affliction.Prefab.IsBuff) { continue; }
                if (affliction.Prefab == AfflictionPrefab.OxygenLow) { continue; }
                if (affliction.Prefab == AfflictionPrefab.RadiationSickness && (GameMain.GameSession.Map?.Radiation?.IsEntityRadiated(character) ?? false)) { continue; }
-                EnqueueHint("onafflictiondisplayed",
+                if (affliction.Strength < affliction.Prefab.ShowIconThreshold) { continue; }
+                DisplayHint("onafflictiondisplayed",
                    variableTags: new string[1] { "[key]" },
                    variableValues: new string[1] { GameMain.Config.KeyBindText(InputType.Health) },
                    icon: affliction.Prefab.Icon,
@@ -325,12 +298,13 @@ namespace Barotrauma
            if (character != Character.Controlled) { return; }
            if (character.SelectedConstruction != null || character.FocusedItem != null) { return; }
            if (item == null || !item.IsShootable || !item.RequireAimToUse) { return; }
-            if (GUI.MouseOn != null) { return; }
            if (TimeStoppedInteracting + 1 > Timing.TotalTime) { return; }
+            if (GUI.MouseOn != null) { return; }
+            if (Character.Controlled.Inventory?.visualSlots != null && Character.Controlled.Inventory.visualSlots.Any(s => s.InteractRect.Contains(PlayerInput.MousePosition))) { return; }
            string hintIdentifier = "onshootwithoutaiming";
            if (!HintTags.TryGetValue(hintIdentifier, out var tags)) { return; }
            if (!item.HasTag(tags)) { return; }
-            EnqueueHint(hintIdentifier,
+            DisplayHint(hintIdentifier,
                variableTags: new string[1] { "[key]" },
                variableValues: new string[1] { GameMain.Config.KeyBindText(InputType.Aim) },
                onUpdate: () =>
@@ -347,14 +321,14 @@ namespace Barotrauma
            if (!CanDisplayHints()) { return; }
            if (character != Character.Controlled) { return; }
            if (door == null || door.Stuck < 20.0f) { return; }
-            EnqueueHint("onweldingdoor");
+            DisplayHint("onweldingdoor");
        }

        public static void OnTryOpenStuckDoor(Character character)
        {
            if (!CanDisplayHints()) { return; }
            if (character != Character.Controlled) { return; }
-            EnqueueHint("ontryopenstuckdoor");
+            DisplayHint("ontryopenstuckdoor");
        }

        public static void OnShowCampaignInterface(CampaignMode.InteractionType interactionType)
@@ -362,36 +336,34 @@ namespace Barotrauma
            if (!CanDisplayHints()) { return; }
            if (interactionType == CampaignMode.InteractionType.None) { return; }
            string hintIdentifier = $"onshowcampaigninterface.{interactionType.ToString().ToLowerInvariant()}";
-            EnqueueHint(hintIdentifier,
-                onUpdate: () =>
-                {
+            DisplayHint(hintIdentifier, onUpdate: () =>
+            {

-                    if (!(GameMain.GameSession?.Campaign is CampaignMode campaign) ||
-                        (!campaign.ShowCampaignUI && !campaign.ForceMapUI) ||
-                        campaign.CampaignUI?.SelectedTab != CampaignMode.InteractionType.Map)
-                    {
-                        ActiveHintMessageBox.Close();
-                    }
-                });
+                if (!(GameMain.GameSession?.Campaign is CampaignMode campaign) ||
+                    (!campaign.ShowCampaignUI && !campaign.ForceMapUI) ||
+                    campaign.CampaignUI?.SelectedTab != CampaignMode.InteractionType.Map)
+                {
+                    ActiveHintMessageBox.Close();
+                }
+            });
        }

        public static void OnShowCommandInterface()
        {
            IgnoreReminder("commandinterface");
            if (!CanDisplayHints()) { return; }
-            EnqueueHint("onshowcommandinterface",
-                onUpdate: () =>
-                {
-                    if (CrewManager.IsCommandInterfaceOpen) { return; }
-                    ActiveHintMessageBox.Close();
-                });
+            DisplayHint("onshowcommandinterface", onUpdate: () =>
+            {
+                if (CrewManager.IsCommandInterfaceOpen) { return; }
+                ActiveHintMessageBox.Close();
+            });
        }

        public static void OnShowHealthInterface()
        {
            if (!CanDisplayHints()) { return; }
            if (CharacterHealth.OpenHealthWindow == null) { return; }
-            EnqueueHint("onshowhealthinterface", onUpdate: () =>
+            DisplayHint("onshowhealthinterface", onUpdate: () =>
            {
                if (CharacterHealth.OpenHealthWindow != null) { return; }
                ActiveHintMessageBox.Close();
@@ -408,7 +380,7 @@ namespace Barotrauma
            if (!CanDisplayHints()) { return; }
            if (character != Character.Controlled) { return; }
            if (item == null || !item.SpawnedInOutpost || !item.StolenDuringRound) { return; }
-            EnqueueHint("onstoleitem", onUpdate: () =>
+            DisplayHint("onstoleitem", onUpdate: () =>
            {
                if (item == null || item.Removed || item.GetRootInventoryOwner() != character)
                {
@@ -421,7 +393,7 @@ namespace Barotrauma
        {
            if (!CanDisplayHints()) { return; }
            if (character != Character.Controlled || !character.LockHands) { return; }
-            EnqueueHint("onhandcuffed", onUpdate: () =>
+            DisplayHint("onhandcuffed", onUpdate: () =>
            {
                if (character != null && !character.Removed && character.LockHands) { return; }
                ActiveHintMessageBox.Close();
@@ -434,7 +406,7 @@ namespace Barotrauma
            if (reactor == null) { return; }
            if (reactor.Item.Submarine?.Info?.Type != SubmarineType.Player || reactor.Item.Submarine.TeamID != Character.Controlled.TeamID) { return; }
            if (!HasValidJob("engineer")) { return; }
-            EnqueueHint("onreactoroutoffuel", onUpdate: () =>
+            DisplayHint("onreactoroutoffuel", onUpdate: () =>
            {
                if (reactor?.Item != null && !reactor.Item.Removed && reactor.AvailableFuel < 1) { return; }
                ActiveHintMessageBox.Close();
@@ -445,7 +417,7 @@ namespace Barotrauma
        {
            if (!CanDisplayHints()) { return; }
            if (transitionType == CampaignMode.TransitionType.None) { return; }
-            EnqueueHint($"onavailabletransition.{transitionType.ToString().ToLowerInvariant()}");
+            DisplayHint($"onavailabletransition.{transitionType.ToString().ToLowerInvariant()}");
        }

        public static void OnShowSubInventory(Item item)
@@ -462,12 +434,31 @@ namespace Barotrauma
            IgnoreReminder("characterchange");
        }

+        public static void OnCharacterUnconscious(Character character)
+        {
+            if (!CanDisplayHints()) { return; }
+            if (character != Character.Controlled) { return; }
+            if (character.IsDead) { return; }
+            if (character.CharacterHealth != null && character.Vitality < character.CharacterHealth.MinVitality) { return; }
+            DisplayHint("oncharacterunconscious");
+        }
+
+        public static void OnCharacterKilled(Character character)
+        {
+            if (!CanDisplayHints()) { return; }
+            if (character != Character.Controlled) { return; }
+            if (GameMain.IsMultiplayer) { return; }
+            if (GameMain.GameSession?.CrewManager == null) { return; }
+            if (GameMain.GameSession.CrewManager.GetCharacters().None(c => !c.IsDead)) { return; }
+            DisplayHint("oncharacterkilled");
+        }
+
        private static void OnStartedControlling()
        {
            if (Level.IsLoadedOutpost) { return; }
            if (Character.Controlled?.Info?.Job?.Prefab == null) { return; }
            string hintIdentifier = $"onstartedcontrolling.job.{Character.Controlled.Info.Job.Prefab.Identifier}";
-            EnqueueHint(hintIdentifier,
+            DisplayHint(hintIdentifier,
                icon: Character.Controlled.Info.Job.Prefab.Icon,
                iconColor: Character.Controlled.Info.Job.Prefab.UIColor,
                onDisplay: () =>
@@ -500,7 +491,7 @@ namespace Barotrauma
            if (!steering.SteeringPath.Finished && steering.SteeringPath.NextNode != null) { return; }
            if (steering.LevelStartSelected && (Level.Loaded.StartOutpost == null || !steering.Item.Submarine.AtStartExit)) { return; }
            if (steering.LevelEndSelected && (Level.Loaded.EndOutpost == null || !steering.Item.Submarine.AtEndExit)) { return; }
-            EnqueueHint("onautopilotreachedoutpost");
+            DisplayHint("onautopilotreachedoutpost");
        }

        public static void OnStatusEffectApplied(ItemComponent component, ActionType actionType, Character character)
@@ -509,7 +500,7 @@ namespace Barotrauma
            if (character != Character.Controlled) { return; }
            // Could make this more generic if there will ever be any other status effect related hints
            if (!(component is Repairable) || actionType != ActionType.OnFailure) { return; }
-            EnqueueHint("onrepairfailed");
+            DisplayHint("onrepairfailed");
        }

        private static void CheckIfDivingGearOutOfOxygen()
@@ -517,12 +508,12 @@ namespace Barotrauma
            if (!CanDisplayHints()) { return; }
            var divingGear = Character.Controlled.GetEquippedItem("diving");
            if (divingGear?.OwnInventory == null) { return; }
-            if (divingGear.GetContainedItemConditionPercentage() > 0.05f) { return; }
-            EnqueueHint("ondivinggearoutofoxygen", onUpdate: () =>
+            if (divingGear.GetContainedItemConditionPercentage() > 0.0f) { return; }
+            DisplayHint("ondivinggearoutofoxygen", onUpdate: () =>
            {
                if (divingGear == null || divingGear.Removed ||
                    Character.Controlled == null || !Character.Controlled.HasEquippedItem(divingGear) ||
-                    divingGear.GetContainedItemConditionPercentage() > 0.05f)
+                    divingGear.GetContainedItemConditionPercentage() > 0.0f)
                {
                    ActiveHintMessageBox.Close();
                }
@@ -535,15 +526,21 @@ namespace Barotrauma
            if (Character.Controlled.CurrentHull == null) { return; }
            foreach (var gap in Character.Controlled.CurrentHull.ConnectedGaps)
            {
-                if (!gap.IsRoomToRoom) { continue; }
                if (gap.ConnectedDoor == null || gap.ConnectedDoor.Impassable) { continue; }
                if (Vector2.DistanceSquared(Character.Controlled.WorldPosition, gap.ConnectedDoor.Item.WorldPosition) > 400 * 400) { continue; }
+                if (!gap.IsRoomToRoom)
+                {
+                    if (!(Character.Controlled.GetEquippedItem("deepdiving") is Item)) { continue; }
+                    if (Character.Controlled.IsProtectedFromPressure()) { continue; }
+                    if (DisplayHint("divingsuitwarning", extendTextTag: false)) { return; }
+                    continue;
+                }
                foreach (var me in gap.linkedTo)
                {
                    if (me == Character.Controlled.CurrentHull) { continue; }
                    if (!(me is Hull adjacentHull)) { continue; }
-                    if (adjacentHull.LethalPressure > 5.0f && EnqueueHint("onadjacenthull.highpressure")) { return; }
-                    if (adjacentHull.WaterPercentage > 75 && !BallastHulls.Contains(adjacentHull) && EnqueueHint("onadjacenthull.highwaterpercentage")) { return; }
+                    if (adjacentHull.LethalPressure > 5.0f && DisplayHint("onadjacenthull.highpressure")) { return; }
+                    if (adjacentHull.WaterPercentage > 75 && !BallastHulls.Contains(adjacentHull) && DisplayHint("onadjacenthull.highwaterpercentage")) { return; }
                }
            }
        }
@@ -552,23 +549,23 @@ namespace Barotrauma
        {
            if (!CanDisplayHints()) { return; }
            if (Level.Loaded == null) { return; }
-            if (Timing.TotalTime < GameMain.GameSession.RoundStartTime + TimeBeforeReminders) { return; }
-            if (Timing.TotalTime < TimeReminderLastDisplayed + ReminderCooldown) { return; }
+            if (GameMain.GameScreen.GameTime < TimeRoundStarted + TimeBeforeReminders) { return; }
+            if (GameMain.GameScreen.GameTime < TimeReminderLastDisplayed + ReminderCooldown) { return; }

            string hintIdentifierBase = "reminder";

            if (GameMain.GameSession.GameMode.IsSinglePlayer)
            {
-                if (EnqueueHint($"{hintIdentifierBase}.characterchange"))
+                if (DisplayHint($"{hintIdentifierBase}.characterchange"))
                {
-                    TimeReminderLastDisplayed = Timing.TotalTime;
+                    TimeReminderLastDisplayed = GameMain.GameScreen.GameTime;
                    return;
                }
            }

            if (Level.Loaded.Type != LevelData.LevelType.Outpost)
            {
-                if (EnqueueHint($"{hintIdentifierBase}.commandinterface",
+                if (DisplayHint($"{hintIdentifierBase}.commandinterface",
                        variableTags: new string[] { "[commandkey]" },
                        variableValues: new string[] { GameMain.Config.KeyBindText(InputType.Command) },
                        onUpdate: () =>
@@ -577,12 +574,12 @@ namespace Barotrauma
                            ActiveHintMessageBox.Close();
                        }))
                {
-                    TimeReminderLastDisplayed = Timing.TotalTime;
+                    TimeReminderLastDisplayed = GameMain.GameScreen.GameTime;
                    return;
                }
            }

-            if (EnqueueHint($"{hintIdentifierBase}.tabmenu",
+            if (DisplayHint($"{hintIdentifierBase}.tabmenu",
                    variableTags: new string[] { "[infotabkey]" },
                    variableValues: new string[] { GameMain.Config.KeyBindText(InputType.InfoTab) },
                    onUpdate: () =>
@@ -591,21 +588,21 @@ namespace Barotrauma
                        ActiveHintMessageBox.Close();
                    }))
            {
-                TimeReminderLastDisplayed = Timing.TotalTime;
+                TimeReminderLastDisplayed = GameMain.GameScreen.GameTime;
                return;
            }

            if (Character.Controlled.Inventory?.GetItemInLimbSlot(InvSlotType.Bag)?.Prefab?.Identifier == "toolbelt")
            {
-                if (EnqueueHint($"{hintIdentifierBase}.toolbelt"))
+                if (DisplayHint($"{hintIdentifierBase}.toolbelt"))
                {
-                    TimeReminderLastDisplayed = Timing.TotalTime;
+                    TimeReminderLastDisplayed = GameMain.GameScreen.GameTime;
                    return;
                }
            }
        }

-        private static bool EnqueueHint(string hintIdentifier, string[] variableTags = null, string[] variableValues = null, Sprite icon = null, Color? iconColor = null, Action onDisplay = null, Action onUpdate = null)
+        private static bool DisplayHint(string hintIdentifier, bool extendTextTag = true, string[] variableTags = null, string[] variableValues = null, Sprite icon = null, Color? iconColor = null, Action onDisplay = null, Action onUpdate = null)
        {
            if (string.IsNullOrEmpty(hintIdentifier)) { return false; }
            if (!HintIdentifiers.Contains(hintIdentifier)) { return false; }
@@ -613,7 +610,7 @@ namespace Barotrauma
            if (HintsIgnoredThisRound.Contains(hintIdentifier)) { return false; }

            string text;
-            string textTag = $"hint.{hintIdentifier}";
+            string textTag = extendTextTag ? $"hint.{hintIdentifier}" : hintIdentifier;
            if (variableTags != null && variableTags != null && variableTags.Length > 0 && variableTags.Length == variableValues.Length)
            {
                text = TextManager.GetWithVariables(textTag, variableTags, variableValues, returnNull: true);
@@ -631,9 +628,16 @@ namespace Barotrauma
                return false;
            }

-            var hint = new HintInfo(hintIdentifier, text, icon, iconColor, onDisplay, onUpdate);
-            HintQueue.Enqueue(hint);
            HintsIgnoredThisRound.Add(hintIdentifier);
+
+            ActiveHintMessageBox = new GUIMessageBox(hintIdentifier, text, icon);
+            if (iconColor.HasValue) { ActiveHintMessageBox.IconColor = iconColor.Value; }
+            OnUpdate = onUpdate;
+
+            SoundPlayer.PlayUISound(GUISoundType.UIMessage);
+            ActiveHintMessageBox.InnerFrame.Flash(color: iconColor ?? Color.Orange, flashDuration: 0.75f);
+            onDisplay?.Invoke();
+
            return true;
        }

@@ -678,6 +682,7 @@ namespace Barotrauma
        {
            if (HintIdentifiers == null) { return false; }
            if (GameMain.Config.DisableInGameHints) { return false; }
+            if (ActiveHintMessageBox != null) { return false; }
            if (requireControllingCharacter && Character.Controlled == null) { return false; }
            var gameMode = GameMain.GameSession?.GameMode;
            if (!(gameMode is CampaignMode || gameMode is MissionMode)) { return false; }
@@ -266,7 +266,9 @@ namespace Barotrauma
                    displayedMission.Description;
                GUIImage missionIcon = new GUIImage(new RectTransform(new Point((int)(missionContentHorizontal.Rect.Height)), missionContentHorizontal.RectTransform), displayedMission.Prefab.Icon, scaleToFit: true)
                {
-                    Color = displayedMission.Prefab.IconColor
+                    Color = displayedMission.Prefab.IconColor,
+                    HoverColor = displayedMission.Prefab.IconColor,
+                    SelectedColor = displayedMission.Prefab.IconColor
                }; 
                missionIcon.RectTransform.MinSize = new Point((int)(missionContentHorizontal.Rect.Height * 0.9f));
                if (selectedMissions.Contains(displayedMission))
@@ -278,8 +280,27 @@ namespace Barotrauma
                {
                    RelativeSpacing = 0.05f
                };
-                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextContent.RectTransform),
+                var missionNameTextBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextContent.RectTransform),
                    displayedMission.Name, font: GUI.SubHeadingFont);
+                if (displayedMission.Difficulty.HasValue)
+                {
+                    var groupSize = missionNameTextBlock.Rect.Size;
+                    groupSize.X -= (int)(missionNameTextBlock.Padding.X + missionNameTextBlock.Padding.Z);
+                    var indicatorGroup = new GUILayoutGroup(new RectTransform(groupSize, missionTextContent.RectTransform) { AbsoluteOffset = new Point((int)missionNameTextBlock.Padding.X, 0) },
+                        isHorizontal: true, childAnchor: Anchor.CenterLeft)
+                    {
+                        AbsoluteSpacing = 1
+                    };
+                    var difficultyColor = displayedMission.GetDifficultyColor();
+                    for (int i = 0; i < displayedMission.Difficulty; i++)
+                    {
+                        new GUIImage(new RectTransform(Vector2.One, indicatorGroup.RectTransform, scaleBasis: ScaleBasis.Smallest) { IsFixedSize = true }, "DifficultyIndicator", scaleToFit: true)
+                        {
+                            CanBeFocused = false,
+                            Color = difficultyColor
+                        };
+                    }
+                }
                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextContent.RectTransform),
                    missionMessage, wrap: true, parseRichText: true);
                if (selectedMissions.Contains(displayedMission) && displayedMission.Completed && displayedMission.Reward > 0)
@@ -430,7 +451,7 @@ namespace Barotrauma
                            Faction unlockFaction = null;
                            if (!string.IsNullOrEmpty(unlockEvent.UnlockPathFaction))
                            {
-                                unlockFaction = GameMain.GameSession.Campaign.Factions.Find(f => f.Prefab.Identifier == unlockEvent.UnlockPathFaction);
+                                unlockFaction = GameMain.GameSession.Campaign.Factions.Find(f => f.Prefab.Identifier.Equals(unlockEvent.UnlockPathFaction, StringComparison.OrdinalIgnoreCase));
                                unlockReputation = unlockFaction?.Reputation;
                            }
                            float normalizedUnlockReputation = MathUtils.InverseLerp(unlockReputation.MinReputation, unlockReputation.MaxReputation, unlockEvent.UnlockPathReputation);