(7ae08a816) Incremented version number, changelog update

Barotrauma/BarotraumaClient/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.5")]
+[assembly: AssemblyVersion("0.9.0.6")]
-[assembly: AssemblyFileVersion("0.9.0.5")]
+[assembly: AssemblyFileVersion("0.9.0.6")]

Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs

@@ -578,6 +578,42 @@ namespace Barotrauma
                     editingHUD = null;
                 }
             }
+
+            if ((PlayerInput.KeyDown(Keys.LeftControl) || PlayerInput.KeyDown(Keys.RightControl)))
+            {
+                if (PlayerInput.KeyHit(Keys.N))
+                {
+                    float minX = selectedList[0].WorldRect.X, maxX = selectedList[0].WorldRect.Right;
+                    for (int i = 0; i < selectedList.Count; i++)
+                    {
+                        minX = Math.Min(minX, selectedList[i].WorldRect.X);
+                        maxX = Math.Max(maxX, selectedList[i].WorldRect.Right);
+                    }
+
+                    float centerX = (minX + maxX) / 2.0f;
+                    foreach (MapEntity me in selectedList)
+                    {
+                        me.FlipX(false);
+                        me.Move(new Vector2((centerX - me.WorldPosition.X) * 2.0f, 0.0f));
+                    }
+                }
+                else if (PlayerInput.KeyHit(Keys.M))
+                {
+                    float minY = selectedList[0].WorldRect.Y - selectedList[0].WorldRect.Height, maxY = selectedList[0].WorldRect.Y;
+                    for (int i = 0; i < selectedList.Count; i++)
+                    {
+                        minY = Math.Min(minY, selectedList[i].WorldRect.Y - selectedList[i].WorldRect.Height);
+                        maxY = Math.Max(maxY, selectedList[i].WorldRect.Y);
+                    }
+
+                    float centerY = (minY + maxY) / 2.0f;
+                    foreach (MapEntity me in selectedList)
+                    {
+                        me.FlipY(false);
+                        me.Move(new Vector2(0.0f, (centerY - me.WorldPosition.Y) * 2.0f));
+                    }
+                }
+            }
             FilteredSelectedList.Clear();
             if (selectedList.Count == 0) return;
             foreach (var e in selectedList)

Barotrauma/BarotraumaServer/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.5")]
+[assembly: AssemblyVersion("0.9.0.6")]
-[assembly: AssemblyFileVersion("0.9.0.5")]
+[assembly: AssemblyFileVersion("0.9.0.6")]

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -842,10 +842,33 @@ namespace Barotrauma
                 {
                     humanConfigFile = GetConfigFile("Human");
                 }
-                return humanConfigFile;
+                return characterConfigFiles;
             }
         }
 
+        public static string GetConfigFile(string speciesName, ContentPackage contentPackage = null)
+        {
+            string configFile = null;
+            if (contentPackage == null)
+            {
+                configFile = GameMain.Instance.GetFilesOfType(ContentType.Character, searchAllContentPackages: true)
+                    .FirstOrDefault(c => Path.GetFileName(c).ToLowerInvariant() == $"{speciesName.ToLowerInvariant()}.xml");
+            }
+            else
+            {
+                configFile = contentPackage.GetFilesOfType(ContentType.Character)?
+                    .FirstOrDefault(c => Path.GetFileName(c).ToLowerInvariant() == $"{speciesName.ToLowerInvariant()}.xml");
+            }
+
+            if (configFile == null)
+            {
+                DebugConsole.ThrowError($"Couldn't find a config file for {speciesName} from the selected content packages!");
+                DebugConsole.ThrowError($"(The config file must end with \"{speciesName}.xml\")");
+                return string.Empty;
+            }
+            return configFile;
+        }
+
         private static IEnumerable<string> characterConfigFiles;
         private static IEnumerable<string> CharacterConfigFiles
         {
@@ -920,25 +943,6 @@ namespace Barotrauma
                 }
                 return characterConfigFiles;
             }
-        }
-
-        /// <summary>
-        /// Searches for a character config file from all currently selected content packages, 
-        /// or from a specific package if the contentPackage parameter is given.
-        /// </summary>
-        public static string GetConfigFile(string speciesName, ContentPackage contentPackage = null)
-        {
-            string configFile = null;
-            if (contentPackage == null)
-            {
-                configFile = GameMain.Instance.GetFilesOfType(ContentType.Character)
-                    .FirstOrDefault(c => Path.GetFileName(c).ToLowerInvariant() == $"{speciesName.ToLowerInvariant()}.xml");
-            }
-            else
-            {
-                configFile = contentPackage.GetFilesOfType(ContentType.Character)?
-                    .FirstOrDefault(c => Path.GetFileName(c).ToLowerInvariant() == $"{speciesName.ToLowerInvariant()}.xml");
-            }
 #endif
 
             if (configFile == null)

Barotrauma/BarotraumaShared/Source/Map/Structure.cs

@@ -373,6 +373,13 @@ namespace Barotrauma
             return Name;
         }
 
+        partial void InitProjSpecific();
+
+        public override string ToString()
+        {
+            return Name;
+        }
+
         public override MapEntity Clone()
         {
             var clone = new Structure(rect, Prefab, Submarine)

Barotrauma/BarotraumaShared/changelog.txt

@@ -1,3 +1,10 @@
+---------------------------------------------------------------------------------------------------------
+v0.9.0.6
+---------------------------------------------------------------------------------------------------------
+
+- Fixed clients failing to connect to servers that have banned clients based on their Steam ID.
+- Removed Berilia (vanilla sub that's not ready for release).
+
 ---------------------------------------------------------------------------------------------------------
 v0.9.0.5
 ---------------------------------------------------------------------------------------------------------