(7ae08a816) Incremented version number, changelog update

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)