Skip to content

Commit 1df98a3

Browse files
committed
Adjust user inputs
1 parent 037dbdf commit 1df98a3

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ public virtual void LoadFromWagFile(string wagFilePath)
626626
NumberCarBrakeShoes = (LocoNumDrvAxles * 4) + (WagonNumAxles * 4); // Assume 4 brake shoes per axle on all wheels
627627
}
628628

629-
if (Simulator.Settings.VerboseConfigurationMessages && (BrakeShoeType == BrakeShoeTypes.CastIron || BrakeShoeType == BrakeShoeTypes.HiFrictionCompost))
629+
if (Simulator.Settings.VerboseConfigurationMessages && (BrakeShoeType == BrakeShoeTypes.Cast_Iron || BrakeShoeType == BrakeShoeTypes.Hi_Friction_Compost))
630630
{
631631
Trace.TraceInformation("Number of Locomotive Brakeshoes set to default value of {0}", NumberCarBrakeShoes);
632632
}
@@ -635,7 +635,7 @@ public virtual void LoadFromWagFile(string wagFilePath)
635635
{
636636
NumberCarBrakeShoes = WagonNumAxles * 4; // Assume 4 brake shoes per axle
637637

638-
if (Simulator.Settings.VerboseConfigurationMessages && (BrakeShoeType == BrakeShoeTypes.CastIron || BrakeShoeType == BrakeShoeTypes.HiFrictionCompost))
638+
if (Simulator.Settings.VerboseConfigurationMessages && (BrakeShoeType == BrakeShoeTypes.Cast_Iron || BrakeShoeType == BrakeShoeTypes.Hi_Friction_Compost))
639639
{
640640
Trace.TraceInformation("Number of Wagon Brakeshoes set to default value of {0}", NumberCarBrakeShoes);
641641
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -683,9 +683,9 @@ public enum WagonSpecialTypes
683683
public enum BrakeShoeTypes
684684
{
685685
Unknown,
686-
CastIron,
687-
HiFrictionCompost,
688-
UserDefined,
686+
Cast_Iron,
687+
Hi_Friction_Compost,
688+
User_Defined,
689689
}
690690
public BrakeShoeTypes BrakeShoeType;
691691

@@ -3239,15 +3239,15 @@ public virtual float GetBrakeShoeFrictionFactor()
32393239
float NewtonsTokNewtons = 0.001f;
32403240
float brakeShoeForcekN = (NewtonsTokNewtons * BrakeShoeForceN) / NumberCarBrakeShoes;
32413241

3242-
if (BrakeShoeType == BrakeShoeTypes.CastIron)
3242+
if (BrakeShoeType == BrakeShoeTypes.Cast_Iron)
32433243
{
32443244
frictionfraction = 0.6f * ((1.6f * brakeShoeForcekN + 100.0f) / (8.0f * brakeShoeForcekN + 100.0f)) * ((MpS.ToKpH(AbsSpeedMpS) + 100.0f) / (5.0f * MpS.ToKpH(AbsSpeedMpS) + 100.0f));
32453245
}
3246-
else if (BrakeShoeType == BrakeShoeTypes.HiFrictionCompost)
3246+
else if (BrakeShoeType == BrakeShoeTypes.Hi_Friction_Compost)
32473247
{
32483248
frictionfraction = 0.44f * ((0.1f * brakeShoeForcekN + 20.0f) / (0.4f * brakeShoeForcekN + 20.0f)) * ((MpS.ToKpH(AbsSpeedMpS) + 150.0f) / (2.0f * MpS.ToKpH(AbsSpeedMpS) + 150.0f));
32493249
}
3250-
else if (BrakeShoeType == BrakeShoeTypes.UserDefined)
3250+
else if (BrakeShoeType == BrakeShoeTypes.User_Defined)
32513251
{
32523252
frictionfraction = BrakeShoeFrictionFactor[MpS.ToKpH(AbsSpeedMpS)];
32533253
}
@@ -3306,15 +3306,15 @@ public virtual float GetBrakeShoeFrictionCoefficientHuD()
33063306
float NewtonsTokNewtons = 0.001f;
33073307
float brakeShoeForcekN = NewtonsTokNewtons * BrakeShoeForceN / NumberCarBrakeShoes;
33083308

3309-
if (BrakeShoeType == BrakeShoeTypes.CastIron)
3309+
if (BrakeShoeType == BrakeShoeTypes.Cast_Iron)
33103310
{
33113311
frictionfraction = 0.6f * ((1.6f * brakeShoeForcekN + 100.0f) / (8.0f * brakeShoeForcekN + 100.0f)) * ((MpS.ToKpH(AbsSpeedMpS) + 100.0f) / (5.0f * MpS.ToKpH(AbsSpeedMpS) + 100.0f));
33123312
}
3313-
else if (BrakeShoeType == BrakeShoeTypes.HiFrictionCompost)
3313+
else if (BrakeShoeType == BrakeShoeTypes.Hi_Friction_Compost)
33143314
{
33153315
frictionfraction = 0.44f * ((0.1f * brakeShoeForcekN + 20.0f) / (0.4f * brakeShoeForcekN + 20.0f)) * ((MpS.ToKpH(AbsSpeedMpS) + 150.0f) / (2.0f * MpS.ToKpH(AbsSpeedMpS) + 150.0f));
33163316
}
3317-
else if (BrakeShoeType == BrakeShoeTypes.UserDefined)
3317+
else if (BrakeShoeType == BrakeShoeTypes.User_Defined)
33183318
{
33193319
frictionfraction = BrakeShoeFrictionFactor[MpS.ToKpH(AbsSpeedMpS)];
33203320
}

0 commit comments

Comments
 (0)