Unstable 0.14.5.0

2021-06-14 17:53:42 +03:00
parent 1f3e588fcd
commit 23a7c37eee
25 changed files with 254 additions and 259 deletions
@@ -19,5 +19,22 @@ namespace Barotrauma.Items.Components
            this.power = power;
            this.strength = strength;
        }
+
+        internal Signal WithStepsTaken(int stepsTaken)
+        {
+            Signal retVal = this;
+            retVal.stepsTaken = stepsTaken;
+            return retVal;
+        }
+
+        public static bool operator==(Signal a, Signal b) =>
+            a.value == b.value &&
+            a.stepsTaken == b.stepsTaken &&
+            a.sender == b.sender &&
+            a.source == b.source &&
+            MathUtils.NearlyEqual(a.power, b.power) &&
+            MathUtils.NearlyEqual(a.strength, b.strength);
+
+        public static bool operator!=(Signal a, Signal b) => !(a == b);
    }
 }
@@ -64,6 +64,7 @@ namespace Barotrauma.Items.Components
        public override void ReceiveSignal(Signal signal, Connection connection)
        {
            float.TryParse(signal.value, NumberStyles.Float, CultureInfo.InvariantCulture, out float value);
+            bool sendOutputImmediately = true;
            switch (Function)
            {
                case FunctionType.Sin:
@@ -105,11 +106,13 @@ namespace Barotrauma.Items.Components
                    {
                        timeSinceReceived[0] = 0.0f;
                        float.TryParse(signal.value, NumberStyles.Float, CultureInfo.InvariantCulture, out receivedSignal[0]);
+                        sendOutputImmediately = false;
                    }
                    else if (connection.Name == "signal_in_y")
                    {
                        timeSinceReceived[1] = 0.0f;
                        float.TryParse(signal.value, NumberStyles.Float, CultureInfo.InvariantCulture, out receivedSignal[1]);
+                        sendOutputImmediately = false;
                    }
                    else
                    {
@@ -121,9 +124,11 @@ namespace Barotrauma.Items.Components
                default:
                    throw new NotImplementedException($"Function {Function} has not been implemented.");
            }
-
-            signal.value = value.ToString("G", CultureInfo.InvariantCulture);
-            item.SendSignal(signal, "signal_out");
+            if (sendOutputImmediately)
+            {
+                signal.value = value.ToString("G", CultureInfo.InvariantCulture);
+                item.SendSignal(signal, "signal_out");
+            }
        }
    }
 }