From 6148edafdb61269f0fbe95c0e54de08c2eb0fc16 Mon Sep 17 00:00:00 2001 From: autocommitter Date: Mon, 22 Apr 2024 15:03:14 +0200 Subject: State at 2023-11-21 --- Crossroads/init_code.lua | 2 +- Crossroads/nodes/(1452,6,7980).lua | 1 + Crossroads/nodes/(1950,19,8220).lua | 1 + far/nodes/(3695,10,1715).lua | 7 +++++++ il_timetable/init_code.lua | 5 +++++ il_timetable/nodes/(-1921,13,-4541).lua | 2 ++ il_timetable/nodes/(-1925,13,-4577).lua | 2 +- il_timetable/nodes/(1103,23,3014).lua | 1 - il_timetable/nodes/(1103,23,3027).lua | 1 - il_timetable/nodes/(1109,19,3030).lua | 4 ++++ il_timetable/nodes/(1111,23,1943).lua | 9 +++++++++ il_timetable/nodes/(1112,23,3027).lua | 6 ++++++ il_timetable/nodes/(133,11,873).lua | 1 + il_timetable/nodes/(142,8,164).lua | 11 ++++++++++- il_timetable/nodes/(1626,9,4628).lua | 4 ++++ il_timetable/nodes/(1973,42,8383).lua | 2 +- il_timetable/nodes/(1984,3,6146).lua | 4 ++++ il_timetable/nodes/(1984,3,7957).lua | 4 ++++ il_timetable/nodes/(1987,3,7371).lua | 4 ++++ il_timetable/nodes/(690,9,462).lua | 5 +++++ il_timetable/nodes/(693,9,484).lua | 4 ++++ il_timetable/nodes/(851,14,775).lua | 4 ++++ il_timetable/nodes/(864,14,791).lua | 4 ++++ il_timetable/nodes/(981,15,1041).lua | 3 +-- il_timetable/nodes/(981,21,1053).lua | 6 ++++++ il_timetable/nodes/(982,21,1053).lua | 5 +++++ il_timetable/nodes/(992,14,1023).lua | 1 - il_timetable/nodes/(995,14,1043).lua | 4 ++++ 28 files changed, 98 insertions(+), 9 deletions(-) create mode 100644 Crossroads/nodes/(1452,6,7980).lua create mode 100644 Crossroads/nodes/(1950,19,8220).lua create mode 100644 far/nodes/(3695,10,1715).lua create mode 100644 il_timetable/nodes/(-1921,13,-4541).lua create mode 100644 il_timetable/nodes/(1109,19,3030).lua create mode 100644 il_timetable/nodes/(1111,23,1943).lua create mode 100644 il_timetable/nodes/(1112,23,3027).lua create mode 100644 il_timetable/nodes/(1626,9,4628).lua create mode 100644 il_timetable/nodes/(1984,3,6146).lua create mode 100644 il_timetable/nodes/(1984,3,7957).lua create mode 100644 il_timetable/nodes/(1987,3,7371).lua create mode 100644 il_timetable/nodes/(690,9,462).lua create mode 100644 il_timetable/nodes/(693,9,484).lua create mode 100644 il_timetable/nodes/(851,14,775).lua create mode 100644 il_timetable/nodes/(864,14,791).lua create mode 100644 il_timetable/nodes/(981,21,1053).lua create mode 100644 il_timetable/nodes/(982,21,1053).lua create mode 100644 il_timetable/nodes/(995,14,1043).lua diff --git a/Crossroads/init_code.lua b/Crossroads/init_code.lua index 3536bd0..7e0d79c 100644 --- a/Crossroads/init_code.lua +++ b/Crossroads/init_code.lua @@ -545,7 +545,7 @@ F.lines = { rtt = 600, interval = 300, [1] = { {"SWALD-south", "1", 45}, {"SWALD-stn", "N", 85}, {"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", "W", 495}, {"SWALD-stn", "S", 605}, {"SWALD-south", "1", 645}, }, + [2] = { {"NRG-yard", "W", 340}, {"NRG-krstr", "N", 370}, {"NRG-CW", "N", 400}, {"NRG-pek", "E", 440}, {"krasnograd", "E", 495}, {"SWALD-stn", "S", 605}, {"SWALD-south", "1", 645}, }, }, } diff --git a/Crossroads/nodes/(1452,6,7980).lua b/Crossroads/nodes/(1452,6,7980).lua new file mode 100644 index 0000000..6d0d5e1 --- /dev/null +++ b/Crossroads/nodes/(1452,6,7980).lua @@ -0,0 +1 @@ +F.stn2gen("NRG-yard", "W", "R", true, true) \ No newline at end of file diff --git a/Crossroads/nodes/(1950,19,8220).lua b/Crossroads/nodes/(1950,19,8220).lua new file mode 100644 index 0000000..7938637 --- /dev/null +++ b/Crossroads/nodes/(1950,19,8220).lua @@ -0,0 +1 @@ +F.stn2gen("krasnograd", "E", "R") \ No newline at end of file diff --git a/far/nodes/(3695,10,1715).lua b/far/nodes/(3695,10,1715).lua new file mode 100644 index 0000000..2eec319 --- /dev/null +++ b/far/nodes/(3695,10,1715).lua @@ -0,0 +1,7 @@ +-- far_luaatctrack_spot_check_01.lua + +if event.train then + local posTable = POS( 3695,10,1715 ) + F.save_train(posTable) + return +end \ No newline at end of file diff --git a/il_timetable/init_code.lua b/il_timetable/init_code.lua index bac2c9e..42b3509 100644 --- a/il_timetable/init_code.lua +++ b/il_timetable/init_code.lua @@ -178,6 +178,11 @@ F.ttp={ inside_line_desc = "NX to Trisiston", stn_display = "NX Trisiston ", }, + NX_N = { + outside_text = "[NX] Stopsleyhood\nvia Ehlodex, Personhood West", + inside_line_desc = "NX to Stopsleyhood", + stn_display = "NX Stopsleyhood", + }, E1_S = { outside_text = "[E1] Melinka\nvia The Cube, Ehlodex, Spawn Main, Mom Junction", inside_line_desc = "E1 to Melinka", diff --git a/il_timetable/nodes/(-1921,13,-4541).lua b/il_timetable/nodes/(-1921,13,-4541).lua new file mode 100644 index 0000000..921af94 --- /dev/null +++ b/il_timetable/nodes/(-1921,13,-4541).lua @@ -0,0 +1,2 @@ +-- reset timetable for this train +S.ttt[atc_id] = nil \ No newline at end of file diff --git a/il_timetable/nodes/(-1925,13,-4577).lua b/il_timetable/nodes/(-1925,13,-4577).lua index fa700e6..a1d7a28 100644 --- a/il_timetable/nodes/(-1925,13,-4577).lua +++ b/il_timetable/nodes/(-1925,13,-4577).lua @@ -8,7 +8,7 @@ F.ttp_begin({ doorside = "R", reverse = true, only_lines = { E1 = true }, - force_tt_reset = false, + force_tt_reset = true, }) if event.train then diff --git a/il_timetable/nodes/(1103,23,3014).lua b/il_timetable/nodes/(1103,23,3014).lua index 7c78acb..5d864f9 100644 --- a/il_timetable/nodes/(1103,23,3014).lua +++ b/il_timetable/nodes/(1103,23,3014).lua @@ -3,6 +3,5 @@ F.ttp_station_display({ departure = {CFE_S="10;45", NX_S="02;45"}, station = "Personhood West", title = "PH West - Track 4", - interval = 30, display1 = "track4", }) \ No newline at end of file diff --git a/il_timetable/nodes/(1103,23,3027).lua b/il_timetable/nodes/(1103,23,3027).lua index 7c78acb..5d864f9 100644 --- a/il_timetable/nodes/(1103,23,3027).lua +++ b/il_timetable/nodes/(1103,23,3027).lua @@ -3,6 +3,5 @@ F.ttp_station_display({ departure = {CFE_S="10;45", NX_S="02;45"}, station = "Personhood West", title = "PH West - Track 4", - interval = 30, display1 = "track4", }) \ No newline at end of file diff --git a/il_timetable/nodes/(1109,19,3030).lua b/il_timetable/nodes/(1109,19,3030).lua new file mode 100644 index 0000000..0341996 --- /dev/null +++ b/il_timetable/nodes/(1109,19,3030).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Personhood West", + doorside = "R", +}) \ No newline at end of file diff --git a/il_timetable/nodes/(1111,23,1943).lua b/il_timetable/nodes/(1111,23,1943).lua new file mode 100644 index 0000000..10ca4f5 --- /dev/null +++ b/il_timetable/nodes/(1111,23,1943).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"CFE_N", "NX_N", "E1_N"}, + departure = {}, + station = "The Cube", + title = "The Cube (Track 3)", + interval = 15, + display1 = "display1", + display2 = "display2", +}) \ No newline at end of file diff --git a/il_timetable/nodes/(1112,23,3027).lua b/il_timetable/nodes/(1112,23,3027).lua new file mode 100644 index 0000000..7be357d --- /dev/null +++ b/il_timetable/nodes/(1112,23,3027).lua @@ -0,0 +1,6 @@ +F.ttp_station_display({ + lines = {"CFE_N", "NX_N"}, + station = "Personhood West", + title = "PH West - Track 3", + display1 = "track3", +}) \ No newline at end of file diff --git a/il_timetable/nodes/(133,11,873).lua b/il_timetable/nodes/(133,11,873).lua index 4f28e6b..3914838 100644 --- a/il_timetable/nodes/(133,11,873).lua +++ b/il_timetable/nodes/(133,11,873).lua @@ -1,4 +1,5 @@ F.ttp_stop({ stn = "Schwarzschild Street", doorside = "L", + no_disable_ars = true, }) \ No newline at end of file diff --git a/il_timetable/nodes/(142,8,164).lua b/il_timetable/nodes/(142,8,164).lua index acced81..09f6f9e 100644 --- a/il_timetable/nodes/(142,8,164).lua +++ b/il_timetable/nodes/(142,8,164).lua @@ -1 +1,10 @@ -atc_set_text_outside("[CFE] Warmoneaye\nvia Ehlodex, Personhood West, Crystal Farms") \ No newline at end of file +F.ttp_begin({ + stn = "Origin Berton Street", -- station name + tt = "CFE_N", -- timetable ID + depint = "05;00", --departure slot interval + depoff = "03;15", --departure slot offset + doorside = "L", + reverse = true, + only_lines = {['CFE'] = true}, + force_tt_reset = false, +}) \ No newline at end of file diff --git a/il_timetable/nodes/(1626,9,4628).lua b/il_timetable/nodes/(1626,9,4628).lua new file mode 100644 index 0000000..5635e0e --- /dev/null +++ b/il_timetable/nodes/(1626,9,4628).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Intercal", + doorside = "R", +}) \ No newline at end of file diff --git a/il_timetable/nodes/(1973,42,8383).lua b/il_timetable/nodes/(1973,42,8383).lua index 59c796b..1637b6a 100644 --- a/il_timetable/nodes/(1973,42,8383).lua +++ b/il_timetable/nodes/(1973,42,8383).lua @@ -1,5 +1,5 @@ F.ttp_station_display({ - lines = {"CFE_S", "NRG_W", "NRG_E"}, + lines = {"CFE_S", "CFE_N", "NRG_W", "NRG_E"}, departure = {}, station = "Azena Transirejo", title = "Azena Transirejo", diff --git a/il_timetable/nodes/(1984,3,6146).lua b/il_timetable/nodes/(1984,3,6146).lua new file mode 100644 index 0000000..438b60f --- /dev/null +++ b/il_timetable/nodes/(1984,3,6146).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Grootshad - X Nihilo", + doorside = "R", +}) \ No newline at end of file diff --git a/il_timetable/nodes/(1984,3,7957).lua b/il_timetable/nodes/(1984,3,7957).lua new file mode 100644 index 0000000..9e91259 --- /dev/null +++ b/il_timetable/nodes/(1984,3,7957).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Malvarma Akvo", + doorside = "R", +}) \ No newline at end of file diff --git a/il_timetable/nodes/(1987,3,7371).lua b/il_timetable/nodes/(1987,3,7371).lua new file mode 100644 index 0000000..61e267f --- /dev/null +++ b/il_timetable/nodes/(1987,3,7371).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Crystal Farms", + doorside = "R", +}) \ No newline at end of file diff --git a/il_timetable/nodes/(690,9,462).lua b/il_timetable/nodes/(690,9,462).lua new file mode 100644 index 0000000..9c09e05 --- /dev/null +++ b/il_timetable/nodes/(690,9,462).lua @@ -0,0 +1,5 @@ +F.ttp_stop({ + stn = "Perlin River", + doorside = "R", + end_of_tt = {NX_S=true} +}) \ No newline at end of file diff --git a/il_timetable/nodes/(693,9,484).lua b/il_timetable/nodes/(693,9,484).lua new file mode 100644 index 0000000..f784947 --- /dev/null +++ b/il_timetable/nodes/(693,9,484).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Perlin River", + doorside = "R", +}) \ No newline at end of file diff --git a/il_timetable/nodes/(851,14,775).lua b/il_timetable/nodes/(851,14,775).lua new file mode 100644 index 0000000..8fc2628 --- /dev/null +++ b/il_timetable/nodes/(851,14,775).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "EVO", + doorside = "L", +}) \ No newline at end of file diff --git a/il_timetable/nodes/(864,14,791).lua b/il_timetable/nodes/(864,14,791).lua new file mode 100644 index 0000000..8fc2628 --- /dev/null +++ b/il_timetable/nodes/(864,14,791).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "EVO", + doorside = "L", +}) \ No newline at end of file diff --git a/il_timetable/nodes/(981,15,1041).lua b/il_timetable/nodes/(981,15,1041).lua index fc2d491..d88ec3f 100644 --- a/il_timetable/nodes/(981,15,1041).lua +++ b/il_timetable/nodes/(981,15,1041).lua @@ -1,9 +1,8 @@ F.ttp_station_display({ - lines = {"S12_S", "S12_N", "E1_S", "E1_N", "CFE_S", "NX_S"}, + lines = {"S12_S", "S12_N", "E1_S", "E1_N", "CFE_S", "CFE_N", "NX_S", "NX_N"}, departure = {}, station = "Ehlodex", title = "Ehlodex", - interval = 15, display1 = "d1", display2 = "d2", }) \ No newline at end of file diff --git a/il_timetable/nodes/(981,21,1053).lua b/il_timetable/nodes/(981,21,1053).lua new file mode 100644 index 0000000..567de55 --- /dev/null +++ b/il_timetable/nodes/(981,21,1053).lua @@ -0,0 +1,6 @@ + +lines = F.ttp_info_times("CFE_N", "00;00") +linestr = F.ttp_info_trains("CFE_N", "00;00") +local li = lines +for i=1,#linestr do li[#li+1] = linestr[i] end +print(" CFE\n"..table.concat(li, "\n")) diff --git a/il_timetable/nodes/(982,21,1053).lua b/il_timetable/nodes/(982,21,1053).lua new file mode 100644 index 0000000..4f6e3d8 --- /dev/null +++ b/il_timetable/nodes/(982,21,1053).lua @@ -0,0 +1,5 @@ +lines = F.ttp_info_times("NX_N", "00;00") +linestr = F.ttp_info_trains("NX_N", "00;00") +li = lines +for i=1,#linestr do li[#li+1] = linestr[i] end +print(" NX\n"..table.concat(li, "\n")) \ No newline at end of file diff --git a/il_timetable/nodes/(992,14,1023).lua b/il_timetable/nodes/(992,14,1023).lua index d37615d..5e0be27 100644 --- a/il_timetable/nodes/(992,14,1023).lua +++ b/il_timetable/nodes/(992,14,1023).lua @@ -1,5 +1,4 @@ F.ttp_stop({ stn = "Ehlodex", doorside = "R", - end_of_tt = {NX_S=true, CFE_S=true} }) \ No newline at end of file diff --git a/il_timetable/nodes/(995,14,1043).lua b/il_timetable/nodes/(995,14,1043).lua new file mode 100644 index 0000000..5e0be27 --- /dev/null +++ b/il_timetable/nodes/(995,14,1043).lua @@ -0,0 +1,4 @@ +F.ttp_stop({ + stn = "Ehlodex", + doorside = "R", +}) \ No newline at end of file -- cgit v1.2.3