Unstable v0.1300.0.2

2021-03-12 15:57:04 +02:00
parent 0f6de8ada9
commit 874616027b
145 changed files with 1897 additions and 939 deletions
@@ -475,9 +475,12 @@ namespace Barotrauma
                            };
                            missionName.Padding = new Vector4(missionName.Padding.X + icon.Rect.Width * 1.5f, missionName.Padding.Y, missionName.Padding.Z, missionName.Padding.W);
                        }
-                        string rewardText = TextManager.GetWithVariable("currencyformat", "[credits]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", mission.Reward));
-                        new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextContent.RectTransform), 
-                            TextManager.GetWithVariable("missionreward", "[reward]", rewardText), wrap: true, parseRichText: true);
+
+                        new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextContent.RectTransform), mission.GetMissionRewardText(), wrap: true, parseRichText: true);
+
+                        string reputationText = mission.GetReputationRewardText(mission.Locations[0]);
+                        new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextContent.RectTransform), reputationText, wrap: true, parseRichText: true);
+
                        new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), missionTextContent.RectTransform), mission.Description, wrap: true, parseRichText: true);
                    }
                    missionPanel.RectTransform.MinSize = new Point(0, (int)(missionTextContent.Children.Sum(c => c.Rect.Height) / missionTextContent.RectTransform.RelativeSize.Y) + GUI.IntScale(20));
@@ -24,6 +24,7 @@ namespace Barotrauma

        public Effect PostProcessEffect { get; private set; }
        public Effect GradientEffect { get; private set; }
+        public Effect GrainEffect { get; private set; }

        public GameScreen(GraphicsDevice graphics, ContentManager content)
        {
@@ -41,11 +42,13 @@ namespace Barotrauma
            damageEffect = content.Load<Effect>("Effects/damageshader_opengl");
            PostProcessEffect = content.Load<Effect>("Effects/postprocess_opengl");
            GradientEffect = content.Load<Effect>("Effects/gradientshader_opengl");
+            GrainEffect = content.Load<Effect>("Effects/grainshader_opengl");
 #else
            //var blurEffect = content.Load<Effect>("Effects/blurshader");
            damageEffect = content.Load<Effect>("Effects/damageshader");
            PostProcessEffect = content.Load<Effect>("Effects/postprocess");
            GradientEffect = content.Load<Effect>("Effects/gradientshader");
+            GrainEffect = content.Load<Effect>("Effects/grainshader");
 #endif

            damageStencil = TextureLoader.FromFile("Content/Map/walldamage.png");
@@ -362,6 +365,17 @@ namespace Barotrauma
                GameMain.LightManager.LosEffect.CurrentTechnique.Passes[0].Apply();
                Quad.Render();
            }
+
+            float grainStrength = Character.Controlled?.GrainStrength ?? 0;
+            if (grainStrength > 0)
+            {
+                Rectangle screenRect = new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight);
+                spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, effect: GrainEffect);
+                GUI.DrawRectangle(spriteBatch, screenRect, Color.White * grainStrength, isFilled: true);
+                GrainEffect.Parameters["seed"].SetValue(Rand.Range(0f, 1f, Rand.RandSync.Unsynced));
+                spriteBatch.End();
+            }
+
            graphics.SetRenderTarget(null);

            float BlurStrength = 0.0f;
