(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs

@@ -393,7 +393,7 @@ namespace Barotrauma
             }
         }
 
-        partial void SeverLimbJointProjSpecific(LimbJoint limbJoint)
+        partial void SeverLimbJointProjSpecific(LimbJoint limbJoint, bool playSound = true)
         {
             foreach (Limb limb in new Limb[] { limbJoint.LimbA, limbJoint.LimbB })
             {
@@ -411,6 +411,11 @@ namespace Barotrauma
                     character.CurrentHull?.AddDecal(character.BloodDecalName, limb.WorldPosition, MathHelper.Clamp(limb.Mass, 0.5f, 2.0f));
                 }
             }
+
+            if (playSound)
+            {
+                SoundPlayer.PlayDamageSound("Gore", 1.0f, limbJoint.LimbA.body);
+            }
         }
 
         public virtual void Draw(SpriteBatch spriteBatch, Camera cam)

Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs

@@ -96,6 +96,11 @@ namespace Barotrauma
         private const float UpdateDisplayedAfflictionsInterval = 0.5f;
         private List<Affliction> currentDisplayedAfflictions = new List<Affliction>();
 
+        public bool MouseOnElement
+        {
+            get { return highlightedLimbIndex > -1 || GUI.MouseOn == dropItemArea; }
+        }
+
         private static CharacterHealth openHealthWindow;
         public static CharacterHealth OpenHealthWindow
         {
@@ -172,18 +177,16 @@ namespace Barotrauma
 
             afflictionInfoContainer = new GUIListBox(new RectTransform(new Vector2(0.7f, 0.85f), paddedInfoFrame.RectTransform, Anchor.BottomLeft));
 
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.08f), paddedInfoFrame.RectTransform), TextManager.Get("SuitableTreatments"), textAlignment: Alignment.TopRight);
-            lowSkillIndicator = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.07f), paddedInfoFrame.RectTransform, Anchor.TopRight) { RelativeOffset = new Vector2(0.0f, 0.08f) },
-              TextManager.Get("LowMedicalSkillWarning"), Color.Orange, textAlignment: Alignment.Center, font: GUI.SmallFont, wrap: true)
+            lowSkillIndicator = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), paddedInfoFrame.RectTransform, Anchor.TopRight),
+              TextManager.Get("LowMedicalSkillWarning"), Color.Orange, textAlignment: Alignment.TopRight, font: GUI.SmallFont, wrap: true)
             {
                 Visible = false
             };
-            recommendedTreatmentContainer = new GUIListBox(new RectTransform(new Vector2(0.28f, 0.5f), paddedInfoFrame.RectTransform, Anchor.TopRight) { RelativeOffset = new Vector2(0.0f, 0.15f) })
-            {
-                Spacing = 10
-            };
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), paddedInfoFrame.RectTransform) { RelativeOffset = new Vector2(0.0f, 0.05f) }, TextManager.Get("SuitableTreatments"), textAlignment: Alignment.BottomRight);
+            
+            recommendedTreatmentContainer = new GUIListBox(new RectTransform(new Vector2(0.28f, 0.5f), paddedInfoFrame.RectTransform, Anchor.TopRight) { RelativeOffset = new Vector2(0.0f, 0.12f) });
             dropItemArea = new GUIFrame(new RectTransform(new Vector2(0.28f, 0.3f), paddedInfoFrame.RectTransform, Anchor.BottomRight)
-            { RelativeOffset = new Vector2(0.0f, 0.0f) }, style: null)
+            { RelativeOffset = new Vector2(0.02f, 0.0f) }, style: null)
             {
                 ToolTip = TextManager.Get("HealthItemUseTip")
             };
@@ -584,9 +587,18 @@ namespace Barotrauma
                     var affliction = GetAllAfflictions(a => a.Prefab.IndicatorLimb != LimbType.None)
                         .OrderByDescending(a => a.DamagePerSecond)
                         .ThenByDescending(a => a.Strength).FirstOrDefault();
-                    var limbHealth = GetMathingLimbHealth(affliction);
-                    if (limbHealth != null)
+                    if (affliction.DamagePerSecond > 0 || affliction.Strength > 0)
                     {
+                        var limbHealth = GetMathingLimbHealth(affliction);
+                        if (limbHealth != null)
+                        {
+                            selectedLimbIndex = limbHealths.IndexOf(limbHealth);
+                        }
+                    }
+                    else
+                    {
+                        // If no affliction is critical, select the limb which has most damage.
+                        var limbHealth = limbHealths.OrderByDescending(l => l.TotalDamage).FirstOrDefault();
                         selectedLimbIndex = limbHealths.IndexOf(limbHealth);
                     }
                 }
@@ -928,7 +940,7 @@ namespace Barotrauma
         {
             afflictionInfoContainer.Content.ClearChildren();
             recommendedTreatmentContainer.Content.ClearChildren();
-
+            
             float characterSkillLevel = Character.Controlled == null ? 0.0f : Character.Controlled.GetSkillLevel("medical");
 
             //random variance is 200% when the skill is 0
@@ -1023,14 +1035,15 @@ namespace Barotrauma
             {
                 ItemPrefab item = MapEntityPrefab.Find(name: null, identifier: treatment.Key, showErrorMessages: false) as ItemPrefab;
                 if (item == null) continue;
-                int slotSize = (int)(recommendedTreatmentContainer.Content.Rect.Width * 0.8f);
+                int slotSize = (int)(recommendedTreatmentContainer.Content.Rect.Width * 0.5f);
 
-                var itemSlot = new GUIButton(new RectTransform(new Point(slotSize), recommendedTreatmentContainer.Content.RectTransform, Anchor.TopCenter),
-                    text: "", style: "InventorySlotSmall")
+                var itemSlot = new GUIFrame(new RectTransform(new Point(recommendedTreatmentContainer.Content.Rect.Width, slotSize), recommendedTreatmentContainer.Content.RectTransform, Anchor.TopCenter),
+                    style: "InnerGlow")
                 {
-                    UserData = item
+                    UserData = item,
+                    CanBeFocused = false
                 };
-                itemSlot.Color = ToolBox.GradientLerp(treatment.Value, Color.Red, Color.White, Color.LightGreen);
+                itemSlot.Color = ToolBox.GradientLerp(treatment.Value, Color.Red, Color.Orange, Color.LightGreen);
 
                 Sprite itemSprite = item.InventoryIcon ?? item.sprite;
                 Color itemColor = itemSprite == item.sprite ? item.SpriteColor : item.InventoryIconColor;

Barotrauma/BarotraumaClient/Source/Characters/Limb.cs

@@ -296,6 +296,7 @@ namespace Barotrauma
                         break;
                     }
                 }
+                SoundPlayer.PlayDamageSound(damageSoundType, Math.Max(damage, bleedingDamage), WorldPosition);
             }
 
             // Always spawn damage particles

Barotrauma/BarotraumaClient/Source/DebugConsole.cs

@@ -555,6 +555,37 @@ namespace Barotrauma
                 }
             }));
 
+            commands.Add(new Command("resetselected", "Reset selected items and structures to prefabs. Only applicable in the subeditor.", args =>
+            {
+                if (Screen.Selected == GameMain.SubEditorScreen)
+                {
+                    foreach (MapEntity entity in MapEntity.SelectedList)
+                    {
+                        if (entity is Item item)
+                        {
+                            item.Reset();
+                        }
+                        else if (entity is Structure structure)
+                        {
+                            structure.Reset();
+                        }
+                    }
+                    foreach (MapEntity entity in MapEntity.SelectedList)
+                    {
+                        if (entity is Item item)
+                        {
+                            item.CreateEditingHUD();
+                            break;
+                        }
+                        else if (entity is Structure structure)
+                        {
+                            structure.CreateEditingHUD();
+                            break;
+                        }
+                    }
+                }
+            }));
+
             commands.Add(new Command("alpha", "Change the alpha (as bytes from 0 to 255) of the selected item/structure instances. Applied only in the subeditor.", (string[] args) =>
             {
                 if (Screen.Selected == GameMain.SubEditorScreen)
@@ -1051,6 +1082,130 @@ namespace Barotrauma
                 };
             }));
 
+            commands.Add(new Command("dumpentitytexts", "dumpentitytexts [filepath]: gets the names and descriptions of all entity prefabs and writes them into a file along with xml tags that can be used in translation files. If the filepath is omitted, the file is written to Content/Texts/EntityTexts.txt", (string[] args) =>
+            {
+                string filePath = args.Length > 0 ? args[0] : "Content/Texts/EntityTexts.txt";
+                List<string> lines = new List<string>();
+                foreach (MapEntityPrefab me in MapEntityPrefab.List)
+                {
+                    lines.Add("<EntityName." + me.Identifier + ">" + me.Name + "</EntityName." + me.Identifier + ">");
+                    lines.Add("<EntityDescription." + me.Identifier + ">" + me.Description + "</EntityDescription." + me.Identifier + ">");
+                }
+                File.WriteAllLines(filePath, lines);
+            }));
+#if DEBUG
+            commands.Add(new Command("checkduplicates", "Checks the given language for duplicate translation keys and writes to file.", (string[] args) =>
+            {
+                if (args.Length != 1) return;
+                TextManager.CheckForDuplicates(args[0]);
+            }));
+
+            commands.Add(new Command("writetocsv", "Writes the default language (English) to a .csv file.", (string[] args) =>
+            {
+                TextManager.WriteToCSV();
+                NPCConversation.WriteToCSV();
+            }));
+
+            commands.Add(new Command("csvtoxml", "csvtoxml [language] -> Converts .csv localization files in Content/NPCConversations & Content/Texts to .xml for use in-game.", (string[] args) =>
+            {
+                if (args.Length == 0) return;
+                LocalizationCSVtoXML.Convert(args[0]);
+            }));
+#endif
+
+            commands.Add(new Command("cleanbuild", "", (string[] args) =>
+            {
+                GameMain.Config.MusicVolume = 0.5f;
+                GameMain.Config.SoundVolume = 0.5f;
+                NewMessage("Music and sound volume set to 0.5", Color.Green);
+
+                GameMain.Config.GraphicsWidth = 0;
+                GameMain.Config.GraphicsHeight = 0;
+                GameMain.Config.WindowMode = WindowMode.Fullscreen;
+                NewMessage("Resolution set to 0 x 0 (screen resolution will be used)", Color.Green);
+                NewMessage("Fullscreen enabled", Color.Green);
+
+                GameSettings.ShowUserStatisticsPrompt = true;
+
+                GameSettings.VerboseLogging = false;
+
+                if (GameMain.Config.MasterServerUrl != "http://www.undertowgames.com/baromaster")
+                {
+                    ThrowError("MasterServerUrl \"" + GameMain.Config.MasterServerUrl + "\"!");
+                }
+
+                GameMain.Config.SaveNewPlayerConfig();
+
+                var saveFiles = System.IO.Directory.GetFiles(SaveUtil.SaveFolder);
+
+                foreach (string saveFile in saveFiles)
+                {
+                    System.IO.File.Delete(saveFile);
+                    NewMessage("Deleted " + saveFile, Color.Green);
+                }
+
+                if (System.IO.Directory.Exists(System.IO.Path.Combine(SaveUtil.SaveFolder, "temp")))
+                {
+                    ThrowError("Reading the file \"" + sourcePath + "\" failed.", e);
+                    return;
+                }
+                var doc = XMLExtensions.TryLoadXml(destinationPath);
+                int i = 0;
+                foreach (XElement element in doc.Root.Elements())
+                {
+                    if (i >= lines.Length)
+                    {
+                        ThrowError("Error while loading texts to the xml file. The xml has more elements than the number of lines in the text file.");
+                        return;
+                    }
+                    element.Value = lines[i];
+                    i++;
+                }
+                doc.Save(destinationPath);
+            },
+            () =>
+            {
+                var files = TextManager.GetTextFiles().Select(f => f.Replace("\\", "/"));
+                return new string[][]
+                {
+                    files.Where(f => Path.GetExtension(f)==".txt").ToArray(),
+                    files.Where(f => Path.GetExtension(f)==".xml").ToArray()
+                };
+            }));
+
+            commands.Add(new Command("updatetextfile", "updatetextfile [sourcefile] [destinationfile]: Inserts all the xml elements that are only present in the source file into the destination file. Can be used to update outdated translation files more easily.", (string[] args) =>
+            {
+                if (args.Length < 2) return;
+                string sourcePath = args[0];
+                string destinationPath = args[1];
+
+                var sourceDoc = XMLExtensions.TryLoadXml(sourcePath);
+                var destinationDoc = XMLExtensions.TryLoadXml(destinationPath);
+
+                XElement destinationElement = destinationDoc.Root.Elements().First();
+                foreach (XElement element in sourceDoc.Root.Elements())
+                {
+                    if (destinationDoc.Root.Element(element.Name) == null)
+                    {
+                        element.Value = "!!!!!!!!!!!!!" + element.Value;
+                        destinationElement.AddAfterSelf(element);
+                    }
+                    XNode nextNode = destinationElement.NextNode;
+                    while ((!(nextNode is XElement) || nextNode == element) && nextNode != null) nextNode = nextNode.NextNode;
+                    destinationElement = nextNode as XElement;
+                }
+                destinationDoc.Save(destinationPath);
+            },
+            () =>
+            {
+                var files = TextManager.GetTextFiles().Where(f => Path.GetExtension(f) == ".xml").Select(f => f.Replace("\\", "/")).ToArray();
+                return new string[][]
+                {
+                    files,
+                    files
+                };
+            }));
+
             commands.Add(new Command("dumpentitytexts", "dumpentitytexts [filepath]: gets the names and descriptions of all entity prefabs and writes them into a file along with xml tags that can be used in translation files. If the filepath is omitted, the file is written to Content/Texts/EntityTexts.txt", (string[] args) =>
             {
                 string filePath = args.Length > 0 ? args[0] : "Content/Texts/EntityTexts.txt";
@@ -1694,7 +1849,7 @@ namespace Barotrauma
                 character.AnimController.ResetRagdoll();
             }, isCheat: true));
 
-            commands.Add(new Command("reloadwearables|reloadlimbs", "Reloads the sprites of all limbs and wearable sprites (clothing) of the controlled character. Provide id or name if you want to target another character.", args =>
+            commands.Add(new Command("reloadwearables", "Reloads the sprites of all limbs and wearable sprites (clothing) of the controlled character. Provide id or name if you want to target another character.", args =>
             {
                 var character = (args.Length == 0) ? Character.Controlled : FindMatchingCharacter(args, true);
                 if (character == null)
@@ -1705,6 +1860,26 @@ namespace Barotrauma
                 ReloadWearables(character);
             }, isCheat: true));
 
+            commands.Add(new Command("loadwearable", "Force select certain variant for the selected character.", args =>
+            {
+                var character = Character.Controlled;
+                if (character == null)
+                {
+                    ThrowError("Not controlling any character.");
+                    return;
+                }
+                if (args.Length == 0)
+                {
+                    ThrowError("No arguments provided! Give an index number for the variant starting from 1.");
+                    return;
+                }
+                if (int.TryParse(args[0], out int variant))
+                {
+                    ReloadWearables(character, variant);
+                }
+                
+            }, isCheat: true));
+
             commands.Add(new Command("reloadsprite|reloadsprites", "Reloads the sprites of the selected item(s)/structure(s) (hovering over or selecting in the subeditor) or the controlled character. Can also reload sprites by entity id or by the name attribute (sprite element). Example 1: reloadsprite id itemid. Example 2: reloadsprite name \"Sprite name\"", args =>
             {
                 if (Screen.Selected is SpriteEditorScreen)
@@ -1852,7 +2027,7 @@ namespace Barotrauma
             }, isCheat: true));
         }
 
-        private static void ReloadWearables(Character character)
+        private static void ReloadWearables(Character character, int variant = 0)
         {
             foreach (var limb in character.AnimController.Limbs)
             {
@@ -1861,11 +2036,17 @@ namespace Barotrauma
                 limb.DeformSprite?.Sprite.ReloadTexture();
                 foreach (var wearable in limb.WearingItems)
                 {
+                    if (variant > 0 && wearable.Variant > 0)
+                    {
+                        wearable.Variant = variant;
+                    }
+                    wearable.RefreshPath();
                     wearable.Sprite.ReloadXML();
                     wearable.Sprite.ReloadTexture();
                 }
                 foreach (var wearable in limb.OtherWearables)
                 {
+                    wearable.RefreshPath();
                     wearable.Sprite.ReloadXML();
                     wearable.Sprite.ReloadTexture();
                 }

Barotrauma/BarotraumaClient/Source/GUI/ChatBox.cs

@@ -26,7 +26,21 @@ namespace Barotrauma
         private bool isSinglePlayer;
         public bool IsSinglePlayer => isSinglePlayer;
 
-        private bool toggleOpen = true;
+        private bool _toggleOpen = true;
+        public bool ToggleOpen
+        {
+            get { return _toggleOpen; }
+            set
+            {
+                if (_toggleOpen == value) { return; }
+                _toggleOpen = GameMain.Config.ChatOpen = value;
+                foreach (GUIComponent child in ToggleButton.Children)
+                {
+                    child.SpriteEffects = _toggleOpen == (HUDLayoutSettings.ChatBoxAlignment == Alignment.Right) ?
+                      SpriteEffects.FlipHorizontally : SpriteEffects.None;
+                }
+            }
+        }
         private float openState;
 
         private float prevUIScale;
@@ -81,12 +95,7 @@ namespace Barotrauma
 
             toggleButton.OnClicked += (GUIButton btn, object userdata) =>
             {
-                toggleOpen = !toggleOpen;
-                foreach (GUIComponent child in btn.Children)
-                {
-                    child.SpriteEffects = toggleOpen == (HUDLayoutSettings.ChatBoxAlignment == Alignment.Right) ?
-                      SpriteEffects.FlipHorizontally : SpriteEffects.None;
-                }
+                ToggleOpen = !ToggleOpen;
                 return true;
             };
 
@@ -124,6 +133,8 @@ namespace Barotrauma
                 }
                 return true;
             };
+
+            ToggleOpen = GameMain.Config.ChatOpen;
         }
 
         public bool TypingChatMessage(GUITextBox textBox, string text)
@@ -228,7 +239,7 @@ namespace Barotrauma
 
             chatBox.UpdateScrollBarSize();
 
