From 0b8005f7214a608a091a1fc4242df4fe1b18567d Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat, 18 May 2019 17:27:25 +0300
Subject: [PATCH] (5154265e6) Don't round ItemLabel text positions to the
 nearest pixel (causes weird looking "jitter" when the sub moves)

---
 .../Source/GUI/GUITextBlock.cs                |  9 +++-
 .../Source/Items/Components/ItemLabel.cs      |  3 +-
 .../BarotraumaShared/Source/GameSettings.cs   | 48 +++++++++++++++++++
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUITextBlock.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUITextBlock.cs
index 38f9b3483..5192c5a0f 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUITextBlock.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUITextBlock.cs
@@ -26,6 +26,8 @@ namespace Barotrauma
 
         public bool Wrap;
 
+        public bool RoundToNearestPixel = true;
+
         private bool overflowClipActive;
         public bool OverflowClip;
 
@@ -329,8 +331,11 @@ namespace Barotrauma
             if (!string.IsNullOrEmpty(text))
             {
                 Vector2 pos = rect.Location.ToVector2() + textPos + TextOffset;
-                pos.X = (int)pos.X;
-                pos.Y = (int)pos.Y;
+                if (RoundToNearestPixel)
+                {
+                    pos.X = (int)pos.X;
+                    pos.Y = (int)pos.Y;
+                }
 
                 Font.DrawString(spriteBatch,
                     Wrap ? wrappedText : text,
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/ItemLabel.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/ItemLabel.cs
index 512abe647..c837950c7 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/ItemLabel.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/ItemLabel.cs
@@ -105,7 +105,8 @@ namespace Barotrauma.Items.Components
                     textBlock = new GUITextBlock(new RectTransform(item.Rect.Size), "",
                         textColor: textColor, font: GUI.UnscaledSmallFont, textAlignment: Alignment.Center, wrap: true, style: null)
                     {
-                        TextDepth = item.SpriteDepth - 0.0001f,
+                        TextDepth = item.SpriteDepth - 0.00001f,
+                        RoundToNearestPixel = false,
                         TextScale = TextScale
                     };
                 }
diff --git a/Barotrauma/BarotraumaShared/Source/GameSettings.cs b/Barotrauma/BarotraumaShared/Source/GameSettings.cs
index d6722b111..64b8a8358 100644
--- a/Barotrauma/BarotraumaShared/Source/GameSettings.cs
+++ b/Barotrauma/BarotraumaShared/Source/GameSettings.cs
@@ -821,6 +821,54 @@ namespace Barotrauma
                     VoiceSetting = voiceSetting;
                 }
             }
+            if (!SelectedContentPackages.Any())
+            {
+                var availablePackage = ContentPackage.List.FirstOrDefault(cp => cp.IsCompatible() && cp.CorePackage);
+                if (availablePackage != null)
+                {
+                    SelectedContentPackages.Add(availablePackage);
+                }
+            }
+
+            //save to get rid of the invalid selected packages in the config file
+            if (missingPackagePaths.Count > 0 || incompatiblePackages.Count > 0) { SaveNewPlayerConfig(); }
+        }
+        #endregion
+
+        #region Save DefaultConfig
+        private void SaveNewDefaultConfig()
+        {
+            XDocument doc = new XDocument();
+
+            if (doc.Root == null)
+            {
+                doc.Add(new XElement("config"));
+            }
+
+            doc.Root.Add(
+                new XAttribute("language", TextManager.Language),
+                new XAttribute("masterserverurl", MasterServerUrl),
+                new XAttribute("autocheckupdates", AutoCheckUpdates),
+                new XAttribute("musicvolume", musicVolume),
+                new XAttribute("soundvolume", soundVolume),
+                new XAttribute("voicechatvolume", voiceChatVolume),
+                new XAttribute("verboselogging", VerboseLogging),
+                new XAttribute("savedebugconsolelogs", SaveDebugConsoleLogs),
+                new XAttribute("enablesplashscreen", EnableSplashScreen),
+                new XAttribute("usesteammatchmaking", useSteamMatchmaking),
+                new XAttribute("quickstartsub", QuickStartSubmarineName),
+                new XAttribute("requiresteamauthentication", requireSteamAuthentication),
+                new XAttribute("aimassistamount", aimAssistAmount));
+
+            if (!ShowUserStatisticsPrompt)
+            {
+                doc.Root.Add(new XAttribute("senduserstatistics", sendUserStatistics));
+            }
+
+            if (WasGameUpdated)
+            {
+                doc.Root.Add(new XAttribute("wasgameupdated", true));
+            }
             
             useSteamMatchmaking = doc.Root.GetAttributeBool("usesteammatchmaking", useSteamMatchmaking);
             requireSteamAuthentication = doc.Root.GetAttributeBool("requiresteamauthentication", requireSteamAuthentication);