@@ -15,12 +15,26 @@ using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Xml.Linq;
+using Barotrauma.Steam;

 namespace Barotrauma
 {
    class MainMenuScreen : Screen
    {
-        public enum Tab { NewGame = 1, LoadGame = 2, HostServer = 3, Settings = 4, Tutorials = 5, JoinServer = 6, CharacterEditor = 7, SubmarineEditor = 8, QuickStartDev = 9, ProfilingTestBench = 10, SteamWorkshop = 11, Credits = 12, Empty = 13 }
+        public enum Tab
+        {
+            NewGame = 0,
+            LoadGame = 1,
+            HostServer = 2,
+            Settings = 3,
+            Tutorials = 4,
+            JoinServer = 5,
+            CharacterEditor = 6,
+            SubmarineEditor = 7,
+            SteamWorkshop = 8,
+            Credits = 9,
+            Empty = 10
+        }

        private readonly GUIComponent buttonsParent;

@@ -29,8 +43,7 @@ namespace Barotrauma
        private CampaignSetupUI campaignSetupUI;

        private GUITextBox serverNameBox, /*portBox, queryPortBox,*/ passwordBox, maxPlayersBox;
-        private GUITickBox isPublicBox, wrongPasswordBanBox, karmaEnabledBox;
-        private GUIDropDown karmaPresetDD;
+        private GUITickBox isPublicBox, wrongPasswordBanBox, karmaBox;
        private readonly GUIFrame downloadingModsContainer, enableModsContainer;
        private readonly GUIButton joinServerButton, hostServerButton, steamWorkshopButton;
        private readonly GameMain game;
@@ -41,7 +54,7 @@ namespace Barotrauma
        private GUIComponent remoteContentContainer;
        private XDocument remoteContentDoc;

-        private Tab selectedTab;
+        private Tab selectedTab = Tab.Empty;

        private Sprite backgroundSprite;

@@ -353,10 +366,13 @@ namespace Barotrauma
                "Quickstart (dev)", style: "GUIButtonLarge", color: GUI.Style.Red)
            {
                IgnoreLayoutGroups = true,
-                UserData = Tab.QuickStartDev,
+                UserData = Tab.Empty,
                OnClicked = (tb, userdata) =>
                {
                    SelectTab(tb, userdata);
+
+                    QuickStart();
+
                    return true;
                }
            };
@@ -364,11 +380,32 @@ namespace Barotrauma
                "Profiling", style: "GUIButtonLarge", color: GUI.Style.Red)
            {
                IgnoreLayoutGroups = true,
-                UserData = Tab.ProfilingTestBench,
+                UserData = Tab.Empty,
                ToolTip = "Enables performance indicators and starts the game with a fixed sub, crew and level to make it easier to compare the performance between sessions.",
                OnClicked = (tb, userdata) =>
                {
                    SelectTab(tb, userdata);
+
+                    QuickStart(fixedSeed: true);
+                    GameMain.ShowPerf = true;
+                    GameMain.ShowFPS = true;
+
+                    return true;
+                }
+            };
+            new GUIButton(new RectTransform(new Point(300, 30), Frame.RectTransform, Anchor.TopRight) { AbsoluteOffset = new Point(40, 180) },
+                "Join Localhost", style: "GUIButtonLarge", color: GUI.Style.Red)
+            {
+                IgnoreLayoutGroups = true,
+                UserData = Tab.Empty,
+                ToolTip = "Connects to a locally hosted dedicated server, assuming default port.",
+                OnClicked = (tb, userdata) =>
+                {
+                    SelectTab(tb, userdata);
+
+                    GameMain.Client = new GameClient(string.IsNullOrEmpty(GameMain.Config.PlayerName) ? SteamManager.GetUsername() : GameMain.Config.PlayerName,
+                                                     IPAddress.Loopback.ToString(), 0, "localhost", 0, false);
+
                    return true;
                }
            };
@@ -538,13 +575,13 @@ namespace Barotrauma
                case Tab.NewGame:
                    if (GameMain.Config.ShowTutorialSkipWarning)
                    {
-                        selectedTab = 0;
+                        selectedTab = Tab.Empty;
                        ShowTutorialSkipWarning(Tab.NewGame);
                        return true;
                    }
                    if (!GameMain.Config.CampaignDisclaimerShown)
                    {
-                        selectedTab = 0;
+                        selectedTab = Tab.Empty;
                        GameMain.Instance.ShowCampaignDisclaimer(() => { SelectTab(null, Tab.NewGame); });
                        return true;
                    }
@@ -564,13 +601,13 @@ namespace Barotrauma
                case Tab.JoinServer:
                    if (GameMain.Config.ShowTutorialSkipWarning)
                    {
-                        selectedTab = 0;
+                        selectedTab = Tab.Empty;
                        ShowTutorialSkipWarning(Tab.JoinServer);
                        return true;
                    }
                    if (!GameMain.Config.CampaignDisclaimerShown)
                    {
-                        selectedTab = 0;
+                        selectedTab = Tab.Empty;
                        GameMain.Instance.ShowCampaignDisclaimer(() => { SelectTab(null, Tab.JoinServer); });
                        return true;
                    }