-            if (!toggleOpen)
+            if (!ToggleOpen)
             {
                 var popupMsg = new GUIFrame(new RectTransform(Vector2.One, guiFrame.RectTransform), style: "GUIToolTip")
                 {
@@ -313,9 +324,7 @@ namespace Barotrauma
                 prevUIScale = GUI.Scale;
             }
 
-
-
-            if (toggleOpen || (inputBox != null && inputBox.Selected))
+            if (ToggleOpen || (inputBox != null && inputBox.Selected))
             {
                 openState += deltaTime * 5.0f;
                 //delete all popup messages when the chatbox is open

Barotrauma/BarotraumaClient/Source/GUI/GUI.cs

@@ -1568,7 +1568,7 @@ namespace Barotrauma
         }
 
         /// <summary>
-        /// Displays a message at the center of the screen, automatically preventing overlapping with other centered messages
+        /// Displays a message at the center of the screen, automatically preventing overlapping with other centered messages. TODO: Allow to show messages at the middle of the screen (instead of the top center).
         /// </summary>
         public static void AddMessage(string message, Color color, float? lifeTime = null, bool playSound = true, ScalableFont font = null)
         {

Barotrauma/BarotraumaClient/Source/GameMain.cs

@@ -318,8 +318,16 @@ namespace Barotrauma
             SoundManager.SetCategoryGainMultiplier("voip", Config.VoiceChatVolume);
             if (Config.EnableSplashScreen)
             {
-                (TitleScreen as LoadingScreen).SplashScreen = new Video(base.GraphicsDevice, SoundManager, "Content/splashscreen.mp4", 1280, 720);
-            }
+                try
+                {
+                    (TitleScreen as LoadingScreen).SplashScreen = new Video(base.GraphicsDevice, SoundManager, "Content/splashscreen.mp4", 1280, 720);
+                }
+                catch (Exception e)
+                {
+                    Config.EnableSplashScreen = false;
+                    DebugConsole.ThrowError("Playing the splash screen failed.", e);
+                }
+             }
 
             GUI.Init(Window, Config.SelectedContentPackages, GraphicsDevice);
             DebugConsole.Init();

Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs

@@ -41,7 +41,10 @@ namespace Barotrauma
         private bool toggleCrewAreaOpen = true;
         private int characterInfoWidth;
 
-        private ChatBox chatBox;
+        /// <summary>
+        /// Present only in single player games. In multiplayer. The chatbox is found from GameSession.Client.
+        /// </summary>
+        public ChatBox ChatBox { get; private set; }
 
         private float prevUIScale;
 
@@ -50,7 +53,15 @@ namespace Barotrauma
         public bool ToggleCrewAreaOpen
         {
             get { return toggleCrewAreaOpen; }
-            set { toggleCrewAreaOpen = value; }
+            set
+            {
+                if (toggleCrewAreaOpen == value) { return; }
+                toggleCrewAreaOpen = GameMain.Config.CrewMenuOpen = value;
+                foreach (GUIComponent child in toggleCrewButton.Children)
+                {
+                    child.SpriteEffects = toggleCrewAreaOpen ? SpriteEffects.None : SpriteEffects.FlipHorizontally;
+                }
+            }
         }
 
         #endregion
@@ -93,11 +104,7 @@ namespace Barotrauma
                 "", style: "UIToggleButton");
             toggleCrewButton.OnClicked += (GUIButton btn, object userdata) =>
             {
-                toggleCrewAreaOpen = !toggleCrewAreaOpen;
-                foreach (GUIComponent child in btn.Children)
-                {
-                    child.SpriteEffects = toggleCrewAreaOpen ? SpriteEffects.None : SpriteEffects.FlipHorizontally;
-                }
+                ToggleCrewAreaOpen = !ToggleCrewAreaOpen;
                 return true;
             };
 
@@ -125,7 +132,7 @@ namespace Barotrauma
 
             if (isSinglePlayer)
             {
-                chatBox = new ChatBox(guiFrame, isSinglePlayer: true)
+                ChatBox = new ChatBox(guiFrame, isSinglePlayer: true)
                 {
                     OnEnterMessage = (textbox, text) =>
                     {
@@ -158,7 +165,7 @@ namespace Barotrauma
                     }
                 };
 
-                chatBox.InputBox.OnTextChanged += chatBox.TypingChatMessage;
+                ChatBox.InputBox.OnTextChanged += ChatBox.TypingChatMessage;
             }
 
             var reports = Order.PrefabList.FindAll(o => o.TargetAllCharacters && o.SymbolSprite != null);
@@ -208,6 +215,8 @@ namespace Barotrauma
             screenResolution = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
 
             prevUIScale = GUI.Scale;
+
+            ToggleCrewAreaOpen = GameMain.Config.CrewMenuOpen;
         }
 
 
@@ -271,7 +280,6 @@ namespace Barotrauma
                 DebugConsole.ThrowError("Tried to add the same character info to CrewManager twice.\n" + Environment.StackTrace);
                 return;
             }
-        }
 
             characterInfos.Add(characterInfo);
         }
@@ -599,7 +607,20 @@ namespace Barotrauma
                 characterListBox.BarScroll = roundedPos;
             }
 
-            return false;
+        #region Dialog
+        /// <summary>
+        /// Adds the message to the single player chatbox.
+        /// </summary>
+        public void AddSinglePlayerChatMessage(string senderName, string text, ChatMessageType messageType, Character sender)
+        {
+            if (!isSinglePlayer)
+            {
+                DebugConsole.ThrowError("Cannot add messages to single player chat box in multiplayer mode!\n" + Environment.StackTrace);
+                return;
+            }
+            if (string.IsNullOrEmpty(text)) { return; }
+
+            chatBox.AddMessage(ChatMessage.Create(senderName, text, messageType, sender));
         }
 
         private IEnumerable<object> KillCharacterAnim(GUIComponent component)
@@ -612,6 +633,12 @@ namespace Barotrauma
             {
                 comp.Color = Color.DarkRed;
             }
+            List<Character> availableSpeakers = Character.CharacterList.FindAll(c =>
+                c.AIController is HumanAIController &&
+                !c.IsDead &&
+                c.SpeechImpediment <= 100.0f);
+            pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers));
+        }
 
             yield return new WaitForSeconds(1.0f);
 
@@ -647,7 +674,7 @@ namespace Barotrauma
             }
             if (string.IsNullOrEmpty(text)) { return; }
 
-            chatBox.AddMessage(ChatMessage.Create(senderName, text, messageType, sender));
+            ChatBox.AddMessage(ChatMessage.Create(senderName, text, messageType, sender));
         }
 
         private WifiComponent GetHeadset(Character character, bool requireEquipped)
@@ -723,7 +750,7 @@ namespace Barotrauma
                 if (IsSinglePlayer)
                 {
                     orderGiver.Speak(
-                        order.GetChatMessage("", orderGiver.CurrentHull?.RoomName, givingOrderToSelf: character == orderGiver), ChatMessageType.Order);
+                        order.GetChatMessage("", orderGiver.CurrentHull?.DisplayName, givingOrderToSelf: character == orderGiver), ChatMessageType.Order);
                 }
                 else
                 {
@@ -740,7 +767,7 @@ namespace Barotrauma
             if (IsSinglePlayer)
             {
                 orderGiver?.Speak(
-                    order.GetChatMessage(character.Name, orderGiver.CurrentHull?.RoomName, givingOrderToSelf: character == orderGiver, orderOption: option), null);
+                    order.GetChatMessage(character.Name, orderGiver.CurrentHull?.DisplayName, givingOrderToSelf: character == orderGiver, orderOption: option), null);
             }
             else if (orderGiver != null)
             {
@@ -1057,24 +1084,24 @@ namespace Barotrauma
             }
 
             if (GUI.DisableHUD || GUI.DisableUpperHUD) return;
-            if (chatBox != null)
+            if (ChatBox != null)
             {
-                chatBox.Update(deltaTime);
-                chatBox.InputBox.Visible = Character.Controlled != null;
+                ChatBox.Update(deltaTime);
+                ChatBox.InputBox.Visible = Character.Controlled != null;
 
-                if (!DebugConsole.IsOpen && chatBox.InputBox.Visible)
+                if (!DebugConsole.IsOpen && ChatBox.InputBox.Visible)
                 {
-                    if (PlayerInput.KeyHit(InputType.Chat) && !chatBox.InputBox.Selected)
+                    if (PlayerInput.KeyHit(InputType.Chat) && !ChatBox.InputBox.Selected)
                     {
-                        chatBox.GUIFrame.Flash(Color.DarkGreen, 0.5f);
-                        chatBox.InputBox.Select();
+                        ChatBox.GUIFrame.Flash(Color.DarkGreen, 0.5f);
+                        ChatBox.InputBox.Select();
                     }
 
-                    if (PlayerInput.KeyHit(InputType.RadioChat) && !chatBox.InputBox.Selected)
+                    if (PlayerInput.KeyHit(InputType.RadioChat) && !ChatBox.InputBox.Selected)
                     {
-                        chatBox.GUIFrame.Flash(Color.YellowGreen, 0.5f);
-                        chatBox.InputBox.Select();
-                        chatBox.InputBox.Text = "r; ";
+                        ChatBox.GUIFrame.Flash(Color.YellowGreen, 0.5f);
+                        ChatBox.InputBox.Select();
+                        ChatBox.InputBox.Text = "r; ";
                     }
                 }
             }
@@ -1144,7 +1171,7 @@ namespace Barotrauma
 
             crewArea.RectTransform.AbsoluteOffset =
                 Vector2.SmoothStep(new Vector2(-crewArea.Rect.Width, 0), new Vector2(toggleCrewButton.Rect.Width, 0), crewAreaOpenState).ToPoint();
-            crewAreaOpenState = toggleCrewAreaOpen ?
+            crewAreaOpenState = ToggleCrewAreaOpen ?
                 Math.Min(crewAreaOpenState + deltaTime * 2.0f, 1.0f) :
                 Math.Max(crewAreaOpenState - deltaTime * 2.0f, 0.0f);
 
@@ -1157,7 +1184,7 @@ namespace Barotrauma
                 {
                     Character.Controlled.SelectedConstruction = null;
                 }
-                toggleCrewAreaOpen = !toggleCrewAreaOpen;
+                ToggleCrewAreaOpen = !ToggleCrewAreaOpen;
             }
 
             UpdateReports(deltaTime);
@@ -1285,7 +1312,7 @@ namespace Barotrauma
             {
                 reportButtonFrame.Visible = true;
 
-                var reportButtonParent = chatBox ?? GameMain.Client.ChatBox;
+                var reportButtonParent = ChatBox ?? GameMain.Client.ChatBox;
                 reportButtonFrame.RectTransform.AbsoluteOffset = new Point(
                     Math.Min(reportButtonParent.GUIFrame.Rect.X, reportButtonParent.ToggleButton.Rect.X) - reportButtonFrame.Rect.Width - (int)(10 * GUI.Scale),
                     reportButtonParent.GUIFrame.Rect.Y);

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -135,6 +135,8 @@ namespace Barotrauma
 
             msg.Write(map.SelectedLocationIndex == -1 ? UInt16.MaxValue : (UInt16)map.SelectedLocationIndex);
             msg.Write(map.SelectedMissionIndex == -1 ? byte.MaxValue : (byte)map.SelectedMissionIndex);
+            msg.Write(PurchasedHullRepairs);
+            msg.Write(PurchasedItemRepairs);
 
             msg.Write((UInt16)CargoManager.PurchasedItems.Count);
             foreach (PurchasedItem pi in CargoManager.PurchasedItems)

Barotrauma/BarotraumaClient/Source/GameSettings.cs

@@ -81,7 +81,8 @@ namespace Barotrauma
             var leftPanel = new GUILayoutGroup(new RectTransform(new Vector2(0.25f, 1.0f), settingsFramePadding.RectTransform, Anchor.TopLeft));
 
             new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), leftPanel.RectTransform),
-                TextManager.Get("Settings"), textAlignment: Alignment.TopLeft, font: GUI.LargeFont);
+                TextManager.Get("Settings"), textAlignment: Alignment.TopLeft, font: GUI.LargeFont)
+            { ForceUpperCase = true };
 
             var generalLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 1.0f), leftPanel.RectTransform, Anchor.TopLeft));
 
@@ -438,6 +439,17 @@ namespace Barotrauma
                 DebugConsole.NewMessage(name + " " + name.Length.ToString(), Color.Lime);
             }
 
+            GUITickBox directionalVoiceChat = new GUITickBox(new RectTransform(new Point(32, 32), audioSliders.RectTransform), TextManager.Get("DirectionalVoiceChat"));
+            directionalVoiceChat.Selected = UseDirectionalVoiceChat;
+            directionalVoiceChat.ToolTip = TextManager.Get("DirectionalVoiceChatToolTip");
+            directionalVoiceChat.OnSelected = (tickBox) =>
+            {
+                UseDirectionalVoiceChat = tickBox.Selected;
+                UnsavedSettings = true;
+                return true;
+            };
+
+
             if (string.IsNullOrWhiteSpace(VoiceCaptureDevice)) VoiceCaptureDevice = deviceNames[0];
 #if (!OSX)
             var deviceList = new GUIDropDown(new RectTransform(new Vector2(1.0f, 0.05f), audioSliders.RectTransform), VoiceCaptureDevice, deviceNames.Count);

Barotrauma/BarotraumaClient/Source/Items/CharacterInventory.cs

@@ -19,7 +19,7 @@ namespace Barotrauma
             Right,
             Center
         }
-
+        
         private enum QuickUseAction
         {
             None,
@@ -34,6 +34,8 @@ namespace Barotrauma
         }
 
         private static Dictionary<InvSlotType, Sprite> limbSlotIcons;
+        
+        const InvSlotType PersonalSlots = InvSlotType.Card | InvSlotType.Headset | InvSlotType.InnerClothes | InvSlotType.OuterClothes | InvSlotType.Head;
 
         private Point screenResolution;
 
@@ -51,11 +53,42 @@ namespace Barotrauma
             }
         }
         public bool Hidden { get; set; }
+        
+        private bool hidePersonalSlots;
+        private float hidePersonalSlotsState;
+        private GUIButton hideButton;
+        private Rectangle personalSlotArea;
 
+        public bool HidePersonalSlots
+        {
+            get { return hidePersonalSlots; }
+        }
+
+        public Rectangle PersonalSlotArea
+        {
+            get { return personalSlotArea; }
+        }
+        
         partial void InitProjSpecific(XElement element)
         {
             Hidden = true;
 
+            hideButton = new GUIButton(new RectTransform(new Point((int)(30 * GUI.Scale), (int)(60 * GUI.Scale)), GUI.Canvas)
+            { AbsoluteOffset = HUDLayoutSettings.CrewArea.Location },
+                "", style: "UIToggleButton");
+            hideButton.Children.ForEach(c => c.SpriteEffects = SpriteEffects.FlipHorizontally);
+            hideButton.OnClicked += (GUIButton btn, object userdata) =>
+            {
+                hidePersonalSlots = !hidePersonalSlots;
+                foreach (GUIComponent child in btn.Children)
+                {
+                    child.SpriteEffects = hidePersonalSlots ? SpriteEffects.None : SpriteEffects.FlipHorizontally;
+                }
+                return true;
+            };
+
+            hidePersonalSlots = false;
+
             if (limbSlotIcons == null)
             {
                 limbSlotIcons = new Dictionary<InvSlotType, Sprite>();
@@ -68,12 +101,11 @@ namespace Barotrauma
                 limbSlotIcons.Add(InvSlotType.LeftHand, new Sprite("Content/UI/IconAtlas.png", new Rectangle(640 + margin, 383 + margin, 128 - margin * 2, 128 - margin * 2)));
                 limbSlotIcons.Add(InvSlotType.RightHand, new Sprite("Content/UI/IconAtlas.png", new Rectangle(768 + margin, 383 + margin, 128 - margin * 2, 128 - margin * 2)));
             }
-
             SlotPositions = new Vector2[SlotTypes.Length];
             CurrentLayout = Layout.Default;
             SetSlotPositions(layout);
         }
