mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #10467: [YAPF] Trains do not use all available tracks

This commit is contained in:
Michael Bernardi 2023-05-10 17:25:32 +02:00 committed by mrmbernardi
parent 41faae8c59
commit fe3d5a7718
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pathfinder/yapf/yapf_costrail.hpp
View File

@ -156,12 +156,18 @@ public:
if (n.m_num_signals_passed >= m_sig_look_ahead_costs.size() / 2) return 0;
if (!IsPbsSignal(n.m_last_signal_type)) return 0;
const Train *v = Yapf().GetVehicle();
assert(v != nullptr);
assert(v->type == VEH_TRAIN);
/* the longer a train waits, the more it will consider longer routes around blocking trains */
int impatience = std::max(0, v->wait_counter - DAY_TICKS / 2);
if (IsRailStationTile(tile) && IsAnyStationTileReserved(tile, trackdir, skipped)) {
return Yapf().PfGetSettings().rail_pbs_station_penalty * (skipped + 1);
return Yapf().PfGetSettings().rail_pbs_station_penalty * (skipped + 1) + impatience;
} else if (TrackOverlapsTracks(GetReservedTrackbits(tile), TrackdirToTrack(trackdir))) {
int cost = Yapf().PfGetSettings().rail_pbs_cross_penalty;
if (!IsDiagonalTrackdir(trackdir)) cost = (cost * YAPF_TILE_CORNER_LENGTH) / YAPF_TILE_LENGTH;
return cost * (skipped + 1);
return cost * (skipped + 1) + impatience;
}
return 0;
}