Automatic merge of T1.5.1-1678-gf88b8b9b1 and 11 pull requests

- Pull request #900 at b54024b: DMI in 3D cab + two more dials
- Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter
- Pull request #1057 at cf3caa0: Switchable brake system
- Pull request #1062 at 3b18c48: Train Forces popup Window.
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #1000 at d8d9709: Locomotive operation from control car
- Pull request #1029 at 92c74ef: Superelevation Follow Up Fixes
- Pull request #1063 at 6c23191: Better Missing Track Section Error Message
- Pull request #1065 at 409064d: Fix for PantographToggle sound event
- Pull request #1068 at d6e1f83: Build for online-only documentation files
- Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains

Author: openrails-bot

Source/Documentation/Manual/physics.rst

@@ -1141,58 +1141,6 @@ with the ``ORTSTractionMotorType ( AC ) `` parameter, to be inserted in the Engi
 section of the ENG file. The use of this motor will have an impact on wheel slip,
 because the wheel speed never exceeds the frequency of the rotating magnetic field.
 
-Traction force retardation
-''''''''''''''''''''''''''
-
-.. index::
-    single: ORTSTractiveForceRampUpRate
-    single: ORTSTractiveForceRampDownRate
-    single: ORTSTractiveForceRampDownToZeroRate
-    single: ORTSDynamicBrakeForceRampUpRate
-    single: ORTSDynamicBrakeForceRampDownRate
-    single: ORTSDynamicBrakeForceRampDownToZeroRate
-    single: ORTSDelayTimeBeforeUpdating
-
-When the driver sets full throttle, the control electronics may not apply the full
-tractive force instantly, but it will instead linearly apply force until reaching
-the target demand. This can be tuned both for traction and dynamic braking by inserting
-``ORTSTractiveForceRampUpRate``, ``ORTSTractiveForceRampDownRate``,
-``ORTSTractiveForceRampDownToZeroRate``, ``ORTSDynamicBrakeForceRampUpRate``,
-``ORTSDynamicBrakeForceRampDownRate`` and ``ORTSDynamicBrakeForceRampDownToZeroRate``
-in the .eng file. The value of each parameter determines the force increase/decrease
-rate in one second.
-
-Example::
-
-  Engine (
-    ORTSTractiveForceRampUpRate ( 50kN )
-    ORTSTractiveForceRampDownRate ( 50kN )
-    ORTSTractiveForceRampDownToZeroRate ( 100kN )
-    ORTSDynamicBrakeForceRampUpRate ( 70kN )
-    ORTSDynamicBrakeForceRampDownRate ( 50kN )
-    ORTSDynamicBrakeForceRampDownToZeroRate ( 50kN )
-  )
-
-Another possibility to avoid sudden variations in tractive force while the driver
-is moving the throttle, is to only update the throttle/brake demand when the lever
-has not been moved for a defined amount of time. This can be implemented using the
-``ORTSDelayTimeBeforeUpdating``, which has to be inserted for the desired
-controller in the ``EngineControllers`` block.
-
-Example::
-
-  Engine (
-    EngineControllers (
-      Throttle ( 0 1 0.1 0
-        NumNotches ( 0 )
-        ORTSDelayTimeBeforeUpdating ( 0.5s )
-      )
-      Brake_Dynamic ( 0 1 0.1 0
-        NumNotches ( 0 )
-        ORTSDelayTimeBeforeUpdating ( 1s )
-      )
-    )
-  )
 
 Steam Locomotives
 -----------------
@@ -2642,10 +2590,6 @@ behave exactly the same way as player controlled ones.
 
 .. _physics-braking:
 
-.. index::
-   single: BrakeSystemType
-   single: BrakeEquipmentType
-
 Open Rails Braking
 ==================
 
@@ -2683,15 +2627,13 @@ graduated release. It will also force graduated release of brakes in triple
 valves. This option should be unchecked, except for compatibility problems
 with old MSTS stock.
 