-        
+
         protected override void PutItem(Item item, int i, Character user, bool removeItem = true, bool createNetworkEvent = true)
         {
             base.PutItem(item, i, user, removeItem, createNetworkEvent);
@@ -159,6 +191,11 @@ namespace Barotrauma
         {
             if (slots[i].Disabled || (hideEmptySlot[i] && Items[i] == null)) return true;
 
+            if (layout == Layout.Default)
+            {
+                if (PersonalSlots.HasFlag(SlotTypes[i]) && !personalSlotArea.Contains(slots[i].Rect.Center + slots[i].DrawOffset.ToPoint())) return true;
+            }
+
             //no need to draw the right hand slot if the item is in both hands
             if (Items[i] != null && SlotTypes[i] == InvSlotType.RightHand && IsInLimbSlot(Items[i], InvSlotType.LeftHand))
             {
@@ -176,7 +213,6 @@ namespace Barotrauma
 
             return false;
         }
-
         private void SetSlotPositions(Layout layout)
         {
             int spacing = (int)(10 * UIScale);
@@ -185,27 +221,32 @@ namespace Barotrauma
 
             if (slots == null) CreateSlots();
 
-            var upperSlots = InvSlotType.Card | InvSlotType.Headset | InvSlotType.InnerClothes | InvSlotType.Head;
+            hideButton.Visible = false;
 
             switch (layout)
             {
                 case Layout.Default:
                     {
-                        int personalSlotCount = SlotTypes.Count(s => upperSlots.HasFlag(s));
-                        int normalSlotCount = SlotTypes.Count(s => !upperSlots.HasFlag(s));
+                        int personalSlotCount = SlotTypes.Count(s => PersonalSlots.HasFlag(s));
+                        int normalSlotCount = SlotTypes.Count(s => !PersonalSlots.HasFlag(s));
 
                         int x = GameMain.GraphicsWidth / 2 - normalSlotCount * (slotSize.X + spacing) / 2;
-                        int upperX = HUDLayoutSettings.PortraitArea.X - slotSize.X;
+                        int upperX = HUDLayoutSettings.PortraitArea.X - slotSize.X * 2;
 
                         //make sure the rightmost normal slot doesn't overlap with the personal slots
                         x -= Math.Max((x + normalSlotCount * (slotSize.X + spacing)) - (upperX - personalSlotCount * (slotSize.X + spacing)), 0);
 
+                        int hideButtonSlotIndex = -1;
                         for (int i = 0; i < SlotPositions.Length; i++)
                         {
-                            if (upperSlots.HasFlag(SlotTypes[i]))
+                            if (PersonalSlots.HasFlag(SlotTypes[i]))
                             {
                                 SlotPositions[i] = new Vector2(upperX, GameMain.GraphicsHeight - bottomOffset);
                                 upperX -= slotSize.X + spacing;
+                                personalSlotArea = (hideButtonSlotIndex == -1) ? 
+                                    new Rectangle(SlotPositions[i].ToPoint(), slotSize) :
+                                    Rectangle.Union(personalSlotArea, new Rectangle(SlotPositions[i].ToPoint(), slotSize));
+                                hideButtonSlotIndex = i;
                             }
                             else
                             {
@@ -213,19 +254,29 @@ namespace Barotrauma
                                 x += slotSize.X + spacing;
                             }
                         }
+
+                        if (hideButtonSlotIndex > -1)
+                        {
+                            hideButton.RectTransform.SetPosition(Anchor.TopLeft, Pivot.TopLeft);
+                            hideButton.RectTransform.NonScaledSize = new Point(slotSize.X / 2, slotSize.Y + slots[hideButtonSlotIndex].EquipButtonRect.Height);
+                            hideButton.RectTransform.AbsoluteOffset = new Point(
+                                personalSlotArea.Right + spacing, 
+                                personalSlotArea.Y - slots[hideButtonSlotIndex].EquipButtonRect.Height);
+                            hideButton.Visible = true;
+                        }
                     }
                     break;
                 case Layout.Right:
                     {
                         int extraOffset = 0;
                         int x = HUDLayoutSettings.InventoryAreaLower.Right;
-                        int upperX = HUDLayoutSettings.InventoryAreaLower.Right;
+                        int personalSlotX = HUDLayoutSettings.InventoryAreaLower.Right - slotSize.X - spacing;
                         for (int i = 0; i < slots.Length; i++)
                         {
                             if (HideSlot(i)) continue;
-                            if (upperSlots.HasFlag(SlotTypes[i]))
+                            if (PersonalSlots.HasFlag(SlotTypes[i]))
                             {
-                                upperX -= slotSize.X + spacing;
+                                //upperX -= slotSize.X + spacing;
                             }
                             else
                             {
@@ -237,10 +288,10 @@ namespace Barotrauma
                         for (int i = 0; i < SlotPositions.Length; i++)
                         {
                             if (HideSlot(i)) continue;
-                            if (upperSlots.HasFlag(SlotTypes[i]))
+                            if (PersonalSlots.HasFlag(SlotTypes[i]))
                             {
-                                SlotPositions[i] = new Vector2(upperX, GameMain.GraphicsHeight - bottomOffset * 2 - extraOffset - spacing * 2);
-                                upperX += slots[i].Rect.Width + spacing;
+                                SlotPositions[i] = new Vector2(personalSlotX, GameMain.GraphicsHeight - bottomOffset * 2 - extraOffset - spacing * 2);
+                                personalSlotX -= slots[i].Rect.Width + spacing;
                             }
                             else
                             {
@@ -261,14 +312,14 @@ namespace Barotrauma
                 case Layout.Left:
                     {
                         int x = HUDLayoutSettings.InventoryAreaLower.X;
-                        int upperX = x;
+                        int personalSlotX = x;
                         for (int i = 0; i < SlotPositions.Length; i++)
                         {
                             if (HideSlot(i)) continue;
-                            if (upperSlots.HasFlag(SlotTypes[i]))
+                            if (PersonalSlots.HasFlag(SlotTypes[i]))
                             {
-                                SlotPositions[i] = new Vector2(upperX, GameMain.GraphicsHeight - bottomOffset * 2 - spacing * 2);
-                                upperX += slots[i].Rect.Width + spacing;
+                                SlotPositions[i] = new Vector2(personalSlotX, GameMain.GraphicsHeight - bottomOffset * 2 - spacing * 2);
+                                personalSlotX += slots[i].Rect.Width + spacing;
                             }
                             else
                             {
@@ -354,6 +405,27 @@ namespace Barotrauma
                 ((selectedSlot != null && selectedSlot.IsSubSlot) || (draggingItem != null && (draggingSlot == null || !draggingSlot.MouseOn())));
             if (CharacterHealth.OpenHealthWindow != null) hoverOnInventory = true;
             
+            if (layout == Layout.Default && hideButton.Visible)
+            {
+                hideButton.AddToGUIUpdateList();
+                hideButton.UpdateManually(deltaTime, alsoChildren: true);
+
+                hidePersonalSlotsState = hidePersonalSlots ? 
+                    Math.Min(hidePersonalSlotsState + deltaTime * 5.0f, 1.0f) : 
+                    Math.Max(hidePersonalSlotsState -  deltaTime * 5.0f, 0.0f);
+                
+                for (int i = 0; i < slots.Length; i++)
+                {
+                    if (!PersonalSlots.HasFlag(SlotTypes[i])) { continue; }
+                    if (HidePersonalSlots)
+                    {
+                        if (selectedSlot?.Slot == slots[i]) { selectedSlot = null; }
+                        highlightedSubInventorySlots.RemoveWhere(s => s.Slot == slots[i]);
+                    }
+                    slots[i].DrawOffset = Vector2.Lerp(Vector2.Zero, new Vector2(personalSlotArea.Width, 0.0f), hidePersonalSlotsState);
+                }
+            }
+            
             if (hoverOnInventory) HideTimer = 0.5f;
             if (HideTimer > 0.0f) HideTimer -= deltaTime;
 
@@ -366,6 +438,32 @@ namespace Barotrauma
                     QuickUseItem(Items[i], true, false, true);
                 }
             }
+        }
+
+            //force personal slots open if an item is running out of battery/fuel/oxygen/etc
+            if (hidePersonalSlots)
+            {
+                for (int i = 0; i < slots.Length; i++)
+                {
+                    if (Items[i]?.OwnInventory != null && Items[i].OwnInventory.Capacity == 1 && PersonalSlots.HasFlag(SlotTypes[i]))
+                    {
+                        if (Items[i].OwnInventory.Items[0].Condition > 0.0f &&
+                            Items[i].OwnInventory.Items[0].Condition / Items[i].OwnInventory.Items[0].MaxCondition < 0.15f)
+                        {
+                            hidePersonalSlots = false;
+                        }
+                    }
+                }
+            }
+
+            List<SlotReference> hideSubInventories = new List<SlotReference>();
+            foreach (var highlightedSubInventorySlot in highlightedSubInventorySlots)
+            {
+                if (highlightedSubInventorySlot.ParentInventory == this)
+                {
+                    UpdateSubInventory(deltaTime, highlightedSubInventorySlot.SlotIndex, cam);
+                }
+            }
             
             List<SlotReference> hideSubInventories = new List<SlotReference>();
             foreach (var highlightedSubInventorySlot in highlightedSubInventorySlots)
@@ -704,7 +802,12 @@ namespace Barotrauma
             }
 
             base.Draw(spriteBatch);
-
+            
+            if (hideButton != null && hideButton.Visible)
+            {
+                hideButton.DrawManually(spriteBatch, alsoChildren: true);
+            }
+            
             InventorySlot highlightedQuickUseSlot = null;
             for (int i = 0; i < capacity; i++)
             {
@@ -718,7 +821,7 @@ namespace Barotrauma
                     if (limbSlotIcons.ContainsKey(SlotTypes[i]))
                     {
                         var icon = limbSlotIcons[SlotTypes[i]];
-                        icon.Draw(spriteBatch, slots[i].Rect.Center.ToVector2(), Color.White * 0.3f, origin: icon.size / 2, scale: slots[i].Rect.Width / icon.size.X);
+                        icon.Draw(spriteBatch, slots[i].Rect.Center.ToVector2() + slots[i].DrawOffset, Color.White * 0.3f, origin: icon.size / 2, scale: slots[i].Rect.Width / icon.size.X);
                     }
                     continue;
                 }
@@ -728,12 +831,12 @@ namespace Barotrauma
                 if (IsInLimbSlot(Items[i], InvSlotType.LeftHand))
                 {
                     var icon = limbSlotIcons[InvSlotType.LeftHand];
-                    icon.Draw(spriteBatch, new Vector2(slots[i].Rect.X, slots[i].Rect.Bottom), Color.White * 0.6f, origin: new Vector2(icon.size.X * 0.35f, icon.size.Y * 0.75f), scale: slots[i].Rect.Width / icon.size.X * 0.7f);
+                    icon.Draw(spriteBatch, new Vector2(slots[i].Rect.X, slots[i].Rect.Bottom) + slots[i].DrawOffset, Color.White * 0.6f, origin: new Vector2(icon.size.X * 0.35f, icon.size.Y * 0.75f), scale: slots[i].Rect.Width / icon.size.X * 0.7f);
                 }
                 if (IsInLimbSlot(Items[i], InvSlotType.RightHand))
                 {
                     var icon = limbSlotIcons[InvSlotType.RightHand];
-                    icon.Draw(spriteBatch, new Vector2(slots[i].Rect.Right, slots[i].Rect.Bottom), Color.White * 0.6f, origin: new Vector2(icon.size.X * 0.65f, icon.size.Y * 0.75f), scale: slots[i].Rect.Width / icon.size.X * 0.7f);
+                    icon.Draw(spriteBatch, new Vector2(slots[i].Rect.Right, slots[i].Rect.Bottom) + slots[i].DrawOffset, Color.White * 0.6f, origin: new Vector2(icon.size.X * 0.65f, icon.size.Y * 0.75f), scale: slots[i].Rect.Width / icon.size.X * 0.7f);
                 }
 
                 Color color = slots[i].EquipButtonState == GUIComponent.ComponentState.Pressed ? Color.Gray : Color.White * 0.8f;

Barotrauma/BarotraumaClient/Source/Items/Components/ItemComponent.cs

@@ -377,9 +377,13 @@ namespace Barotrauma.Items.Components
 
         public virtual void UpdateHUD(Character character, float deltaTime, Camera cam) { }
 
-        public ItemComponent GetLinkUIToComponent()
+        public virtual void CreateEditingHUD(SerializableEntityEditor editor)
         {
-            if (string.IsNullOrEmpty(LinkUIToComponent))
+        }
+
+        private bool LoadElemProjSpecific(XElement subElement)
+        {
+            switch (subElement.Name.ToString().ToLowerInvariant())
             {
                 case "guiframe":
                     if (subElement.Attribute("rect") != null)

Barotrauma/BarotraumaClient/Source/Items/Components/ItemLabel.cs

@@ -28,7 +28,7 @@ namespace Barotrauma.Items.Components
         }
 
         private string text;
-        [Serialize("", true), Editable(100)]
+        [Serialize("", true, translationTextTag: "Label."), Editable(100)]
         public string Text
         {
             get { return text; }
@@ -40,9 +40,10 @@ namespace Barotrauma.Items.Components
                 {
                     textBlock = null;
                 }
-
+                
                 text = value;
-                TextBlock.Text = value;
+                DisplayText = TextManager.Get(text, returnNull: true) ?? value;
+                TextBlock.Text = DisplayText;
                 SetScrollingText();
             }
         }
@@ -121,7 +122,7 @@ namespace Barotrauma.Items.Components
         {
             if (!scrollable) return;
 
-            float totalWidth = textBlock.Font.MeasureString(text).X;
+            float totalWidth = textBlock.Font.MeasureString(DisplayText).X;
             float textAreaWidth = Math.Max(textBlock.Rect.Width - textBlock.Padding.X - textBlock.Padding.Z, 0);
             if (totalWidth >= textAreaWidth)
             {
@@ -129,13 +130,13 @@ namespace Barotrauma.Items.Components
                 //(so the text can scroll entirely out of view before we reset it back to start)
                 needsScrolling = true;
                 float spaceWidth = textBlock.Font.MeasureChar(' ').X;
-                scrollingText = new string(' ', (int)Math.Ceiling(textAreaWidth / spaceWidth)) + text;
+                scrollingText = new string(' ', (int)Math.Ceiling(textAreaWidth / spaceWidth)) + DisplayText;
             }
             else
             {
                 //whole text can fit in the textblock, no need to scroll
                 needsScrolling = false;
-                scrollingText = text;
+                scrollingText = DisplayText;
                 scrollAmount = 0.0f;
                 scrollIndex = 0;
                 return;
@@ -151,7 +152,7 @@ namespace Barotrauma.Items.Components
                 charWidths[i] = charWidth;
             }
 
-            scrollIndex = MathHelper.Clamp(scrollIndex, 0, text.Length);
+            scrollIndex = MathHelper.Clamp(scrollIndex, 0, DisplayText.Length);
         }
 
         public override void Update(float deltaTime, Camera cam)

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/MiniMap.cs

@@ -221,7 +221,7 @@ namespace Barotrauma.Items.Components
                 {                    
                     hullInfoFrame.RectTransform.ScreenSpaceOffset = hullFrame.Rect.Center;
                     hullInfoFrame.Visible = true;
-                    hullNameText.Text = hull.RoomName;
+                    hullNameText.Text = hull.DisplayName;
 
                     foreach (Hull linkedHull in hullData.LinkedHulls)
                     {

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Sonar.cs

@@ -785,15 +785,32 @@ namespace Barotrauma.Items.Components
 
             foreach (Character c in Character.CharacterList)
             {
-                if (c.AnimController.CurrentHull != null || !c.Enabled) continue;
-                if (DetectSubmarineWalls && c.AnimController.CurrentHull == null && item.CurrentHull != null) continue;
+                if (c.AnimController.CurrentHull != null || !c.Enabled) { continue; }
+                if (DetectSubmarineWalls && c.AnimController.CurrentHull == null && item.CurrentHull != null) { continue; }
+
+                if (c.AnimController.SimplePhysicsEnabled)
+                {
+                    float pointDist = ((c.WorldPosition - pingSource) * displayScale).LengthSquared();
+                    if (pointDist > DisplayRadius * DisplayRadius) { continue; }
+
+                    if (pointDist > prevPingRadiusSqr && pointDist < pingRadiusSqr)
+                    {
+                        var blip = new SonarBlip(
+                            c.WorldPosition,
+                            MathHelper.Clamp(c.Mass, 0.1f, pingStrength),
+                            MathHelper.Clamp(c.Mass * 0.03f, 0.1f, 2.0f));
+                        if (!passive && !CheckBlipVisibility(blip, transducerPos)) { continue; }
+                        sonarBlips.Add(blip);
+                    }
+                    continue;
+                }
 
                 foreach (Limb limb in c.AnimController.Limbs)
                 {
                     if (!limb.body.Enabled) { continue; }
 
                     float pointDist = ((limb.WorldPosition - pingSource) * displayScale).LengthSquared();
-                    if (limb.SimPosition == Vector2.Zero || pointDist > DisplayRadius * DisplayRadius) continue;
+                    if (limb.SimPosition == Vector2.Zero || pointDist > DisplayRadius * DisplayRadius) { continue; }
 
                     if (pointDist > prevPingRadiusSqr && pointDist < pingRadiusSqr)
                     {
@@ -801,13 +818,13 @@ namespace Barotrauma.Items.Components
                             limb.WorldPosition + Rand.Vector(limb.Mass / 10.0f), 
                             MathHelper.Clamp(limb.Mass, 0.1f, pingStrength), 
                             MathHelper.Clamp(limb.Mass * 0.1f, 0.1f, 2.0f));
-                        if (!passive && !CheckBlipVisibility(blip, transducerPos)) continue;
+                        if (!passive && !CheckBlipVisibility(blip, transducerPos)) { continue; }
                         sonarBlips.Add(blip);
                     }
                 }
             }
         }
-
+        
         private void CreateBlipsForLine(Vector2 point1, Vector2 point2, Vector2 pingSource, Vector2 transducerPos, float pingRadius, float prevPingRadius,
             float lineStep, float zStep, float range, float pingStrength, bool passive)
         {

Barotrauma/BarotraumaClient/Source/Items/Components/Signal/CustomInterface.cs

@@ -3,6 +3,7 @@ using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Xml.Linq;
 
@@ -16,16 +17,22 @@ namespace Barotrauma.Items.Components
         {
             uiElements.Clear();
 
+            var visibleElements = customInterfaceElementList.Where(ciElement => !string.IsNullOrEmpty(ciElement.Label));
+
             GUILayoutGroup paddedFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.8f), GuiFrame.RectTransform, Anchor.Center),
                 childAnchor: customInterfaceElementList.Count > 1 ? Anchor.TopCenter : Anchor.Center)
-                { RelativeSpacing = 0.05f };
+            {
+                RelativeSpacing = 0.05f,
+                Stretch = visibleElements.Count() > 2
+            };
 
-            float elementSize = Math.Min(1.0f / customInterfaceElementList.Count, 0.5f);
-            foreach (CustomInterfaceElement ciElement in customInterfaceElementList)
+            float elementSize = Math.Min(1.0f / visibleElements.Count(), 0.5f);
+            foreach (CustomInterfaceElement ciElement in visibleElements)
             {
                 if (ciElement.ContinuousSignal)
                 {
-                    var tickBox = new GUITickBox(new RectTransform(new Vector2(1.0f, elementSize), paddedFrame.RectTransform), ciElement.Label)
+                    var tickBox = new GUITickBox(new RectTransform(new Vector2(1.0f, elementSize), paddedFrame.RectTransform),
+                        TextManager.Get(ciElement.Label, returnNull: true) ?? ciElement.Label)
                     {
                         UserData = ciElement
                     };
@@ -45,7 +52,8 @@ namespace Barotrauma.Items.Components
                 }
                 else
                 {
-                    var btn = new GUIButton(new RectTransform(new Vector2(1.0f, elementSize), paddedFrame.RectTransform), ciElement.Label, style: "GUIButtonLarge")
+                    var btn = new GUIButton(new RectTransform(new Vector2(1.0f, elementSize), paddedFrame.RectTransform), 
+                        TextManager.Get(ciElement.Label, returnNull: true) ?? ciElement.Label, style: "GUIButtonLarge")
                     {
                         UserData = ciElement
                     };
@@ -66,6 +74,24 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public override void CreateEditingHUD(SerializableEntityEditor editor)
+        {
+            base.CreateEditingHUD(editor);
+
+            PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(customInterfaceElementList[0]);
+            PropertyDescriptor labelProperty = properties.Find("Label", false);
+            PropertyDescriptor signalProperty = properties.Find("Signal", false);
+            for (int i = 0; i< customInterfaceElementList.Count; i++)
+            {
+                editor.CreateStringField(customInterfaceElementList[i],
+                    new SerializableProperty(labelProperty, customInterfaceElementList[i]),
+                    customInterfaceElementList[i].Label, "Label #" + (i + 1), "");
+                editor.CreateStringField(customInterfaceElementList[i],
+                    new SerializableProperty(signalProperty, customInterfaceElementList[i]),
+                    customInterfaceElementList[i].Signal, "Signal #" + (i + 1), "");
+            }
+        }
+
         partial void UpdateLabelsProjSpecific()
         {
             for (int i = 0; i < labels.Length && i < uiElements.Count; i++)

Barotrauma/BarotraumaClient/Source/Items/Inventory.cs

@@ -154,8 +154,6 @@ namespace Barotrauma
 
             public SlotReference(Inventory parentInventory, InventorySlot slot, int slotIndex, bool isSubSlot, Inventory subInventory = null)
             {
-
-
                 ParentInventory = parentInventory;
                 Slot = slot;
                 SlotIndex = slotIndex;
@@ -714,12 +712,15 @@ namespace Barotrauma
                     float scale = Math.Min(Math.Min(iconSize / sprite.size.X, iconSize / sprite.size.Y), 1.5f);
                     Vector2 itemPos = PlayerInput.MousePosition;
 
-                    if (GUI.MouseOn == null && selectedSlot == null)
+                    bool mouseOnHealthInterface = CharacterHealth.OpenHealthWindow != null && CharacterHealth.OpenHealthWindow.MouseOnElement;
+
+                    if ((GUI.MouseOn == null || mouseOnHealthInterface) && selectedSlot == null)
                     {
                         var shadowSprite = GUI.Style.GetComponentStyle("OuterGlow").Sprites[GUIComponent.ComponentState.None][0];
-                        string toolTip = Character.Controlled.FocusedItem != null ?
-                            TextManager.Get("PutItemIn").Replace("[itemname]", Character.Controlled.FocusedItem.Name) :
-                            TextManager.Get("DropItem");
+                        string toolTip = mouseOnHealthInterface ? TextManager.Get("QuickUseAction.UseTreatment") :                            
+                            Character.Controlled.FocusedItem != null ?
+                                TextManager.Get("PutItemIn").Replace("[itemname]", Character.Controlled.FocusedItem.Name) :
+                                TextManager.Get("DropItem");
                         int textWidth = (int)Math.Max(GUI.Font.MeasureString(draggingItem.Name).X, GUI.SmallFont.MeasureString(toolTip).X);
                         int textSpacing = (int)(15 * GUI.Scale);
                         Point shadowBorders = (new Point(40, 10)).Multiply(GUI.Scale);
@@ -727,7 +728,7 @@ namespace Barotrauma
                             new Rectangle(itemPos.ToPoint() - new Point(iconSize / 2) - shadowBorders, new Point(iconSize + textWidth + textSpacing, iconSize) + shadowBorders.Multiply(2)), Color.Black * 0.8f);
                         GUI.DrawString(spriteBatch, new Vector2(itemPos.X + iconSize / 2 + textSpacing, itemPos.Y - iconSize / 2), draggingItem.Name, Color.White);
                         GUI.DrawString(spriteBatch, new Vector2(itemPos.X + iconSize / 2 + textSpacing, itemPos.Y), toolTip,
-                            color: Character.Controlled.FocusedItem == null ? Color.Red : Color.LightGreen,
+                            color: Character.Controlled.FocusedItem == null && !mouseOnHealthInterface ? Color.Red : Color.LightGreen,
                             font: GUI.SmallFont);
                     }
                     sprite.Draw(spriteBatch, itemPos + Vector2.One * 2, Color.Black, scale: scale);
@@ -853,7 +854,7 @@ namespace Barotrauma
                         if (itemContainer.ContainedStateIndicator?.Texture == null)
                         {
                             containedIndicatorArea.Inflate(0, -2);
-                            GUI.DrawRectangle(spriteBatch, containedIndicatorArea, Color.DarkGray * 0.8f, true);
+                            GUI.DrawRectangle(spriteBatch, containedIndicatorArea, Color.DarkGray * 0.9f, true);
                             GUI.DrawRectangle(spriteBatch,
                                 new Rectangle(containedIndicatorArea.X, containedIndicatorArea.Y, (int)(containedIndicatorArea.Width * containedState), containedIndicatorArea.Height),
                                 Color.Lerp(Color.Red, Color.Green, containedState) * 0.8f, true);
@@ -867,11 +868,11 @@ namespace Barotrauma
 
                             if (containedState > 0.0f && containedState < 0.25f)
                             {
-                                indicatorScale += ((float)Math.Sin(Timing.TotalTime * 5.0f) + 1.0f) * 0.1f;
+                                indicatorScale += ((float)Math.Sin(Timing.TotalTime * 5.0f) + 1.0f) * 0.25f;
                             }
 
                             indicatorSprite.Draw(spriteBatch, containedIndicatorArea.Center.ToVector2(),
-                                Color.DarkGray * 0.6f, 
+                                Color.DarkGray * 0.9f, 
                                 origin: indicatorSprite.size / 2,
                                 rotate: 0.0f,
                                 scale: indicatorScale);

Barotrauma/BarotraumaClient/Source/Items/Item.cs

@@ -41,8 +41,6 @@ namespace Barotrauma
         {
             get { return activeSprite; }
         }
-              
-        public float SpriteRotation;
 
         private GUITextBlock itemInUseWarning;
         private GUITextBlock ItemInUseWarning
@@ -103,9 +101,22 @@ namespace Barotrauma
             return color;
         }
 
-        partial void SetActiveSprite()
+        partial void SetActiveSpriteProjSpecific()
         {
             activeSprite = prefab.sprite;
+            Holdable holdable = GetComponent<Holdable>();
+            if (holdable != null && holdable.Attached)
+            {
+                foreach (ContainedItemSprite containedSprite in Prefab.ContainedSprites)
+                {
+                    if (containedSprite.UseWhenAttached)
+                    {
+                        activeSprite = containedSprite.Sprite;
+                        return;
+                    }
+                }
+            }
+
             if (Container != null)
             {
                 foreach (ContainedItemSprite containedSprite in Prefab.ContainedSprites)
@@ -175,8 +186,7 @@ namespace Barotrauma
             
             Color color = isHighlighted && !GUI.DisableItemHighlights && Screen.Selected != GameMain.GameScreen ? Color.Orange : GetSpriteColor();
             //if (IsSelected && editing) color = Color.Lerp(color, Color.Gold, 0.5f);
-
-            Sprite activeSprite = prefab.sprite;
+            
             BrokenItemSprite fadeInBrokenSprite = null;
             float fadeInBrokenSpriteAlpha = 0.0f;
             if (condition < Prefab.Health)
@@ -567,8 +577,13 @@ namespace Barotrauma
                 }
 
                 var componentEditor = new SerializableEntityEditor(listBox.Content.RectTransform, ic, inGame, showName: !inGame);
-                
-                if (inGame) continue;
+
+                if (inGame)
+                {
+                    ic.CreateEditingHUD(componentEditor);
+                    componentEditor.Recalculate();
+                    continue;
+                }
 
                 foreach (var kvp in ic.requiredItems)
                 {
@@ -602,6 +617,10 @@ namespace Barotrauma
                     }
                 }
 
+                ic.CreateEditingHUD(componentEditor);
+                componentEditor.Recalculate();
+            }
+
             PositionEditingHUD();
             SetHUDLayout();
 
@@ -784,7 +803,7 @@ namespace Barotrauma
             {
                 if (!ic.CanBeSelected) { continue; }
 
-                bool useAlternativeLayout = ic.Item != this;
+                bool useAlternativeLayout = activeHUDs.Count > 1;
                 bool wasUsingAlternativeLayout = ic.UseAlternativeLayout;
                 ic.UseAlternativeLayout = useAlternativeLayout;
                 needsLayoutUpdate |= ic.UseAlternativeLayout != wasUsingAlternativeLayout;
@@ -818,14 +837,28 @@ namespace Barotrauma
                 case NetEntityEvent.Type.ComponentState:
                     {
                         int componentIndex = msg.ReadRangedInteger(0, components.Count - 1);
-                        (components[componentIndex] as IServerSerializable).ClientRead(type, msg, sendingTime);
+                        if (components[componentIndex] is IServerSerializable serverSerializable)
+                        {
+                            serverSerializable.ClientRead(type, msg, sendingTime);
+                        }
+                        else
+                        {
+                            throw new Exception("Failed to read component state - " + components[componentIndex].GetType() + " is not IServerSerializable.");
+                        }
                     }
                     break;
-                    
+
                 case NetEntityEvent.Type.InventoryState:
-                    { 
+                    {
                         int containerIndex = msg.ReadRangedInteger(0, components.Count - 1);
-                        (components[containerIndex] as ItemContainer).Inventory.ClientRead(type, msg, sendingTime);
+                        if (components[containerIndex] is ItemContainer container)
+                        {
+                            container.Inventory.ClientRead(type, msg, sendingTime);
+                        }
+                        else
+                        {
+                            throw new Exception("Failed to read inventory state - " + components[containerIndex].GetType() + " is not an ItemContainer.");
+                        }
                     }
                     break;
                 case NetEntityEvent.Type.Status:

Barotrauma/BarotraumaClient/Source/Items/ItemPrefab.cs

@@ -25,12 +25,14 @@ namespace Barotrauma
     class ContainedItemSprite
     {
         public readonly Sprite Sprite;
+        public readonly bool UseWhenAttached;
         public readonly string[] AllowedContainerIdentifiers;
         public readonly string[] AllowedContainerTags;
 
         public ContainedItemSprite(XElement element, string path = "", bool lazyLoad = false)
         {
             Sprite = new Sprite(element, path, lazyLoad: lazyLoad);
+            UseWhenAttached = element.GetAttributeBool("usewhenattached", false);
             AllowedContainerIdentifiers = element.GetAttributeStringArray("allowedcontaineridentifiers", new string[0], convertToLowerInvariant: true);
             AllowedContainerTags = element.GetAttributeStringArray("allowedcontainertags", new string[0], convertToLowerInvariant: true);
         }

Barotrauma/BarotraumaClient/Source/Map/Levels/LevelRenderer.cs

@@ -217,7 +217,7 @@ namespace Barotrauma
 
             spriteBatch.Begin(SpriteSortMode.Deferred,
                 BlendState.AlphaBlend,
-                SamplerState.LinearClamp, DepthStencilState.Default, null, null,
+                SamplerState.LinearClamp, DepthStencilState.DepthRead, null, null,
                 cam.Transform);
             if (backgroundSpriteManager != null) backgroundSpriteManager.DrawObjects(spriteBatch, cam, drawFront: true);
             spriteBatch.End();

Barotrauma/BarotraumaClient/Source/Map/Lights/LightManager.cs

@@ -291,11 +291,6 @@ namespace Barotrauma.Lights
                 spriteBatch.Draw(HighlightMap, Vector2.Zero, Color.White);
                 spriteBatch.End();
             }
-            GameMain.ParticleManager.Draw(spriteBatch, true, null, Particles.ParticleBlendState.Additive);
-            spriteBatch.End();
-
-            //draw a black rectangle on hulls to hide background lights behind subs
-            //---------------------------------------------------------------------------------------------------
 
             //draw characters to obstruct the highlighted items/characters and light sprites
             //---------------------------------------------------------------------------------------------------
@@ -500,6 +495,8 @@ namespace Barotrauma.Lights
                 spriteBatch.Draw(backgroundObstructor, new Rectangle(0, 0,
                     (int)(GameMain.GraphicsWidth * currLightMapScale), (int)(GameMain.GraphicsHeight * currLightMapScale)), Color.White);
             }
+            spriteBatch.End();
+            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, effect: SolidColorEffect, transformMatrix: spriteBatchTransform);
             foreach (Character c in Character.CharacterList)
             {
                 if (c.Enabled) { c.Draw(spriteBatch, cam); }

Barotrauma/BarotraumaClient/Source/Map/Structure.cs

@@ -215,23 +215,24 @@ namespace Barotrauma
             {
                 if (Prefab.BackgroundSprite != null)
                 {
-                    bool drawDropShadow = Submarine != null && HasBody;
                     Vector2 dropShadowOffset = Vector2.Zero;
-                    if (drawDropShadow)
+                    if (UseDropShadow)
                     {
-                        dropShadowOffset = Submarine.HiddenSubPosition - Position;
-                        if (dropShadowOffset != Vector2.Zero)
+                        dropShadowOffset = DropShadowOffset;
+                        if (dropShadowOffset == Vector2.Zero)
                         {
-                            if (IsHorizontal)
+                            if (Submarine == null)
                             {
-                                dropShadowOffset = new Vector2(0.0f, Math.Sign(dropShadowOffset.Y) * 10.0f);
+                                dropShadowOffset = Vector2.UnitY * 10.0f;
                             }
                             else
                             {
-                                dropShadowOffset = new Vector2(Math.Sign(dropShadowOffset.X) * 10.0f, 0.0f);
+                                dropShadowOffset = IsHorizontal ? 
+                                    new Vector2(0.0f, Math.Sign(Submarine.HiddenSubPosition.Y - Position.Y) * 10.0f) : 
+                                    new Vector2(Math.Sign(Submarine.HiddenSubPosition.X - Position.X) * 10.0f, 0.0f);
                             }
-                            dropShadowOffset.Y = -dropShadowOffset.Y;
                         }
+                        dropShadowOffset.Y = -dropShadowOffset.Y;
                     }
 
                     if (DrawTiled)
@@ -251,7 +252,7 @@ namespace Barotrauma
                             textureScale: TextureScale * Scale,
                             startOffset: backGroundOffset);
 
-                        if (drawDropShadow)
+                        if (UseDropShadow)
                         {
                             Prefab.BackgroundSprite.DrawTiled(
                                 spriteBatch,
@@ -276,7 +277,7 @@ namespace Barotrauma
                             rotate: 0,
                             spriteEffect: SpriteEffects);
 
-                        if (drawDropShadow)
+                        if (UseDropShadow)
                         {
                             Prefab.BackgroundSprite.Draw(
                                 spriteBatch,

Barotrauma/BarotraumaClient/Source/Networking/ChatMessage.cs

@@ -61,7 +61,7 @@ namespace Barotrauma.Networking
                 {
                     orderOption = order.Options[optionIndex];
                 }
-                txt = order.GetChatMessage(targetCharacter?.Name, senderCharacter?.CurrentHull?.RoomName, givingOrderToSelf: targetCharacter == senderCharacter, orderOption: orderOption);
+                txt = order.GetChatMessage(targetCharacter?.Name, senderCharacter?.CurrentHull?.DisplayName, givingOrderToSelf: targetCharacter == senderCharacter, orderOption: orderOption);
 
                 if (order.TargetAllCharacters)
                 {

Barotrauma/BarotraumaClient/Source/Networking/Client.cs

@@ -39,25 +39,33 @@ namespace Barotrauma.Networking
 
         public void UpdateSoundPosition()
         {
-            if (VoipSound != null)
+            if (VoipSound == null) { return; }
+            
+            if (!VoipSound.IsPlaying)
             {
-                if (!VoipSound.IsPlaying)
-                {
-                    DebugConsole.Log("Destroying voipsound");
-                    VoipSound.Dispose();
-                    VoipSound = null;
-                    return;
-                }
+                DebugConsole.Log("Destroying voipsound");
+                VoipSound.Dispose();
+                VoipSound = null;
+                return;
+            }
 
-                if (character != null)
+            if (character != null)
+            {
+                if (GameMain.Config.UseDirectionalVoiceChat)
                 {
                     VoipSound.SetPosition(new Vector3(character.WorldPosition.X, character.WorldPosition.Y, 0.0f));
                 }
                 else
                 {
                     VoipSound.SetPosition(null);
+                    float dist = Vector3.Distance(new Vector3(character.WorldPosition, 0.0f), GameMain.SoundManager.ListenerPosition);
+                    VoipSound.Gain = 1.0f - MathUtils.InverseLerp(VoipSound.Near, VoipSound.Far, dist);
                 }
             }
+            else
+            {
+                VoipSound.SetPosition(null);
+            }            
         }
 
         partial void InitProjSpecific()

Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs

@@ -1114,7 +1114,9 @@ namespace Barotrauma.Networking
 
             if (campaign == null)
             {
-                GameMain.GameSession = new GameSession(GameMain.NetLobbyScreen.SelectedSub, "", gameMode, missionIndex < 0 ? null : MissionPrefab.List[missionIndex]);
+                GameMain.GameSession = missionIndex < 0 ?
+                    new GameSession(GameMain.NetLobbyScreen.SelectedSub, "", gameMode, MissionType.None) :
+                    new GameSession(GameMain.NetLobbyScreen.SelectedSub, "", gameMode, MissionPrefab.List[missionIndex]);
                 GameMain.GameSession.StartRound(levelSeed, levelDifficulty, loadSecondSub);
             }
             else
@@ -1126,6 +1128,18 @@ namespace Barotrauma.Networking
                     mirrorLevel: campaign.Map.CurrentLocation != campaign.Map.SelectedConnection.Locations[0]);
             }
 
+            for (int i = 0; i < Submarine.MainSubs.Length; i++)
+            {
+                if (!loadSecondSub && i > 0) { break; }
+
+                var teamID = i == 0 ? Character.TeamType.Team1 : Character.TeamType.Team2;
+                Submarine.MainSubs[i].TeamID = teamID;
+                foreach (Submarine sub in Submarine.MainSubs[i].DockedTo)
+                {
+                    sub.TeamID = teamID;
+                }
+            }
+
             if (Level.Loaded.EqualityCheckVal != levelEqualityCheckVal)
             {
                 string errorMsg = "Level equality check failed. The level generated at your end doesn't match the level generated by the server (seed " + Level.Loaded.Seed + ").";
@@ -2246,7 +2260,47 @@ namespace Barotrauma.Networking
 
         public virtual void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch)
         {
-            if (!gameStarted || Screen.Selected != GameMain.GameScreen || GUI.DisableHUD || GUI.DisableUpperHUD) return;
+            if (GUI.DisableHUD || GUI.DisableUpperHUD) return;
+            
+            if (fileReceiver != null && fileReceiver.ActiveTransfers.Count > 0)
+            {
+                Vector2 downloadBarSize = new Vector2(250, 35) * GUI.Scale;
+                Vector2 pos = new Vector2(GameMain.NetLobbyScreen.InfoFrame.Rect.X, GameMain.GraphicsHeight - downloadBarSize.Y - 5);
+
+                GUI.DrawRectangle(spriteBatch, new Rectangle(
+                    (int)pos.X,
+                    (int)pos.Y,
+                    (int)(fileReceiver.ActiveTransfers.Count * (downloadBarSize.X + 10)),
+                    (int)downloadBarSize.Y),
+                    Color.Black * 0.8f, true);
+
+                for (int i = 0; i < fileReceiver.ActiveTransfers.Count; i++)
+                {
+                    var transfer = fileReceiver.ActiveTransfers[i];
+
+                    GUI.DrawString(spriteBatch,
+                        pos,
+                        ToolBox.LimitString(TextManager.Get("DownloadingFile").Replace("[filename]", transfer.FileName), GUI.SmallFont, (int)downloadBarSize.X),
+                        Color.White, null, 0, GUI.SmallFont);
+                    GUI.DrawProgressBar(spriteBatch, new Vector2(pos.X, -pos.Y - downloadBarSize.Y / 2), new Vector2(downloadBarSize.X * 0.7f, downloadBarSize.Y / 2), transfer.Progress, Color.Green);
+                    GUI.DrawString(spriteBatch, pos + new Vector2(5, downloadBarSize.Y / 2),
+                        MathUtils.GetBytesReadable((long)transfer.Received) + " / " + MathUtils.GetBytesReadable((long)transfer.FileSize),
+                        Color.White, null, 0, GUI.SmallFont);
+
+                    if (GUI.DrawButton(spriteBatch, new Rectangle(
+                            (int)(pos.X + downloadBarSize.X * 0.7f), (int)(pos.Y + downloadBarSize.Y / 2),
+                            (int)(downloadBarSize.X * 0.3f), (int)(downloadBarSize.Y / 2)), 
+                        TextManager.Get("Cancel"), new Color(0.47f, 0.13f, 0.15f, 0.08f)))
+                    {
+                        CancelFileTransfer(transfer);
+                        fileReceiver.StopTransfer(transfer);
+                    }
+
+                    pos.X += (downloadBarSize.X + 10);
+                }
+            }
+            
+            if (!gameStarted || Screen.Selected != GameMain.GameScreen) return;
 
             inGameHUD.DrawManually(spriteBatch);
 
@@ -2297,40 +2351,6 @@ namespace Barotrauma.Networking
                 }
             }
 
-            if (fileReceiver != null && fileReceiver.ActiveTransfers.Count > 0)
-            {
-                Vector2 pos = new Vector2(GameMain.NetLobbyScreen.InfoFrame.Rect.X, GameMain.GraphicsHeight - 35);
-
-                GUI.DrawRectangle(spriteBatch, new Rectangle(
-                    (int)pos.X,
-                    (int)pos.Y,
-                    fileReceiver.ActiveTransfers.Count * 210 + 10,
-                    32),
-                    Color.Black * 0.8f, true);
-
-                for (int i = 0; i < fileReceiver.ActiveTransfers.Count; i++)
-                {
-                    var transfer = fileReceiver.ActiveTransfers[i];
-
-                    GUI.DrawString(spriteBatch,
-                        pos,
-                        ToolBox.LimitString(TextManager.Get("DownloadingFile").Replace("[filename]", transfer.FileName), GUI.SmallFont, 200),
-                        Color.White, null, 0, GUI.SmallFont);
-                    GUI.DrawProgressBar(spriteBatch, new Vector2(pos.X, -pos.Y - 15), new Vector2(135, 15), transfer.Progress, Color.Green);
-                    GUI.DrawString(spriteBatch, pos + new Vector2(5, 15),
-                        MathUtils.GetBytesReadable((long)transfer.Received) + " / " + MathUtils.GetBytesReadable((long)transfer.FileSize),
-                        Color.White, null, 0, GUI.SmallFont);
-
-                    if (GUI.DrawButton(spriteBatch, new Rectangle((int)pos.X + 140, (int)pos.Y + 18, 60, 15), TextManager.Get("Cancel"), new Color(0.47f, 0.13f, 0.15f, 0.08f)))
-                    {
-                        CancelFileTransfer(transfer);
-                        fileReceiver.StopTransfer(transfer);
-                    }
-
-                    pos.X += 210;
-                }
-            }
-
             if (!ShowNetStats) return;
 
             netStats.Draw(spriteBatch, new Rectangle(300, 10, 300, 150));

Barotrauma/BarotraumaClient/Source/Networking/ServerInfo.cs

@@ -59,17 +59,32 @@ namespace Barotrauma.Networking
             return contentPackageHashes.SetEquals(myContentPackageHashes);
         }
 
-        public void CreatePreviewWindow(GUIMessageBox messageBox)
+        public void CreatePreviewWindow(GUIListBox listBox)
         {
-            var title = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), messageBox.Content.RectTransform), ServerName, textAlignment: Alignment.Center, font: GUI.LargeFont, wrap: true);
+            listBox.ClearChildren();
 
-            var serverMsg = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.2f), messageBox.Content.RectTransform));
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), serverMsg.Content.RectTransform), ServerMessage, wrap: true);
+            if (listBox == null) return;
 
-            var columnContainer = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), messageBox.Content.RectTransform), isHorizontal: true)
+            var previewContainer =  new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 1.0f), listBox.Content.RectTransform, Anchor.Center))
+            {
+                Stretch = true
+            };
+
+            var titleHolder = new GUILayoutGroup(new RectTransform(new Vector2(0.97f, 0.07f), previewContainer.RectTransform))
+            {
+                IsHorizontal = true,
+                Stretch = true
+            };
+
+            var title = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), titleHolder.RectTransform), ServerName, font: GUI.LargeFont, wrap: true);
+
+            new GUITextBlock(new RectTransform(Vector2.One, title.RectTransform), 
+                TextManager.Get("ServerListVersion") + ": " + (string.IsNullOrEmpty(GameVersion) ? TextManager.Get("Unknown") : GameVersion), textAlignment: Alignment.Right);
+
+            var columnContainer = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), previewContainer.RectTransform), isHorizontal: true)
             {
                 Stretch = true,
-                RelativeSpacing = 0.05f
+                RelativeSpacing = 0.005f
             };
 
             var columnLeft = new GUILayoutGroup(new RectTransform(new Vector2(0.5f, 1.0f), columnContainer.RectTransform))
