Made Axle Count corrections suggested in the PR review.

The axle count now reflects what the simulation is actually using. The
code is the same as in the simulation classes MSTSWagon and
MSTSLocomotive.

There is a special condition for Steam engines that is not practical to
correctly reproduce (WheelAxles array). Thus the count may be off for
some steam engines. It matches the sim for the Flying Scottsman, but not
for the Gölsdorf 380. I don't have other steam engines to test.

Author: rwf-rr

Source/Contrib/ContentManager/Models/Car.cs

@@ -43,6 +43,7 @@ public class Car
         public readonly float MassKG;
         public readonly float LengthM;
         public readonly int NumDriveAxles;
+        public readonly int NumIdleAxles;
         public readonly int NumAllAxles;
         public readonly float MaxBrakeForceN;
         public readonly float MaxPowerW;
@@ -57,8 +58,6 @@ public Car(Content content)
 
             const float GravitationalAccelerationMpS2 = 9.80665f;
 
-            int ortsEngAxles = -1;  // not present
-
             // .eng files also have a wagon block
             var wagFile = new WagonFile(content.PathName);
             Type = CarType.Wagon;
@@ -81,20 +80,27 @@ public Car(Content content)
                 Description = engFile.Description;
 
                 // see MSTSLocomotive.Initialize()
-                ortsEngAxles = engFile.NumDriveAxles;
-                if (ortsEngAxles >= 0) { NumDriveAxles = ortsEngAxles; }
-                else if (engFile.NumEngWheels >= 7f) { NumDriveAxles = (int)(engFile.NumEngWheels / 2f); }
-                else if (engFile.NumEngWheels > 0f) { NumDriveAxles = (int)engFile.NumEngWheels; }
-                else { NumDriveAxles = 4; }
+                NumDriveAxles = engFile.NumDriveAxles;
+                if (NumDriveAxles == 0)
+                {
+                    if (engFile.NumEngWheels != 0 && engFile.NumEngWheels < 7) { NumDriveAxles = (int)engFile.NumEngWheels; }
+                    else { NumDriveAxles = 4; }
+                }
             }
 
             // see MSTSWagon.LoadFromWagFile()
-            if (ortsEngAxles >= 0 && wagFile.NumWagAxles >= 0) { NumAllAxles = ortsEngAxles + wagFile.NumWagAxles; }
-            else if (wagFile.NumWagAxles >= 0) { NumAllAxles = wagFile.NumWagAxles; }
-            else if (wagFile.NumWagWheels >= 7f) { NumAllAxles = (int)(wagFile.NumWagWheels / 2f); }
-            else if (wagFile.NumWagWheels > 0f) { NumAllAxles = (int)wagFile.NumWagWheels; }
-            else { NumAllAxles = 4; }
-            if (NumDriveAxles > NumAllAxles) { NumAllAxles = NumDriveAxles; }
+            NumIdleAxles = wagFile.NumWagAxles;
+            if ((NumIdleAxles == 0) && Type != CarType.Engine)
+            {
+                if (wagFile.NumWagWheels != 0 && wagFile.NumWagWheels < 6) { NumIdleAxles = (int)wagFile.NumWagWheels; }
+                else { NumIdleAxles = 4; }
+            }
+
+            // correction for steam engines; see TrainCar.Update()
+            // this is not always correct as TrainCar uses the WheelAxles array for the count; that is too complex to do here
+            if (SubType.Equals("Steam") && NumDriveAxles >= (NumDriveAxles + NumIdleAxles)) { NumDriveAxles /= 2; }
+
+            NumAllAxles = NumDriveAxles + NumIdleAxles;
 
             // see TrainCar.UpdateTrainDerailmentRisk()
             var numWheels = NumAllAxles * 2;

Source/Contrib/ContentManager/Models/Consist.cs

