Unstable v0.1100.0.4 (November 11th 2020)

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

@@ -40,7 +40,7 @@ namespace Barotrauma.Items.Components
         {
             get
             {
-                if (recipientsDirty) RefreshRecipients();
+                if (recipientsDirty) { RefreshRecipients(); }
                 return recipients;
             }
         }
@@ -61,7 +61,7 @@ namespace Barotrauma.Items.Components
             return "Connection (" + item.Name + ", " + Name + ")";
         }
 
-        public Connection(XElement element, ConnectionPanel connectionPanel)
+        public Connection(XElement element, ConnectionPanel connectionPanel, IdRemap idRemap)
         {
 
 #if CLIENT
@@ -150,8 +150,11 @@ namespace Barotrauma.Items.Components
                         if (index == -1) break;
 
                         int id = subElement.GetAttributeInt("w", 0);
-                        if (id < 0) id = 0;
-                        wireId[index] = (ushort)id;
+                        if (id < 0)
+                        {
+                            id = 0;
+                        }
+                        wireId[index] = idRemap.GetOffsetId(id);
 
                         break;
 
@@ -162,6 +165,11 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public void SetRecipientsDirty()
+        {
+            recipientsDirty = true;
+        }
+
         private void RefreshRecipients()
         {
             recipients.Clear();
@@ -304,6 +312,7 @@ namespace Barotrauma.Items.Components
                 {
                     if (wires[i].Item.body != null) wires[i].Item.body.Enabled = false;
                     wires[i].Connect(this, false, false);
+                    wires[i].FixNodeEnds();
                 }
             }
         }

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

@@ -50,10 +50,10 @@ namespace Barotrauma.Items.Components
                 switch (subElement.Name.ToString())
                 {
                     case "input":                        
-                        Connections.Add(new Connection(subElement, this));
+                        Connections.Add(new Connection(subElement, this, IdRemap.DiscardId));
                         break;
                     case "output":
-                        Connections.Add(new Connection(subElement, this));
+                        Connections.Add(new Connection(subElement, this, IdRemap.DiscardId));
                         break;
                 }
             }
@@ -218,9 +218,9 @@ namespace Barotrauma.Items.Components
             return false;
         }
 
-        public override void Load(XElement element, bool usePrefabValues)
+        public override void Load(XElement element, bool usePrefabValues, IdRemap idRemap)
         {
-            base.Load(element, usePrefabValues);
+            base.Load(element, usePrefabValues, idRemap);
 
             List<Connection> loadedConnections = new List<Connection>();
 
@@ -229,10 +229,10 @@ namespace Barotrauma.Items.Components
                 switch (subElement.Name.ToString())
                 {
                     case "input":
-                        loadedConnections.Add(new Connection(subElement, this));
+                        loadedConnections.Add(new Connection(subElement, this, idRemap));
                         break;
                     case "output":
-                        loadedConnections.Add(new Connection(subElement, this));
+                        loadedConnections.Add(new Connection(subElement, this, idRemap));
                         break;
                 }
             }

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

@@ -14,12 +14,12 @@ namespace Barotrauma.Items.Components
         private Color lightColor;
         private float lightBrightness;
         private float blinkFrequency;
+        private float pulseFrequency, pulseAmount;
         private float range;
-        private float flicker, flickerState;
+        private float flicker, flickerSpeed;
         private bool castShadows;
         private bool drawBehindSubs;
 
-        private float blinkTimer;
 
         private double lastToggleSignalTime;
 
@@ -90,14 +90,49 @@ namespace Barotrauma.Items.Components
             set
             {
                 flicker = MathHelper.Clamp(value, 0.0f, 1.0f);
+#if CLIENT
+                if (light != null) { light.LightSourceParams.Flicker = flicker; }
+#endif
             }
         }
 
         [Editable, Serialize(1.0f, false, description: "How fast the light flickers.")]
         public float FlickerSpeed
         {
-            get;
-            set;
+            get { return flickerSpeed; }
+            set
+            {
+                flickerSpeed = value;
+#if CLIENT
+                if (light != null) { light.LightSourceParams.FlickerSpeed = flickerSpeed; }
+#endif
+            }
+        }
+
+        [Editable, Serialize(0.0f, true, description: "How rapidly the light pulsates (in Hz). 0 = no blinking.")]
+        public float PulseFrequency
+        {
+            get { return pulseFrequency; }
+            set
+            {
+                pulseFrequency = MathHelper.Clamp(value, 0.0f, 60.0f);
+#if CLIENT
+                if (light != null) { light.LightSourceParams.PulseFrequency = pulseFrequency; }
+#endif
+            }
+        }
+
+        [Editable(MinValueFloat = 0.0f, MaxValueFloat = 1.0f, DecimalCount = 2), Serialize(0.0f, true, description: "How much light pulsates (in Hz). 0 = not at all, 1 = alternates between full brightness and off.")]
+        public float PulseAmount
+        {
+            get { return pulseAmount; }
+            set
+            {
+                pulseAmount = MathHelper.Clamp(value, 0.0f, 1.0f);
+#if CLIENT
+                if (light != null) { light.LightSourceParams.PulseAmount = pulseAmount; }
+#endif
+            }
         }
 
         [Editable, Serialize(0.0f, true, description: "How rapidly the light blinks on and off (in Hz). 0 = no blinking.")]
