Remove surplus triggers

Author: peternewell

Source/Documentation/Manual/sound.rst

@@ -457,7 +457,7 @@ This approach relies on use of the Track Region sounds configured in the TType.d
 continuously and contains all track related sounds that need to be played despite the region that the train is in. Further track region SMS files can be created for 
 different track type regions, such as different bridge types (such as wood, concrete or steel).
 
-To enable this approach the following parameters need to be set accordingly in the route TRK file.
+To enable this approach in OR, the following parameters need to be set accordingly in the route TRK file.
 
 ``ORTSPlayTrackSoundsBaseContinuous`` - this causes the first SMS file in the TType file to be played continuously. Set to 1 for continuous play or 0 for legacy operation.
 
@@ -467,11 +467,11 @@ To enable this approach the following parameters need to be set accordingly in t
 
 The following control parameters can be used in the relevant track region SMS files to vary a frequency or volume curve for the sound being played:
 
-``AngleofAttackControlled`` - Varies as the Angle of Attack of a car on a curve varies.
+``AngleofAttackControlled`` - Varies as the Angle of Attack of a car on a curve varies, in Milliradian (mRad).
 
 ``CarFrictionControlled`` - Varies as friction of car changes, typically between 0 and 1.
 
-``WheelRPMControlled`` - Varies as RPM of wheel changes.
+``WheelRPMControlled`` - Varies as RPM of wheel changes, in RPM.
 
 ``CarDistanceTrackControlled`` - Distance that the car is from the camera in metres.
 
@@ -488,9 +488,9 @@ passes over a switch, and can be varied in accordance with the number of axles d
 ``Xover_2Axle_Trigger``, ``Xover_3Axle_Trigger``, ``Xover_4Axle_Trigger``, ``Xover_6Axle_Trigger``, ``Xover_8Axle_Trigger`` - these triggers are operated when the car passes 
 over a Cross over, and can be varied in accordance with the number of axles defined in the WAG file. Note that the cross over needs to have been defined within the route editor.
 
-``AngleofAttack_inc_past``, ``Angleofattack_dec_past`` - Varies as the Angle of Attack of a car on a curve varies.
+``AngleofAttack_inc_past``, ``Angleofattack_dec_past`` - Varies as the Angle of Attack of a car on a curve varies, in Milliradian (mRad).
 
-``WheelRPM_inc_past``, ``WheelRPM_dec_past`` - Varies as RPM of wheel changes.
+``WheelRPM_inc_past``, ``WheelRPM_dec_past`` - Varies as RPM of wheel changes, in RPM.
 
 ``ConcreteSleepers_inc_past``, ``ConcreteSleepers_dec_past`` - 0 = wood sleepers, 1 = concrete sleepers
 

Source/Orts.Formats.Msts/SoundManagmentFile.cs

