Switchable brake system

Author: pzgulyas

Source/Orts.Common/Conversions.cs

@@ -189,7 +189,7 @@ public static class Kg
         /// <summary>Convert from kilograms to UK Tons</summary>
         public static float ToTUK(float kg)       { return kg     * (1.0f / 1016.047f); }
         /// <summary>Convert from kilogram to metric tonnes</summary>
-        public static float ToTonne(float kg)      { return kg    * (1.0f / 1000.0f); }
+        public static float ToTonne(float kg)      { return kg    / 1000.0f; }
         /// <summary>Convert from metrix tonnes to kilogram</summary>
         public static float FromTonne(float tonne) { return tonne * 1000.0f; }
     }

Source/Orts.Parsers.Msts/STFReader.cs

@@ -609,11 +609,10 @@ public float ReadFloat(UNITS validUnits, float? defaultValue)
             // However, some values (mostly "time" ones) may be followed by text. Therefore that approach cannot be used consistently 
             // and has been abandoned. </CJComment> 
 
-            float val;
-            double scale = ParseUnitSuffix(ref item, validUnits);
             if (item.Length == 0) return 0.0f;
             if (item[item.Length - 1] == ',') item = item.TrimEnd(',');
-            if (float.TryParse(item, parseNum, parseNFI, out val)) return (scale == 1) ? val : (float)(scale * val);
+            double scale = ParseUnitSuffix(ref item, validUnits); // must be after TrimEnd(','), otherwise the unit parsed becomes invalid
+            if (float.TryParse(item, parseNum, parseNFI, out float val)) return (scale == 1) ? val : (float)(scale * val);
             STFException.TraceWarning(this, "Cannot parse the constant number " + item);
             if (item == ")") StepBackOneItem();
             return defaultValue.GetValueOrDefault(0);

Source/Orts.Simulation/Simulation/Physics/Train.cs

@@ -4059,33 +4059,14 @@ public void UnconditionalInitializeBrakes()
                 MSTSLocomotive lead = (MSTSLocomotive)Cars[LeadLocomotiveIndex];
                 if (lead.TrainBrakeController != null)
                 {
-                    foreach (MSTSWagon car in Cars)
+                    foreach (var car in Cars)
                     {
-                        if (lead.CarBrakeSystemType != car.CarBrakeSystemType) // Test to see if car brake system is the same as the locomotive
+                        if (lead.BrakeSystem.GetType() != car.BrakeSystem.GetType())
                         {
-                            // If not, change so that they are compatible
-                            car.CarBrakeSystemType = lead.CarBrakeSystemType;
-                            if (lead.BrakeSystem is VacuumSinglePipe)
-                                car.MSTSBrakeSystem = new VacuumSinglePipe(car);
-                            else if (lead.BrakeSystem is AirTwinPipe)
-                                car.MSTSBrakeSystem = new AirTwinPipe(car);
-                            else if (lead.BrakeSystem is AirSinglePipe leadAir)
-                            {
-                                car.MSTSBrakeSystem = new AirSinglePipe(car);
-                                // if emergency reservoir has been set on lead locomotive then also set on trailing cars
-                                if (leadAir.EmergencyReservoirPresent)
-                                {
-                                    (car.BrakeSystem as AirSinglePipe).EmergencyReservoirPresent = leadAir.EmergencyReservoirPresent;
-                                }
-                            }
-                            else if (lead.BrakeSystem is EPBrakeSystem ep)
-                                car.MSTSBrakeSystem = new EPBrakeSystem(car, ep.TwoPipes);
-                            else if (lead.BrakeSystem is SingleTransferPipe)
-                                car.MSTSBrakeSystem = new SingleTransferPipe(car);
-                            else
-                                throw new Exception("Unknown brake type");
-
-                            car.MSTSBrakeSystem.InitializeFromCopy(lead.BrakeSystem);
+                            car.BrakeSystem = BrakeSystem.CreateNewLike(lead.BrakeSystem, car);
+                            car.BrakeSystem.InitializeFromCopy(lead.BrakeSystem, false);
+                            if (car.BrakeSystem is AirSinglePipe carAir && lead.BrakeSystem is AirSinglePipe leadAir)
+                                carAir.EmergencyReservoirPresent = leadAir.EmergencyReservoirPresent;
                             Trace.TraceInformation("Car and Locomotive Brake System Types Incompatible on Car {0} - Car brakesystem type changed to {1}", car.CarID, car.CarBrakeSystemType);
                         }
                     }