Unstable 0.17.3.0

Barotrauma/BarotraumaClient/ClientSource/Map/Creatures/BallastFloraBehavior.cs

@@ -370,6 +370,7 @@ namespace Barotrauma.MapCreatures.Behavior
         private BallastFloraBranch ReadBranch(IReadMessage msg)
         {
             int id = msg.ReadInt32();
+            bool isRootGrowth = msg.ReadBoolean();
             byte type = (byte)msg.ReadRangedInteger(0b0000, 0b1111);
             byte sides = (byte)msg.ReadRangedInteger(0b0000, 0b1111);
             int flowerConfig = msg.ReadRangedInteger(0, 0xFFF);
@@ -385,7 +386,8 @@ namespace Barotrauma.MapCreatures.Behavior
             {
                 ID = id,
                 MaxHealth = maxHealth,
-                Sides = (TileSide) sides
+                Sides = (TileSide) sides,
+                IsRootGrowth = isRootGrowth
             };
         }
     }

Barotrauma/BarotraumaClient/ClientSource/Map/WayPoint.cs

@@ -272,11 +272,7 @@ namespace Barotrauma
 
         private GUIComponent CreateEditingHUD()
         {
-            int width = 500;
-            int height = spawnType == SpawnType.Path ? 80 : 200;
-            int x = GameMain.GraphicsWidth / 2 - width / 2, y = 30;
-
-            editingHUD = new GUIFrame(new RectTransform(new Point(width, height), GUI.Canvas) { ScreenSpaceOffset = new Point(x, y) })
+            editingHUD = new GUIFrame(new RectTransform(new Vector2(0.3f, 0.15f), GUI.Canvas, Anchor.CenterRight) { MinSize = new Point(400, 0) })
             {
                 UserData = this
             };
@@ -284,7 +280,7 @@ namespace Barotrauma
             var paddedFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.85f), editingHUD.RectTransform, Anchor.Center))
             {
                 Stretch = true,
-                RelativeSpacing = 0.05f
+                AbsoluteSpacing = (int)(GUI.Scale * 5)
             };
 
             if (spawnType == SpawnType.Path)
@@ -418,6 +414,10 @@ namespace Barotrauma
                 };
             }
 
+            editingHUD.RectTransform.Resize(new Point(
+                editingHUD.Rect.Width,
+                (int)(paddedFrame.Children.Sum(c => c.Rect.Height + paddedFrame.AbsoluteSpacing) / paddedFrame.RectTransform.RelativeSize.Y)));
+
             PositionEditingHUD();
 
             return editingHUD;