@@ -88,12 +103,72 @@ namespace Barotrauma.Networking
             // left column -----------------------------------------------------------------------------
 
             //new GUITextBlock(new RectTransform(new Vector2(1.0f, elementHeight), columnLeft.RectTransform), IP + ":" + Port);
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, elementHeight), columnLeft.RectTransform),
-                TextManager.Get("ServerListVersion") + ": " + (string.IsNullOrEmpty(GameVersion) ? TextManager.Get("Unknown") : GameVersion));
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), columnLeft.RectTransform),
+
+            var serverMsg = new GUIListBox(new RectTransform(new Vector2(1.0f, 1.0f), columnLeft.RectTransform)) { ScrollBarVisible = true };
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), serverMsg.Content.RectTransform), ServerMessage, wrap: true) { CanBeFocused = false };
+
+            // right column -----------------------------------------------------------------------------
+
+            /*var playerCount = new GUITextBlock(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListPlayers"));
+            new GUITextBlock(new RectTransform(Vector2.One, playerCount.RectTransform), PlayerCount + "/" + MaxPlayers, textAlignment: Alignment.Right);
+
+
+            new GUITickBox(new RectTransform(new Vector2(1, elementHeight), columnRight.RectTransform), "Round running")
+            {
+                Selected = GameStarted,
+                CanBeFocused = false
+            };*/
+
+            var gameMode = new GUITextBlock(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("GameMode"));
+            new GUITextBlock(new RectTransform(Vector2.One, gameMode.RectTransform), TextManager.Get(string.IsNullOrEmpty(GameMode) ? "Unknown" : GameMode), textAlignment: Alignment.Right);
+
+           var traitors = new GUITextBlock(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("Traitors"));
+            new GUITextBlock(new RectTransform(Vector2.One, traitors.RectTransform), TextManager.Get(!TraitorsEnabled.HasValue ? "Unknown" : TraitorsEnabled.Value.ToString()), textAlignment: Alignment.Right);
+
+
+            var subSelection = new GUITextBlock(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListSubSelection"));
+            new GUITextBlock(new RectTransform(Vector2.One, subSelection.RectTransform), TextManager.Get(!SubSelectionMode.HasValue ? "Unknown" : SubSelectionMode.Value.ToString()), textAlignment: Alignment.Right);
+
+            var modeSelection = new GUITextBlock(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListModeSelection"));
+            new GUITextBlock(new RectTransform(Vector2.One, modeSelection.RectTransform), TextManager.Get(!ModeSelectionMode.HasValue ? "Unknown" : ModeSelectionMode.Value.ToString()), textAlignment: Alignment.Right);
+
+            var allowSpectating = new GUITickBox(new RectTransform(new Vector2(1, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListAllowSpectating"))
+            {
+                CanBeFocused = false
+            };
+            if (!AllowSpectating.HasValue)
+                new GUITextBlock(new RectTransform(new Vector2(0.8f, 0.8f), allowSpectating.Box.RectTransform, Anchor.Center), "?", textAlignment: Alignment.Center);
+            else
+                allowSpectating.Selected = AllowSpectating.Value;
+
+            var allowRespawn = new GUITickBox(new RectTransform(new Vector2(1, elementHeight), columnRight.RectTransform), TextManager.Get("ServerSettingsAllowRespawning"))
+            {
+                CanBeFocused = false
+            };
+            if (!AllowRespawn.HasValue)
+                new GUITextBlock(new RectTransform(new Vector2(0.8f, 0.8f), allowRespawn.Box.RectTransform, Anchor.Center), "?", textAlignment: Alignment.Center);
+            else
+                allowRespawn.Selected = AllowRespawn.Value;
+
+            /*new GUITickBox(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListHasPassword"))
+            {
+                Selected = HasPassword,
+                CanBeFocused = false
+            };*/
+
+            var usingWhiteList = new GUITickBox(new RectTransform(new Vector2(1, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListUsingWhitelist"))
+            {
+                CanBeFocused = false
+            };
+            if (!UsingWhiteList.HasValue)
+                new GUITextBlock(new RectTransform(new Vector2(0.8f, 0.8f), usingWhiteList.Box.RectTransform, Anchor.Center), "?", textAlignment: Alignment.Center);
+            else
+                usingWhiteList.Selected = UsingWhiteList.Value;
+
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), columnRight.RectTransform),
                 TextManager.Get("ServerListContentPackages"));
 
-            var contentPackageList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.7f), columnLeft.RectTransform));
+            var contentPackageList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.3f), columnRight.RectTransform));
             if (ContentPackageNames.Count == 0)
             {
                 new GUITextBlock(new RectTransform(Vector2.One, contentPackageList.Content.RectTransform), TextManager.Get("Unknown"), textAlignment: Alignment.Center)
@@ -143,7 +218,7 @@ namespace Barotrauma.Networking
                         }
                     }
                 }
