Unstable 0.16.3.0

2022-02-10 02:52:08 +09:00
parent 6814a11520
commit 2190fe08ef
115 changed files with 993 additions and 453 deletions
@@ -302,17 +302,24 @@ namespace Barotrauma.Items.Components
        /// <summary>
        /// Returns the amount of power that can be supplied by batteries directly connected to the item
        /// </summary>
-        protected float GetAvailableBatteryPower()
+        protected float GetAvailableInstantaneousBatteryPower()
        {
-            var batteries = item.GetConnectedComponents<PowerContainer>();
-
+            if (item.Connections == null) { return 0.0f; }
            float availablePower = 0.0f;
-            foreach (PowerContainer battery in batteries)
+            foreach (Connection c in item.Connections)
            {
-                float batteryPower = Math.Min(battery.Charge * 3600.0f, battery.MaxOutPut);
-                availablePower += batteryPower;
-            }
+                var recipients = c.Recipients;
+                foreach (Connection recipient in recipients)
+                {
+                    if (!recipient.IsPower || !recipient.IsOutput) { continue; }
+                    var battery = recipient.Item?.GetComponent<PowerContainer>();
+                    if (battery == null) { continue; }

+                    float maxOutputPerFrame = battery.MaxOutPut / 60.0f;
+                    float framesPerMinute = 3600.0f;
+                    availablePower += Math.Min(battery.Charge * framesPerMinute, maxOutputPerFrame);
+                }
+            }
            return availablePower;
        }