v1.0.13.1 (first post-1.0 patch)

Barotrauma/BarotraumaClient/ClientSource/Map/Gap.cs

@@ -2,6 +2,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
+using System.Linq;
 
 namespace Barotrauma
 {
@@ -320,5 +321,45 @@ namespace Barotrauma
                 return IsHorizontal ? rect.Height : rect.Width;
             }
         }
+
+        public override void UpdateEditing(Camera cam, float deltaTime)
+        {
+            if (editingHUD == null || editingHUD.UserData != this)
+            {
+                editingHUD = CreateEditingHUD();
+            }
+        }
+        private GUIComponent CreateEditingHUD(bool inGame = false)
+        {
+
+            editingHUD = new GUIFrame(new RectTransform(new Vector2(0.3f, 0.15f), GUI.Canvas, Anchor.CenterRight) { MinSize = new Point(400, 0) })
+            {
+                UserData = this
+            };
+
+            var paddedFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.85f), editingHUD.RectTransform, Anchor.Center))
+            {
+                Stretch = true,
+                AbsoluteSpacing = (int)(GUI.Scale * 5)
+            };
+
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.2f), paddedFrame.RectTransform), TextManager.Get("entityname.gap"), font: GUIStyle.LargeFont);
+            var hiddenInGameTickBox = new GUITickBox(new RectTransform(new Vector2(0.5f, 1.0f), paddedFrame.RectTransform), TextManager.Get("sp.hiddeningame.name"))
+            {
+                Selected = HiddenInGame
+            };
+            hiddenInGameTickBox.OnSelected += (GUITickBox tickbox) =>
+            {
+                HiddenInGame = tickbox.Selected;
+                return true;
+            };
+            editingHUD.RectTransform.Resize(new Point(
+                editingHUD.Rect.Width,
+                (int)(paddedFrame.Children.Sum(c => c.Rect.Height + paddedFrame.AbsoluteSpacing) / paddedFrame.RectTransform.RelativeSize.Y * 1.25f)));
+
+            PositionEditingHUD();
+
+            return editingHUD;
+        }
     }
 }

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

@@ -240,7 +240,8 @@ namespace Barotrauma.Lights
                     range *
                     ((Character.Controlled?.Submarine != null && light.ParentSub == Character.Controlled?.Submarine) ? 2.0f : 1.0f) *
                     (light.CastShadows ? 10.0f : 1.0f) *
-                    (light.LightSourceParams.OverrideLightSpriteAlpha ?? (light.Color.A / 255.0f));
+                    (light.LightSourceParams.OverrideLightSpriteAlpha ?? (light.Color.A / 255.0f)) *
+                    light.PriorityMultiplier;
             }
 
             //find the lights with an active light volume

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

@@ -377,6 +377,8 @@ namespace Barotrauma.Lights
 
         public float Priority;
 
+        public float PriorityMultiplier = 1.0f;
+
         private Vector2 lightTextureTargetSize;
 
         public Vector2 LightTextureTargetSize

Barotrauma/BarotraumaClient/ClientSource/Map/Structure.cs

@@ -537,7 +537,7 @@ namespace Barotrauma
                 float damage = msg.ReadRangedSingle(0.0f, 1.0f, 8) * MaxHealth;
                 if (!invalidMessage && i < Sections.Length)
                 {
-                    SetDamage(i, damage);
+                    SetDamage(i, damage, isNetworkEvent: true);
                 }
             }
         }