devel

Author: pzgulyas

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

@@ -1045,30 +1045,6 @@ public virtual void LoadFromWagFile(string wagFilePath)
                 Trace.TraceInformation("Empty Values = Brake {0} Handbrake {1} DavisA {2} DavisB {3} DavisC {4} CoGY {5}", LoadEmptyMaxBrakeForceN, LoadEmptyMaxHandbrakeForceN, LoadEmptyORTSDavis_A, LoadEmptyORTSDavis_B, LoadEmptyORTSDavis_C, LoadEmptyCentreOfGravityM_Y);
                 Trace.TraceInformation("Full Values = Brake {0} Handbrake {1} DavisA {2} DavisB {3} DavisC {4} CoGY {5}", LoadFullMaxBrakeForceN, LoadFullMaxHandbrakeForceN, LoadFullORTSDavis_A, LoadFullORTSDavis_B, LoadFullORTSDavis_C, LoadFullCentreOfGravityM_Y);
 #endif
-
-                // The FreightAnim-style brake parameters cannot support switchable states, so use them only in case there are none of those
-                if (BrakeSystems.Count <= 1 && BrakeLoadStages.Count == 0)
-                {
-                    var loStage = BrakeSystem.CreateNewLike(BrakeSystem, this).InitializeDefault();
-                    var hiStage = BrakeSystem.CreateNewLike(BrakeSystem, this).InitializeDefault();
-                    if (loStage != null && hiStage != null)
-                    {
-                        loStage.InitialMaxBrakeForceN = LoadEmptyMaxBrakeForceN;
-                        hiStage.InitialMaxBrakeForceN = LoadFullMaxBrakeForceN;
-                        loStage.InitialMaxHandbrakeForceN = LoadEmptyMaxHandbrakeForceN;
-                        hiStage.InitialMaxHandbrakeForceN = LoadFullMaxHandbrakeForceN;
-                        
-                        if (loStage is AirSinglePipe loStageAir && hiStage is AirSinglePipe hiStageAir)
-                        {
-                            loStageAir.RelayValveRatio = LoadEmptyRelayValveRatio;
-                            hiStageAir.RelayValveRatio = LoadFullRelayValveRatio;
-                            loStageAir.RelayValveInshotPSI = LoadEmptyInshotPSI;
-                            hiStageAir.RelayValveInshotPSI = LoadFullInshotPSI;
-                        }
-                    }
-                    BrakeLoadStages.Add((BrakeSystem.BrakeMode, InitialMassKG), loStage);
-                    BrakeLoadStages.Add((BrakeSystem.BrakeMode, MassKG), hiStage);
-                }
             }
 
             // Determine whether or not to use the Davis friction model. Must come after freight animations are initialized.
@@ -1104,20 +1080,50 @@ public virtual void LoadFromWagFile(string wagFilePath)
                 }
             }
             BrakeSystem = BrakeSystem ?? MSTSBrakeSystem.Create(CarBrakeSystemType, this);
-            SetBrakeSystemMode(BrakeSystems.Keys.FirstOrDefault().ToString());
+
+            if (FreightAnimations != null && BrakeSystems.Count <= 1)
+            {
+                // The FreightAnim-style brake parameters cannot support switchable states, so use them only in case there are none configured
+                var loStage = BrakeSystem.CreateNewLike(BrakeSystem, this).InitializeDefault();
+                var hiStage = BrakeSystem.CreateNewLike(BrakeSystem, this).InitializeDefault();
+                if (loStage != null && hiStage != null)
+                {
+                    loStage.InitialMaxBrakeForceN = LoadEmptyMaxBrakeForceN;
+                    hiStage.InitialMaxBrakeForceN = LoadFullMaxBrakeForceN;
+                    loStage.InitialMaxHandbrakeForceN = LoadEmptyMaxHandbrakeForceN;
+                    hiStage.InitialMaxHandbrakeForceN = LoadFullMaxHandbrakeForceN;
+
+                    if (loStage is AirSinglePipe loStageAir && hiStage is AirSinglePipe hiStageAir)
+                    {
+                        loStageAir.RelayValveRatio = LoadEmptyRelayValveRatio;
+                        hiStageAir.RelayValveRatio = LoadFullRelayValveRatio;
+                        loStageAir.RelayValveInshotPSI = LoadEmptyInshotPSI;
+                        hiStageAir.RelayValveInshotPSI = LoadFullInshotPSI;
+                    }
+                }
+                BrakeSystems.Add((BrakeSystem.BrakeMode, InitialMassKG), loStage);
+                BrakeSystems.Add((BrakeSystem.BrakeMode, MassKG), hiStage);
+            }
+            var mode = BrakeSystems.Keys.FirstOrDefault();
+            SetBrakeSystemMode(mode.BrakeMode, mode.MaxMass);
 
             MaxHandbrakeForceN = BrakeSystem.InitialMaxHandbrakeForceN;
             FrictionBrakeBlendingMaxForceN = BrakeSystem.InitialMaxBrakeForceN; // set the value of braking when blended with dynamic brakes
             UpdateBrakeLoadCompensation(TempMassDiffRatio);
             UpdateDavisLoadCompensation(TempMassDiffRatio);
         }
 
