Revert "Correction to brake CoF"

This reverts commit f365984.

Author: peternewell

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -1492,7 +1492,6 @@ public override void Initialize()
                     Trace.TraceInformation("Number of Locomotive Drive Axles set to default value of {0}", LocoNumDrvAxles);
                 }
             }
-
             if (TractionMotorType == TractionMotorTypes.AC)
             {
                 InductionMotor motor = new InductionMotor(LocomotiveAxle, this);

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

@@ -597,39 +597,34 @@ public virtual void LoadFromWagFile(string wagFilePath)
             MassKG = InitialMassKG;
 
             MaxHandbrakeForceN = InitialMaxHandbrakeForceN;
-
             if (MaxBrakeShoeForceN != 0 && BrakeShoeType != BrakeShoeTypes.Unknown)
             {
-                MaxBrakeForceN = MaxBrakeShoeForceN;             
+                MaxBrakeForceN = MaxBrakeShoeForceN;
+
+                if (Simulator.Settings.VerboseConfigurationMessages)
+                {
+                    Trace.TraceInformation("BrakeShoeType set to {0}, with a MaxBrakeShoeForce of {1}", BrakeShoeType, FormatStrings.FormatForce(MaxBrakeForceN, IsMetric));
+                }
+                
             }
             else
             {
                 MaxBrakeForceN = InitialMaxBrakeForceN;
 
                 if (Simulator.Settings.VerboseConfigurationMessages)
                 {
-                    Trace.TraceInformation("Unknown BrakeShoeType set to OR default (Cast Iron) with a MaxBrakeForce of {0}", FormatStrings.FormatForce(MaxBrakeForceN, IsMetric));
+                    Trace.TraceInformation("BrakeShoeType set to {0}, with a MaxBrakeForce of {1}", BrakeShoeType, FormatStrings.FormatForce(MaxBrakeForceN, IsMetric));
                 }
             }
 
             // Initialise number of brake shoes per wagon
             if (NumberCarBrakeShoes == 0 && WagonType == WagonTypes.Engine)
             {
                 NumberCarBrakeShoes = LocoNumDrvAxles * 4.0f; // Assume 4 brake shoes per axle
-
-                if (Simulator.Settings.VerboseConfigurationMessages && (BrakeShoeType == BrakeShoeTypes.CastIron || BrakeShoeType == BrakeShoeTypes.HiFrictionCompost))
-                {
-                    Trace.TraceInformation("Number of Locomotive Brakeshoes set to default value of {0}", NumberCarBrakeShoes);
-                }
             }
-            else if (NumberCarBrakeShoes == 0 )
+            else if (NumberCarBrakeShoes == 0)
             {
                 NumberCarBrakeShoes = WagonNumAxles * 4.0f; // Assume 4 brake shoes per axle
-
-                if (Simulator.Settings.VerboseConfigurationMessages && (BrakeShoeType == BrakeShoeTypes.CastIron || BrakeShoeType == BrakeShoeTypes.HiFrictionCompost))
-                {
-                    Trace.TraceInformation("Number of Wagon Brakeshoes set to default value of {0}", NumberCarBrakeShoes);
-                }
             }
 
             CentreOfGravityM = InitialCentreOfGravityM;

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

@@ -3296,7 +3296,7 @@ public virtual float GetBrakeShoeFrictionCoefficientHuD()
                 // https://iopscience.iop.org/article/10.1088/1742-6596/1614/1/012086/pdf
 
                 float NewtonsTokNewtons = 0.001f;
-                float brakeShoeForcekN = NewtonsTokNewtons * BrakeShoeForceN / NumberCarBrakeShoes;
+                float brakeShoeForcekN = NewtonsTokNewtons * BrakeShoeForceN;
 
                 if (BrakeShoeType == BrakeShoeTypes.CastIron)
                 {