Automatic merge of T1.5.1-1689-g72674c98d and 14 pull requests

- Pull request #900 at 4629736: DMI in 3D cab + two more dials
- Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter
- Pull request #1045 at cc4d53c: Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes
- Pull request #1052 at d3f00a1: Content Manager: Add axle count, and lowest derail force
- Pull request #1062 at 3b18c48: Train Forces popup Window.
- Pull request #1064 at 53dd604: Add Train Info tab to Help window (F1)
- Pull request #1066 at 62c89c1: Log derailment, using TraceInformation.
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #1000 at d8d9709: Locomotive operation from control car
- Pull request #1029 at 92c74ef: Superelevation Follow Up Fixes
- Pull request #1057 at 29a0d37: Switchable brake system
- Pull request #1065 at 409064d: Fix for PantographToggle sound event
- Pull request #1068 at d6e1f83: Build for online-only documentation files
- Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains

Author: openrails-bot

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -682,6 +682,7 @@ public virtual void LoadFromWagFile(string wagFilePath)
                 }
             }
 
+            // Calling SetBrakeSystemMode() is also a prerequisite for initializing the freightanim-style load compensation, by setting the default values for the Load... variables
             var (brakeMode, maxMass) = BrakeSystems?.Count > 0 ? BrakeSystems.Keys.FirstOrDefault() : default;
             SetBrakeSystemMode(brakeMode, maxMass, forceSwitch: true);
 

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

@@ -409,7 +409,6 @@ public override string[] GetDebugStatus(Dictionary<BrakeSystemComponent, Pressur
                 FrontBrakeHoseConnected ? "I" : "T",
                 string.Format("A{0} B{1}", AngleCockAOpenAmount >= 1 ? "+" : AngleCockAOpenAmount <= 0 ? "-" : "/", AngleCockBOpenAmount >= 1 ? "+" : AngleCockBOpenAmount <= 0 ? "-" : "/"),
                 BleedOffValveOpen ? Simulator.Catalog.GetString("Open") : string.Empty,
-                string.Format("{0}t-{1}%", (int)Kg.ToTonne(BrakeMass), GetBrakePercent()),
             };
         }
 
@@ -2602,12 +2601,12 @@ public void BrakeMassToShoeForce(float? brakeMassWithoutAccelerator)
                 return;
             }
 
-            var referenceSpeed = 120; // km/h
-            var referenceMass = Kg.ToTonne(Math.Max(Car.InitialMassKG, LoadStageMinMassKg));
+            var referenceMass = Kg.ToTonne(LoadStageMinMassKg > 0 ? LoadStageMinMassKg : Car.InitialMassKG);
             if (referenceMass == 0)
                 referenceMass = 50;
 
             // Approximation of the UIC curves by Darwin Smith:
+            var referenceSpeed = 120; // km/h
             float a = 0, b = 0, c = 0, d = 0;
             switch (BrakeMode)
             {
@@ -2651,17 +2650,13 @@ public void BrakeMassToShoeForce(float? brakeMassWithoutAccelerator)
             }
             else
             {
+                // If we don't have the brake mass then try to calculate back from the brake force, using the same formula as above
                 var force = MaxBrakeShoeForceN > 0 ? MaxBrakeShoeForceN : InitialMaxBrakeForceN;
                 var brakePercentage = MathHelper.Clamp((force / referenceMass / 10 + d - c * referenceSpeed) / (a - b * referenceSpeed), 0, 250);
                 BrakeMass = Kg.FromTonne(referenceMass) * brakePercentage / 100;
                 if (modeIsAccelerated)
                     BrakeMass /= 0.7f;
             }
         }
-
-        public float GetBrakePercent()
-        {
-            return (int)MathHelper.Clamp(BrakeMass / Car.MassKG * 100, 0, 250);
-        }
     }
 }

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -533,11 +533,16 @@ void TextPageConsistInfo(TableData table)
             var mstsLocomotive = locomotive as MSTSLocomotive;
             var train = locomotive.Train;
             float tonnage = 0f;
+            var brakeMass = 0f;
+            var totalMass = 0f;
             foreach (var car in train.Cars)
             {
-                if(car.WagonType == TrainCar.WagonTypes.Freight || car.WagonType == TrainCar.WagonTypes.Passenger)
+                if (car.WagonType == TrainCar.WagonTypes.Freight || car.WagonType == TrainCar.WagonTypes.Passenger)
                     tonnage += car.MassKG;
+                totalMass += car.MassKG;
+                brakeMass += (car.BrakeSystem as AirSinglePipe)?.BrakeMass ?? 0;
             }