@@ -409,7 +409,7 @@ public Discrete_Trigger(STFReader f)
     public class Variable_Trigger : Trigger
     {
         public enum Events { Speed_Inc_Past, Speed_Dec_Past, Distance_Inc_Past, Distance_Dec_Past,
-            Variable1_Inc_Past, Variable1_2_Inc_Past, Variable1_3_Inc_Past, Variable1_4_Inc_Past, Variable1_Dec_Past, Variable1_2_Dec_Past, Variable1_3_Dec_Past, Variable1_4_Dec_Past, Variable2_Inc_Past, Variable2_Dec_Past, Variable3_Inc_Past, Variable3_Dec_Past, BrakeCyl_Inc_Past, BrakeCyl_Dec_Past, CurveForce_Inc_Past, CurveForce_Dec_Past, AngleofAttack_Inc_Past, AngleofAttack_Dec_Past, WheelRpM_Dec_Past, WheelRPM_Inc_Past, TrackJoints_Inc_Past, TrackJoints_Dec_Past, CarOnSwitch_Inc_Past, CarOnSwitch_Dec_Past, CarOnXover_Inc_Past, CarOnXover_Dec_Past, WagonAxles_Inc_Past, WagonAxles_Dec_Past, ConcreteSleepers_Inc_Past, ConcreteSleepers_Dec_Past, CarInTunnel_Inc_Past, CarInTunnel_Dec_Past, CarCameraDistance_Inc_Past, CarCameraDistance_Dec_Past
+            Variable1_Inc_Past, Variable1_2_Inc_Past, Variable1_3_Inc_Past, Variable1_4_Inc_Past, Variable1_Dec_Past, Variable1_2_Dec_Past, Variable1_3_Dec_Past, Variable1_4_Dec_Past, Variable2_Inc_Past, Variable2_Dec_Past, Variable3_Inc_Past, Variable3_Dec_Past, BrakeCyl_Inc_Past, BrakeCyl_Dec_Past, CurveForce_Inc_Past, CurveForce_Dec_Past, AngleofAttack_Inc_Past, AngleofAttack_Dec_Past, WheelRpM_Dec_Past, WheelRPM_Inc_Past, ConcreteSleepers_Inc_Past, ConcreteSleepers_Dec_Past, CarInTunnel_Inc_Past, CarInTunnel_Dec_Past, CarCameraDistance_Inc_Past, CarCameraDistance_Dec_Past
         };
 
         public Events Event;
@@ -459,14 +459,6 @@ public Variable_Trigger(STFReader f)
                 case "angleofattack_dec_past": Event = Events.AngleofAttack_Dec_Past; break;
                 case "wheelrpm_inc_past": Event = Events.WheelRPM_Inc_Past; break;
                 case "wheelrpm_dec_past": Event = Events.WheelRpM_Dec_Past; break;
-                case "trackjoints_inc_past": Event = Events.TrackJoints_Inc_Past; break;
-                case "trackjoints_dec_past": Event = Events.TrackJoints_Dec_Past; break;
-                case "wagonaxles_inc_past": Event = Events.WagonAxles_Inc_Past; break;
-                case "wagonaxles_dec_past": Event = Events.WagonAxles_Dec_Past; break;
-                case "caronswitch_inc_past": Event = Events.CarOnSwitch_Inc_Past; break;
-                case "caronswitch_dec_past": Event = Events.CarOnSwitch_Dec_Past; break;
-                case "caronxover_inc_past": Event = Events.CarOnXover_Inc_Past; break;
-                case "caronxover_dec_past": Event = Events.CarOnXover_Dec_Past; break;
                 case "concretesleepers_inc_past": Event = Events.ConcreteSleepers_Inc_Past; break;
                 case "concretesleepers_dec_past": Event = Events.ConcreteSleepers_Dec_Past; break;
                 case "carintunnel_inc_past": Event = Events.CarInTunnel_Inc_Past; break;

Source/RunActivity/Viewer3D/Sound.cs

@@ -2620,10 +2620,6 @@ public override void TryTrigger( )
                 case Orts.Formats.Msts.Variable_Trigger.Events.CurveForce_Inc_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.AngleofAttack_Inc_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.WheelRPM_Inc_Past:
-                case Orts.Formats.Msts.Variable_Trigger.Events.TrackJoints_Inc_Past:
-                case Orts.Formats.Msts.Variable_Trigger.Events.WagonAxles_Inc_Past:
-                case Orts.Formats.Msts.Variable_Trigger.Events.CarOnSwitch_Inc_Past:
-                case Orts.Formats.Msts.Variable_Trigger.Events.CarOnXover_Inc_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.ConcreteSleepers_Inc_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Inc_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.CarCameraDistance_Inc_Past:
@@ -2718,18 +2714,6 @@ private float ReadValue()
                     var wheelRpM = pS.TopM((float)(car.AbsSpeedMpS /
                     (2 * Math.PI * car.WheelRadiusM)));
                     return wheelRpM;
-                case Orts.Formats.Msts.Variable_Trigger.Events.TrackJoints_Dec_Past:
-                case Orts.Formats.Msts.Variable_Trigger.Events.TrackJoints_Inc_Past:
-                    return car.TrackJointSoundTriggered;
-                case Orts.Formats.Msts.Variable_Trigger.Events.WagonAxles_Dec_Past:
-                case Orts.Formats.Msts.Variable_Trigger.Events.WagonAxles_Inc_Past:
-                    return car.SoundAxleCount;
-                case Orts.Formats.Msts.Variable_Trigger.Events.CarOnSwitch_Dec_Past:
-                case Orts.Formats.Msts.Variable_Trigger.Events.CarOnSwitch_Inc_Past:
-                    return car.TrackSwitchSoundTriggered;
-                case Orts.Formats.Msts.Variable_Trigger.Events.CarOnXover_Dec_Past:
-                case Orts.Formats.Msts.Variable_Trigger.Events.CarOnXover_Inc_Past:
-                    return car.TrackXoverSoundTriggered;
                 case Orts.Formats.Msts.Variable_Trigger.Events.ConcreteSleepers_Dec_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.ConcreteSleepers_Inc_Past:
                     return SharedSMSFileManager.ConcreteSleepers;