-                if (availableWorkshopUrls.Count > 0 )
+                if (availableWorkshopUrls.Count > 0)
                 {
                     var workshopBtn = new GUIButton(new RectTransform(new Vector2(1.0f, 0.15f), columnLeft.RectTransform), TextManager.Get("ServerListSubscribeMissingPackages"))
                     {
@@ -159,64 +234,6 @@ namespace Barotrauma.Networking
                     workshopBtn.TextBlock.AutoScale = true;
                 }
             }
-            
-            // right column -----------------------------------------------------------------------------
-
-            var playerCount = new GUITextBlock(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListPlayers"));
-            new GUITextBlock(new RectTransform(Vector2.One, playerCount.RectTransform), PlayerCount + "/" + MaxPlayers, textAlignment: Alignment.Right);
-
-
-            new GUITickBox(new RectTransform(new Vector2(1, elementHeight), columnRight.RectTransform), "Round running")
-            {
-                Selected = GameStarted,
-                CanBeFocused = false
-            };
-
-            var gameMode = new GUITextBlock(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("GameMode"));
-            new GUITextBlock(new RectTransform(Vector2.One, gameMode.RectTransform), string.IsNullOrEmpty(GameMode) ? "Unknown" : GameMode, textAlignment: Alignment.Right);
-
-           var traitors = new GUITextBlock(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("Traitors"));
-            new GUITextBlock(new RectTransform(Vector2.One, traitors.RectTransform), !TraitorsEnabled.HasValue ? "Unknown" : TraitorsEnabled.Value.ToString(), textAlignment: Alignment.Right);
-
-
-            var subSelection = new GUITextBlock(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListSubSelection"));
-            new GUITextBlock(new RectTransform(Vector2.One, subSelection.RectTransform), !SubSelectionMode.HasValue ? "Unknown" : SubSelectionMode.Value.ToString(), textAlignment: Alignment.Right);
-
-            var modeSelection = new GUITextBlock(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListModeSelection"));
-            new GUITextBlock(new RectTransform(Vector2.One, modeSelection.RectTransform), (!ModeSelectionMode.HasValue ? "Unknown" : ModeSelectionMode.Value.ToString()), textAlignment: Alignment.Right);
-
-            var allowSpectating = new GUITickBox(new RectTransform(new Vector2(1, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListAllowSpectating"))
-            {
-                CanBeFocused = false
-            };
-            if (!AllowSpectating.HasValue)
-                new GUITextBlock(new RectTransform(new Vector2(0.8f, 0.8f), allowSpectating.Box.RectTransform, Anchor.Center), "?", textAlignment: Alignment.Center);
-            else
-                allowSpectating.Selected = AllowSpectating.Value;
-
-            var allowRespawn = new GUITickBox(new RectTransform(new Vector2(1, elementHeight), columnRight.RectTransform), "Allow respawn")
-            {
-                CanBeFocused = false
-            };
-            if (!AllowRespawn.HasValue)
-                new GUITextBlock(new RectTransform(new Vector2(0.8f, 0.8f), allowRespawn.Box.RectTransform, Anchor.Center), "?", textAlignment: Alignment.Center);
-            else
-                allowRespawn.Selected = AllowRespawn.Value;
-
-            new GUITickBox(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListHasPassword"))
-            {
-                Selected = HasPassword,
-                CanBeFocused = false
-            };
-
-            var usingWhiteList = new GUITickBox(new RectTransform(new Vector2(1, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListUsingWhitelist"))
-            {
-                CanBeFocused = false
-            };
-            if (!UsingWhiteList.HasValue)
-                new GUITextBlock(new RectTransform(new Vector2(0.8f, 0.8f), usingWhiteList.Box.RectTransform, Anchor.Center), "?", textAlignment: Alignment.Center);
-            else
-                usingWhiteList.Selected = UsingWhiteList.Value;
 
             // -----------------------------------------------------------------------------
 

Barotrauma/BarotraumaClient/Source/Networking/SteamManager.cs

@@ -107,6 +107,56 @@ namespace Barotrauma.Steam
             return true;
         }
 
+        public static bool GetFavouriteServers(Action<Networking.ServerInfo> onServerFound, Action<Networking.ServerInfo> onServerRulesReceived, Action onFinished)
+        {
+            if (instance == null || !instance.isInitialized)
+            {
+                return false;
+            }
+
+            var filter = new ServerList.Filter
+            {
+                { "appid", AppID.ToString() },
+                { "gamedir", "Barotrauma" },
+                { "secure", "1" }
+            };
+
+            //include unresponsive servers in the server list
+
+            //the response is queried using the server's query port, not the game port,
+            //so it may be possible to play on the server even if it doesn't respond to server list queries
+            var query = instance.client.ServerList.Favourites(filter);
+            query.OnUpdate += () => { UpdateServerQuery(query, onServerFound, onServerRulesReceived, includeUnresponsive: true); };
+            query.OnFinished = onFinished;
+
+            return true;
+        }
+
+        public static bool GetServersFromHistory(Action<Networking.ServerInfo> onServerFound, Action<Networking.ServerInfo> onServerRulesReceived, Action onFinished)
+        {
+            if (instance == null || !instance.isInitialized)
+            {
+                return false;
+            }
+
+            var filter = new ServerList.Filter
+            {
+                { "appid", AppID.ToString() },
+                { "gamedir", "Barotrauma" },
+                { "secure", "1" }
+            };
+
+            //include unresponsive servers in the server list
+
+            //the response is queried using the server's query port, not the game port,
+            //so it may be possible to play on the server even if it doesn't respond to server list queries
+            var query = instance.client.ServerList.History(filter);
+            query.OnUpdate += () => { UpdateServerQuery(query, onServerFound, onServerRulesReceived, includeUnresponsive: true); };
+            query.OnFinished = onFinished;
+
+            return true;
+        }
+
         private static void UpdateServerQuery(ServerList.Request query, Action<Networking.ServerInfo> onServerFound, Action<Networking.ServerInfo> onServerRulesReceived, bool includeUnresponsive)
         {
             IEnumerable<ServerList.Server> servers = includeUnresponsive ?
@@ -548,6 +598,8 @@ namespace Barotrauma.Steam
 
             if (!allowFileOverwrite)
             {
+                // TODO: If you create a new mod via the workshop interface and enable it, it will show the error msg, but still allows you to enable the content.
+
                 if (File.Exists(newContentPackagePath))
                 {
                     errorMsg = TextManager.Get("WorkshopErrorOverwriteOnEnable")

Barotrauma/BarotraumaClient/Source/Screens/CampaignUI.cs

@@ -9,12 +9,9 @@ namespace Barotrauma
 {
     class CampaignUI
     {
-        public enum Tab { Map, Crew, Store }
+        public enum Tab { Map, Crew, Store, Repair }
         private Tab selectedTab;
         private GUIFrame[] tabs;
-
-        private GUIButton startButton;
-        
         private GUIFrame topPanel;
 
         private GUIListBox characterList;
@@ -26,6 +23,8 @@ namespace Barotrauma
         private GUIComponent selectedLocationInfo;
         private GUIListBox selectedMissionInfo;
 
+        private GUIButton repairHullsButton, repairItemsButton;
+
         private GUIFrame characterPreviewFrame;
 
         private List<GUIButton> tabButtons = new List<GUIButton>();
@@ -39,10 +38,7 @@ namespace Barotrauma
 
         public GUIComponent MapContainer { get; private set; }
 
-        public GUIButton StartButton
-        {
-            get { return startButton; }
-        }
+        public GUIButton StartButton { get; private set; }
 
         public CampaignMode Campaign { get; }
 
@@ -112,7 +108,7 @@ namespace Barotrauma
             tabs[(int)Tab.Crew] = new GUIFrame(new RectTransform(new Vector2(0.3f, 0.7f), container.RectTransform, Anchor.TopLeft)
             {
                 RelativeOffset = new Vector2(0.0f, topPanel.RectTransform.RelativeSize.Y)
-            }, color: Color.Black * 0.7f);
+            }, color: Color.Black * 0.9f);
             new GUIFrame(new RectTransform(new Vector2(1.25f, 1.25f), tabs[(int)Tab.Crew].RectTransform, Anchor.Center), style: "OuterGlow", color: Color.Black * 0.7f)
             {
                 CanBeFocused = false
@@ -157,7 +153,7 @@ namespace Barotrauma
             tabs[(int)Tab.Store] = new GUIFrame(new RectTransform(new Vector2(0.5f, 0.7f), container.RectTransform, Anchor.TopLeft)
             {
                 RelativeOffset = new Vector2(0.1f, topPanel.RectTransform.RelativeSize.Y)
-            }, color: Color.Black * 0.7f);
+            }, color: Color.Black * 0.9f);
             new GUIFrame(new RectTransform(new Vector2(1.25f, 1.25f), tabs[(int)Tab.Store].RectTransform, Anchor.Center), style: "OuterGlow", color: Color.Black * 0.7f)
             {
                 CanBeFocused = false
@@ -218,6 +214,97 @@ namespace Barotrauma
             }
             SelectItemCategory(MapEntityCategory.Equipment);
 
+            // repair tab -------------------------------------------------------------------------
+
+            tabs[(int)Tab.Repair] = new GUIFrame(new RectTransform(new Vector2(0.35f, 0.5f), container.RectTransform, Anchor.TopLeft)
+            {
+                RelativeOffset = new Vector2(0.02f, topPanel.RectTransform.RelativeSize.Y)
+            }, color: Color.Black * 0.9f);
+            new GUIFrame(new RectTransform(new Vector2(1.25f, 1.25f), tabs[(int)Tab.Repair].RectTransform, Anchor.Center), style: "OuterGlow", color: Color.Black * 0.7f)
+            {
+                CanBeFocused = false
+            };
+
+            var repairContent = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.85f), tabs[(int)Tab.Repair].RectTransform, Anchor.Center))
+            {
+                RelativeSpacing = 0.05f,
+                Stretch = true
+            };
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.2f), crewContent.RectTransform), "", font: GUI.LargeFont)
+            {
+                TextGetter = GetMoney
+            };
+
+            var repairHullsHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), repairContent.RectTransform), childAnchor: Anchor.TopRight)
+            {
+                RelativeSpacing = 0.05f,
+                Stretch = true
+            };
+            new GUIImage(new RectTransform(new Vector2(0.3f, 1.0f), repairHullsHolder.RectTransform, Anchor.CenterLeft), "RepairHullButton")
+            {
+                IgnoreLayoutGroups = true,
+                CanBeFocused = false
+            };
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.3f), repairHullsHolder.RectTransform), TextManager.Get("RepairAllWalls"), textAlignment: Alignment.Right, font: GUI.LargeFont)
+            {
+                ForceUpperCase = true
+            };
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.3f), repairHullsHolder.RectTransform), "500", textAlignment: Alignment.Right, font: GUI.LargeFont);
+            repairHullsButton = new GUIButton(new RectTransform(new Vector2(0.4f, 0.3f), repairHullsHolder.RectTransform), TextManager.Get("Repair"), style: "GUIButtonLarge")
+            {
+                OnClicked = (btn, userdata) =>
+                {
+                    if (campaign.Money >= CampaignMode.HullRepairCost)
+                    {
+                        campaign.Money -= CampaignMode.HullRepairCost;
+                        campaign.PurchasedHullRepairs = true;
+                        GameMain.Client?.SendCampaignState();
+                        btn.GetChild<GUITickBox>().Selected = true;
+                    }
+                    btn.Enabled = false;
+                    return true;
+                }
+            };
+            new GUITickBox(new RectTransform(new Vector2(0.65f), repairHullsButton.RectTransform, Anchor.CenterLeft) { AbsoluteOffset = new Point(10, 0) }, "")
+            {
+                CanBeFocused = false
+            };
+
+            var repairItemsHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), repairContent.RectTransform), childAnchor: Anchor.TopRight)
+            {
+                RelativeSpacing = 0.05f,
+                Stretch = true
+            };
+            new GUIImage(new RectTransform(new Vector2(0.3f, 1.0f), repairItemsHolder.RectTransform, Anchor.CenterLeft), "RepairItemsButton")
+            {
+                IgnoreLayoutGroups = true,
+                CanBeFocused = false
+            };
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.3f), repairItemsHolder.RectTransform), TextManager.Get("RepairAllItems"), textAlignment: Alignment.Right, font: GUI.LargeFont)
+            {
+                ForceUpperCase = true
+            };
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.3f), repairItemsHolder.RectTransform), "500", textAlignment: Alignment.Right, font: GUI.LargeFont);
+            repairItemsButton = new GUIButton(new RectTransform(new Vector2(0.4f, 0.3f), repairItemsHolder.RectTransform), TextManager.Get("Repair"), style: "GUIButtonLarge")
+            {
+                OnClicked = (btn, userdata) =>
+                {
+                    if (campaign.Money >= CampaignMode.ItemRepairCost)
+                    {
+                        campaign.Money -= CampaignMode.ItemRepairCost;
+                        campaign.PurchasedItemRepairs = true;
+                        GameMain.Client?.SendCampaignState();
+                        btn.GetChild<GUITickBox>().Selected = true;
+                    }
+                    btn.Enabled = false;
+                    return true;
+                }
+            };
+            new GUITickBox(new RectTransform(new Vector2(0.65f), repairItemsButton.RectTransform, Anchor.CenterLeft) { AbsoluteOffset = new Point(10, 0) }, "")
+            {
+                CanBeFocused = false
+            };
+
             // mission info -------------------------------------------------------------------------
 
             missionPanel = new GUIFrame(new RectTransform(new Vector2(0.3f, 0.5f), container.RectTransform, Anchor.TopRight)
@@ -330,8 +417,7 @@ namespace Barotrauma
             bool purchaseableItemsFound = false;
             foreach (MapEntityPrefab mapEntityPrefab in MapEntityPrefab.List)
             {
-                var itemPrefab = mapEntityPrefab as ItemPrefab;
-                if (itemPrefab == null) { continue; }
+                if (!(mapEntityPrefab is ItemPrefab itemPrefab)) { continue; }
 
                 PriceInfo priceInfo = itemPrefab.GetPrice(Campaign.Map.CurrentLocation);
                 if (priceInfo != null) { purchaseableItemsFound = true; break; }
@@ -349,8 +435,7 @@ namespace Barotrauma
             {
                 //refresh store view
                 SelectItemCategory(MapEntityCategory.Equipment);
-            }
-            
+            }            
         }
         
         private void DrawMap(SpriteBatch spriteBatch, GUICustomComponent mapContainer)
@@ -452,7 +537,7 @@ namespace Barotrauma
                 
                 RefreshMissionTab(selectedMission);
 
-                startButton = new GUIButton(new RectTransform(new Vector2(0.3f, 0.7f), missionContent.RectTransform, Anchor.CenterRight),
+                StartButton = new GUIButton(new RectTransform(new Vector2(0.3f, 0.7f), missionContent.RectTransform, Anchor.CenterRight),
                     TextManager.Get("StartCampaignButton"), style: "GUIButtonLarge")
                 {
                     IgnoreLayoutGroups = true,
@@ -461,7 +546,7 @@ namespace Barotrauma
                 };
                 if (GameMain.Client != null)
                 {
-                    startButton.Visible = !GameMain.Client.GameStarted &&
+                    StartButton.Visible = !GameMain.Client.GameStarted &&
                         (GameMain.Client.HasPermission(Networking.ClientPermissions.ManageRound) ||
                         GameMain.Client.HasPermission(Networking.ClientPermissions.ManageCampaign));
                 }
@@ -508,10 +593,10 @@ namespace Barotrauma
                 CanBeFocused = false
             };
 
