Automatic merge of T1.5.1-870-ge0bf062eb and 16 pull requests

- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #882 at 9c456aa: Blueprint/train car operations UI window
- Pull request #885 at 8f94333: feat: Add notifications to Menu
- Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #897 at 42f1dd9: feat: Improved system information collection
- Pull request #903 at 0d6d045: Downloading route content (Github, zip)
- Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel
- Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR
- Pull request #912 at 659396e: New Triple Valve Features Vol. 2
- Pull request #914 at 1dea28c: Adjustments to Duplex steam
- Pull request #915 at 6d911d7: Correct calculation error with curve friction
- Pull request #916 at 11ac52c: Distributed Power Air Brake Synchronization

Author: openrails-bot

Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs

@@ -160,6 +160,7 @@ private static class Symbols
             [Viewer.Catalog.GetString("Time")] = Viewer.Catalog.GetString("TIME"),
             [Viewer.Catalog.GetString("Traction cut-off relay")] = Viewer.Catalog.GetString("TRAC"),
             [Viewer.Catalog.GetString("Train brake")] = Viewer.Catalog.GetString("BTRN"),
+            [Viewer.Catalog.GetString("Water scoop")] = Viewer.Catalog.GetString("WSCO"),
             [Viewer.Catalog.GetString("Wheel")] = Viewer.Catalog.GetString("WHEL")
         };
 
@@ -1153,6 +1154,40 @@ void AddSeparator() => AddLabel(new ListLabel
                         });
                     }
                 }
+                AddSeparator();
+            }
+
+            // Water scoop
+            if (locomotive.HasWaterScoop)
+            {
+                string waterScoopIndicator, waterScoopKey;
+                if (locomotive.ScoopIsBroken)
+                {
+                    if (locomotive.IsWaterScoopDown)
+                    {
+                        locomotive.ToggleWaterScoop();// Set water scoop up
+                    }
+                    waterScoopIndicator = Viewer.Catalog.GetString("Broken") + ColorCode[Color.Orange];
+                    waterScoopKey = "";
+                }
+                else if (locomotive.IsWaterScoopDown && !locomotive.ScoopIsBroken)
+                {
+                    waterScoopIndicator = Viewer.Catalog.GetString("Down") + (locomotive.IsOverTrough() ? ColorCode[Color.Cyan] : ColorCode[Color.Orange]);
+                    waterScoopKey = Symbols.ArrowToRight + ColorCode[Color.Yellow];
+                }
+                else
+                {
+                    waterScoopIndicator = Viewer.Catalog.GetString("Up") + ColorCode[Color.White];
+                    waterScoopKey = "";
+                }
+
+                AddLabel(new ListLabel
+                {
+                    FirstCol = Viewer.Catalog.GetString("Water scoop"),
+                    LastCol = waterScoopIndicator,
+                    KeyPressed = waterScoopKey,
+                    SymbolCol = ""
+                });
             }
 
             // Blowdown valve
@@ -1179,7 +1214,7 @@ void AddSeparator() => AddLabel(new ListLabel
                 AddSeparator();
             }
 
