Build 1.1.4.0

2023-03-31 18:40:44 +03:00
parent efba17e0ff
commit 9470edead3
483 changed files with 17487 additions and 8548 deletions
@@ -1,9 +1,9 @@
-using Microsoft.Xna.Framework;
+using Barotrauma.Extensions;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
-using Barotrauma.Extensions;

 namespace Barotrauma
 {
@@ -199,8 +199,8 @@ namespace Barotrauma
                if (GameMain.GraphicsWidth <= maxResolution.X && GameMain.GraphicsHeight <= maxResolution.Y)
                {
                    size = new Point(
-                        subElement.GetAttributeInt("width", 0), 
-                        subElement.GetAttributeInt("height", 0));
+                        ParseSize(subElement, "width"),
+                        ParseSize(subElement, "height"));
                    break;
                }
            }
@@ -3,7 +3,6 @@ using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using PlayerBalanceElement = Barotrauma.CampaignUI.PlayerBalanceElement;

@@ -29,6 +28,8 @@ namespace Barotrauma

        private Point resolutionWhenCreated;

+        private bool needsHireableRefresh;
+
        private enum SortingMethod
        {
            AlphabeticalAsc,
@@ -50,6 +51,8 @@ namespace Barotrauma
            campaignUI.Campaign.Map.OnLocationChanged.RegisterOverwriteExisting(
                "CrewManagement.UpdateLocationView".ToIdentifier(), 
                (locationChangeInfo) => UpdateLocationView(locationChangeInfo.NewLocation, true, locationChangeInfo.PrevLocation));
+            Reputation.OnAnyReputationValueChanged.RegisterOverwriteExisting(
+                "CrewManagement.UpdateLocationView".ToIdentifier(), _ => needsHireableRefresh = true);
        }

        public void RefreshPermissions()
@@ -68,7 +71,13 @@ namespace Barotrauma
            {
                if (child.FindChild(c => c is GUIButton && c.UserData is CharacterInfo, true) is GUIButton buyButton)
                {
-                    buyButton.Enabled = HasPermission;
+                    CharacterInfo characterInfo = buyButton.UserData as CharacterInfo;
+                    bool enoughReputationToHire = EnoughReputationToHire(characterInfo);
+                    buyButton.Enabled = HasPermission && enoughReputationToHire;
+                    foreach (GUITextBlock text in child.GetAllChildren<GUITextBlock>())
+                    {
+                        text.TextColor = new Color(text.TextColor, buyButton.Enabled ? 1.0f : 0.6f);
+                    }
                }
            }
        }
@@ -294,18 +303,21 @@ namespace Barotrauma
            if (sortingMethod == SortingMethod.AlphabeticalAsc)
            {
                list.Content.RectTransform.SortChildren((x, y) =>
+                    CompareReputationRequirement(x.GUIComponent, y.GUIComponent) ??
                    ((InfoSkill)x.GUIComponent.UserData).CharacterInfo.Name.CompareTo(((InfoSkill)y.GUIComponent.UserData).CharacterInfo.Name));
            }
            else if (sortingMethod == SortingMethod.JobAsc)
            {
                SortCharacters(list, SortingMethod.AlphabeticalAsc);
                list.Content.RectTransform.SortChildren((x, y) =>
-                    String.Compare(((InfoSkill)x.GUIComponent.UserData).CharacterInfo.Job.Name.Value, ((InfoSkill)y.GUIComponent.UserData).CharacterInfo.Job.Name.Value, StringComparison.Ordinal));
+                    CompareReputationRequirement(x.GUIComponent, y.GUIComponent) ??
+                    string.Compare(((InfoSkill)x.GUIComponent.UserData).CharacterInfo.Job.Name.Value, ((InfoSkill)y.GUIComponent.UserData).CharacterInfo.Job.Name.Value, StringComparison.Ordinal));
            }
            else if (sortingMethod == SortingMethod.PriceAsc || sortingMethod == SortingMethod.PriceDesc)
            {
                SortCharacters(list, SortingMethod.AlphabeticalAsc);
                list.Content.RectTransform.SortChildren((x, y) =>
+                    CompareReputationRequirement(x.GUIComponent, y.GUIComponent) ??
                    ((InfoSkill)x.GUIComponent.UserData).CharacterInfo.Salary.CompareTo(((InfoSkill)y.GUIComponent.UserData).CharacterInfo.Salary));
                if (sortingMethod == SortingMethod.PriceDesc) { list.Content.RectTransform.ReverseChildren(); }
            }
@@ -313,9 +325,26 @@ namespace Barotrauma
            {
                SortCharacters(list, SortingMethod.AlphabeticalAsc);
                list.Content.RectTransform.SortChildren((x, y) =>
+                    CompareReputationRequirement(x.GUIComponent, y.GUIComponent) ??
                    ((InfoSkill)x.GUIComponent.UserData).SkillLevel.CompareTo(((InfoSkill)y.GUIComponent.UserData).SkillLevel));
                if (sortingMethod == SortingMethod.SkillDesc) { list.Content.RectTransform.ReverseChildren(); }
            }
+
+            int? CompareReputationRequirement(GUIComponent c1, GUIComponent c2)
+            {
+                CharacterInfo info1 = ((InfoSkill)c1.UserData).CharacterInfo;
+                CharacterInfo info2 = ((InfoSkill)c2.UserData).CharacterInfo;
+                float requirement1 = EnoughReputationToHire(info1) ? 0 : info1.MinReputationToHire.reputation;
+                float requirement2 = EnoughReputationToHire(info2) ? 0 : info2.MinReputationToHire.reputation;
+                if (MathUtils.NearlyEqual(requirement1, 0.0f) && MathUtils.NearlyEqual(requirement2, 0.0f))
+                {
+                    return null;
+                }
+                else
+                {
+                    return requirement1.CompareTo(requirement2);
+                }
+            }
        }

        private readonly struct InfoSkill
@@ -367,12 +396,25 @@ namespace Barotrauma
            nameBlock.Text = ToolBox.LimitString(nameBlock.Text, nameBlock.Font, nameBlock.Rect.Width);

            GUITextBlock jobBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.5f), nameAndJobGroup.RectTransform),
-                characterInfo.Job.Name, textColor: Color.White, font: GUIStyle.SmallFont, textAlignment: Alignment.TopLeft)
+                characterInfo.Title ?? characterInfo.Job.Name, textColor: Color.White, font: GUIStyle.SmallFont, textAlignment: Alignment.TopLeft)
            {
                CanBeFocused = false
            };
-            jobBlock.Text = ToolBox.LimitString(jobBlock.Text, jobBlock.Font, jobBlock.Rect.Width);
-
+            if (!characterInfo.MinReputationToHire.factionId.IsEmpty)
+            {
+                var faction = campaign.Factions.Find(f => f.Prefab.Identifier == characterInfo.MinReputationToHire.factionId);
+                if (faction != null)
+                {
+                    jobBlock.TextColor = faction.Prefab.IconColor;
+                }
+            }
+            var fullJobText = jobBlock.Text;
+            jobBlock.Text = ToolBox.LimitString(fullJobText, jobBlock.Font, jobBlock.Rect.Width);
+            if (jobBlock.Text != fullJobText)
+            {
+                jobBlock.ToolTip = fullJobText;
+                jobBlock.CanBeFocused = true;
+            }
            float width =  0.6f / 3;
            if (characterInfo.Job != null && skill != null)
            {
@@ -410,7 +452,7 @@ namespace Barotrauma
                {
                    ClickSound = GUISoundType.Cart,
                    UserData = characterInfo,
-                    Enabled = HasPermission,
+                    Enabled = CanHire(characterInfo),
                    OnClicked = (b, o) => AddPendingHire(o as CharacterInfo)
                };
                hireButton.OnAddedToGUIUpdateList += (GUIComponent btn) =>
@@ -426,10 +468,9 @@ namespace Barotrauma
                    else if (!btn.Enabled)
                    {
                        btn.ToolTip = string.Empty;
-                        btn.Enabled = HasPermission;
+                        btn.Enabled = CanHire(characterInfo);
                    }
                };
-
            }
            else if (listBox == pendingList)
            {
@@ -437,7 +478,7 @@ namespace Barotrauma
                {
                    ClickSound = GUISoundType.Cart,
                    UserData = characterInfo,
-                    Enabled = HasPermission,
+                    Enabled = CanHire(characterInfo),
                    OnClicked = (b, o) => RemovePendingHire(o as CharacterInfo)
                };
            }
@@ -474,12 +515,30 @@ namespace Barotrauma
                size = new Point(3 * mainGroup.AbsoluteSpacing + icon.Rect.Width + nameAndJobGroup.Rect.Width, mainGroup.Rect.Height);
                new GUIButton(new RectTransform(size, frame.RectTransform) { RelativeOffset = new Vector2(0.025f) }, style: null)
                {
-                    Enabled = HasPermission,
-                    ToolTip = TextManager.GetWithVariable("campaigncrew.givenicknametooltip", "[mouseprimary]", TextManager.Get($"input.{(PlayerInput.MouseButtonsSwapped() ? "rightmouse" : "leftmouse")}")), 
+                    Enabled = CanHire(characterInfo),
+                    ToolTip = TextManager.GetWithVariable("campaigncrew.givenicknametooltip", "[mouseprimary]", PlayerInput.PrimaryMouseLabel),
                    UserData = characterInfo,
                    OnClicked = CreateRenamingComponent
                };
            }
+
+            bool CanHire(CharacterInfo characterInfo)
+            {
+                if (!HasPermission) { return false; }
+                return EnoughReputationToHire(characterInfo);
+            }
+        }
+
+        private bool EnoughReputationToHire(CharacterInfo characterInfo)
+        {
+            if (characterInfo.MinReputationToHire.factionId != Identifier.Empty)
+            {
+                if (campaign.GetReputation(characterInfo.MinReputationToHire.factionId) < characterInfo.MinReputationToHire.reputation)
+                {
+                    return false;
+                }
+            }
+            return true;
        }

        private void CreateCharacterPreviewFrame(GUIListBox listBox, GUIFrame characterFrame, CharacterInfo characterInfo)
@@ -488,13 +547,13 @@ namespace Barotrauma
            Point absoluteOffset = new Point(
                pivot == Pivot.TopLeft ? listBox.Parent.Parent.Rect.Right + 5 : listBox.Parent.Parent.Rect.Left - 5,
                characterFrame.Rect.Top);
-            int frameSize = (int)(GUI.Scale * 300);
-            if (GameMain.GraphicsHeight - (absoluteOffset.Y + frameSize) < 0)
+            Point frameSize = new Point(GUI.IntScale(300), GUI.IntScale(350));
+            if (GameMain.GraphicsHeight - (absoluteOffset.Y + frameSize.Y) < 0)
            {
                pivot = listBox == hireableList ? Pivot.BottomLeft : Pivot.BottomRight;
                absoluteOffset.Y = characterFrame.Rect.Bottom;
            }
-            characterPreviewFrame = new GUIFrame(new RectTransform(new Point(frameSize), parent: campaignUI.GetTabContainer(CampaignMode.InteractionType.Crew).Parent.RectTransform, pivot: pivot)
+            characterPreviewFrame = new GUIFrame(new RectTransform(frameSize, parent: campaignUI.GetTabContainer(CampaignMode.InteractionType.Crew).Parent.RectTransform, pivot: pivot)
                {
                    AbsoluteOffset = absoluteOffset
                }, style: "InnerFrame")
@@ -503,7 +562,8 @@ namespace Barotrauma
            };
            GUILayoutGroup mainGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.95f), characterPreviewFrame.RectTransform, anchor: Anchor.Center))
            {
-                RelativeSpacing = 0.01f
+                RelativeSpacing = 0.01f,
+                Stretch = true
            };

            // Character info
@@ -545,9 +605,23 @@ namespace Barotrauma
            blockHeight = 1.0f / characterSkills.Count();
            foreach (Skill skill in characterSkills)
            {
-                new GUITextBlock(new RectTransform(new Vector2(1.0f, blockHeight), skillNameGroup.RectTransform), TextManager.Get("SkillName." + skill.Identifier));
+                new GUITextBlock(new RectTransform(new Vector2(1.0f, blockHeight), skillNameGroup.RectTransform), TextManager.Get("SkillName." + skill.Identifier), font: GUIStyle.SmallFont);
                new GUITextBlock(new RectTransform(new Vector2(1.0f, blockHeight), skillLevelGroup.RectTransform), ((int)skill.Level).ToString(), textAlignment: Alignment.Right);
            }
+
+            if (characterInfo.MinReputationToHire.reputation > 0.0f)
+            {
+                var repStr = TextManager.GetWithVariables(
+                    "campaignstore.reputationrequired",
+                    ("[amount]", ((int)characterInfo.MinReputationToHire.reputation).ToString()),
+                    ("[faction]", TextManager.Get("faction." + characterInfo.MinReputationToHire.factionId).Value));
+                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), mainGroup.RectTransform),
+                    repStr, textColor: !EnoughReputationToHire(characterInfo) ? GUIStyle.Orange : GUIStyle.Green, 
+                    font: GUIStyle.SmallFont, wrap: true, textAlignment: Alignment.Center);
+            }
+            mainGroup.Recalculate();
+            characterPreviewFrame.RectTransform.MinSize = 
+                new Point(0, (int)(mainGroup.Children.Sum(c => c.Rect.Height + mainGroup.Rect.Height * mainGroup.RelativeSpacing) / mainGroup.RectTransform.RelativeSize.Y));
        }

        private bool SelectCharacter(GUIListBox listBox, GUIFrame characterFrame, CharacterInfo characterInfo)