@@ -107,6 +142,9 @@ namespace Barotrauma.Items.Components
             set
             {
                 blinkFrequency = MathHelper.Clamp(value, 0.0f, 60.0f);
+#if CLIENT
+                if (light != null) { light.LightSourceParams.BlinkFrequency = blinkFrequency; }
+#endif
             }
         }
 
@@ -161,11 +199,16 @@ namespace Barotrauma.Items.Components
             {
                 ParentSub = item.CurrentHull?.Submarine,
                 Position = item.Position,
-                CastShadows = castShadows,
+                CastShadows = castShadows,                
                 IsBackground = drawBehindSubs,
                 SpriteScale = Vector2.One * item.Scale,
                 Range = range
             };
+            light.LightSourceParams.Flicker = flicker;
+            light.LightSourceParams.FlickerSpeed = FlickerSpeed;
+            light.LightSourceParams.PulseAmount = pulseAmount;
+            light.LightSourceParams.PulseFrequency = pulseFrequency;
+            light.LightSourceParams.BlinkFrequency = blinkFrequency;
 #endif
 
             IsActive = IsOn;
@@ -229,22 +272,7 @@ namespace Barotrauma.Items.Components
                 lightBrightness = MathHelper.Lerp(lightBrightness, powerConsumption <= 0.0f ? 1.0f : Math.Min(Voltage, 1.0f), 0.1f);
             }
 
-            if (blinkFrequency > 0.0f)
-            {
-                blinkTimer = (blinkTimer + deltaTime * blinkFrequency) % 1.0f;
-            }
-
-            if (blinkTimer > 0.5f)
-            {
-                SetLightSourceState(false, lightBrightness);
-            }
-            else
-            {
-                flickerState += deltaTime * FlickerSpeed;
-                flickerState %= 255;
-                float noise = PerlinNoise.GetPerlin(flickerState, flickerState * 0.5f) * flicker;
-                SetLightSourceState(true, lightBrightness * (1.0f - noise));
-            }
+            SetLightSourceState(true, lightBrightness);
 
             if (powerIn == null && powerConsumption > 0.0f) { Voltage -= deltaTime; }
         }

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

@@ -1,4 +1,5 @@
 using Barotrauma.Networking;
+using System.Collections.Generic;
 using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
@@ -7,6 +8,10 @@ namespace Barotrauma.Items.Components
     {
         private const int MaxMessageLength = ChatMessage.MaxLength;
 
+        private const int MaxMessages = 60;
+
+        private List<string> messageHistory = new List<string>(MaxMessages);
+
         public string DisplayedWelcomeMessage
         {
             get;
@@ -50,5 +55,41 @@ namespace Barotrauma.Items.Components
             string inputSignal = signal.Replace("\\n", "\n");
             ShowOnDisplay(inputSignal);
         }
+
+        public override void OnItemLoaded()
+        {
+            base.OnItemLoaded();
+            if (!string.IsNullOrEmpty(DisplayedWelcomeMessage))
+            {
+                ShowOnDisplay(DisplayedWelcomeMessage);
+                DisplayedWelcomeMessage = "";
+                //remove welcome message if a game session is running so it doesn't reappear on successive rounds
+                if (GameMain.GameSession != null)
+                {
+                    welcomeMessage = null;
+                }
+            }
+        }
+
+        public override XElement Save(XElement parentElement)
+        {
+            var componentElement = base.Save(parentElement);
+            for (int i = 0; i < messageHistory.Count; i++)
+            {
+                componentElement.Add(new XAttribute("msg" + i, messageHistory[i]));
+            }
+            return componentElement;
+        }
+
+        public override void Load(XElement componentElement, bool usePrefabValues, IdRemap idRemap)
+        {
+            base.Load(componentElement, usePrefabValues, idRemap);
+            for (int i = 0; i < MaxMessages; i++)
+            {
+                string msg = componentElement.GetAttributeString("msg" + i, null);
+                if (msg == null) { break; }
+                ShowOnDisplay(msg);
+            }
+        }
     }
 }

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

