Remove air compressor and main reservoir indication for control cars

Author: peternewell

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -1749,23 +1749,23 @@ public override void Update(float elapsedClockSeconds)
                  }
 
             // If the train is vacuumed braked then no need to update the compressor, but udate the ejector instead
-              if (BrakeSystem is VacuumSinglePipe)
-                 {
-                    
-                    if (VacuumBrakeEQFitted) // Only update exhauster/main reservoir on locomotives fitted ith an EQ reservoir
-                    {
+            if (BrakeSystem is VacuumSinglePipe)
+            {
+
+                if (VacuumBrakeEQFitted) // Only update exhauster/main reservoir on locomotives fitted ith an EQ reservoir
+                {
                     UpdateVacuumExhauster(elapsedClockSeconds);
-                    }
-                    else
-                    {
-                        UpdateSteamEjector(elapsedClockSeconds);
-                    }
-                
-                 }
-                 else if (EngineType != EngineTypes.Control) // TODO - Control trailers would not have compressors, but if they do then need to be linked to power supply requirements
-                 {
-                   UpdateCompressor(elapsedClockSeconds);
-                 }
+                }
+                else
+                {
+                    UpdateSteamEjector(elapsedClockSeconds);
+                }
+
+            }
+            else if (EngineType != EngineTypes.Control) // TODO - Control trailers would not have compressors, but if they do then need to be linked to power supply requirements
+            {
+                UpdateCompressor(elapsedClockSeconds);
+            }
 
             UpdateHornAndBell(elapsedClockSeconds);
 

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs

@@ -800,7 +800,7 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
                                 dp = train.BrakeLine3PressurePSI - p;
                             p += dp;
                             lead.EngineBrakeState = ValveState.Apply;
-                            sumpv -= dp * brakeSystem.GetCylVolumeM3() / lead.MainResVolumeM3;
+                            sumpv -= dp * brakeSystem.GetCylVolumeM3() / lead.MainResVolumeM3;  // TODO - On control cars there may not be a main reservoir, so this value is may not be correct
                         }
                         else if (p > train.BrakeLine3PressurePSI)  // Release the engine brake as the pressure increases in the brake cylinder
                         {

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -811,12 +811,27 @@ void TextPageBrakeInfo(TableData table)
                 }
                 else  // Default to air or electronically braked, use this display
                 {
-                    TableAddLines(table, String.Format("{0}\t\t{1}\t\t{2}\t{3}\t\t{4}",
-                        Viewer.Catalog.GetString("PlayerLoco"),
-                        Viewer.Catalog.GetString("Main reservoir"),
-                        FormatStrings.FormatPressure((Viewer.PlayerLocomotive as MSTSLocomotive).MainResPressurePSI, PressureUnit.PSI, (Viewer.PlayerLocomotive as MSTSLocomotive).BrakeSystemPressureUnits[BrakeSystemComponent.MainReservoir], true),
-                        Viewer.Catalog.GetString("Compressor"),
-                        (Viewer.PlayerLocomotive as MSTSLocomotive).CompressorIsOn ? Viewer.Catalog.GetString("on") : Viewer.Catalog.GetString("off")));
+                    if ((Viewer.PlayerLocomotive as MSTSLocomotive).EngineType == TrainCar.EngineTypes.Control)
+                    {
+                        // Control cars typically don't have reservoirs
+                        TableAddLines(table, String.Format("{0}\t\t{1}",
+                            Viewer.Catalog.GetString("PlayerLoco"),
+                            Viewer.Catalog.GetString("No compressor or reservoir fitted")
+                            ));
+                    }
+                    else
+                    {
+
+                        TableAddLines(table, String.Format("{0}\t\t{1}\t\t{2}\t{3}\t\t{4}",
+                            Viewer.Catalog.GetString("PlayerLoco"),
+                            Viewer.Catalog.GetString("Main reservoir"),
+                            FormatStrings.FormatPressure((Viewer.PlayerLocomotive as MSTSLocomotive).MainResPressurePSI, PressureUnit.PSI, (Viewer.PlayerLocomotive as MSTSLocomotive).BrakeSystemPressureUnits[BrakeSystemComponent.MainReservoir], true),
+                            Viewer.Catalog.GetString("Compressor"),
+                            (Viewer.PlayerLocomotive as MSTSLocomotive).CompressorIsOn ? Viewer.Catalog.GetString("on") : Viewer.Catalog.GetString("off")));
+                    }
+
+
+
                 }
 
                 // Display data for other locomotives
@@ -825,13 +840,28 @@ void TextPageBrakeInfo(TableData table)
                     var car = train.Cars[i];
                     if (car is MSTSLocomotive && car != Viewer.PlayerLocomotive)
                     {
-                        TableAddLines(table, String.Format("{0}\t{1}\t{2}\t\t{3}\t{4}\t\t{5}",
+
+                        if ((car as MSTSLocomotive).EngineType == TrainCar.EngineTypes.Control)
+                        {
+                            // Control cars typically don't have reservoirs
+                            TableAddLines(table, String.Format("{0}\t{1}",
+                            Viewer.Catalog.GetString("Loco"),
+                            car.CarID
+                            ));
+                        }
+                        else
+                        {
+                            TableAddLines(table, String.Format("{0}\t{1}\t{2}\t\t{3}\t{4}\t\t{5}",
                             Viewer.Catalog.GetString("Loco"),
                             car.CarID,
+
                             Viewer.Catalog.GetString("Main reservoir"),
                             FormatStrings.FormatPressure((car as MSTSLocomotive).MainResPressurePSI, PressureUnit.PSI, (car as MSTSLocomotive).BrakeSystemPressureUnits[BrakeSystemComponent.MainReservoir], true),
                             Viewer.Catalog.GetString("Compressor"),
                             (car as MSTSLocomotive).CompressorIsOn ? Viewer.Catalog.GetString("on") : Viewer.Catalog.GetString("off")));
+
+
+                        }
                     }
                 }
                 TableAddLine(table);