From 45e18326e34537973a4c88a26ad8991e3935d384 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Mon, 8 Nov 2021 22:47:29 +0100 Subject: [PATCH] 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) --- advtrains/signals.lua | 4 ++-- advtrains_signals_ks/init.lua | 7 ++++--- .../textures/advtrains_signals_ks_sign_20.png | Bin 0 -> 5715 bytes 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 advtrains_signals_ks/textures/advtrains_signals_ks_sign_20.png diff --git a/advtrains/signals.lua b/advtrains/signals.lua index 5fb1d1b..b26c950 100644 --- a/advtrains/signals.lua +++ b/advtrains/signals.lua @@ -18,7 +18,7 @@ end local function aspect(b) return { - main = (not b) and 0, -- b ? false : 0 + main = b and -1 or 0, shunt = false, proceed_as_main = true, dst = false, @@ -27,7 +27,7 @@ return { end local suppasp = { - main = {0, false}, + main = {0, -1}, dst = {false}, shunt = nil, proceed_as_main = true, diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua index 95076e0..e97eb77 100755 --- a/advtrains_signals_ks/init.lua +++ b/advtrains_signals_ks/init.lua @@ -60,9 +60,9 @@ local setaspectf = function(rot) end setzs3v(pos, nil, rot) 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}) - 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}) else 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"}, ["8"] = {main = 8, n = "12"}, ["12"] = {main = 12, n = "16"}, - ["16"] = {main = 16, n = "4"}, + ["16"] = {main = 16, n = "20"}, + ["20"] = {main = 20, n = "4"}, } do 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)" diff --git a/advtrains_signals_ks/textures/advtrains_signals_ks_sign_20.png b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_20.png new file mode 100644 index 0000000000000000000000000000000000000000..71b540dab3b822270c7a5c46891980c24d5a8dc8 GIT binary patch literal 5715 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 OU6Mo`5mFMAu<}1@oltQA literal 0 HcmV?d00001