v0.19.8.0

2022-09-28 21:30:52 -03:00
parent fec8131243
commit 3ca584f2fc
152 changed files with 1931 additions and 1071 deletions
@@ -1013,12 +1013,14 @@ namespace Barotrauma.Items.Components
                }
                else if (hullData.LinkedHulls.Any())
                {
-                    hullData.HullWaterAmount = 0.0f;
+                    float waterVolume = 0.0f;
+                    float totalVolume = 0.0f;
                    foreach (Hull linkedHull in hullData.LinkedHulls)
                    {
-                        hullData.HullWaterAmount += WaterDetector.GetWaterPercentage(linkedHull);
+                        waterVolume += linkedHull.WaterVolume;
+                        totalVolume += linkedHull.Volume;
                    }
-                    hullData.HullWaterAmount /= hullData.LinkedHulls.Count;
+                    hullData.HullWaterAmount = MathHelper.Clamp((int)Math.Ceiling(waterVolume / totalVolume * 100), 0, 100);
                }
                else
                {