Skip to content

Commit 6e1bdff

Browse files
committed
Add Max Dynamic Brake Force to consist info.
And minor name-change for TPOP -> TpOP. TOP is often used.
1 parent 232abee commit 6e1bdff

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

Source/Contrib/ContentManager/ContentInfo.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,9 @@ public static string GetText(Content content)
194194
details.AppendFormat("Length:\t{1}{0}", Environment.NewLine, FormatStrings.FormatShortDistanceDisplay(data.LengthM, IsMetric));
195195
details.AppendFormat("Power:\t{1}{0}", Environment.NewLine, FormatStrings.FormatPower(data.MaxPowerW, IsMetric, IsImperialBHP, IsImperialBTUpS));
196196
details.AppendFormat("MaxTE:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxTractiveForceN, IsMetric));
197+
details.AppendFormat("MaxDynBrk:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxDynamicBrakeForceN, IsMetric));
197198
if (!IsMetric && !IsUK) { details.AppendFormat("HPT:\t{1}{0}", Environment.NewLine, FormatHPT(data.MaxPowerW, data.MassKG)); }
198-
if (!IsMetric && !IsUK) { details.AppendFormat("TPOB:\t{1}{0}", Environment.NewLine, FormatTPOB(data.MassKG, data.NumOperativeBrakes)); }
199+
if (!IsMetric && !IsUK) { details.AppendFormat("TpOB:\t{1}{0}", Environment.NewLine, FormatTPOB(data.MassKG, data.NumOperativeBrakes)); }
199200
details.AppendFormat("MinCouplerStrength:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MinCouplerStrengthN, IsMetric));
200201
details.AppendFormat("MinDerailForce:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MinDerailForceN, IsMetric));
201202
details.AppendLine();

Source/Contrib/ContentManager/Models/Consist.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public class Consist
3434
public readonly float MassKG = 0F;
3535
public readonly float MaxPowerW = 0F;
3636
public readonly float MaxTractiveForceN = 0F;
37+
public readonly float MaxDynamicBrakeForceN = 0F;
3738
public readonly float MaxBrakeForce = 0F;
3839
public readonly int NumOperativeBrakes = 0;
3940
public readonly float MinCouplerStrengthN = 9.999e8f; // impossible high force
@@ -88,6 +89,7 @@ public Consist(Content content)
8889
EngCount++;
8990
MaxPowerW += engFile.MaxPowerW;
9091
MaxTractiveForceN += engFile.MaxForceN;
92+
MaxDynamicBrakeForceN += engFile.MaxDynamicBrakeForceN;
9193
}
9294
else { WagCount++; }
9395
}

Source/Orts.Formats.Msts/EngineFile.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public class EngineFile
3131
public string EngineType;
3232
public float MaxPowerW;
3333
public float MaxForceN;
34+
public float MaxDynamicBrakeForceN;
3435
public float MaxSpeedMps;
3536
public int NumDriveAxles = -1; // ORTS; -1 indicates absent
3637
public float NumEngWheels; // MSTS
@@ -50,6 +51,7 @@ public EngineFile(string filePath)
5051
new STFReader.TokenProcessor("type", ()=>{ EngineType = stf.ReadStringBlock(null); }),
5152
new STFReader.TokenProcessor("maxpower", ()=>{ MaxPowerW = stf.ReadFloatBlock( STFReader.UNITS.Power, null); }),
5253
new STFReader.TokenProcessor("maxforce", ()=>{ MaxForceN = stf.ReadFloatBlock( STFReader.UNITS.Force, null); }),
54+
new STFReader.TokenProcessor("dynamicbrakesmaximumforce", ()=>{ MaxDynamicBrakeForceN = stf.ReadFloatBlock( STFReader.UNITS.Force, null); }),
5355
new STFReader.TokenProcessor("maxvelocity", ()=>{ MaxSpeedMps = stf.ReadFloatBlock( STFReader.UNITS.Speed, null); }),
5456
new STFReader.TokenProcessor("ortsnumberdriveaxles", ()=>{ NumDriveAxles = stf.ReadIntBlock(null); }),
5557
new STFReader.TokenProcessor("numwheels", ()=>{ NumEngWheels = stf.ReadFloatBlock( STFReader.UNITS.None, null); }),

0 commit comments

Comments
 (0)