Automatic merge of T1.5.1-976-g502cbbef0 and 16 pull requests

- Pull request #799 at dfc715e: Consolidated wind simulation
- 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 b3f83ed: Blueprint/train car operations UI window
- Pull request #891 at 9a1d6b2: Auto save
- 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 #900 at c27f32d: DMI updates
- Pull request #903 at 3e390b8: Downloading route content (Github, zip)
- Pull request #912 at cda1d74: New Triple Valve Features Vol. 2
- Pull request #922 at abe2e52: Autopilot for timetable mode
- Pull request #943 at fb1f454: Dynamic Brakes Behavior & Display Improvements
- Pull request #945 at f5872fd: Display tractive force instead of compensated out force
- Pull request #946 at 66f836c: Advanced track sounds
- Pull request #948 at a687981: Fix Cycling Lights
- Pull request #949 at c2a5d32: Oil Burning Locomotive

Author: openrails-bot

Source/Orts.Formats.Msts/SoundManagmentFile.cs

@@ -201,7 +201,7 @@ public struct CurvePoint
 
     public class VolumeCurve
     {
-        public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable1_2Controlled, Variable1_3Controlled, Variable1_4Controlled, Variable2Controlled, Variable2BoosterControlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled, AngleofAttackControlled, CarFrictionControlled, WheelRpMControlled, TrackJointControlled, SwitchControlled };
+        public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable1_2Controlled, Variable1_3Controlled, Variable1_4Controlled, Variable2Controlled, Variable2BoosterControlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled, AngleofAttackControlled, CarFrictionControlled, WheelRpMControlled, TrackJointControlled, SwitchControlled, TunnelControlled };
 
         public Controls Control = Controls.None;
         public float Granularity = 1.0f;
@@ -230,6 +230,7 @@ public VolumeCurve(STFReader stf)
                 case "wheelrpmcontrolled": Control = Controls.WheelRpMControlled; break;
                 case "trackjointcontrolled": Control = Controls.TrackJointControlled; break;
                 case "switchcontrolled": Control = Controls.SwitchControlled; break;
+                case "tunnelcontrolled": Control = Controls.TunnelControlled; break;
                 default: STFException.TraceWarning(stf, "Crash expected: Skipped unknown VolumeCurve/Frequencycurve type " + type); stf.SkipRestOfBlock(); return;
             }
             stf.ParseBlock(new STFReader.TokenProcessor[] {
@@ -351,7 +352,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,
+            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, CarInTunnel_Inc_Past, CarInTunnel_Dec_Past,
         };
 
         public Events Event;
@@ -405,6 +406,8 @@ public Variable_Trigger(STFReader f)
                 case "trackjoints_dec_past": Event = Events.TrackJoints_Dec_Past; break;
                 case "caronswitch_inc_past": Event = Events.CarOnSwitch_Inc_Past; break;
                 case "caronswitch_dec_past": Event = Events.CarOnSwitch_Dec_Past; break;
+                case "carintunnel_inc_past": Event = Events.CarInTunnel_Inc_Past; break;
+                case "carintunnel_dec_past": Event = Events.CarInTunnel_Dec_Past; break;
             }
 
 

Source/RunActivity/Viewer3D/Sound.cs

@@ -1592,6 +1592,9 @@ private float ReadValue(Orts.Formats.Msts.VolumeCurve.Controls control, MSTSWago
                     else
                         switchPresent = 0;
                     return switchPresent;
+                case Orts.Formats.Msts.VolumeCurve.Controls.TunnelControlled:
+                    var tunnelSize = car.CarTunnelData.numTunnelPaths;
+                    return tunnelSize;
 
                 default: return 0;
             }
@@ -2031,6 +2034,7 @@ public override void TryTrigger()
                 case Orts.Formats.Msts.Variable_Trigger.Events.WheelRpM_Dec_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.TrackJoints_Dec_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.CarOnSwitch_Dec_Past:
+                case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Dec_Past:
                     if (newValue < SMS.Threshold)
                     {
                         Signaled = true;
@@ -2052,6 +2056,7 @@ public override void TryTrigger()
                 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.CarOnSwitch_Inc_Past:
+                case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Inc_Past:
                     if (newValue > SMS.Threshold)
                     {
                         Signaled = true;
@@ -2162,6 +2167,14 @@ private float ReadValue()
                     else
                         switchPresent = 0;
                     return switchPresent;
+                case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Dec_Past:
+                case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Inc_Past:
+                    var inTunnel = 0;
+                    if (car.CarTunnelData.FrontPositionBeyondStartOfTunnel.HasValue) // Car is in tunnel
+                        inTunnel = 1;
+                    else
+                        inTunnel = 0;
+                    return inTunnel;
 
                 default:
                     return 0;