Montandalar
/
advtrains
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix atc command evaluation BB command

master
orwell96 2019-01-22 23:24:05 +01:00
parent 2b87106961
commit f2a62c2d77
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
advtrains/atc.lua
View File

@ -179,11 +179,8 @@ local matchptn={
train.tarvelocity=tonumber(match)
return #match+1
end,
["B([0-9B]+)"]=function(id, train, match)
if match=="B" then
train.atc_brake_target = -1
train.tarvelocity = 0
elseif train.velocity>tonumber(match) then
["B([0-9]+)"]=function(id, train, match)
if train.velocity>tonumber(match) then
train.atc_brake_target=tonumber(match)
if not train.tarvelocity or train.tarvelocity>train.atc_brake_target then
train.tarvelocity=train.atc_brake_target
@ -191,6 +188,13 @@ local matchptn={
end
return #match+1
end,
["BB"]=function(id, train)
if match=="B" then
train.atc_brake_target = -1
train.tarvelocity = 0
else
return 2
end,
["W"]=function(id, train)
train.atc_wait_finish=true
return 1

2
advtrains_interlocking/lzb.lua
View File

@ -19,7 +19,7 @@ train.lzb = {
trav = Current index that the traverser has advanced so far
travsht = boolean indicating whether the train will be a shunt move at "trav"
travspd = speed restriction at end of traverser
travwspd = warning speed res.
travwspd = warning speed res.t
oncoming = table containing oncoming signals, in order of appearance on the path
{
pos = position of the signal (not the IP!). Can be nil