New-Ks: minor additions/corrections to ywang's work:
- Add sign for line speed 20 (else no way to return to max line speed once set) - When no distant signal info available (default), Ks displays green light (2 sections free) - Normal and wall signals again signal maximum speed (persistent restriction can be given via line speed nouw)master
parent
3f6cef7308
commit
45e18326e3
|
@ -18,7 +18,7 @@ end
|
||||||
|
|
||||||
local function aspect(b)
|
local function aspect(b)
|
||||||
return {
|
return {
|
||||||
main = (not b) and 0, -- b ? false : 0
|
main = b and -1 or 0,
|
||||||
shunt = false,
|
shunt = false,
|
||||||
proceed_as_main = true,
|
proceed_as_main = true,
|
||||||
dst = false,
|
dst = false,
|
||||||
|
@ -27,7 +27,7 @@ return {
|
||||||
end
|
end
|
||||||
|
|
||||||
local suppasp = {
|
local suppasp = {
|
||||||
main = {0, false},
|
main = {0, -1},
|
||||||
dst = {false},
|
dst = {false},
|
||||||
shunt = nil,
|
shunt = nil,
|
||||||
proceed_as_main = true,
|
proceed_as_main = true,
|
||||||
|
|
|
@ -60,9 +60,9 @@ local setaspectf = function(rot)
|
||||||
end
|
end
|
||||||
setzs3v(pos, nil, rot)
|
setzs3v(pos, nil, rot)
|
||||||
else
|
else
|
||||||
if asp.dst == -1 then
|
if not asp.dst or asp.dst == -1 then
|
||||||
advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_free_"..rot, param2 = node.param2})
|
advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_free_"..rot, param2 = node.param2})
|
||||||
elseif not asp.dst or asp.dst == 0 then
|
elseif asp.dst == 0 then
|
||||||
advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_slow_"..rot, param2 = node.param2})
|
advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_slow_"..rot, param2 = node.param2})
|
||||||
else
|
else
|
||||||
advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_nextslow_"..rot, param2 = node.param2})
|
advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_nextslow_"..rot, param2 = node.param2})
|
||||||
|
@ -334,7 +334,8 @@ for _, rtab in ipairs({
|
||||||
["6"] = {main = 6, n = "8"},
|
["6"] = {main = 6, n = "8"},
|
||||||
["8"] = {main = 8, n = "12"},
|
["8"] = {main = 8, n = "12"},
|
||||||
["12"] = {main = 12, n = "16"},
|
["12"] = {main = 12, n = "16"},
|
||||||
["16"] = {main = 16, n = "4"},
|
["16"] = {main = 16, n = "20"},
|
||||||
|
["20"] = {main = 20, n = "4"},
|
||||||
} do
|
} do
|
||||||
local tile2 = "advtrains_signals_ks_sign_lf7.png^(advtrains_signals_ks_sign_"..typ..".png^[makealpha:255,255,255)"
|
local tile2 = "advtrains_signals_ks_sign_lf7.png^(advtrains_signals_ks_sign_"..typ..".png^[makealpha:255,255,255)"
|
||||||
local inv = "advtrains_signals_ks_sign_lf7.png^(advtrains_signals_ks_sign_8.png^[makealpha:255,255,255)"
|
local inv = "advtrains_signals_ks_sign_lf7.png^(advtrains_signals_ks_sign_8.png^[makealpha:255,255,255)"
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 5.6 KiB |
Loading…
Reference in New Issue