Unstable v0.10.600.0

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

@@ -271,7 +271,7 @@ namespace Barotrauma.Items.Components
                 if (wires[i] == null) { continue; }
 
                 Connection recipient = wires[i].OtherConnection(this);
-                if (recipient == null) { continue; }
+                if (recipient == null || !recipient.IsPower) { continue; }
 
                 recipient.item.GetComponent<Powered>()?.ReceivePowerProbeSignal(recipient, source, power);
             }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/MemoryComponent.cs

@@ -5,7 +5,7 @@ namespace Barotrauma.Items.Components
 {
     partial class MemoryComponent : ItemComponent, IServerSerializable
     {
-        const int MaxValueLength = 256;
+        const int MaxValueLength = ChatMessage.MaxLength;
 
 
         private string value;

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/RegExFindComponent.cs

@@ -11,6 +11,7 @@ namespace Barotrauma.Items.Components
         private string previousReceivedSignal;
 
         private bool previousResult;
+        private GroupCollection previousGroups;
 
         private Regex regex;
 
@@ -19,6 +20,9 @@ namespace Barotrauma.Items.Components
         [InGameEditable, Serialize("1", true, description: "The signal this item outputs when the received signal matches the regular expression.", alwaysUseInstanceValues: true)]
         public string Output { get; set; }
 
+        [InGameEditable, Serialize(false, true, description: "Should the component output a value of a capture group instead of a constant signal.", alwaysUseInstanceValues: true)]
+        public bool UseCaptureGroup { get; set; }
+
         [Serialize("0", true, description: "The signal this item outputs when the received signal does not match the regular expression.", alwaysUseInstanceValues: true)]
         public string FalseOutput { get; set; }
 
@@ -64,6 +68,7 @@ namespace Barotrauma.Items.Components
                 {
                     Match match = regex.Match(receivedSignal);
                     previousResult =  match.Success;
+                    previousGroups = UseCaptureGroup && previousResult ? match.Groups : null;
                     previousReceivedSignal = receivedSignal;
 
                 }
@@ -75,7 +80,30 @@ namespace Barotrauma.Items.Components
                 }
             }
 
-            string signalOut = previousResult ? Output : FalseOutput;
+            string signalOut;
+            if (previousResult)
+            {
+                if (UseCaptureGroup)
+                {
+                    if (previousGroups != null && previousGroups.TryGetValue(Output, out Group group))
+                    {
+                        signalOut = group.Value;
+                    }
+                    else
+                    {
+                        signalOut = FalseOutput;
+                    }
+                }
+                else
+                {
+                    signalOut = Output;
+                }
+            }
+            else
+            {
+                signalOut = FalseOutput;
+            }
+
             if (ContinuousOutput)
             {
                 if (!string.IsNullOrEmpty(signalOut)) { item.SendSignal(0, signalOut, "signal_out", null); }

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

@@ -37,7 +37,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        [Editable, Serialize(false, true, description: "Can the relay currently pass power and signals through it.", alwaysUseInstanceValues: true)]
+        [Editable, Serialize(true, true, description: "Can the relay currently pass power and signals through it.", alwaysUseInstanceValues: true)]
         public bool IsOn
         {
             get

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/Terminal.cs

@@ -21,7 +21,7 @@ namespace Barotrauma.Items.Components
             {
                 if (welcomeMessage == value) { return; }
                 welcomeMessage = value;
-                DisplayedWelcomeMessage = TextManager.Get(welcomeMessage, returnNull: true) ?? welcomeMessage;
+                DisplayedWelcomeMessage = TextManager.Get(welcomeMessage, returnNull: true) ?? welcomeMessage.Replace("\\n", "\n");
             }
         }
 
@@ -45,7 +45,9 @@ namespace Barotrauma.Items.Components
             {
                 signal = signal.Substring(0, MaxMessageLength);
             }
-            ShowOnDisplay(signal);
+
+            string inputSignal = signal.Replace("\\n", "\n");
+            ShowOnDisplay(inputSignal);
         }
     }
 }

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

@@ -198,7 +198,21 @@ namespace Barotrauma.Items.Components
                 int newNodeIndex = 0;
                 if (nodes.Count > 1)
                 {
-                    if (Vector2.DistanceSquared(nodes[nodes.Count - 1], nodePos) < Vector2.DistanceSquared(nodes[0], nodePos))
+                    if (connections[0] != null && connections[0] != newConnection)
+                    {
+                        if (Vector2.DistanceSquared(nodes[0], connections[0].Item.Position - (refSub?.HiddenSubPosition ?? Vector2.Zero)) < Vector2.DistanceSquared(nodes[nodes.Count - 1], nodePos))
+                        {
+                            newNodeIndex = nodes.Count;
+                        }
+                    }
+                    else if (connections[1] != null && connections[1] != newConnection)
+                    {
+                        if (Vector2.DistanceSquared(nodes[0], connections[1].Item.Position - (refSub?.HiddenSubPosition ?? Vector2.Zero)) < Vector2.DistanceSquared(nodes[nodes.Count - 1], nodePos))
+                        {
+                            newNodeIndex = nodes.Count;
+                        }
+                    }
+                    else if (Vector2.DistanceSquared(nodes[nodes.Count - 1], nodePos) < Vector2.DistanceSquared(nodes[0], nodePos))
                     {
                         newNodeIndex = nodes.Count;
                     }