(a00338777) v0.9.2.1

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

@@ -218,6 +218,16 @@ namespace Barotrauma.Items.Components
 
         public void SetWire(int index, Wire wire)
         {
+            Wire previousWire = wires[index];
+            if (wire != previousWire && previousWire != null)
+            {
+                var otherConnection = previousWire.OtherConnection(this);
+                if (otherConnection != null)
+                {
+                    otherConnection.recipientsDirty = true;
+                }
+            }
+
             wires[index] = wire;
             recipientsDirty = true;
             if (wire != null)

Barotrauma/BarotraumaShared/Source/Items/Components/Signal/ConnectionPanel.cs

@@ -1,6 +1,5 @@
 using Barotrauma.Networking;
 using FarseerPhysics;
-using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -19,7 +18,9 @@ namespace Barotrauma.Items.Components
         /// Wires that have been disconnected from the panel, but not removed completely (visible at the bottom of the connection panel).
         /// </summary>
         public readonly HashSet<Wire> DisconnectedWires = new HashSet<Wire>();
-        
+
+        private List<ushort> disconnectedWireIds;
+
         [Serialize(false, true), Editable(ToolTip = "Locked connection panels cannot be rewired in-game.")]
         public bool Locked
         {
@@ -64,6 +65,19 @@ namespace Barotrauma.Items.Components
             {
                 c.ConnectLinked();
             }
+
+            if (disconnectedWireIds != null)
+            {
+                foreach (ushort disconnectedWireId in disconnectedWireIds)
+                {
+                    if (!(Entity.FindEntityByID(disconnectedWireId) is Item wireItem)) { continue; }
+                    Wire wire = wireItem.GetComponent<Wire>();
+                    if (wire != null)
+                    {
+                        DisconnectedWires.Add(wire);
+                    }
+                }
+            }
         }
 
         public override void OnItemLoaded()
@@ -193,6 +207,8 @@ namespace Barotrauma.Items.Components
             {
                 loadedConnections[i].wireId.CopyTo(Connections[i].wireId, 0);
             }
+
+            disconnectedWireIds = element.GetAttributeUshortArray("disconnectedwires", new ushort[0]).ToList();
         }
 
         public override XElement Save(XElement parentElement)
@@ -204,6 +220,11 @@ namespace Barotrauma.Items.Components
                 c.Save(componentElement);
             }
 
+            if (DisconnectedWires.Count > 0)
+            {
+                componentElement.Add(new XAttribute("disconnectedwires", string.Join(",", DisconnectedWires.Select(w => w.Item.ID))));
+            }
+
             return componentElement;
         }
 
@@ -214,6 +235,14 @@ namespace Barotrauma.Items.Components
 
         protected override void RemoveComponentSpecific()
         {
+            foreach (Wire wire in DisconnectedWires.ToList())
+            {
+                if (wire.OtherConnection(null) == null) //wire not connected to anything else
+                {
+                    wire.Item.Drop(null);
+                }
+            }
+
             DisconnectedWires.Clear();
             foreach (Connection c in Connections)
             {
@@ -233,7 +262,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public void ClientWrite(NetBuffer msg, object[] extraData = null)
+        public void ClientWrite(IWriteMessage msg, object[] extraData = null)
         {
             foreach (Connection connection in Connections)
             {

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

@@ -1,5 +1,4 @@
 using Barotrauma.Networking;
-using Lidgren.Network;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;

Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Xml.Linq;
 using Barotrauma.Networking;
-using Lidgren.Network;
 #if CLIENT
 using Microsoft.Xna.Framework.Graphics;
 using Barotrauma.Lights;
@@ -251,10 +250,6 @@ namespace Barotrauma.Items.Components
                 light.Range = range;
 #endif
             }
-            if (AITarget != null)
-            {
-                UpdateAITarget(AITarget);
-            }
             if (item.AiTarget != null)
             {
                 UpdateAITarget(item.AiTarget);
@@ -267,6 +262,7 @@ namespace Barotrauma.Items.Components
         public override void UpdateBroken(float deltaTime, Camera cam)
         {
             light.Color = Color.Transparent;
+            lightBrightness = 0.0f;
         }
 
         protected override void RemoveComponentSpecific()
@@ -298,7 +294,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public void ServerWrite(NetBuffer msg, Client c, object[] extraData = null)
+        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
         {
             msg.Write(IsOn);
         }

Barotrauma/BarotraumaShared/Source/Items/Components/Signal/RelayComponent.cs

@@ -1,5 +1,4 @@
 using Barotrauma.Networking;
-using Lidgren.Network;
 using System;
 using System.Collections.Generic;
 using System.Xml.Linq;
@@ -104,12 +103,12 @@ namespace Barotrauma.Items.Components
             IsOn = on;
         }
 
-        public void ServerWrite(NetBuffer msg, Client c, object[] extraData = null)
+        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
         {
             msg.Write(isOn);
         }
 
-        public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
+        public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
         {
             SetState(msg.ReadBoolean(), true);
         }

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

@@ -1,5 +1,4 @@
 using Barotrauma.Networking;
-using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -282,7 +281,7 @@ namespace Barotrauma.Items.Components
                     Structure attachTarget = Structure.GetAttachTarget(item.WorldPosition);
                     canPlaceNode = attachTarget != null;
 
-                    sub = attachTarget?.Submarine;
+                    sub = sub ?? attachTarget?.Submarine;
                     newNodePos = sub == null ? 
                         item.WorldPosition :
                         item.WorldPosition - sub.Position - sub.HiddenSubPosition;
@@ -333,7 +332,8 @@ namespace Barotrauma.Items.Components
             }
             else
             {
-                newNodePos = RoundNode(item.Position, item.CurrentHull) - sub.HiddenSubPosition;
+                newNodePos = RoundNode(item.Position, item.CurrentHull);
+                if (sub != null) { newNodePos -= sub.HiddenSubPosition; }
                 canPlaceNode = true;
             }
 
@@ -724,7 +724,7 @@ namespace Barotrauma.Items.Components
             base.RemoveComponentSpecific();
         }
 
-        public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
+        public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
         {
             int eventIndex = msg.ReadRangedInteger(0, (int)Math.Ceiling(MaxNodeCount / (float)MaxNodesPerNetworkEvent));
             int nodeCount = msg.ReadRangedInteger(0, MaxNodesPerNetworkEvent);
@@ -738,7 +738,7 @@ namespace Barotrauma.Items.Components
 
             for (int i = 0; i < nodeCount; i++)
             {
-                nodePositions[nodeStartIndex + i] = new Vector2(msg.ReadFloat(), msg.ReadFloat());
+                nodePositions[nodeStartIndex + i] = new Vector2(msg.ReadSingle(), msg.ReadSingle());
             }
 
             if (nodePositions.Any(n => !MathUtils.IsValid(n)))