marc/openbve-fcmb-train-plugin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ATC Dimetronic: ATO notch delay

Browse source
This commit is contained in:
Marc Riera 2024-12-29 01:40:38 +01:00
parent 1b04090ef1
commit be091a5784
1 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/Devices/AtcDimetronic.cs
View file

@ -83,6 +83,12 @@ namespace OpenbveFcmbTrainPlugin
/// <summary>Whether ATO is available or not on the train.</summary>
private readonly bool AtoAvailable;
/// <summary>The delay before ATO changes notches.</summary>
private readonly double AtoNotchDelay = 500;
/// <summary>The counter for the ATO notch delay.</summary>
private double AtoNotchDelayCounter;
/// <summary>The current position of the train.</summary>
private double TrainLocation;
@ -383,7 +389,7 @@ namespace OpenbveFcmbTrainPlugin
train.ContinuousProtection = true;
train.VigilanceOverride = true;
CurrentSpeedCode = GetSpeedCodeFromAspect();
ProcessAto(train, route);
ProcessAto(train, route, elapsedTime);
// If reverser is not forward or emergency brake is applied, unselect mode
if (train.PhysicalHandles.Reverser != 1 || train.PhysicalHandles.BrakeNotch > train.Specs.BrakeNotches)
{
@ -691,7 +697,7 @@ namespace OpenbveFcmbTrainPlugin
}
/// <summary>Processes ATO orders.</summary>
private void ProcessAto(Train train, Route route)
private void ProcessAto(Train train, Route route, Time elapsedTime)
{
double speed = train.State.Speed.KilometersPerHour;
bool stopped = speed < 0.05;
@ -700,6 +706,9 @@ namespace OpenbveFcmbTrainPlugin
Speed target = CurrentSpeedCode.TargetLimit;
double distance = CurrentSpeedCode.TargetPosition - TrainLocation;
// Update notch delay counter
AtoNotchDelayCounter += elapsedTime.Milliseconds;
// Calculate notches according to state
switch (AtoState)
{
@ -724,10 +733,29 @@ namespace OpenbveFcmbTrainPlugin
break;
case AtoStates.IncreaseSpeed:
AtoBrakeNotch = 0;
if (train.Acceleration < 0.2 && AtoPowerNotch < train.Specs.PowerNotches)
if (train.Acceleration < 0.2 && AtoPowerNotch < train.Specs.PowerNotches && AtoNotchDelayCounter >= AtoNotchDelay)
{
// TODO: Add delay
AtoPowerNotch++;
AtoNotchDelayCounter = 0;
}
if (train.State.Speed.KilometersPerHour >= target.KilometersPerHour - 5)
{
AtoState = AtoStates.MaintainSpeed;
}
break;
case AtoStates.MaintainSpeed:
AtoBrakeNotch = 0;
if (train.Acceleration > 0 && AtoNotchDelayCounter >= AtoNotchDelay)
{
if (AtoPowerNotch > 0)
{
AtoPowerNotch--;
}
else if (AtoBrakeNotch < train.Specs.BrakeNotches)
{
AtoBrakeNotch++;
}
AtoNotchDelayCounter = 0;
}
break;
}