Update calculation of Operative Brakes and Tons per Operative Brake.

Brake Force alone is not sufficient to determine if the car has
operative brakes. BrakeValve (BrakeEquipmentType) does not work well for
the Content Manager, and even some newer rollingstock has it incorrect.
Thus BrakeSystem (BrakeSystemType) not being "just a pipe" or manual
braking seems to work best.

Also corrected TpOP to only use trailing tonnage (as defined by BNSF).

Author: rwf-rr

Source/Contrib/ContentManager/ContentInfo.cs

@@ -198,7 +198,7 @@ public static string GetText(Content content)
                     if (!IsMetric && !IsUK)
                     {
                         details.AppendFormat("HPT:\t{1}{0}", Environment.NewLine, FormatHPT(data.MaxPowerW, data.MassKG));
-                        details.AppendFormat("TpOB:\t{1}{0}", Environment.NewLine, FormatTPOB(data.MassKG, data.NumOperativeBrakes));
+                        details.AppendFormat("TpOB:\t{1}{0}", Environment.NewLine, FormatTPOB(data.TrailingMassKG, data.NumOperativeBrakes));
                         details.AppendFormat("TpEPA:\t{1}{0}", Environment.NewLine, FormatTonsPerEPA(data.MassKG, data.MaxTractiveForceN));
                         details.AppendFormat("TpEDBA:\t{1}{0}", Environment.NewLine, FormatTonsPerEDBA(data.MassKG, data.MaxDynamicBrakeForceN));
                     }

Source/Contrib/ContentManager/Models/Consist.cs

@@ -32,6 +32,7 @@ public class Consist
         public readonly float LengthM = 0F;
         public readonly int NumAxles = 0;
         public readonly float MassKG = 0F;
+        public readonly float TrailingMassKG = 0F;
         public readonly float MaxPowerW = 0F;
         public readonly float MaxTractiveForceN = 0F;
         public readonly float MaxDynamicBrakeForceN = 0F;
@@ -74,7 +75,6 @@ public Consist(Content content)
                         MaxBrakeForce += wagonFile.MaxBrakeForceN;
                         MinCouplerStrengthN = Math.Min(MinCouplerStrengthN, wagonFile.MinCouplerStrengthN);
                         var subType = wagonFile.WagonType;
-                        if (wagonFile.MaxBrakeForceN > 0) { NumOperativeBrakes++; }
 
                         if (engFile != null)
                         {
@@ -100,6 +100,12 @@ public Consist(Content content)
                         else if (!wag.IsEOT && wagonFile.WagonSize.LengthM > 1.1) // exclude legacy EOT
                         {
                             WagCount++;
+                            TrailingMassKG += wagonFile.MassKG;
+                            if (wagonFile.MaxBrakeForceN > 0 && wagonFile.BrakeSystemType != null && !wagonFile.BrakeSystemType.Contains("manual_braking") &&
+                                !wagonFile.BrakeSystemType.Contains("air_piped") && !wagonFile.BrakeSystemType.Contains("vacuum_piped"))
+                            {
+                                NumOperativeBrakes++;
+                            }
                         }
 
                         // see MSTSWagon.LoadFromWagFile()

Source/Orts.Formats.Msts/WagonFile.cs

@@ -34,6 +34,8 @@ public class WagonFile
         public CarSize WagonSize;
         public int NumWagAxles;  // ORTS
         public float NumWagWheels;  // MSTS
+        public string BrakeSystemType;
+        public string BrakeEquipmentType;
         public float MaxBrakeForceN;
         public float MinCouplerStrengthN = ImpossiblyHighForceN;
 
@@ -111,6 +113,8 @@ public WagonFile(string filePath)
                             new STFReader.TokenProcessor("size", ()=>{ WagonSize = new CarSize( stf); }),
                             new STFReader.TokenProcessor("ortsnumberaxles", ()=>{ NumWagAxles = stf.ReadIntBlock(null); }),
                             new STFReader.TokenProcessor("numwheels", ()=>{ NumWagWheels = stf.ReadFloatBlock( STFReader.UNITS.None, null); }),
+                            new STFReader.TokenProcessor("brakesystemtype", ()=>{ BrakeSystemType = stf.ReadStringBlock(null).ToLower(); }),
+                            new STFReader.TokenProcessor("brakeequipmenttype", ()=>{ BrakeEquipmentType = stf.ReadStringBlock(null).ToLower(); }),
                             new STFReader.TokenProcessor("maxbrakeforce", ()=>{ MaxBrakeForceN = stf.ReadFloatBlock(STFReader.UNITS.Force, null); }),
                             new STFReader.TokenProcessor("coupling", ()=>{ new CouplingSpring( ref MinCouplerStrengthN, stf); })
                         });