@@ -580,18 +617,18 @@ namespace Barotrauma
                    if (GameMain.Config.ContentPackageSelectionDirty)
                    {
                        new GUIMessageBox(TextManager.Get("RestartRequiredLabel"), TextManager.Get("ServerRestartRequiredContentPackage", fallBackTag: "RestartRequiredGeneric"));
-                        selectedTab = 0;
+                        selectedTab = Tab.Empty;
                        return false;
                    }
                    if (GameMain.Config.ShowTutorialSkipWarning)
                    {
-                        selectedTab = 0;
+                        selectedTab = Tab.Empty;
                        ShowTutorialSkipWarning(tab);
                        return true;
                    }
                    if (!GameMain.Config.CampaignDisclaimerShown)
                    {
-                        selectedTab = 0;
+                        selectedTab = Tab.Empty;
                        GameMain.Instance.ShowCampaignDisclaimer(() => { SelectTab(null, Tab.HostServer); });
                        return true;
                    }
@@ -599,7 +636,7 @@ namespace Barotrauma
                case Tab.Tutorials:
                    if (!GameMain.Config.CampaignDisclaimerShown)
                    {
-                        selectedTab = 0;
+                        selectedTab = Tab.Empty;
                        GameMain.Instance.ShowCampaignDisclaimer(() => { SelectTab(null, Tab.Tutorials); });
                        return true;
                    }
@@ -612,14 +649,6 @@ namespace Barotrauma
                case Tab.SubmarineEditor:
                    CoroutineManager.StartCoroutine(SelectScreenWithWaitCursor(GameMain.SubEditorScreen));
                    break;
-                case Tab.QuickStartDev:
-                    QuickStart();
-                    break;
-                case Tab.ProfilingTestBench:
-                    QuickStart(fixedSeed: true);
-                    GameMain.ShowPerf = true;
-                    GameMain.ShowFPS = true;
-                    break;
                case Tab.SteamWorkshop:
                    if (!Steam.SteamManager.IsInitialized) return false;
                    CoroutineManager.StartCoroutine(SelectScreenWithWaitCursor(GameMain.SteamWorkshopScreen));
@@ -630,7 +659,7 @@ namespace Barotrauma
                    break;
                case Tab.Empty:
                    titleText.Visible = true;
-                    selectedTab = 0;
+                    selectedTab = Tab.Empty;
                    break;
            }

@@ -886,8 +915,8 @@ namespace Barotrauma
                                   " -public " + isPublicBox.Selected.ToString() +
                                   " -playstyle " + ((PlayStyle)playstyleBanner.UserData).ToString()  +
                                   " -banafterwrongpassword " + wrongPasswordBanBox.Selected.ToString() +
-                                   " -karmaenabled " + karmaEnabledBox.Selected.ToString() +
-                                   " -karmapreset " + (karmaPresetDD.SelectedData?.ToString() ?? "default") +
+                                   " -karmaenabled " + (!karmaBox.Selected).ToString() +
+                                   " -karmapreset default" +
                                   " -maxplayers " + maxPlayersBox.Text;

                if (!string.IsNullOrWhiteSpace(passwordBox.Text))
