diff options
| author | orwell96 <orwell@bleipb.de> | 2018-12-08 17:12:57 +0100 |
|---|---|---|
| committer | orwell96 <orwell@bleipb.de> | 2018-12-08 17:12:57 +0100 |
| commit | c3c5431412ddb65e08f55e56e1f51fb442b746b0 (patch) | |
| tree | 03e15e99f6044427b093ffaf94779e1f22e9d874 /advtrains_interlocking | |
| parent | e37f4f9188808c3a91be55ba90b9b666341af3cf (diff) | |
| download | advtrains-c3c5431412ddb65e08f55e56e1f51fb442b746b0.tar.gz advtrains-c3c5431412ddb65e08f55e56e1f51fb442b746b0.tar.bz2 advtrains-c3c5431412ddb65e08f55e56e1f51fb442b746b0.zip | |
Shunt signals (not exactly Ks), along with fixes in other components that those rely on
Diffstat (limited to 'advtrains_interlocking')
| -rw-r--r-- | advtrains_interlocking/init.lua | 2 | ||||
| -rw-r--r-- | advtrains_interlocking/lzb.lua | 2 | ||||
| -rw-r--r-- | advtrains_interlocking/train_sections.lua | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/advtrains_interlocking/init.lua b/advtrains_interlocking/init.lua index 7239674..f46ed65 100644 --- a/advtrains_interlocking/init.lua +++ b/advtrains_interlocking/init.lua @@ -3,6 +3,8 @@ advtrains.interlocking = {} +advtrains.SHUNT_SPEED_MAX = 6 + function advtrains.interlocking.sigd_equal(sigd, cmp) return vector.equals(sigd.p, cmp.p) and sigd.s==cmp.s end diff --git a/advtrains_interlocking/lzb.lua b/advtrains_interlocking/lzb.lua index 14c1741..11871f1 100644 --- a/advtrains_interlocking/lzb.lua +++ b/advtrains_interlocking/lzb.lua @@ -51,7 +51,7 @@ local ZONE_ROLL = 2 local ZONE_HOLD = 5 -- added on top of ZONE_ROLL local ZONE_VSLOW = 3 -- When speed is <2, still allow accelerating -local SHUNT_SPEED_MAX = 4 +local SHUNT_SPEED_MAX = advtrains.SHUNT_SPEED_MAX local function look_ahead(id, train) diff --git a/advtrains_interlocking/train_sections.lua b/advtrains_interlocking/train_sections.lua index c0a911e..762fd5d 100644 --- a/advtrains_interlocking/train_sections.lua +++ b/advtrains_interlocking/train_sections.lua @@ -174,6 +174,8 @@ advtrains.te_register_on_create(function(id, train) else atwarn("ILDB corruption: TCB",origin," has invalid TS reference") end + -- Make train a shunt move + train.is_shunt = true elseif ts_id==nil then atwarn("Train",id,": Unable to determine whether to block a track section!") else |