@@ -636,7 +710,7 @@ namespace Barotrauma
            List<CharacterInfo> nonDuplicateHires = new List<CharacterInfo>();
            hires.ForEach(hireInfo =>
            {
-                if(campaign.CrewManager.GetCharacterInfos().None(crewInfo => crewInfo.IsNewHire && crewInfo.GetIdentifierUsingOriginalName() == hireInfo.GetIdentifierUsingOriginalName()))
+                if (campaign.CrewManager.GetCharacterInfos().None(crewInfo => crewInfo.IsNewHire && crewInfo.GetIdentifierUsingOriginalName() == hireInfo.GetIdentifierUsingOriginalName()))
                {
                    nonDuplicateHires.Add(hireInfo);
                }
@@ -791,6 +865,16 @@ namespace Barotrauma
                playerBalanceElement = CampaignUI.UpdateBalanceElement(playerBalanceElement);
            }

+            if (needsHireableRefresh)
+            {
+                RefreshCrewFrames(hireableList);
+                if (sortingDropDown?.SelectedItemData != null)
+                {
+                    SortCharacters(hireableList, (SortingMethod)sortingDropDown.SelectedItemData);
+                }
+                needsHireableRefresh = false;
+            }
+
            (GUIComponent highlightedFrame, CharacterInfo highlightedInfo) = FindHighlightedCharacter(GUI.MouseOn);
            if (highlightedFrame != null && highlightedInfo != null)
            {
@@ -106,6 +106,11 @@ namespace Barotrauma
        public static float VerticalAspectRatio => GameMain.GraphicsHeight / (float)GameMain.GraphicsWidth;
        public static float RelativeHorizontalAspectRatio => HorizontalAspectRatio / (ReferenceResolution.X / ReferenceResolution.Y);
        public static float RelativeVerticalAspectRatio => VerticalAspectRatio / (ReferenceResolution.Y / ReferenceResolution.X);
+        /// <summary>
+        /// A horizontal scaling factor for low aspect ratios (small width relative to height)
+        /// </summary>
+        public static float AspectRatioAdjustment => HorizontalAspectRatio < 1.4f ? (1.0f - (1.4f - HorizontalAspectRatio)) : 1.0f;
+
        public static bool IsUltrawide => HorizontalAspectRatio > 2.0f;

        public static int UIWidth
@@ -140,13 +145,20 @@ namespace Barotrauma
        public static Texture2D WhiteTexture => solidWhiteTexture;
        private static GUICursor MouseCursorSprites => GUIStyle.CursorSprite;

-        private static bool debugDrawSounds, debugDrawEvents, debugDrawMetadata;
-        private static int debugDrawMetadataOffset;
-        private static readonly string[] ignoredMetadataInfo = { string.Empty, string.Empty, string.Empty, string.Empty };
+        private static bool debugDrawSounds, debugDrawEvents;
+
+        private static DebugDrawMetaData debugDrawMetaData;
+
+        public struct DebugDrawMetaData
+        {
+            public bool Enabled;
+            public bool FactionMetadata, UpgradeLevels, UpgradePrices;
+            public int Offset;
+        }

        public static GraphicsDevice GraphicsDevice => GameMain.Instance.GraphicsDevice;

-        private static List<GUIMessage> messages = new List<GUIMessage>();
+        private static readonly List<GUIMessage> messages = new List<GUIMessage>();

        public static GUIFrame PauseMenu { get; private set; }
        public static GUIFrame SettingsMenuContainer { get; private set; }
@@ -195,8 +207,9 @@ namespace Barotrauma
                    SettingsMenuOpen ||
                    DebugConsole.IsOpen ||
                    GameSession.IsTabMenuOpen ||
-                    (GameMain.GameSession?.GameMode?.Paused ?? false) ||
-                    CharacterHUD.IsCampaignInterfaceOpen;
+                    GameMain.GameSession?.GameMode is { Paused: true } ||
+                    CharacterHUD.IsCampaignInterfaceOpen ||
+                    GameMain.GameSession?.Campaign is { SlideshowPlayer: { Finished: false, Visible: true } };
            }
        }

@@ -533,18 +546,17 @@ namespace Barotrauma
                    if (GameMain.GameSession?.GameMode is CampaignMode campaignMode)
                    {
                        // TODO: TEST THIS
-                        if (debugDrawMetadata)
+                        if (debugDrawMetaData.Enabled)
                        {
                            string text = "Ctrl+M to hide campaign metadata debug info\n\n" +
-                                          $"Ctrl+1 to {(string.IsNullOrWhiteSpace(ignoredMetadataInfo[0]) ? "hide" : "show")} outpost reputations, \n" +
-                                          $"Ctrl+2 to {(string.IsNullOrWhiteSpace(ignoredMetadataInfo[1]) ? "hide" : "show")} faction reputations, \n" +
-                                          $"Ctrl+3 to {(string.IsNullOrWhiteSpace(ignoredMetadataInfo[2]) ? "hide" : "show")} upgrade levels, \n" +
-                                          $"Ctrl+4 to {(string.IsNullOrWhiteSpace(ignoredMetadataInfo[3]) ? "hide" : "show")} upgrade prices";
+                                          $"Ctrl+1 to {(debugDrawMetaData.FactionMetadata ? "hide" : "show")} faction reputations, \n" +
+                                          $"Ctrl+2 to {(debugDrawMetaData.UpgradeLevels ? "hide" : "show")} upgrade levels, \n" +
+                                          $"Ctrl+3 to {(debugDrawMetaData.UpgradePrices ? "hide" : "show")} upgrade prices";
                            Vector2 textSize = GUIStyle.SmallFont.MeasureString(text);
                            Vector2 pos = new Vector2(GameMain.GraphicsWidth - (textSize.X + 10), 300);
                            DrawString(spriteBatch, pos, text, Color.White, Color.Black * 0.5f, 0, GUIStyle.SmallFont);
                            pos.Y += textSize.Y + 8;
-                            campaignMode.CampaignMetadata?.DebugDraw(spriteBatch, pos, debugDrawMetadataOffset, ignoredMetadataInfo);
+                            campaignMode.CampaignMetadata?.DebugDraw(spriteBatch, pos, campaignMode, debugDrawMetaData);
                        }
                        else
                        {
@@ -684,37 +696,24 @@ namespace Barotrauma
            }
        }

-        public static void DrawBackgroundSprite(SpriteBatch spriteBatch, Sprite backgroundSprite, float aberrationStrength = 1.0f)
+        public static void DrawBackgroundSprite(SpriteBatch spriteBatch, Sprite backgroundSprite, Color color, Rectangle? drawArea = null, SpriteEffects spriteEffects = SpriteEffects.None)
        {
-            double aberrationT = (Timing.TotalTime * 0.5f);
-            GameMain.GameScreen.PostProcessEffect.Parameters["blurDistance"].SetValue(0.001f * aberrationStrength);
-            GameMain.GameScreen.PostProcessEffect.Parameters["chromaticAberrationStrength"].SetValue(new Vector3(-0.025f, -0.01f, -0.05f) *
-                (float)(PerlinNoise.CalculatePerlin(aberrationT, aberrationT, 0) + 0.5f) * aberrationStrength);
-
-            Matrix.CreateOrthographicOffCenter(0, GameMain.GraphicsWidth, GameMain.GraphicsHeight, 0, 0, -1, out Matrix projection);
-
-            GameMain.GameScreen.PostProcessEffect.Parameters["MatrixTransform"].SetValue(projection);
-            GameMain.GameScreen.PostProcessEffect.CurrentTechnique = GameMain.GameScreen.PostProcessEffect.Techniques["BlurChromaticAberration"];
-            GameMain.GameScreen.PostProcessEffect.CurrentTechnique.Passes[0].Apply();
-
-            spriteBatch.Begin(SpriteSortMode.Immediate, effect: GameMain.GameScreen.PostProcessEffect);
+            Rectangle area = drawArea ?? new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight);

            float scale = Math.Max(
-                (float)GameMain.GraphicsWidth / backgroundSprite.SourceRect.Width,
-                (float)GameMain.GraphicsHeight / backgroundSprite.SourceRect.Height) * 1.1f;
-            float paddingX = backgroundSprite.SourceRect.Width * scale - GameMain.GraphicsWidth;
-            float paddingY = backgroundSprite.SourceRect.Height * scale - GameMain.GraphicsHeight;
+                (float)area.Width / backgroundSprite.SourceRect.Width,
+                (float)area.Height / backgroundSprite.SourceRect.Height) * 1.1f;
+            float paddingX = backgroundSprite.SourceRect.Width * scale - area.Width;
+            float paddingY = backgroundSprite.SourceRect.Height * scale - area.Height;

-            double noiseT = (Timing.TotalTime * 0.02f);
+            double noiseT = Timing.TotalTime * 0.02f;
            Vector2 pos = new Vector2((float)PerlinNoise.CalculatePerlin(noiseT, noiseT, 0) - 0.5f, (float)PerlinNoise.CalculatePerlin(noiseT, noiseT, 0.5f) - 0.5f);
            pos = new Vector2(pos.X * paddingX, pos.Y * paddingY);

            spriteBatch.Draw(backgroundSprite.Texture,
-                new Vector2(GameMain.GraphicsWidth, GameMain.GraphicsHeight) / 2 + pos,
-                null, Color.White, 0.0f, backgroundSprite.size / 2,
-                scale, SpriteEffects.None, 0.0f);
-
-            spriteBatch.End();
+                area.Center.ToVector2() + pos,
+                null, color, 0.0f, backgroundSprite.size / 2,
+                scale, spriteEffects, 0.0f);
        }

        #region Update list
@@ -1206,48 +1205,37 @@ namespace Barotrauma
                }
                if (PlayerInput.IsCtrlDown() && PlayerInput.KeyHit(Keys.M))
                {
-                    debugDrawMetadata = !debugDrawMetadata;
+                    debugDrawMetaData.Enabled = !debugDrawMetaData.Enabled;
                }

-                if (debugDrawMetadata)
+                if (debugDrawMetaData.Enabled)
                {
                    if (PlayerInput.KeyHit(Keys.Up))
                    {
-                        debugDrawMetadataOffset--;
+                        debugDrawMetaData.Offset--;
                    }
-
                    if (PlayerInput.KeyHit(Keys.Down))
                    {
-                        debugDrawMetadataOffset++;
+                        debugDrawMetaData.Offset++;
                    }
-
                    if (PlayerInput.IsCtrlDown())
                    {
                        if (PlayerInput.KeyHit(Keys.D1))
                        {
-                            ignoredMetadataInfo[0] = ignoredMetadataInfo[0] == string.Empty ? "reputation.location" : string.Empty;
-                            debugDrawMetadataOffset = 0;
+                            debugDrawMetaData.FactionMetadata = !debugDrawMetaData.FactionMetadata;
+                            debugDrawMetaData.Offset = 0;
                        }
-
                        if (PlayerInput.KeyHit(Keys.D2))
                        {
-                            ignoredMetadataInfo[1] = ignoredMetadataInfo[1] == string.Empty ? "reputation.faction" : string.Empty;
-                            debugDrawMetadataOffset = 0;
+                            debugDrawMetaData.UpgradeLevels = !debugDrawMetaData.UpgradeLevels;
+                            debugDrawMetaData.Offset = 0;
                        }
-
                        if (PlayerInput.KeyHit(Keys.D3))
                        {
-                            ignoredMetadataInfo[2] = ignoredMetadataInfo[2] == string.Empty ? "upgrade." : string.Empty;
-                            debugDrawMetadataOffset = 0;
-                        }
-
-                        if (PlayerInput.KeyHit(Keys.D4))
-                        {
-                            ignoredMetadataInfo[3] = ignoredMetadataInfo[3] == string.Empty ? "upgradeprice." : string.Empty;
-                            debugDrawMetadataOffset = 0;
+                            debugDrawMetaData.UpgradePrices = !debugDrawMetaData.UpgradePrices;
+                            debugDrawMetaData.Offset = 0;
                        }
                    }
-
                }

                HandlePersistingElements(deltaTime);
@@ -2599,8 +2587,12 @@ namespace Barotrauma

        public static void AddMessage(string message, Color color, float? lifeTime = null, bool playSound = true, GUIFont font = null)
        {
-            if (messages.Any(msg => msg.Text == message)) { return; }
-            messages.Add(new GUIMessage(message, color, lifeTime ?? MathHelper.Clamp(message.Length / 5.0f, 3.0f, 10.0f), font ?? GUIStyle.LargeFont));
+            var guiMessage = new GUIMessage(message, color, lifeTime ?? MathHelper.Clamp(message.Length / 5.0f, 3.0f, 10.0f), font ?? GUIStyle.LargeFont);
+            lock (mutex)
+            {
+                if (messages.Any(msg => msg.Text == message)) { return; }
+                messages.Add(guiMessage);
+            }
            if (playSound) { SoundPlayer.PlayUISound(GUISoundType.UIMessage); }
        }

@@ -2610,34 +2602,37 @@ namespace Barotrauma

            var newMessage = new GUIMessage(message, color, pos, velocity, lifeTime, Alignment.Center, GUIStyle.Font, sub: sub);
            if (playSound) { SoundPlayer.PlayUISound(soundType); }
-            bool overlapFound = true;
-            int tries = 0;
-            while (overlapFound)
-            {
-                overlapFound = false;
-                foreach (var otherMessage in messages)
-                {
-                    float xDiff = otherMessage.Pos.X - newMessage.Pos.X;
-                    if (Math.Abs(xDiff) > (newMessage.Size.X + otherMessage.Size.X) / 2) { continue; }
-                    float yDiff = otherMessage.Pos.Y - newMessage.Pos.Y;
-                    if (Math.Abs(yDiff) > (newMessage.Size.Y + otherMessage.Size.Y) / 2) { continue; }
-                    Vector2 moveDir = -(new Vector2(xDiff, yDiff) + Rand.Vector(1.0f));
-                    if (moveDir.LengthSquared() > 0.0001f)
-                    {
-                        moveDir = Vector2.Normalize(moveDir);
-                    }
-                    else
-                    {
-                        moveDir = Rand.Vector(1.0f);
-                    }
-                    moveDir.Y = -Math.Abs(moveDir.Y);
-                    newMessage.Pos -= Vector2.UnitY * 10;
-                }
-                tries++;
-                if (tries > 20) { break; }
-            }

-            messages.Add(newMessage);
+            lock (mutex)
+            {
+                bool overlapFound = true;
+                int tries = 0;
+                while (overlapFound)
+                {
+                    overlapFound = false;
+                    foreach (var otherMessage in messages)
+                    {
+                        float xDiff = otherMessage.Pos.X - newMessage.Pos.X;
+                        if (Math.Abs(xDiff) > (newMessage.Size.X + otherMessage.Size.X) / 2) { continue; }
+                        float yDiff = otherMessage.Pos.Y - newMessage.Pos.Y;
+                        if (Math.Abs(yDiff) > (newMessage.Size.Y + otherMessage.Size.Y) / 2) { continue; }
+                        Vector2 moveDir = -(new Vector2(xDiff, yDiff) + Rand.Vector(1.0f));
+                        if (moveDir.LengthSquared() > 0.0001f)
+                        {
+                            moveDir = Vector2.Normalize(moveDir);
+                        }
+                        else
+                        {
+                            moveDir = Rand.Vector(1.0f);
+                        }
+                        moveDir.Y = -Math.Abs(moveDir.Y);
+                        newMessage.Pos -= Vector2.UnitY * 10;
+                    }
+                    tries++;
+                    if (tries > 20) { break; }
+                }
+                messages.Add(newMessage);
+            }
        }

        public static void ClearMessages()
