(3a5d98b) v0.9.6.0

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

@@ -175,9 +175,8 @@ namespace Barotrauma.Items.Components
             else
             {
                 currPowerConsumption = MathHelper.Lerp(currPowerConsumption, rechargeSpeed, 0.05f);
-                Charge += currPowerConsumption * Voltage / 3600.0f;
-            }
-                       
+                Charge += currPowerConsumption * Math.Min(Voltage, 1.0f) / 3600.0f;
+            }                       
 
             if (charge <= 0.0f)
             {

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

@@ -280,6 +280,8 @@ namespace Barotrauma.Items.Components
         {
             //we've already received this signal
             if (lastPowerProbeRecipients.Contains(this)) { return; }
+            if (item.Condition <= 0.0f) { return; }
+
             lastPowerProbeRecipients.Add(this);
 
             if (power < 0.0f)
@@ -306,15 +308,15 @@ namespace Barotrauma.Items.Components
 
                     foreach (ItemComponent ic in recipient.Item.Components)
                     {
-                        //powertransfer components don't need to receive the signal in the pass-through signal connections
+                        //other junction boxes don't need to receive the signal in the pass-through signal connections
                         //because we relay it straight to the connected items without going through the whole chain of junction boxes
-                        if (ic is PowerTransfer && connection.Name.Contains("signal")) { continue; }
+                        if (ic is PowerTransfer && !(ic is RelayComponent) && connection.Name.Contains("signal")) { continue; }
                         ic.ReceiveSignal(stepsTaken, signal, recipient, source, sender, 0.0f, signalStrength);
                     }
 
                     foreach (StatusEffect effect in recipient.Effects)
                     {
-                        recipient.Item.ApplyStatusEffect(effect, ActionType.OnUse, 1.0f, null, null, false, false);
+                        recipient.Item.ApplyStatusEffect(effect, ActionType.OnUse, 1.0f);
                     }
                 }
             }

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

@@ -279,13 +279,30 @@ namespace Barotrauma.Items.Components
                     var pc = powerSource.Item.GetComponent<PowerContainer>();
                     if (pc != null)
                     {
-                        float voltage = -pc.CurrPowerOutput / Math.Max(powered.CurrPowerConsumption, 1.0f);
+                        float voltage = pc.CurrPowerOutput / Math.Max(powered.CurrPowerConsumption, 1.0f);
                         powered.voltage += voltage;
                     }
                 }
             }
         }
-        
+
+        /// <summary>
+        /// Returns the amount of power that can be supplied by batteries directly connected to the item
+        /// </summary>
+        protected float GetAvailableBatteryPower()
+        {
+            var batteries = item.GetConnectedComponents<PowerContainer>();
+
+            float availablePower = 0.0f;
+            foreach (PowerContainer battery in batteries)
+            {
+                float batteryPower = Math.Min(battery.Charge * 3600.0f, battery.MaxOutPut);
+                availablePower += batteryPower;
+            }
+
+            return availablePower;
+        }
+
         protected override void RemoveComponentSpecific()
         {
             poweredList.Remove(this);