-            if (startButton != null)
+            if (StartButton != null)
             {
-                startButton.Enabled = true;
-                startButton.Visible = GameMain.Client == null || 
+                StartButton.Enabled = true;
+                StartButton.Visible = GameMain.Client == null || 
                     GameMain.Client.HasPermission(Networking.ClientPermissions.ManageRound) || 
                     GameMain.Client.HasPermission(Networking.ClientPermissions.ManageCampaign);
             }
@@ -597,8 +682,7 @@ namespace Barotrauma
 
         private bool BuyItem(GUIComponent component, object obj)
         {
-            PurchasedItem pi = obj as PurchasedItem;
-            if (pi == null || pi.ItemPrefab == null) return false;
+            if (!(obj is PurchasedItem pi) || pi.ItemPrefab == null) return false;
 
             if (GameMain.Client != null && !GameMain.Client.HasPermission(Networking.ClientPermissions.ManageCampaign))
             {
@@ -616,8 +700,7 @@ namespace Barotrauma
 
         private bool SellItem(GUIComponent component, object obj)
         {
-            PurchasedItem pi = obj as PurchasedItem;
-            if (pi == null || pi.ItemPrefab == null) return false;
+            if (!(obj is PurchasedItem pi) || pi.ItemPrefab == null) return false;
 
             if (GameMain.Client != null && !GameMain.Client.HasPermission(Networking.ClientPermissions.ManageCampaign))
             {
@@ -659,6 +742,20 @@ namespace Barotrauma
             {
                 button.Selected = (Tab)button.UserData == tab;
             }
+
+            switch (selectedTab)
+            {
+                case Tab.Repair:
+                    repairHullsButton.Enabled = 
+                        !Campaign.PurchasedHullRepairs && Campaign.Money >= CampaignMode.HullRepairCost &&
+                        (GameMain.Client == null || GameMain.Client.HasPermission(Networking.ClientPermissions.ManageCampaign));
+                    repairHullsButton.GetChild<GUITickBox>().Selected = Campaign.PurchasedHullRepairs;
+                    repairItemsButton.Enabled = 
+                        !Campaign.PurchasedItemRepairs && Campaign.Money >= CampaignMode.ItemRepairCost &&
+                        (GameMain.Client == null || GameMain.Client.HasPermission(Networking.ClientPermissions.ManageCampaign));
+                    repairItemsButton.GetChild<GUITickBox>().Selected = Campaign.PurchasedItemRepairs;
+                    break;
+            }
         }
 
         private bool SelectItemCategory(MapEntityCategory category)
@@ -668,8 +765,7 @@ namespace Barotrauma
             int width = storeItemList.Rect.Width;
             foreach (MapEntityPrefab mapEntityPrefab in MapEntityPrefab.List)
             {
-                var itemPrefab = mapEntityPrefab as ItemPrefab;
-                if (itemPrefab == null || !itemPrefab.Category.HasFlag(category)) continue;
+                if (!(mapEntityPrefab is ItemPrefab itemPrefab) || !itemPrefab.Category.HasFlag(category)) continue;
 
                 PriceInfo priceInfo = itemPrefab.GetPrice(Campaign.Map.CurrentLocation);
                 if (priceInfo == null) continue;
@@ -707,9 +803,8 @@ namespace Barotrauma
             }
 
             if (prevInfoFrame != null) { tabs[(int)selectedTab].RemoveChild(prevInfoFrame); }
-            
-            CharacterInfo characterInfo = selection as CharacterInfo;
-            if (characterInfo == null) { return false; }
+
+            if (!(selection is CharacterInfo characterInfo)) { return false; }
             if (Character.Controlled != null && characterInfo == Character.Controlled.Info) { return false; }
 
             if (characterPreviewFrame == null || characterPreviewFrame.UserData != characterInfo)
@@ -761,11 +856,9 @@ namespace Barotrauma
 
         private bool HireCharacter(GUIButton button, object selection)
         {
-            CharacterInfo characterInfo = selection as CharacterInfo;
-            if (characterInfo == null) { return false; }
+            if (!(selection is CharacterInfo characterInfo)) { return false; }
 
-            SinglePlayerCampaign spCampaign = Campaign as SinglePlayerCampaign;
-            if (spCampaign == null)
+            if (!(Campaign is SinglePlayerCampaign spCampaign))
             {
                 DebugConsole.ThrowError("Characters can only be hired in the single player campaign.\n" + Environment.StackTrace);
                 return false;
@@ -784,11 +877,9 @@ namespace Barotrauma
 
         private bool FireCharacter(GUIButton button, object selection)
         {
-            CharacterInfo characterInfo = selection as CharacterInfo;
-            if (characterInfo == null) return false;
+            if (!(selection is CharacterInfo characterInfo)) return false;
 
-            SinglePlayerCampaign spCampaign = Campaign as SinglePlayerCampaign;
-            if (spCampaign == null)
+            if (!(Campaign is SinglePlayerCampaign spCampaign))
             {
                 DebugConsole.ThrowError("Characters can only be fired in the single player campaign.\n" + Environment.StackTrace);
                 return false;

Barotrauma/BarotraumaClient/Source/Screens/CharacterEditorScreen.cs

@@ -42,16 +42,16 @@ namespace Barotrauma
         private bool showParamsEditor;
         private bool showSpritesheet;
         private bool isFreezed;
-        private bool autoFreeze = true;
-        private bool limbPairEditing = true;
-        private bool uniformScaling = true;
-        private bool lockSpriteOrigin = true;
+        private bool autoFreeze;
+        private bool limbPairEditing;
+        private bool uniformScaling;
+        private bool lockSpriteOrigin;
         private bool lockSpritePosition;
         private bool lockSpriteSize;
         private bool recalculateCollider;
         private bool copyJointSettings;
         private bool displayColliders;
-        private bool displayWearables = true;
+        private bool displayWearables;
         private bool displayBackgroundColor;
         private bool ragdollResetRequiresForceLoading;
         private bool animationResetRequiresForceLoading;
@@ -89,10 +89,17 @@ namespace Barotrauma
         public override void Select()
         {
             base.Select();
+
+            SoundPlayer.OverrideMusicType = "none";
+            SoundPlayer.OverrideMusicDuration = null;
+            GameMain.SoundManager.SetCategoryGainMultiplier("default", 0.0f);
+            GameMain.SoundManager.SetCategoryGainMultiplier("waterambience", 0.0f);
+
             GUI.ForceMouseOn(null);
             CalculateSpritesheetPosition();
             if (Submarine.MainSub == null)
             {
+                ResetVariables();
                 Submarine.MainSub = new Submarine("Content/AnimEditor.sub");
                 Submarine.MainSub.Load(unloadPrevious: false, showWarningMessages: false);
                 originalWall = new WallGroup(new List<Structure>(Structure.WallList));
@@ -101,6 +108,10 @@ namespace Barotrauma
                 isEndlessRunner = true;
                 GameMain.LightManager.LightingEnabled = false;
             }
+            else if (instance == null)
+            {
+                ResetVariables();
+            }
             Submarine.MainSub.GodMode = true;
             if (Character.Controlled == null)
             {
@@ -118,31 +129,65 @@ namespace Barotrauma
             instance = this;
         }
 
+        private void ResetVariables()
+        {
+            editAnimations = false;
+            editLimbs = false;
+            editJoints = false;
+            editIK = false;
+            showRagdoll = false;
+            showParamsEditor = false;
+            showSpritesheet = false;
+            isFreezed = false;
+            autoFreeze = true;
+            limbPairEditing = true;
+            uniformScaling = true;
+            lockSpriteOrigin = false;
+            lockSpritePosition = false;
+            lockSpriteSize = false;
+            recalculateCollider = false;
+            copyJointSettings = false;
+            displayColliders = false;
+            displayWearables = true;
+            displayBackgroundColor = false;
+            ragdollResetRequiresForceLoading = false;
+            animationResetRequiresForceLoading = false;
+            isExtrudingJoint = false;
+            isDrawingJoint = false;
+            Wizard.instance = null;
+        }
+
         private void Reset()
         {
-            AnimParams.ForEach(a => a.Reset(true));
-            RagdollParams.Reset(true);
-            RagdollParams.ClearHistory();
-            CurrentAnimation.ClearHistory();
-            if (!character.Removed)
+            ResetVariables();
+            if (character != null)
             {
-                character.Remove();
+                AnimParams.ForEach(a => a.Reset(true));
+                RagdollParams.Reset(true);
+                RagdollParams.ClearHistory();
+                CurrentAnimation.ClearHistory();
+                if (!character.Removed)
+                {
+                    character.Remove();
+                }
+                character = null;
             }
-            character = null;
         }
 
         public override void Deselect()
         {
             base.Deselect();
+
+            SoundPlayer.OverrideMusicType = null;
+            GameMain.SoundManager.SetCategoryGainMultiplier("default", GameMain.Config.SoundVolume);
+            GameMain.SoundManager.SetCategoryGainMultiplier("waterambience", GameMain.Config.SoundVolume);
+
             GUI.ForceMouseOn(null);
             if (isEndlessRunner)
             {
                 Submarine.MainSub.Remove();
                 isEndlessRunner = false;
-                if (character != null)
-                {
-                    Reset();
-                }
+                Reset();
                 GameMain.World.ProcessChanges();
             }
             else
@@ -175,7 +220,7 @@ namespace Barotrauma
         {
             //base.AddToGUIUpdateList();
             rightPanel.AddToGUIUpdateList();
-            Wizard.Instance.AddToGUIUpdateList();
+            Wizard.instance?.AddToGUIUpdateList();
             if (displayBackgroundColor)
             {
                 backgroundColorPanel.AddToGUIUpdateList();
@@ -207,7 +252,7 @@ namespace Barotrauma
             base.Update(deltaTime);
             spriteSheetRect = CalculateSpritesheetRectangle();
             // Handle shortcut keys
-            if (GUI.KeyboardDispatcher.Subscriber == null)
+            if (GUI.KeyboardDispatcher.Subscriber == null && Wizard.instance == null)
             {
                 if (PlayerInput.KeyDown(Keys.LeftControl))
                 {
@@ -396,7 +441,7 @@ namespace Barotrauma
                     }
                 }
             }
-            if (!isFreezed)
+            if (!isFreezed && Wizard.instance == null)
             {
                 if (character.AnimController.Invalid)
                 {
@@ -1131,7 +1176,22 @@ namespace Barotrauma
                 character = Character.Create(configFile, spawnPosition, ToolBox.RandomSeed(8), hasAi: false, ragdoll: ragdoll);
                 selectedJob = null;
             }
-            character.dontFollowCursor = dontFollowCursor;
+            if (character != null)
+            {
+                character.dontFollowCursor = dontFollowCursor;
+            }
+            if (character == null)
+            {
+                if (currentCharacterConfig == configFile)
+                {
+                    return null;
+                }
+                else
+                {
+                    // Respawn the current character;
+                    SpawnCharacter(currentCharacterConfig);
+                }
+            }
             OnPostSpawn();
             return character;
         }
@@ -1247,27 +1307,33 @@ namespace Barotrauma
             string speciesName = name;
             // Config file
             string configFilePath = Path.Combine(mainFolder, $"{speciesName}.xml").Replace(@"\", @"/");
-            if (ContentPackage.GetFilesOfType(GameMain.SelectedPackages, ContentType.Character).None(path => path.Contains(speciesName)))
+            if (ContentPackage.GetFilesOfType(GameMain.SelectedPackages, ContentType.Character).Any(path => path.Contains(speciesName)))
             {
-                // Create the config file
-                XElement mainElement = new XElement("Character",
-                    new XAttribute("name", speciesName),
-                    new XAttribute("humanoid", isHumanoid),
-                    new XElement("ragdolls", new XAttribute("folder", Path.Combine(mainFolder, $"Ragdolls/").Replace(@"\", @"/"))),
-                    new XElement("animations", new XAttribute("folder", Path.Combine(mainFolder, $"Animations/").Replace(@"\", @"/"))),
-                    new XElement("health"),
-                    new XElement("ai"));
-                XDocument doc = new XDocument(mainElement);
-                if (!Directory.Exists(mainFolder))
-                {
-                    Directory.CreateDirectory(mainFolder);
-                }
-                doc.Save(configFilePath);
-                // Add to the selected content package
-                contentPackage.AddFile(configFilePath, ContentType.Character);
-                contentPackage.Save(contentPackage.Path);
-                DebugConsole.NewMessage(GetCharacterEditorTranslation("ContentPackageSaved").Replace("[path]", contentPackage.Path));
+                GUI.AddMessage(GetCharacterEditorTranslation("ExistingCharacterFound"), Color.Red, font: GUI.LargeFont);
+                // TODO: add a prompt: "Do you want to replace it?" + functionality
+                return false;
             }
+
+            // Create the config file
+            XElement mainElement = new XElement("Character",
+                new XAttribute("name", speciesName),
+                new XAttribute("humanoid", isHumanoid),
+                new XElement("ragdolls", new XAttribute("folder", Path.Combine(mainFolder, $"Ragdolls/").Replace(@"\", @"/"))),
+                new XElement("animations", new XAttribute("folder", Path.Combine(mainFolder, $"Animations/").Replace(@"\", @"/"))),
+                new XElement("health"),
+                new XElement("ai"));
+
+            XDocument doc = new XDocument(mainElement);
+            if (!Directory.Exists(mainFolder))
+            {
+                Directory.CreateDirectory(mainFolder);
+            }
+            doc.Save(configFilePath);
+            // Add to the selected content package
+            contentPackage.AddFile(configFilePath, ContentType.Character);
+            contentPackage.Save(contentPackage.Path);
+            DebugConsole.NewMessage(GetCharacterEditorTranslation("ContentPackageSaved").Replace("[path]", contentPackage.Path));
+
             // Ragdoll
             string ragdollFolder = RagdollParams.GetFolder(speciesName);
             string ragdollPath = RagdollParams.GetDefaultFile(speciesName);
@@ -1278,12 +1344,20 @@ namespace Barotrauma
             string animFolder = AnimationParams.GetFolder(speciesName);
             foreach (AnimationType animType in Enum.GetValues(typeof(AnimationType)))
             {
-                if (animType != AnimationType.NotDefined)
+                switch (animType)
                 {
-                    Type type = AnimationParams.GetParamTypeFromAnimType(animType, isHumanoid);
-                    string fullPath = AnimationParams.GetDefaultFile(speciesName, animType);
-                    AnimationParams.Create(fullPath, speciesName, animType, type);
+                    case AnimationType.Walk:
+                    case AnimationType.Run:
+                        if (!ragdollParams.CanEnterSubmarine) { continue; }
+                        break;
+                    case AnimationType.SwimSlow:
+                    case AnimationType.SwimFast:
+                        break;
+                    default: continue;
                 }
+                Type type = AnimationParams.GetParamTypeFromAnimType(animType, isHumanoid);
+                string fullPath = AnimationParams.GetDefaultFile(speciesName, animType);
+                AnimationParams.Create(fullPath, speciesName, animType, type);
             }
             if (!AllFiles.Contains(configFilePath))
             {
@@ -3764,7 +3838,7 @@ namespace Barotrauma
                                         void RecalculateCollider(Limb l)
                                         {
                                             // We want the collider to be slightly smaller than the source rect, because the source rect is usually a bit bigger than the graphic.
-                                            float multiplier = 0.75f;
+                                            float multiplier = 0.85f;
                                             l.body.SetSize(new Vector2(ConvertUnits.ToSimUnits(width), ConvertUnits.ToSimUnits(height)) * RagdollParams.LimbScale * RagdollParams.TextureScale * multiplier);
                                             TryUpdateLimbParam(l, "radius", ConvertUnits.ToDisplayUnits(l.body.radius / RagdollParams.LimbScale / RagdollParams.TextureScale));
                                             TryUpdateLimbParam(l, "width", ConvertUnits.ToDisplayUnits(l.body.width / RagdollParams.LimbScale / RagdollParams.TextureScale));
@@ -4283,7 +4357,7 @@ namespace Barotrauma
             private List<XElement> jointXElements = new List<XElement>();
             private List<GUIComponent> jointGUIElements = new List<GUIComponent>();
 
-            private static Wizard instance;
+            public static Wizard instance;
             public static Wizard Instance
             {
                 get
@@ -4314,7 +4388,6 @@ namespace Barotrauma
                         break;
                     case Tab.None:
                     default:
-                        //activeView = null;
                         instance = null;
                         break;
                 }
@@ -4343,7 +4416,7 @@ namespace Barotrauma
                     GUITextBox xmlPathElement = null;
                     void UpdatePaths()
                     {
-                        string pathBase = $"Content/Characters/{Name}/{Name}";
+                        string pathBase = $"Mods/Characters/{Name}/{Name}";
                         XMLPath = $"{pathBase}.xml";
                         TexturePath = $"{pathBase}.png";
                         texturePathElement.Text = TexturePath;
@@ -4422,7 +4495,7 @@ namespace Barotrauma
                     // Cancel
                     box.Buttons[0].OnClicked += (b, d) =>
                     {
-                        Instance.SelectTab(Tab.None);
+                        Wizard.Instance.SelectTab(Tab.None);
                         return true;
                     };
                     // Next
@@ -4434,7 +4507,7 @@ namespace Barotrauma
                             texturePathElement.Flash(Color.Red);
                             return false;
                         }
-                        Instance.SelectTab(Tab.Ragdoll);
+                        Wizard.Instance.SelectTab(Tab.Ragdoll);
                         return true;
                     };
                     return box;
@@ -4575,7 +4648,7 @@ namespace Barotrauma
                     // Previous
                     box.Buttons[0].OnClicked += (b, d) =>
                     {
-                        Instance.SelectTab(Tab.Character);
+                        Wizard.Instance.SelectTab(Tab.Character);
                         return true;
                     };
                     // Parse and create
@@ -4666,7 +4739,7 @@ namespace Barotrauma
                         {
                             GUI.AddMessage(GetCharacterEditorTranslation("CharacterCreated").Replace("[name]", Name), Color.Green, font: GUI.Font);
                         }
-                        Instance.SelectTab(Tab.None);
+                        Wizard.Instance.SelectTab(Tab.None);
                         return true;
                     };
                     return box;
@@ -4846,23 +4919,27 @@ namespace Barotrauma
                         int width = rectInputs[2].IntValue;
                         int height = rectInputs[3].IntValue;
                         var colliderAttributes = new List<XAttribute>();
-                        if (width == height)
-                        {
-                            colliderAttributes.Add(new XAttribute("radius", width / 2));
-                        }
-                        else
-                        {
-                            if (height > width)
-                            {
-                                colliderAttributes.Add(new XAttribute("radius", width / 2));
-                                colliderAttributes.Add(new XAttribute("height", height - width));
-                            }
-                            else
-                            {
-                                colliderAttributes.Add(new XAttribute("radius", height / 2));
-                                colliderAttributes.Add(new XAttribute("width", width - height));
-                            }
-                        }
+                        // Capsules/Circles
+                        //if (width == height)
+                        //{
+                        //    colliderAttributes.Add(new XAttribute("radius", (int)(width / 2 * 0.85f)));
+                        //}
+                        //else
+                        //{
+                        //    if (height > width)
+                        //    {
+                        //        colliderAttributes.Add(new XAttribute("radius", (int)(width / 2 * 0.85f)));
+                        //        colliderAttributes.Add(new XAttribute("height",(int) (height - width * 0.85f)));
+                        //    }
+                        //    else
+                        //    {
+                        //        colliderAttributes.Add(new XAttribute("radius", (int)(height / 2 * 0.85f)));
+                        //        colliderAttributes.Add(new XAttribute("width", (int)(width - height * 0.85f)));
+                        //    }
+                        //}
+                        // Rectangles
+                        colliderAttributes.Add(new XAttribute("height", (int)(height * 0.85f)));
+                        colliderAttributes.Add(new XAttribute("width", (int)(width * 0.85f)));
                         idToCodeName.TryGetValue(id, out string notes);
                         LimbXElements.Add(id.ToString(), new XElement("limb",
                             new XAttribute("id", id),

Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs

@@ -261,7 +261,7 @@ namespace Barotrauma
 
         public NetLobbyScreen()
         {
-            defaultModeContainer = new GUIFrame(new RectTransform(new Vector2(0.95f, 0.95f), Frame.RectTransform, Anchor.Center), style: null);
+            defaultModeContainer = new GUIFrame(new RectTransform(new Vector2(0.95f, 0.95f), Frame.RectTransform, Anchor.Center) { MaxSize = new Point(int.MaxValue, GameMain.GraphicsHeight - 100) }, style: null);
             campaignContainer = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.75f), Frame.RectTransform, Anchor.TopCenter), style: null)
             {
                 Visible = false
@@ -737,11 +737,15 @@ namespace Barotrauma
                 spectateButton.Visible = GameMain.Client.GameStarted;
                 ReadyToStartBox.Visible = !GameMain.Client.GameStarted;
                 ReadyToStartBox.Selected = false;
-                if (campaignUI?.StartButton != null)
+                if (campaignUI != null)
                 {
-                    campaignUI.StartButton.Visible = !GameMain.Client.GameStarted &&
-                        (GameMain.Client.HasPermission(ClientPermissions.ManageRound) ||
-                        GameMain.Client.HasPermission(ClientPermissions.ManageCampaign));
+                    //SelectTab(Tab.Map);
+                    if (campaignUI.StartButton != null)
+                    {
+                        campaignUI.StartButton.Visible = !GameMain.Client.GameStarted &&
+                            (GameMain.Client.HasPermission(ClientPermissions.ManageRound) ||
+                            GameMain.Client.HasPermission(ClientPermissions.ManageCampaign));
+                    }
                 }
                 GameMain.Client.SetReadyToStart(ReadyToStartBox);
             }

Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs

@@ -57,32 +57,20 @@ namespace Barotrauma
 
             var leftColumn = new GUILayoutGroup(new RectTransform(new Vector2(0.25f, 1.0f), paddedFrame.RectTransform, Anchor.CenterLeft)) { Stretch = true, RelativeSpacing = 0.5f };
 
-            menu = new GUIFrame(new RectTransform(new Point(width, height), GUI.Canvas, Anchor.Center));
+            var infoHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), leftColumn.RectTransform)) { RelativeSpacing = 0.05f };
 
-            new GUITextBlock(new RectTransform(new Vector2(0.95f, 0.133f), menu.RectTransform, Anchor.TopCenter),
-                TextManager.Get("JoinServer"), textAlignment: Alignment.Left, font: GUI.LargeFont) { ForceUpperCase = true };
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.3f), infoHolder.RectTransform, Anchor.Center), TextManager.Get("JoinServer"), font: GUI.LargeFont)
+            { ForceUpperCase = true };
 
-            var paddedFrame = new GUIFrame(new RectTransform(new Vector2(0.95f, 0.95f), menu.RectTransform, Anchor.Center) { RelativeOffset = new Vector2(0.0f, 0.03f) }, style: null);
-
-            //-------------------------------------------------------------------------------------
-            //left column
-            //-------------------------------------------------------------------------------------
-
-            var leftColumn = new GUILayoutGroup(new RectTransform(new Vector2(0.25f, 0.92f), paddedFrame.RectTransform, Anchor.TopLeft));
-
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.03f), leftColumn.RectTransform), style: null);
-
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), TextManager.Get("YourName"));
-            clientNameBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.045f), leftColumn.RectTransform), "")
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoHolder.RectTransform), TextManager.Get("YourName"));
+            clientNameBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.13f), infoHolder.RectTransform), "")
             {
                 Text = GameMain.Config.DefaultPlayerName
             };
             clientNameBox.OnTextChanged += RefreshJoinButtonState;
 
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), TextManager.Get("ServerIP"));
-            // TODO: Show IP on server info window
-            ipBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.045f), leftColumn.RectTransform), "");
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoHolder.RectTransform), TextManager.Get("ServerIP"));
+            ipBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.13f), infoHolder.RectTransform), "");
             ipBox.OnTextChanged += RefreshJoinButtonState;
             ipBox.OnSelected += (sender, key) => 
             {
@@ -92,31 +80,81 @@ namespace Barotrauma
                     sender.UserData = null;
                 }
             };
