Add base track sounds to route

Author: peternewell

Source/Orts.Formats.Msts/RouteFile.cs

@@ -126,7 +126,9 @@ public Tr_RouteFile(STFReader stf)
                 new STFReader.TokenProcessor("ortscurvesmsnumber", ()=>{ CurveSMSNumber = stf.ReadIntBlock(null); }),
                 new STFReader.TokenProcessor("ortscurveswitchsmsnumber", ()=>{ CurveSwitchSMSNumber = stf.ReadIntBlock(null); }),
                 new STFReader.TokenProcessor("ortsopendoorsinaitrains", ()=>{ OpenDoorsInAITrains = stf.ReadBoolBlock(false); }),
-
+                new STFReader.TokenProcessor("ortsplaytracksoundsbasecontinuous", ()=>{ TrackSoundDefaultContinuousPlay = stf.ReadBoolBlock(false); }),
+                new STFReader.TokenProcessor("ortsdistancebetweentrackjoints", ()=>{ DistanceBetweenTrackJointsM = stf.ReadFloatBlock(STFReader.UNITS.Distance, null); }),
+                new STFReader.TokenProcessor("ortsconcretesleepers", ()=>{ ConcreteSleepers = stf.ReadFloatBlock(STFReader.UNITS.None, null); }),
            });
             //TODO This should be changed to STFException.TraceError() with defaults values created
             if (RouteID == null) throw new STFException(stf, "Missing RouteID");
@@ -175,6 +177,11 @@ public Tr_RouteFile(STFReader stf)
         public float ForestClearDistance = 0;
         public bool RemoveForestTreesFromRoads = false;
 
+        // Track based sounds
+        public bool TrackSoundDefaultContinuousPlay = false;
+        public float DistanceBetweenTrackJointsM;
+        public float ConcreteSleepers;
+
         // images
         public string Thumbnail;
         public string LoadingScreen;

Source/Orts.Formats.Msts/SoundManagmentFile.cs

@@ -38,6 +38,9 @@ public class SharedSMSFileManager
         public static int CurveSwitchSMSNumber;
         public static bool AutoTrackSound = false;
 
+        public static bool PlayDefaultTrackSoundsContinuous = false;
+        public static float ConcreteSleepers;
+
         public static SoundManagmentFile Get(string path)
         {
             if (!SharedSMSFiles.ContainsKey(path))
@@ -240,7 +243,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 };
+        public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable1_2Controlled, Variable1_3Controlled, Variable1_4Controlled, Variable2Controlled, Variable2BoosterControlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled, AngleofAttackControlled, CarFrictionControlled, WheelRpMControlled };
 
         public Controls Control = Controls.None;
         public float Granularity = 1.0f;
@@ -264,6 +267,9 @@ public VolumeCurve(STFReader stf)
                 case "variable3controlled": Control = Controls.Variable3Controlled; break;
                 case "brakecylcontrolled": Control = Controls.BrakeCylControlled; break;
                 case "curveforcecontrolled": Control = Controls.CurveForceControlled; break;
+                case "angleofattackcontrolled": Control = Controls.AngleofAttackControlled; break;
+                case "carfrictioncontrolled": Control = Controls.CarFrictionControlled; break;
+                case "wheelrpmcontrolled": Control = Controls.WheelRpMControlled; break;
                 default: STFException.TraceWarning(stf, "Crash expected: Skipped unknown VolumeCurve/Frequencycurve type " + type); stf.SkipRestOfBlock(); return;
             }
             stf.ParseBlock(new STFReader.TokenProcessor[] {
@@ -385,7 +391,8 @@ 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
+        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
         };
 
         public Events Event;
@@ -431,6 +438,23 @@ public Variable_Trigger(STFReader f)
                 case "brakecyl_dec_past": Event = Events.BrakeCyl_Dec_Past; break;
                 case "curveforce_inc_past": Event = Events.CurveForce_Inc_Past; break;
                 case "curveforce_dec_past": Event = Events.CurveForce_Dec_Past; break;
+
+                case "angleofattack_inc_past": Event = Events.AngleofAttack_Inc_Past; break;
+                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;
+                case "carintunnel_dec_past": Event = Events.CarInTunnel_Dec_Past; break;
             }
 
 

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

@@ -1956,7 +1956,7 @@ public override void Save(BinaryWriter outf)
 
             outf.Write(WheelBrakeSlideProtectionActive);
             outf.Write(WheelBrakeSlideProtectionTimerS);
-            outf.Write(AngleOfAttackRad);
+            outf.Write(AngleOfAttackmRad);
             outf.Write(DerailClimbDistanceM);
             outf.Write(DerailPossible);
             outf.Write(DerailExpected);
@@ -2013,7 +2013,7 @@ public override void Restore(BinaryReader inf)
 
             WheelBrakeSlideProtectionActive = inf.ReadBoolean();
             WheelBrakeSlideProtectionTimerS = inf.ReadInt32();
-            AngleOfAttackRad = inf.ReadSingle();
+            AngleOfAttackmRad = inf.ReadSingle();
             DerailClimbDistanceM = inf.ReadSingle();
             DerailPossible = inf.ReadBoolean();
             DerailExpected = inf.ReadBoolean();