Add ability to control vacuum brakes and gears to Control Car

Author: peternewell

Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs

@@ -42,12 +42,16 @@
 using System.Text;
 using Event = Orts.Common.Event;
 using ORTS.Scripting.Api;
+using static Orts.Simulation.RollingStocks.MSTSDieselLocomotive;
 
 namespace Orts.Simulation.RollingStocks
 {
     public class MSTSControlTrailerCar : MSTSLocomotive
     {
 
+        public int ControlGearBoxNumberOfGears = 1;
+
+
         public MSTSControlTrailerCar(Simulator simulator, string wagFile)
     : base(simulator, wagFile)
         {
@@ -96,12 +100,55 @@ public override void Parse(string lowercasetoken, STFReader stf)
                     LocomotivePowerSupply.Parse(lowercasetoken, stf);
                     break;
 
+                // to setup gearbox controller
+                case "engine(gearboxnumberofgears": ControlGearBoxNumberOfGears = stf.ReadIntBlock(1); break;
+
+
                 default:
                     base.Parse(lowercasetoken, stf); break;
             }
 
         }
 
+        /// <summary>
+        /// This initializer is called when we are making a new copy of a locomotive already
+        /// loaded in memory.  We use this one to speed up loading by eliminating the
+        /// need to parse the wag file multiple times.
+        /// NOTE:  you must initialize all the same variables as you parsed above
+        /// </summary>
+        public override void Copy(MSTSWagon copy)
+        {
+            
+            base.Copy(copy);  // each derived level initializes its own variables
+
+            MSTSControlTrailerCar locoCopy = (MSTSControlTrailerCar)copy;
+
+            ControlGearBoxNumberOfGears = locoCopy.ControlGearBoxNumberOfGears;
+
+
+        }
+
+        /// <summary>
+        /// We are saving the game.  Save anything that we'll need to restore the 
+        /// status later.
+        /// </summary>
+        public override void Save(BinaryWriter outf)
+        {
+            ControllerFactory.Save(GearBoxController, outf);
+        }
+
+        /// <summary>
+        /// We are restoring a saved game.  The TrainCar class has already
+        /// been initialized.   Restore the game state.
+        /// </summary>
+        public override void Restore(BinaryReader inf)
+        {
+            base.Restore(inf);
+            ControllerFactory.Restore(GearBoxController, inf);
+
+        }
+
+
         /// <summary>
         /// Set starting conditions  when initial speed > 0 
         /// 
@@ -112,6 +159,14 @@ public override void InitializeMoving()
             WheelSpeedMpS = SpeedMpS;
 
             ThrottleController.SetValue(Train.MUThrottlePercent / 100);
+
+            // Initialise gearbox controller
+            if (ControlGearBoxNumberOfGears > 0)
+            {
+                GearBoxController = new MSTSNotchController(ControlGearBoxNumberOfGears + 1);
+            }
+
+
         }
 
         /// <summary>

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -1504,8 +1504,8 @@ public override void Initialize()
             // Initialise Brake Pipe Quick Charging Rate
             if (BrakePipeQuickChargingRatePSIpS == 0) BrakePipeQuickChargingRatePSIpS = BrakePipeChargingRatePSIorInHgpS;
 
-            // Initialise Exhauster Charging rate in diesel and electric locomotives. The equivalent ejector charging rates are set in the steam locomotive.
-            if (this is MSTSDieselLocomotive || this is MSTSElectricLocomotive)
+            // Initialise Exhauster Charging rate in diesel, control cars and electric locomotives. The equivalent ejector charging rates are set in the steam locomotive.
+            if (this is MSTSDieselLocomotive || this is MSTSElectricLocomotive || this is MSTSControlTrailerCar)
             {
                 ExhausterHighSBPChargingRatePSIorInHgpS = BrakePipeChargingRatePSIorInHgpS;
                 ExhausterLowSBPChargingRatePSIorInHgpS = BrakePipeChargingRatePSIorInHgpS / 5.0f; // Low speed exhauster setting is 1/5 of high speed

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

@@ -996,8 +996,9 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
                         // Brake Controller is in Release position - decrease brake pipe value pressure - PSI goes from 14.5 to 4.189 - releasing brakes
                         else if (lead.TrainBrakeController.TrainBrakeControllerState == ControllerState.Release)
                         {
+                            
                             float TrainPipePressureDiffPSI = 0;
-                            if (lead.EngineType == TrainCar.EngineTypes.Diesel || lead.EngineType == TrainCar.EngineTypes.Electric)
+                            if (lead.EngineType == TrainCar.EngineTypes.Diesel || lead.EngineType == TrainCar.EngineTypes.Electric || lead.EngineType == TrainCar.EngineTypes.Control)
                             {
                                 // diesel and electric locomotives use vacuum exhauster
                                 TrainPipePressureDiffPSI = TrainPipeTimeVariationS * EQReleaseNetBPLossGainPSI;