2f107db...5202af9

Barotrauma/BarotraumaClient/Source/Items/Components/Door.cs

@@ -4,7 +4,6 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
 
-
 namespace Barotrauma.Items.Components
 {
     partial class Door : Pickable, IDrawableComponent, IServerSerializable
@@ -12,6 +11,15 @@ namespace Barotrauma.Items.Components
         private ConvexHull convexHull;
         private ConvexHull convexHull2;
 
+        //openState when the vertices of the convex hull were last calculated
+        private float lastConvexHullState;
+
+        public Vector2 DrawSize
+        {
+            //use the extents of the item as the draw size
+            get { return Vector2.Zero; }
+        }
+
         private Vector2[] GetConvexHullCorners(Rectangle rect)
         {
             Vector2[] corners = new Vector2[4];
@@ -32,7 +40,7 @@ namespace Barotrauma.Items.Components
                 (int)(doorSprite.size.Y * item.Scale));
 
             Rectangle rect = doorRect;
-            if (isHorizontal)
+            if (IsHorizontal)
             {
                 rect.Width = (int)(rect.Width * (1.0f - openState));
             }
@@ -41,9 +49,9 @@ namespace Barotrauma.Items.Components
                 rect.Height = (int)(rect.Height * (1.0f - openState));
             }
 
-            if (window.Height > 0 && window.Width > 0)
+            if (Window.Height > 0 && Window.Width > 0)
             {
-                rect.Height = -(int)(window.Y * item.Scale);
+                rect.Height = -(int)(Window.Y * item.Scale);
 
                 rect.Y += (int)(doorRect.Height * openState);
                 rect.Height = Math.Max(rect.Height - (rect.Y - doorRect.Y), 0);
@@ -52,7 +60,7 @@ namespace Barotrauma.Items.Components
                 if (convexHull2 != null)
                 {
                     Rectangle rect2 = doorRect;
-                    rect2.Y = rect2.Y + (int)((window.Y * item.Scale - window.Height * item.Scale));
+                    rect2.Y = rect2.Y + (int)((Window.Y * item.Scale - Window.Height * item.Scale));
 
                     rect2.Y += (int)(doorRect.Height * openState);
                     rect2.Y = Math.Min(doorRect.Y, rect2.Y);
@@ -105,11 +113,11 @@ namespace Barotrauma.Items.Components
 
             if (openState == 1.0f)
             {
-                body.Enabled = false;
+                Body.Enabled = false;
                 return;
             }
 
-            if (isHorizontal)
+            if (IsHorizontal)
             {
                 Vector2 pos = new Vector2(item.Rect.X, item.Rect.Y - item.Rect.Height / 2);
                 if (item.Submarine != null) pos += item.Submarine.DrawPosition;
@@ -159,9 +167,49 @@ namespace Barotrauma.Items.Components
                             (int)brokenSprite.size.X, (int)(brokenSprite.size.Y * (1.0f - openState))),
                         color * alpha, 0.0f, brokenSprite.Origin, scale * item.Scale, SpriteEffects.None, brokenSprite.Depth);
                 }
+            }
+        }
 
+
+        partial void SetState(bool open, bool isNetworkMessage, bool sendNetworkMessage)
+        {
+            if (isStuck ||
+                (PredictedState == null && isOpen == open) ||
+                (PredictedState != null && isOpen == PredictedState.Value && isOpen == open))
+            {
+                return;
             }
 
+            if (GameMain.Client != null && !isNetworkMessage)
+            {
+                bool stateChanged = open != PredictedState;
+
+                //clients can "predict" that the door opens/closes when a signal is received
+                //the prediction will be reset after 1 second, setting the door to a state
+                //sent by the server, or reverting it back to its old state if no msg from server was received
+                PredictedState = open;
+                resetPredictionTimer = CorrectionDelay;
+                if (stateChanged) PlaySound(ActionType.OnUse, item.WorldPosition);
+            }
+            else
+            {
+                isOpen = open;
+                if (!isNetworkMessage || open != PredictedState) PlaySound(ActionType.OnUse, item.WorldPosition);
+            }
+
+            //opening a partially stuck door makes it less stuck
+            if (isOpen) stuck = MathHelper.Clamp(stuck - 30.0f, 0.0f, 100.0f);
+            
+        }
+
+        public override void ClientRead(ServerNetObject type, Lidgren.Network.NetBuffer msg, float sendingTime)
+        {
+            base.ClientRead(type, msg, sendingTime);
+
+            SetState(msg.ReadBoolean(), isNetworkMessage: true, sendNetworkMessage: false);
+            Stuck = msg.ReadRangedSingle(0.0f, 100.0f, 8);
+
+            PredictedState = null;
         }
     }
 }

Barotrauma/BarotraumaClient/Source/Items/Components/ItemComponent.cs

@@ -35,7 +35,15 @@ namespace Barotrauma.Items.Components
             get { return RoundSound.Range; }
         }
 
-
+        public float VolumeMultiplier
+        {
+            get { return RoundSound.Volume; }
+        }
+        
+        public float Range
+        {
+            get { return RoundSound.Range; }
+        }
 
         public readonly bool Loop;
 
