Add additional control keys for Steam Booster

Author: peternewell

Source/ORTS.Common/Input/UserCommand.cs

@@ -193,8 +193,9 @@ public enum UserCommand
         [GetString("Control Blower Decrease")] ControlBlowerDecrease,
         [GetString("Control Steam Heat Increase")] ControlSteamHeatIncrease,
         [GetString("Control Steam Heat Decrease")] ControlSteamHeatDecrease,
-        [GetString("Control Steam Booster Increase")] ControlSteamBoosterIncrease,
-        [GetString("Control Steam Booster Decrease")] ControlSteamBoosterDecrease,
+        [GetString("Control Steam Booster Air Valve")] ControlSteamBoosterAirValve,
+        [GetString("Control Steam Booster Idle Valve")] ControlSteamBoosterIdleValve,
+        [GetString("Control Steam Booster Latch")] ControlSteamBoosterLatch,
         [GetString("Control Damper Increase")] ControlDamperIncrease,
         [GetString("Control Damper Decrease")] ControlDamperDecrease,
         [GetString("Control Firebox Open")] ControlFireboxOpen,

Source/ORTS.Settings/InputSettings.cs

@@ -356,8 +356,9 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.ControlBlowerIncrease] = new UserCommandKeyInput(0x31);
             Commands[(int)UserCommand.ControlSteamHeatDecrease] = new UserCommandKeyInput(0x20, KeyModifiers.Alt);
             Commands[(int)UserCommand.ControlSteamHeatIncrease] = new UserCommandKeyInput(0x16, KeyModifiers.Alt);
-            Commands[(int)UserCommand.ControlSteamBoosterDecrease] = new UserCommandKeyInput(0x11, KeyModifiers.Shift);
-            Commands[(int)UserCommand.ControlSteamBoosterIncrease] = new UserCommandKeyInput(0x11, KeyModifiers.Alt);
+            Commands[(int)UserCommand.ControlSteamBoosterAirValve] = new UserCommandKeyInput(0x11, KeyModifiers.Alt);
+            Commands[(int)UserCommand.ControlSteamBoosterIdleValve] = new UserCommandKeyInput(0x25, KeyModifiers.Alt);
+            Commands[(int)UserCommand.ControlSteamBoosterLatch] = new UserCommandKeyInput(0x25, KeyModifiers.Control);
             Commands[(int)UserCommand.ControlBrakeHoseConnect] = new UserCommandKeyInput(0x2B);
             Commands[(int)UserCommand.ControlBrakeHoseDisconnect] = new UserCommandKeyInput(0x2B, KeyModifiers.Shift);
             Commands[(int)UserCommand.ControlCabRadio] = new UserCommandKeyInput(0x13, KeyModifiers.Alt);

Source/Orts.Formats.Msts/CabViewFile.cs

@@ -130,7 +130,9 @@ public enum CABViewControlTypes
         DAMPERS_FRONT,
         DAMPERS_BACK,
         STEAM_HEAT,
-        STEAM_BOOSTER,
+        STEAM_BOOSTER_AIR,
+        STEAM_BOOSTER_IDLE,
+        STEAM_BOOSTER_LATCH,
         WATER_INJECTOR1,
         WATER_INJECTOR2,
         SMALL_EJECTOR,

Source/Orts.Simulation/Common/Commands.cs

@@ -1575,21 +1575,64 @@ public override void Redo()
     // Steam controls
 
     // Steam booster command
+
     [Serializable()]
-    public sealed class ContinuousSteamBoosterCommand : ContinuousCommand
+    public sealed class ToggleSteamBoosterAirCommand : Command
     {
         public static MSTSSteamLocomotive Receiver { get; set; }
 
-        public ContinuousSteamBoosterCommand(CommandLog log, int injector, bool toState, float? target, double startTime)
-            : base(log, toState, target, startTime)
+        public ToggleSteamBoosterAirCommand(CommandLog log)
+            : base(log)
+        {
+            Redo();
+        }
+
+        public override void Redo()
+        {
+            if (Receiver == null) return;
+            Receiver.ToggleSteamBoosterAir();
+            // Report();
+        }
+    }
+
+    // Steam Booster Idle Valve
+
+    [Serializable()]
+    public sealed class ToggleSteamBoosterIdleCommand : Command
+    {
+        public static MSTSSteamLocomotive Receiver { get; set; }
+
+        public ToggleSteamBoosterIdleCommand(CommandLog log)
+            : base(log)
+        {
+            Redo();
+        }
+
+        public override void Redo()
+        {
+            if (Receiver == null) return;
+            Receiver.ToggleSteamBoosterIdle();
+            // Report();
+        }
+    }
+
+    // Steam Booster Latch
+
+    [Serializable()]
+    public sealed class ToggleSteamBoosterLatchCommand : Command
+    {
+        public static MSTSSteamLocomotive Receiver { get; set; }
+
+        public ToggleSteamBoosterLatchCommand(CommandLog log)
+            : base(log)
         {
             Redo();
         }
 
         public override void Redo()
         {
             if (Receiver == null) return;
-            Receiver.SteamBoosterChangeTo(ToState, Target);
+            Receiver.ToggleSteamBoosterLatch();
             // Report();
         }
     }

Source/Orts.Simulation/Simulation/Confirmer.cs

@@ -66,7 +66,9 @@ public enum CabControl {
       , FiringIsManual
       , FireShovelfull
       , CylinderCocks
-      , SteamBooster
+      , SteamBoosterAir
+      , SteamBoosterIdle
+      , SteamBoosterLatch
       , CylinderCompound
       , LargeEjector
       , SmallEjector
@@ -217,7 +219,9 @@ public Confirmer(Simulator simulator, double defaultDurationS)
                 , new string [] { GetString("Manual Firing"), GetString("off"), null, GetString("on") } 
                 , new string [] { GetString("Fire"), null, null, GetString("add shovel-full") }
                 , new string [] { GetString("Cylinder Cocks"), GetString("close"), null, GetString("open") }
-                , new string [] { GetString("SteamBooster"), null, null, null, GetString("decrease"), GetString("increase") }
+                , new string [] { GetString("Steam Booster Air Valve"), GetString("close"), null, GetString("open") }
+                , new string [] { GetString("Steam Booster Idle Valve"), GetString("idle"), null, GetString("run") }
+                , new string [] { GetString("Steam Booster Latch"), GetString("close"), null, GetString("open") }
                 , new string [] { GetString("Cylinder Compound"), GetString("close"), null, GetString("open") }
                 , new string [] { GetString("LargeEjector"), null, null, null, GetString("decrease"), GetString("increase") }
                 , new string [] { GetString("SmallEjector"), null, null, null, GetString("decrease"), GetString("increase") }