@@ -8,9 +8,7 @@ namespace Barotrauma
 {
    public class GUICanvas : RectTransform
    {
-        private static readonly object mutex = new object();
-
-        protected GUICanvas() : base(size, parent: null) { }
+        protected GUICanvas() : base(Size, parent: null) { }

        private static GUICanvas _instance;
        public static GUICanvas Instance
@@ -33,7 +31,7 @@ namespace Barotrauma
        //GUICanvas stores the children as weak references, to allow elements that we no longer need to get garbage collected
        private readonly List<WeakReference<RectTransform>> childrenWeakRef = new List<WeakReference<RectTransform>>();

-        private static Vector2 size => new Vector2(GameMain.GraphicsWidth / (float)GUI.UIWidth, 1f);
+        private static Vector2 Size => new Vector2(GameMain.GraphicsWidth / (float)GUI.UIWidth, 1f);

        protected override Rectangle NonScaledUIRect => UIRect;

@@ -41,25 +39,27 @@ namespace Barotrauma

        private static void OnChildrenChanged(RectTransform _)
        {
-            lock (mutex)
+            CrossThread.RequestExecutionOnMainThread(RefreshChildren);
+        }
+
+        private static void RefreshChildren()
+        {
+            //add weak reference if we don't have one yet
+            foreach (var child in _instance.Children)
            {
-                //add weak reference if we don't have one yet
-                foreach (var child in _instance.Children)
+                if (!_instance.childrenWeakRef.Any(c => c.TryGetTarget(out var existingChild) && existingChild == child))
                {
-                    if (!_instance.childrenWeakRef.Any(c => c.TryGetTarget(out var existingChild) && existingChild == child))
-                    {
-                        _instance.childrenWeakRef.Add(new WeakReference<RectTransform>(child));
-                    }
+                    _instance.childrenWeakRef.Add(new WeakReference<RectTransform>(child));
                }
-                //get rid of strong references
-                _instance.children.Clear();
-                //remove dead children
-                for (int i = _instance.childrenWeakRef.Count - 2; i >= 0; i--)
+            }
+            //get rid of strong references
+            _instance.children.Clear();
+            //remove dead children
+            for (int i = _instance.childrenWeakRef.Count - 1; i >= 0; i--)
+            {
+                if (!_instance.childrenWeakRef[i].TryGetTarget(out var child) || child.Parent != _instance)
                {
-                    if (!_instance.childrenWeakRef[i].TryGetTarget(out var child) || child.Parent != _instance)
-                    {
-                        _instance.childrenWeakRef.RemoveAt(i);
-                    }
+                    _instance.childrenWeakRef.RemoveAt(i);
                }
            }
        }
@@ -67,7 +67,7 @@ namespace Barotrauma
        // Turn public, if there is a need to call this manually.
        private static void RecalculateSize()
        {
-            Vector2 recalculatedSize = size;
+            Vector2 recalculatedSize = Size;

            // Scale children that are supposed to encompass the whole screen so that they are properly scaled on ultrawide as well
            for (int i = 0; i < Instance.childrenWeakRef.Count; i++)
@@ -109,7 +109,7 @@ namespace Barotrauma
                }
            }

-            Instance.Resize(size, resizeChildren: true);
+            Instance.Resize(Size, resizeChildren: true);
            Instance.GetAllChildren().Select(c => c.GUIComponent as GUITextBlock).ForEach(t => t?.SetTextPos());
            _instance.children.Clear();
        }
@@ -244,18 +244,16 @@ namespace Barotrauma
            return parentHierarchy.Last();
        }
                
-        public void AddItem(LocalizedString text, object userData = null, LocalizedString toolTip = null)
+        public GUIComponent AddItem(LocalizedString text, object userData = null, LocalizedString toolTip = null, Color? color = null, Color? textColor = null)
        {
            toolTip ??= "";
            if (selectMultiple)
            {
-                var frame = new GUIFrame(new RectTransform(new Point(button.Rect.Width, button.Rect.Height), listBox.Content.RectTransform)
-                { IsFixedSize = false }, style: "ListBoxElement")
+                var frame = new GUIFrame(new RectTransform(new Point(button.Rect.Width, button.Rect.Height), listBox.Content.RectTransform) { IsFixedSize = false }, style: "ListBoxElement", color: color)
                {
                    UserData = userData,
                    ToolTip = toolTip
                };
-
                new GUITickBox(new RectTransform(new Vector2(1.0f, 0.8f), frame.RectTransform, anchor: Anchor.CenterLeft) { MaxSize = new Point(int.MaxValue, (int)(button.Rect.Height * 0.8f)) }, text)
                {
                    UserData = userData,
@@ -275,7 +273,7 @@ namespace Barotrauma
                        foreach (GUIComponent child in ListBox.Content.Children)
                        {
                            var tickBox = child.GetChild<GUITickBox>();
-                            if (tickBox.Selected)
+                            if (tickBox is { Selected: true })
                            {
                                selectedDataMultiple.Add(child.UserData);
                                selectedIndexMultiple.Add(i);
@@ -289,11 +287,11 @@ namespace Barotrauma
                        return true;
                    }
                };
+                return frame;
            }
            else
            {
-                new GUITextBlock(new RectTransform(new Point(button.Rect.Width, button.Rect.Height), listBox.Content.RectTransform)
-                { IsFixedSize = false }, text, style: "ListBoxElement")
+                return new GUITextBlock(new RectTransform(new Point(button.Rect.Width, button.Rect.Height), listBox.Content.RectTransform) { IsFixedSize = false }, text, style: "ListBoxElement", color: color, textColor: textColor)
                {
                    UserData = userData,
                    ToolTip = toolTip
@@ -323,7 +321,7 @@ namespace Barotrauma
            }
            else
            {
-                if (!(component is GUITextBlock textBlock))
+                if (component is not GUITextBlock textBlock)
                {
                    textBlock = component.GetChild<GUITextBlock>();
                    if (textBlock is null && !AllowNonText) { return false; }
@@ -1059,6 +1059,7 @@ namespace Barotrauma

            GUIComponent child = Content.GetChild(childIndex);
            if (child is null) { return; }
+            if (!child.Enabled) { return; }

            bool wasSelected = true;
            if (OnSelected != null)
@@ -268,7 +268,7 @@ namespace Barotrauma
                    Buttons.Clear();
                }

-                Header = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), headerText, wrap: true);
+                Header = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), headerText, wrap: true, textColor: GUIStyle.TextColorBright);
                GUIStyle.Apply(Header, "", this);
                Header.RectTransform.MinSize = new Point(0, Header.Rect.Height);

@@ -313,7 +313,9 @@ namespace Barotrauma
                    break;
            }

-            RectTransform.MinSize = TextBox.RectTransform.MinSize;
+            RectTransform.MinSize = new Point(
+                Math.Max(rectT.MinSize.X, TextBox.RectTransform.MinSize.X), 
+                Math.Max(rectT.MinSize.Y, TextBox.RectTransform.MinSize.Y));
            LayoutGroup.Recalculate();
        }

@@ -1,14 +1,12 @@
-using Microsoft.Xna.Framework;
+using Barotrauma.Extensions;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
-using Barotrauma.Extensions;

 namespace Barotrauma
 {
@@ -20,6 +18,26 @@ namespace Barotrauma
        {
            return element.NameAsIdentifier();
        }
+
+        protected int ParseSize(XElement element, string attributeName)
+        {
+            string valueStr = element.GetAttributeString(attributeName, string.Empty);
+            bool relativeToWidth = valueStr.EndsWith("vw");
+            bool relativeToHeight = valueStr.EndsWith("vh");
+            if (relativeToWidth || relativeToHeight)
+            {
+                string floatStr = valueStr.Substring(0, valueStr.Length - 2);
+                if (!float.TryParse(floatStr, NumberStyles.Any, CultureInfo.InvariantCulture, out float relativeHeight))
+                {
+                    DebugConsole.ThrowError($"Error while parsing a {nameof(GUIComponentStyle)}: {valueStr} is not a valid size.");
+                }
+                return (int)(relativeHeight / 100.0f * (relativeToWidth ? GameMain.GraphicsWidth : GameMain.GraphicsHeight));
+            }
+            else
+            {
+                return element.GetAttributeInt(attributeName, 0);
+            }
+        }
    }

    public abstract class GUISelector<T> where T : GUIPrefab
@@ -166,7 +184,8 @@ namespace Barotrauma
                Point maxResolution = subElement.GetAttributePoint("maxresolution", new Point(int.MaxValue, int.MaxValue));
                if (GameMain.GraphicsWidth <= maxResolution.X && GameMain.GraphicsHeight <= maxResolution.Y)
                {
-                    return (uint)Math.Round(subElement.GetAttributeInt("size", 14) * GameSettings.CurrentConfig.Graphics.TextScale);
+                    int rawSize = ParseSize(subElement, "size");
+                    return (uint)Math.Round(rawSize * GameSettings.CurrentConfig.Graphics.TextScale);
                }
            }
            return (uint)Math.Round(defaultSize * GameSettings.CurrentConfig.Graphics.TextScale);
@@ -438,7 +438,7 @@ namespace Barotrauma
            }
            else
            {
-                if ((PlayerInput.LeftButtonClicked() || PlayerInput.RightButtonClicked()) && selected) 
+                if ((PlayerInput.PrimaryMouseButtonClicked() || PlayerInput.SecondaryMouseButtonClicked()) && selected)
                {
                    if (!mouseHeldInside) { Deselect(); }
                    mouseHeldInside = false;
@@ -143,14 +143,13 @@ namespace Barotrauma
            }
            int healthBarHeight = (int)(50f * GUI.Scale);
            HealthBarArea = new Rectangle(BottomRightInfoArea.Right - healthBarWidth + (int)Math.Floor(1 / GUI.Scale), BottomRightInfoArea.Y - healthBarHeight + GUI.IntScale(10), healthBarWidth, healthBarHeight);
-            HealthBarAfflictionArea = new Rectangle(HealthBarArea.X, HealthBarArea.Y - Padding - afflictionAreaHeight, HealthBarArea.Width, afflictionAreaHeight);            
+            HealthBarAfflictionArea = new Rectangle(HealthBarArea.X, HealthBarArea.Y - Padding - afflictionAreaHeight, HealthBarArea.Width, afflictionAreaHeight);


            int messageAreaWidth = GameMain.GraphicsWidth / 3;
            MessageAreaTop = new Rectangle((GameMain.GraphicsWidth - messageAreaWidth) / 2, ButtonAreaTop.Bottom + ButtonAreaTop.Height, messageAreaWidth, ButtonAreaTop.Height);

-            bool isFourByThree = GUI.IsFourByThree();
-            int chatBoxWidth = !isFourByThree ? (int)(475 * GUI.Scale) : (int)(375 * GUI.Scale);
+            int chatBoxWidth = (int)(475 * GUI.Scale * GUI.AspectRatioAdjustment);
            int chatBoxHeight = (int)Math.Max(GameMain.GraphicsHeight * 0.25f, 150);
            ChatBoxArea = new Rectangle(Padding, GameMain.GraphicsHeight - Padding - chatBoxHeight, chatBoxWidth, chatBoxHeight);

@@ -160,8 +159,9 @@ namespace Barotrauma

            int crewAreaY = ButtonAreaTop.Bottom + Padding;
            int crewAreaHeight = ObjectiveAnchor.Top - Padding - crewAreaY;
-            CrewArea = new Rectangle(Padding, crewAreaY, (int)Math.Max(400 * GUI.Scale, 220), crewAreaHeight);

+            float crewAreaWidthMultiplier = GUI.IsUltrawide ? GUI.HorizontalAspectRatio : 1.0f;
+            CrewArea = new Rectangle(Padding, crewAreaY, (int)(Math.Max(400 * GUI.Scale, 220) * crewAreaWidthMultiplier), crewAreaHeight);
            InventoryAreaLower = new Rectangle(ChatBoxArea.Right + Padding * 7, inventoryTopY, GameMain.GraphicsWidth - Padding * 9 - ChatBoxArea.Width, GameMain.GraphicsHeight - inventoryTopY);

            int healthWindowWidth = (int)(GameMain.GraphicsWidth * 0.5f);
@@ -187,19 +187,26 @@ namespace Barotrauma

        public static void Draw(SpriteBatch spriteBatch)
        {
-            DrawRectangle(ButtonAreaTop, Color.White * 0.5f);
-            DrawRectangle(TutorialObjectiveListArea, GUIStyle.Blue * 0.5f);
-            DrawRectangle(MessageAreaTop, GUIStyle.Orange * 0.5f);
-            DrawRectangle(CrewArea, Color.Blue * 0.5f);
-            DrawRectangle(ChatBoxArea, Color.Cyan * 0.5f);
-            DrawRectangle(HealthBarArea, Color.Red * 0.5f);
-            DrawRectangle(HealthBarAfflictionArea, Color.Red * 0.5f);
-            DrawRectangle(InventoryAreaLower, Color.Yellow * 0.5f);
-            DrawRectangle(HealthWindowAreaLeft, Color.Red * 0.5f);
-            DrawRectangle(BottomRightInfoArea, Color.Green * 0.5f);
-            DrawRectangle(ItemHUDArea, Color.Magenta * 0.3f);
+            DrawRectangle(nameof(ButtonAreaTop), ButtonAreaTop, Color.White * 0.5f);
+            DrawRectangle(nameof(TutorialObjectiveListArea), TutorialObjectiveListArea, GUIStyle.Blue * 0.5f);
+            DrawRectangle(nameof(MessageAreaTop), MessageAreaTop, GUIStyle.Orange * 0.5f);
+            DrawRectangle(nameof(CrewArea), CrewArea, Color.Blue * 0.5f);
+            DrawRectangle(nameof(ChatBoxArea), ChatBoxArea, Color.Cyan * 0.5f);
+            DrawRectangle(nameof(HealthBarArea), HealthBarArea, Color.Red * 0.5f);
+            DrawRectangle(nameof(HealthBarAfflictionArea), HealthBarAfflictionArea, Color.Red * 0.5f);
+            DrawRectangle(nameof(InventoryAreaLower), InventoryAreaLower, Color.Yellow * 0.5f);
+            DrawRectangle(nameof(HealthWindowAreaLeft), HealthWindowAreaLeft, Color.Red * 0.5f);
+            DrawRectangle(nameof(BottomRightInfoArea), BottomRightInfoArea, Color.Green * 0.5f);
+            DrawRectangle(nameof(ItemHUDArea), ItemHUDArea, Color.Magenta * 0.3f);

-            void DrawRectangle(Rectangle r, Color c) => GUI.DrawRectangle(spriteBatch, r, c);
+            void DrawRectangle(string label, Rectangle r, Color c)
+            {
+                if (!label.IsNullOrEmpty())
+                {
+                    GUI.DrawString(spriteBatch, r.Location.ToVector2() + Vector2.One * 3, label, c, font: GUIStyle.SmallFont);
+                }
+                GUI.DrawRectangle(spriteBatch, r, c);
+            }
        }
    }