-            
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.45f), leftColumn.RectTransform), style: null);
 
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), TextManager.Get("FilterServers"));
-            searchBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), "");
+            var filterHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), leftColumn.RectTransform)) { RelativeSpacing = 0.05f };
 
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.03f), leftColumn.RectTransform), style: null);
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), filterHolder.RectTransform), TextManager.Get("FilterServers"));
+            searchBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.13f), filterHolder.RectTransform), "");
+
+            var tickBoxHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), filterHolder.RectTransform));
 
             searchBox.OnTextChanged += (txtBox, txt) => { FilterServers(); return true; };
-            filterPassword = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), TextManager.Get("FilterPassword"));
+            filterPassword = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.27f), tickBoxHolder.RectTransform), TextManager.Get("FilterPassword"));
             filterPassword.OnSelected += (tickBox) => { FilterServers(); return true; };
-            filterIncompatible = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), TextManager.Get("FilterIncompatibleServers"));
+            filterIncompatible = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.27f), tickBoxHolder.RectTransform), TextManager.Get("FilterIncompatibleServers"));
             filterIncompatible.OnSelected += (tickBox) => { FilterServers(); return true; };
 
-            filterFull = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), TextManager.Get("FilterFullServers"));
+            filterFull = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.27f), tickBoxHolder.RectTransform), TextManager.Get("FilterFullServers"));
             filterFull.OnSelected += (tickBox) => { FilterServers(); return true; };
-            filterEmpty = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), TextManager.Get("FilterEmptyServers"));
+            filterEmpty = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.27f), tickBoxHolder.RectTransform), TextManager.Get("FilterEmptyServers"));
             filterEmpty.OnSelected += (tickBox) => { FilterServers(); return true; };
 
             //-------------------------------------------------------------------------------------
             //right column
             //-------------------------------------------------------------------------------------
 
+            var rightColumn = new GUILayoutGroup(new RectTransform(new Vector2(1.0f - leftColumn.RectTransform.RelativeSize.X - 0.017f, 1.0f),
+                paddedFrame.RectTransform, Anchor.CenterRight))
+            {
+                RelativeSpacing = 0.02f,
+                Stretch = true
+            };
+
+            var serverListHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 1.0f), rightColumn.RectTransform)) { Stretch = true, RelativeSpacing = 0.02f };
+
+            serverList = new GUIListBox(new RectTransform(new Vector2(1.0f, 1.0f), serverListHolder.RectTransform, Anchor.Center))
+            {
+                OnSelected = (btn, obj) => {
+                    ServerInfo serverInfo = (ServerInfo)obj;
+
+                    serverInfo.CreatePreviewWindow(serverPreview);
+
+                    return true;
+                }
+            };
+
+            serverList.OnSelected += SelectServer;
+
+            serverPreview = new GUIListBox(new RectTransform(new Vector2(1.0f, 1.0f), serverListHolder.RectTransform, Anchor.Center));
+
+            columnRelativeWidth = new float[] { 0.04f, 0.02f, 0.044f, 0.77f, 0.02f, 0.075f, 0.06f };
+
+            var buttonContainer = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.075f), rightColumn.RectTransform), style: null);
+
+            GUIButton button = new GUIButton(new RectTransform(new Vector2(0.25f, 0.9f), buttonContainer.RectTransform, Anchor.TopLeft),
+                TextManager.Get("Back"), style: "GUIButtonLarge")
+            {
+                OnClicked = GameMain.MainMenuScreen.ReturnToMainMenu
+            };
+
+			var refreshButton = new GUIButton(new RectTransform(new Vector2(buttonContainer.Rect.Height / (float)buttonContainer.Rect.Width, 0.9f), buttonContainer.RectTransform, Anchor.Center),
+				"", style: "GUIButtonRefresh") {
+
+				ToolTip = TextManager.Get("ServerListRefresh"),
+				OnClicked = RefreshServers
+			};
+
+            joinButton = new GUIButton(new RectTransform(new Vector2(0.25f, 0.9f), buttonContainer.RectTransform, Anchor.TopRight),
+                TextManager.Get("ServerListJoin"), style: "GUIButtonLarge")
+            {
+                OnClicked = JoinServer,
+                Enabled = false
+            };
+
+            //-------------------------------------------------------------------------------------
+            //right column
+            //-------------------------------------------------------------------------------------
+
             var rightColumn = new GUILayoutGroup(new RectTransform(new Vector2(1.0f - leftColumn.RectTransform.RelativeSize.X - 0.017f, 0.97f),
                 paddedFrame.RectTransform, Anchor.TopRight))
             {
@@ -360,7 +398,7 @@ namespace Barotrauma
 
         private void AddToServerList(ServerInfo serverInfo)
         {
-            var serverFrame = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.06f), serverList.Content.RectTransform) { MinSize = new Point(0, 20) },
+            var serverFrame = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.06f), serverList.Content.RectTransform) { MinSize = new Point(0, 35) },
                 style: "InnerFrame", color: Color.White * 0.5f)
             {
                 UserData = serverInfo
@@ -398,19 +436,6 @@ namespace Barotrauma
                 UserData = "password"
             };
 
-			new GUIButton(new RectTransform(new Vector2(columnRelativeWidth[2], 0.8f), serverContent.RectTransform, Anchor.Center), style: "GUIButtonServerListInfo") {
-				ToolTip = TextManager.Get("ServerListInfo"),
-				OnClicked = (btn, obj) => {
-					SelectServer(null, serverInfo);
-					var msgBox = new GUIMessageBox("", "", new string[] { TextManager.Get("Cancel"), TextManager.Get("ServerListJoin") }, 550, 400);
-					msgBox.Buttons[0].OnClicked += msgBox.Close;
-					msgBox.Buttons[1].OnClicked += JoinServer;
-					msgBox.Buttons[1].OnClicked += msgBox.Close;
-					serverInfo.CreatePreviewWindow(msgBox);
-					return true;
-				}
-			};
-
 			var serverName = new GUITextBlock(new RectTransform(new Vector2(columnRelativeWidth[3], 1.0f), serverContent.RectTransform), serverInfo.ServerName, style: "GUIServerListTextBox");
 
 			var gameStartedBox = new GUITickBox(new RectTransform(new Vector2(columnRelativeWidth[4], 0.4f), serverContent.RectTransform, Anchor.Center),

Barotrauma/BarotraumaClient/Source/Screens/SteamWorkshopScreen.cs

@@ -43,6 +43,7 @@ namespace Barotrauma
 
         private ContentPackage itemContentPackage;
         private Facepunch.Steamworks.Workshop.Editor itemEditor;
+        //private Facepunch.Steamworks.Overlay overlay;
 
         public SteamWorkshopScreen()
         {
@@ -637,6 +638,12 @@ namespace Barotrauma
                 OutlineColor = new Color(72, 124, 77, 255),
                 OnClicked = (btn, userdata) =>
                 {
+                    // Failed attempt, might have to be activated before accessing because as of now it just throws a null for overlay
+                    /*if (overlay.Enabled)
+                    {
+                        overlay.OpenUrl("steam://url/CommunityFilePage/" + item.Id);
+                    }*/
+
                     System.Diagnostics.Process.Start("steam://url/CommunityFilePage/" + item.Id);
                     return true;
                 }

Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs

@@ -310,6 +310,12 @@ namespace Barotrauma
                 RelativeSpacing = 0.01f,
                 Stretch = true
             };
+
+            new GUIButton(new RectTransform(new Vector2(1.0f, 1.0f), tabButtonHolder.RectTransform), TextManager.Get("MapEntityCategory.All"), style: "GUITabButton")
+            {
+                OnClicked = (btn, userdata) => { ClearFilter(); return true; }
+            };
+
             foreach (MapEntityCategory category in Enum.GetValues(typeof(MapEntityCategory)))
             {
                 entityCategoryButtons.Add(new GUIButton(new RectTransform(new Vector2(1.0f, 1.0f), tabButtonHolder.RectTransform),
@@ -1011,7 +1017,7 @@ namespace Barotrauma
 
             var previewImageButtonHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.1f), rightColumn.RectTransform), isHorizontal: true) { Stretch = true, RelativeSpacing = 0.05f };
 
-            new GUIButton(new RectTransform(new Vector2(0.5f, 1.0f), previewImageButtonHolder.RectTransform), TextManager.Get("SubPreviewImageGenerate"))
+            new GUIButton(new RectTransform(new Vector2(0.5f, 1.0f), previewImageButtonHolder.RectTransform), TextManager.Get("SubPreviewImageCreate"))
             {
                 OnClicked = (btn, userdata) =>
                 {

Barotrauma/BarotraumaClient/Source/Serialization/SerializableEntityEditor.cs

@@ -277,13 +277,17 @@ namespace Barotrauma
         {
             component.RectTransform.Parent = layoutGroup.RectTransform;
             component.RectTransform.RepositionChildInHierarchy(childIndex);
+            Recalculate();
+        }
 
+        public void Recalculate()
+        {
             int contentHeight = ContentHeight;
             RectTransform.NonScaledSize = new Point(RectTransform.NonScaledSize.X, contentHeight);
             layoutGroup.RectTransform.NonScaledSize = new Point(layoutGroup.RectTransform.NonScaledSize.X, contentHeight);
         }
 
-        private GUIComponent CreateNewField(SerializableProperty property, ISerializableEntity entity)
+        public GUIComponent CreateNewField(SerializableProperty property, ISerializableEntity entity)
         {
             object value = property.GetValue(entity);
             if (property.PropertyType == typeof(string) && value == null)
@@ -351,7 +355,7 @@ namespace Barotrauma
             return propertyField;
         }
 
-        private GUIComponent CreateBoolField(ISerializableEntity entity, SerializableProperty property, bool value, string displayName, string toolTip)
+        public GUIComponent CreateBoolField(ISerializableEntity entity, SerializableProperty property, bool value, string displayName, string toolTip)
         {
             GUITickBox propertyTickBox = new GUITickBox(new RectTransform(new Point(Rect.Width, elementHeight), layoutGroup.RectTransform), displayName)
             {
@@ -367,11 +371,11 @@ namespace Barotrauma
                     return true;
                 }
             };
-            Fields.Add(property.Name, new GUIComponent[] { propertyTickBox });
+            if (!Fields.ContainsKey(property.Name)) { Fields.Add(property.Name, new GUIComponent[] { propertyTickBox }); }
             return propertyTickBox;
         }
 
-        private GUIComponent CreateIntField(ISerializableEntity entity, SerializableProperty property, int value, string displayName, string toolTip)
+        public GUIComponent CreateIntField(ISerializableEntity entity, SerializableProperty property, int value, string displayName, string toolTip)
         {
             var frame = new GUIFrame(new RectTransform(new Point(Rect.Width, Math.Max(elementHeight, 26)), layoutGroup.RectTransform), color: Color.Transparent);
             var label = new GUITextBlock(new RectTransform(new Vector2(0.6f, 1), frame.RectTransform), displayName, font: GUI.SmallFont)
@@ -395,11 +399,11 @@ namespace Barotrauma
                     TrySendNetworkUpdate(entity, property);
                 }
             };
-            Fields.Add(property.Name, new GUIComponent[] { numberInput });
+            if (!Fields.ContainsKey(property.Name)) { Fields.Add(property.Name, new GUIComponent[] { numberInput }); }
             return frame;
         }
 
-        private GUIComponent CreateFloatField(ISerializableEntity entity, SerializableProperty property, float value, string displayName, string toolTip)
+        public GUIComponent CreateFloatField(ISerializableEntity entity, SerializableProperty property, float value, string displayName, string toolTip)
         {
             var frame = new GUIFrame(new RectTransform(new Point(Rect.Width, Math.Max(elementHeight, 26)), layoutGroup.RectTransform), color: Color.Transparent);
             var label = new GUITextBlock(new RectTransform(new Vector2(0.6f, 1), frame.RectTransform), displayName, font: GUI.SmallFont)
@@ -425,11 +429,11 @@ namespace Barotrauma
                     TrySendNetworkUpdate(entity, property);
                 }
             };
-            Fields.Add(property.Name, new GUIComponent[] { numberInput });
+            if (!Fields.ContainsKey(property.Name)) { Fields.Add(property.Name, new GUIComponent[] { numberInput }); }
             return frame;
         }
 
-        private GUIComponent CreateEnumField(ISerializableEntity entity, SerializableProperty property, object value, string displayName, string toolTip)
+        public GUIComponent CreateEnumField(ISerializableEntity entity, SerializableProperty property, object value, string displayName, string toolTip)
         {
             var frame = new GUIFrame(new RectTransform(new Point(Rect.Width, elementHeight), layoutGroup.RectTransform), color: Color.Transparent);
             var label = new GUITextBlock(new RectTransform(new Vector2(0.6f, 1), frame.RectTransform), displayName, font: GUI.SmallFont)
@@ -454,11 +458,11 @@ namespace Barotrauma
                 return true;
             };
             enumDropDown.SelectItem(value);
-            Fields.Add(property.Name, new GUIComponent[] { enumDropDown });
+            if (!Fields.ContainsKey(property.Name)) { Fields.Add(property.Name, new GUIComponent[] { enumDropDown }); }
             return frame;
         }
 
-        private GUIComponent CreateEnumFlagField(ISerializableEntity entity, SerializableProperty property, object value, string displayName, string toolTip)
+        public GUIComponent CreateEnumFlagField(ISerializableEntity entity, SerializableProperty property, object value, string displayName, string toolTip)
         {
             var frame = new GUIFrame(new RectTransform(new Point(Rect.Width, elementHeight), layoutGroup.RectTransform), color: Color.Transparent);
             var label = new GUITextBlock(new RectTransform(new Vector2(0.6f, 1), frame.RectTransform), displayName, font: GUI.SmallFont)
@@ -487,18 +491,21 @@ namespace Barotrauma
                 return true;
             };
 
-            Fields.Add(property.Name, new GUIComponent[] { enumDropDown });
+            if (!Fields.ContainsKey(property.Name)) { Fields.Add(property.Name, new GUIComponent[] { enumDropDown }); }
             return frame;
         }
 
-        private GUIComponent CreateStringField(ISerializableEntity entity, SerializableProperty property, string value, string displayName, string toolTip)
+        public GUIComponent CreateStringField(ISerializableEntity entity, SerializableProperty property, string value, string displayName, string toolTip)
         {
-            var frame = new GUIFrame(new RectTransform(new Point(Rect.Width, elementHeight), layoutGroup.RectTransform), color: Color.Transparent);
+            var frame = new GUILayoutGroup(new RectTransform(new Point(Rect.Width, elementHeight), layoutGroup.RectTransform), isHorizontal: true)
+            {
+                Stretch = true
+            };
             var label = new GUITextBlock(new RectTransform(new Vector2(0.4f, 1), frame.RectTransform), displayName, font: GUI.SmallFont, textAlignment: Alignment.Left)
             {
                 ToolTip = toolTip
             };
-            GUITextBox propertyBox = new GUITextBox(new RectTransform(new Vector2(0.6f, 1), frame.RectTransform, Anchor.TopRight))
+            GUITextBox propertyBox = new GUITextBox(new RectTransform(new Vector2(0.6f, 1), frame.RectTransform))
             {
                 ToolTip = toolTip,
                 Font = GUI.SmallFont,
@@ -514,11 +521,36 @@ namespace Barotrauma
                     return true;
                 }
             };
