Correct reading of input parameters

Author: peternewell

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

@@ -615,7 +615,16 @@ public virtual void LoadFromWagFile(string wagFilePath)
             // Initialise number of brake shoes per wagon
             if (NumberCarBrakeShoes == 0 && WagonType == WagonTypes.Engine)
             {
-                NumberCarBrakeShoes = LocoNumDrvAxles * 4.0f; // Assume 4 brake shoes per axle
+                var LocoTest = Simulator.PlayerLocomotive as MSTSLocomotive;
+
+                if (LocoTest != null && !LocoTest.DriveWheelOnlyBrakes)
+                {
+                    NumberCarBrakeShoes = LocoNumDrvAxles * 4 + WagonNumAxles * 4; // Assume 4 brake shoes per axle on all wheels
+                }
+                else
+                {
+                    NumberCarBrakeShoes = LocoNumDrvAxles * 4; // Assume 4 brake shoes per axle on drive wheels only
+                } 
 
                 if (Simulator.Settings.VerboseConfigurationMessages && (BrakeShoeType == BrakeShoeTypes.CastIron || BrakeShoeType == BrakeShoeTypes.HiFrictionCompost))
                 {
@@ -624,7 +633,7 @@ public virtual void LoadFromWagFile(string wagFilePath)
             }
             else if (NumberCarBrakeShoes == 0)
             {
-                NumberCarBrakeShoes = WagonNumAxles * 4.0f; // Assume 4 brake shoes per axle
+                NumberCarBrakeShoes = WagonNumAxles * 4; // Assume 4 brake shoes per axle
 
                 if (Simulator.Settings.VerboseConfigurationMessages && (BrakeShoeType == BrakeShoeTypes.CastIron || BrakeShoeType == BrakeShoeTypes.HiFrictionCompost))
                 {
@@ -1173,7 +1182,7 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
                 case "wagon(maxhandbrakeforce": InitialMaxHandbrakeForceN = stf.ReadFloatBlock(STFReader.UNITS.Force, null); break;
                 case "wagon(maxbrakeforce": InitialMaxBrakeForceN = stf.ReadFloatBlock(STFReader.UNITS.Force, null); break;
                 case "wagon(ortsmaxbrakeshoeforce": MaxBrakeShoeForceN = stf.ReadFloatBlock(STFReader.UNITS.Force, null); break;
-                case "engine(ortsnumbercarbrakeshoes": NumberCarBrakeShoes = stf.ReadIntBlock(null); break;
+                case "wagon(ortsnumbercarbrakeshoes": NumberCarBrakeShoes = stf.ReadIntBlock(null); break;
                 case "wagon(ortsbrakeshoetype":
                     stf.MustMatch("(");
                     var brakeShoeType = stf.ReadString();

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

@@ -213,7 +213,7 @@ public static Interpolator SteamHeatBoilerFuelUsageGalukpH()
         public float MaxHandbrakeForceN;
         public float MaxBrakeForceN = 89e3f;
         public float MaxBrakeShoeForceN; // This is the force applied to the brake shoe, hence it will be decreased by CoF to give force applied to the wheel
-        public float NumberCarBrakeShoes;
+        public int NumberCarBrakeShoes;
         public float InitialMaxHandbrakeForceN;  // Initial force when agon initialised
         public float InitialMaxBrakeForceN = 89e3f;   // Initial force when wagon initialised, this is the force on the wheel, ie after the brake shoe.