@@ -946,7 +975,7 @@ namespace Barotrauma
        public override void AddToGUIUpdateList()
        {
            Frame.AddToGUIUpdateList();
-            if (selectedTab > 0 && menuTabs[(int)selectedTab] != null)
+            if (selectedTab < Tab.Empty && menuTabs[(int)selectedTab] != null)
            {
                menuTabs[(int)selectedTab].AddToGUIUpdateList();
            }
@@ -1142,9 +1171,11 @@ namespace Barotrauma
        {
            menuTabs[(int)Tab.HostServer].ClearChildren();

-            int port = NetConfig.DefaultPort;
-            int queryPort = NetConfig.DefaultQueryPort;
+            string name = "";
+            string password = "";
            int maxPlayers = 8;
+            bool isPublic = true;
+            bool banAfterWrongPassword = false;
            bool karmaEnabled = true;
            string selectedKarmaPreset = "";
            PlayStyle selectedPlayStyle = PlayStyle.Casual;
@@ -1153,8 +1184,10 @@ namespace Barotrauma
                XDocument settingsDoc = XMLExtensions.TryLoadXml(ServerSettings.SettingsFile);
                if (settingsDoc != null)
                {
-                    port = settingsDoc.Root.GetAttributeInt("port", port);
-                    queryPort = settingsDoc.Root.GetAttributeInt("queryport", queryPort);
+                    name = settingsDoc.Root.GetAttributeString("name", name);
+                    password = settingsDoc.Root.GetAttributeString("password", password);
+                    isPublic = settingsDoc.Root.GetAttributeBool("public", isPublic);
+                    banAfterWrongPassword = settingsDoc.Root.GetAttributeBool("banafterwrongpassword", banAfterWrongPassword);

                    int maxPlayersElement = settingsDoc.Root.GetAttributeInt("maxplayers", maxPlayers);
                    if (maxPlayersElement > NetConfig.MaxPlayers)
@@ -1256,30 +1289,12 @@ namespace Barotrauma
            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.05f), content.RectTransform), style: null);

            var label = new GUITextBlock(new RectTransform(textLabelSize, parent.RectTransform), TextManager.Get("ServerName"), textAlignment: textAlignment);
-            serverNameBox = new GUITextBox(new RectTransform(textFieldSize, label.RectTransform, Anchor.CenterRight), textAlignment: textAlignment)
+            serverNameBox = new GUITextBox(new RectTransform(textFieldSize, label.RectTransform, Anchor.CenterRight), text: name, textAlignment: textAlignment)
            { 
                MaxTextLength = NetConfig.ServerNameMaxLength,
                OverflowClip = true
            };
            label.RectTransform.MaxSize = serverNameBox.RectTransform.MaxSize;
- 
-            /* TODO: allow lidgren servers from client?
-            label = new GUITextBlock(new RectTransform(textLabelSize, parent.RectTransform), TextManager.Get("ServerPort"), textAlignment: textAlignment);
-            portBox = new GUITextBox(new RectTransform(textFieldSize, label.RectTransform, Anchor.CenterRight), textAlignment: textAlignment)
-            {
-                Text = port.ToString(),
-                ToolTip = TextManager.Get("ServerPortToolTip")
-            };
-
-#if USE_STEAM
-            label = new GUITextBlock(new RectTransform(textLabelSize, parent.RectTransform), TextManager.Get("ServerQueryPort"), textAlignment: textAlignment);
-            queryPortBox = new GUITextBox(new RectTransform(textFieldSize, label.RectTransform, Anchor.CenterRight), textAlignment: textAlignment)
-            {
-                Text = queryPort.ToString(),
-                ToolTip = TextManager.Get("ServerQueryPortToolTip")
-            };
-#endif
-            */

            var maxPlayersLabel = new GUITextBlock(new RectTransform(textLabelSize, parent.RectTransform), TextManager.Get("MaxPlayers"), textAlignment: textAlignment);
            var buttonContainer = new GUILayoutGroup(new RectTransform(textFieldSize, maxPlayersLabel.RectTransform, Anchor.CenterRight), isHorizontal: true)
@@ -1305,7 +1320,7 @@ namespace Barotrauma
            maxPlayersLabel.RectTransform.MaxSize = maxPlayersBox.RectTransform.MaxSize;

            label = new GUITextBlock(new RectTransform(textLabelSize, parent.RectTransform), TextManager.Get("Password"), textAlignment: textAlignment);
-            passwordBox = new GUITextBox(new RectTransform(textFieldSize, label.RectTransform, Anchor.CenterRight), textAlignment: textAlignment)
+            passwordBox = new GUITextBox(new RectTransform(textFieldSize, label.RectTransform, Anchor.CenterRight), text: password, textAlignment: textAlignment)
            {
                Censor = true
            };
@@ -1317,10 +1332,14 @@ namespace Barotrauma

            isPublicBox = new GUITickBox(new RectTransform(new Vector2(0.5f, 1.0f), tickboxAreaUpper.RectTransform), TextManager.Get("PublicServer"))
            {
+                Selected = isPublic,
                ToolTip = TextManager.Get("PublicServerToolTip")
            };

