* feat(ai): reduced signal speed ends at a marked end of the interlocking area
Ie-1 (from 17.01.2026, signals on colour light signals, par. 8): a reduced
speed shown by a signal (S10 "40, then Vmax" and the like) holds to the end
of the interlocking area the signal guards. Only on secondary main tracks
does it hold for the whole route, and on semaphore signals (Sr3) at an entry
or route signal 40 holds for the whole route as well.
The AI kept the speed of the passed signal (VelSignalLast) until it passed
the next signal, or until no signal, switch or W4 was left in the scan. On a
station the exit signal, the far switches and the W4 are always in the scan,
so after S10 at the entry signal onto the principal main track the AI ran 40
all the way to the exit signal.
A scenery can now mark where the interlocking area ends, with a putvalues
event read by the scan like a signal:
event <name> putvalues 0 none x y z SignalAreaEnd 0 0 endevent
attached to event1/event2 of the track (the direction the train runs), past
the last switch of the area, on the principal main track only. In train mode
the reduced speed of the passed signal ends once the rear of the train is
past the marker, i.e. the whole train has left the switches. A signal at
stop passed (speed 0) is not lifted. The marker sends no command and is not
treated as a signal or a speed limit: it does not end the restricted run on
sight after S1 on automatic block, and it means nothing in shunting. The
driver hint for the end of the speed limit uses the marker when there is one
instead of the farthest switch in the scan.
Where the marker is left out (secondary main tracks, stations with semaphore
signals, every existing scenery) the speed holds as before.
Game data: nothing has to change in the SVN for this to work. Sceneries may
add the marker; a release without this change does not read SignalAreaEnd
(an unknown putvalues command is not scanned), so it ignores it.
* fix(ai): a marker behind the last passed signal does not end its speed
The marker acted on whatever speed the last passed signal had left when the
rear of the train passed it. A train longer than the way from the marker to
the next signal, or one which started standing over the marker (scenario
start at a platform, a direction change), had its head past the next signal
before its rear was past the marker of the previous area, and the marker
then lifted the 40 of the new signal while the head ran through its
switches. Passing a signal now drops the markers that lie before it in the
scan table: they end the area of an earlier signal.
In shunting the marker is no longer thrown away when the rear passes it, so
a train order given before the next signal still finds it.
A note to the previous commit: a release without SignalAreaEnd does not scan
the marker, it runs it as an ordinary putvalues event when a vehicle passes,
which logs it and sends the mover a command it does not know, to no effect.
* AI: a higher road speed (W27/W27a) takes effect once the rear is past the sign (#306)
* fix(ai): a higher road speed (W27) holds only once the rear is past the sign
The road speed of a RoadVelocity event (W27/W27a) took effect as soon as
the head of the train passed the sign, both a lower and a higher one, and
the entry left the scan table in the same pass. A lower speed from the head
is right: the AI brakes before the sign, it is in the scan. A higher one let
the AI speed up while the rest of the train was still on the stretch of the
lower speed.
Now a higher road speed (compared through min_speed, so -1 is no limit)
holds once the whole train is past the sign. Until then the entry stays in
the table and is left out of the rest of the table update, which would have
dropped it. What the update did to a passed passive event when it dropped
it (command, VelSignal, the end of the restricted run on sight) now happens
when the rear passes the sign instead of the head. One-way signs and 2w27
stay as they were: the scan reads only the event of the running direction.
The comments of the road speed and section speed branches named them W6
and W27; they are W27/W27a and W9.
* fix(ai): road speed of cars from the head, W27 does not end the run on sight
Two faults of the previous commit, found in review:
A car's passed events leave the scan table at the latest when its rear
passes them (TableCheck), before the table update could see the rear past
the sign, so an AI car never took a higher road speed and kept the lowest
one for good. A car takes the road speed from the head again, as before.
With the sign now kept in the table until the rear passes it, the generic
handling of a passed passive event ran only then, and it ends the run on
sight after S1 on automatic block. A train which stopped at S1 with its rear
not yet past a W27 lying shortly before the signal would, once on the move,
end the run on sight and run into the occupied block at road speed. A road
speed sign is no signal: it no longer ends the run on sight at all, which
also ends the same thing happening, before this branch, to a train whose
head passed a W27 while running on sight.
* fix(ai): a passed road speed sign is handled when the head passes it, as before
The previous commit left a road speed sign out of the table update until
the rear passed it, so the generic handling of a passed passive event (the
SetVelocity command, VelSignal, the end of the run on sight) ran up to one
train length later than before. By then the order may have changed: a
train standing over a W27 at its last station, with Shunt as its next
order, would be switched back to Obey_train by that command once its rear
passed the sign on the next forward move.
Now the sign is handled as before in the first pass after the head passes
it. In place of dropping it from the table it is then marked as held
(spRoadVelHeld) and only waits for the rear, left out of the rest of the
update. So everything but the moment a higher road speed takes effect is as
it was, and the change of the previous commit that kept a W27 from ending
the run on sight is undone: it is not needed any more.
A car is told by CategoryFlag == 2, the same test TableCheck drops its
passed events by, so a unimog (rail and road) holds the sign for its rear
like a train.
* fix(ai): a road speed released by the rear doesn't exceed a lower sign after it the head has passed
A train longer than the distance between two road speed signs, as W27a
120 and then W27a 60, passes the 60 with its head before its rear is
past the 120. Releasing the 120 then set the road speed to 120, and only
the held 60 handled later in the same table pass brought it back down,
so the result depended on the order of the table and on the loop
reaching that entry (it stops at the first point that orders a stop).
When the rear passes a sign, the road speed is now the lowest of that
sign and of the signs after it that the head has passed and the rear
not yet. Without such a sign it is set as before.
* fix(ai): a passed road speed sign not yet marked as held caps the released one too
The sign after the released one may have been passed by the head in
the very tick the rear passes the released one, before the table update
marks it as held. It is now taken into the lowest speed as well (an
enabled road speed entry behind the head), so the result doesn't depend
on the table update reaching it in that tick.
---------
Co-authored-by: maj00r <maj00r@host>
---------
Co-authored-by: maj00r <maj00r@host>
Co-authored-by: jerrrrycho <jurek.pakula@gmail.com>
* feat(ai): PointVelocity, a speed limit for the head of the train at a point beyond the cell
A memory cell (or putvalues) with "PointVelocity v d" tells the train that the head has to be at v km/h
at the point d metres beyond the cell (v -1: no limit). The cell is read by the speed table scan like a
signal, live until the head passes it; what it says then is kept for the point, later changes of the
cell don't concern that train. The limit ends when the head passes the point, it doesn't hold the rest
of the train and doesn't extend or break a speed limit of the line, like W27 of length 0 moved d metres
on. The AI brakes so the head reaches the point at v; for a human driver it only shows as the next
speed limit of the driving aid, the security systems don't see it.
It is made for the warning disc of a level crossing (TOP, Osp1/Osp2), which has to give 20 km/h at the
crossing about 500 m beyond the disc, as the disc showed when the train passed it.
The cell with PointVelocity as its first command makes its getvalues scanned (passive) as SetVelocity
does; PutCommand ignores it when such an event runs. Old commands keep working as they did,
SetProximityVelocity included.
* fix(ai): a point limit isn't a signal, and a PointVelocity 0 can be released
From the review of the PointVelocity commit:
- a cell rewritten from SetVelocity or ShuntVelocity to PointVelocity drops the flags of a signal, so it
can't count as a semaphor or report a signal passed at danger;
- PointVelocity 0 is read on after the head passes the cell, as a stop of a signal is, otherwise the
train would stand short of the point for good;
- a point limit doesn't become eSignNext, so a W4 between the disc and the crossing keeps its release.
* fix(ai): a PointVelocity limit outlives a rebuilt speed table, and holds when shunting
The state of the cell, latched when the head passes it, is now kept by the
controller apart from the speed table, and the distance to the point is
measured by the movement of the consist in the world. Stopping, backing up
and going on between the cell and the point, coupling or a takeover no longer
lose the limit or read the cell anew, unless the head backs up past the cell,
when the cell is read again.
Near the point the desired speed is capped to the limit, so a train that
coasts within its tolerance (as a shunting one does) reaches the point at it.
* fix(ai): review of the latched point limits
- a point the head has passed already isn't latched, and a latched limit at
or behind the head isn't applied (it asked for a full brake for a cycle);
- a latched limit is dropped once the head backs up behind its cell, so it
can't follow the consist onto another track; the table reads the cell again;
- a cell latched already, found under the consist by a rebuilt table, is
ignored whatever it shows now (a 0 for the next train no longer stops it);
- PointVelocity 0 stops at the usual distance, not from the approach;
- the heading follows the track under the measured vehicle, not the chord of
the consist, which a long consist on a tight curve holds far off the track;
- vehicles coupled or uncoupled at the end towards the point move the head;
- a jump of the consist (moved elsewhere) drops the latched limits.
* fix(ai): a cab change and curves don't move the latched point limits
- the end of the consist towards the point is taken into the distance only
when the consist changes (its end vehicles or its length), not when another
vehicle is measured from (a cab change at a reversal) nor when a curve
shortens its projection;
- the way of travel follows the direction of the driver's vehicle against
its own couplers, not the chord of the consist, which on a balloon loop
points against it.
* fix(ai): a coupling with a cab change in one order still moves the head of a latched point limit
The end of the consist measured from the previous vehicle is moved to the place of the new one, so a coupling or an uncoupling followed at once by a change of direction to the other cab (the shunting orders) is taken into the distance to the point.
---------
Co-authored-by: maj00r <maj00r@host>
make_event() lowercased the event name twice: cParser::getToken() already
folds ASCII via toLowerChar() (which intentionally leaves bytes >= 0x80
alone), then ToLower() ran std::tolower() over every byte on top of that.
With a non-"C" global locale, that second pass remaps cp1250 uppercase
accented letters (e.g. 0xAF -> 0xBF). Every lookup path - TTrack::AssignEvents(),
child-event resolution in multi_event, event-launcher name resolution -
normalizes only through the parser, so a registered name containing such a
letter can no longer be found: the track logs "can't find assigned event"
and the binding is silently dropped.
Removing the extra ToLower() makes the registration key match every lookup
site (ASCII-only folding, non-ASCII bytes compared verbatim), and matches
the direction toLowerChar()'s own comment already points at for UTF-8.
A whois with no triggering vehicle previously just wrote nothing to
the target cell with no trace in the log, which is a real pain to
diagnose from the scenery side (this is exactly the kind of thing that
cost real debugging time on a station script recently).
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
whois_event::run_() dereferenced m_activator unconditionally in every
branch (this predates this PR). getvalues_event::run_() and
putvalues_event::run_() already guard the same way elsewhere in this
file; whois_event was missing it. Single early return covers every
branch, old and new.
Per review: StationNameAhead()/StationIsStopAhead() duplicated the same
bounds check for no reason. Replaced with a single
TimeTableEntryAhead(Offset) returning the TMTableLine itself; the whois
branch reads .StationName/.Ah off it directly.
The +8/+16/+24/+32/+40 (and the new +48) modes all pick the reporting
vehicle the same way: the activator's own Mechanik if it's the primary
driver, otherwise the consist's controlling vehicle (ctOwner) - so the
event still resolves correctly if a wagon happens to trigger it ahead
of its locomotive.
+0 (train name / stations left / stop flag) predates that pattern and
never got it: it required m_activator->Mechanik directly and silently
wrote nothing otherwise. A whois hook placed where the loco doesn't
necessarily lead (e.g. a train that reverses direction, or one being
propelled) can have a wagon trigger the event first and the memcell
stays empty, with no error - hard to diagnose from scenery side.
Same owner-selection, same guard semantics (still nothing written if
neither the activator nor its consist has a controller), only the
source of the vehicle it reads from is widened.
Per review: +48 (whois_name | whois_load, mode_alt clear) was an
unused combination of the existing mode bits - use that instead of
claiming a new bit 6. +56 (same, with mode_alt set) stays free for a
future mode. No new flags::* entry needed; mtable.h/.cpp unchanged.
Dispatcher scripts that route trains at a station based on where they
go afterwards (e.g. a big terminal throat with several outbound
directions) have no way to read that: whois +40 only exposes the
current/next timetable entry (NextStop()/IsStop()), which while the
train is at that very station is that station itself.
Adds flags::whois_ahead (bit 6, previously unused) plus
TTrainParameters::StationNameAhead(Offset)/StationIsStopAhead(Offset),
returning the raw TimeTable[] entry Offset positions past StationIndex
(name and whether it's a booked stop, "none"/false past the end of the
timetable). The new whois branch calls both with Offset=1, mirroring
the existing +40 branch's UpdateValues()/WriteLog() shape.
Logic-verified with an isolated harness mirroring the touched types
(TTrainParameters/TController/TMemCell shapes and the exact function
bodies); not yet build-tested against the full engine locally - relying
on CI for that.
- Lua bindings are no longer using FFI in favor of the "classic" Lua C API.
- This makes it work properly on native Linux builds.
- Changed the Lua API slightly:
- Removed the `api.event_preparefunc()` function because it is no longer necessary. Instead, you can pass any function you want without preparing it first.
- Added an `api.event_exists()` function. Takes a single `name` argument.
- Any `api.find_*()` functions return `nil` instead of an userdata representing a null pointer when the requested object is not found.