Reverted the changes to power transfer logic in bb987676 because of the issues it caused with relay components. Signals are still passed using the cached recipient lists, but power is passed using the old recursive CheckJunctions method. Closes #282

Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs

@@ -17,7 +17,7 @@ namespace Barotrauma.Items.Components
         //affects how fast changes in power/load are carried over the grid
         static float inertia = 5.0f;
 
-        private HashSet<PowerTransfer> connectedPoweredList = new HashSet<PowerTransfer>();
+        private static HashSet<Powered> connectedList = new HashSet<Powered>();
         private List<Connection> powerConnections;
         public List<Connection> PowerConnections
         {
@@ -26,7 +26,7 @@ namespace Barotrauma.Items.Components
                 if (powerConnections == null)
                 {
                     var connections = Item.Connections;
-                    powerConnections = connectedPoweredList == null ? new List<Connection>() : connections.FindAll(c => c.IsPower);
+                    powerConnections = connections == null ? new List<Connection>() : connections.FindAll(c => c.IsPower);
 
                 }
                 return powerConnections;
@@ -128,35 +128,28 @@ namespace Barotrauma.Items.Components
             fullPower = 0.0f;
             fullLoad = 0.0f;
 
-            connectedPoweredList.Clear();
+            connectedList.Clear();
 
-            CheckPower(deltaTime);
+            CheckJunctions(deltaTime);
             updateCount = 0;
 
-            int n = 0;
+            foreach (Powered p in connectedList)
-            foreach (PowerTransfer pt in connectedPoweredList)
             {
+                PowerTransfer pt = p as PowerTransfer;
+                if (pt == null) continue;
+
                 pt.powerLoad += (fullLoad - pt.powerLoad) / inertia;
                 pt.currPowerConsumption += (-fullPower - pt.currPowerConsumption) / inertia;
                 pt.Item.SendSignal(0, "", "power", null, fullPower / Math.Max(fullLoad, 1.0f));
                 pt.Item.SendSignal(0, "", "power_out", null, fullPower / Math.Max(fullLoad, 1.0f));
 
-                //damage the item if voltage is too high (except if running as a client)
+                //damage the item if voltage is too high 
-
+                //(except if running as a client)
-                //relay components work differently, they can be connected to a high-powered junction box
+                if (GameMain.Client != null) continue;
-                //and only break if the output (~the power running through the relay) is too high
-                if (GameMain.Client != null || this is RelayComponent) continue;
                 if (-pt.currPowerConsumption < Math.Max(pt.powerLoad * Rand.Range(1.9f, 2.1f), 200.0f)) continue;
 
                 float prevCondition = pt.item.Condition;
-
+                pt.item.Condition -= deltaTime * 10.0f;
-                //deterioration rate is directly proportional to the ratio between the available power and the load (up to a max of 10x)
-                float conditionDeteriorationSpeed = MathHelper.Clamp(-pt.currPowerConsumption / Math.Max(pt.powerLoad, 1.0f), 0.0f, 10.0f);
-
-                //make the deterioration speed vary between items to prevent every junction box breaking at the same time
-                conditionDeteriorationSpeed += ((n + (float)Timing.TotalTime / 60.0f) % 10) * 0.5f;
-
-                pt.item.Condition -= deltaTime * conditionDeteriorationSpeed;
 
                 if (pt.item.Condition <= 0.0f && prevCondition > 0.0f)
                 {
@@ -178,7 +171,7 @@ namespace Barotrauma.Items.Components
                         new FireSource(pt.item.WorldPosition);
                     }
                 }
-                n++;
+
             }
         }
 
@@ -263,42 +256,36 @@ namespace Barotrauma.Items.Components
 
         //a recursive function that goes through all the junctions and adds up
         //all the generated/consumed power of the constructions connected to the grid
-        private void CheckPower(float deltaTime)
+        private void CheckJunctions(float deltaTime)
         {
             updateCount = 1;
-            connectedPoweredList.Clear();
+            connectedList.Add(this);
+
+            ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
 
             foreach (Connection c in PowerConnections)
             {
-                HashSet<Connection> recipients = connectedRecipients[c];
+                var recipients = c.Recipients;
+
                 foreach (Connection recipient in recipients)
                 {
                     if (recipient == null) continue;
 
                     Item it = recipient.Item;
-                    if (it == null || it.Condition <= 0.0f) continue;
+                    if (it == null) continue;
+
+                    if (it.Condition <= 0.0f) continue;
 
                     foreach (Powered powered in it.GetComponents<Powered>())
                     {
                         if (powered == null || !powered.IsActive) continue;
+                        if (connectedList.Contains(powered)) continue;
+
                         PowerTransfer powerTransfer = powered as PowerTransfer;
                         if (powerTransfer != null)
                         {
                             if (!powerTransfer.CanTransfer) continue;
-                            if (powerTransfer is RelayComponent != this is RelayComponent && c.IsPower)
+                            powerTransfer.CheckJunctions(deltaTime);
-                            {
-                                //relay components and junction boxes aren't treated as parts of the same power grid
-                                //connected relays simply increase the load of the grid (and jbs connected to relays increase the load of the relay)
-                                if (c.IsOutput)
-                                {
-                                    fullLoad += powerTransfer.powerLoad;
-                                }
-                            }
-                            else
-                            {
-                                connectedPoweredList.Add(powerTransfer);
-                                powerTransfer.updateCount = 1;
-                            }
                             continue;
                         }
 
@@ -307,8 +294,7 @@ namespace Barotrauma.Items.Components
                         {
                             if (recipient.Name == "power_in")
                             {
-                                //batteries connected to power_in never increase load
+                                fullLoad += powerContainer.CurrPowerConsumption;
-                                if (c.IsOutput) fullLoad += powerContainer.CurrPowerConsumption;
                             }
                             else
                             {
@@ -317,18 +303,21 @@ namespace Barotrauma.Items.Components
                         }
                         else
                         {
+                            connectedList.Add(powered);
                             //positive power consumption = the construction requires power -> increase load
                             if (powered.CurrPowerConsumption > 0.0f)
                             {
-                                //items connected to power_in never increase load
+                                fullLoad += powered.CurrPowerConsumption;
-                                if (c.IsOutput) fullLoad += powered.CurrPowerConsumption;
                             }
-                            else if (powered.CurrPowerConsumption < 0.0f) //negative power consumption = the construction is a generator/battery
+                            else if (powered.CurrPowerConsumption < 0.0f)
+                            //negative power consumption = the construction is a 
+                            //generator/battery or another junction box
                             {
                                 fullPower -= powered.CurrPowerConsumption;
                             }
                         }
                     }
+
                 }
             }
         }