From 02cf9234aa67a2a5b83887739b416f2c6ce65292 Mon Sep 17 00:00:00 2001 From: autocommitter Date: Mon, 22 Apr 2024 14:58:03 +0200 Subject: State at 2023-03-26 --- init_code.lua | 12 +++++++++++- nodes/(-109,17,680).lua | 5 +++++ nodes/(-1109,5,-2096).lua | 4 ++++ nodes/(-1112,5,-2124).lua | 4 ++++ nodes/(-1112,5,-3275).lua | 4 ++++ nodes/(-1210,9,-3870).lua | 4 ++++ nodes/(-1229,9,-3874).lua | 4 ++++ nodes/(-1731,7,-4402).lua | 10 ++++++++++ nodes/(-1929,15,-4581).lua | 13 +++++++++++++ nodes/(-1934,13,-4577).lua | 16 ++++++++++++++++ nodes/(-1937,21,-4581).lua | 12 ++++++++++++ nodes/(-435,23,377).lua | 5 +++++ nodes/(-441,23,384).lua | 5 +++++ nodes/(-524,23,-215).lua | 5 +++++ nodes/(-524,23,-58).lua | 5 +++++ nodes/(-524,23,82).lua | 5 +++++ nodes/(-527,23,-228).lua | 1 - nodes/(-617,14,-411).lua | 15 +++++++++++---- nodes/(-643,15,-424).lua | 4 ++-- nodes/(-966,5,-756).lua | 4 ++++ nodes/(-993,5,-753).lua | 4 ++++ nodes/(1017,8,1011).lua | 4 ++++ nodes/(1020,11,1021).lua | 2 +- nodes/(1222,3,1011).lua | 5 +++++ nodes/(144,11,892).lua | 5 +++++ nodes/(152,11,892).lua | 5 +++++ nodes/(1543,21,2653).lua | 4 ++++ nodes/(1722,30,2937).lua | 9 +++++++++ nodes/(1734,26,2922).lua | 2 -- nodes/(197,14,1011).lua | 5 +++++ nodes/(670,14,1011).lua | 5 +++++ nodes/(960,14,1063).lua | 4 ++++ nodes/(964,16,1067).lua | 8 ++++++++ nodes/(981,15,1041).lua | 2 +- nodes/(983,21,1053).lua | 5 +++++ 35 files changed, 194 insertions(+), 12 deletions(-) create mode 100644 nodes/(-109,17,680).lua create mode 100644 nodes/(-1109,5,-2096).lua create mode 100644 nodes/(-1112,5,-2124).lua create mode 100644 nodes/(-1112,5,-3275).lua create mode 100644 nodes/(-1210,9,-3870).lua create mode 100644 nodes/(-1229,9,-3874).lua create mode 100644 nodes/(-1731,7,-4402).lua create mode 100644 nodes/(-1929,15,-4581).lua create mode 100644 nodes/(-1934,13,-4577).lua create mode 100644 nodes/(-1937,21,-4581).lua create mode 100644 nodes/(-435,23,377).lua create mode 100644 nodes/(-441,23,384).lua create mode 100644 nodes/(-524,23,-215).lua create mode 100644 nodes/(-524,23,-58).lua create mode 100644 nodes/(-524,23,82).lua create mode 100644 nodes/(-966,5,-756).lua create mode 100644 nodes/(-993,5,-753).lua create mode 100644 nodes/(1017,8,1011).lua create mode 100644 nodes/(1222,3,1011).lua create mode 100644 nodes/(144,11,892).lua create mode 100644 nodes/(152,11,892).lua create mode 100644 nodes/(1543,21,2653).lua create mode 100644 nodes/(1722,30,2937).lua create mode 100644 nodes/(197,14,1011).lua create mode 100644 nodes/(670,14,1011).lua create mode 100644 nodes/(960,14,1063).lua create mode 100644 nodes/(964,16,1067).lua create mode 100644 nodes/(983,21,1053).lua diff --git a/init_code.lua b/init_code.lua index 4a61c7f..bac2c9e 100644 --- a/init_code.lua +++ b/init_code.lua @@ -183,11 +183,21 @@ F.ttp={ inside_line_desc = "E1 to Melinka", stn_display = "E1 Melinka ", }, + E1_N = { + outside_text = "[E1] Personhood\nvia Mom Junction, Spawn Main, Ehlodex, The Cube", + inside_line_desc = "E1 to Personhood", + stn_display = "E1 Personhood ", + }, S12_S = { - outside_text = "[S12] Ehlodex\nvia Gardon St., Schwarzschild St., Anju Crossing, Lesnoi", + outside_text = "[S12] Spawn Main\nvia Ehlodex, Schwarzschild St., Anju Crossing, Lesnoi", inside_line_desc = "S12 to Spawn Main", stn_display = "S12 Spawn Main ", }, + S12_N = { + outside_text = "[S12] Silver Coast\nvia Lesnoi, Anju Crossing, Schwarzschild St., Ehlodex", + inside_line_desc = "S12 to Silver Coast", + stn_display = "S12 Silver Coast", + }, } --[[ diff --git a/nodes/(-109,17,680).lua b/nodes/(-109,17,680).lua new file mode 100644 index 0000000..3e25243 --- /dev/null +++ b/nodes/(-109,17,680).lua @@ -0,0 +1,5 @@ +F.ttp_stop({ + stn = "Schwarzschild Passing Track", + doorside = "R", + only_lines={S12=true}, +}) \ No newline at end of file diff --git a/nodes/(-1109,5,-2096).lua b/nodes/(-1109,5,-2096).lua new file mode 100644 index 0000000..dc26cd0 --- /dev/null +++ b/nodes/(-1109,5,-2096).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Mom Junction", + doorside = "R", +}) \ No newline at end of file diff --git a/nodes/(-1112,5,-2124).lua b/nodes/(-1112,5,-2124).lua new file mode 100644 index 0000000..dc26cd0 --- /dev/null +++ b/nodes/(-1112,5,-2124).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Mom Junction", + doorside = "R", +}) \ No newline at end of file diff --git a/nodes/(-1112,5,-3275).lua b/nodes/(-1112,5,-3275).lua new file mode 100644 index 0000000..98df9b1 --- /dev/null +++ b/nodes/(-1112,5,-3275).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Padrana Peninsula", + doorside = "R", +}) \ No newline at end of file diff --git a/nodes/(-1210,9,-3870).lua b/nodes/(-1210,9,-3870).lua new file mode 100644 index 0000000..2e977d6 --- /dev/null +++ b/nodes/(-1210,9,-3870).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Aksums Folly", + doorside = "R", +}) \ No newline at end of file diff --git a/nodes/(-1229,9,-3874).lua b/nodes/(-1229,9,-3874).lua new file mode 100644 index 0000000..2e977d6 --- /dev/null +++ b/nodes/(-1229,9,-3874).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Aksums Folly", + doorside = "R", +}) \ No newline at end of file diff --git a/nodes/(-1731,7,-4402).lua b/nodes/(-1731,7,-4402).lua new file mode 100644 index 0000000..4f7d9b5 --- /dev/null +++ b/nodes/(-1731,7,-4402).lua @@ -0,0 +1,10 @@ +if event.train then + if get_line() == "E1" then + if flip then + set_rc("E1_Mel_Left") + else + set_rc("E1_Mel_Right") + end + flip = not flip + end +end \ No newline at end of file diff --git a/nodes/(-1929,15,-4581).lua b/nodes/(-1929,15,-4581).lua new file mode 100644 index 0000000..ac7edc1 --- /dev/null +++ b/nodes/(-1929,15,-4581).lua @@ -0,0 +1,13 @@ +local now = rwt.now() +local rwt_left = rwt.next_rpt(now, "05;00", "02;30") +local rwt_right = rwt.next_rpt(now, "05;00", "00;00") +local stringl = "Track 5 | E1 Personhood | "..rwt.to_string(rwt_left, true) +local stringr = "Track 4 | E1 Personhood | "..rwt.to_string(rwt_right, true) + +if rwt.diff(rwt_left, rwt_right) > 0 then + digiline_send("left", stringl.." | ") +end \ No newline at end of file diff --git a/nodes/(-1934,13,-4577).lua b/nodes/(-1934,13,-4577).lua new file mode 100644 index 0000000..6f18244 --- /dev/null +++ b/nodes/(-1934,13,-4577).lua @@ -0,0 +1,16 @@ +F.ttp_begin({ + stn = "Melinka", -- station name + tt = "E1_N", -- timetable ID +-- depint = "02;30", --departure slot interval +-- depoff = "00;45", --departure slot offset + depint = "05;00", + depoff = "00;00", + doorside = "L", + reverse = true, + only_lines = { E1 = true }, + force_tt_reset = false, +}) + +if event.train then + set_rc("") +end \ No newline at end of file diff --git a/nodes/(-1937,21,-4581).lua b/nodes/(-1937,21,-4581).lua new file mode 100644 index 0000000..007736b --- /dev/null +++ b/nodes/(-1937,21,-4581).lua @@ -0,0 +1,12 @@ +-- this will be triggered by the digiline messages of the other luacontroller +if event.on then +F.ttp_station_display({ + lines = {"E1_S", "E1_N"}, + departure = {}, + station = "Melinka", + title = "Melinka", +-- interval = 15, + display1 = "d1", +-- display2 = "d2", +}) +end \ No newline at end of file diff --git a/nodes/(-435,23,377).lua b/nodes/(-435,23,377).lua new file mode 100644 index 0000000..79457dd --- /dev/null +++ b/nodes/(-435,23,377).lua @@ -0,0 +1,5 @@ +F.ttp_stop({ + stn = "Anju Crossing Central", + doorside = "R", + only_lines={E1=true}, +}) \ No newline at end of file diff --git a/nodes/(-441,23,384).lua b/nodes/(-441,23,384).lua new file mode 100644 index 0000000..ed6368b --- /dev/null +++ b/nodes/(-441,23,384).lua @@ -0,0 +1,5 @@ +F.ttp_stop({ + stn = "Anju Crossing Central", + doorside = "R", + only_lines={S12=true}, +}) \ No newline at end of file diff --git a/nodes/(-524,23,-215).lua b/nodes/(-524,23,-215).lua new file mode 100644 index 0000000..e1df782 --- /dev/null +++ b/nodes/(-524,23,-215).lua @@ -0,0 +1,5 @@ +F.ttp_stop({ + stn = "Community of Laza", + doorside = "R", + only_lines={S12=true}, +}) \ No newline at end of file diff --git a/nodes/(-524,23,-58).lua b/nodes/(-524,23,-58).lua new file mode 100644 index 0000000..3a20545 --- /dev/null +++ b/nodes/(-524,23,-58).lua @@ -0,0 +1,5 @@ +F.ttp_stop({ + stn = "Lesnoi Sued", + doorside = "R", + only_lines={S12=true}, +}) \ No newline at end of file diff --git a/nodes/(-524,23,82).lua b/nodes/(-524,23,82).lua new file mode 100644 index 0000000..dbcb99e --- /dev/null +++ b/nodes/(-524,23,82).lua @@ -0,0 +1,5 @@ +F.ttp_stop({ + stn = "Lesnoi Nord", + doorside = "R", + only_lines={S12=true}, +}) \ No newline at end of file diff --git a/nodes/(-527,23,-228).lua b/nodes/(-527,23,-228).lua index 13eaead..e1df782 100644 --- a/nodes/(-527,23,-228).lua +++ b/nodes/(-527,23,-228).lua @@ -2,5 +2,4 @@ F.ttp_stop({ stn = "Community of Laza", doorside = "R", only_lines={S12=true}, - end_of_tt={S12_S=true}, }) \ No newline at end of file diff --git a/nodes/(-617,14,-411).lua b/nodes/(-617,14,-411).lua index f20b2a4..121c3f4 100644 --- a/nodes/(-617,14,-411).lua +++ b/nodes/(-617,14,-411).lua @@ -1,4 +1,11 @@ --- d_int: Departure every n seconds (epoch modulo) --- d_off: Departure time offset --- function F.stop_sd(st_name, doors, departcommand, minstoptime, d_int, d_off) ---F.stop_sd_sched("Main Station", "R", "RSM", 30, 240, 35) \ No newline at end of file +F.ttp_begin({ + stn = "Spawn Main", -- station name + tt = "S12_N", -- timetable ID + depint = "02;30", --departure slot interval + depoff = "00;45", --departure slot offset + doorside = "R", + reverse = true, + only_lines = { S12 = true }, + force_tt_reset =false, +}) + diff --git a/nodes/(-643,15,-424).lua b/nodes/(-643,15,-424).lua index 2ab3bd0..f5190dc 100644 --- a/nodes/(-643,15,-424).lua +++ b/nodes/(-643,15,-424).lua @@ -1,8 +1,8 @@ F.ttp_station_display({ - lines = {"E1_S"}, + lines = {"E1_S", "E1_N"}, departure = {}, station = "Spawn Main", - title = "Spawn Main (T.6)", + title = "Spawn Main T5/6", interval = 15, display1 = "display1", }) \ No newline at end of file diff --git a/nodes/(-966,5,-756).lua b/nodes/(-966,5,-756).lua new file mode 100644 index 0000000..8bae7d7 --- /dev/null +++ b/nodes/(-966,5,-756).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Mountain South", + doorside = "R", +}) \ No newline at end of file diff --git a/nodes/(-993,5,-753).lua b/nodes/(-993,5,-753).lua new file mode 100644 index 0000000..8bae7d7 --- /dev/null +++ b/nodes/(-993,5,-753).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Mountain South", + doorside = "R", +}) \ No newline at end of file diff --git a/nodes/(1017,8,1011).lua b/nodes/(1017,8,1011).lua new file mode 100644 index 0000000..7793f30 --- /dev/null +++ b/nodes/(1017,8,1011).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Ehlodex", + doorside = "L", +}) \ No newline at end of file diff --git a/nodes/(1020,11,1021).lua b/nodes/(1020,11,1021).lua index dc3083a..705eed3 100644 --- a/nodes/(1020,11,1021).lua +++ b/nodes/(1020,11,1021).lua @@ -1,5 +1,5 @@ F.ttp_station_display({ - lines = {"S12_S"}, + lines = {"S12_S", "S12_N"}, departure = {}, station = "Ehlodex", title = "Ehlodex", diff --git a/nodes/(1222,3,1011).lua b/nodes/(1222,3,1011).lua new file mode 100644 index 0000000..d3e713e --- /dev/null +++ b/nodes/(1222,3,1011).lua @@ -0,0 +1,5 @@ +F.ttp_stop({ + stn = "Silver Coast Central", + doorside = "L", + end_of_tt = {S12_N = true}, +}) \ No newline at end of file diff --git a/nodes/(144,11,892).lua b/nodes/(144,11,892).lua new file mode 100644 index 0000000..7943557 --- /dev/null +++ b/nodes/(144,11,892).lua @@ -0,0 +1,5 @@ +F.ttp_stop({ + stn = "Schwarzschild Street", + doorside = "R", + only_lines={S12=true}, +}) \ No newline at end of file diff --git a/nodes/(152,11,892).lua b/nodes/(152,11,892).lua new file mode 100644 index 0000000..a00ccff --- /dev/null +++ b/nodes/(152,11,892).lua @@ -0,0 +1,5 @@ +F.ttp_stop({ + stn = "Schwarzschild Street", + doorside = "L", + only_lines={E1=true}, +}) \ No newline at end of file diff --git a/nodes/(1543,21,2653).lua b/nodes/(1543,21,2653).lua new file mode 100644 index 0000000..9b7580d --- /dev/null +++ b/nodes/(1543,21,2653).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Personhood South", + doorside = "R", +}) \ No newline at end of file diff --git a/nodes/(1722,30,2937).lua b/nodes/(1722,30,2937).lua new file mode 100644 index 0000000..d28bc16 --- /dev/null +++ b/nodes/(1722,30,2937).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"E1_N", "E1_S"}, + departure = {}, + station = "Personhood Main", + title = "Personhood Main", + interval = 15, + display1 = "d1", +-- display2 = "d2", +}) \ No newline at end of file diff --git a/nodes/(1734,26,2922).lua b/nodes/(1734,26,2922).lua index 9d37365..2980622 100644 --- a/nodes/(1734,26,2922).lua +++ b/nodes/(1734,26,2922).lua @@ -8,5 +8,3 @@ F.ttp_begin({ only_lines = { E1 = true }, force_tt_reset = false, }) - -atc_set_text_outside("[E1] Melinka Town via Spawn") \ No newline at end of file diff --git a/nodes/(197,14,1011).lua b/nodes/(197,14,1011).lua new file mode 100644 index 0000000..357e32c --- /dev/null +++ b/nodes/(197,14,1011).lua @@ -0,0 +1,5 @@ +F.ttp_stop({ + stn = "Minkovsky Street", + doorside = "R", + only_lines={S12=true}, +}) \ No newline at end of file diff --git a/nodes/(670,14,1011).lua b/nodes/(670,14,1011).lua new file mode 100644 index 0000000..0ed504e --- /dev/null +++ b/nodes/(670,14,1011).lua @@ -0,0 +1,5 @@ +F.ttp_stop({ + stn = "Gardon Street", + doorside = "R", + only_lines={S12=true}, +}) \ No newline at end of file diff --git a/nodes/(960,14,1063).lua b/nodes/(960,14,1063).lua new file mode 100644 index 0000000..5e0be27 --- /dev/null +++ b/nodes/(960,14,1063).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Ehlodex", + doorside = "R", +}) \ No newline at end of file diff --git a/nodes/(964,16,1067).lua b/nodes/(964,16,1067).lua new file mode 100644 index 0000000..18d98f2 --- /dev/null +++ b/nodes/(964,16,1067).lua @@ -0,0 +1,8 @@ +F.ttp_station_display({ + lines = {"E1_N"}, + departure = {}, + station = "Ehlodex", + title = "Ehlodex", + interval = 30, + display1 = "d1", +}) \ No newline at end of file diff --git a/nodes/(981,15,1041).lua b/nodes/(981,15,1041).lua index 3301300..fc2d491 100644 --- a/nodes/(981,15,1041).lua +++ b/nodes/(981,15,1041).lua @@ -1,5 +1,5 @@ F.ttp_station_display({ - lines = {"S12_S", "E1_S", "CFE_S", "NX_S"}, + lines = {"S12_S", "S12_N", "E1_S", "E1_N", "CFE_S", "NX_S"}, departure = {}, station = "Ehlodex", title = "Ehlodex", diff --git a/nodes/(983,21,1053).lua b/nodes/(983,21,1053).lua new file mode 100644 index 0000000..4c89cef --- /dev/null +++ b/nodes/(983,21,1053).lua @@ -0,0 +1,5 @@ +lines = F.ttp_info_times("E1_N", "00;00") +linestr = F.ttp_info_trains("E1_N", "00;00") +li = lines +for i=1,#linestr do li[#li+1] = linestr[i] end +print(" E1\n"..table.concat(li, "\n")) \ No newline at end of file -- cgit v1.2.3