@@ -60,7 +60,7 @@ public Consist(Content content)
                 var CarList = new List<Car>();
                 foreach (Wagon wag in file.Train.TrainCfg.WagonList)
                 {
-                    float wagonMassKG = 0; int ortsEngAxles = -1; int numDriveAxles = 0; int numAllAxles = 0;
+                    float wagonMassKG = 0; int numDriveAxles = 0; int numIdleAxles = 0; int numAllAxles = 0;
                     try
                     {
                         var fileType = wag.IsEngine ? ".eng" : ".wag";
@@ -73,16 +73,20 @@ public Consist(Content content)
                         wagonMassKG = wagonFile.MassKG;
                         MaxBrakeForce += wagonFile.MaxBrakeForceN;
                         MinCouplerStrengthN = Math.Min(MinCouplerStrengthN, wagonFile.MinCouplerStrengthN);
+                        var subType = wagonFile.WagonType;
                         if (wagonFile.MaxBrakeForceN > 0) { NumOperativeBrakes++; }
 
-                        if (wag.IsEngine)
+                        if (engFile != null)
                         {
+                            subType = engFile.EngineType;
+
                             // see MSTSLocomotive.Initialize()
-                            ortsEngAxles = engFile.NumDriveAxles;
-                            if (ortsEngAxles >= 0) { numDriveAxles = ortsEngAxles; }
-                            else if (engFile.NumEngWheels > 7f) { numDriveAxles = (int)(engFile.NumEngWheels / 2f); }
-                            else if (engFile.NumEngWheels > 0) { numDriveAxles = (int)engFile.NumEngWheels; }
-                            else { numDriveAxles = 4; }
+                            numDriveAxles = engFile.NumDriveAxles;
+                            if (numDriveAxles == 0)
+                            {
+                                if (engFile.NumEngWheels != 0 && engFile.NumEngWheels < 7) { numDriveAxles = (int)engFile.NumEngWheels; }
+                                else { numDriveAxles = 4; }
+                            }
 
                             if (engFile.MaxForceN > 25000)  // exclude legacy driving trailers / cab-cars
                             {
@@ -99,12 +103,18 @@ public Consist(Content content)
                         }
 
                         // see MSTSWagon.LoadFromWagFile()
-                        if (ortsEngAxles >= 0 && wagonFile.NumWagAxles >= 0) { numAllAxles = ortsEngAxles + wagonFile.NumWagAxles; }
-                        else if (wagonFile.NumWagAxles >= 0) { numAllAxles =  wagonFile.NumWagAxles; }
-                        else if (wagonFile.NumWagWheels >= 7f) { numAllAxles = (int)(wagonFile.NumWagWheels / 2f); }
-                        else if (wagonFile.NumWagWheels >= 0f) { numAllAxles = (int)wagonFile.NumWagWheels; }
-                        else { numAllAxles = 4; }
-                        if (numDriveAxles > numAllAxles) { numAllAxles = numDriveAxles; }
+                        numIdleAxles = wagonFile.NumWagAxles;
+                        if (numIdleAxles == 0 && !wag.IsEngine)
+                        {
+                            if (wagonFile.NumWagWheels != 0 && wagonFile.NumWagWheels < 6) { numIdleAxles = (int)wagonFile.NumWagWheels; }
+                            else { numIdleAxles = 4; }
+                        }
+
+                        // correction for steam engines; see TrainCar.Update()
+                        // this is not always correct as TrainCar uses the WheelAxles array for the count; that is too complex to do here
+                        if (subType.Equals("Steam") && numDriveAxles >= (numDriveAxles + numIdleAxles)) { numDriveAxles /= 2; }
+
+                        numAllAxles = numDriveAxles + numIdleAxles;
 
                         // exclude legacy EOT from total axle count
                         if (!wag.IsEOT && wagonFile.WagonSize.LengthM > 1.1)

Source/Contrib/SettingsExporter/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "SettingsExporter": {
+      "commandName": "Project",
+      "commandLineArgs": "REG INI"
+    }
+  }
+}

Source/Orts.Formats.Msts/EngineFile.cs

@@ -33,7 +33,7 @@ public class EngineFile
         public float MaxForceN;
         public float MaxDynamicBrakeForceN;
         public float MaxSpeedMps;
-        public int NumDriveAxles = -1;  // ORTS; -1 indicates absent
+        public int NumDriveAxles;  // ORTS
         public float NumEngWheels;  // MSTS
         public string Description;
         public string CabViewFile;

Source/Orts.Formats.Msts/WagonFile.cs

@@ -32,7 +32,7 @@ public class WagonFile
         public string WagonType;
         public float MassKG;
         public CarSize WagonSize;
-        public int NumWagAxles = -1;  // ORTS; -1 indicates absent
+        public int NumWagAxles;  // ORTS
         public float NumWagWheels;  // MSTS
         public float MaxBrakeForceN;
         public float MinCouplerStrengthN = ImpossiblyHighForceN;