-        public void SetBrakeSystemMode(string mode)
+        public void SetBrakeSystemMode(BrakeModes mode, float massKg)
         {
-            if (Math.Abs(SpeedMpS) > .1)
+            if (Math.Abs(SpeedMpS) > .1 || BrakeSystems.Count == 0)
                 return;
 
-            if (!string.IsNullOrWhiteSpace(mode) && Enum.TryParse(mode, out BrakeModes modeEnum) && BrakeSystems.TryGetValue(modeEnum, out var brakeSystem))
+            var max = 0f;
+            foreach (var key in BrakeSystems.Keys)
+                if (massKg < key.MaxMass && key.BrakeMode == mode)
+                    max = Math.Max(max, key.MaxMass);
+
+            if (BrakeSystems.TryGetValue((mode, max), out var brakeSystem))
             {
                 if (brakeSystem is VacuumSinglePipe ^ BrakeSystem is VacuumSinglePipe)
                 {
@@ -1431,10 +1437,10 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
                                     if (newSystem != null)
                                     {
                                         newSystem.BrakeMode = brakeModeName.Value;
-                                        if (BrakeSystems.ContainsKey(newSystem.BrakeMode))
-                                            BrakeSystems[newSystem.BrakeMode] = newSystem;
+                                        if (BrakeSystems.ContainsKey((newSystem.BrakeMode, 0)))
+                                            BrakeSystems[(newSystem.BrakeMode, 0)] = newSystem;
                                         else
-                                            BrakeSystems.Add(newSystem.BrakeMode, newSystem);
+                                            BrakeSystems.Add((newSystem.BrakeMode, 0), newSystem);
                                     }
                                 }
                                 break;
@@ -1445,10 +1451,10 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
                                 if (brakeModeName != null)
                                 {
                                     newSystem.BrakeMode = brakeModeName.Value;
-                                    if (BrakeSystems.ContainsKey(newSystem.BrakeMode))
-                                        BrakeSystems[newSystem.BrakeMode] = newSystem;
+                                    if (BrakeSystems.ContainsKey((newSystem.BrakeMode, 0)))
+                                        BrakeSystems[(newSystem.BrakeMode, 0)] = newSystem;
                                     else
-                                        BrakeSystems.Add(newSystem.BrakeMode, newSystem);
+                                        BrakeSystems.Add((newSystem.BrakeMode, 0), newSystem);
                                 }
                                 break;
                             case "wagon(ortsbrakemode(ortsloadstage":
@@ -1463,8 +1469,8 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
                                     {
                                         case "wagon(ortsbrakemode(ortsloadstage(ortsloadstagemaxmass":
                                             maxMass = stf.ReadFloatBlock(STFReader.UNITS.Mass, null);
-                                            if (!BrakeLoadStages.ContainsKey((newSystem.BrakeMode, maxMass.Value)))
-                                                BrakeLoadStages.Add((newSystem.BrakeMode, maxMass.Value), stage);
+                                            if (!BrakeSystems.ContainsKey((newSystem.BrakeMode, maxMass.Value)))
+                                                BrakeSystems.Add((newSystem.BrakeMode, maxMass.Value), stage);
                                             break;
                                         default:
                                             if (lowercasetoken.EndsWith("("))

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

@@ -545,10 +545,8 @@ public Direction Direction
         public BrakeSystem BrakeSystem;
         /// <summary>Alternative for dual vacuum/air vehicles, to be swapped with <see cref="BrakeSystem"/> and used directly</summary>
         protected BrakeSystem BrakeSystemAlt;
-        /// <summary>Store for the various modes. Never used directly, only the non-zero values get copied into <see cref="BrakeSystem"/></summary>
-        public readonly Dictionary<BrakeModes, BrakeSystem> BrakeSystems = new Dictionary<BrakeModes, BrakeSystem>();
         /// <summary>Store for the various loades within modes. Never used directly, only the non-zero values get copied into <see cref="BrakeSystem"/></summary>
-        public readonly Dictionary<(BrakeModes BrakeMode, float MaxMass), BrakeSystem> BrakeLoadStages = new Dictionary<(BrakeModes, float), BrakeSystem>();
+        public readonly Dictionary<(BrakeModes BrakeMode, float MaxMass), BrakeSystem> BrakeSystems = new Dictionary<(BrakeModes, float), BrakeSystem>();
         /// <summary>Filter for the <see cref="BrakeSystems"/>, in case that comes from an include file</summary>
         public string[] BrakeModeNames { get; protected set; }
         protected string BrakeModePreset;