@@ -17,7 +17,8 @@ namespace Barotrauma.Items.Components
             Atan,
         }
 
-        protected float[] receivedSignal = new float[2];
+        private float[] receivedSignal = new float[2];
+        private float[] timeSinceReceived = new float[2];
 
         [Serialize(FunctionType.Sin, false, description: "Which kind of function to run the input through.", alwaysUseInstanceValues: true)]
         public FunctionType Function
@@ -41,12 +42,25 @@ namespace Barotrauma.Items.Components
 
         public override void Update(float deltaTime, Camera cam)
         {
-            //reset received signals
-            receivedSignal[0] = float.NaN;
-            receivedSignal[1] = float.NaN;
+            if (Function == FunctionType.Atan)
+            {
+                for (int i = 0; i < 2; i++)
+                {
+                    timeSinceReceived[i] += deltaTime;
+                    if (timeSinceReceived[i] > 0.1f)
+                    {
+                        receivedSignal[i] = float.NaN;
+                    }
+                }
+                if (!float.IsNaN(receivedSignal[0]) && !float.IsNaN(receivedSignal[1]))
+                {
+                    float angle = (float)Math.Atan2(receivedSignal[1], receivedSignal[0]);
+                    if (!UseRadians) { angle = MathHelper.ToDegrees(angle); }
+                    item.SendSignal(0, angle.ToString("G", CultureInfo.InvariantCulture), "signal_out", null);
+                }
+            }
         }
 
-
         public override void ReceiveSignal(int stepsTaken, string signal, Connection connection, Item source, Character sender, float power = 0, float signalStrength = 1)
         {
             float.TryParse(signal, NumberStyles.Float, CultureInfo.InvariantCulture, out float value);
@@ -89,17 +103,13 @@ namespace Barotrauma.Items.Components
                 case FunctionType.Atan:                    
                     if (connection.Name == "signal_in_x")
                     {
+                        timeSinceReceived[0] = 0.0f;
                         float.TryParse(signal, NumberStyles.Float, CultureInfo.InvariantCulture, out receivedSignal[0]);
                     }
                     else if (connection.Name == "signal_in_y")
                     {
-                        float.TryParse(signal, NumberStyles.Float, CultureInfo.InvariantCulture, out receivedSignal[1]);   
-                        if (!float.IsNaN(receivedSignal[0]) && !float.IsNaN(receivedSignal[1]))
-                        {
-                            float angle = (float)Math.Atan2(receivedSignal[1], receivedSignal[0]);
-                            if (!UseRadians) { angle = MathHelper.ToDegrees(angle); }
-                            item.SendSignal(0, angle.ToString("G", CultureInfo.InvariantCulture), "signal_out", null);
-                        }
+                        timeSinceReceived[1] = 0.0f;
+                        float.TryParse(signal, NumberStyles.Float, CultureInfo.InvariantCulture, out receivedSignal[1]);
                     }
                     else
                     {

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

@@ -1,4 +1,6 @@
-using System.Xml.Linq;
+using Microsoft.Xna.Framework;
+using System;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
@@ -59,6 +61,12 @@ namespace Barotrauma.Items.Components
             {
                 item.SendSignal(0, signalOut, "signal_out", null);
             }
+
+            if (item.CurrentHull != null)
+            {
+                int waterPercentage = MathHelper.Clamp((int)Math.Round(item.CurrentHull.WaterPercentage), 0, 100);
+                item.SendSignal(0, waterPercentage.ToString(), "water_%", null);
+            }
         }
     }
 }

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

@@ -63,7 +63,7 @@ namespace Barotrauma.Items.Components
 
         public bool Hidden;
 
-        private float removeNodeDelay;
+        private float editNodeDelay;
 
         private bool locked;
         public bool Locked
@@ -200,14 +200,16 @@ namespace Barotrauma.Items.Components
                 {
                     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))
+                        if (Vector2.DistanceSquared(nodes[0], connections[0].Item.Position - (refSub?.HiddenSubPosition ?? Vector2.Zero)) < 
+                            Vector2.DistanceSquared(nodes[nodes.Count - 1], connections[0].Item.Position - (refSub?.HiddenSubPosition ?? Vector2.Zero)))
                         {
                             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))
+                        if (Vector2.DistanceSquared(nodes[0], connections[1].Item.Position - (refSub?.HiddenSubPosition ?? Vector2.Zero)) < 
+                            Vector2.DistanceSquared(nodes[nodes.Count - 1], connections[1].Item.Position - (refSub?.HiddenSubPosition ?? Vector2.Zero)))
                         {
                             newNodeIndex = nodes.Count;
                         }
@@ -290,7 +292,7 @@ namespace Barotrauma.Items.Components
             if (nodes.Count == 0) { return; }
 
             Character user = item.ParentInventory?.Owner as Character;