@@ -11,9 +11,9 @@ namespace Barotrauma
 {
    class LoadingScreen
    {
-        private readonly Texture2D defaultBackgroundTexture, overlay;
+        private readonly Sprite defaultBackgroundTexture, overlay;
        private readonly SpriteSheet decorativeGraph, decorativeMap;
-        private Texture2D currentBackgroundTexture;
+        private Sprite currentBackgroundTexture;
        private readonly Sprite noiseSprite;

        private string randText = "";
@@ -24,6 +24,8 @@ namespace Barotrauma
        private Video currSplashScreen;
        private DateTime videoStartTime;

+        private bool mirrorBackground;
+
        public struct PendingSplashScreen
        {
            public string Filename;
@@ -112,12 +114,12 @@ namespace Barotrauma

        public LoadingScreen(GraphicsDevice graphics)
        {
-            defaultBackgroundTexture = TextureLoader.FromFile("Content/Map/LocationPortraits/AlienRuins.png");
+            defaultBackgroundTexture = new Sprite("Content/Map/LocationPortraits/MainMenu1.png", Vector2.Zero);

            decorativeMap = new SpriteSheet("Content/Map/MapHUD.png", 6, 5, Vector2.Zero, sourceRect: new Rectangle(0, 0, 2048, 640));
            decorativeGraph = new SpriteSheet("Content/Map/MapHUD.png", 4, 10, Vector2.Zero, sourceRect: new Rectangle(1025, 1259, 1024, 732));

-            overlay = TextureLoader.FromFile("Content/UI/LoadingScreenOverlay.png");
+            overlay = new Sprite("Content/UI/MainMenuVignette.png", Vector2.Zero);
            noiseSprite = new Sprite("Content/UI/noise.png", Vector2.Zero);
            DrawLoadingText = true;
            SetSelectedTip(TextManager.Get("LoadingScreenTip"));
@@ -138,35 +140,24 @@ namespace Barotrauma
                    DisableSplashScreen();
                }
            }
-        
-            var titleStyle = GUIStyle.GetComponentStyle("TitleText");
-            Sprite titleSprite = null;
-            if (!WaitForLanguageSelection && titleStyle != null && titleStyle.Sprites.ContainsKey(GUIComponent.ComponentState.None))
-            {
-                titleSprite = titleStyle.Sprites[GUIComponent.ComponentState.None].First()?.Sprite;
-            }

            drawn = true;

            currentBackgroundTexture ??= defaultBackgroundTexture;

+            float overlayScale = Math.Min(GameMain.GraphicsWidth / overlay.size.X, GameMain.GraphicsHeight / overlay.size.Y);
+
+            Rectangle drawArea = new Rectangle(
+                (int)(overlay.size.X * overlayScale / 2), 0, 
+                (int)(GameMain.GraphicsWidth - overlay.size.X * overlayScale / 2), GameMain.GraphicsHeight);
+
            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, samplerState: GUI.SamplerState);

-            float scale = (GameMain.GraphicsWidth / (float)currentBackgroundTexture.Width) * 1.2f;
-            float paddingX = currentBackgroundTexture.Width * scale - GameMain.GraphicsWidth;
-            float paddingY = currentBackgroundTexture.Height * scale - GameMain.GraphicsHeight;
-
-            double noiseT = (Timing.TotalTime * 0.02f);
-            Vector2 pos = new Vector2((float)PerlinNoise.CalculatePerlin(noiseT, noiseT, 0) - 0.5f, (float)PerlinNoise.CalculatePerlin(noiseT, noiseT, 0.5f) - 0.5f);
-            pos = new Vector2(pos.X * paddingX, pos.Y * paddingY);
-
-            spriteBatch.Draw(currentBackgroundTexture,
-                new Vector2(GameMain.GraphicsWidth, GameMain.GraphicsHeight) / 2 + pos,
-                null, Color.White, 0.0f, new Vector2(currentBackgroundTexture.Width / 2, currentBackgroundTexture.Height / 2),
-                scale, SpriteEffects.None, 0.0f);
-
-            spriteBatch.Draw(overlay, new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight), null, Color.White, 0.0f, Vector2.Zero, SpriteEffects.None, 0.0f);
+            GUI.DrawBackgroundSprite(spriteBatch, currentBackgroundTexture, Color.White, drawArea, 
+                spriteEffects: mirrorBackground ? SpriteEffects.FlipHorizontally : SpriteEffects.None);
+            overlay.Draw(spriteBatch, Vector2.Zero, scale: overlayScale);

+            double noiseT = Timing.TotalTime * 0.02f;
            float noiseStrength = (float)PerlinNoise.CalculatePerlin(noiseT, noiseT, 0);
            float noiseScale = (float)PerlinNoise.CalculatePerlin(noiseT * 5.0f, noiseT * 2.0f, 0) * 4.0f;
            noiseSprite.DrawTiled(spriteBatch, Vector2.Zero, new Vector2(GameMain.GraphicsWidth, GameMain.GraphicsHeight),
@@ -174,10 +165,7 @@ namespace Barotrauma
                color: Color.White * noiseStrength * 0.1f,
                textureScale: Vector2.One * noiseScale);

-            titleSprite?.Draw(spriteBatch, new Vector2(GameMain.GraphicsWidth * 0.05f, GameMain.GraphicsHeight * 0.125f),
-                Color.White, origin: new Vector2(0.0f, titleSprite.SourceRect.Height / 2.0f),
-                scale: GameMain.GraphicsHeight / 2000.0f);
-
+            Vector2 textPos = new Vector2((int)(GameMain.GraphicsWidth * 0.05f), (int)(GameMain.GraphicsHeight * 0.75f));
            if (WaitForLanguageSelection)
            {
                DrawLanguageSelectionPrompt(spriteBatch, graphics);
@@ -215,16 +203,18 @@ namespace Barotrauma
 #endif
                    }
                }
+
                if (GUIStyle.LargeFont.HasValue)
                {
                    GUIStyle.LargeFont.DrawString(spriteBatch, loadText.ToUpper(),
-                        new Vector2(GameMain.GraphicsWidth / 2.0f - GUIStyle.LargeFont.MeasureString(loadText.ToUpper()).X / 2.0f, GameMain.GraphicsHeight * 0.75f),
+                        textPos,
                        Color.White);
+                    textPos.Y += GUIStyle.LargeFont.MeasureString(loadText.ToUpper()).Y * 1.2f;
                }

                if (GUIStyle.Font.HasValue && selectedTip != null)
                {
-                    string wrappedTip = ToolBox.WrapText(selectedTip.SanitizedValue, GameMain.GraphicsWidth * 0.5f, GUIStyle.Font.Value);
+                    string wrappedTip = ToolBox.WrapText(selectedTip.SanitizedValue, GameMain.GraphicsWidth * 0.3f, GUIStyle.Font.Value);
                    string[] lines = wrappedTip.Split('\n');
                    float lineHeight = GUIStyle.Font.MeasureString(selectedTip).Y;

@@ -234,7 +224,8 @@ namespace Barotrauma
                        for (int i = 0; i < lines.Length; i++)
                        {
                            GUIStyle.Font.DrawStringWithColors(spriteBatch, lines[i],
-                                new Vector2((int)(GameMain.GraphicsWidth / 2.0f - GUIStyle.Font.MeasureString(lines[i]).X / 2.0f), (int)(GameMain.GraphicsHeight * 0.8f + i * lineHeight)), Color.White,
+                                new Vector2(textPos.X, (int)(textPos.Y + i * lineHeight)),
+                                Color.White,
                                0f, Vector2.Zero, 1f, SpriteEffects.None, 0f, selectedTip.RichTextData.Value, rtdOffset);
                            rtdOffset += lines[i].Length;
                        }
@@ -244,7 +235,8 @@ namespace Barotrauma
                        for (int i = 0; i < lines.Length; i++)
                        {
                            GUIStyle.Font.DrawString(spriteBatch, lines[i],
-                                new Vector2((int)(GameMain.GraphicsWidth / 2.0f - GUIStyle.Font.MeasureString(lines[i]).X / 2.0f), (int)(GameMain.GraphicsHeight * 0.8f + i * lineHeight)), Color.White);
+                                new Vector2(textPos.X, (int)(textPos.Y + i * lineHeight)),
+                                new Color(228, 217, 167, 255));
                        }
                    }
                }
@@ -257,13 +249,16 @@ namespace Barotrauma
            Vector2 decorativeScale = new Vector2(GameMain.GraphicsHeight / 1080.0f);

            float noiseVal = (float)PerlinNoise.CalculatePerlin(Timing.TotalTime * 0.25f, Timing.TotalTime * 0.5f, 0);
-            decorativeGraph.Draw(spriteBatch, (int)(decorativeGraph.FrameCount * noiseVal),
-                new Vector2(GameMain.GraphicsWidth * 0.001f, GameMain.GraphicsHeight * 0.24f),
-                Color.White, Vector2.Zero, 0.0f, decorativeScale, SpriteEffects.FlipVertically);
+            if (!WaitForLanguageSelection)
+            {
+                decorativeGraph.Draw(spriteBatch, (int)(decorativeGraph.FrameCount * noiseVal),
+                    new Vector2(GameMain.GraphicsWidth * 0.001f, textPos.Y),
+                    Color.White, new Vector2(0, decorativeMap.FrameSize.Y), 0.0f, decorativeScale, SpriteEffects.FlipVertically);
+            }

            decorativeMap.Draw(spriteBatch, (int)(decorativeMap.FrameCount * noiseVal),
-                new Vector2(GameMain.GraphicsWidth * 0.99f, GameMain.GraphicsHeight * 0.66f),
-                Color.White, decorativeMap.FrameSize.ToVector2(), 0.0f, decorativeScale);
+                new Vector2(GameMain.GraphicsWidth * 0.99f, GameMain.GraphicsHeight * 0.01f),
+                Color.White, new Vector2(decorativeMap.FrameSize.X, 0), 0.0f, decorativeScale, SpriteEffects.FlipHorizontally | SpriteEffects.FlipVertically);

            if (noiseVal < 0.2f)
            {
@@ -285,8 +280,9 @@ namespace Barotrauma

            if (GUIStyle.LargeFont.HasValue)
            {
+                Vector2 textSize = GUIStyle.LargeFont.MeasureString(randText);
                GUIStyle.LargeFont.DrawString(spriteBatch, randText,
-                    new Vector2(GameMain.GraphicsWidth - decorativeMap.FrameSize.X * decorativeScale.X * 0.8f, GameMain.GraphicsHeight * 0.57f),
+                    new Vector2(GameMain.GraphicsWidth * 0.95f - textSize.X, GameMain.GraphicsHeight * 0.06f),
                    Color.White * (1.0f - noiseVal));
            }

@@ -312,8 +308,8 @@ namespace Barotrauma
                languageSelectionCursor = new Sprite("Content/UI/cursor.png", Vector2.Zero);
            }

