From aee7f0d4198c441c3dd4cb5d33f488607a1a81a5 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Thu, 30 Jan 2020 13:59:46 +0100 Subject: Fix things, rework signal aspect select dialog, transform old aspects on-the-fly --- advtrains/signals.lua | 6 +++--- advtrains/trainlogic.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'advtrains') diff --git a/advtrains/signals.lua b/advtrains/signals.lua index 1940518..68cbc70 100644 --- a/advtrains/signals.lua +++ b/advtrains/signals.lua @@ -73,7 +73,7 @@ for r,f in pairs({on={as="off", ls="green", als="red"}, off={as="on", ls="red", -- new signal API advtrains = { set_aspect = function(pos, node, asp) - if asp.main != 0 then + if asp.main ~= 0 then advtrains.ndb.swap_node(pos, {name = "advtrains:retrosignal_on"..rotation, param2 = node.param2}, true) else advtrains.ndb.swap_node(pos, {name = "advtrains:retrosignal_off"..rotation, param2 = node.param2}, true) @@ -132,7 +132,7 @@ for r,f in pairs({on={as="off", ls="green", als="red"}, off={as="on", ls="red", -- new signal API advtrains = { set_aspect = function(pos, node, asp) - if asp.main != 0 then + if asp.main ~= 0 then advtrains.ndb.swap_node(pos, {name = "advtrains:signal_on"..rotation, param2 = node.param2}, true) else advtrains.ndb.swap_node(pos, {name = "advtrains:signal_off"..rotation, param2 = node.param2}, true) @@ -200,7 +200,7 @@ for r,f in pairs({on={as="off", ls="green", als="red"}, off={as="on", ls="red", -- new signal API advtrains = { set_aspect = function(pos, node, asp) - if asp.main != 0 then + if asp.main ~= 0 then advtrains.ndb.swap_node(pos, {name = "advtrains:signal_wall_"..loc.."_on", param2 = node.param2}, true) else advtrains.ndb.swap_node(pos, {name = "advtrains:signal_wall_"..loc.."_off", param2 = node.param2}, true) diff --git a/advtrains/trainlogic.lua b/advtrains/trainlogic.lua index fa7a40e..be0d60e 100644 --- a/advtrains/trainlogic.lua +++ b/advtrains/trainlogic.lua @@ -417,7 +417,7 @@ function advtrains.train_step_b(id, train, dtime) if emerg then v_target_apply(v_targets, VLEVER_EMERG, 0) else - v_target_apply(v_targets, VLEVER_EMERG, braketar) + v_target_apply(v_targets, VLEVER_BRAKE, braketar) end else v_target_apply(v_targets, VLEVER_ROLL, train.tarvelocity) -- cgit v1.2.3