Add booster sound trigger

Author: peternewell

Source/Orts.Formats.Msts/SoundManagmentFile.cs

@@ -198,7 +198,7 @@ public struct CurvePoint
 
     public class VolumeCurve
     {
-        public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable2_1Controlled, Variable3_1Controlled, Variable4_1Controlled, Variable2Controlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled };
+        public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable2_1Controlled, Variable3_1Controlled, Variable4_1Controlled, Variable2Controlled, Variable2BoosterControlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled };
 
         public Controls Control = Controls.None;
         public float Granularity = 1.0f;
@@ -218,6 +218,7 @@ public VolumeCurve(STFReader stf)
                 case "variable3_1controlled": Control = Controls.Variable3_1Controlled; break;
                 case "variable4_1controlled": Control = Controls.Variable4_1Controlled; break;
                 case "variable2controlled": Control = Controls.Variable2Controlled; break;
+                case "variable2BoosterControlled": Control = Controls.Variable2BoosterControlled; break;
                 case "variable3controlled": Control = Controls.Variable3Controlled; break;
                 case "brakecylcontrolled": Control = Controls.BrakeCylControlled; break;
                 case "curveforcecontrolled": Control = Controls.CurveForceControlled; break;

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

@@ -3022,7 +3022,14 @@ private void UpdateFX(float elapsedClockSeconds)
 
             Variable2 = MathHelper.Clamp((CylinderCocksPressureAtmPSI - OneAtmospherePSI) / BoilerPressurePSI * 100f, 0, 100);
 
-//            Trace.TraceInformation("Variable2 - {0}", Variable2);
+            if (SteamBoosterAirOpen && SteamBoosterRunMode && BoosterCylinderSteamExhaustOn && throttle > 0.0)
+            {
+                Variable2_Booster = SteamChestPressurePSI / MaxBoilerPressurePSI;
+            }
+            else
+            {
+                Variable2_Booster = 0;
+            }
 
             Variable3 = FuelRateSmoothed * 100;
 

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

@@ -115,6 +115,7 @@ public enum WindowState
         public float Variable2_1;
         public float Variable3_1;
         public float Variable4_1;
+        public float Variable2_Booster;
 
         // wag file data
         public string MainShapeFileName;
@@ -1818,7 +1819,11 @@ public override void Save(BinaryWriter outf)
         {
             outf.Write(Variable1);
             outf.Write(Variable2);
+            outf.Write(Variable2_Booster);
             outf.Write(Variable3);
+            outf.Write(Variable2_1);
+            outf.Write(Variable3_1);
+            outf.Write(Variable4_1);
             outf.Write(IsDavisFriction);
             outf.Write(IsRollerBearing);
             outf.Write(IsLowTorqueRollerBearing);
@@ -1879,7 +1884,11 @@ public override void Restore(BinaryReader inf)
         {
             Variable1 = inf.ReadSingle();
             Variable2 = inf.ReadSingle();
+            Variable2_Booster = inf.ReadSingle();
             Variable3 = inf.ReadSingle();
+            Variable2_1 = inf.ReadSingle();
+            Variable3_1 = inf.ReadSingle();
+            Variable4_1 = inf.ReadSingle();
             IsDavisFriction = inf.ReadBoolean();
             IsRollerBearing = inf.ReadBoolean();
             IsLowTorqueRollerBearing = inf.ReadBoolean();

Source/RunActivity/Viewer3D/Sound.cs

@@ -1497,6 +1497,7 @@ private float ReadValue(Orts.Formats.Msts.VolumeCurve.Controls control, MSTSWago
                 case Orts.Formats.Msts.VolumeCurve.Controls.Variable2_1Controlled: return car.Variable2_1;
                 case Orts.Formats.Msts.VolumeCurve.Controls.Variable3_1Controlled: return car.Variable3_1;
                 case Orts.Formats.Msts.VolumeCurve.Controls.Variable4_1Controlled: return car.Variable4_1;
+                case Orts.Formats.Msts.VolumeCurve.Controls.Variable2BoosterControlled: return car.Variable2_Booster;
                 case Orts.Formats.Msts.VolumeCurve.Controls.Variable2Controlled: return car.Variable2;
                 case Orts.Formats.Msts.VolumeCurve.Controls.Variable3Controlled: return car.Variable3;
                 case Orts.Formats.Msts.VolumeCurve.Controls.BrakeCylControlled: return car.BrakeSystem.GetCylPressurePSI();