-            Vector2 textPos = new Vector2(GameMain.GraphicsWidth / 2, GameMain.GraphicsHeight * 0.3f);
-            Vector2 textSpacing = new Vector2(0.0f, (GameMain.GraphicsHeight * 0.5f) / AvailableLanguages.Length);
+            Vector2 textPos = new Vector2((int)(GameMain.GraphicsWidth * 0.05f), (int)(GameMain.GraphicsHeight * 0.3f));
+            Vector2 textSpacing = new Vector2(0.0f, GameMain.GraphicsHeight * 0.5f / AvailableLanguages.Length);
            foreach (LanguageIdentifier language in AvailableLanguages)
            {
                string localizedLanguageName = TextManager.GetTranslatedLanguageName(language);
@@ -321,10 +317,10 @@ namespace Barotrauma

                Vector2 textSize = font.MeasureString(localizedLanguageName);
                bool hover =
-                    Math.Abs(PlayerInput.MousePosition.X - textPos.X) < textSize.X / 2 &&
-                    Math.Abs(PlayerInput.MousePosition.Y - textPos.Y) < textSpacing.Y / 2;
+                    PlayerInput.MousePosition.X > textPos.X && PlayerInput.MousePosition.X < textPos.X + textSize.X &&
+                    PlayerInput.MousePosition.Y > textPos.Y && PlayerInput.MousePosition.Y < textPos.Y + textSize.Y;

-                font.DrawString(spriteBatch, localizedLanguageName, textPos - textSize / 2,
+                font.DrawString(spriteBatch, localizedLanguageName, textPos,
                    hover ? Color.White : Color.White * 0.6f);
                if (hover && PlayerInput.PrimaryMouseButtonClicked())
                {
@@ -431,7 +427,12 @@ namespace Barotrauma
            drawn = false;
            LoadState = null;
            SetSelectedTip(TextManager.Get("LoadingScreenTip"));
-            currentBackgroundTexture = LocationType.Prefabs.GetRandomUnsynced()?.GetPortrait(Rand.Int(int.MaxValue))?.Texture;
+            currentBackgroundTexture = LocationType.Prefabs.Where(p => p.UsePortraitInRandomLoadingScreens).GetRandomUnsynced()?.GetPortrait(Rand.Int(int.MaxValue));
+            if (GameMain.GameSession?.GameMode?.Missions is { } missions && missions.Any(m => m.Prefab.HasPortraits))
+            {
+                currentBackgroundTexture = missions.Where(m => m.Prefab.HasPortraits).First().Prefab.GetPortrait(Rand.Int(int.MaxValue));
+            }
+            mirrorBackground = Rand.Range(0.0f, 1.0f) < 0.5f;

            while (!drawn)
            {
@@ -143,33 +143,32 @@ namespace Barotrauma
        {
            public readonly MedicalClinic.NetAffliction Target;
            public readonly ImmutableArray<GUIComponent> ElementsToDisable;
+            public readonly GUIComponent TargetElement;

-            public PopupAffliction(ImmutableArray<GUIComponent> elementsToDisable, MedicalClinic.NetAffliction target)
+            public PopupAffliction(ImmutableArray<GUIComponent> elementsToDisable, GUIComponent component, MedicalClinic.NetAffliction target)
            {
                Target = target;
                ElementsToDisable = elementsToDisable;
+                TargetElement = component;
            }
        }

        private readonly struct PopupAfflictionList
        {
            public readonly MedicalClinic.NetCrewMember Target;
+            public readonly GUIListBox ListElement;
            public readonly GUIButton TreatAllButton;
-            public readonly List<PopupAffliction> Afflictions;
+            public readonly HashSet<PopupAffliction> Afflictions;

-            public PopupAfflictionList(MedicalClinic.NetCrewMember crewMember, GUIButton treatAllButton)
+            public PopupAfflictionList(MedicalClinic.NetCrewMember crewMember, GUIListBox listElement, GUIButton treatAllButton)
            {
+                ListElement = listElement;
                Target = crewMember;
                TreatAllButton = treatAllButton;
-                Afflictions = new List<PopupAffliction>();
+                Afflictions = new HashSet<PopupAffliction>();
            }
        }

-        // private enum SortMode
-        // {
-        //     Severity
-        // }
-
        private readonly MedicalClinic medicalClinic;
        private readonly GUIComponent container;
        private Point prevResolution;
@@ -221,23 +220,22 @@ namespace Barotrauma

        private void UpdatePopupAfflictions()
        {
-            if (selectedCrewAfflictionList is { } afflictionList)
-            {
-                foreach (PopupAffliction popupAffliction in afflictionList.Afflictions)
-                {
-                    ToggleElements(ElementState.Enabled, popupAffliction.ElementsToDisable);
-                    if (medicalClinic.IsAfflictionPending(afflictionList.Target, popupAffliction.Target))
-                    {
-                        ToggleElements(ElementState.Disabled, popupAffliction.ElementsToDisable);
-                    }
-                }
+            if (selectedCrewAfflictionList is not { } afflictionList) { return; }

-                afflictionList.TreatAllButton.Enabled = true;
-                if (afflictionList.Afflictions.All(a => medicalClinic.IsAfflictionPending(afflictionList.Target, a.Target)))
+            foreach (PopupAffliction popupAffliction in afflictionList.Afflictions)
+            {
+                ToggleElements(ElementState.Enabled, popupAffliction.ElementsToDisable);
+                if (medicalClinic.IsAfflictionPending(afflictionList.Target, popupAffliction.Target))
                {
-                    afflictionList.TreatAllButton.Enabled = false;
+                    ToggleElements(ElementState.Disabled, popupAffliction.ElementsToDisable);
                }
            }
+
+            afflictionList.TreatAllButton.Enabled = true;
+            if (afflictionList.Afflictions.All(a => medicalClinic.IsAfflictionPending(afflictionList.Target, a.Target)))
+            {
+                afflictionList.TreatAllButton.Enabled = false;
+            }
        }

        private void UpdatePending()
@@ -309,7 +307,7 @@ namespace Barotrauma
            }
        }

-        private void UpdateCrewPanel()
+        public void UpdateCrewPanel()
        {
            if (crewHealList is not { } healList) { return; }

@@ -502,7 +500,7 @@ namespace Barotrauma
                    return true;
                }
            };
-            
+
            crewHealList = new CrewHealList(crewList, parent, treatAllButton);

            void OnReceived(MedicalClinic.CallbackOnlyRequest obj)
@@ -526,7 +524,7 @@ namespace Barotrauma

            new GUITextBlock(new RectTransform(Vector2.One, healthLayout.RectTransform), string.Empty, textAlignment: Alignment.Center, font: GUIStyle.SubHeadingFont)
            {
-                TextGetter = () => TextManager.GetWithVariable("percentageformat", "[value]", $"{(int)(info.Character?.HealthPercentage ?? 100f)}"),
+                TextGetter = () => TextManager.GetWithVariable("percentageformat", "[value]", $"{(int)MathF.Round(info.Character?.HealthPercentage ?? 100f)}"),
                TextColor = GUIStyle.Green
            };

@@ -789,7 +787,7 @@ namespace Barotrauma

            GUIListBox afflictionList = new GUIListBox(new RectTransform(new Vector2(1f, 0.8f), mainLayout.RectTransform)) { Visible = false };

-            PopupAfflictionList popupAfflictionList = new PopupAfflictionList(crewMember, treatAllButton);
+            PopupAfflictionList popupAfflictionList = new PopupAfflictionList(crewMember, afflictionList, treatAllButton);
            selectedCrewElement = mainFrame;
            selectedCrewAfflictionList = popupAfflictionList;

@@ -810,9 +808,9 @@ namespace Barotrauma
                List<GUIComponent> allComponents = new List<GUIComponent>();
                foreach (MedicalClinic.NetAffliction affliction in request.Afflictions)
                {
-                    ImmutableArray<GUIComponent> createdComponents = CreatePopupAffliction(afflictionList.Content, crewMember, affliction);
-                    allComponents.AddRange(createdComponents);
-                    popupAfflictionList.Afflictions.Add(new PopupAffliction(createdComponents, affliction));
+                    CreatedPopupAfflictionElement createdComponents = CreatePopupAffliction(afflictionList.Content, crewMember, affliction);
+                    allComponents.AddRange(createdComponents.AllCreatedElements);
+                    popupAfflictionList.Afflictions.Add(new PopupAffliction(createdComponents.AllCreatedElements, createdComponents.MainElement, affliction));
                }

                allComponents.Add(treatAllButton);
@@ -832,9 +830,11 @@ namespace Barotrauma
            }
        }

-        private ImmutableArray<GUIComponent> CreatePopupAffliction(GUIComponent parent, MedicalClinic.NetCrewMember crewMember, MedicalClinic.NetAffliction affliction)
+        private readonly record struct CreatedPopupAfflictionElement(GUIComponent MainElement, ImmutableArray<GUIComponent> AllCreatedElements);
+
+        private CreatedPopupAfflictionElement CreatePopupAffliction(GUIComponent parent, MedicalClinic.NetCrewMember crewMember, MedicalClinic.NetAffliction affliction)
        {
-            if (!(affliction.Prefab is { } prefab)) { return ImmutableArray<GUIComponent>.Empty; }
+            ToolBox.ThrowIfNull(affliction.Prefab);

            GUIFrame backgroundFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.33f), parent.RectTransform), style: "ListBoxElement");
            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.01f), backgroundFrame.RectTransform, Anchor.BottomCenter), style: "HorizontalLine");
@@ -846,9 +846,9 @@ namespace Barotrauma

            GUILayoutGroup topLayout = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.33f), mainLayout.RectTransform), isHorizontal: true) { Stretch = true };

-            Color iconColor = CharacterHealth.GetAfflictionIconColor(prefab, affliction.Strength);
+            Color iconColor = CharacterHealth.GetAfflictionIconColor(affliction.Prefab, affliction.Strength);

-            GUIImage icon = new GUIImage(new RectTransform(Vector2.One, topLayout.RectTransform, scaleBasis: ScaleBasis.BothHeight), prefab.Icon, scaleToFit: true)
+            GUIImage icon = new GUIImage(new RectTransform(Vector2.One, topLayout.RectTransform, scaleBasis: ScaleBasis.BothHeight), affliction.Prefab.Icon, scaleToFit: true)
            {
                Color = iconColor,
                DisabledColor = iconColor * 0.5f
@@ -856,7 +856,7 @@ namespace Barotrauma

            GUILayoutGroup topTextLayout = new GUILayoutGroup(new RectTransform(Vector2.One, topLayout.RectTransform), isHorizontal: true);

-            GUITextBlock prefabBlock = new GUITextBlock(new RectTransform(new Vector2(0.5f, 1f), topTextLayout.RectTransform), prefab.Name, font: GUIStyle.SubHeadingFont);
+            GUITextBlock prefabBlock = new GUITextBlock(new RectTransform(new Vector2(0.5f, 1f), topTextLayout.RectTransform), affliction.Prefab.Name, font: GUIStyle.SubHeadingFont);

            Color textColor = Color.Lerp(GUIStyle.Orange, GUIStyle.Red, affliction.Strength / affliction.Prefab.MaxStrength);

@@ -878,7 +878,7 @@ namespace Barotrauma
                AutoScaleHorizontal = true
            };

-            EnsureTextDoesntOverflow(prefab.Name.Value, prefabBlock, prefabBlock.Rect, ImmutableArray.Create(mainLayout, topLayout, topTextLayout));
+            EnsureTextDoesntOverflow(affliction.Prefab.Name.Value, prefabBlock, prefabBlock.Rect, ImmutableArray.Create(mainLayout, topLayout, topTextLayout));

            GUILayoutGroup bottomLayout = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.66f), mainLayout.RectTransform), isHorizontal: true, childAnchor: Anchor.CenterLeft);

@@ -923,7 +923,7 @@ namespace Barotrauma
                return true;
            };

-            return elementsToDisable;
+            return new CreatedPopupAfflictionElement(backgroundFrame, elementsToDisable);
        }

        private void AddPending(ImmutableArray<GUIComponent> elementsToDisable, MedicalClinic.NetCrewMember crewMember, ImmutableArray<MedicalClinic.NetAffliction> afflictions)
@@ -1033,11 +1033,53 @@ namespace Barotrauma
            }
        }

+        public void UpdateAfflictions(MedicalClinic.NetCrewMember crewMember)
+        {
+            if (selectedCrewAfflictionList is not { } afflictionList || !afflictionList.Target.CharacterEquals(crewMember)) { return; }
+
+            List<GUIComponent> allComponents = new List<GUIComponent>();
+            foreach (PopupAffliction existingAffliction in afflictionList.Afflictions.ToHashSet())
+            {
+                if (crewMember.Afflictions.None(received => received.AfflictionEquals(existingAffliction.Target)))
+                {
+                    // remove from UI
+                    existingAffliction.TargetElement.RectTransform.Parent = null;
+                    afflictionList.Afflictions.Remove(existingAffliction);
+                }
+                else
+                {
+                    allComponents.AddRange(existingAffliction.ElementsToDisable);
+                }
+            }
+
+            foreach (MedicalClinic.NetAffliction received in crewMember.Afflictions)
+            {
+                // we're not that concerned about updating the strength of the afflictions
+                if (afflictionList.Afflictions.Any(existing => existing.Target.AfflictionEquals(received))) { continue; }
+
+                CreatedPopupAfflictionElement createdComponents = CreatePopupAffliction(afflictionList.ListElement.Content, crewMember, received);
+                allComponents.AddRange(createdComponents.AllCreatedElements);
+                afflictionList.Afflictions.Add(new PopupAffliction(createdComponents.AllCreatedElements, createdComponents.MainElement, received));
+            }
+
+            allComponents.Add(afflictionList.TreatAllButton);
+            afflictionList.TreatAllButton.OnClicked = (_, _) =>
+            {
+                var afflictions = crewMember.Afflictions.Where(a => !medicalClinic.IsAfflictionPending(crewMember, a)).ToImmutableArray();
+                if (!afflictions.Any()) { return true; }
+
+                AddPending(allComponents.ToImmutableArray(), crewMember, afflictions);
+                return true;
+            };
+
+            UpdatePopupAfflictions();
+        }
+
        public void ClosePopup()
        {
            if (selectedCrewElement is { } popup)
            {
-                popup.Parent?.RemoveChild(selectedCrewElement);
+                popup.RectTransform.Parent = null;
            }

            selectedCrewElement = null;
@@ -1096,5 +1138,14 @@ namespace Barotrauma
                refreshTimer = 0;
            }
        }
+
+        public void OnDeselected()
+        {
+            if (GameMain.NetworkMember is not null)
+            {
+                MedicalClinic.SendUnsubscribeRequest();
+            }
+            ClosePopup();
+        }
    }
 }
@@ -207,11 +207,12 @@ namespace Barotrauma
            cargoManager.OnItemsInSellFromSubCrateChanged.RegisterOverwriteExisting(refreshStoreId, _ => needsSellingFromSubRefresh = true);
        }