+            var brakePercentage = (int)(brakeMass / totalMass * 100);
             TableSetCells(table, 0,
                 Viewer.Catalog.GetString("Player"),
                 Viewer.Catalog.GetString("Tilted"),
@@ -547,7 +552,8 @@ void TextPageConsistInfo(TableData table)
                 Viewer.Catalog.GetString("Tonnage"), "",
                 Viewer.Catalog.GetString("Control Mode"), "",
                 Viewer.Catalog.GetString("Out of Control"), "",
-                Viewer.Catalog.GetString("Cab Aspect"));
+                Viewer.Catalog.GetString("Cab Aspect"), "",
+                Viewer.Catalog.GetString("Brake %"));
             TableAddLine(table);
             TableSetCells(table, 0, locomotive.CarID + " " + (mstsLocomotive == null ? "" : mstsLocomotive.UsingRearCab ? Viewer.Catalog.GetParticularString("Cab", "R") : Viewer.Catalog.GetParticularString("Cab", "F")),
                 train.IsTilting ? Viewer.Catalog.GetString("Yes") : Viewer.Catalog.GetString("No"),
@@ -557,7 +563,8 @@ void TextPageConsistInfo(TableData table)
                 FormatStrings.FormatLargeMass(tonnage, locomotive.IsMetric, locomotive.IsUK), "",
                 train.ControlMode.ToString(), "",
                 train.OutOfControlReason.ToString(), "",
-                mstsLocomotive.TrainControlSystem.CabSignalAspect.ToString());
+                mstsLocomotive.TrainControlSystem.CabSignalAspect.ToString(), "",
+                string.Format("{0:F0}%", brakePercentage));
             TableAddLine(table);
             TableAddLine(table);
             TableSetCells(table, 0,
@@ -568,7 +575,8 @@ void TextPageConsistInfo(TableData table)
                 Viewer.Catalog.GetString("Weight"),
                 Viewer.Catalog.GetString("Drv/Cabs"),
                 Viewer.Catalog.GetString("Wheels"),
-                Viewer.Catalog.GetString("Temp"));
+                Viewer.Catalog.GetString("Temp"),
+                Viewer.Catalog.GetString("BrkMass"));
             TableAddLine(table);
             foreach (var car in train.Cars.Take(20))
             {
@@ -579,7 +587,8 @@ void TextPageConsistInfo(TableData table)
                     FormatStrings.FormatLargeMass(car.MassKG, locomotive.IsMetric, locomotive.IsUK),
                     (car.IsDriveable ? Viewer.Catalog.GetParticularString("Cab", "D") : "") + (car.HasFrontCab || car.HasFront3DCab ? Viewer.Catalog.GetParticularString("Cab", "F") : "") + (car.HasRearCab || car.HasRear3DCab ? Viewer.Catalog.GetParticularString("Cab", "R") : ""),
                     GetCarWhyteLikeNotation(car),
-                    car.WagonType == TrainCar.WagonTypes.Passenger || car.WagonSpecialType == TrainCar.WagonSpecialTypes.Heated ? FormatStrings.FormatTemperature(car.CarInsideTempC, locomotive.IsMetric, false) : string.Empty);
+                    car.WagonType == TrainCar.WagonTypes.Passenger || car.WagonSpecialType == TrainCar.WagonSpecialTypes.Heated ? FormatStrings.FormatTemperature(car.CarInsideTempC, locomotive.IsMetric, false) : string.Empty,
+                    ((int)Kg.ToTonne((car.BrakeSystem as AirSinglePipe)?.BrakeMass ?? 0)).ToString() + " " + FormatStrings.t);
                 TableAddLine(table);
             }
         }
@@ -1125,8 +1134,7 @@ void TextPageBrakeInfo(TableData table)
                                 Viewer.Catalog.GetString("Handbrk"),
                                 Viewer.Catalog.GetString("Conn"),
                                 Viewer.Catalog.GetString("AnglCock"),
-                                Viewer.Catalog.GetString("BleedOff"),
-                                Viewer.Catalog.GetString("BrkM-%"));
+                                Viewer.Catalog.GetString("BleedOff"));
                 TableAddLine(table);
 
                 var n = train.Cars.Count; // Number of lines to show