-            // Booster air valve
+            // Booster engine
             if (locomotive is MSTSSteamLocomotive)
             {
                 MSTSSteamLocomotive steamLocomotive6 = (MSTSSteamLocomotive)locomotive;
@@ -1198,22 +1233,18 @@ void AddSeparator() => AddLabel(new ListLabel
                     string boosterIdleValveIndicator = "-", boosterIdleValveKey = "";
                     string boosterLatchOnIndicator = "-", boosterLatchOnKey = "";
                     var cutOffLess65 = train.MUReverserPercent < 65.0f;
-                    bool moving = Math.Abs(trainCar.SpeedMpS) > 1;
+                    bool movingTrain = Math.Abs(trainCar.SpeedMpS) > 0.0555556f;// 0.2 km/h
                     var currentTrainInfo = train.GetTrainInfo();
-                    var trainStopping = currentTrainInfo.projectedSpeedMpS < 1;
+                    var trainStopping = currentTrainInfo.projectedSpeedMpS < 0.0277778f;// 0.1 km/h
 
-                    // Disengages booster if speed is more than 34 km/h or cutOff less than 65%
-                    if (steamLocomotive6.SteamBoosterLatchOn && (steamLocomotive6.SpeedMpS > 9.4444 || (cutOffLess65 && moving) || locomotive.Direction == Direction.Reverse))
-                    {
-                        steamLocomotive6.ToggleSteamBoosterLatch();// Disengages booster
-                    }
                     // Engages booster if train is moving forward less than 19 km/h and cutoff value more than 65%
-                    else if (!steamLocomotive6.SteamBoosterLatchOn && !trainStopping && steamLocomotive6.SpeedMpS < 5.27778 && !cutOffLess65 && moving && locomotive.Direction == Direction.Forward)
+                    if (!steamLocomotive6.SteamBoosterLatchOn && !trainStopping && steamLocomotive6.SpeedMpS < 5.27778 && !cutOffLess65 && movingTrain && locomotive.Direction == Direction.Forward)
                     {
                         steamLocomotive6.ToggleSteamBoosterLatch();// Engages booster
                     }
-                    // Disengages booster if projectedSpeedMpS < 1
-                    else if (steamLocomotive6.SteamBoosterLatchOn && trainStopping)
+                    // Disengages booster if speed is more than 34 km/h or cutOff less than 65%
+                    else if (steamLocomotive6.SteamBoosterLatchOn && (steamLocomotive6.SpeedMpS > 9.4444 || (cutOffLess65 && movingTrain) || locomotive.Direction == Direction.Reverse)
+                        || (steamLocomotive6.SteamBoosterLatchOn && trainStopping))// Disengages booster if projectedSpeedMpS < 0.1 km/h
                     {
                         steamLocomotive6.ToggleSteamBoosterLatch();// Disengages booster
                     }
@@ -1223,6 +1254,10 @@ void AddSeparator() => AddLabel(new ListLabel
                     {
                         EnabledIdleValve = true;
                     }
+                    if (EnabledIdleValve && !steamLocomotive6.SteamBoosterAirOpen && !steamLocomotive6.SteamBoosterIdle && !steamLocomotive6.SteamBoosterLatchOn)
+                    {
+                        EnabledIdleValve = false;
+                    }
 
                     // SteamBoosterAirValve   Ctrl+D...close/open
                     if (!steamLocomotive6.SteamBoosterAirOpen)
@@ -1248,14 +1283,21 @@ void AddSeparator() => AddLabel(new ListLabel
                     // SteamBoosterIdleValve..Ctrl+B...idle/run
                     if (!steamLocomotive6.SteamBoosterIdle)
                     {
-                        boosterIdleValveIndicator = Viewer.Catalog.GetString("Idle") + ColorCode[Color.White];
+                        boosterIdleValveIndicator = Viewer.Catalog.GetString("Idle") + ColorCode[EnabledIdleValve ? Color.White : Color.Orange];
                         boosterIdleValveKey = "";
                     }
                     if (steamLocomotive6.SteamBoosterIdle && EnabledIdleValve)
                     {
                         boosterIdleValveIndicator = Viewer.Catalog.GetString("Run") + ColorCode[EnabledIdleValve ? Color.Cyan : Color.Orange];
                         boosterIdleValveKey = Symbols.ArrowToRight + ColorCode[Color.Yellow];
                     }
+                    // When shut off the booster system and the air open valve is closed, we set the idle valve from the run position to idle.
+                    if (steamLocomotive6.SteamBoosterIdle && !steamLocomotive6.SteamBoosterAirOpen )
+                    {
+                        steamLocomotive6.ToggleSteamBoosterIdle();// set to idle
+                        boosterIdleValveIndicator = Viewer.Catalog.GetString("Idle") + ColorCode[Color.White];
+                        boosterIdleValveKey = "";
+                    }
                     AddLabel(new ListLabel
                     {
                         FirstCol = Viewer.Catalog.GetString("Booster idle valve") + ColorCode[EnabledIdleValve ? Color.White : Color.Orange],
@@ -1273,7 +1315,7 @@ void AddSeparator() => AddLabel(new ListLabel
                     }
                     if (!steamLocomotive6.SteamBoosterLatchOn)
                     {
-                        boosterLatchOnIndicator = Viewer.Catalog.GetString("Opened") + ColorCode[Color.White];
+                        boosterLatchOnIndicator = Viewer.Catalog.GetString("Opened") + ColorCode[EnabledIdleValve ? Color.White : Color.Orange];
                         boosterLatchOnKey = "";
                         BoosterLocked = false;
                     }
@@ -1429,21 +1471,21 @@ void AddSeparator() => AddLabel(new ListLabel
             }
 
             // Wheel
-            if (train.IsWheelSlip || train.IsWheelSlipWarninq || train.IsBrakeSkid)
+            if (train.HuDIsWheelSlip || train.HuDIsWheelSlipWarninq || train.IsBrakeSkid)
             {
                 wheelLabelVisible = true;
                 clockWheelTime = Owner.Viewer.Simulator.ClockTime;
             }
 
-            if (train.IsWheelSlip)
+            if (train.HuDIsWheelSlip)
             {
                 AddLabel(new ListLabel
                 {
                     FirstCol = Viewer.Catalog.GetString("Wheel"),
                     LastCol = Viewer.Catalog.GetString("slip") + ColorCode[Color.OrangeRed],
                 });
             }
-            else if (train.IsWheelSlipWarninq)
+            else if (train.HuDIsWheelSlipWarninq)
             {
                 AddLabel(new ListLabel
                 {