-        public void SelectStore(Identifier identifier)
+        public void SelectStore(Character merchant)
        {
+            Identifier storeIdentifier = merchant?.MerchantIdentifier ?? Identifier.Empty;
            if (CurrentLocation?.Stores != null)
            {
-                if (!identifier.IsEmpty && CurrentLocation.GetStore(identifier) is { } store)
+                if (!storeIdentifier.IsEmpty && CurrentLocation.GetStore(storeIdentifier) is { } store)
                {
                    ActiveStore = store;
                    if (storeNameBlock != null)
@@ -223,12 +224,13 @@ namespace Barotrauma
                        } 
                        storeNameBlock.SetRichText(storeName);
                    }
+                    ActiveStore.SetMerchantFaction(merchant.Faction);
                }
                else
                {
                    ActiveStore = null;
                    string errorId, msg;
-                    if (identifier.IsEmpty)
+                    if (storeIdentifier.IsEmpty)
                    {
                        errorId = "Store.SelectStore:IdentifierEmpty";
                        msg = $"Error selecting store at {CurrentLocation}: identifier is empty.";
@@ -236,7 +238,7 @@ namespace Barotrauma
                    else
                    {
                        errorId = "Store.SelectStore:StoreDoesntExist";
-                        msg = $"Error selecting store with identifier \"{identifier}\" at {CurrentLocation}: store with the identifier doesn't exist at the location.";
+                        msg = $"Error selecting store with identifier \"{storeIdentifier}\" at {CurrentLocation}: store with the identifier doesn't exist at the location.";
                    }
                    DebugConsole.LogError(msg);
                    GameAnalyticsManager.AddErrorEventOnce(errorId, GameAnalyticsManager.ErrorSeverity.Error, msg);
@@ -249,17 +251,17 @@ namespace Barotrauma
                if (campaignUI.Campaign.Map == null)
                {
                    errorId = "Store.SelectStore:MapNull";
-                    msg = $"Error selecting store with identifier \"{identifier}\": Map is null.";
+                    msg = $"Error selecting store with identifier \"{storeIdentifier}\": Map is null.";
                }
                else if (CurrentLocation == null)
                {
                    errorId = "Store.SelectStore:CurrentLocationNull";
-                    msg = $"Error selecting store with identifier \"{identifier}\": CurrentLocation is null.";
+                    msg = $"Error selecting store with identifier \"{storeIdentifier}\": CurrentLocation is null.";
                }
                else if (CurrentLocation.Stores == null)
                {
                    errorId = "Store.SelectStore:StoresNull";
-                    msg = $"Error selecting store with identifier \"{identifier}\": CurrentLocation.Stores is null.";
+                    msg = $"Error selecting store with identifier \"{storeIdentifier}\": CurrentLocation.Stores is null.";
                }
                if (!msg.IsNullOrEmpty())
                {
@@ -406,11 +408,11 @@ namespace Barotrauma
                TextScale = 1.1f,
                TextGetter = () =>
                {
-                    if (CurrentLocation != null)
+                    if (ActiveStore is not null)
                    {
                        Color textColor = GUIStyle.ColorReputationNeutral;
                        string sign = "";
-                        int reputationModifier = (int)MathF.Round((CurrentLocation.GetStoreReputationModifier(activeTab == StoreTab.Buy) - 1) * 100);
+                        int reputationModifier = (int)MathF.Round((ActiveStore.GetReputationModifier(activeTab == StoreTab.Buy) - 1) * 100);
                        if (reputationModifier > 0)
                        {
                            textColor = IsBuying ? GUIStyle.ColorReputationLow : GUIStyle.ColorReputationHigh;
@@ -727,7 +729,7 @@ namespace Barotrauma
                ChangeStoreTab(StoreTab.Buy);
                if (newLocation?.Reputation != null)
                {
-                    CurrentLocation.Reputation.OnReputationValueChanged.RegisterOverwriteExisting("RefreshStore".ToIdentifier(), _ => { SetNeedsRefresh(); });
+                    newLocation.Reputation.OnReputationValueChanged.RegisterOverwriteExisting("RefreshStore".ToIdentifier(), _ => { SetNeedsRefresh(); });
                }
            }

@@ -855,6 +857,28 @@ namespace Barotrauma
            FilterStoreItems(category, searchBox.Text);
        }

+        private static KeyValuePair<Identifier, float>? GetReputationRequirement(PriceInfo priceInfo)
+        {
+            return GameMain.GameSession?.Campaign is not null
+               ? priceInfo.MinReputation.FirstOrNull()
+               : null;
+        }
+
+        private static KeyValuePair<Identifier, float>? GetTooLowReputation(PriceInfo priceInfo)
+        {
+            if (GameMain.GameSession?.Campaign is CampaignMode campaign)
+            {
+                foreach (var minRep in priceInfo.MinReputation)
+                {
+                    if (campaign.GetReputation(minRep.Key) < minRep.Value)
+                    {
+                        return minRep;
+                    }
+                }
+            }
+            return null;
+        }
+
        int prevDailySpecialCount, prevRequestedGoodsCount, prevSubRequestedGoodsCount;

        private void RefreshStoreBuyList()
@@ -898,6 +922,7 @@ namespace Barotrauma
            {
                if (itemPrefab.CanBeBoughtFrom(ActiveStore, out PriceInfo priceInfo) && itemPrefab.CanCharacterBuy())
                {
+
                    bool isDailySpecial = ActiveStore.DailySpecials.Contains(itemPrefab);
                    var itemFrame = isDailySpecial ?
                        storeDailySpecialsGroup.FindChild(c => c.UserData is PurchasedItem pi && pi.ItemPrefab == itemPrefab) :
@@ -922,7 +947,8 @@ namespace Barotrauma
                        SetOwnedText(itemFrame);
                        SetPriceGetters(itemFrame, true);
                    }
-                    SetItemFrameStatus(itemFrame, hasPermissions && quantity > 0);
+
+                    SetItemFrameStatus(itemFrame, hasPermissions && quantity > 0 && !GetTooLowReputation(priceInfo).HasValue);
                    existingItemFrames.Add(itemFrame);
                }
            }
@@ -1317,6 +1343,8 @@ namespace Barotrauma
                {
                    if (x.GUIComponent.UserData is PurchasedItem itemX && y.GUIComponent.UserData is PurchasedItem itemY)
                    {
+                        int reputationCompare = CompareByReputationRestriction(itemX, itemY);
+                        if (reputationCompare != 0) { return reputationCompare; }
                        int sortResult = itemX.ItemPrefab.Name != itemY.ItemPrefab.Name ?
                            itemX.ItemPrefab.Name.CompareTo(itemY.ItemPrefab.Name) :
                            itemX.ItemPrefab.Identifier.CompareTo(itemY.ItemPrefab.Identifier);
@@ -1345,6 +1373,8 @@ namespace Barotrauma
                    {
                        if (x.GUIComponent.UserData is PurchasedItem itemX && y.GUIComponent.UserData is PurchasedItem itemY)
                        {
+                            int reputationCompare = CompareByReputationRestriction(itemX, itemY);
+                            if (reputationCompare != 0) { return reputationCompare; }
                            int sortResult = ActiveStore.GetAdjustedItemSellPrice(itemX.ItemPrefab).CompareTo(
                                ActiveStore.GetAdjustedItemSellPrice(itemY.ItemPrefab));
                            if (sortingMethod == SortingMethod.PriceDesc) { sortResult *= -1; }
@@ -1369,6 +1399,8 @@ namespace Barotrauma
                    {
                        if (x.GUIComponent.UserData is PurchasedItem itemX && y.GUIComponent.UserData is PurchasedItem itemY)
                        {
+                            int reputationCompare = CompareByReputationRestriction(itemX, itemY);
+                            if (reputationCompare != 0) { return reputationCompare; }
                            int sortResult = ActiveStore.GetAdjustedItemBuyPrice(itemX.ItemPrefab).CompareTo(
                                ActiveStore.GetAdjustedItemBuyPrice(itemY.ItemPrefab));
                            if (sortingMethod == SortingMethod.PriceDesc) { sortResult *= -1; }
@@ -1391,10 +1423,12 @@ namespace Barotrauma
                    specialsGroup.Recalculate();
                }

-                static int CompareByCategory(RectTransform x, RectTransform y)
+                int CompareByCategory(RectTransform x, RectTransform y)
                {
                    if (x.GUIComponent.UserData is PurchasedItem itemX && y.GUIComponent.UserData is PurchasedItem itemY)
                    {
+                        int reputationCompare = CompareByReputationRestriction(itemX, itemY);
+                        if (reputationCompare != 0) { return reputationCompare; }
                        return itemX.ItemPrefab.Category.CompareTo(itemY.ItemPrefab.Category);
                    }
                    else
@@ -1424,6 +1458,19 @@ namespace Barotrauma
                }
            }

+            int CompareByReputationRestriction(PurchasedItem item1, PurchasedItem item2)
+            {
+                PriceInfo priceInfo1 = item1.ItemPrefab.GetPriceInfo(ActiveStore);
+                PriceInfo priceInfo2 = item2.ItemPrefab.GetPriceInfo(ActiveStore);
+                if (priceInfo1 != null && priceInfo2 != null)
+                {
+                    var requiredReputation1 = GetTooLowReputation(priceInfo1)?.Value ?? 0.0f;
+                    var requiredReputation2 = GetTooLowReputation(priceInfo2)?.Value ?? 0.0f;
+                    return requiredReputation1.CompareTo(requiredReputation2);
+                }
+                return 0;                
+            }
+
            static int CompareByElement(RectTransform x, RectTransform y)
            {
                if (ShouldBeOnTop(x) || ShouldBeOnBottom(y))
@@ -1753,7 +1800,7 @@ namespace Barotrauma
            {
                if (pi.ItemPrefab?.InventoryIcon != null)
                {
-                    icon.Color = pi.ItemPrefab.InventoryIconColor * (enabled ? 1.0f: 0.5f);
+                    icon.Color = pi.ItemPrefab.InventoryIconColor * (enabled ? 1.0f : 0.5f);
                }
                else if (pi.ItemPrefab?.Sprite != null)
                {
@@ -1858,7 +1905,7 @@ namespace Barotrauma
                LocalizedString toolTip = string.Empty;
                if (purchasedItem.ItemPrefab != null)
                {
-                    toolTip = purchasedItem.ItemPrefab.GetTooltip();
+                    toolTip = purchasedItem.ItemPrefab.GetTooltip(Character.Controlled);
                    if (itemQuantity != null)
                    {
                        if (itemQuantity.AllNonEmpty)
@@ -1871,6 +1918,23 @@ namespace Barotrauma
                            toolTip += $"\n{TextManager.GetWithVariable("campaignstore.ownedtotal", "[amount]", itemQuantity.Total.ToString())}";
                        }
                    }
+
+                    PriceInfo priceInfo = purchasedItem.ItemPrefab.GetPriceInfo(ActiveStore);
+                    var campaign = GameMain.GameSession?.Campaign;
+                    if (priceInfo != null && campaign != null)
+                    {
+                        var requiredReputation = GetReputationRequirement(priceInfo);
+                        if (requiredReputation != null)
+                        {
+                            var repStr = TextManager.GetWithVariables(
+                                            "campaignstore.reputationrequired",
+                                            ("[amount]", ((int)requiredReputation.Value.Value).ToString()),
+                                            ("[faction]", TextManager.Get("faction." + requiredReputation.Value.Key).Value));
+                            Color color = campaign.GetReputation(requiredReputation.Value.Key) < requiredReputation.Value.Value ?
+                                GUIStyle.Orange : GUIStyle.Green;
+                            toolTip += $"\n‖color:{color.ToStringHex()}‖{repStr}‖color:end‖";
+                        }
+                    }
                }
                itemComponent.ToolTip = RichString.Rich(toolTip);
            }
@@ -15,8 +15,6 @@ namespace Barotrauma
        private int pageCount;
        private readonly bool transferService, purchaseService;
        private bool initialized;
-        private int deliveryFee;
-        private string deliveryLocationName;

        public GUIFrame GuiFrame;
        private GUIFrame pageIndicatorHolder;
@@ -34,14 +32,13 @@ namespace Barotrauma
        private readonly List<SubmarineInfo> subsToShow;
        private readonly SubmarineDisplayContent[] submarineDisplays = new SubmarineDisplayContent[submarinesPerPage];
        private SubmarineInfo selectedSubmarine = null;
-        private LocalizedString purchaseAndSwitchText, purchaseOnlyText, deliveryText, selectedSubText, switchText, missingPreviewText, currencyName;
+        private LocalizedString purchaseAndSwitchText, purchaseOnlyText, selectedSubText, switchText, missingPreviewText, currencyName;
        private readonly RectTransform parent;
        private readonly Action closeAction;
        private Sprite pageIndicator;

        private readonly LocalizedString[] messageBoxOptions;

-        public const int DeliveryFeePerDistanceTravelled = 1000;
        public static bool ContentRefreshRequired = false;

        private static readonly Color indicatorColor = new Color(112, 149, 129);
@@ -108,14 +105,9 @@ namespace Barotrauma
        {
            initialized = true;
            selectedSubText = TextManager.Get("selectedsub");
-            deliveryText = TextManager.Get("requestdeliverybutton");
            switchText = TextManager.Get("switchtosubmarinebutton");
            purchaseAndSwitchText = TextManager.Get("purchaseandswitch");
            purchaseOnlyText = TextManager.Get("purchase");
-            if (transferService)
-            {
-                deliveryFee = CalculateDeliveryFee();
-            }

            currencyName = TextManager.Get("credit").Value.ToLowerInvariant();

@@ -124,13 +116,6 @@ namespace Barotrauma
            CreateGUI();
        }

-        private int CalculateDeliveryFee()
-        {
-            int distanceToOutpost = GameMain.GameSession.Map.DistanceToClosestLocationWithOutpost(GameMain.GameSession.Map.CurrentLocation, out Location endLocation);
-            deliveryLocationName = endLocation.Name;
-            return DeliveryFeePerDistanceTravelled * distanceToOutpost;
-        }
-
        private void CreateGUI()
        {
            createdForResolution = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
@@ -194,7 +179,7 @@ namespace Barotrauma
                confirmButtonAlt = new GUIButton(new RectTransform(new Vector2(0.2f, 1f), bottomContainer.RectTransform), purchaseOnlyText, style: "GUIButtonFreeScale");
                transferInfoFrameWidth -= confirmButtonAlt.RectTransform.RelativeSize.X;
            } 
-            confirmButton = new GUIButton(new RectTransform(new Vector2(0.2f, 1f), bottomContainer.RectTransform), purchaseService ? purchaseAndSwitchText : deliveryFee > 0 ? deliveryText : switchText, style: "GUIButtonFreeScale");
+            confirmButton = new GUIButton(new RectTransform(new Vector2(0.2f, 1f), bottomContainer.RectTransform), purchaseService ? purchaseAndSwitchText : switchText, style: "GUIButtonFreeScale");
            SetConfirmButtonState(false);
            transferInfoFrameWidth -= confirmButton.RectTransform.RelativeSize.X;
            GUIFrame transferInfoFrame = new GUIFrame(new RectTransform(new Vector2(transferInfoFrameWidth, 1.0f), bottomContainer.RectTransform), style: null)
@@ -406,22 +391,14 @@ namespace Barotrauma

                    if (!GameMain.GameSession.IsSubmarineOwned(subToDisplay))
                    {
-                        LocalizedString amountString = TextManager.FormatCurrency(subToDisplay.Price);
+                        LocalizedString amountString = TextManager.FormatCurrency(subToDisplay.GetPrice());
                        submarineDisplays[i].submarineFee.Text = TextManager.GetWithVariable("price", "[amount]", amountString);
                    }
                    else
                    {
                        if (subToDisplay.Name != CurrentOrPendingSubmarine().Name)
                        {
-                            if (deliveryFee > 0)
-                            {
-                                LocalizedString amountString = TextManager.FormatCurrency(deliveryFee);
-                                submarineDisplays[i].submarineFee.Text = TextManager.GetWithVariable("deliveryfee", "[amount]", amountString);
-                            }
-                            else
-                            {
-                                submarineDisplays[i].submarineFee.Text = string.Empty;
-                            }
+                            submarineDisplays[i].submarineFee.Text = string.Empty;                            
                        }
                        else
                        {
@@ -581,7 +558,7 @@ namespace Barotrauma

                if (owned)
                {
-                    confirmButton.Text = deliveryFee > 0 ? deliveryText : switchText;
+                    confirmButton.Text = switchText;
                    confirmButton.OnClicked = (button, userData) =>
                    {
                        ShowTransferPrompt();
@@ -702,37 +679,12 @@ namespace Barotrauma

        private void ShowTransferPrompt()
        {
-            if (!GameMain.GameSession.Campaign.CanAfford(deliveryFee) && deliveryFee > 0)
-            {
-                new GUIMessageBox(TextManager.Get("deliveryrequestheader"), TextManager.GetWithVariables("notenoughmoneyfordeliverytext",
-                    ("[currencyname]", currencyName),
-                    ("[submarinename]", selectedSubmarine.DisplayName),
-                    ("[location1]", deliveryLocationName),
-                    ("[location2]", GameMain.GameSession.Map.CurrentLocation.Name)));
-                return;
-            }
+            var text = TextManager.GetWithVariables("switchsubmarinetext",
+                ("[submarinename1]", CurrentOrPendingSubmarine().DisplayName),
+                ("[submarinename2]", selectedSubmarine.DisplayName));
+            text += GetItemTransferText();
+            GUIMessageBox msgBox = new GUIMessageBox(TextManager.Get("switchsubmarineheader"), text, messageBoxOptions);

-            GUIMessageBox msgBox;
-
-            if (deliveryFee > 0)
-            {
-                msgBox = new GUIMessageBox(TextManager.Get("deliveryrequestheader"), TextManager.GetWithVariables("deliveryrequesttext",
-                    ("[submarinename1]", selectedSubmarine.DisplayName),
-                    ("[location1]", deliveryLocationName),
-                    ("[location2]", GameMain.GameSession.Map.CurrentLocation.Name),
-                    ("[submarinename2]", CurrentOrPendingSubmarine().DisplayName),
-                    ("[amount]", deliveryFee.ToString()),
-                    ("[currencyname]", currencyName)), messageBoxOptions);
-                msgBox.Buttons[0].ClickSound = GUISoundType.ConfirmTransaction;
-            }
-            else
-            {
-                var text = TextManager.GetWithVariables("switchsubmarinetext",
-                    ("[submarinename1]", CurrentOrPendingSubmarine().DisplayName),
-                    ("[submarinename2]", selectedSubmarine.DisplayName));
-                text += GetItemTransferText();
-                msgBox = new GUIMessageBox(TextManager.Get("switchsubmarineheader"), text, messageBoxOptions);
-            }

            msgBox.Buttons[0].OnClicked = (applyButton, obj) =>
            {
@@ -777,7 +729,7 @@ namespace Barotrauma
            {
                if (GameMain.Client == null)
                {
-                    GameMain.GameSession.SwitchSubmarine(selectedSubmarine, TransferItemsOnSwitch, deliveryFee);
+                    GameMain.GameSession.SwitchSubmarine(selectedSubmarine, TransferItemsOnSwitch);
                    RefreshSubmarineDisplay(true);
                }
                else
@@ -797,7 +749,9 @@ namespace Barotrauma

        private void ShowBuyPrompt(bool purchaseOnly)
        {
-            if (!GameMain.GameSession.Campaign.CanAfford(selectedSubmarine.Price))
+            int price = selectedSubmarine.GetPrice();
+
+            if (!GameMain.GameSession.Campaign.CanAfford(price))
            {
                new GUIMessageBox(TextManager.Get("purchasesubmarineheader"), TextManager.GetWithVariables("notenoughmoneyforpurchasetext",
                    ("[currencyname]", currencyName),
@@ -810,7 +764,7 @@ namespace Barotrauma
            {
                var text = TextManager.GetWithVariables("purchaseandswitchsubmarinetext",
                    ("[submarinename1]", selectedSubmarine.DisplayName),
-                    ("[amount]", selectedSubmarine.Price.ToString()),
+                    ("[amount]", price.ToString()),
                    ("[currencyname]", currencyName),
                    ("[submarinename2]", CurrentOrPendingSubmarine().DisplayName));
                text += GetItemTransferText();
@@ -854,7 +808,7 @@ namespace Barotrauma
                    if (GameMain.Client == null)
                    {
                        GameMain.GameSession.PurchaseSubmarine(selectedSubmarine);
-                        GameMain.GameSession.SwitchSubmarine(selectedSubmarine, TransferItemsOnSwitch, 0);
+                        GameMain.GameSession.SwitchSubmarine(selectedSubmarine, TransferItemsOnSwitch);
                        RefreshSubmarineDisplay(true);
                    }
                    else
@@ -868,7 +822,7 @@ namespace Barotrauma
            {
                msgBox = new GUIMessageBox(TextManager.Get("purchasesubmarineheader"), TextManager.GetWithVariables("purchasesubmarinetext",
                    ("[submarinename]", selectedSubmarine.DisplayName),
-                    ("[amount]", selectedSubmarine.Price.ToString()),
+                    ("[amount]", price.ToString()),
                    ("[currencyname]", currencyName)) + '\n' + TextManager.Get("submarineswitchinstruction"), messageBoxOptions);

                msgBox.Buttons[0].OnClicked = (applyButton, obj) =>
@@ -836,7 +836,7 @@ namespace Barotrauma
                Identifier eventIdentifier = new Identifier($"{nameof(CreateWalletCrewFrame)}.{character.ID}");
                campaign.OnMoneyChanged.RegisterOverwriteExisting(eventIdentifier, e =>
                {
-                    if (!(e.Owner is Some<Character> { Value: var owner }) || owner != character) { return; }
+                    if (!e.Owner.TryUnwrap(out var owner) || owner != character) { return; }
                    SetWalletText(walletBlock, e.Wallet, icon, largeIcon);
                });
                registeredEvents.Add(eventIdentifier);
@@ -1502,27 +1502,9 @@ namespace Barotrauma
                AbsoluteSpacing = GUI.IntScale(10)
            };

-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), locationInfoContainer.RectTransform), location.Name, font: GUIStyle.LargeFont);
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), locationInfoContainer.RectTransform), location.Type.Name, font: GUIStyle.SubHeadingFont);
-
-            var biomeLabel = new GUITextBlock(new RectTransform(new Vector2(0.5f, 0.0f), locationInfoContainer.RectTransform),
-                TextManager.Get("Biome", "location"), font: GUIStyle.SubHeadingFont, textAlignment: Alignment.CenterLeft);
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), biomeLabel.RectTransform), Level.Loaded.LevelData.Biome.DisplayName, textAlignment: Alignment.CenterRight);
-            var difficultyLabel = new GUITextBlock(new RectTransform(new Vector2(0.5f, 0.0f), locationInfoContainer.RectTransform),
-                TextManager.Get("LevelDifficulty"), font: GUIStyle.SubHeadingFont, textAlignment: Alignment.CenterLeft);
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), difficultyLabel.RectTransform), ((int)Level.Loaded.LevelData.Difficulty) + " %", textAlignment: Alignment.CenterRight);
-
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.01f), missionFrameContent.RectTransform) { AbsoluteOffset = new Point(0, locationInfoContainer.Rect.Height + padding) }, style: "HorizontalLine")
-            {
-                CanBeFocused = false
-            };
-
-            int locationInfoYOffset = locationInfoContainer.Rect.Height + padding * 2;
-
            Sprite portrait = location.Type.GetPortrait(location.PortraitId);
            bool hasPortrait = portrait != null && portrait.SourceRect.Width > 0 && portrait.SourceRect.Height > 0;
            int contentWidth = missionFrameContent.Rect.Width;
-
            if (hasPortrait)
            {
                float portraitAspectRatio = portrait.SourceRect.Width / portrait.SourceRect.Height;
@@ -1534,6 +1516,30 @@ namespace Barotrauma
                portraitImage.RectTransform.NonScaledSize = new Point(Math.Min((int)(portraitImage.Rect.Size.Y * portraitAspectRatio), portraitImage.Rect.Width), portraitImage.Rect.Size.Y);
            }

+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), locationInfoContainer.RectTransform), location.Name, font: GUIStyle.LargeFont);
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), locationInfoContainer.RectTransform), location.Type.Name, font: GUIStyle.SubHeadingFont);
+
+            if (location.Faction?.Prefab != null)
+            {
+                var factionLabel = new GUITextBlock(new RectTransform(new Vector2(0.5f, 0.0f), locationInfoContainer.RectTransform),
+                    TextManager.Get("Faction"), font: GUIStyle.SubHeadingFont, textAlignment: Alignment.CenterLeft);
+                new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), factionLabel.RectTransform), location.Faction.Prefab.Name, textAlignment: Alignment.CenterRight);
+            }
+            var biomeLabel = new GUITextBlock(new RectTransform(new Vector2(0.5f, 0.0f), locationInfoContainer.RectTransform),
+                TextManager.Get("Biome", "location"), font: GUIStyle.SubHeadingFont, textAlignment: Alignment.CenterLeft);
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), biomeLabel.RectTransform), Level.Loaded.LevelData.Biome.DisplayName, textAlignment: Alignment.CenterRight);
+            var difficultyLabel = new GUITextBlock(new RectTransform(new Vector2(0.5f, 0.0f), locationInfoContainer.RectTransform),
+                TextManager.Get("LevelDifficulty"), font: GUIStyle.SubHeadingFont, textAlignment: Alignment.CenterLeft);
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), difficultyLabel.RectTransform), TextManager.GetWithVariable("percentageformat", "[value]", ((int)Level.Loaded.LevelData.Difficulty).ToString()), textAlignment: Alignment.CenterRight);
+
+            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.01f), missionFrameContent.RectTransform) { AbsoluteOffset = new Point(0, locationInfoContainer.Rect.Height + padding) }, style: "HorizontalLine")
+            {
+                CanBeFocused = false
+            };
+
+            int locationInfoYOffset = locationInfoContainer.Rect.Height + padding * 2;
+
+
            GUIListBox missionList = new GUIListBox(new RectTransform(new Point(contentWidth, missionFrameContent.Rect.Height - locationInfoYOffset), missionFrameContent.RectTransform, Anchor.TopCenter) { AbsoluteOffset = new Point(0, locationInfoYOffset) });
            missionList.ContentBackground.Color = Color.Transparent;
            missionList.Spacing = GUI.IntScale(15);