-            wrongPasswordBanBox = new GUITickBox(new RectTransform(new Vector2(0.5f, 1.0f), tickboxAreaUpper.RectTransform), TextManager.Get("ServerSettingsBanAfterWrongPassword"));
+            wrongPasswordBanBox = new GUITickBox(new RectTransform(new Vector2(0.5f, 1.0f), tickboxAreaUpper.RectTransform), TextManager.Get("ServerSettingsBanAfterWrongPassword"))
+            {
+                Selected = banAfterWrongPassword
+            };

            tickboxAreaUpper.RectTransform.MaxSize = isPublicBox.RectTransform.MaxSize;

@@ -1328,31 +1347,13 @@ namespace Barotrauma

            var tickboxAreaLower = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, tickBoxSize.Y), parent.RectTransform), isHorizontal: true);

-            karmaEnabledBox = new GUITickBox(new RectTransform(new Vector2(0.5f, 1.0f), tickboxAreaLower.RectTransform), TextManager.Get("ServerSettingsUseKarma"))
+            karmaBox = new GUITickBox(new RectTransform(new Vector2(0.5f, 1.0f), tickboxAreaLower.RectTransform), TextManager.Get("HostServerKarmaSetting"))
            {
-                ToolTip = TextManager.Get("karmaexplanation"),
-                OnSelected = (tb) =>
-                {
-                    karmaPresetDD.Enabled = karmaPresetDD.ButtonEnabled = tb.Selected;
-                    return true;
-                }                
+                Selected = !karmaEnabled,
+                ToolTip = TextManager.Get("hostserverkarmasettingtooltip")
            };
-            karmaPresetDD = new GUIDropDown(new RectTransform(new Vector2(0.5f, 1.0f), tickboxAreaLower.RectTransform))
-            {
-                ButtonEnabled = false,
-                Enabled = false
-            };
-            var tempKarmaManager = new KarmaManager();
-            foreach (string karmaPreset in tempKarmaManager.Presets.Keys)
-            {
-                karmaPresetDD.AddItem(TextManager.Get("KarmaPreset." + karmaPreset), karmaPreset);
-                if (karmaPreset == selectedKarmaPreset) { karmaPresetDD.SelectItem(karmaPreset); }
-            }
-            if (karmaPresetDD.SelectedIndex == -1) { karmaPresetDD.Select(0); }

-            karmaEnabledBox.Selected = karmaEnabled;
-
-            tickboxAreaLower.RectTransform.MaxSize = karmaEnabledBox.RectTransform.MaxSize;
+            tickboxAreaLower.RectTransform.MaxSize = karmaBox.RectTransform.MaxSize;

            //spacing
            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.05f), content.RectTransform), style: null);
@@ -132,6 +132,12 @@ namespace Barotrauma
            get;
            private set;
        }
+
+        public GUITickBox Favorite
+        {
+            get;
+            private set;
+        }
        
        public GUITextBox ServerMessage
        {
@@ -148,6 +154,8 @@ namespace Barotrauma
        private readonly GUIButton showChatButton;
        private readonly GUIButton showLogButton;

+        private readonly GUITextBlock publicOrPrivate;
+
        public GUIListBox SubList
        {
            get { return subList; }
@@ -667,6 +675,27 @@ namespace Barotrauma
            };
            clientReadonlyElements.Add(ServerName);

+            Favorite = new GUITickBox(new RectTransform(new Vector2(1.0f, 1.0f), lobbyHeader.RectTransform, scaleBasis: ScaleBasis.BothHeight),
+                "", null, "GUIServerListFavoriteTickBox")
+            {
+                Selected = false,
+                ToolTip = TextManager.Get("addtofavorites"),
+                OnSelected = (tickbox) =>
+                {
+                    ServerInfo info = GameMain.ServerListScreen.UpdateServerInfoWithServerSettings(GameMain.Client.ClientPeer.ServerConnection.EndPointString, GameMain.Client.ServerSettings);
+                    if (tickbox.Selected)
+                    {
+                        GameMain.ServerListScreen.AddToFavoriteServers(info);
+                    }
+                    else
+                    {
+                        GameMain.ServerListScreen.RemoveFromFavoriteServers(info);
+                    }
+                    tickbox.ToolTip = TextManager.Get(tickbox.Selected ? "removefromfavorites" : "addtofavorites");
+                    return true;
+                }
+            };
+
            SettingsButton = new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), lobbyHeader.RectTransform, Anchor.TopRight),
                TextManager.Get("ServerSettingsButton"));
            clientHiddenElements.Add(SettingsButton);
