Skip to content

Commit

Permalink
Automatic merge of T1.5.1-413-g1daa6a7c6 and 20 pull requests
Browse files Browse the repository at this point in the history
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #757 at d9d75f4: Unify RailDriver code implementations
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at 7fdad38: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 23f3488: Allow independent drive axles for locomotives
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #823 at 5e1c03b: Select track sound volume percent retained in .eng and .wag files
- Pull request #824 at f16ebed: Update Readme.md
- Pull request #825 at 29ed427: 2D Cabview controls for side viewpoints https://blueprints.launchpad.net/or/+spec/2dcabview-controls-for-side-views
- Pull request #829 at 434af02: Improvements for air brakes #3 - Emergency valves
- Pull request #830 at ceeaba7: Electric locomotive hot start
- Pull request #831 at c8927a4: preliminary version switchpanel on tablet
- Pull request #833 at 01aaca7: Implement brake relay valve
- Pull request #834 at 7a98eca: Replaces email service with FormSpark
- Pull request #835 at 4e475c2: Correct Brake Shoe Force Calculation
- Pull request #836 at 62e6d02: Adds policy on crashes and derailments
- Pull request #837 at 0497316: copies website policies to repo
  • Loading branch information
openrails-bot committed May 31, 2023
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
Expand Up @@ -598,13 +598,24 @@ public virtual void LoadFromWagFile(string wagFilePath)
MassKG = InitialMassKG;

MaxHandbrakeForceN = InitialMaxHandbrakeForceN;
if (MaxBrakeShoeForceN != 0 && BrakeShoeFrictionFactor != null)
if (MaxBrakeShoeForceN != 0 && BrakeShoeType != BrakeShoeTypes.Unknown)
{
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("BrakeShoeType set to {0}, with a MaxBrakeForce of {1}", BrakeShoeType, FormatStrings.FormatForce(MaxBrakeForceN, IsMetric));
}
}
CentreOfGravityM = InitialCentreOfGravityM;

Expand Down

0 comments on commit ee6cb81

Please sign in to comment.