@@ -1545,6 +1551,7 @@ namespace Barotrauma

                foreach (Mission mission in GameMain.GameSession.Missions)
                {
+                    if (!mission.Prefab.ShowInMenus) { continue; }
                    GUIFrame missionDescriptionHolder = new GUIFrame(new RectTransform(Vector2.One, missionList.Content.RectTransform), style: null);
                    GUILayoutGroup missionTextGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.744f, 0f), missionDescriptionHolder.RectTransform, Anchor.CenterLeft) { AbsoluteOffset = new Point(iconSize + spacing, 0) }, false, childAnchor: Anchor.TopLeft)
                    {
@@ -1556,7 +1563,7 @@ namespace Barotrauma
                        descriptionText += "\n\n" + missionMessage;
                    }
                    RichString rewardText = mission.GetMissionRewardText(Submarine.MainSub);
-                    RichString reputationText = mission.GetReputationRewardText(mission.Locations[0]);
+                    RichString reputationText = mission.GetReputationRewardText();

                    Func<string, string> wrapMissionText(GUIFont font)
                    {
@@ -727,7 +727,7 @@ namespace Barotrauma
                    talentStages.Add(GetTalentState(character, button.Identifier, selectedTalents));
                }

-                TalentStages collectiveStage = talentStages.Any(static stage => stage is Locked)
+                TalentStages collectiveStage = talentStages.All(static stage => stage is Locked)
                    ? Locked
                    : Available;

@@ -2,6 +2,7 @@

 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Linq;
 using Barotrauma.Extensions;
@@ -77,6 +78,8 @@ namespace Barotrauma

        private PlayerBalanceElement? playerBalanceElement;

+        private static ImmutableHashSet<Character> characterList = ImmutableHashSet<Character>.Empty;
+
        /// <summary>
        /// While set to true any call to <see cref="RefreshUpgradeList"/> will cause the buy button to be disabled and to not update the prices.
        /// This is to prevent us from buying another upgrade before the server has given us the new prices and causing potential syncing issues.
