Build 0.18.0.0

Barotrauma/BarotraumaClient/ClientSource/Map/ItemAssemblyPrefab.cs

@@ -80,15 +80,17 @@ namespace Barotrauma
             }
             Vector2 center = new Vector2((minX + maxX) / 2.0f, (minY + maxY) / 2.0f);
             if (Submarine.MainSub != null) { center -= Submarine.MainSub.HiddenSubPosition; }
-            center.X -= MathUtils.RoundTowardsClosest(center.X, Submarine.GridSize.X);
-            center.Y -= MathUtils.RoundTowardsClosest(center.Y, Submarine.GridSize.Y);
+
+            Vector2 offsetFromGrid = new Vector2(
+                MathUtils.RoundTowardsClosest(center.X, Submarine.GridSize.X) - center.X,
+                MathUtils.RoundTowardsClosest(center.Y, Submarine.GridSize.Y) - center.Y - Submarine.GridSize.Y / 2);
 
             MapEntity.SelectedList.Clear();
             assemblyEntities.ForEach(e => MapEntity.AddSelection(e));
 
             foreach (MapEntity mapEntity in assemblyEntities)
             {
-                mapEntity.Move(-center);
+                mapEntity.Move(-center - offsetFromGrid);
                 mapEntity.Submarine = Submarine.MainSub;
                 var entityElement = mapEntity.Save(element);
                 if (disabledEntities.Contains(mapEntity))

Barotrauma/BarotraumaClient/ClientSource/Map/Lights/ConvexHull.cs

@@ -461,7 +461,7 @@ namespace Barotrauma.Lights
                 Matrix.CreateTranslation(-origin.X, -origin.Y, 0.0f) * 
                 Matrix.CreateRotationZ(amount) *
                 Matrix.CreateTranslation(origin.X, origin.Y, 0.0f);
-            SetVertices(vertices.Select(v => v.Pos).ToArray(), rotationMatrix);
+            SetVertices(vertices.Select(v => v.Pos).ToArray(), rotationMatrix: rotationMatrix);
         }
 
         private void CalculateDimensions()
@@ -541,7 +541,7 @@ namespace Barotrauma.Lights
             }
         }
 
-        public void SetVertices(Vector2[] points, Matrix? rotationMatrix = null)
+        public void SetVertices(Vector2[] points, bool mergeOverlappingSegments = true, Matrix? rotationMatrix = null)
         {
             Debug.Assert(points.Length == 4, "Only rectangular convex hulls are supported");
 
@@ -594,13 +594,16 @@ namespace Barotrauma.Lights
 
             if (ParentEntity == null) { return; }
 
-            var chList = HullLists.Find(h => h.Submarine == ParentEntity.Submarine);
-            if (chList != null)
+            if (mergeOverlappingSegments)
             {
-                overlappingHulls.Clear();
-                foreach (ConvexHull ch in chList.List)
+                var chList = HullLists.Find(h => h.Submarine == ParentEntity.Submarine);
+                if (chList != null)
                 {
-                    MergeOverlappingSegments(ch);
+                    overlappingHulls.Clear();
+                    foreach (ConvexHull ch in chList.List)
+                    {
+                        MergeOverlappingSegments(ch);
+                    }
                 }
             }
         }

Barotrauma/BarotraumaClient/ClientSource/Map/RoundSound.cs

@@ -81,11 +81,18 @@ namespace Barotrauma
                 }
                 catch (System.IO.FileNotFoundException e)
                 {
-                    string errorMsg = "Failed to load sound file \"" + filename + "\".";
+                    string errorMsg = "Failed to load sound file \"" + filename + "\" (file not found).";
                     DebugConsole.ThrowError(errorMsg, e);
                     GameAnalyticsManager.AddErrorEventOnce("RoundSound.LoadRoundSound:FileNotFound" + filename, GameAnalyticsManager.ErrorSeverity.Error, errorMsg + "\n" + Environment.StackTrace.CleanupStackTrace());
                     return null;
                 }
+                catch (System.IO.InvalidDataException e)
+                {
+                    string errorMsg = "Failed to load sound file \"" + filename + "\" (invalid data).";
+                    DebugConsole.ThrowError(errorMsg, e);
+                    GameAnalyticsManager.AddErrorEventOnce("RoundSound.LoadRoundSound:InvalidData" + filename, GameAnalyticsManager.ErrorSeverity.Error, errorMsg + "\n" + Environment.StackTrace.CleanupStackTrace());
+                    return null;
+                }
             }
 
             RoundSound newSound = new RoundSound(element, existingSound);

Barotrauma/BarotraumaClient/ClientSource/Map/Submarine.cs

@@ -525,7 +525,7 @@ namespace Barotrauma
                         Item.ItemList.Count(it2 => it2.linkedTo.Contains(item) && !item.linkedTo.Contains(it2));
                     for (int i = 0; i < item.Connections.Count; i++)
                     {
-                        int wireCount = item.Connections[i].Wires.Count(w => w != null);
+                        int wireCount = item.Connections[i].Wires.Count;
                         if (doorLinks + wireCount > item.Connections[i].MaxWires)
                         {
                             errorMsgs.Add(TextManager.GetWithVariables("InsufficientFreeConnectionsWarning",