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 5bbc476: Content Manager: Add axle count, and lowest derail force
- Pull request #1062 at 3b18c48: Train Forces popup Window.
- Pull request #1064 at 9b3415e: 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/RunActivity/Viewer3D/Popups/HelpWindow.cs

@@ -593,7 +593,7 @@ owner.Viewer.Simulator.PlayerLocomotive is MSTSLocomotive &&
             }));
             Tabs.Add(new TabData(Tab.TrainInfo, Viewer.Catalog.GetString("Train Info"), (cl) =>
             {
-                var labelWidth = cl.TextHeight * 12;
+                var labelWidth = cl.TextHeight * 13;
                 var scrollbox = cl.AddLayoutScrollboxVertical(cl.RemainingWidth);
                 if (Owner.Viewer.PlayerTrain != null)
                 {
@@ -1197,16 +1197,16 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
             var lengthM = playerTrain.Length;
             var maxSpeedMps = playerTrain.TrainMaxSpeedMpS;
             float totPowerW = 0f;
-            float totMaxTractiveEffortN = 0f;
-            string sectionMaxTractiveForce = ""; // using "  +  " between DPU sets
+            float totMaxContTractiveEffortN = 0f;
+            string sectionMaxContTractiveForce = ""; // using "  +  " between DPU sets
             float totMaxDynamicBrakeForceN = 0f;
             string sectionMaxDynamicBrakeForce = ""; // using "  +  " between DPU sets
             float maxBrakeForceN = 0f;
             float lowestCouplerStrengthN = 9.999e8f;  // impossible high force
             float lowestDerailForceN = 9.999e8f;  // impossible high force
 
             int engCount = 0; string countSeparator = ""; // when set, indicates that subsequent engines are in a separate block
-            float engMaxTractiveForceN = 0f; float engMaxDynBrakeForceN = 0f; string forceSeparator = "";  // when set, indicates that subsequent engines are in a separate block
+            float engMaxContTractiveForceN = 0f; float engMaxDynBrakeForceN = 0f; string forceSeparator = "";  // when set, indicates that subsequent engines are in a separate block
 
             float wagMassKg = 0f; string massSeparator = ""; // when set, indicates that subsequent engines are in a separate block
             int numOperativeBrakes = 0;
@@ -1233,8 +1233,8 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
                     engCount++;
                     numAxles += eng.LocoNumDrvAxles + eng.GetWagonNumAxles();
                     totPowerW += eng.MaxPowerW;
-                    totMaxTractiveEffortN += eng.MaxForceN;
-                    engMaxTractiveForceN += eng.MaxForceN;
+                    totMaxContTractiveEffortN += eng.MaxContinuousForceN > 0 ? eng.MaxContinuousForceN : eng.MaxForceN;
+                    engMaxContTractiveForceN += eng.MaxContinuousForceN > 0 ? eng.MaxContinuousForceN : eng.MaxForceN;
                     totMaxDynamicBrakeForceN += eng.MaxDynamicBrakeForceN;
                     engMaxDynBrakeForceN += eng.MaxDynamicBrakeForceN;
 
@@ -1256,9 +1256,9 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
                     {
                         numEngines += countSeparator + engCount.ToString();
                         engCount = 0; countSeparator = "+";
-                        sectionMaxTractiveForce += forceSeparator + FormatStrings.FormatForce(engMaxTractiveForceN, isMetric);
+                        sectionMaxContTractiveForce += forceSeparator + FormatStrings.FormatForce(engMaxContTractiveForceN, isMetric);
                         sectionMaxDynamicBrakeForce += forceSeparator + FormatStrings.FormatForce(engMaxDynBrakeForceN, isMetric);
-                        engMaxTractiveForceN = 0f; engMaxDynBrakeForceN = 0f;  forceSeparator = "  +  ";
+                        engMaxContTractiveForceN = 0f; engMaxDynBrakeForceN = 0f;  forceSeparator = "  +  ";
                     }
                 }
 
@@ -1278,7 +1278,7 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
 
             if (engCount > 0) { numEngines = numEngines + countSeparator + engCount.ToString(); }
             if (String.IsNullOrEmpty(numEngines)) { numEngines = "0"; }
-            if (engMaxTractiveForceN > 0) { sectionMaxTractiveForce += forceSeparator + FormatStrings.FormatForce(engMaxTractiveForceN, isMetric); }
+            if (engMaxContTractiveForceN > 0) { sectionMaxContTractiveForce += forceSeparator + FormatStrings.FormatForce(engMaxContTractiveForceN, isMetric); }
             if (engMaxDynBrakeForceN > 0) { sectionMaxDynamicBrakeForce += forceSeparator + FormatStrings.FormatForce(engMaxDynBrakeForceN, isMetric); }
             if (wagMassKg > 0) { sectionMass += massSeparator + FormatStrings.FormatLargeMass(wagMassKg, isMetric, isUK); }
 
@@ -1314,8 +1314,8 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
             line.Add(new Label(line.RemainingWidth, line.RemainingHeight, FormatStrings.FormatPower(totPowerW, isMetric, false, false), LabelAlignment.Left));
 
             line = scrollbox.AddLayoutHorizontalLineOfText();
-            line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Max Tractive Effort:"), LabelAlignment.Left));
-            line.Add(new Label(line.RemainingWidth, line.RemainingHeight, sectionMaxTractiveForce, LabelAlignment.Left));
+            line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Max Continuous Tractive Effort:"), LabelAlignment.Left));
+            line.Add(new Label(line.RemainingWidth, line.RemainingHeight, sectionMaxContTractiveForce, LabelAlignment.Left));
 
             line = scrollbox.AddLayoutHorizontalLineOfText();
             line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Max Dynamic Brake Force:"), LabelAlignment.Left));
@@ -1340,7 +1340,7 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
                 //       and should really be defined in the path file.
 
                 // tons per equivalent powered axle (TPA or TpEPA)
-                float tpepa = totMaxTractiveEffortN > 0 ? Kg.ToTUS(totMassKg) / (N.ToLbf(totMaxTractiveEffortN) / 10000f) : 0;
+                float tpepa = totMaxContTractiveEffortN > 0 ? Kg.ToTUS(totMassKg) / (N.ToLbf(totMaxContTractiveEffortN) / 10000f) : 0;
                 line = scrollbox.AddLayoutHorizontalLineOfText();
                 line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Tons per EPA:"), LabelAlignment.Left));
                 line.Add(new Label(line.RemainingWidth, line.RemainingHeight, string.Format("{0:0}", tpepa), LabelAlignment.Left));