@@ -695,6 +724,12 @@ namespace Barotrauma
                CanBeFocused = false
            };

+            publicOrPrivate = new GUITextBlock(new RectTransform(new Vector2(0.15f, 1.0f), serverBanner.RectTransform, Anchor.BottomRight, Pivot.BottomRight),
+                "", font: GUI.SmallFont, textAlignment: Alignment.Center, textColor: Color.White, style: "GUISlopedHeader")
+            {
+                CanBeFocused = false
+            };
+
            var serverMessageContainer = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.75f), serverInfoHolder.RectTransform));
            ServerMessage = new GUITextBox(new RectTransform(Vector2.One, serverMessageContainer.Content.RectTransform), style: "GUITextBoxNoBorder")
            {
@@ -1240,6 +1275,11 @@ namespace Barotrauma

            base.Select();
        }
+
+        public void SetPublic(bool isPublic)
+        {
+            publicOrPrivate.Text = isPublic ? TextManager.Get("PublicLobbyTag") : TextManager.Get("PrivateLobbyTag");
+        }
        
        public void RefreshEnabledElements()
        {
@@ -1977,6 +2017,17 @@ namespace Barotrauma
            if (child != null) { playerList.RemoveChild(child); }
        }

+        public void SelectPlayer(GUITextBlock component, GUITextBlock.ClickableArea area)
+        {
+            if (!UInt64.TryParse(area.Data.Metadata, out UInt64 id)) { return; }
+            Client client = GameMain.Client.ConnectedClients.Find(c => c.SteamID == id)
+                ?? GameMain.Client.ConnectedClients.Find(c => c.ID == id)
+                ?? GameMain.Client.PreviouslyConnectedClients.FirstOrDefault(c => c.SteamID == id)
+                ?? GameMain.Client.PreviouslyConnectedClients.FirstOrDefault(c => c.ID == id);
+            if (client == null) { return; }
+            GameMain.NetLobbyScreen.SelectPlayer(client);
+        }
+
        public bool SelectPlayer(Client selectedClient)
        {
            bool myClient = selectedClient.ID == GameMain.Client.ID;
@@ -2475,6 +2526,8 @@ namespace Barotrauma

                component.ToolTip = TextManager.Get("servertagdescription." + playStyle);
            }
+
+            publicOrPrivate.RectTransform.NonScaledSize = (publicOrPrivate.Font.MeasureString(publicOrPrivate.Text) + new Vector2(25, 8) * GUI.Scale).ToPoint();
        }

        private void DrawJobVariantItems(SpriteBatch spriteBatch, GUICustomComponent component, Pair<JobPrefab, int> jobPrefab, int itemsPerRow)
@@ -2548,17 +2601,12 @@ namespace Barotrauma
                chatBox.RemoveChild(chatBox.Content.Children.First());
            }

-            string textWithSender = message.TextWithSender;
-            if (message.Type == ChatMessageType.Server)
-            {
-                RichTextData.GetRichTextData(textWithSender, out textWithSender);
-            }
-
            GUITextBlock msg = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), chatBox.Content.RectTransform),
-                text: ChatMessage.GetTimeStamp() + (message.Type == ChatMessageType.Private ? TextManager.Get("PrivateMessageTag") + " " : "") + textWithSender,
+                text: ChatMessage.GetTimeStamp() + (message.Type == ChatMessageType.Private ? TextManager.Get("PrivateMessageTag") + " " : "") + message.TextWithSender,
                textColor: message.Color,
                color: ((chatBox.CountChildren % 2) == 0) ? Color.Transparent : Color.Black * 0.1f,