@@ -102,6 +105,7 @@ namespace Barotrauma
        public UpgradeStore(CampaignUI campaignUI, GUIComponent parent)
        {
            WaitForServerUpdate = false;
+            characterList = GameSession.GetSessionCrewCharacters(CharacterType.Both);
            this.campaignUI = campaignUI;
            GUIFrame upgradeFrame = new GUIFrame(rectT(1, 1, parent, Anchor.Center), style: "OuterGlow", color: Color.Black * 0.7f)
            {
@@ -130,6 +134,7 @@ namespace Barotrauma

        private void RefreshAll()
        {
+            characterList = GameSession.GetSessionCrewCharacters(CharacterType.Both);
            switch (selectedUpgradeTab)
            {
                case UpgradeTab.Repairs:
@@ -273,7 +278,7 @@ namespace Barotrauma
            new GUITextBlock(rectT(1, 0, tooltipLayout), string.Empty) { UserData = "moreindicator" };
            ItemInfoFrame.Children.ForEach(c => { c.CanBeFocused = false; c.Children.ForEach(c2 => c2.CanBeFocused = false); });

-            GUIFrame paddedLayout = new GUIFrame(rectT(0.95f, GUI.IsFourByThree() ? 0.98f : 0.95f, parent, Anchor.Center), style: null);
+            GUIFrame paddedLayout = new GUIFrame(rectT(0.95f, 0.95f, parent, Anchor.Center), style: null);
            mainStoreLayout = new GUILayoutGroup(rectT(1, 0.9f, paddedLayout, Anchor.BottomLeft), isHorizontal: true) { RelativeSpacing = 0.01f };
            topHeaderLayout = new GUILayoutGroup(rectT(1, 0.1f, paddedLayout, Anchor.TopLeft), isHorizontal: true);

@@ -295,8 +300,8 @@ namespace Barotrauma
                    new GUITextBlock(rectT(1.0f, 1, locationLayout), TextManager.Get("UpgradeUI.AllSubmarinesInfo"), font: GUIStyle.SmallFont, wrap: true);                
            
                categoryButtonLayout = new GUILayoutGroup(rectT(0.4f, 0.3f, leftLayout), isHorizontal: true) { Stretch = true };
-                    GUIButton upgradeButton = new GUIButton(rectT(1, 1f, categoryButtonLayout), TextManager.Get("UICategory.Upgrades"), style: "GUITabButton") { UserData = UpgradeTab.Upgrade, Selected = selectedUpgradeTab == UpgradeTab.Upgrade };
-                    GUIButton repairButton = new GUIButton(rectT(1, 1f, categoryButtonLayout), TextManager.Get("UICategory.Maintenance"), style: "GUITabButton") { UserData = UpgradeTab.Repairs, Selected = selectedUpgradeTab == UpgradeTab.Repairs };
+                    GUIButton upgradeButton = new GUIButton(rectT(0.5f, 1f, categoryButtonLayout), TextManager.Get("UICategory.Upgrades"), style: "GUITabButton") { UserData = UpgradeTab.Upgrade, Selected = selectedUpgradeTab == UpgradeTab.Upgrade };
+                    GUIButton repairButton = new GUIButton(rectT(0.5f, 1f, categoryButtonLayout), TextManager.Get("UICategory.Maintenance"), style: "GUITabButton") { UserData = UpgradeTab.Repairs, Selected = selectedUpgradeTab == UpgradeTab.Repairs };

            /*                                         RIGHT HEADER LAYOUT
             * |---------------------------------------------------------------------------------------------------|
@@ -347,12 +352,15 @@ namespace Barotrauma

            SelectTab(UpgradeTab.Upgrade);

-            var itemSwapPreview = new GUICustomComponent(new RectTransform(new Vector2(0.27f, 0.4f), mainStoreLayout.RectTransform, Anchor.TopLeft) { RelativeOffset = new Vector2(GUI.IsFourByThree() ? 0.5f : 0.47f, 0.0f) }, DrawItemSwapPreview)
+            var itemSwapPreview = new GUICustomComponent(new RectTransform(new Vector2(0.25f, 0.4f), mainStoreLayout.RectTransform, Anchor.TopLeft) 
+                { RelativeOffset = new Vector2(0.52f * GUI.AspectRatioAdjustment, 0.0f) }, DrawItemSwapPreview)
            {
                IgnoreLayoutGroups = true,
                CanBeFocused = true
            };

+            GUITextBlock.AutoScaleAndNormalize(upgradeButton.TextBlock, repairButton.TextBlock);
+
 #if DEBUG
            // creates a button that re-creates the UI
            CreateRefreshButton();
@@ -725,7 +733,7 @@ namespace Barotrauma
            if (storeLayout == null || mainStoreLayout == null) { return; }
            currentStoreLayout = CreateUpgradeCategoryList(rectT(1.0f, 1.5f, storeLayout));

-            selectedUpgradeCategoryLayout = new GUIFrame(rectT(GUI.IsFourByThree() ? 0.3f : 0.25f, 1, mainStoreLayout), style: null) { CanBeFocused = false };
+            selectedUpgradeCategoryLayout = new GUIFrame(rectT(0.3f  * GUI.AspectRatioAdjustment, 1, mainStoreLayout), style: null) { CanBeFocused = false };

            RefreshUpgradeList();

@@ -956,7 +964,7 @@ namespace Barotrauma
                bool isUninstallPending = item.Prefab.SwappableItem != null && item.PendingItemSwap?.Identifier == item.Prefab.SwappableItem.ReplacementOnUninstall;
                if (isUninstallPending) { canUninstall = false; }

-                frames.Add(CreateUpgradeEntry(rectT(1f, 0.25f, parent.Content), currentOrPending.UpgradePreviewSprite,
+                frames.Add(CreateUpgradeEntry(rectT(1f, 0.35f, parent.Content), currentOrPending.UpgradePreviewSprite,
                                item.PendingItemSwap != null ? TextManager.GetWithVariable("upgrades.pendingitem", "[itemname]", name) : TextManager.GetWithVariable("upgrades.installeditem", "[itemname]", nameWithQuantity),
                                currentOrPending.Description,
                                0, null, addBuyButton: canUninstall, addProgressBar: false, buttonStyle: "WeaponUninstallButton").Frame);
@@ -996,7 +1004,7 @@ namespace Barotrauma

                int price = isPurchased || replacement == item.Prefab ? 0 : replacement.SwappableItem.GetPrice(Campaign.Map?.CurrentLocation) * linkedItems.Count();

-                frames.Add(CreateUpgradeEntry(rectT(1f, 0.25f, parent.Content), replacement.UpgradePreviewSprite, replacement.Name, replacement.Description,
+                frames.Add(CreateUpgradeEntry(rectT(1f, 0.35f, parent.Content), replacement.UpgradePreviewSprite, replacement.Name, replacement.Description,
                    price, replacement,
                    addBuyButton: true,
                    addProgressBar: false,
@@ -1102,7 +1110,7 @@ namespace Barotrauma

        public static UpgradeFrame CreateUpgradeFrame(UpgradePrefab prefab, UpgradeCategory category, CampaignMode campaign, RectTransform rectTransform, bool addBuyButton = true)
        {
-            int price = prefab.Price.GetBuyPrice(campaign.UpgradeManager.GetUpgradeLevel(prefab, category), campaign.Map?.CurrentLocation);
+            int price = prefab.Price.GetBuyPrice(campaign.UpgradeManager.GetUpgradeLevel(prefab, category), campaign.Map?.CurrentLocation, characterList);
            return CreateUpgradeEntry(rectTransform, prefab.Sprite, prefab.Name, prefab.Description, price, new CategoryData(category, prefab), addBuyButton, upgradePrefab: prefab, currentLevel: campaign.UpgradeManager.GetUpgradeLevel(prefab, category));
        }

@@ -1129,7 +1137,8 @@ namespace Barotrauma
                        GUILayoutGroup imageLayout = new GUILayoutGroup(rectT(new Point(prefabLayout.Rect.Height, prefabLayout.Rect.Height), prefabLayout), childAnchor: Anchor.Center);
                            var icon = new GUIImage(rectT(0.9f, 0.9f, imageLayout, scaleBasis: ScaleBasis.BothHeight), sprite, scaleToFit: true) { CanBeFocused = false };
                        GUILayoutGroup textLayout = new GUILayoutGroup(rectT(1f - imageLayout.RectTransform.RelativeSize.X, 1, prefabLayout));
-                            var name = new GUITextBlock(rectT(1, 0.25f, textLayout), RichString.Rich(title), font: GUIStyle.SubHeadingFont) { AutoScaleHorizontal = true, AutoScaleVertical = true, Padding = Vector4.Zero };
+                            var name = new GUITextBlock(rectT(1, 0.35f, textLayout), RichString.Rich(title), font: GUIStyle.SubHeadingFont) { AutoScaleHorizontal = true, AutoScaleVertical = true, Padding = Vector4.Zero };
+                            //name.RectTransform.MinSize = new Point(0, (int)name.TextSize.Y);
                            GUILayoutGroup descriptionLayout = new GUILayoutGroup(rectT(1, 0.75f - progressBarHeight, textLayout));
                                var description = new GUITextBlock(rectT(1, 1, descriptionLayout), body, font: GUIStyle.SmallFont, wrap: true, textAlignment: Alignment.TopLeft) { Padding = Vector4.Zero };
                                GUILayoutGroup? progressLayout = null;
@@ -1171,7 +1180,7 @@ namespace Barotrauma
                materialCostList.Visible = false;
                materialCostList.UserData = UpgradeStoreUserData.MaterialCostList;

-                var priceText = new GUITextBlock(rectT(0.2f, 1f, buyButtonLayout), formattedPrice, textAlignment: Alignment.Right)
+                var priceText = new GUITextBlock(rectT(0.2f, 1f, buyButtonLayout), formattedPrice, textAlignment: Alignment.CenterRight)
                {
                    UserData = UpgradeStoreUserData.PriceLabel,
                    //prices on swappable items are always visible, upgrade prices are enabled in UpdateUpgradeEntry for purchasable upgrades
@@ -1258,7 +1267,7 @@ namespace Barotrauma
            {
                LocalizedString promptBody = TextManager.GetWithVariables("Upgrades.PurchasePromptBody",
                    ("[upgradename]", prefab.Name),
-                    ("[amount]", prefab.Price.GetBuyPrice(Campaign.UpgradeManager.GetUpgradeLevel(prefab, category), Campaign.Map?.CurrentLocation).ToString()));
+                    ("[amount]", prefab.Price.GetBuyPrice(Campaign.UpgradeManager.GetUpgradeLevel(prefab, category), Campaign.Map?.CurrentLocation, characterList).ToString()));
                currectConfirmation = EventEditorScreen.AskForConfirmation(TextManager.Get("Upgrades.PurchasePromptTitle"), promptBody, () =>
                {
                    if (GameMain.NetworkMember != null)
@@ -1673,7 +1682,7 @@ namespace Barotrauma

            GUITextBlock priceLabel = (GUITextBlock)buttonParent.FindChild(UpgradeStoreUserData.PriceLabel, recursive: true);
            priceLabel.Visible = true;
-            int price = prefab.Price.GetBuyPrice(campaign.UpgradeManager.GetUpgradeLevel(prefab, category), campaign.Map?.CurrentLocation);
+            int price = prefab.Price.GetBuyPrice(campaign.UpgradeManager.GetUpgradeLevel(prefab, category), campaign.Map?.CurrentLocation, characterList);

            if (!WaitForServerUpdate)
            {
@@ -1713,7 +1722,7 @@ namespace Barotrauma
            static void CreateMaterialCosts(GUIListBox list, UpgradePrefab prefab, int targetLevel)
            {
                list.Content.ClearChildren();
-                List<Item> allItems = Character.Controlled?.Inventory?.FindAllItems(recursive: true) ?? new List<Item>();
+                var allItems = CargoManager.FindAllItemsOnPlayerAndSub(Character.Controlled);

                var resources = prefab.GetApplicableResources(targetLevel);

@@ -163,6 +163,7 @@ namespace Barotrauma
        
        private void SetSubmarineVotingText(Client starter, SubmarineInfo info, bool transferItems, VoteType type)
        {
+            int price = info.GetPrice();
            string name = starter.Name;
            JobPrefab prefab = starter?.Character?.Info?.Job?.Prefab;
            Color nameColor = prefab != null ? prefab.UIColor : Color.White;
@@ -177,35 +178,21 @@ namespace Barotrauma
                    text = TextManager.GetWithVariables(tag,
                        ("[playername]", characterRichString),
                        ("[submarinename]", submarineRichString),
-                        ("[amount]", info.Price.ToString()),
+                        ("[amount]", price.ToString()),
                        ("[currencyname]", TextManager.Get("credit").ToLower()));
                    break;
                case VoteType.PurchaseSub:
                    text = TextManager.GetWithVariables("submarinepurchasevote",
                        ("[playername]", characterRichString),
                        ("[submarinename]", submarineRichString),
-                        ("[amount]", info.Price.ToString()),
+                        ("[amount]", price.ToString()),
                        ("[currencyname]", TextManager.Get("credit").ToLower()));
                    break;
                case VoteType.SwitchSub:
-                    int deliveryFee = SubmarineSelection.DeliveryFeePerDistanceTravelled * GameMain.GameSession.Map.DistanceToClosestLocationWithOutpost(GameMain.GameSession.Map.CurrentLocation, out Location endLocation);
-                    if (deliveryFee > 0)
-                    {
-                        tag = transferItems ? "submarineswitchwithitemsfeevote" : "submarineswitchfeevote";
-                        text = TextManager.GetWithVariables(tag,
-                            ("[playername]", characterRichString),
-                            ("[submarinename]", submarineRichString),
-                            ("[locationname]", endLocation.Name),
-                            ("[amount]", deliveryFee.ToString()),
-                            ("[currencyname]", TextManager.Get("credit").ToLower()));
-                    }
-                    else
-                    {
-                        tag = transferItems ? "submarineswitchwithitemsnofeevote" : "submarineswitchnofeevote";
-                        text = TextManager.GetWithVariables(tag,
-                            ("[playername]", characterRichString),
-                            ("[submarinename]", submarineRichString));
-                    }
+                    tag = transferItems ? "submarineswitchwithitemsnofeevote" : "submarineswitchnofeevote";
+                    text = TextManager.GetWithVariables(tag,
+                        ("[playername]", characterRichString),
+                        ("[submarinename]", submarineRichString));
                    break;
            }
            votingOnText = RichString.Rich(text);
@@ -218,6 +205,7 @@ namespace Barotrauma

        private LocalizedString GetSubmarineVoteResultMessage(SubmarineInfo info, VoteType type, int yesVoteCount, int noVoteCount, bool votePassed)
        {
+            int price = info.GetPrice();
            LocalizedString result = string.Empty;

            switch (type)
@@ -225,7 +213,7 @@ namespace Barotrauma
                case VoteType.PurchaseAndSwitchSub:
                    result = TextManager.GetWithVariables(votePassed ? "submarinepurchaseandswitchvotepassed" : "submarinepurchaseandswitchvotefailed",
                        ("[submarinename]", info.DisplayName),
-                        ("[amount]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", info.Price)),
+                        ("[amount]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", price)),
                        ("[currencyname]", TextManager.Get("credit").ToLower()),
                        ("[yesvotecount]", yesVoteCount.ToString()),
                        ("[novotecount]" , noVoteCount.ToString()));
@@ -233,31 +221,16 @@ namespace Barotrauma
                case VoteType.PurchaseSub:
                    result = TextManager.GetWithVariables(votePassed ? "submarinepurchasevotepassed" : "submarinepurchasevotefailed",
                        ("[submarinename]", info.DisplayName),
-                        ("[amount]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", info.Price)),
+                        ("[amount]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", price)),
                        ("[currencyname]", TextManager.Get("credit").ToLower()),
                        ("[yesvotecount]", yesVoteCount.ToString()),
                        ("[novotecount]", noVoteCount.ToString()));
                    break;
                case VoteType.SwitchSub:
-                    int deliveryFee = SubmarineSelection.DeliveryFeePerDistanceTravelled * GameMain.GameSession.Map.DistanceToClosestLocationWithOutpost(GameMain.GameSession.Map.CurrentLocation, out Location endLocation);
-
-                    if (deliveryFee > 0)
-                    {
-                        result = TextManager.GetWithVariables(votePassed ? "submarineswitchfeevotepassed" : "submarineswitchfeevotefailed",
-                            ("[submarinename]", info.DisplayName),
-                            ("[locationname]", endLocation.Name),
-                            ("[amount]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", deliveryFee)),
-                            ("[currencyname]", TextManager.Get("credit").ToLower()),
-                            ("[yesvotecount]", yesVoteCount.ToString()),
-                            ("[novotecount]", noVoteCount.ToString()));
-                    }
-                    else
-                    {
-                        result = TextManager.GetWithVariables(votePassed ? "submarineswitchnofeevotepassed" : "submarineswitchnofeevotefailed",
-                            ("[submarinename]", info.DisplayName),
-                            ("[yesvotecount]", yesVoteCount.ToString()),
-                            ("[novotecount]", noVoteCount.ToString()));
-                    }
+                    result = TextManager.GetWithVariables(votePassed ? "submarineswitchnofeevotepassed" : "submarineswitchnofeevotefailed",
+                        ("[submarinename]", info.DisplayName),
+                        ("[yesvotecount]", yesVoteCount.ToString()),
+                        ("[novotecount]", noVoteCount.ToString()));
                    break;
                default:
                    break;