v0.11.0.9

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/OxygenGenerator.cs

@@ -8,11 +8,10 @@ namespace Barotrauma.Items.Components
 {
     class OxygenGenerator : Powered
     {
-        private float powerDownTimer;
-        
         private float generatedAmount;
 
-        private List<Vent> ventList;
+        //key = vent, float = total volume of the hull the vent is in and the hulls connected to it
+        private Dictionary<Vent, float> ventList;
 
         private float totalHullVolume;
         
@@ -49,17 +48,12 @@ namespace Barotrauma.Items.Components
                 Voltage = 1.0f;
             }
 
-            if (item.CurrentHull == null) return;
+            if (item.CurrentHull == null) { return; }
 
             if (Voltage < MinVoltage)
             {
-                powerDownTimer += deltaTime;
                 return;
             }
-            else
-            {
-                powerDownTimer = 0.0f;
-            }
             
             CurrFlow = Math.Min(Voltage, 1.0f) * generatedAmount * 100.0f;
 
@@ -76,24 +70,25 @@ namespace Barotrauma.Items.Components
         public override void UpdateBroken(float deltaTime, Camera cam)
         {
             base.UpdateBroken(deltaTime, cam);
-            powerDownTimer += deltaTime;
             CurrFlow = 0.0f;
         }
 
         private void GetVents()
         {
-            ventList.Clear();
-
+            ventList = new Dictionary<Vent, float>();
             foreach (MapEntity entity in item.linkedTo)
             {
-                Item linkedItem = entity as Item;
-                if (linkedItem == null) continue;
+                if (!(entity is Item linkedItem)) { continue; }
 
                 Vent vent = linkedItem.GetComponent<Vent>();
-                if (vent == null) continue;
+                if (vent?.Item.CurrentHull == null) { continue; }
 
-                ventList.Add(vent);
-                if (linkedItem.CurrentHull != null) totalHullVolume += linkedItem.CurrentHull.Volume;
+                ventList.Add(vent, 0.0f);
+                foreach (Hull connectedHull in vent.Item.CurrentHull.GetConnectedHulls(includingThis: true, searchDepth: 10, ignoreClosedGaps: true))
+                { 
+                    totalHullVolume += connectedHull.Volume;
+                    ventList[vent] += connectedHull.Volume;
+                }
             }
         }
         
@@ -101,18 +96,17 @@ namespace Barotrauma.Items.Components
         {
             if (ventList == null)
             {
-                ventList = new List<Vent>();
                 GetVents();
             }
 
-            if (!ventList.Any() || totalHullVolume <= 0.0f) return;
+            if (!ventList.Any() || totalHullVolume <= 0.0f) { return; }
 
-            foreach (Vent v in ventList)
+            foreach (KeyValuePair<Vent, float> v in ventList)
             {
-                if (v.Item.CurrentHull == null) continue;
+                if (v.Key?.Item.CurrentHull == null) { continue; }
 
-                v.OxygenFlow = deltaOxygen * (v.Item.CurrentHull.Volume / totalHullVolume);
-                v.IsActive = true;
+                v.Key.OxygenFlow = deltaOxygen * (v.Value / totalHullVolume);
+                v.Key.IsActive = true;
             }
         }
     }