-                wrap: true, font: GUI.SmallFont)
+                wrap: true, font: GUI.SmallFont,
+                parseRichText: true)
            {
                UserData = message,
                CanBeFocused = false
@@ -3484,29 +3532,35 @@ namespace Barotrauma
                    new string[3] { sub.Name, sub.MD5Hash.ShortHash, Md5Hash.GetShortHash(md5Hash) }) + " ";
            }

-            errorMsg += TextManager.Get("DownloadSubQuestion");
-
            //already showing a message about the same sub
            if (GUIMessageBox.MessageBoxes.Any(mb => mb.UserData as string == "request" + subName))
            {
                return false;
            }

-            var requestFileBox = new GUIMessageBox(TextManager.Get("DownloadSubLabel"), errorMsg, 
-                new string[] { TextManager.Get("Yes"), TextManager.Get("No") })
+            if (GameMain.Client.ServerSettings.AllowFileTransfers)
            {
-                UserData = "request" + subName
-            };
-            requestFileBox.Buttons[0].UserData = new string[] { subName, md5Hash };
-            requestFileBox.Buttons[0].OnClicked += requestFileBox.Close;
-            requestFileBox.Buttons[0].OnClicked += (GUIButton button, object userdata) =>
-            {
-                string[] fileInfo = (string[])userdata;
-                GameMain.Client?.RequestFile(FileTransferType.Submarine, fileInfo[0], fileInfo[1]);
-                return true;
-            };
-            requestFileBox.Buttons[1].OnClicked += requestFileBox.Close;
+                errorMsg += TextManager.Get("DownloadSubQuestion");

+                var requestFileBox = new GUIMessageBox(TextManager.Get("DownloadSubLabel"), errorMsg,
+                    new string[] { TextManager.Get("Yes"), TextManager.Get("No") })
+                {
+                    UserData = "request" + subName
+                };
+                requestFileBox.Buttons[0].UserData = new string[] { subName, md5Hash };
+                requestFileBox.Buttons[0].OnClicked += requestFileBox.Close;
+                requestFileBox.Buttons[0].OnClicked += (GUIButton button, object userdata) =>
+                {
+                    string[] fileInfo = (string[])userdata;
+                    GameMain.Client?.RequestFile(FileTransferType.Submarine, fileInfo[0], fileInfo[1]);
+                    return true;
+                };
+                requestFileBox.Buttons[1].OnClicked += requestFileBox.Close;
+            }
+            else
+            {
+                new GUIMessageBox(TextManager.Get("DownloadSubLabel"), errorMsg);
+            }
            return false;            
        }

@@ -487,7 +487,10 @@ namespace Barotrauma
                filterTickBoxes.ForEach(t => t.Value.Text = t.Value.UserData as string);
                gameModeTickBoxes.ForEach(tb => tb.Value.Text = tb.Value.ToolTip);
                playStyleTickBoxes.ForEach(tb => tb.Value.Text = tb.Value.ToolTip);
-                GUITextBlock.AutoScaleAndNormalize(filterTickBoxes.Values.Select(tb => tb.TextBlock), defaultScale: 1.0f);
+                GUITextBlock.AutoScaleAndNormalize(
+                    filterTickBoxes.Values.Select(tb => tb.TextBlock)
+                    .Concat(ternaryFilters.Values.Select(dd => dd.Parent.GetChild<GUITextBlock>())),
+                    defaultScale: 1.0f);
                if (filterTickBoxes.Values.First().TextBlock.TextScale < 0.8f)
                {
                    filterTickBoxes.ForEach(t => t.Value.TextBlock.TextScale = 1.0f);
@@ -860,6 +863,11 @@ namespace Barotrauma
            WriteServerMemToFile(recentServersFile, recentServers);
        }

+        public bool IsFavorite(ServerInfo info)
+        {
+            return favoriteServers.Any(serverInfo => info.OwnerID == serverInfo.OwnerID && (info.OwnerID != 0 ? true : (info.IP == serverInfo.IP && info.Port == serverInfo.Port)));
+        }
+
        public void AddToFavoriteServers(ServerInfo info)
        {
            info.Favorite = true;