@@ -309,15 +317,15 @@ namespace Barotrauma.Items.Components
 
         private float GetSoundVolume(ItemSound sound)
         {
-            if (sound == null) return 0.0f;
-            if (sound.VolumeProperty == "") return 1.0f;
+            if (sound == null) { return 0.0f; }
+            if (sound.VolumeProperty == "") { return sound.VolumeMultiplier; }
 
-            if (properties.TryGetValue(sound.VolumeProperty.ToLowerInvariant(), out SerializableProperty property))
+            if (properties.TryGetValue(sound.VolumeProperty, out SerializableProperty property))
             {
                 float newVolume = 0.0f;
                 try
                 {
-                    newVolume = (float)property.GetValue();
+                    newVolume = (float)property.GetValue(this);
                 }
                 catch
                 {
@@ -353,7 +361,7 @@ namespace Barotrauma.Items.Components
             {
                 return null;
             }
-            foreach (ItemComponent component in item.components)
+            foreach (ItemComponent component in item.Components)
             {
                 if (component.name.ToLower() == LinkUIToComponent.ToLower())
                 {
@@ -427,9 +435,10 @@ namespace Barotrauma.Items.Components
                     }
                     
                     RoundSound sound = Submarine.LoadRoundSound(subElement);
+                    if (sound == null) { break; }
                     ItemSound itemSound = new ItemSound(sound, type, subElement.GetAttributeBool("loop", false))
                     {
-                        VolumeProperty = subElement.GetAttributeString("volumeproperty", "")
+                        VolumeProperty = subElement.GetAttributeString("volumeproperty", "").ToLowerInvariant()
                     };
 
                     if (soundSelectionModes == null) soundSelectionModes = new Dictionary<ActionType, SoundSelectionMode>();

Barotrauma/BarotraumaClient/Source/Items/Components/ItemContainer.cs

@@ -72,7 +72,13 @@ namespace Barotrauma.Items.Components
             get;
             set;
         }
-        
+
+        public Vector2 DrawSize
+        {
+            //use the extents of the item as the draw size
+            get { return Vector2.Zero; }
+        }
+
         partial void InitProjSpecific(XElement element)
         {
             foreach (XElement subElement in element.Elements())
@@ -169,9 +175,10 @@ namespace Barotrauma.Items.Components
                     item.IsHighlighted = false;
                 }
 
-                if (containedItem.body != null)
+                if (containedItem.body != null && 
+                    Math.Abs(containedItem.body.FarseerBody.Rotation - currentRotation) > 0.001f)
                 {
-                    containedItem.body.FarseerBody.Rotation = currentRotation;
+                    containedItem.body.SetTransformIgnoreContacts(containedItem.body.SimPosition, currentRotation);
                 }
 
                 containedItem.Sprite.Draw(

Barotrauma/BarotraumaClient/Source/Items/Components/ItemLabel.cs

@@ -209,6 +209,7 @@ namespace Barotrauma.Items.Components
                 return;
             }
 
+            textBlock.TextDepth = item.SpriteDepth - 0.0001f;
             textBlock.TextOffset = drawPos - textBlock.Rect.Location.ToVector2() + new Vector2(scrollAmount + scrollPadding, 0.0f);
             textBlock.DrawManually(spriteBatch);
         }

Barotrauma/BarotraumaClient/Source/Items/Components/LightComponent.cs

@@ -8,6 +8,11 @@ namespace Barotrauma.Items.Components
 {
     partial class LightComponent : Powered, IServerSerializable, IDrawableComponent
     {
+        public Vector2 DrawSize
+        {
+            get { return new Vector2(light.Range * 2, light.Range * 2); }
+        }
+
         private LightSource light;
         public LightSource Light
         {

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Controller.cs

@@ -8,7 +8,7 @@ namespace Barotrauma.Items.Components
         {
             if (focusTarget != null && character.ViewTarget == focusTarget)
             {
-                foreach (ItemComponent ic in focusTarget.components)
+                foreach (ItemComponent ic in focusTarget.Components)
                 {
                     ic.DrawHUD(spriteBatch, character);
                 }

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Deconstructor.cs

@@ -79,12 +79,8 @@ namespace Barotrauma.Items.Components
             SetActive(!IsActive, Character.Controlled);
 
             currPowerConsumption = IsActive ? powerConsumption : 0.0f;
-
-            if (GameMain.Server != null)
-            {
-                item.CreateServerEvent(this);
-            }
-            else if (GameMain.Client != null)
+            
+            if (GameMain.Client != null)
             {
                 item.CreateClientEvent(this);
             }

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Engine.cs

@@ -22,6 +22,12 @@ namespace Barotrauma.Items.Components
             private set;
         }
 
+        public Vector2 DrawSize
+        {
+            //use the extents of the item as the draw size
+            get { return Vector2.Zero; }
+        }
+
         partial void InitProjSpecific(XElement element)
         {
             powerIndicator = new GUITickBox(new RectTransform(new Point(30, 30), GuiFrame.RectTransform) { RelativeOffset = new Vector2(0.05f, 0.15f) }, 
@@ -51,12 +57,8 @@ namespace Barotrauma.Items.Components
                     if (Math.Abs(newTargetForce - targetForce) < 0.01) return false;
 
                     targetForce = newTargetForce;
-                    if (GameMain.Server != null)
-                    {
-                        item.CreateServerEvent(this);
-                        GameServer.Log(Character.Controlled.LogName + " set the force speed of " + item.Name + " to " + (int)(targetForce) + " %", ServerLog.MessageType.ItemInteraction);
-                    }
-                    else if (GameMain.Client != null)
+
+                    if (GameMain.Client != null)
                     {
                         correctionTimer = CorrectionDelay;
                         item.CreateClientEvent(this);

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Fabricator.cs

@@ -306,13 +306,6 @@ namespace Barotrauma.Items.Components
                 new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedFrame.RectTransform), text,
                     textColor: inadequateSkills.Any() ? Color.Red : Color.LightGreen, font: GUI.SmallFont);
             }
-            
-            if (tooltip != null)
-            {
-                GUIComponent.DrawToolTip(spriteBatch, tooltip.Second, tooltip.First);
-                tooltip = null;
-            }
-        }
 
             float degreeOfSuccess = user == null ? 0.0f : DegreeOfSuccess(user, selectedItem.RequiredSkills);
             if (degreeOfSuccess > 0.5f) { degreeOfSuccess = 1.0f; }
@@ -343,11 +336,7 @@ namespace Barotrauma.Items.Components
                 CancelFabricating(Character.Controlled);
             }
 
-            if (GameMain.Server != null)
-            {
-                item.CreateServerEvent(this);
-            }
-            else if (GameMain.Client != null)
+            if (GameMain.Client != null)
             {
                 item.CreateClientEvent(this);
             }

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/MiniMap.cs

@@ -79,7 +79,7 @@ namespace Barotrauma.Items.Components
                 CreateHUD();
             }
 
-            float distort = 1.0f - item.Condition / 100.0f;
+            float distort = 1.0f - item.Condition / item.Prefab.Health;
             foreach (HullData hullData in hullDatas.Values)
             {
                 hullData.DistortionTimer -= deltaTime;

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Pump.cs

@@ -59,12 +59,7 @@ namespace Barotrauma.Items.Components
                 IsActive = active;
                 if (!IsActive) currPowerConsumption = 0.0f;
 
-                if (GameMain.Server != null)
-                {
-                    item.CreateServerEvent(this);
-                    GameServer.Log(Character.Controlled.LogName + (IsActive ? " turned on " : " turned off ") + item.Name, ServerLog.MessageType.ItemInteraction);
-                }
-                else if (GameMain.Client != null)
+                if (GameMain.Client != null)
                 {
                     correctionTimer = CorrectionDelay;
                     item.CreateClientEvent(this);
@@ -102,12 +97,8 @@ namespace Barotrauma.Items.Components
                     if (Math.Abs(newValue - FlowPercentage) < 0.1f) return false;
 
                     FlowPercentage = newValue;
-                    if (GameMain.Server != null)
-                    {
-                        item.CreateServerEvent(this);
-                        GameServer.Log(Character.Controlled.LogName + " set the pumping speed of " + item.Name + " to " + (int)(flowPercentage) + " %", ServerLog.MessageType.ItemInteraction);
-                    }
-                    else if (GameMain.Client != null)
+
+                    if (GameMain.Client != null)
                     {
                         correctionTimer = CorrectionDelay;
                         item.CreateClientEvent(this);

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs

@@ -162,10 +162,6 @@ namespace Barotrauma.Items.Components
                 OnMoved = (GUIScrollBar bar, float scrollAmount) =>
                 {
                     LastUser = Character.Controlled;
-                    if (nextServerLogWriteTime == null)
-                    {
-                        nextServerLogWriteTime = Math.Max(lastServerLogWriteTime + 1.0f, (float)Timing.TotalTime);
-                    }
                     unsentChanges = true;
                     targetFissionRate = scrollAmount * 100.0f;
 
@@ -181,10 +177,6 @@ namespace Barotrauma.Items.Components
                 OnMoved = (GUIScrollBar bar, float scrollAmount) =>
                 {
                     LastUser = Character.Controlled;
-                    if (nextServerLogWriteTime == null)
-                    {
-                        nextServerLogWriteTime = Math.Max(lastServerLogWriteTime + 1.0f, (float)Timing.TotalTime);
-                    }
                     unsentChanges = true;
                     targetTurbineOutput = scrollAmount * 100.0f;
 
@@ -209,10 +201,6 @@ namespace Barotrauma.Items.Components
                 OnMoved = (scrollBar, scrollAmount) =>
                 {
                     LastUser = Character.Controlled;
-                    if (nextServerLogWriteTime == null)
-                    {
-                        nextServerLogWriteTime = Math.Max(lastServerLogWriteTime + 1.0f, (float)Timing.TotalTime);
-                    }
                     unsentChanges = true;
                     return true;
                 }
@@ -227,10 +215,6 @@ namespace Barotrauma.Items.Components
                 OnMoved = (scrollBar, scrollAmount) =>
                 {
                     LastUser = Character.Controlled;
-                    if (nextServerLogWriteTime == null)
-                    {
-                        nextServerLogWriteTime = Math.Max(lastServerLogWriteTime + 1.0f, (float)Timing.TotalTime);
-                    }
                     unsentChanges = true;
                     return true;
                 }

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Sonar.cs

@@ -11,6 +11,12 @@ namespace Barotrauma.Items.Components
 {
     partial class Sonar : Powered, IServerSerializable, IClientSerializable
     {
+        enum Mode
+        {
+            Active,
+            Passive
+        };
+
         private bool unsentChanges;
         private float networkUpdateTimer;
 
@@ -86,17 +92,12 @@ namespace Barotrauma.Items.Components
                 ToolTip = TextManager.Get("SonarTipActive"),
                 OnSelected = (GUITickBox box) =>
                 {
-                    if (GameMain.Server != null)
-                    {
-                        unsentChanges = true;
-                    }
-                    else if (GameMain.Client != null)
+                    IsActive = box.Selected;
+                    if (GameMain.Client != null)
                     {
                         unsentChanges = true;
                         correctionTimer = CorrectionDelay;
                     }
-                    IsActive = box.Selected;
-
                     return true;
                 }
             };
@@ -111,11 +112,7 @@ namespace Barotrauma.Items.Components
                 OnMoved = (scrollbar, scroll) =>
                 {
                     zoom = MathHelper.Lerp(MinZoom, MaxZoom, scroll);
-                    if (GameMain.Server != null)
-                    {
-                        unsentChanges = true;
-                    }
-                    else if (GameMain.Client != null)
+                    if (GameMain.Client != null)
                     {
                         unsentChanges = true;
                         correctionTimer = CorrectionDelay;
@@ -136,11 +133,7 @@ namespace Barotrauma.Items.Components
                 OnSelected = (tickBox) =>
                 {
                     useDirectionalPing = tickBox.Selected;
-                    if (GameMain.Server != null)
-                    {
-                        unsentChanges = true;
-                    }
-                    else if (GameMain.Client != null)
+                    if (GameMain.Client != null)
                     {
                         unsentChanges = true;
                         correctionTimer = CorrectionDelay;
@@ -154,11 +147,7 @@ namespace Barotrauma.Items.Components
                 {
                     float pingAngle = MathHelper.Lerp(0.0f, MathHelper.TwoPi, scroll);
                     pingDirection = new Vector2((float)Math.Cos(pingAngle), (float)Math.Sin(pingAngle));
-                    if (GameMain.Server != null)
-                    {
-                        unsentChanges = true;
-                    }
-                    else if (GameMain.Client != null)
+                    if (GameMain.Client != null)
                     {
                         unsentChanges = true;
                         correctionTimer = CorrectionDelay;
@@ -168,9 +157,12 @@ namespace Barotrauma.Items.Components
             };
             
             signalWarningText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), paddedControlContainer.RectTransform), "", Color.Orange, textAlignment: Alignment.Center);
-            
-            GUITickBox.CreateRadioButtonGroup(new List<GUITickBox>() { activeTickBox, passiveTickBox });
 
+            GUIRadioButtonGroup sonarMode = new GUIRadioButtonGroup();
+            sonarMode.AddRadioButton(Mode.Active, activeTickBox);
+            sonarMode.AddRadioButton(Mode.Passive, passiveTickBox);
+            sonarMode.Selected = Mode.Passive;
+            
             GuiFrame.CanBeFocused = false;
         }
 
@@ -183,27 +175,20 @@ namespace Barotrauma.Items.Components
 
         public override void UpdateHUD(Character character, float deltaTime, Camera cam)
         {
-            if (unsentChanges)
+            if (GameMain.Client != null)
             {
-                if (networkUpdateTimer <= 0.0f)
+                if (unsentChanges)
                 {
-#if CLIENT
-                    if (GameMain.Client != null)
+                    if (networkUpdateTimer <= 0.0f)
                     {
                         item.CreateClientEvent(this);
                         correctionTimer = CorrectionDelay;
+                        networkUpdateTimer = 0.1f;
+                        unsentChanges = false;
                     }
-#endif
-                    if (GameMain.Server != null)
-                    {
-                        item.CreateServerEvent(this);
-                    }
-
-                    networkUpdateTimer = 0.1f;
-                    unsentChanges = false;
                 }
+                networkUpdateTimer -= deltaTime;
             }
-            networkUpdateTimer -= deltaTime;
 
             if (sonarView.Rect.Contains(PlayerInput.MousePosition))
             {
@@ -215,7 +200,7 @@ namespace Barotrauma.Items.Components
                 }
             }
 
-            float distort = 1.0f - item.Condition / 100.0f;
+            float distort = 1.0f - item.Condition / item.Prefab.Health;
             for (int i = sonarBlips.Count - 1; i >= 0; i--)
             {
                 sonarBlips[i].FadeTimer -= deltaTime * MathHelper.Lerp(0.5f, 2.0f, distort);
@@ -304,18 +289,22 @@ namespace Barotrauma.Items.Components
                 return;
             }
 
-            float passivePingRadius = (float)Math.Sin(Timing.TotalTime * 10);
+            float passivePingRadius = (float)(Timing.TotalTime % 1.0f);
             if (passivePingRadius > 0.0f)
             {
                 disruptedDirections.Clear();
                 foreach (AITarget t in AITarget.List)
                 {
-                    if (t.SoundRange <= 0.0f || !t.Enabled) continue;
+                    if (t.SoundRange <= 0.0f || !t.Enabled) { continue; }
+                    
+                    float distSqr = Vector2.DistanceSquared(t.WorldPosition, transducerCenter);
+                    if (distSqr > t.SoundRange * t.SoundRange * 2) { continue; }
 
-                    if (Vector2.DistanceSquared(t.WorldPosition, transducerCenter) < t.SoundRange * t.SoundRange)
+                    float dist = (float)Math.Sqrt(distSqr);
+                    if (dist > prevPassivePingRadius * Range && dist <= passivePingRadius * Range)
                     {
-                        Ping(t.WorldPosition, transducerCenter, 
-                            t.SoundRange * passivePingRadius * 0.2f, t.SoundRange * prevPassivePingRadius * 0.2f, displayScale, t.SoundRange, 
+                        Ping(t.WorldPosition, transducerCenter,
+                            Math.Min(t.SoundRange, range * 0.5f) * displayScale, 0, displayScale, Math.Min(t.SoundRange, range * 0.5f), 
                             passive: true, pingStrength: 0.5f);
                         sonarBlips.Add(new SonarBlip(t.WorldPosition, 1.0f, 1.0f));
                     }
@@ -653,25 +642,25 @@ namespace Barotrauma.Items.Components
                 CreateBlipsForLine(
                     new Vector2(item.CurrentHull.WorldRect.X, item.CurrentHull.WorldRect.Y), 
                     new Vector2(item.CurrentHull.WorldRect.Right, item.CurrentHull.WorldRect.Y), 
-                    transducerPos,
+                    pingSource, transducerPos,
                     pingRadius, prevPingRadius, 50.0f, 5.0f, range, 2.0f, passive);
 
                 CreateBlipsForLine(
                     new Vector2(item.CurrentHull.WorldRect.X, item.CurrentHull.WorldRect.Y - item.CurrentHull.Rect.Height),
                     new Vector2(item.CurrentHull.WorldRect.Right, item.CurrentHull.WorldRect.Y - item.CurrentHull.Rect.Height),
-                    transducerPos,
+                    pingSource, transducerPos,
                     pingRadius, prevPingRadius, 50.0f, 5.0f, range, 2.0f, passive);
 
                 CreateBlipsForLine(
                     new Vector2(item.CurrentHull.WorldRect.X, item.CurrentHull.WorldRect.Y),
                     new Vector2(item.CurrentHull.WorldRect.X, item.CurrentHull.WorldRect.Y - item.CurrentHull.Rect.Height),
-                    transducerPos,
+                    pingSource, transducerPos,
                     pingRadius, prevPingRadius, 50.0f, 5.0f, range, 2.0f, passive);
 
                 CreateBlipsForLine(
                     new Vector2(item.CurrentHull.WorldRect.Right, item.CurrentHull.WorldRect.Y),
                     new Vector2(item.CurrentHull.WorldRect.Right, item.CurrentHull.WorldRect.Y - item.CurrentHull.Rect.Height),
-                    transducerPos,
+                    pingSource, transducerPos,
                     pingRadius, prevPingRadius, 50.0f, 5.0f, range, 2.0f, passive);
 
                 return;
@@ -708,7 +697,7 @@ namespace Barotrauma.Items.Components
                     CreateBlipsForLine(
                         start + submarine.WorldPosition,
                         end + submarine.WorldPosition,
-                        transducerPos,
+                        pingSource, transducerPos,
                         pingRadius, prevPingRadius,
                         200.0f, 2.0f, range, 1.0f, passive);
                 }
@@ -721,7 +710,7 @@ namespace Barotrauma.Items.Components
                     CreateBlipsForLine(
                         new Vector2(pingSource.X - range, Level.Loaded.Size.Y),
                         new Vector2(pingSource.X + range, Level.Loaded.Size.Y),
-                        transducerPos,
+                        pingSource, transducerPos,
                         pingRadius, prevPingRadius,
                         250.0f, 150.0f, range, pingStrength, passive);
                 }
@@ -742,7 +731,7 @@ namespace Barotrauma.Items.Components
                         CreateBlipsForLine(
                             edge.Point1 + cell.Translation,
                             edge.Point2 + cell.Translation,
-                            transducerPos,
+                            pingSource, transducerPos,
                             pingRadius, prevPingRadius,
                             350.0f, 3.0f * (Math.Abs(facingDot) + 1.0f), range, pingStrength, passive);
                     }
@@ -763,7 +752,7 @@ namespace Barotrauma.Items.Components
 
                             CreateBlipsForLine(
                                 wall.A, wall.B,
-                                transducerPos,
+                                pingSource, transducerPos,
                                 pingRadius, prevPingRadius,
                                 100.0f, 1000.0f, range, pingStrength, passive);
                         }
@@ -813,7 +802,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        private void CreateBlipsForLine(Vector2 point1, Vector2 point2, Vector2 transducerPos, float pingRadius, float prevPingRadius,
+        private void CreateBlipsForLine(Vector2 point1, Vector2 point2, Vector2 pingSource, Vector2 transducerPos, float pingRadius, float prevPingRadius,
             float lineStep, float zStep, float range, float pingStrength, bool passive)
         {
             lineStep /= zoom;
@@ -824,19 +813,25 @@ namespace Barotrauma.Items.Components
             for (float x = 0; x < length; x += lineStep * Rand.Range(0.8f, 1.2f))
             {
                 Vector2 point = point1 + lineDir * x;
-                //point += cell.Translation;
 
-                Vector2 pointDiff = point - transducerPos;
-                float pointDist = pointDiff.Length();
-                float displayPointDist = pointDist * displayScale;
+                //ignore if outside the display
+                Vector2 transducerDiff = point - transducerPos;
+                Vector2 transducerDisplayDiff = transducerDiff * displayScale;
+                if (transducerDisplayDiff.LengthSquared() > DisplayRadius * DisplayRadius) continue;
 
-                if (displayPointDist > DisplayRadius) continue;
-                if (displayPointDist < prevPingRadius || displayPointDist > pingRadius) continue;
+                //ignore if the point is not within the ping
+                Vector2 pointDiff = point - pingSource;
+                Vector2 displayPointDiff = pointDiff * displayScale;
+                float displayPointDistSqr = displayPointDiff.LengthSquared();
+                if (displayPointDistSqr < prevPingRadius * prevPingRadius || displayPointDistSqr > pingRadius * pingRadius) continue;
 
+                //ignore if direction is disrupted
+                float transducerDist = transducerDiff.Length();
+                Vector2 pingDirection = transducerDiff / transducerDist;
                 bool disrupted = false;
                 foreach (Pair<Vector2, float> disruptDir in disruptedDirections)
                 {
-                    float dot = Vector2.Dot(pointDiff / pointDist, disruptDir.First);
+                    float dot = Vector2.Dot(pingDirection, disruptDir.First);
                     if (dot >  1.0f - disruptDir.Second)
                     {
                         disrupted = true;
@@ -845,10 +840,11 @@ namespace Barotrauma.Items.Components
                 }
                 if (disrupted) continue;
 
+                float displayPointDist = (float)Math.Sqrt(displayPointDistSqr);
                 float alpha = pingStrength * Rand.Range(1.5f, 2.0f);
-                for (float z = 0; z < DisplayRadius - displayPointDist; z += zStep)
+                for (float z = 0; z < DisplayRadius - transducerDist * displayScale; z += zStep)
                 {
-                    Vector2 pos = point + Rand.Vector(150.0f / zoom) + Vector2.Normalize(point - item.WorldPosition) * z / displayScale;
+                    Vector2 pos = point + Rand.Vector(150.0f / zoom) + pingDirection * z / displayScale;
                     float fadeTimer = alpha * (1.0f - displayPointDist / range);
 
                     int minDist = (int)(200 / zoom);
@@ -902,7 +898,7 @@ namespace Barotrauma.Items.Components
         {
             strength = MathHelper.Clamp(strength, 0.0f, 1.0f);
 
-            float distort = 1.0f - item.Condition / 100.0f;
+            float distort = 1.0f - item.Condition / item.Prefab.Health;
             
             Vector2 pos = (blip.Position - transducerPos) * displayScale * zoom;
             pos.Y = -pos.Y;

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs

@@ -10,7 +10,19 @@ namespace Barotrauma.Items.Components
 {
     partial class Steering : Powered, IServerSerializable, IClientSerializable
     {
+        enum Mode
+        {
+            AutoPilot,
+            Manual
+        };
         private GUITickBox autopilotTickBox, manualTickBox;
+
+        enum Destination
+        {
+            MaintainPos,
+            LevelEnd,
+            LevelStart
+        };
         private GUITickBox maintainPosTickBox, levelEndTickBox, levelStartTickBox;
 
         private GUIFrame autoPilotControlsDisabler;
@@ -104,8 +116,11 @@ namespace Barotrauma.Items.Components
                 }
             };
 
-            GUITickBox.CreateRadioButtonGroup(new List<GUITickBox> { manualTickBox, autopilotTickBox });
-
+            GUIRadioButtonGroup modes = new GUIRadioButtonGroup();
+            modes.AddRadioButton(Mode.AutoPilot, autopilotTickBox);
+            modes.AddRadioButton(Mode.Manual, manualTickBox);
+            modes.Selected = Mode.Manual;
+            
             var autoPilotControls = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.6f), paddedControlContainer.RectTransform), "InnerFrame");
             var paddedAutoPilotControls = new GUILayoutGroup(new RectTransform(new Vector2(0.8f), autoPilotControls.RectTransform, Anchor.Center))
             {
@@ -205,7 +220,12 @@ namespace Barotrauma.Items.Components
 
             autoPilotControlsDisabler = new GUIFrame(new RectTransform(Vector2.One, autoPilotControls.RectTransform), "InnerFrame");
 
-            GUITickBox.CreateRadioButtonGroup(new List<GUITickBox> { maintainPosTickBox, levelStartTickBox, levelEndTickBox });
+            GUIRadioButtonGroup destinations = new GUIRadioButtonGroup();
+            destinations.AddRadioButton(Destination.MaintainPos, maintainPosTickBox);
+            destinations.AddRadioButton(Destination.LevelStart, levelStartTickBox);
+            destinations.AddRadioButton(Destination.LevelEnd, levelEndTickBox);
+            destinations.Selected = maintainPos        ? Destination.MaintainPos :
+                                    levelStartSelected ? Destination.LevelStart  : Destination.LevelEnd;
             
             string steeringVelX = TextManager.Get("SteeringVelocityX");
             string steeringVelY = TextManager.Get("SteeringVelocityY");

Barotrauma/BarotraumaClient/Source/Items/Components/Power/PowerContainer.cs

@@ -11,6 +11,12 @@ namespace Barotrauma.Items.Components
         private GUIProgressBar chargeIndicator;
         private GUIScrollBar rechargeSpeedSlider;
 
+        public Vector2 DrawSize
+        {
+            //use the extents of the item as the draw size
+            get { return Vector2.Zero; }
+        }
+
         partial void InitProjSpecific()
         {
             if (GuiFrame == null) return;
@@ -44,12 +50,7 @@ namespace Barotrauma.Items.Components
                     if (Math.Abs(newRechargeSpeed - rechargeSpeed) < 0.1f) return false;
 
                     RechargeSpeed = newRechargeSpeed;
-                    if (GameMain.Server != null)
-                    {
-                        item.CreateServerEvent(this);
-                        GameServer.Log(Character.Controlled.LogName + " set the recharge speed of " + item.Name + " to " + (int)((rechargeSpeed / maxRechargeSpeed) * 100.0f) + " %", ServerLog.MessageType.ItemInteraction);
-                    }
-                    else if (GameMain.Client != null)
+                    if (GameMain.Client != null)
                     {
                         item.CreateClientEvent(this);
                         correctionTimer = CorrectionDelay;

Barotrauma/BarotraumaClient/Source/Items/Components/Power/Powered.cs

@@ -22,7 +22,8 @@ namespace Barotrauma.Items.Components
                         powerOnSound = Submarine.LoadRoundSound(subElement, false);
                         break;
                     case "sparksound":
-                        sparkSounds.Add(Submarine.LoadRoundSound(subElement, false));
+                        var sparkSound = Submarine.LoadRoundSound(subElement, false);
+                        if (sparkSound != null) { sparkSounds.Add(sparkSound); }
                         break;
                 }
             }

Barotrauma/BarotraumaClient/Source/Items/Components/RepairTool.cs

@@ -73,7 +73,7 @@ namespace Barotrauma.Items.Components
             }
 
             var progressBar = user.UpdateHUDProgressBar(
-                targetStructure,
+                targetStructure.ID * 1000 + sectionIndex, //unique "identifier" for each wall section
                 progressBarPos,
                 1.0f - targetStructure.SectionDamage(sectionIndex) / targetStructure.Health,
                 Color.Red, Color.Green);
@@ -108,7 +108,7 @@ namespace Barotrauma.Items.Components
                 var progressBar = user.UpdateHUDProgressBar(
                     targetItem,
                     progressBarPos,
-                    targetItem.Condition / 100.0f,
+                    targetItem.Prefab.Health <= 0.0f ? 0.0f : targetItem.Condition / targetItem.Prefab.Health,
                     Color.Red, Color.Green);
                 if (progressBar != null) { progressBar.Size = new Vector2(60.0f, 20.0f); }
             }

Barotrauma/BarotraumaClient/Source/Items/Components/Repairable.cs

@@ -26,7 +26,7 @@ namespace Barotrauma.Items.Components
         
         public override bool ShouldDrawHUD(Character character)
         {
-            if (!HasRequiredItems(character, false)) return false;
+            if (!HasRequiredItems(character, false) || character.SelectedConstruction != item) return false;
             return (item.Condition < ShowRepairUIThreshold || (currentFixer == character && item.Condition < item.Prefab.Health));
         }
 

Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Connection.cs

@@ -108,10 +108,6 @@ namespace Barotrauma.Items.Components
                     {
                         panel.Item.CreateClientEvent(panel);
                     }
-                    else if (GameMain.Server != null)
-                    {
-                        panel.Item.CreateServerEvent(panel);
-                    }
 
                     draggingConnected = null;
                 }
@@ -173,6 +169,8 @@ namespace Barotrauma.Items.Components
                         if (draggingConnected.Connect(this, !alreadyConnected, true))
                         {
                             var otherConnection = draggingConnected.OtherConnection(this);
+#if SERVER
+                            //TODO: ffs
                             if (otherConnection == null)
                             {
                                 GameServer.Log(Character.Controlled.LogName + " connected a wire to " +
@@ -183,6 +181,7 @@ namespace Barotrauma.Items.Components
                                 GameServer.Log(Character.Controlled.LogName + " connected a wire from " +
                                     Item.Name + " (" + Name + ") to " + otherConnection.item.Name + " (" + otherConnection.Name + ")", ServerLog.MessageType.ItemInteraction);
                             }
+#endif
 
                             SetWire(index, draggingConnected);
                         }

Barotrauma/BarotraumaClient/Source/Items/Components/Signal/CustomInterface.cs

@@ -54,7 +54,7 @@ namespace Barotrauma.Items.Components
                         }
                         else
                         {
-                            GameMain.Client.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.ComponentState, item.components.IndexOf(this), userdata as CustomInterfaceElement });
+                            GameMain.Client.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.ComponentState, item.GetComponentIndex(this), userdata as CustomInterfaceElement });
                         }
                         return true;
                     };

Barotrauma/BarotraumaClient/Source/Items/Components/Signal/MotionSensor.cs

@@ -5,6 +5,11 @@ namespace Barotrauma.Items.Components
 {
     partial class MotionSensor : IDrawableComponent
     {
+        public Vector2 DrawSize
+        {
+            get { return new Vector2(rangeX, rangeY) * 2.0f; }
+        }
+
         public void Draw(SpriteBatch spriteBatch, bool editing)
         {
             if (!editing || !MapEntity.SelectedList.Contains(item)) return;

Barotrauma/BarotraumaClient/Source/Items/Components/Signal/WifiComponent.cs

@@ -5,6 +5,11 @@ namespace Barotrauma.Items.Components
 {
     partial class WifiComponent : IDrawableComponent
     {
+        public Vector2 DrawSize
+        {
+            get { return new Vector2(range * 2); }
+        }
+
         public void Draw(SpriteBatch spriteBatch, bool editing)
         {
             if (!editing || !MapEntity.SelectedList.Contains(item)) return;

Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs

@@ -41,7 +41,12 @@ namespace Barotrauma.Items.Components
         private static Wire draggingWire;
         private static int? selectedNodeIndex;
         private static int? highlightedNodeIndex;
-        
+
+        public Vector2 DrawSize
+        {
+            get { return sectionExtents; }
+        }
+
         public void Draw(SpriteBatch spriteBatch, bool editing)
         {
             if (sections.Count == 0 && !IsActive || Hidden)

Barotrauma/BarotraumaClient/Source/Items/Components/StatusHUD.cs

@@ -73,7 +73,7 @@ namespace Barotrauma.Items.Components
             visibleCharacters.Clear();
             foreach (Character c in Character.CharacterList)
             {
-                if (c == equipper) continue;
+                if (c == equipper || !c.Enabled || c.Removed) { continue; }
 
                 float dist = Vector2.DistanceSquared(equipper.WorldPosition, c.WorldPosition);
                 if (dist < Range * Range)
@@ -111,10 +111,9 @@ namespace Barotrauma.Items.Components
 
             Character closestCharacter = null;
             float closestDist = float.PositiveInfinity;
-
             foreach (Character c in visibleCharacters)
             {
-                if (c == character) continue;
+                if (c == character || !c.Enabled || c.Removed) { continue; }
 
                 float dist = Vector2.DistanceSquared(GameMain.GameScreen.Cam.ScreenToWorld(PlayerInput.MousePosition), c.WorldPosition);
                 if (dist < closestDist)
@@ -175,14 +174,14 @@ namespace Barotrauma.Items.Components
                 {
                     int bleedingTextIndex = MathHelper.Clamp((int)Math.Floor(target.Bleeding / 100.0f) * BleedingTexts.Length, 0, BleedingTexts.Length - 1);
                     texts.Add(BleedingTexts[bleedingTextIndex]);
-                    textColors.Add(Color.Lerp(Color.Red, Color.Green, target.Bleeding / 100.0f));
+                    textColors.Add(Color.Lerp(Color.Orange, Color.Red, target.Bleeding / 100.0f));
                 }
 
                 var allAfflictions = target.CharacterHealth.GetAllAfflictions();
                 Dictionary<AfflictionPrefab, float> combinedAfflictionStrengths = new Dictionary<AfflictionPrefab, float>();
                 foreach (Affliction affliction in allAfflictions)
                 {
-                    if (affliction.Strength < affliction.Prefab.ActivationThreshold || affliction.Strength < affliction.Prefab.ShowIconThreshold) continue;
+                    if (affliction.Strength < affliction.Prefab.ActivationThreshold || affliction.Strength <= 0.0f) continue;
                     if (combinedAfflictionStrengths.ContainsKey(affliction.Prefab))
                     {
                         combinedAfflictionStrengths[affliction.Prefab] += affliction.Strength;
@@ -196,7 +195,7 @@ namespace Barotrauma.Items.Components
                 foreach (AfflictionPrefab affliction in combinedAfflictionStrengths.Keys)
                 {
                     texts.Add(affliction.Name + ": " + ((int)combinedAfflictionStrengths[affliction]).ToString() + " %");
-                    textColors.Add(Color.Lerp(Color.Red, Color.Green, combinedAfflictionStrengths[affliction] / affliction.MaxStrength));
+                    textColors.Add(Color.Lerp(Color.Orange, Color.Red, combinedAfflictionStrengths[affliction] / affliction.MaxStrength));
                 }
             }
 
@@ -204,6 +203,9 @@ namespace Barotrauma.Items.Components
             hudPos.X += 5.0f;
             hudPos.Y += 24.0f;
 
+            hudPos.X = (int)hudPos.X;
+            hudPos.Y = (int)hudPos.Y;
+
             for (int i = 1; i < texts.Count; i++)
             {
                 GUI.DrawString(spriteBatch, hudPos, texts[i], textColors[i] * alpha, Color.Black * 0.7f * alpha, 2, GUI.SmallFont);

Barotrauma/BarotraumaClient/Source/Items/Components/Turret.cs

@@ -61,6 +61,26 @@ namespace Barotrauma.Items.Components
             private set;
         }
 
+        public Vector2 DrawSize
+        {
+            get
+            {
+                float size = Math.Max(transformedBarrelPos.X, transformedBarrelPos.Y);
+                if (barrelSprite != null)
+                {
+                    if (railSprite != null)
+                    {
+                        size += Math.Max(Math.Max(barrelSprite.size.X, barrelSprite.size.Y), Math.Max(railSprite.size.X, railSprite.size.Y)) * item.Scale;
+                    }
+                    else
+                    {
+                        size += Math.Max(barrelSprite.size.X, barrelSprite.size.Y) * item.Scale;
+                    }
+                }
+                return Vector2.One * size * 2;
+            }
+        }
+
         partial void InitProjSpecific(XElement element)
         {
             foreach (XElement subElement in element.Elements())