From 265acf710f26d8dc6ad78e3a65d2e36fb958276d Mon Sep 17 00:00:00 2001 From: autocommitter Date: Mon, 22 Apr 2024 15:03:29 +0200 Subject: State at 2023-11-28 --- Crossroads/init_code.lua | 4 ++-- Crossroads/nodes/(1663,18,8241).lua | 2 +- Crossroads/nodes/(1921,19,8220).lua | 2 +- Crossroads/nodes/(1928,19,8223).lua | 2 +- il_timetable/init_code.lua | 14 ++++++++++++-- il_timetable/nodes/(-614,15,-411).lua | 7 +++++++ il_timetable/nodes/(1236,3,1016).lua | 2 +- 7 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 il_timetable/nodes/(-614,15,-411).lua diff --git a/Crossroads/init_code.lua b/Crossroads/init_code.lua index 8266283..057e685 100644 --- a/Crossroads/init_code.lua +++ b/Crossroads/init_code.lua @@ -547,8 +547,8 @@ F.lines = { ring = false, rtt = 600, interval = 300, - [1] = { {"SWALD-south", "1", 45}, {"SWALD-stn", "N", 85}, {"SWALD-west", "W", 115}, {"krasnograd", "W", 195}, {"NRG-pek", "W", 235}, {"NRG-CW", "S", 280}, {"NRG-krstr", "S", 310}, {"NRG-yard", "W", 340}, }, - [2] = { {"NRG-yard", "W", 340}, {"NRG-krstr", "N", 370}, {"NRG-CW", "N", 400}, {"NRG-pek", "E", 440}, {"krasnograd", "E", 495}, {"SWALD-west", "E", 575}, {"SWALD-stn", "S", 605}, {"SWALD-south", "1", 645}, }, + [1] = { {"SWALD-south", "1", 45}, {"SWALD-stn", "N", 85}, {"SWALD-west", "W", 115}, {"krasnograd", "2", 195}, {"NRG-pek", "2", 235}, {"NRG-CW", "S", 280}, {"NRG-krstr", "S", 310}, {"NRG-yard", "W", 340}, }, + [2] = { {"NRG-yard", "W", 340}, {"NRG-krstr", "N", 370}, {"NRG-CW", "N", 400}, {"NRG-pek", "1", 440}, {"krasnograd", "1", 495}, {"SWALD-west", "E", 575}, {"SWALD-stn", "S", 605}, {"SWALD-south", "1", 645}, }, }, } diff --git a/Crossroads/nodes/(1663,18,8241).lua b/Crossroads/nodes/(1663,18,8241).lua index 9d7770c..2a8fb6e 100644 --- a/Crossroads/nodes/(1663,18,8241).lua +++ b/Crossroads/nodes/(1663,18,8241).lua @@ -1 +1 @@ -F.stn2gen("NRG-pek", "W", "L") \ No newline at end of file +F.stn2gen("NRG-pek", "2", "L") \ No newline at end of file diff --git a/Crossroads/nodes/(1921,19,8220).lua b/Crossroads/nodes/(1921,19,8220).lua index 7938637..2e47a85 100644 --- a/Crossroads/nodes/(1921,19,8220).lua +++ b/Crossroads/nodes/(1921,19,8220).lua @@ -1 +1 @@ -F.stn2gen("krasnograd", "E", "R") \ No newline at end of file +F.stn2gen("krasnograd", "1", "R") \ No newline at end of file diff --git a/Crossroads/nodes/(1928,19,8223).lua b/Crossroads/nodes/(1928,19,8223).lua index aceaa29..80be033 100644 --- a/Crossroads/nodes/(1928,19,8223).lua +++ b/Crossroads/nodes/(1928,19,8223).lua @@ -1 +1 @@ -F.stn2gen("krasnograd", "W", "R") \ No newline at end of file +F.stn2gen("krasnograd", "2", "R") \ No newline at end of file diff --git a/il_timetable/init_code.lua b/il_timetable/init_code.lua index a4aee4e..15c760e 100644 --- a/il_timetable/init_code.lua +++ b/il_timetable/init_code.lua @@ -445,8 +445,9 @@ end station = "The Cube", title = "The Cube (Track 2)", interval = 30, - display1 = "display1", - display2 = "display2", + display1 = "d1", + display2 = "d2", + display3 = "d3" }]] function F.ttp_station_display(p) --L425 @@ -515,6 +516,15 @@ if p.display2 then end digiline_send(p.display2, text2) end +if p.display3 then + local text3 = "" + for i=8,11 do + if next_trains[i] then + text3 = text3 .. next_trains[i].text .. "\n" + end + end + digiline_send(p.display3, text3) +end --if not p.notimer then -- schedule_in(p.interval or 30,"foo") --end diff --git a/il_timetable/nodes/(-614,15,-411).lua b/il_timetable/nodes/(-614,15,-411).lua new file mode 100644 index 0000000..e077d42 --- /dev/null +++ b/il_timetable/nodes/(-614,15,-411).lua @@ -0,0 +1,7 @@ +F.ttp_station_display({ + lines = {"S12_N", "S12_S"}, + departure = {}, + station = "Spawn Main", + title = "Spawn Main T3", + display1 = "d1", +}) \ No newline at end of file diff --git a/il_timetable/nodes/(1236,3,1016).lua b/il_timetable/nodes/(1236,3,1016).lua index 2a4682b..fb19feb 100644 --- a/il_timetable/nodes/(1236,3,1016).lua +++ b/il_timetable/nodes/(1236,3,1016).lua @@ -2,7 +2,7 @@ F.ttp_begin({ stn = "Silver Coast Central Siding", tt = "S12_S", -- timetable ID depint = "05;00", --departure slot interval - depoff = "00;00", --departure slot offset + depoff = "01;40", --departure slot offset doorside = "C", reverse = false, only_lines = {S12=true}, -- cgit v1.2.3