-            Fields.Add(property.Name, new GUIComponent[] { propertyBox });
+            string translationTextTag = property.GetAttribute<Serialize>()?.translationTextTag;
+            if (translationTextTag != null)
+            {
+                new GUIButton(new RectTransform(new Vector2(0.1f, 1), frame.RectTransform, Anchor.TopRight), "...")
+                {
+                    OnClicked = (bt, userData) => { CreateTextPicker(translationTextTag, entity, property, propertyBox); return true; }
+                };
+                propertyBox.OnTextChanged += (tb, text) =>
+                {
+                    string translatedText = TextManager.Get(text, returnNull: true);
+                    if (translatedText == null)
+                    {
+                        propertyBox.TextColor = Color.Gray;
+                        propertyBox.ToolTip = TextManager.Get("StringPropertyCannotTranslate").Replace("[tag]", text ?? "");
+                    }
+                    else
+                    {
+                        propertyBox.TextColor = Color.LightGreen;
+                        propertyBox.ToolTip = TextManager.Get("StringPropertyTranslate").Replace("[translation]", translatedText);
+                    }
+                    return true;
+                };
+                propertyBox.Text = value;
+            }
+
+            if (!Fields.ContainsKey(property.Name)) { Fields.Add(property.Name, new GUIComponent[] { propertyBox }); }
             return frame;
         }
 
-        private GUIComponent CreatePointField(ISerializableEntity entity, SerializableProperty property, Point value, string displayName, string toolTip)
+        public GUIComponent CreatePointField(ISerializableEntity entity, SerializableProperty property, Point value, string displayName, string toolTip)
         {
             var frame = new GUIFrame(new RectTransform(new Point(Rect.Width, Math.Max(elementHeight, 26)), layoutGroup.RectTransform), color: Color.Transparent);
             var label = new GUITextBlock(new RectTransform(new Vector2(0.4f, 1), frame.RectTransform), displayName, font: GUI.SmallFont)
@@ -566,11 +598,11 @@ namespace Barotrauma
                 };
                 fields[i] = numberInput;
             }
-            Fields.Add(property.Name, fields);
+            if (!Fields.ContainsKey(property.Name)) { Fields.Add(property.Name, fields); }
             return frame;
         }
 
-        private GUIComponent CreateVector2Field(ISerializableEntity entity, SerializableProperty property, Vector2 value, string displayName, string toolTip)
+        public GUIComponent CreateVector2Field(ISerializableEntity entity, SerializableProperty property, Vector2 value, string displayName, string toolTip)
         {
             var frame = new GUIFrame(new RectTransform(new Point(Rect.Width, Math.Max(elementHeight, 26)), layoutGroup.RectTransform), color: Color.Transparent);
             var label = new GUITextBlock(new RectTransform(new Vector2(0.4f, 1), frame.RectTransform), displayName, font: GUI.SmallFont)
@@ -620,11 +652,11 @@ namespace Barotrauma
                 };
                 fields[i] = numberInput;
             }
-            Fields.Add(property.Name, fields);
+            if (!Fields.ContainsKey(property.Name)) { Fields.Add(property.Name, fields); }
             return frame;
         }
 
-        private GUIComponent CreateVector3Field(ISerializableEntity entity, SerializableProperty property, Vector3 value, string displayName, string toolTip)
+        public GUIComponent CreateVector3Field(ISerializableEntity entity, SerializableProperty property, Vector3 value, string displayName, string toolTip)
         {
             var frame = new GUIFrame(new RectTransform(new Point(Rect.Width, Math.Max(elementHeight, 26)), layoutGroup.RectTransform), color: Color.Transparent);
             var label = new GUITextBlock(new RectTransform(new Vector2(0.3f, 1), frame.RectTransform), displayName, font: GUI.SmallFont)
@@ -678,11 +710,11 @@ namespace Barotrauma
                 };
                 fields[i] = numberInput;
             }
-            Fields.Add(property.Name, fields);
+            if (!Fields.ContainsKey(property.Name)) { Fields.Add(property.Name, fields); }
             return frame;
         }
 
-        private GUIComponent CreateVector4Field(ISerializableEntity entity, SerializableProperty property, Vector4 value, string displayName, string toolTip)
+        public GUIComponent CreateVector4Field(ISerializableEntity entity, SerializableProperty property, Vector4 value, string displayName, string toolTip)
         {
             var frame = new GUIFrame(new RectTransform(new Point(Rect.Width, Math.Max(elementHeight, 26)), layoutGroup.RectTransform), color: Color.Transparent);
             var label = new GUITextBlock(new RectTransform(new Vector2(0.2f, 1), frame.RectTransform), displayName, font: GUI.SmallFont)
@@ -740,14 +772,14 @@ namespace Barotrauma
                 };
                 fields[i] = numberInput;
             }
-            Fields.Add(property.Name, fields);
+            if (!Fields.ContainsKey(property.Name)) { Fields.Add(property.Name, fields); }
             return frame;
         }
 
-        private GUIComponent CreateColorField(ISerializableEntity entity, SerializableProperty property, Color value, string displayName, string toolTip)
+        public GUIComponent CreateColorField(ISerializableEntity entity, SerializableProperty property, Color value, string displayName, string toolTip)
         {
             var frame = new GUIFrame(new RectTransform(new Point(Rect.Width, Math.Max(elementHeight, 26)), layoutGroup.RectTransform), color: Color.Transparent);
-            var label = new GUITextBlock(new RectTransform(new Vector2(0.2f, 1), frame.RectTransform) { MinSize = new Point(80, 26)}, displayName, font: GUI.SmallFont)
+            var label = new GUITextBlock(new RectTransform(new Vector2(0.2f, 1), frame.RectTransform) { MinSize = new Point(80, 26) }, displayName, font: GUI.SmallFont)
             {
                 ToolTip = toolTip
             };
@@ -807,11 +839,11 @@ namespace Barotrauma
                 colorBox.Color = (Color)property.GetValue(entity);
                 fields[i] = numberInput;
             }
-            Fields.Add(property.Name, fields);
+            if (!Fields.ContainsKey(property.Name)) { Fields.Add(property.Name, fields); }
             return frame;
         }
 
-        private GUIComponent CreateRectangleField(ISerializableEntity entity, SerializableProperty property, Rectangle value, string displayName, string toolTip)
+        public GUIComponent CreateRectangleField(ISerializableEntity entity, SerializableProperty property, Rectangle value, string displayName, string toolTip)
         {
             var frame = new GUIFrame(new RectTransform(new Point(Rect.Width, Math.Max(elementHeight, 26)), layoutGroup.RectTransform), color: Color.Transparent);
             var label = new GUITextBlock(new RectTransform(new Vector2(0.2f, 1), frame.RectTransform), displayName, font: GUI.SmallFont)
@@ -867,9 +899,43 @@ namespace Barotrauma
                 };
                 fields[i] = numberInput;
             }
-            Fields.Add(property.Name, fields);
+            if (!Fields.ContainsKey(property.Name)) { Fields.Add(property.Name, fields); }
             return frame;
         }
+
+        public void CreateTextPicker(string textTag, ISerializableEntity entity, SerializableProperty property, GUITextBox textBox)
+        {
+            var msgBox = new GUIMessageBox("", "", new string[] { TextManager.Get("Cancel") }, width: 300, height: 400);
+            msgBox.Buttons[0].OnClicked = msgBox.Close;
+
+            var textList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.8f), msgBox.Content.RectTransform, Anchor.TopCenter))
+            {
+                OnSelected = (component, userData) =>
+                {
+                    string text = userData as string ?? "";
+
+                    if (property.TrySetValue(entity, text))
+                    {
+                        TrySendNetworkUpdate(entity, property);
+                        textBox.Text = (string)property.GetValue(entity);
+                        textBox.Deselect();
+                    }
+                    return true;
+                }
+            };
+
+            textTag = textTag.ToLowerInvariant();
+            var tagTextPairs = TextManager.GetAllTagTextPairs();
+            foreach (KeyValuePair<string, string> tagTextPair in tagTextPairs)
+            {
+                if (!tagTextPair.Key.StartsWith(textTag)) { continue; }
+                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), textList.Content.RectTransform) { MinSize = new Point(0, 20) },
+                    ToolBox.LimitString(tagTextPair.Value, GUI.Font, textList.Content.Rect.Width))
+                {
+                    UserData = tagTextPair.Key
+                };
+            }
+        }
         
         private void TrySendNetworkUpdate(ISerializableEntity entity, SerializableProperty property)
         {

Barotrauma/BarotraumaClient/Source/Sounds/SoundPlayer.cs

@@ -372,167 +372,6 @@ namespace Barotrauma
             }
         }
 
-        private static void UpdateFireSounds(float deltaTime)
-        {
-            for (int i = 0; i < fireVolumeLeft.Length; i++)
-            {
-                fireVolumeLeft[i] = 0.0f;
-                fireVolumeRight[i] = 0.0f;
-            }
-
-            Vector2 listenerPos = new Vector2(GameMain.SoundManager.ListenerPosition.X, GameMain.SoundManager.ListenerPosition.Y);
-            foreach (Hull hull in Hull.hullList)
-            {
-                foreach (FireSource fs in hull.FireSources)
-                {
-                    Vector2 diff = fs.WorldPosition + fs.Size / 2 - listenerPos;
-                    if (Math.Abs(diff.X) < FireSoundRange && Math.Abs(diff.Y) < FireSoundRange)
-                    {
-                        Vector2 diffLeft = (fs.WorldPosition + new Vector2(fs.Size.X, fs.Size.Y / 2)) - listenerPos;
-                        if (diff.X < fs.Size.X / 2.0f) diff.X = 0.0f;
-                        if (diffLeft.X <= 0)
-                        {
-                            float distFallOffLeft = diffLeft.Length() / FireSoundRange;
-                            if (distFallOffLeft < 0.99f)
-                            {
-                                fireVolumeLeft[0] += (1.0f - distFallOffLeft) * (fs.Size.X / FireSoundLargeLimit);
-                                if (fs.Size.X > FireSoundLargeLimit) fireVolumeLeft[1] += (1.0f - distFallOffLeft) * ((fs.Size.X - FireSoundLargeLimit) / FireSoundLargeLimit);
-                            }
-                        }
-
-                        Vector2 diffRight = (fs.WorldPosition + new Vector2(0.0f, fs.Size.Y / 2)) - listenerPos;
-                        if (diff.X < fs.Size.X / 2.0f) diff.X = 0.0f;
-                        if (diffRight.X >= 0)
-                        {
-                            float distFallOffRight = diffRight.Length() / FireSoundRange;
-                            if (distFallOffRight < 0.99f)
-                            {
-                                fireVolumeRight[0] += 1.0f - distFallOffRight;
-                                if (fs.Size.X > FireSoundLargeLimit) fireVolumeRight[1] += (1.0f - distFallOffRight) * ((fs.Size.X - FireSoundLargeLimit) / FireSoundLargeLimit);
-                            }
-                        }
-                    }
-                }
-            }
-
-            for (int i = 0; i < fireVolumeLeft.Length; i++)
-            {
-                if (fireVolumeLeft[i] < 0.05f && fireVolumeRight[i] < 0.05f)
-                {
-                    if (fireSoundChannels[i] != null)
-                    {
-                        fireSoundChannels[i].FadeOutAndDispose();
-                        fireSoundChannels[i] = null;
-                    }
-                }
-                else
-                {
-                    Vector2 soundPos = new Vector2(GameMain.SoundManager.ListenerPosition.X + (fireVolumeRight[i] - fireVolumeLeft[i]) * 100, GameMain.SoundManager.ListenerPosition.Y);
-                    if (fireSoundChannels[i] == null || !fireSoundChannels[i].IsPlaying)
-                    {
-                        fireSoundChannels[i] = GetSound(i == 0 ? "fire" : "firelarge").Play(1.0f, FlowSoundRange, soundPos);
-                        fireSoundChannels[i].Looping = true;
-                    }
-                    fireSoundChannels[i].Gain = Math.Max(fireVolumeRight[i], fireVolumeLeft[i]);
-                    fireSoundChannels[i].Position = new Vector3(soundPos, 0.0f);
-                }
-            }
-        }
-
-            if (waterAmbiences.Count > 1)
-            {
-                if (waterAmbienceChannels[0] == null || !waterAmbienceChannels[0].IsPlaying)
-                {
-                    waterAmbienceChannels[0] = waterAmbiences[0].Play(ambienceVolume * (1.0f - movementSoundVolume),"waterambience");
-                    //waterAmbiences[0].Loop(waterAmbienceIndexes[0], ambienceVolume * (1.0f - movementSoundVolume));
-                    waterAmbienceChannels[0].Looping = true;
-                }
-                else
-                {
-                    waterAmbienceChannels[0].Gain = ambienceVolume * (1.0f - movementSoundVolume);
-                }
-
-                if (waterAmbienceChannels[1] == null || !waterAmbienceChannels[1].IsPlaying)
-                {
-                    waterAmbienceChannels[1] = waterAmbiences[1].Play(ambienceVolume * movementSoundVolume, "waterambience");
-                    //waterAmbienceIndexes[1] = waterAmbiences[1].Loop(waterAmbienceIndexes[1], ambienceVolume * movementSoundVolume);
-                    waterAmbienceChannels[1].Looping = true;
-                }
-                else
-                {
-                    waterAmbienceChannels[1].Gain = ambienceVolume * movementSoundVolume;
-                }
-            }
-        }
-
-        private static void UpdateWaterFlowSounds(float deltaTime)
-        {
-            if (FlowSounds.Count == 0) { return; }
-
-            float[] targetFlowLeft = new float[FlowSounds.Count];
-            float[] targetFlowRight = new float[FlowSounds.Count];
-
-            Vector2 listenerPos = new Vector2(GameMain.SoundManager.ListenerPosition.X, GameMain.SoundManager.ListenerPosition.Y);
-            foreach (Gap gap in Gap.GapList)
-            {
-                if (gap.Open < 0.01f) continue;
-                float gapFlow = Math.Abs(gap.LerpedFlowForce.X) + Math.Abs(gap.LerpedFlowForce.Y) * 2.5f;
-
-                if (gapFlow < 10.0f) continue;
-
-                int flowSoundIndex = (int)Math.Floor(MathHelper.Clamp(gapFlow / MaxFlowStrength, 0, FlowSounds.Count));
-                flowSoundIndex = Math.Min(flowSoundIndex, FlowSounds.Count - 1);
-
-                Vector2 diff = gap.WorldPosition - listenerPos;
-                if (Math.Abs(diff.X) < FlowSoundRange && Math.Abs(diff.Y) < FlowSoundRange)
-                {
-                    float dist = diff.Length();
-                    float distFallOff = dist / FlowSoundRange;
-                    if (distFallOff >= 0.99f) continue;
-
-                    //flow at the left side
-                    if (diff.X < 0)
-                    {
-                        targetFlowLeft[flowSoundIndex] = 1.0f - distFallOff;
-                    }
-                    else
-                    {
-                        targetFlowRight[flowSoundIndex] = 1.0f - distFallOff;
-                    }
-                }
-            }
-
-            for (int i = 0; i < FlowSounds.Count; i++)
-            {
-                flowVolumeLeft[i] = (targetFlowLeft[i] < flowVolumeLeft[i]) ?
-                    Math.Max(targetFlowLeft[i], flowVolumeLeft[i] - deltaTime) :
-                    Math.Min(targetFlowLeft[i], flowVolumeLeft[i] + deltaTime);
-                flowVolumeRight[i] = (targetFlowRight[i] < flowVolumeRight[i]) ?
-                     Math.Max(targetFlowRight[i], flowVolumeRight[i] - deltaTime) :
-                     Math.Min(targetFlowRight[i], flowVolumeRight[i] + deltaTime);
-
-                if (flowVolumeLeft[i] < 0.05f && flowVolumeRight[i] < 0.05f)
-                {
-                    if (flowSoundChannels[i] != null)
-                    {
-                        flowSoundChannels[i].Dispose();
-                        flowSoundChannels[i] = null;
-                    }
-                }
-                else
-                {
-                    Vector2 soundPos = new Vector2(GameMain.SoundManager.ListenerPosition.X + (flowVolumeRight[i] - flowVolumeLeft[i]) * 100, GameMain.SoundManager.ListenerPosition.Y);
-                    if (flowSoundChannels[i] == null || !flowSoundChannels[i].IsPlaying)
-                    {
-                        flowSoundChannels[i] = FlowSounds[i].Play(1.0f, FlowSoundRange, soundPos);
-                        flowSoundChannels[i].Looping = true;
-                    }
-                    flowSoundChannels[i].Gain = Math.Max(flowVolumeRight[i], flowVolumeLeft[i]);
-                    flowSoundChannels[i].Position = new Vector3(soundPos, 0.0f);
-                }
-            }
-        }
-
         private static void UpdateFireSounds(float deltaTime)
         {
             for (int i = 0; i < fireVolumeLeft.Length; i++)

Barotrauma/BarotraumaClient/Source/Sounds/VoipSound.cs

@@ -32,6 +32,9 @@ namespace Barotrauma.Sounds
         public bool UseRadioFilter;
         public bool UseMuffleFilter;
 
+        public float Near { get; private set; }
+        public float Far { get; private set; }
+
         private static BiQuad[] muffleFilters = new BiQuad[]
         {
             new LowpassFilter(VoipConfig.FREQUENCY, 800)
@@ -41,6 +44,16 @@ namespace Barotrauma.Sounds
             new BandpassFilter(VoipConfig.FREQUENCY, 2000)
         };
 
+        public float Gain
+        {
+            get { return soundChannel == null ? 0.0f : soundChannel.Gain; }
+            set
+            {
+                if (soundChannel == null) { return; }
+                soundChannel.Gain = value;
+            }
+        }
+
         public VoipSound(SoundManager owner, VoipQueue q) : base(owner, "voip", true, true)
         {
             VoipConfig.SetupEncoding();
@@ -64,8 +77,8 @@ namespace Barotrauma.Sounds
 
         public void SetRange(float near, float far)
         {
-            soundChannel.Near = near;
-            soundChannel.Far = far;
+            soundChannel.Near = Near = near;
+            soundChannel.Far = Far = far;
         }
 
         public void ApplyFilters(short[] buffer, int readSamples)

Barotrauma/BarotraumaClient/Source/Utils/LocalizationCSVtoXML.cs

@@ -151,6 +151,7 @@ namespace Barotrauma
 
             for (int i = traitStart + NPCPersonalityTrait.List.Count; i < csvContent.Length; i++) // Conversations
             {
+                string[] presplit = csvContent[i].Split(','); // Handling speaker index fetching, somehow doesn't work with the regex
                 string[] split = SplitCSV(csvContent[i]);
 
                 int emptyFields = 0;
@@ -172,20 +173,20 @@ namespace Barotrauma
                     continue;
                 }
 
-                string speaker = split[1];
-                int depthIndex = int.Parse(split[2]);
+                string speaker = presplit[1];
+                int depthIndex = int.Parse(presplit[2]);
                 // 3 = original line
                 string line = split[4].Replace("\"", "");
                 string flags = split[5].Replace("\"", "");
                 string allowedJobs = split[6].Replace("\"", "");
                 string speakerTags = split[7].Replace("\"", "");
-                string minIntensity = split[8].Replace("\"", "");
-                string maxIntensity = split[9].Replace("\"", "");
+                string minIntensity = split[8].Replace("\"", "").Replace(",", ".");
+                string maxIntensity = split[9].Replace("\"", "").Replace(",", ".");
 
                 string element =
                     $"{GetIndenting(depthIndex)}" +
                     $"<Conversation line=\"{line}\" " +
-                    $"{GetVariable("speaker" ,speaker)}" +
+                    $"{GetVariable("speaker", speaker)}" +
                     $"{GetVariable("flags", flags)}" +
                     $"{GetVariable("allowedjobs", allowedJobs)}" +
                     $"{GetVariable("speakertags", speakerTags)}" +