-            removeNodeDelay = (user?.SelectedConstruction == null) ? removeNodeDelay - deltaTime : 0.5f;
+            editNodeDelay = (user?.SelectedConstruction == null) ? editNodeDelay - deltaTime : 0.5f;
 
             Submarine sub = item.Submarine;
             if (connections[0] != null && connections[0].Item.Submarine != null) { sub = connections[0].Item.Submarine; }
@@ -416,7 +418,9 @@ namespace Barotrauma.Items.Components
 #endif
             //clients communicate node addition/removal with network events
             if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer) { return false; }
-            if (newNodePos != Vector2.Zero && canPlaceNode && nodes.Count > 0 && Vector2.Distance(newNodePos, nodes[nodes.Count - 1]) > MinNodeDistance)
+
+            if (newNodePos != Vector2.Zero && canPlaceNode && editNodeDelay <= 0.0f && nodes.Count > 0 && 
+                Vector2.DistanceSquared(newNodePos, nodes[nodes.Count - 1]) > MinNodeDistance * MinNodeDistance)
             {
                 if (nodes.Count >= MaxNodeCount)
                 {
@@ -440,6 +444,7 @@ namespace Barotrauma.Items.Components
                 }
 #endif
             }
+            editNodeDelay = 0.1f;
             return true;
         }
 
@@ -450,7 +455,7 @@ namespace Barotrauma.Items.Components
             //clients communicate node addition/removal with network events
             if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer) { return false; }
 
-            if (nodes.Count > 1 && removeNodeDelay <= 0.0f)
+            if (nodes.Count > 1 && editNodeDelay <= 0.0f)
             {
                 nodes.RemoveAt(nodes.Count - 1);
                 UpdateSections();
@@ -466,7 +471,7 @@ namespace Barotrauma.Items.Components
                 }
 #endif
             }
-            removeNodeDelay = 0.1f;
+            editNodeDelay = 0.1f;
 
             Drawable = IsActive || sections.Count > 0;
             return true;
@@ -617,8 +622,8 @@ namespace Barotrauma.Items.Components
             {
                 if (connections[i]?.Item != null)
                 {
-                    var pt = connections[i].Item.GetComponent<PowerTransfer>();
-                    if (pt != null) pt.SetConnectionDirty(connections[i]);
+                    connections[i].Item.GetComponent<PowerTransfer>()?.SetConnectionDirty(connections[i]);
+                    connections[i].SetRecipientsDirty();
                 }
             }
         }
@@ -648,17 +653,29 @@ namespace Barotrauma.Items.Components
             } while (removed);
         }
 
-        private void FixNodeEnds()
+        public void FixNodeEnds()
         {
-            if (connections[0] == null || connections[1] == null || nodes.Count == 0) { return; }
+            Item item0 = connections[0]?.Item;
+            Item item1 = connections[1]?.Item;
+
+            if (item0 == null && item1 != null)
+            {
+                item0 = Item.ItemList.Find(it => it.GetComponent<ConnectionPanel>()?.DisconnectedWires.Contains(this) ?? false);
+            }
+            else if (item0 != null && item1 == null)
+            {
+                item1 = Item.ItemList.Find(it => it.GetComponent<ConnectionPanel>()?.DisconnectedWires.Contains(this) ?? false);
+            }
+
+            if (item0 == null || item1 == null || nodes.Count == 0) { return; }
 
             Vector2 nodePos = nodes[0];
 
-            Submarine refSub = connections[0].Item.Submarine ?? connections[1].Item.Submarine;
+            Submarine refSub = item0.Submarine ?? item1.Submarine;
             if (refSub != null) { nodePos += refSub.HiddenSubPosition; }
 
-            float dist1 = Vector2.DistanceSquared(connections[0].Item.Position, nodePos);
-            float dist2 = Vector2.DistanceSquared(connections[1].Item.Position, nodePos);
+            float dist1 = Vector2.DistanceSquared(item0.Position, nodePos);
+            float dist2 = Vector2.DistanceSquared(item1.Position, nodePos);
 
             //first node is closer to the second item
             //= the nodes are "backwards", need to reverse them
@@ -747,9 +764,9 @@ namespace Barotrauma.Items.Components
             UpdateSections();
         }
 
-        public override void Load(XElement componentElement, bool usePrefabValues)
+        public override void Load(XElement componentElement, bool usePrefabValues, IdRemap idRemap)
         {
-            base.Load(componentElement, usePrefabValues);
+            base.Load(componentElement, usePrefabValues, idRemap);
 
             string nodeString = componentElement.GetAttributeString("nodes", "");
             if (nodeString == "") return;