diff options
| author | orwell96 <orwell@bleipb.de> | 2019-01-22 23:24:05 +0100 |
|---|---|---|
| committer | orwell96 <orwell@bleipb.de> | 2019-01-22 23:26:20 +0100 |
| commit | f2a62c2d772b7242858be19934512fd9fc3d89fc (patch) | |
| tree | 4e27b19bfa7d0ee7d117ed3921c8bcc531da59f0 | |
| parent | 2b871069617383eaa1c7d4fb89ccab766c9f68b0 (diff) | |
| download | advtrains-f2a62c2d772b7242858be19934512fd9fc3d89fc.tar.gz advtrains-f2a62c2d772b7242858be19934512fd9fc3d89fc.tar.bz2 advtrains-f2a62c2d772b7242858be19934512fd9fc3d89fc.zip | |
Fix atc command evaluation BB command
| -rw-r--r-- | advtrains/atc.lua | 14 | ||||
| -rw-r--r-- | advtrains_interlocking/lzb.lua | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/advtrains/atc.lua b/advtrains/atc.lua index 80b1b36..58d59af 100644 --- a/advtrains/atc.lua +++ b/advtrains/atc.lua @@ -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 diff --git a/advtrains_interlocking/lzb.lua b/advtrains_interlocking/lzb.lua index e439703..b309c72 100644 --- a/advtrains_interlocking/lzb.lua +++ b/advtrains_interlocking/lzb.lua @@ -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 |