Correct issue with Whyte definition not reporting correctly for Duplex locomotives

Author: peternewell

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -28,6 +28,7 @@
 using Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS;
 using Orts.Simulation.RollingStocks.SubSystems.PowerSupplies;
 using Orts.Simulation.RollingStocks.SubSystems.PowerTransmissions;
+using Orts.Simulation.Simulation.RollingStocks.SubSystems.PowerSupplies;
 using Orts.Viewer3D.Processes;
 using ORTS.Common;
 using ORTS.Scripting.Api;
@@ -583,6 +584,11 @@ void TextPageConsistInfo(TableData table)
             }
         }
 
+        /// <summary>
+        /// Calculates Whyte noatation for the vehicle
+        /// For duplex steam locomotives wheel axles can be grouped under the main object shape, and hence the multiple engines will be counted as a single grouping.
+        /// For multiple engines, the number of wheels defined in the attached axles will be used to determine the axles in the "non-bogie" groupings.
+        /// </summary>
         static string GetCarWhyteLikeNotation(TrainCar car)
         {
             if (car.WheelAxles.Count == 0)
@@ -591,18 +597,85 @@ static string GetCarWhyteLikeNotation(TrainCar car)
             var whyte = new List<string>();
             var currentCount = 0;
             var currentBogie = car.WheelAxles[0].BogieIndex;
-            foreach (var axle in car.WheelAxles)
+            bool PreviousAxlePart = true; // Assume a bogie
+
+            var steamloco = car as MSTSSteamLocomotive;
+
+            if (car is MSTSSteamLocomotive && steamloco.SteamEngines.Count > 1)
+            {
+                var i = 0; // Count for number of steam engines
+                var axlesCount = 0;
+
+                foreach (var axle in car.WheelAxles)
+                {
+                    if (!axle.Part.bogie) // if not a bogie then check for the number of axles.
+                    {
+                        if (currentBogie != axle.BogieIndex && currentCount != 0)
+                        {
+                            whyte.Add(currentCount.ToString());
+                            currentBogie = axle.BogieIndex;
+                            currentCount = 0;
+                        }
+
+                        if (steamloco.SteamEngines[i].AuxiliarySteamEngineType != SteamEngine.AuxiliarySteamEngineTypes.Booster)
+                        {
+                            currentCount += 2;
+                            axlesCount += 1;
+
+                            if (axlesCount >= steamloco.SteamEngines[i].AttachedAxle.NumberWheelAxles && currentCount != 0)
+                            {
+                                whyte.Add(currentCount.ToString());
+                                currentBogie = axle.BogieIndex;
+                                currentCount = 0;
+                                axlesCount = 0;
+                                i = i + 1;
+                            }                    
+                        }
+                    }
+                    else if (axle.Part.bogie) // this is a bogie
+                    {
+                        if ( PreviousAxlePart)
+                        {
+                            currentBogie = axle.BogieIndex;
+                        }
+
+                        if (currentBogie != axle.BogieIndex && currentCount != 0)
+                        {
+                            whyte.Add(currentCount.ToString());
+                            currentBogie = axle.BogieIndex;
+                            currentCount = 0;
+                        }
+                        currentCount += 2;
+                    }
+
+                    if (axle.Part.bogie)
+                    {
+                        PreviousAxlePart = true;
+                    }
+                    else
+                    {
+                        PreviousAxlePart = false;
+                    }
+                }
+
+                whyte.Add(currentCount.ToString());
+                return String.Join("-", whyte.ToArray());
+            }
+            else // default axle computation - used for most wheel configurations
             {
-                if (currentBogie != axle.BogieIndex)
+                foreach (var axle in car.WheelAxles)
                 {
-                    whyte.Add(currentCount.ToString());
-                    currentBogie = axle.BogieIndex;
-                    currentCount = 0;
+                    if (currentBogie != axle.BogieIndex && currentCount != 0)
+                    {
+                        whyte.Add(currentCount.ToString());
+                        currentBogie = axle.BogieIndex;
+                        currentCount = 0;
+                    }
+                    currentCount += 2;
                 }
-                currentCount += 2;
+                whyte.Add(currentCount.ToString());
+                return String.Join("-", whyte.ToArray());
             }
-            whyte.Add(currentCount.ToString());
-            return String.Join("-", whyte.ToArray());
         }
 
         void TextPageLocomotiveInfo(TableData table)