-The following brake types are implemented in OR. They can be selected using
-the ``Wagon(BrakeSystemType`` parameter:
+The following brake types are implemented in OR:
 
-- Vacuum single pipe: ``BrakeSystemType ("Vacuum_single_pipe")``
-- Air single-pipe: ``BrakeSystemType ("Air_single_pipe")``
-- Air twin-pipe: ``BrakeSystemType ("Air_twin_pipe")``
-- EP (Electro-pneumatic, twin-pipe): ``BrakeSystemType ("EP")``
-- EP single-pipe: ``BrakeSystemType ("EP_single_pipe")``
-- Single-transfer-pipe (air and vacuum): ``BrakeSystemType ("Air_piped")`` or ``BrakeSystemType ("Vacuum_piped")``
+- Vacuum single
+- Air single-pipe
+- Air twin-pipe
+- EP (Electro-pneumatic)
+- Single-transfer-pipe (air and vacuum)
 
 The operation of air single-pipe brakes is described in general below.
 
@@ -2716,19 +2658,17 @@ brake features.
 For EP brakes, two variants are available:
 
 - If ``Wagon(ORTSEPBrakeControlsBrakePipe`` is set to 0 (default situation),
-  an electrical wire (application wire) provides simultaneous fast brake application
-  along the train. Release time will be fast if standard air brake haven't been applied,
-  otherwise air brakes will determine release time. Typically this system is present
-  with Train Brake Controllers having an EP-only application section, followed by an
-  air application portion which serves as a fallback system, or in combination with a
-  solenoid valve that isolates the triple valve when EP brakes are operational.
-
+an electrical wire (application wire) provides simultaneous fast brake application
+along the train. Release time will be fast if standard air brake haven't been applied,
+otherwise air brakes will determine release time. Typically this system is present
+with Train Brake Controllers having an EP-only application section, followed by an
+air application portion which serves as a fallback system.
 - If ``Wagon(ORTSEPBrakeControlsBrakePipe`` is set to 1, brake pipe is charged and discharged
-  simultaneously at each car in the train, providing fast and uniform brake application and release.
-  The locomotive instructs the cars to "charge" or "discharge" the brake pipe to reach
-  a reference pressure. Standard triple valves or distributors will follow brake pipe variations
-  actuating the cylinders. This system is sometimes called "UIC EP brake". It is typically the system
-  used in high speed trains.
+simultaneously at each car in the train, providing fast and uniform brake application and release.
+The locomotive instructs the cars to "charge" or "discharge" the brake pipe to reach
+a reference pressure. Standard triple valves or distributors will follow brake pipe variations
+actuating the cylinders. This system is sometimes called "UIC EP brake". It is typically the system
+used in high speed trains.
 
 .. _physics-brake-controller:
 
@@ -3440,12 +3380,10 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
    single: ORTSBrakeEmergencyTimeFactor
    single: ORTSBrakePipeTimeFactor
    single: ORTSEPBrakeControlsBrakePipe
-   single: ORTSEPBrakeInhibitsTripleValve
    single: ORTSCompressorIsMuControlled
    single: Supply_Reservoir
    single: ORTSSupplyResCapacity
    single: ORTSSupplyResChargingRate
-   single: Emergency_Solenoid_Valve
 
 - ``Wagon(BrakePipeVolume`` -- Volume of car's brake pipe in cubic feet
   (default .5).
@@ -3518,8 +3456,6 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
   by the brake system.
 - ``Wagon(ORTSEPBrakeControlsBrakePipe`` -- Set to 1 for UIC EP brake: brake pipe
   pressure is electrically controlled at every fitted car.
-- ``Wagon(ORTSEPBrakeInhibitsTripleValve`` -- Set to 1 if the car is fitted with a
-  selector valve that ignores brake pipe pressure when EP brakes are operational.
 - ``Wagon(ORTSBrakeRelayValveRatio`` -- Determines the proportionality constant
   between pressure as demanded by the triple valve and brake cylinder pressure.
   This is achieved via a relay valve which sets BC pressure proportionally.
@@ -3598,7 +3534,7 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
 - ``Wagon(ORTSInitialApplicationThreshold`` -- The pressure difference between
   the brake pipe and auxiliary reservoir at which the triple valve will
   change from release to apply (default 1 psi).
-- ``Wagon(BrakeEquipmentType(Supply_Reservoir`` -- Adds a supply reservoir to the
+- ``BrakeEquipmentType(Supply_Reservoir`` -- Adds a supply reservoir to the
   loco or wagon, which will constantly charge to the brake pipe pressure
   or MR pipe (if equipped) pressure. If a supply reservoir is equipped,
   supply res air will be used to pressurize the brake cylinders thru the relay
@@ -3635,10 +3571,6 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
   Pipe for twin pipe braking systems (default = Main Reservoir Pressure).
 - ``Engine(ORTSCompressorIsMuControlled`` -- Set to 1 if compressors from
   all locomotives are synchronized.
-- ``Wagon(BrakeEquipmentType(Emergency_Solenoid_Valve`` -- Adds an
-  electrically controlled valve that quickly applies maximum
-  brake cylinder pressure during an emergency braking. Only available if the
-  brake cylinder pressure is controlled using a relay valve.
 
 .. _physics-retainers:
 

Source/Orts.Common/Conversions.cs

@@ -189,7 +189,7 @@ public static class Kg
         /// <summary>Convert from kilograms to UK Tons</summary>
         public static float ToTUK(float kg)       { return kg     * (1.0f / 1016.047f); }
         /// <summary>Convert from kilogram to metric tonnes</summary>
-        public static float ToTonne(float kg)      { return kg    * (1.0f / 1000.0f); }
+        public static float ToTonne(float kg)      { return kg    / 1000.0f; }
         /// <summary>Convert from metrix tonnes to kilogram</summary>
         public static float FromTonne(float tonne) { return tonne * 1000.0f; }
     }

Source/Orts.Formats.Msts/RouteFile.cs

@@ -126,9 +126,7 @@ 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");
@@ -177,11 +175,6 @@ 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,9 +38,6 @@ 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))
@@ -243,7 +240,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 };
+        public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable1_2Controlled, Variable1_3Controlled, Variable1_4Controlled, Variable2Controlled, Variable2BoosterControlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled };
 
         public Controls Control = Controls.None;
         public float Granularity = 1.0f;
@@ -267,9 +264,6 @@ 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[] {
@@ -391,8 +385,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
+        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
         };
 
         public Events Event;
@@ -438,23 +431,6 @@ 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.Parsers.Msts/STFReader.cs

@@ -609,11 +609,10 @@ public float ReadFloat(UNITS validUnits, float? defaultValue)
             // However, some values (mostly "time" ones) may be followed by text. Therefore that approach cannot be used consistently 
             // and has been abandoned. </CJComment> 
 
-            float val;
-            double scale = ParseUnitSuffix(ref item, validUnits);
             if (item.Length == 0) return 0.0f;
             if (item[item.Length - 1] == ',') item = item.TrimEnd(',');
-            if (float.TryParse(item, parseNum, parseNFI, out val)) return (scale == 1) ? val : (float)(scale * val);
+            double scale = ParseUnitSuffix(ref item, validUnits); // must be after TrimEnd(','), otherwise the unit parsed becomes invalid
+            if (float.TryParse(item, parseNum, parseNFI, out float val)) return (scale == 1) ? val : (float)(scale * val);
             STFException.TraceWarning(this, "Cannot parse the constant number " + item);
             if (item == ")") StepBackOneItem();
             return defaultValue.GetValueOrDefault(0);