diff options
1001 files changed, 3095 insertions, 4704 deletions
diff --git a/Crossroads/nodes/(-1902,2,698).lua b/Crossroads/nodes/(-1902,2,698).lua deleted file mode 100644 index e69de29..0000000 --- a/Crossroads/nodes/(-1902,2,698).lua +++ /dev/null diff --git a/Crossroads/nodes/(-1908,2,706).lua b/Crossroads/nodes/(-1908,2,706).lua deleted file mode 100644 index e69de29..0000000 --- a/Crossroads/nodes/(-1908,2,706).lua +++ /dev/null diff --git a/Crossroads/nodes/(-5301,13,-2560).lua b/Crossroads/nodes/(-5301,13,-2560).lua deleted file mode 100644 index e69de29..0000000 --- a/Crossroads/nodes/(-5301,13,-2560).lua +++ /dev/null diff --git a/Crossroads/nodes/(-5314,13,-2568).lua b/Crossroads/nodes/(-5314,13,-2568).lua deleted file mode 100644 index e69de29..0000000 --- a/Crossroads/nodes/(-5314,13,-2568).lua +++ /dev/null diff --git a/Crossroads/nodes/(1083,19,3028).lua b/Crossroads/nodes/(1083,19,3028).lua deleted file mode 100644 index 20ba94c..0000000 --- a/Crossroads/nodes/(1083,19,3028).lua +++ /dev/null @@ -1,5 +0,0 @@ -if event.train then - if not atc_arrow then return end - atc_set_text_outside("ATL Bronze Line - Crossroads City Hall") - set_line("AB") -end
\ No newline at end of file diff --git a/Crossroads/nodes/(1100,16,1967).lua b/Crossroads/nodes/(1100,16,1967).lua deleted file mode 100644 index 194c3d9..0000000 --- a/Crossroads/nodes/(1100,16,1967).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("thecube","1","L")
\ No newline at end of file diff --git a/Crossroads/nodes/(1112,10,2639).lua b/Crossroads/nodes/(1112,10,2639).lua deleted file mode 100644 index 40d327a..0000000 --- a/Crossroads/nodes/(1112,10,2639).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("phsc","N","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1117,16,1959).lua b/Crossroads/nodes/(1117,16,1959).lua deleted file mode 100644 index 29aeb3f..0000000 --- a/Crossroads/nodes/(1117,16,1959).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("thecube","4","L")
\ No newline at end of file diff --git a/Crossroads/nodes/(1119,16,2760).lua b/Crossroads/nodes/(1119,16,2760).lua deleted file mode 100644 index dde01ed..0000000 --- a/Crossroads/nodes/(1119,16,2760).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("grsc", "3", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1122,16,2768).lua b/Crossroads/nodes/(1122,16,2768).lua deleted file mode 100644 index 27a6f78..0000000 --- a/Crossroads/nodes/(1122,16,2768).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("grsc", "4", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1122,16,2771).lua b/Crossroads/nodes/(1122,16,2771).lua deleted file mode 100644 index 27a6f78..0000000 --- a/Crossroads/nodes/(1122,16,2771).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("grsc", "4", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1122,19,3014).lua b/Crossroads/nodes/(1122,19,3014).lua deleted file mode 100644 index da8687d..0000000 --- a/Crossroads/nodes/(1122,19,3014).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("phwest", "1", "R", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1187,-6,996).lua b/Crossroads/nodes/(1187,-6,996).lua deleted file mode 100644 index 5c86126..0000000 --- a/Crossroads/nodes/(1187,-6,996).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("scc", "S2", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1201,-6,1087).lua b/Crossroads/nodes/(1201,-6,1087).lua deleted file mode 100644 index e0c8632..0000000 --- a/Crossroads/nodes/(1201,-6,1087).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("scn","N2","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1201,-6,999).lua b/Crossroads/nodes/(1201,-6,999).lua deleted file mode 100644 index 855f755..0000000 --- a/Crossroads/nodes/(1201,-6,999).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("scc", "N2", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1224,12,1555).lua b/Crossroads/nodes/(1224,12,1555).lua deleted file mode 100644 index 6577986..0000000 --- a/Crossroads/nodes/(1224,12,1555).lua +++ /dev/null @@ -1 +0,0 @@ -F.disp2gen("cg")
\ No newline at end of file diff --git a/Crossroads/nodes/(1227,12,1541).lua b/Crossroads/nodes/(1227,12,1541).lua deleted file mode 100644 index 6577986..0000000 --- a/Crossroads/nodes/(1227,12,1541).lua +++ /dev/null @@ -1 +0,0 @@ -F.disp2gen("cg")
\ No newline at end of file diff --git a/Crossroads/nodes/(1288,9,1545).lua b/Crossroads/nodes/(1288,9,1545).lua deleted file mode 100644 index f0f7da4..0000000 --- a/Crossroads/nodes/(1288,9,1545).lua +++ /dev/null @@ -1,4 +0,0 @@ -if event.train and atc_arrow then - atc_send("B8S8") - atc_set_text_inside("Next station:\nColored Grasses") -end
\ No newline at end of file diff --git a/Crossroads/nodes/(1350,11,1371).lua b/Crossroads/nodes/(1350,11,1371).lua deleted file mode 100644 index 657ef63..0000000 --- a/Crossroads/nodes/(1350,11,1371).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("oc","S","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1352,11,1389).lua b/Crossroads/nodes/(1352,11,1389).lua deleted file mode 100644 index 0b10a66..0000000 --- a/Crossroads/nodes/(1352,11,1389).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("oc", "N", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1359,11,1380).lua b/Crossroads/nodes/(1359,11,1380).lua deleted file mode 100644 index 011abe3..0000000 --- a/Crossroads/nodes/(1359,11,1380).lua +++ /dev/null @@ -1 +0,0 @@ -F.ods('AGSoc', 'R', true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1361,11,1379).lua b/Crossroads/nodes/(1361,11,1379).lua deleted file mode 100644 index 9781ffe..0000000 --- a/Crossroads/nodes/(1361,11,1379).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSoc AGNocoutskirts')
\ No newline at end of file diff --git a/Crossroads/nodes/(1361,11,1380).lua b/Crossroads/nodes/(1361,11,1380).lua deleted file mode 100644 index cc40968..0000000 --- a/Crossroads/nodes/(1361,11,1380).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSoc AGNnvboutskirts')
\ No newline at end of file diff --git a/Crossroads/nodes/(1361,11,1381).lua b/Crossroads/nodes/(1361,11,1381).lua deleted file mode 100644 index 3147e24..0000000 --- a/Crossroads/nodes/(1361,11,1381).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSoc AGNmushroom')
\ No newline at end of file diff --git a/Crossroads/nodes/(1361,11,1382).lua b/Crossroads/nodes/(1361,11,1382).lua deleted file mode 100644 index e5316eb..0000000 --- a/Crossroads/nodes/(1361,11,1382).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSoc AGNnvbold')
\ No newline at end of file diff --git a/Crossroads/nodes/(1361,11,1383).lua b/Crossroads/nodes/(1361,11,1383).lua deleted file mode 100644 index d3fe189..0000000 --- a/Crossroads/nodes/(1361,11,1383).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSoc AGNnvbcentral')
\ No newline at end of file diff --git a/Crossroads/nodes/(1386,20,1722).lua b/Crossroads/nodes/(1386,20,1722).lua deleted file mode 100644 index eda2ff4..0000000 --- a/Crossroads/nodes/(1386,20,1722).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'RAGSmushroom AGNnvbcentral')
\ No newline at end of file diff --git a/Crossroads/nodes/(1387,20,1723).lua b/Crossroads/nodes/(1387,20,1723).lua deleted file mode 100644 index b7c5917..0000000 --- a/Crossroads/nodes/(1387,20,1723).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'RAGSmushroom AGNnvbold')
\ No newline at end of file diff --git a/Crossroads/nodes/(1388,-9,1321).lua b/Crossroads/nodes/(1388,-9,1321).lua deleted file mode 100644 index 64642da..0000000 --- a/Crossroads/nodes/(1388,-9,1321).lua +++ /dev/null @@ -1 +0,0 @@ -F.hst("ocmushroom","occh","L",8,nil,"2")
\ No newline at end of file diff --git a/Crossroads/nodes/(1388,-9,1373).lua b/Crossroads/nodes/(1388,-9,1373).lua deleted file mode 100644 index c53d4a6..0000000 --- a/Crossroads/nodes/(1388,-9,1373).lua +++ /dev/null @@ -1 +0,0 @@ -F.hst("occh","occrt","R",8,nil,"2")
\ No newline at end of file diff --git a/Crossroads/nodes/(1388,5,1964).lua b/Crossroads/nodes/(1388,5,1964).lua deleted file mode 100644 index b7047c9..0000000 --- a/Crossroads/nodes/(1388,5,1964).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSnvbcentral RAGSoc')
\ No newline at end of file diff --git a/Crossroads/nodes/(1388,5,1965).lua b/Crossroads/nodes/(1388,5,1965).lua deleted file mode 100644 index 86a7837..0000000 --- a/Crossroads/nodes/(1388,5,1965).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSnvbcentral RAGSocoutskirts')
\ No newline at end of file diff --git a/Crossroads/nodes/(1388,5,1966).lua b/Crossroads/nodes/(1388,5,1966).lua deleted file mode 100644 index 1c72cf4..0000000 --- a/Crossroads/nodes/(1388,5,1966).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSnvbcentral RAGSnvboutskirts')
\ No newline at end of file diff --git a/Crossroads/nodes/(1388,5,1977).lua b/Crossroads/nodes/(1388,5,1977).lua deleted file mode 100644 index f7366dc..0000000 --- a/Crossroads/nodes/(1388,5,1977).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSnvbcentral RAGSmushroom')
\ No newline at end of file diff --git a/Crossroads/nodes/(1388,5,1978).lua b/Crossroads/nodes/(1388,5,1978).lua deleted file mode 100644 index 79fa15f..0000000 --- a/Crossroads/nodes/(1388,5,1978).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSnvbcentral RAGSnvbold')
\ No newline at end of file diff --git a/Crossroads/nodes/(1389,20,1723).lua b/Crossroads/nodes/(1389,20,1723).lua deleted file mode 100644 index 76ebd7a..0000000 --- a/Crossroads/nodes/(1389,20,1723).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSmushroom RAGSnvboutskirts')
\ No newline at end of file diff --git a/Crossroads/nodes/(1390,20,1723).lua b/Crossroads/nodes/(1390,20,1723).lua deleted file mode 100644 index 72d77e0..0000000 --- a/Crossroads/nodes/(1390,20,1723).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSmushroom RAGSocoutskirts')
\ No newline at end of file diff --git a/Crossroads/nodes/(1391,20,1723).lua b/Crossroads/nodes/(1391,20,1723).lua deleted file mode 100644 index 166001f..0000000 --- a/Crossroads/nodes/(1391,20,1723).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSmushroom AGSoc')
\ No newline at end of file diff --git a/Crossroads/nodes/(1393,19,1619).lua b/Crossroads/nodes/(1393,19,1619).lua deleted file mode 100644 index 02e416b..0000000 --- a/Crossroads/nodes/(1393,19,1619).lua +++ /dev/null @@ -1 +0,0 @@ -F.timing(125,F.depint["AG"],"nvboutskirts", "ocoutskirts", "R", "M", nil, "S")
\ No newline at end of file diff --git a/Crossroads/nodes/(1393,19,1709).lua b/Crossroads/nodes/(1393,19,1709).lua deleted file mode 100644 index 4eaa76f..0000000 --- a/Crossroads/nodes/(1393,19,1709).lua +++ /dev/null @@ -1 +0,0 @@ -F.timing(85, F.depint["AG"], "mushroom", "nvboutskirts", "R", "M", nil, "S")
\ No newline at end of file diff --git a/Crossroads/nodes/(1393,19,1820).lua b/Crossroads/nodes/(1393,19,1820).lua deleted file mode 100644 index fada4e2..0000000 --- a/Crossroads/nodes/(1393,19,1820).lua +++ /dev/null @@ -1 +0,0 @@ -F.timing(50,F.depint["AG"],"nvbold","mushroom","L","M",nil,"S")
\ No newline at end of file diff --git a/Crossroads/nodes/(1393,4,1965).lua b/Crossroads/nodes/(1393,4,1965).lua deleted file mode 100644 index 0f6692c..0000000 --- a/Crossroads/nodes/(1393,4,1965).lua +++ /dev/null @@ -1 +0,0 @@ -F.timing(0, F.depint["AG"], "nvbcentral", "nvbold", "R", "M", "ATL Gold Line - Ocean City","GS")
\ No newline at end of file diff --git a/Crossroads/nodes/(1393,8,1489).lua b/Crossroads/nodes/(1393,8,1489).lua deleted file mode 100644 index 2c08535..0000000 --- a/Crossroads/nodes/(1393,8,1489).lua +++ /dev/null @@ -1 +0,0 @@ -F.timing(165,F.depint["AG"],"ocoutskirts","oc","R","M",nil,"S")
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,19,1623).lua b/Crossroads/nodes/(1395,19,1623).lua deleted file mode 100644 index f544a1c..0000000 --- a/Crossroads/nodes/(1395,19,1623).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSnvboutskirts AGSoc')
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,19,1624).lua b/Crossroads/nodes/(1395,19,1624).lua deleted file mode 100644 index a00da3f..0000000 --- a/Crossroads/nodes/(1395,19,1624).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSnvboutskirts RAGSocoutskirts')
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,19,1626).lua b/Crossroads/nodes/(1395,19,1626).lua deleted file mode 100644 index cce6686..0000000 --- a/Crossroads/nodes/(1395,19,1626).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'RAGSnvboutskirts AGNmushroom')
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,19,1627).lua b/Crossroads/nodes/(1395,19,1627).lua deleted file mode 100644 index 3aa49a2..0000000 --- a/Crossroads/nodes/(1395,19,1627).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'RAGSnvboutskirts AGNnvbold')
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,19,1628).lua b/Crossroads/nodes/(1395,19,1628).lua deleted file mode 100644 index 17e262c..0000000 --- a/Crossroads/nodes/(1395,19,1628).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'RAGSnvboutskirts AGNnvbcentral')
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,21,1829).lua b/Crossroads/nodes/(1395,21,1829).lua deleted file mode 100644 index 93cd05a..0000000 --- a/Crossroads/nodes/(1395,21,1829).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSnvbold RAGSnvboutskirts')
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,22,1829).lua b/Crossroads/nodes/(1395,22,1829).lua deleted file mode 100644 index 5d674ea..0000000 --- a/Crossroads/nodes/(1395,22,1829).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG','AGSnvbold RAGSocoutskirts')
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,23,1829).lua b/Crossroads/nodes/(1395,23,1829).lua deleted file mode 100644 index 3f7a3fc..0000000 --- a/Crossroads/nodes/(1395,23,1829).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSnvbold AGSoc')
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,8,1492).lua b/Crossroads/nodes/(1395,8,1492).lua deleted file mode 100644 index 171aba5..0000000 --- a/Crossroads/nodes/(1395,8,1492).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSocoutskirts AGSoc')
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,8,1494).lua b/Crossroads/nodes/(1395,8,1494).lua deleted file mode 100644 index dac0c0f..0000000 --- a/Crossroads/nodes/(1395,8,1494).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'RAGSocoutskirts AGNnvboutskirts')
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,8,1495).lua b/Crossroads/nodes/(1395,8,1495).lua deleted file mode 100644 index 4fe61eb..0000000 --- a/Crossroads/nodes/(1395,8,1495).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'RAGSocoutskirts AGNmushroom')
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,8,1496).lua b/Crossroads/nodes/(1395,8,1496).lua deleted file mode 100644 index 69d1cc4..0000000 --- a/Crossroads/nodes/(1395,8,1496).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'RAGSocoutskirts AGNnvbold')
\ No newline at end of file diff --git a/Crossroads/nodes/(1395,8,1497).lua b/Crossroads/nodes/(1395,8,1497).lua deleted file mode 100644 index b7f16f1..0000000 --- a/Crossroads/nodes/(1395,8,1497).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'RAGSocoutskirts AGNnvbcentral')
\ No newline at end of file diff --git a/Crossroads/nodes/(1397,19,1630).lua b/Crossroads/nodes/(1397,19,1630).lua deleted file mode 100644 index d343142..0000000 --- a/Crossroads/nodes/(1397,19,1630).lua +++ /dev/null @@ -1 +0,0 @@ -F.timing(305,F.depint["AG"],"nvboutskirts", "mushroom", "R", "M", nil, "N")
\ No newline at end of file diff --git a/Crossroads/nodes/(1397,19,1720).lua b/Crossroads/nodes/(1397,19,1720).lua deleted file mode 100644 index 85d220d..0000000 --- a/Crossroads/nodes/(1397,19,1720).lua +++ /dev/null @@ -1 +0,0 @@ -F.timing(345,F.depint["AG"],"mushroom","nvbold","R","M",nil,"N")
\ No newline at end of file diff --git a/Crossroads/nodes/(1397,4,1977).lua b/Crossroads/nodes/(1397,4,1977).lua deleted file mode 100644 index d42c671..0000000 --- a/Crossroads/nodes/(1397,4,1977).lua +++ /dev/null @@ -1 +0,0 @@ -F.bhf("nvbcentral","nvbcentral","R","8","ATL Gold Line - Ocean City","N")
\ No newline at end of file diff --git a/Crossroads/nodes/(1397,8,1501).lua b/Crossroads/nodes/(1397,8,1501).lua deleted file mode 100644 index 58832a9..0000000 --- a/Crossroads/nodes/(1397,8,1501).lua +++ /dev/null @@ -1 +0,0 @@ -F.timing(265,F.depint["AG"],"ocoutskirts","nvboutskirts","R","M", nil, "N")
\ No newline at end of file diff --git a/Crossroads/nodes/(1400,21,1829).lua b/Crossroads/nodes/(1400,21,1829).lua deleted file mode 100644 index 51f80da..0000000 --- a/Crossroads/nodes/(1400,21,1829).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG','RAGSnvbold AGNnvbcentral')
\ No newline at end of file diff --git a/Crossroads/nodes/(1400,21,819).lua b/Crossroads/nodes/(1400,21,819).lua deleted file mode 100644 index 97c3d17..0000000 --- a/Crossroads/nodes/(1400,21,819).lua +++ /dev/null @@ -1 +0,0 @@ --- F.bhf("crwm","scs","L","M",nil,"FW")
\ No newline at end of file diff --git a/Crossroads/nodes/(1400,22,1829).lua b/Crossroads/nodes/(1400,22,1829).lua deleted file mode 100644 index caac89e..0000000 --- a/Crossroads/nodes/(1400,22,1829).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc('AG', 'AGSnvbold RAGSmushroom')
\ No newline at end of file diff --git a/Crossroads/nodes/(1402,19,1820).lua b/Crossroads/nodes/(1402,19,1820).lua deleted file mode 100644 index 6569ce9..0000000 --- a/Crossroads/nodes/(1402,19,1820).lua +++ /dev/null @@ -1 +0,0 @@ -F.timing(385, F.depint["AG"], "nvbold", "nvbcentral", "L", "M", nil, "N")
\ No newline at end of file diff --git a/Crossroads/nodes/(1419,26,819).lua b/Crossroads/nodes/(1419,26,819).lua deleted file mode 100644 index e3c0adf..0000000 --- a/Crossroads/nodes/(1419,26,819).lua +++ /dev/null @@ -1 +0,0 @@ -F.bhf("crwm","crch","R","M",nil,"1")
\ No newline at end of file diff --git a/Crossroads/nodes/(1453,6,7980).lua b/Crossroads/nodes/(1453,6,7980).lua deleted file mode 100644 index 6d0d5e1..0000000 --- a/Crossroads/nodes/(1453,6,7980).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("NRG-yard", "W", "R", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1538,6,7946).lua b/Crossroads/nodes/(1538,6,7946).lua deleted file mode 100644 index f4d3045..0000000 --- a/Crossroads/nodes/(1538,6,7946).lua +++ /dev/null @@ -1 +0,0 @@ -F.ax_on {NRG_1 = 1}
\ No newline at end of file diff --git a/Crossroads/nodes/(1601,5,1992).lua b/Crossroads/nodes/(1601,5,1992).lua deleted file mode 100644 index 4cb1cb8..0000000 --- a/Crossroads/nodes/(1601,5,1992).lua +++ /dev/null @@ -1,9 +0,0 @@ --- -local interval = 900 -- Interval in seconds -local offset = interval/2 -- Offset for the timing system -if event.type == "train" then - if atc_arrow then - interrupt_time = (offset-os.time())%interval - atc_send(string.format("BBWD%dRSM",interrupt_time)) - end -end
\ No newline at end of file diff --git a/Crossroads/nodes/(1610,6,7943).lua b/Crossroads/nodes/(1610,6,7943).lua deleted file mode 100644 index 11efa6f..0000000 --- a/Crossroads/nodes/(1610,6,7943).lua +++ /dev/null @@ -1 +0,0 @@ -F.x_on{NRG_4 = 1, NRG_5 = 1}
\ No newline at end of file diff --git a/Crossroads/nodes/(1611,6,7941).lua b/Crossroads/nodes/(1611,6,7941).lua deleted file mode 100644 index 11efa6f..0000000 --- a/Crossroads/nodes/(1611,6,7941).lua +++ /dev/null @@ -1 +0,0 @@ -F.x_on{NRG_4 = 1, NRG_5 = 1}
\ No newline at end of file diff --git a/Crossroads/nodes/(1612,6,7941).lua b/Crossroads/nodes/(1612,6,7941).lua deleted file mode 100644 index 9e8bcab..0000000 --- a/Crossroads/nodes/(1612,6,7941).lua +++ /dev/null @@ -1 +0,0 @@ -F.x_on{NRG_3 = 1}
\ No newline at end of file diff --git a/Crossroads/nodes/(1612,6,7942).lua b/Crossroads/nodes/(1612,6,7942).lua deleted file mode 100644 index 56bd0a1..0000000 --- a/Crossroads/nodes/(1612,6,7942).lua +++ /dev/null @@ -1 +0,0 @@ -F.x_on {NRG_3 = 1}
\ No newline at end of file diff --git a/Crossroads/nodes/(1623,6,7925).lua b/Crossroads/nodes/(1623,6,7925).lua deleted file mode 100644 index 5ba5cb2..0000000 --- a/Crossroads/nodes/(1623,6,7925).lua +++ /dev/null @@ -1 +0,0 @@ -F.x_off{NRG_3 = 1}
\ No newline at end of file diff --git a/Crossroads/nodes/(1670,18,8231).lua b/Crossroads/nodes/(1670,18,8231).lua deleted file mode 100644 index 8e9d36c..0000000 --- a/Crossroads/nodes/(1670,18,8231).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("NRG-pek", "E", "L", true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1673,20,985).lua b/Crossroads/nodes/(1673,20,985).lua deleted file mode 100644 index 20d4674..0000000 --- a/Crossroads/nodes/(1673,20,985).lua +++ /dev/null @@ -1 +0,0 @@ -F.stnbasic("crsmacker", "L", (30-os.date().sec)%30, false, "M", "CRT 1 - Counterclockwise Route", false, nil, nil, "cras", "2")
\ No newline at end of file diff --git a/Crossroads/nodes/(1675,20,985).lua b/Crossroads/nodes/(1675,20,985).lua deleted file mode 100644 index 3f91691..0000000 --- a/Crossroads/nodes/(1675,20,985).lua +++ /dev/null @@ -1 +0,0 @@ -F.ods('1Wcrsmacker','L',true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1682,20,971).lua b/Crossroads/nodes/(1682,20,971).lua deleted file mode 100644 index 048d9f3..0000000 --- a/Crossroads/nodes/(1682,20,971).lua +++ /dev/null @@ -1 +0,0 @@ -F.stnbasic("crsmacker", "L", (27-os.date().sec)%30+5, false, "M", "CRT 1 - Clockwise Route", false, nil, nil, "crch", "1")
\ No newline at end of file diff --git a/Crossroads/nodes/(1702,12,914).lua b/Crossroads/nodes/(1702,12,914).lua deleted file mode 100644 index 4ce5b54..0000000 --- a/Crossroads/nodes/(1702,12,914).lua +++ /dev/null @@ -1,2 +0,0 @@ ---F.hst("cras","crsmacker","L","M",nil,"1") -atc_send("SM")
\ No newline at end of file diff --git a/Crossroads/nodes/(1702,5,906).lua b/Crossroads/nodes/(1702,5,906).lua deleted file mode 100644 index 03259d6..0000000 --- a/Crossroads/nodes/(1702,5,906).lua +++ /dev/null @@ -1,6 +0,0 @@ -__approach_callback_mode = 1 -if event.type == "approach" then - atc_set_lzb_tsr(2) -elseif event.type == "train" then - atc_send("B2") -end
\ No newline at end of file diff --git a/Crossroads/nodes/(1703,10,781).lua b/Crossroads/nodes/(1703,10,781).lua deleted file mode 100644 index 1bb93e8..0000000 --- a/Crossroads/nodes/(1703,10,781).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crsfterm", "4S", "L", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1709,10,781).lua b/Crossroads/nodes/(1709,10,781).lua deleted file mode 100644 index b7b00f7..0000000 --- a/Crossroads/nodes/(1709,10,781).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crsfterm", "3S", "R", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1709,17,914).lua b/Crossroads/nodes/(1709,17,914).lua deleted file mode 100644 index 4b17b62..0000000 --- a/Crossroads/nodes/(1709,17,914).lua +++ /dev/null @@ -1,2 +0,0 @@ ---F.hst("cras","crchs","R","M",nil,"2") -atc_send("SM")
\ No newline at end of file diff --git a/Crossroads/nodes/(1714,5,912).lua b/Crossroads/nodes/(1714,5,912).lua deleted file mode 100644 index f9e2be2..0000000 --- a/Crossroads/nodes/(1714,5,912).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen ("cras", "N", "R", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1717,10,781).lua b/Crossroads/nodes/(1717,10,781).lua deleted file mode 100644 index 723ad70..0000000 --- a/Crossroads/nodes/(1717,10,781).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crsfterm", "2S", "L", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1720,15,995).lua b/Crossroads/nodes/(1720,15,995).lua deleted file mode 100644 index 1d2fbf8..0000000 --- a/Crossroads/nodes/(1720,15,995).lua +++ /dev/null @@ -1 +0,0 @@ --- Obsolete: the track at the station should change the display
\ No newline at end of file diff --git a/Crossroads/nodes/(1723,10,781).lua b/Crossroads/nodes/(1723,10,781).lua deleted file mode 100644 index 889bdc3..0000000 --- a/Crossroads/nodes/(1723,10,781).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crsfterm", "1S", "R", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1738,-1,990).lua b/Crossroads/nodes/(1738,-1,990).lua deleted file mode 100644 index a20d76a..0000000 --- a/Crossroads/nodes/(1738,-1,990).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen ("crch", "U1", "L")
\ No newline at end of file diff --git a/Crossroads/nodes/(1741,-1,1020).lua b/Crossroads/nodes/(1741,-1,1020).lua deleted file mode 100644 index 479b44d..0000000 --- a/Crossroads/nodes/(1741,-1,1020).lua +++ /dev/null @@ -1 +0,0 @@ -F.odd("CRT2")
\ No newline at end of file diff --git a/Crossroads/nodes/(1746,12,914).lua b/Crossroads/nodes/(1746,12,914).lua deleted file mode 100644 index 4a5be7d..0000000 --- a/Crossroads/nodes/(1746,12,914).lua +++ /dev/null @@ -1 +0,0 @@ -F.hst("crchs","cras","R",8,nil,"1")
\ No newline at end of file diff --git a/Crossroads/nodes/(1746,17,987).lua b/Crossroads/nodes/(1746,17,987).lua deleted file mode 100644 index 819ca25..0000000 --- a/Crossroads/nodes/(1746,17,987).lua +++ /dev/null @@ -1 +0,0 @@ -F.hst("crch","crsmacker","L","M",nil,"R2")
\ No newline at end of file diff --git a/Crossroads/nodes/(1753,12,988).lua b/Crossroads/nodes/(1753,12,988).lua deleted file mode 100644 index c3dce37..0000000 --- a/Crossroads/nodes/(1753,12,988).lua +++ /dev/null @@ -1 +0,0 @@ -F.hst("crch","crchs","R","M",nil,"R1")
\ No newline at end of file diff --git a/Crossroads/nodes/(1753,17,917).lua b/Crossroads/nodes/(1753,17,917).lua deleted file mode 100644 index 4e4f080..0000000 --- a/Crossroads/nodes/(1753,17,917).lua +++ /dev/null @@ -1 +0,0 @@ -F.hst("crchs","crch","L","M",nil,"1")
\ No newline at end of file diff --git a/Crossroads/nodes/(1755,27,942).lua b/Crossroads/nodes/(1755,27,942).lua deleted file mode 100644 index f8ddd3f..0000000 --- a/Crossroads/nodes/(1755,27,942).lua +++ /dev/null @@ -1,3 +0,0 @@ -if event.type == "digiline" and event.channel == "upd" then - digiline_send("upd_main","") -end
\ No newline at end of file diff --git a/Crossroads/nodes/(1755,27,943).lua b/Crossroads/nodes/(1755,27,943).lua deleted file mode 100644 index 227e164..0000000 --- a/Crossroads/nodes/(1755,27,943).lua +++ /dev/null @@ -1,40 +0,0 @@ -local head = { "V TRAIN LINE STATION ", " " } -local length = 18 -local sformat = string.format - -if event.type=="digiline" or event.type=="punch" then - if event.channel=="upd_main" or event.type=="punch" then - local table = table - local start_t = os.clock() - if not S.lagrec then S.lagrec = {} end - local la = {} - local lb = {} - local i - local counter=0 - local ids = {} - for i in pairs(S.trains) do ids[#ids+1] = i end - table.sort(ids) - for id = 1, #ids, 1 do - local st = (S.trains[ids[id] or 0] or "") - i = (counter-counter%7)/7*2+((counter%7<3) and 1 or 2) - if not la[i] then la[i] = (i%2==0) and {} or {head[1]} end - if not lb[i] then lb[i] = (i%2==0) and {} or {head[2]} end - local n = sformat("[%s] %s", st.t or "?", F.stnlist[st.s] or st.s) - la[i][#la[i]+1] = sformat("%02d %06d %-7s %s", st.v, ids[id], st.l, n) - lb[i][#lb[i]+1] = (n:len() < 10 and " " or n:sub(10)) - counter = counter + 1 - end - for i=1,#la,1 do - digiline_send("d"..tostring(i).."a", table.concat(la[i] or {" "," "},"\n")) - digiline_send("d"..tostring(i).."b", table.concat(lb[i] or {" "," "},"\n")) - end - local end_t = os.clock() - S.lagrec[#S.lagrec+1] = end_t - start_t - table.sort(S.lagrec) - local lagavg = 0 - for i = 1, #S.lagrec, 1 do lagavg = lagavg + S.lagrec[i] end - lagavg = lagavg / #S.lagrec - digiline_send("lag1", sformat("DEBUG\nTRAINS: %d\nTS: %d", counter, os.time())) - digiline_send("lag2", sformat("CUR %f\nMIN %f\nMAX %f\nAVG %f", end_t - start_t, S.lagrec[1], S.lagrec[#S.lagrec], lagavg)) - end -end
\ No newline at end of file diff --git a/Crossroads/nodes/(1758,-1,998).lua b/Crossroads/nodes/(1758,-1,998).lua deleted file mode 100644 index 4116d94..0000000 --- a/Crossroads/nodes/(1758,-1,998).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen ("crch", "U2", "L")
\ No newline at end of file diff --git a/Crossroads/nodes/(1767,27,946).lua b/Crossroads/nodes/(1767,27,946).lua deleted file mode 100644 index f30bb31..0000000 --- a/Crossroads/nodes/(1767,27,946).lua +++ /dev/null @@ -1,2 +0,0 @@ -S.trains = {} -S.lagrec = {}
\ No newline at end of file diff --git a/Crossroads/nodes/(1768,10,598).lua b/Crossroads/nodes/(1768,10,598).lua deleted file mode 100644 index 0c03cf2..0000000 --- a/Crossroads/nodes/(1768,10,598).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_8_1","W","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1769,10,652).lua b/Crossroads/nodes/(1769,10,652).lua deleted file mode 100644 index 4f300b4..0000000 --- a/Crossroads/nodes/(1769,10,652).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_7_1","W","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1771,10,595).lua b/Crossroads/nodes/(1771,10,595).lua deleted file mode 100644 index b7c3277..0000000 --- a/Crossroads/nodes/(1771,10,595).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_8_1","E","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1772,10,649).lua b/Crossroads/nodes/(1772,10,649).lua deleted file mode 100644 index 9582a24..0000000 --- a/Crossroads/nodes/(1772,10,649).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_7_1","E","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1772,10,703).lua b/Crossroads/nodes/(1772,10,703).lua deleted file mode 100644 index 4098a4c..0000000 --- a/Crossroads/nodes/(1772,10,703).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_6_1","E","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1772,10,757).lua b/Crossroads/nodes/(1772,10,757).lua deleted file mode 100644 index eee2333..0000000 --- a/Crossroads/nodes/(1772,10,757).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_5_1","E","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1773,5,994).lua b/Crossroads/nodes/(1773,5,994).lua deleted file mode 100644 index b65a919..0000000 --- a/Crossroads/nodes/(1773,5,994).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen ("crch", "A1", "R", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1777,5,912).lua b/Crossroads/nodes/(1777,5,912).lua deleted file mode 100644 index 03a63bd..0000000 --- a/Crossroads/nodes/(1777,5,912).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen ("crchs", "E", "L")
\ No newline at end of file diff --git a/Crossroads/nodes/(1786,5,994).lua b/Crossroads/nodes/(1786,5,994).lua deleted file mode 100644 index e701f62..0000000 --- a/Crossroads/nodes/(1786,5,994).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crch", "A1", "R", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1787,-1,1020).lua b/Crossroads/nodes/(1787,-1,1020).lua deleted file mode 100644 index 56956f8..0000000 --- a/Crossroads/nodes/(1787,-1,1020).lua +++ /dev/null @@ -1 +0,0 @@ -F.ods("CRT2Ecrch")
\ No newline at end of file diff --git a/Crossroads/nodes/(1789,20,995).lua b/Crossroads/nodes/(1789,20,995).lua deleted file mode 100644 index de7fd7b..0000000 --- a/Crossroads/nodes/(1789,20,995).lua +++ /dev/null @@ -1 +0,0 @@ -F.ods('1Wcrchn','L')
\ No newline at end of file diff --git a/Crossroads/nodes/(1790,-1,1020).lua b/Crossroads/nodes/(1790,-1,1020).lua deleted file mode 100644 index 586acca..0000000 --- a/Crossroads/nodes/(1790,-1,1020).lua +++ /dev/null @@ -1 +0,0 @@ -F.ods("CRT2Wcrch","L")
\ No newline at end of file diff --git a/Crossroads/nodes/(1790,5,1020).lua b/Crossroads/nodes/(1790,5,1020).lua deleted file mode 100644 index b7a24f0..0000000 --- a/Crossroads/nodes/(1790,5,1020).lua +++ /dev/null @@ -1 +0,0 @@ -F.kbhf("crrathaus","crbfsw","L","M","CRT2 - Crossroads North","5")
\ No newline at end of file diff --git a/Crossroads/nodes/(1791,20,995).lua b/Crossroads/nodes/(1791,20,995).lua deleted file mode 100644 index 499937e..0000000 --- a/Crossroads/nodes/(1791,20,995).lua +++ /dev/null @@ -1 +0,0 @@ -F.ods('1Ecrchn','R')
\ No newline at end of file diff --git a/Crossroads/nodes/(1791,5,912).lua b/Crossroads/nodes/(1791,5,912).lua deleted file mode 100644 index 01add38..0000000 --- a/Crossroads/nodes/(1791,5,912).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen ("crchs", "W", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1792,-1,1020).lua b/Crossroads/nodes/(1792,-1,1020).lua deleted file mode 100644 index 35127ba..0000000 --- a/Crossroads/nodes/(1792,-1,1020).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen ('crch', 'U6', 'L', true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1796,25,1011).lua b/Crossroads/nodes/(1796,25,1011).lua deleted file mode 100644 index 9aafeb8..0000000 --- a/Crossroads/nodes/(1796,25,1011).lua +++ /dev/null @@ -1 +0,0 @@ -F.kbhf("crch","crwm","L","M","CRT 12","C4")
\ No newline at end of file diff --git a/Crossroads/nodes/(1796,25,1019).lua b/Crossroads/nodes/(1796,25,1019).lua deleted file mode 100644 index 69f3d92..0000000 --- a/Crossroads/nodes/(1796,25,1019).lua +++ /dev/null @@ -1 +0,0 @@ -F.kbhf("crch","crch","R","M",nil,"C5")
\ No newline at end of file diff --git a/Crossroads/nodes/(1797,21,989).lua b/Crossroads/nodes/(1797,21,989).lua deleted file mode 100644 index f06c626..0000000 --- a/Crossroads/nodes/(1797,21,989).lua +++ /dev/null @@ -1 +0,0 @@ --- stub
\ No newline at end of file diff --git a/Crossroads/nodes/(1798,21,989).lua b/Crossroads/nodes/(1798,21,989).lua deleted file mode 100644 index f06c626..0000000 --- a/Crossroads/nodes/(1798,21,989).lua +++ /dev/null @@ -1 +0,0 @@ --- stub
\ No newline at end of file diff --git a/Crossroads/nodes/(1799,21,989).lua b/Crossroads/nodes/(1799,21,989).lua deleted file mode 100644 index f06c626..0000000 --- a/Crossroads/nodes/(1799,21,989).lua +++ /dev/null @@ -1 +0,0 @@ --- stub
\ No newline at end of file diff --git a/Crossroads/nodes/(1801,1,1016).lua b/Crossroads/nodes/(1801,1,1016).lua deleted file mode 100644 index bab001c..0000000 --- a/Crossroads/nodes/(1801,1,1016).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc("CRT2","CRT2Ecrch RCRT2Ecrnsw")
\ No newline at end of file diff --git a/Crossroads/nodes/(1801,1,1017).lua b/Crossroads/nodes/(1801,1,1017).lua deleted file mode 100644 index 837e17a..0000000 --- a/Crossroads/nodes/(1801,1,1017).lua +++ /dev/null @@ -1 +0,0 @@ -F.odc("CRT2", "CRT2Ecrch RCRT2Ecrbfsw")
\ No newline at end of file diff --git a/Crossroads/nodes/(1801,5,1008).lua b/Crossroads/nodes/(1801,5,1008).lua deleted file mode 100644 index 72e6533..0000000 --- a/Crossroads/nodes/(1801,5,1008).lua +++ /dev/null @@ -1,5 +0,0 @@ ---[[if event.type == "train" then - if atc_arrow then - atc_set_text_outside("ATL Mithril Line - Ehlodex") - end -end]]
\ No newline at end of file diff --git a/Crossroads/nodes/(1843,10,598).lua b/Crossroads/nodes/(1843,10,598).lua deleted file mode 100644 index 3a4baa9..0000000 --- a/Crossroads/nodes/(1843,10,598).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_8_3","W","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1843,10,652).lua b/Crossroads/nodes/(1843,10,652).lua deleted file mode 100644 index 6804b79..0000000 --- a/Crossroads/nodes/(1843,10,652).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_7_3","W","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1844,20,598).lua b/Crossroads/nodes/(1844,20,598).lua deleted file mode 100644 index d7639dc..0000000 --- a/Crossroads/nodes/(1844,20,598).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_8_3", "N", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1844,20,652).lua b/Crossroads/nodes/(1844,20,652).lua deleted file mode 100644 index 1b25106..0000000 --- a/Crossroads/nodes/(1844,20,652).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_7_3", "N", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1844,20,706).lua b/Crossroads/nodes/(1844,20,706).lua deleted file mode 100644 index 382af54..0000000 --- a/Crossroads/nodes/(1844,20,706).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_6_3", "N", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1844,20,760).lua b/Crossroads/nodes/(1844,20,760).lua deleted file mode 100644 index 589b926..0000000 --- a/Crossroads/nodes/(1844,20,760).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_5_3", "N", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1846,10,595).lua b/Crossroads/nodes/(1846,10,595).lua deleted file mode 100644 index a395405..0000000 --- a/Crossroads/nodes/(1846,10,595).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_8_3","E","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1846,10,649).lua b/Crossroads/nodes/(1846,10,649).lua deleted file mode 100644 index af71d24..0000000 --- a/Crossroads/nodes/(1846,10,649).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_7_3","E","R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1918,20,595).lua b/Crossroads/nodes/(1918,20,595).lua deleted file mode 100644 index 6238bef..0000000 --- a/Crossroads/nodes/(1918,20,595).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_8_5", "S", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1918,20,649).lua b/Crossroads/nodes/(1918,20,649).lua deleted file mode 100644 index 7ec3101..0000000 --- a/Crossroads/nodes/(1918,20,649).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_7_5", "S", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1918,20,703).lua b/Crossroads/nodes/(1918,20,703).lua deleted file mode 100644 index 4e69e03..0000000 --- a/Crossroads/nodes/(1918,20,703).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_6_5", "S", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1918,20,757).lua b/Crossroads/nodes/(1918,20,757).lua deleted file mode 100644 index 3e4fbcf..0000000 --- a/Crossroads/nodes/(1918,20,757).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_5_5", "S", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1919,10,595).lua b/Crossroads/nodes/(1919,10,595).lua deleted file mode 100644 index e377074..0000000 --- a/Crossroads/nodes/(1919,10,595).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_8_5","W","R",true,true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1919,10,649).lua b/Crossroads/nodes/(1919,10,649).lua deleted file mode 100644 index a4a5cab..0000000 --- a/Crossroads/nodes/(1919,10,649).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_7_5","W","R", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1919,10,703).lua b/Crossroads/nodes/(1919,10,703).lua deleted file mode 100644 index 2bb729b..0000000 --- a/Crossroads/nodes/(1919,10,703).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crs_6_5","W","R",true,true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1928,19,8223).lua b/Crossroads/nodes/(1928,19,8223).lua deleted file mode 100644 index 80be033..0000000 --- a/Crossroads/nodes/(1928,19,8223).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("krasnograd", "2", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1950,19,8220).lua b/Crossroads/nodes/(1950,19,8220).lua deleted file mode 100644 index 7938637..0000000 --- a/Crossroads/nodes/(1950,19,8220).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("krasnograd", "E", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(2065,5,978).lua b/Crossroads/nodes/(2065,5,978).lua deleted file mode 100644 index 3ddbf0f..0000000 --- a/Crossroads/nodes/(2065,5,978).lua +++ /dev/null @@ -1,16 +0,0 @@ -local outline = "" -local outrc = "" -if event.type=="train" then - if atc_arrow then - atc_send("OC") - atc_set_text_outside("") - atc_set_text_inside("") - set_rc("") - set_line("") - else - if outline then set_line(outline) end - if outrc then set_rc(outrc) end - atc_set_text_outside("Not in service") - end - --unset_shunt() -end
\ No newline at end of file diff --git a/Crossroads/nodes/(2675,12,8041).lua b/Crossroads/nodes/(2675,12,8041).lua deleted file mode 100644 index 8619f14..0000000 --- a/Crossroads/nodes/(2675,12,8041).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("SWALD-south", "1", "L", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(544,11,2139).lua b/Crossroads/nodes/(544,11,2139).lua deleted file mode 100644 index 69612c9..0000000 --- a/Crossroads/nodes/(544,11,2139).lua +++ /dev/null @@ -1,9 +0,0 @@ --- -local interval = 900 -- Interval in seconds -local offset = 0 -- Offset for the timing system -if event.type == "train" then - if atc_arrow then - interrupt_time = (offset-os.time())%interval - atc_send(string.format("BBWD%dRSM",interrupt_time)) - end -end
\ No newline at end of file diff --git a/Crossroads/nodes/(544,11,2152).lua b/Crossroads/nodes/(544,11,2152).lua deleted file mode 100644 index 69612c9..0000000 --- a/Crossroads/nodes/(544,11,2152).lua +++ /dev/null @@ -1,9 +0,0 @@ --- -local interval = 900 -- Interval in seconds -local offset = 0 -- Offset for the timing system -if event.type == "train" then - if atc_arrow then - interrupt_time = (offset-os.time())%interval - atc_send(string.format("BBWD%dRSM",interrupt_time)) - end -end
\ No newline at end of file diff --git a/Crossroads/nodes/(851,14,773).lua b/Crossroads/nodes/(851,14,773).lua deleted file mode 100644 index c27c086..0000000 --- a/Crossroads/nodes/(851,14,773).lua +++ /dev/null @@ -1,11 +0,0 @@ -if event.train then - if atc_arrow then - atc_send("BB W OLD15OCD2SM") - atc_set_text_inside("EVO") - interrupt(15) - end -end - -if event.int then - atc_set_text_inside("") -end
\ No newline at end of file diff --git a/Crossroads/nodes/(852,12,710).lua b/Crossroads/nodes/(852,12,710).lua deleted file mode 100644 index 7d7b203..0000000 --- a/Crossroads/nodes/(852,12,710).lua +++ /dev/null @@ -1,6 +0,0 @@ -if event.train then - if atc_arrow then - atc_send("B14S14") - atc_set_text_inside("Next station: EVO") - end -end
\ No newline at end of file diff --git a/Crossroads/nodes/(861,12,725).lua b/Crossroads/nodes/(861,12,725).lua deleted file mode 100644 index 7d7b203..0000000 --- a/Crossroads/nodes/(861,12,725).lua +++ /dev/null @@ -1,6 +0,0 @@ -if event.train then - if atc_arrow then - atc_send("B14S14") - atc_set_text_inside("Next station: EVO") - end -end
\ No newline at end of file diff --git a/Crossroads/nodes/(864,14,793).lua b/Crossroads/nodes/(864,14,793).lua deleted file mode 100644 index 97639de..0000000 --- a/Crossroads/nodes/(864,14,793).lua +++ /dev/null @@ -1,10 +0,0 @@ -if event.train then - if atc_arrow then - atc_send("BB W OLD15OCD2SM") - atc_set_text_inside("EVO") - interrupt(15) - end -end -if event.int then - atc_set_text_inside("") -end
\ No newline at end of file diff --git a/Crossroads/nodes/(867,14,776).lua b/Crossroads/nodes/(867,14,776).lua deleted file mode 100644 index 7e1e849..0000000 --- a/Crossroads/nodes/(867,14,776).lua +++ /dev/null @@ -1,11 +0,0 @@ -if event.train then - if atc_arrow then - atc_send("BBWOLD15OCD2SM") - atc_set_text_inside("EVO") - interrupt(15) - end -end - -if event.int and atc_id then - atc_set_text_inside("") -end
\ No newline at end of file diff --git a/Crossroads/nodes/(880,14,789).lua b/Crossroads/nodes/(880,14,789).lua deleted file mode 100644 index f6c14b8..0000000 --- a/Crossroads/nodes/(880,14,789).lua +++ /dev/null @@ -1 +0,0 @@ -F.bhf("evo","scs","L","M",nil,"ZN")
\ No newline at end of file diff --git a/Crossroads/nodes/(881,6,886).lua b/Crossroads/nodes/(881,6,886).lua deleted file mode 100644 index fada148..0000000 --- a/Crossroads/nodes/(881,6,886).lua +++ /dev/null @@ -1,6 +0,0 @@ -if event.train then - if atc_arrow then - atc_send("B14S14") - atc_set_text_inside("Next station: EVO") - end -end
\ No newline at end of file diff --git a/Crossroads/nodes/(898,14,835).lua b/Crossroads/nodes/(898,14,835).lua deleted file mode 100644 index 7d7b203..0000000 --- a/Crossroads/nodes/(898,14,835).lua +++ /dev/null @@ -1,6 +0,0 @@ -if event.train then - if atc_arrow then - atc_send("B14S14") - atc_set_text_inside("Next station: EVO") - end -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2594,12,-1721).lua b/Hyard/nodes/(-2594,12,-1721).lua deleted file mode 100644 index 952b979..0000000 --- a/Hyard/nodes/(-2594,12,-1721).lua +++ /dev/null @@ -1,28 +0,0 @@ -local dir = 2 -local lane = 6 -if S.dir == dir and atc_arrow then - set_route("HYE"..lane, "HEADSHUNT") - local plen = train_length() - local rc = split_at_fc("B0") - local trc = "HY"..rc..dir - S.cars = plen - train_length() - if plen == train_length() and (rc == "" or S.rc:match(trc)) and not (S.rc:match("HYREVERSE")) then - S.exiting = true - end - if rc and rc ~= "" then - set_rc("HY"..rc..dir) - else - set_rc(S.rc) - S.reversing = false - S.exiting = true - end -elseif S.dir == 1 and atc_arrow then -if S.rc:match("HYREVERSE") and S.cars == 0 then - set_route("HYE"..lane, "HEADSHUNT") -S.reversing = true -S.dir = 2 -end -if not S.reversing then -atc_send("B0WD1RS4") -end -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2594,12,-1780).lua b/Hyard/nodes/(-2594,12,-1780).lua deleted file mode 100644 index 7a257db..0000000 --- a/Hyard/nodes/(-2594,12,-1780).lua +++ /dev/null @@ -1,28 +0,0 @@ - -local dir = 1 -local lane = 6 -if S.dir == dir and atc_arrow then - set_route("HYD"..lane, "HEADSHUNT1") - local plen = train_length() - local rc = split_at_fc("B0") - local trc = "HY"..rc..dir - S.cars = plen - train_length() - if plen == train_length() and (rc == "" or S.rc:match(trc)) and not (S.rc:match("HYREVERSE")) then - S.exiting = true - end - if rc and rc ~= "" then - set_rc("HY"..rc..dir) - else - set_rc(S.rc) - S.exiting = true - end -elseif S.dir == 2 and atc_arrow then -if S.rc:match("HYREVERSE") and S.cars == 0 then - set_route("HYD"..lane, "HEADSHUNT1") -S.reversing = true -S.dir = 1 -end -if not S.reversing then -atc_send("B0WD1RS4") -end -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2594,12,-1784).lua b/Hyard/nodes/(-2594,12,-1784).lua deleted file mode 100644 index 31d73ca..0000000 --- a/Hyard/nodes/(-2594,12,-1784).lua +++ /dev/null @@ -1,3 +0,0 @@ -if not atc_arrow then -set_autocouple() -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2594,12,-1802).lua b/Hyard/nodes/(-2594,12,-1802).lua deleted file mode 100644 index cfca16e..0000000 --- a/Hyard/nodes/(-2594,12,-1802).lua +++ /dev/null @@ -1,9 +0,0 @@ -atc_send("B0") -if S.rc then -interrupt(10, "recheck") -else -atc_send("S4") -S.dir = 2 -S.rc = get_rc() -set_route("HYENTRY2", "PICKUP") -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2596,12,-1721).lua b/Hyard/nodes/(-2596,12,-1721).lua deleted file mode 100644 index cc285f9..0000000 --- a/Hyard/nodes/(-2596,12,-1721).lua +++ /dev/null @@ -1,17 +0,0 @@ -local dir = 2 -local lane = 5 -if S.dir == dir then -if atc_arrow and not S.exiting then -split_off_locomotive("B0") -set_rc("PICKUP") -set_route("HYE"..lane, "HEADSHUNT") -end - -if atc_arrow and S.exiting then -set_rc("EXIT") - set_route("HYE"..lane, "EXIT") -S.exiting = false -end -elseif atc_arrow then -atc_send("B0WD1RS4") -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2596,12,-1780).lua b/Hyard/nodes/(-2596,12,-1780).lua deleted file mode 100644 index aaf4293..0000000 --- a/Hyard/nodes/(-2596,12,-1780).lua +++ /dev/null @@ -1,14 +0,0 @@ -local dir = 1 -if S.dir == dir then -if atc_arrow and not S.exiting then -split_off_locomotive("B0") -set_rc("PICKUP") -end - -if atc_arrow and S.exiting then -set_rc("EXIT") -S.exiting = false -end -elseif atc_arrow then -atc_send("B0WD1RS4") -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2596,12,-1784).lua b/Hyard/nodes/(-2596,12,-1784).lua deleted file mode 100644 index 31d73ca..0000000 --- a/Hyard/nodes/(-2596,12,-1784).lua +++ /dev/null @@ -1,3 +0,0 @@ -if not atc_arrow then -set_autocouple() -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2596,12,-1830).lua b/Hyard/nodes/(-2596,12,-1830).lua deleted file mode 100644 index 0b5e1ac..0000000 --- a/Hyard/nodes/(-2596,12,-1830).lua +++ /dev/null @@ -1,15 +0,0 @@ -if S.reversing and atc_arrow then -set_rc(S.rc) -S.exiting = true -S.reversing = false -elseif atc_arrow and S.exiting and S.rc:match("HYREVERSE") then -set_rc("PICKUP") -S.dir = 2 -S.reversing = true -elseif get_rc():match("EXIT") and not S.reversing then - if S.rc:match("HIP") then - set_route("HYEXIT1", "Hippodrome") - else - set_route("HYEXIT1", "Trisiston") -end -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2597,12,-1708).lua b/Hyard/nodes/(-2597,12,-1708).lua deleted file mode 100644 index d87f3f9..0000000 --- a/Hyard/nodes/(-2597,12,-1708).lua +++ /dev/null @@ -1,4 +0,0 @@ - -if atc_arrow then -set_autocouple() -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2598,12,-1708).lua b/Hyard/nodes/(-2598,12,-1708).lua deleted file mode 100644 index d87f3f9..0000000 --- a/Hyard/nodes/(-2598,12,-1708).lua +++ /dev/null @@ -1,4 +0,0 @@ - -if atc_arrow then -set_autocouple() -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2598,12,-1721).lua b/Hyard/nodes/(-2598,12,-1721).lua deleted file mode 100644 index d19e777..0000000 --- a/Hyard/nodes/(-2598,12,-1721).lua +++ /dev/null @@ -1,17 +0,0 @@ -local dir = 2 -local lane = 4 -if S.dir == dir then -if atc_arrow and not S.exiting then -split_off_locomotive("B0") -set_rc("PICKUP") -set_route("HYE"..lane, "HEADSHUNT") -end - -if atc_arrow and S.exiting then -set_rc("EXIT") - set_route("HYE"..lane, "EXIT") -S.exiting = false -end -elseif atc_arrow then -atc_send("B0WD1RS4") -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2598,12,-1780).lua b/Hyard/nodes/(-2598,12,-1780).lua deleted file mode 100644 index aaf4293..0000000 --- a/Hyard/nodes/(-2598,12,-1780).lua +++ /dev/null @@ -1,14 +0,0 @@ -local dir = 1 -if S.dir == dir then -if atc_arrow and not S.exiting then -split_off_locomotive("B0") -set_rc("PICKUP") -end - -if atc_arrow and S.exiting then -set_rc("EXIT") -S.exiting = false -end -elseif atc_arrow then -atc_send("B0WD1RS4") -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2598,12,-1784).lua b/Hyard/nodes/(-2598,12,-1784).lua deleted file mode 100644 index 31d73ca..0000000 --- a/Hyard/nodes/(-2598,12,-1784).lua +++ /dev/null @@ -1,3 +0,0 @@ -if not atc_arrow then -set_autocouple() -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2600,12,-1708).lua b/Hyard/nodes/(-2600,12,-1708).lua deleted file mode 100644 index d87f3f9..0000000 --- a/Hyard/nodes/(-2600,12,-1708).lua +++ /dev/null @@ -1,4 +0,0 @@ - -if atc_arrow then -set_autocouple() -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2600,12,-1721).lua b/Hyard/nodes/(-2600,12,-1721).lua deleted file mode 100644 index 8766946..0000000 --- a/Hyard/nodes/(-2600,12,-1721).lua +++ /dev/null @@ -1,17 +0,0 @@ -local dir = 2 -local lane = 3 -if S.dir == dir then -if atc_arrow and not S.exiting then -split_off_locomotive("B0") -set_rc("PICKUP") -set_route("HYE"..lane, "HEADSHUNT") -end - -if atc_arrow and S.exiting then -set_rc("EXIT") - set_route("HYE"..lane, "EXIT") -S.exiting = false -end -elseif atc_arrow then -atc_send("B0WD1RS4") -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2600,12,-1780).lua b/Hyard/nodes/(-2600,12,-1780).lua deleted file mode 100644 index aaf4293..0000000 --- a/Hyard/nodes/(-2600,12,-1780).lua +++ /dev/null @@ -1,14 +0,0 @@ -local dir = 1 -if S.dir == dir then -if atc_arrow and not S.exiting then -split_off_locomotive("B0") -set_rc("PICKUP") -end - -if atc_arrow and S.exiting then -set_rc("EXIT") -S.exiting = false -end -elseif atc_arrow then -atc_send("B0WD1RS4") -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2600,12,-1784).lua b/Hyard/nodes/(-2600,12,-1784).lua deleted file mode 100644 index 31d73ca..0000000 --- a/Hyard/nodes/(-2600,12,-1784).lua +++ /dev/null @@ -1,3 +0,0 @@ -if not atc_arrow then -set_autocouple() -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2602,12,-1708).lua b/Hyard/nodes/(-2602,12,-1708).lua deleted file mode 100644 index d87f3f9..0000000 --- a/Hyard/nodes/(-2602,12,-1708).lua +++ /dev/null @@ -1,4 +0,0 @@ - -if atc_arrow then -set_autocouple() -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2602,12,-1721).lua b/Hyard/nodes/(-2602,12,-1721).lua deleted file mode 100644 index 3d3cb4e..0000000 --- a/Hyard/nodes/(-2602,12,-1721).lua +++ /dev/null @@ -1,17 +0,0 @@ -local dir = 2 -local lane = 2 -if S.dir == dir then -if atc_arrow and not S.exiting then -split_off_locomotive("B0") -set_rc("PICKUP") -set_route("HYE"..lane, "HEADSHUNT") -end - -if atc_arrow and S.exiting then -set_rc("EXIT") - set_route("HYE"..lane, "EXIT") -S.exiting = false -end -elseif atc_arrow then -atc_send("B0WD1RS4") -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2602,12,-1780).lua b/Hyard/nodes/(-2602,12,-1780).lua deleted file mode 100644 index aaf4293..0000000 --- a/Hyard/nodes/(-2602,12,-1780).lua +++ /dev/null @@ -1,14 +0,0 @@ -local dir = 1 -if S.dir == dir then -if atc_arrow and not S.exiting then -split_off_locomotive("B0") -set_rc("PICKUP") -end - -if atc_arrow and S.exiting then -set_rc("EXIT") -S.exiting = false -end -elseif atc_arrow then -atc_send("B0WD1RS4") -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2602,12,-1784).lua b/Hyard/nodes/(-2602,12,-1784).lua deleted file mode 100644 index 31d73ca..0000000 --- a/Hyard/nodes/(-2602,12,-1784).lua +++ /dev/null @@ -1,3 +0,0 @@ -if not atc_arrow then -set_autocouple() -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2603,12,-1784).lua b/Hyard/nodes/(-2603,12,-1784).lua deleted file mode 100644 index 31d73ca..0000000 --- a/Hyard/nodes/(-2603,12,-1784).lua +++ /dev/null @@ -1,3 +0,0 @@ -if not atc_arrow then -set_autocouple() -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2604,12,-1708).lua b/Hyard/nodes/(-2604,12,-1708).lua deleted file mode 100644 index d87f3f9..0000000 --- a/Hyard/nodes/(-2604,12,-1708).lua +++ /dev/null @@ -1,4 +0,0 @@ - -if atc_arrow then -set_autocouple() -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2604,12,-1721).lua b/Hyard/nodes/(-2604,12,-1721).lua deleted file mode 100644 index 1d2aaa9..0000000 --- a/Hyard/nodes/(-2604,12,-1721).lua +++ /dev/null @@ -1,17 +0,0 @@ -local dir = 2 -local lane = 1 -if S.dir == dir then -if atc_arrow and not S.exiting then -split_off_locomotive("B0") -set_rc("PICKUP") -set_route("HYE"..lane, "HEADSHUNT") -end - -if atc_arrow and S.exiting then -set_rc("EXIT") - set_route("HYE"..lane, "EXIT") -S.exiting = false -end -elseif atc_arrow then -atc_send("B0WD1RS4") -end
\ No newline at end of file diff --git a/Hyard/nodes/(-2604,12,-1780).lua b/Hyard/nodes/(-2604,12,-1780).lua deleted file mode 100644 index aaf4293..0000000 --- a/Hyard/nodes/(-2604,12,-1780).lua +++ /dev/null @@ -1,14 +0,0 @@ -local dir = 1 -if S.dir == dir then -if atc_arrow and not S.exiting then -split_off_locomotive("B0") -set_rc("PICKUP") -end - -if atc_arrow and S.exiting then -set_rc("EXIT") -S.exiting = false -end -elseif atc_arrow then -atc_send("B0WD1RS4") -end
\ No newline at end of file diff --git a/Tyard/nodes/(-3967,12,-2646).lua b/Tyard/nodes/(-3967,12,-2646).lua deleted file mode 100644 index bf0099d..0000000 --- a/Tyard/nodes/(-3967,12,-2646).lua +++ /dev/null @@ -1,43 +0,0 @@ --- Headshunt Exit Controller -local exit_signal = POS(-3962,14,-2645) - -if not F.yard_active() then return end -__approach_callback_mode = 1 -if event.approach and not event.has_entered then - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) - return -end - -if event.train then - if atc_arrow then - if F.has_rc("TY_DEPART") then - print("Train departs yard to mainline at full speed") - unset_autocouple() - F.remove_rc({"TY_FINAL_COLLECT","TY_DEPART"}) - F.remove_rc_match("TY_LOCOS_%d+") - F.remove_rc_match("TY_WAGONS_%d+") - atc_set_ars_disable(false) - set_route(exit_signal,"Exit Yard") - atc_send("S6D10SM") - schedule_in(";05","deactivate_check") -- wait a little to ensure train is clear from headshunt to deactivate yard - print(F.get_rc_safe()) - return - end - else - atc_send("BBOL") - F.error(true) - end -end - -if event.schedule then - if event.msg == "deactivate_check" then - if not atc_id then - F.yard_active(false) - print("Yard Disabled") - else - schedule_in(";05","deactivate_check") - return - end - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4011,12,-2642).lua b/Tyard/nodes/(-4011,12,-2642).lua deleted file mode 100644 index 2498bc5..0000000 --- a/Tyard/nodes/(-4011,12,-2642).lua +++ /dev/null @@ -1,38 +0,0 @@ --- Yard arrival checker --- F.dir = true if entering from south - -if F.has_rc("TY_NOSHUNT") then return end - -local function enter_yard() - F.dir(false) - F.yard_active(true) - F.add_rc({"TY_ARRIVE"}) - atc_set_ars_disable(false) - atc_send("S6") - return -end - -__approach_callback_mode = 1 -if event.approach and not event.has_entered then - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) - return -end - -if event.train then - if F.yard_active() then - schedule_in(";10","recheck") - return - else - enter_yard() - end -end - -if event.schedule then - if F.yard_active() then - schedule_in(";10","recheck") - return - else - enter_yard() - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4011,12,-2646).lua b/Tyard/nodes/(-4011,12,-2646).lua deleted file mode 100644 index 3c9efc3..0000000 --- a/Tyard/nodes/(-4011,12,-2646).lua +++ /dev/null @@ -1 +0,0 @@ ---arrow points into yard
-- config'd for Southbound entrance (North end of yard)
local dir = "N"
local entrance_signal = "Tyard_Enter_"..dir
-- train enters from mainline. stop at signal to be safe
if event.train and atc_arrow then atc_send("B0") end
if atc_arrow then
local rc = get_rc() or ""
-- allow for manual working
if rc:match("TYARD_NOSHUNT") then return end
if S.yard_active then -- send train to "waiting"
if can_set_route(entrance_signal,"WAITING") then
set_route(entrance_signal,"WAITING")
atc_set_text_outside("Waiting for yard to clear")
atc_send("S6")
else
interrupt(5,"recheck")
end
else -- send train to "pickup"
S.yard_active = true
step_fc()
local rc = get_rc() or ""
S.rc = rc
--check for RTS
if S.single_dir == true or S.rc:match("TY_RTS") then
S.dir = dir
--working end = entrance dir
S.RTS = true
set_rc("AROUND_"..S.dir)
else
--invert S.dir
--working end ~= entrance end
if dir == "N" then
S.dir = "S"
else
S.dir = "N"
end
end
set_route(entrance_signal,"PICKUP")
atc_set_text_outside("Proceeding to Classification Yard")
atc_send("S4")
end
else -- train exiting
set_rc(S.rc)
S.yard_active = nil
S.rc = nil
S.dir = nil
unset_autocouple()
atc_send("SM")
end
\ No newline at end of file diff --git a/Tyard/nodes/(-4011,12,-2647).lua b/Tyard/nodes/(-4011,12,-2647).lua deleted file mode 100644 index 3c9efc3..0000000 --- a/Tyard/nodes/(-4011,12,-2647).lua +++ /dev/null @@ -1 +0,0 @@ ---arrow points into yard
-- config'd for Southbound entrance (North end of yard)
local dir = "N"
local entrance_signal = "Tyard_Enter_"..dir
-- train enters from mainline. stop at signal to be safe
if event.train and atc_arrow then atc_send("B0") end
if atc_arrow then
local rc = get_rc() or ""
-- allow for manual working
if rc:match("TYARD_NOSHUNT") then return end
if S.yard_active then -- send train to "waiting"
if can_set_route(entrance_signal,"WAITING") then
set_route(entrance_signal,"WAITING")
atc_set_text_outside("Waiting for yard to clear")
atc_send("S6")
else
interrupt(5,"recheck")
end
else -- send train to "pickup"
S.yard_active = true
step_fc()
local rc = get_rc() or ""
S.rc = rc
--check for RTS
if S.single_dir == true or S.rc:match("TY_RTS") then
S.dir = dir
--working end = entrance dir
S.RTS = true
set_rc("AROUND_"..S.dir)
else
--invert S.dir
--working end ~= entrance end
if dir == "N" then
S.dir = "S"
else
S.dir = "N"
end
end
set_route(entrance_signal,"PICKUP")
atc_set_text_outside("Proceeding to Classification Yard")
atc_send("S4")
end
else -- train exiting
set_rc(S.rc)
S.yard_active = nil
S.rc = nil
S.dir = nil
unset_autocouple()
atc_send("SM")
end
\ No newline at end of file diff --git a/Tyard/nodes/(-4012,12,-2646).lua b/Tyard/nodes/(-4012,12,-2646).lua deleted file mode 100644 index 00d6c1b..0000000 --- a/Tyard/nodes/(-4012,12,-2646).lua +++ /dev/null @@ -1,61 +0,0 @@ --- Headshunt Controller --- Note: may need customising due to track layout -local this_dir = true -- true = F.dir arrow points north. atc_arrow points towards yard - -if not F.yard_active() then return end - -__approach_callback_mode = 1 -if event.approach and not event.has_entered then - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) - return -end - -if event.train then - if not atc_arrow then --train has entered headshunt from yard. bounce or depart - atc_set_ars_disable(true) - F.remove_rc({"TY_HEADSHUNT"}) - if not F.has_rc("TY_FINAL_COLLECT") then - if not F.has_rc("TY_DEPART") then - schedule_in(";01",atc_id) - return - else - local collect = F.get_rc_safe():match("TY_COLLECT_(%S+)") - if collect then --train needs to collect a rake from the yard before departing - F.add_rc({"TY_FINAL_COLLECT","TY_CLASS_"..collect}) - schedule_in(";01",atc_id) - return - end - end - - --else let train proceed forward to the exit controller without a rake - end --else train has already collected rake. let it exit yard - else --train has bounced - if F.has_rc("TY_AROUND") then - if this_dir == F.dir() then --send train to Classification - F.remove_rc({"TY_AROUND"}) - F.add_rc({"TY_PICKUP"}) - atc_set_ars_disable(false) - return - end --if at wrong end, do nothing. train will follow TY_AROUND ARS to relevant headshunt - end -- if doesn't have TY_AROUND then let ARS classify the train - - atc_set_ars_disable(false) - end - return -end - -if event.schedule then - if not atc_id then --bounce the train that just passed - atc_send_to_train(event.msg,"B0WRD1S3A1") - else - if atc_id == event.msg then --train hasn't fully passed yet, wait a bit longer - schedule_in(";01",atc_id) - else -- somehow another train crossed the controller before the first one returned. Unlikely but possible - atc_send_to_train(event.msg,"BBOL") - atc_send("BBOL") - F.error(true) - end - end - return -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4024,12,-2642).lua b/Tyard/nodes/(-4024,12,-2642).lua deleted file mode 100644 index 36743ff..0000000 --- a/Tyard/nodes/(-4024,12,-2642).lua +++ /dev/null @@ -1 +0,0 @@ -if event.channel=="ops" or event.punch then
digiline_send("lcd","Active:"..tostring(S.yard_active).."\nRC:"..tostring(S.rc).."\nRTS:"..tostring(S.RTS) .. " Dir:"..tostring(S.dir) .."\nExiting:"..tostring(S.exiting))
end
\ No newline at end of file diff --git a/Tyard/nodes/(-4027,12,-2655).lua b/Tyard/nodes/(-4027,12,-2655).lua deleted file mode 100644 index 1c12a8f..0000000 --- a/Tyard/nodes/(-4027,12,-2655).lua +++ /dev/null @@ -1,58 +0,0 @@ --- Classification track -local this_dir = true --- this_dir == true for north end, false for south end -if F.yard_active() then - if atc_arrow then -- loco is at working end - F.remove_rc({"TY_PICKUP"}) - if F.has_rc("TY_ARRIVE") and F.dir() == this_dir then --first pass, prep train for working - F.remove_rc({"TY_AROUND"}) - if not F.get_rc_safe():match("TY_LOCOS_%d+") or not F.get_rc_safe():match("TY_WAGONS_%d+") then - local full_length = train_length() - split_off_locomotive("A0B0") - F.add_rc({"TY_HEADSHUNT"}) -- train will end up going through headshunt no matter what. there shouldn't be any trains entering that pass straight through. - if train_length() == full_length then --train is either only here for collection or there's no FC's in the wagons. can't differentiate - local lane = F.get_rc_safe():match("TY_COLLECT_(%S+)") or "" - F.add_rc({"TY_LAST_CLASS","TY_CLASS_"..lane}) -- direct train to correct lane for collection - else --identify and save loco:wagon ratio, then bounce back from headshunt. it's easier than trying to reconnect - F.add_rc({"TY_LOCOS_"..train_length(), "TY_WAGONS_"..(full_length-train_length()),"TY_PICKUP"}) - end - return -- train has departed for headshunt - end - if F.has_rc("TY_RTS") then - F.dir(not F.dir()) - F.remove_rc({"TY_RTS"}) - F.add_rc({"TY_AROUND"}) -- send loco around to the other end - split_off_locomotive("A0B0") - atc_set_ars_disable(false) - return -- train has departed for RTS loop - end - F.remove_rc({"TY_ARRIVE"}) - step_fc() - end - if this_dir == F.dir() then --train has bounced and is ready to classify wagon(s) - -- local pre_split = train_length() - local lane = split_at_fc("A0B0",5) -- where to classify this rake -- headshunt length - local locos = tonumber(F.get_rc_safe():match("TY_LOCOS_(%d+)")) or 1 --saved loco count - local wagons = tonumber(F.get_rc_safe():match("TY_WAGONS_(%d+)")) or 0 -- wagon_count from last classification split - local this_rake = train_length() - locos-- subtract these wagons from the overall wagon count - if this_rake == wagons then -- mark for last_classification - F.add_rc({"TY_LAST_CLASS"}) - end - if lane ~= "" then - F.add_rc({"TY_CLASS_"..lane}) - end - for v in F.get_rc_safe():gmatch("(TY_WAGONS_%d+)") do - F.remove_rc({v}) - end - F.add_rc({"TY_HEADSHUNT","TY_WAGONS_"..wagons-this_rake}) - atc_set_ars_disable(false) - set_autocouple() - else --bounce train back towards working end - atc_set_ars_disable(true) - atc_send("S0WRD1S3") - unset_autocouple() - end - else -- train entering from the far end. set autocouple so it pushes all the way through to the bounce - set_autocouple() - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4027,12,-2731).lua b/Tyard/nodes/(-4027,12,-2731).lua deleted file mode 100644 index 5491309..0000000 --- a/Tyard/nodes/(-4027,12,-2731).lua +++ /dev/null @@ -1,58 +0,0 @@ --- Classification track -local this_dir = false --- this_dir == true for north end, false for south end -if F.yard_active() then - if atc_arrow then -- loco is at working end - F.remove_rc({"TY_PICKUP"}) - if F.has_rc("TY_ARRIVE") and F.dir() == this_dir then --first pass, prep train for working - F.remove_rc({"TY_AROUND"}) - if not F.get_rc_safe():match("TY_LOCOS_%d+") or not F.get_rc_safe():match("TY_WAGONS_%d+") then - local full_length = train_length() - split_off_locomotive("A0B0") - F.add_rc({"TY_HEADSHUNT"}) -- train will end up going through headshunt no matter what. there shouldn't be any trains entering that pass straight through. - if train_length() == full_length then --train is either only here for collection or there's no FC's in the wagons. can't differentiate - local lane = F.get_rc_safe():match("TY_COLLECT_(%S+)") or "" - F.add_rc({"TY_LAST_CLASS","TY_CLASS_"..lane}) -- direct train to correct lane for collection - else --identify and save loco:wagon ratio, then bounce back from headshunt. it's easier than trying to reconnect - F.add_rc({"TY_LOCOS_"..train_length(), "TY_WAGONS_"..(full_length-train_length()),"TY_PICKUP"}) - end - return -- train has departed for headshunt - end - if F.has_rc("TY_RTS") then - F.dir(not F.dir()) - F.remove_rc({"TY_RTS"}) - F.add_rc({"TY_AROUND"}) -- send loco around to the other end - split_off_locomotive("A0B0") - atc_set_ars_disable(false) - return -- train has departed for RTS loop - end - F.remove_rc({"TY_ARRIVE"}) - step_fc() - end - if this_dir == F.dir() then --train has bounced and is ready to classify wagon(s) - -- local pre_split = train_length() - local lane = split_at_fc("A0B0",5) -- where to classify this rake -- headshunt length - local locos = tonumber(F.get_rc_safe():match("TY_LOCOS_(%d+)")) or 1 --saved loco count - local wagons = tonumber(F.get_rc_safe():match("TY_WAGONS_(%d+)")) or 0 -- wagon_count from last classification split - local this_rake = train_length() - locos-- subtract these wagons from the overall wagon count - if this_rake == wagons then -- mark for last_classification - F.add_rc({"TY_LAST_CLASS"}) - end - if lane ~= "" then - F.add_rc({"TY_CLASS_"..lane}) - end - for v in F.get_rc_safe():gmatch("(TY_WAGONS_%d+)") do - F.remove_rc({v}) - end - F.add_rc({"TY_HEADSHUNT","TY_WAGONS_"..wagons-this_rake}) - atc_set_ars_disable(false) - set_autocouple() - else --bounce train back towards working end - atc_set_ars_disable(true) - atc_send("S0WRD1S3") - unset_autocouple() - end - else -- train entering from the far end. set autocouple so it pushes all the way through to the bounce - set_autocouple() - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4028,12,-2655).lua b/Tyard/nodes/(-4028,12,-2655).lua deleted file mode 100644 index 39f9b81..0000000 --- a/Tyard/nodes/(-4028,12,-2655).lua +++ /dev/null @@ -1 +0,0 @@ ---North pickup splitter
local dir = "N"
local lane = 0
--nothing below this line should indicate a hard direction
--should be able to convert to function using only above args
--------------------------------------------------
if S.yard_active then
if atc_arrow then
if S.dir == dir then
set_route("TY"..dir.."_"..lane, "HEADSHUNT")
local plen = train_length()
local rc = split_at_fc("B0")
local trc = "TY"..dir.."_"..rc
if plen == train_length() and (rc == "" or S.rc:match(trc)) then
S.exiting = true
end
if rc and rc ~= "" then
set_rc("TY"..dir.."_"..rc)
else
set_rc(S.rc)
S.exiting = true
end
else -- if S.dir ~= dir
if S.RTS then -- loop around to other HS
S.RTS = nil
set_route("TY"..dir.."_"..lane,"AROUND")
split_off_locomotive("B0")
set_rc("AROUND_"..S.dir)
return
else
atc_send("B0WRS4")
end
end
end -- nothing to do if train goes against arrow
end
\ No newline at end of file diff --git a/Tyard/nodes/(-4028,12,-2731).lua b/Tyard/nodes/(-4028,12,-2731).lua deleted file mode 100644 index b04ffad..0000000 --- a/Tyard/nodes/(-4028,12,-2731).lua +++ /dev/null @@ -1 +0,0 @@ ---South pickup splitter
local dir = "S"
local lane = 0
--nothing below this line should indicate a hard direction
--should be able to convert to function using only above args
--------------------------------------------------
if S.yard_active then
if atc_arrow then
if S.dir == dir then
set_route("TY"..dir.."_"..lane, "HEADSHUNT")
local plen = train_length()
local rc = split_at_fc("B0")
local trc = "TY"..dir.."_"..rc
if plen == train_length() and (rc == "" or S.rc:match(trc)) then
S.exiting = true
end
if rc and rc ~= "" then
set_rc("TY"..dir.."_"..rc)
else
set_rc(S.rc)
S.exiting = true
end
else -- if S.dir ~= dir
if S.RTS then -- loop around to other HS
S.RTS = nil
set_route("TY"..dir.."_"..lane,"AROUND")
split_off_locomotive("B0")
set_rc("AROUND_"..S.dir)
return
else
atc_send("B0WRS4")
end
end
end -- nothing to do if train goes against arrow
end
\ No newline at end of file diff --git a/Tyard/nodes/(-4031,12,-2655).lua b/Tyard/nodes/(-4031,12,-2655).lua deleted file mode 100644 index f08c2fe..0000000 --- a/Tyard/nodes/(-4031,12,-2655).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = true -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4031,12,-2731).lua b/Tyard/nodes/(-4031,12,-2731).lua deleted file mode 100644 index aad7649..0000000 --- a/Tyard/nodes/(-4031,12,-2731).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = false -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4032,12,-2655).lua b/Tyard/nodes/(-4032,12,-2655).lua deleted file mode 100644 index b6c6d60..0000000 --- a/Tyard/nodes/(-4032,12,-2655).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("N",1)
\ No newline at end of file diff --git a/Tyard/nodes/(-4032,12,-2731).lua b/Tyard/nodes/(-4032,12,-2731).lua deleted file mode 100644 index c4c1959..0000000 --- a/Tyard/nodes/(-4032,12,-2731).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("S",1)
\ No newline at end of file diff --git a/Tyard/nodes/(-4035,12,-2655).lua b/Tyard/nodes/(-4035,12,-2655).lua deleted file mode 100644 index f08c2fe..0000000 --- a/Tyard/nodes/(-4035,12,-2655).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = true -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4035,12,-2731).lua b/Tyard/nodes/(-4035,12,-2731).lua deleted file mode 100644 index aad7649..0000000 --- a/Tyard/nodes/(-4035,12,-2731).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = false -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4036,12,-2655).lua b/Tyard/nodes/(-4036,12,-2655).lua deleted file mode 100644 index 3fd7dcb..0000000 --- a/Tyard/nodes/(-4036,12,-2655).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("N",2)
\ No newline at end of file diff --git a/Tyard/nodes/(-4036,12,-2731).lua b/Tyard/nodes/(-4036,12,-2731).lua deleted file mode 100644 index f15a717..0000000 --- a/Tyard/nodes/(-4036,12,-2731).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("S",2)
\ No newline at end of file diff --git a/Tyard/nodes/(-4039,12,-2655).lua b/Tyard/nodes/(-4039,12,-2655).lua deleted file mode 100644 index f08c2fe..0000000 --- a/Tyard/nodes/(-4039,12,-2655).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = true -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4039,12,-2731).lua b/Tyard/nodes/(-4039,12,-2731).lua deleted file mode 100644 index aad7649..0000000 --- a/Tyard/nodes/(-4039,12,-2731).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = false -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4040,12,-2655).lua b/Tyard/nodes/(-4040,12,-2655).lua deleted file mode 100644 index 592871f..0000000 --- a/Tyard/nodes/(-4040,12,-2655).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("N",3)
\ No newline at end of file diff --git a/Tyard/nodes/(-4040,12,-2731).lua b/Tyard/nodes/(-4040,12,-2731).lua deleted file mode 100644 index af4c22e..0000000 --- a/Tyard/nodes/(-4040,12,-2731).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("S",3)
\ No newline at end of file diff --git a/Tyard/nodes/(-4043,12,-2655).lua b/Tyard/nodes/(-4043,12,-2655).lua deleted file mode 100644 index f08c2fe..0000000 --- a/Tyard/nodes/(-4043,12,-2655).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = true -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4043,12,-2731).lua b/Tyard/nodes/(-4043,12,-2731).lua deleted file mode 100644 index aad7649..0000000 --- a/Tyard/nodes/(-4043,12,-2731).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = false -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4044,12,-2655).lua b/Tyard/nodes/(-4044,12,-2655).lua deleted file mode 100644 index c86923a..0000000 --- a/Tyard/nodes/(-4044,12,-2655).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("N",4)
\ No newline at end of file diff --git a/Tyard/nodes/(-4044,12,-2731).lua b/Tyard/nodes/(-4044,12,-2731).lua deleted file mode 100644 index 9227db4..0000000 --- a/Tyard/nodes/(-4044,12,-2731).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("S",4)
\ No newline at end of file diff --git a/Tyard/nodes/(-4047,12,-2655).lua b/Tyard/nodes/(-4047,12,-2655).lua deleted file mode 100644 index f08c2fe..0000000 --- a/Tyard/nodes/(-4047,12,-2655).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = true -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4047,12,-2731).lua b/Tyard/nodes/(-4047,12,-2731).lua deleted file mode 100644 index aad7649..0000000 --- a/Tyard/nodes/(-4047,12,-2731).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = false -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4048,12,-2655).lua b/Tyard/nodes/(-4048,12,-2655).lua deleted file mode 100644 index 3ce2888..0000000 --- a/Tyard/nodes/(-4048,12,-2655).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("N",5)
\ No newline at end of file diff --git a/Tyard/nodes/(-4048,12,-2731).lua b/Tyard/nodes/(-4048,12,-2731).lua deleted file mode 100644 index e953f0e..0000000 --- a/Tyard/nodes/(-4048,12,-2731).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("S",5)
\ No newline at end of file diff --git a/Tyard/nodes/(-4051,12,-2655).lua b/Tyard/nodes/(-4051,12,-2655).lua deleted file mode 100644 index f08c2fe..0000000 --- a/Tyard/nodes/(-4051,12,-2655).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = true -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4051,12,-2731).lua b/Tyard/nodes/(-4051,12,-2731).lua deleted file mode 100644 index aad7649..0000000 --- a/Tyard/nodes/(-4051,12,-2731).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = false -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4052,12,-2655).lua b/Tyard/nodes/(-4052,12,-2655).lua deleted file mode 100644 index 9e4298b..0000000 --- a/Tyard/nodes/(-4052,12,-2655).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("N",6)
\ No newline at end of file diff --git a/Tyard/nodes/(-4052,12,-2731).lua b/Tyard/nodes/(-4052,12,-2731).lua deleted file mode 100644 index 2fc4fc5..0000000 --- a/Tyard/nodes/(-4052,12,-2731).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("S",6)
\ No newline at end of file diff --git a/Tyard/nodes/(-4055,12,-2655).lua b/Tyard/nodes/(-4055,12,-2655).lua deleted file mode 100644 index f08c2fe..0000000 --- a/Tyard/nodes/(-4055,12,-2655).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = true -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4055,12,-2731).lua b/Tyard/nodes/(-4055,12,-2731).lua deleted file mode 100644 index aad7649..0000000 --- a/Tyard/nodes/(-4055,12,-2731).lua +++ /dev/null @@ -1,28 +0,0 @@ ---EOL code -local this_dir = false -- true = F.dir arrow points north - -if not F.yard_active() then return end -if atc_arrow then - if F.dir() == this_dir then --train has bounced and needs to leave the rake or depart with it - if F.has_rc("TY_LAST_CLASS") then -- take the whole rake to the exit - F.remove_rc({"TY_LAST_CLASS"}) - F.add_rc({"TY_DEPART"}) - split_off_locomotive("A0B0") - elseif not F.has_rc("TY_FINAL_COLLECT") then - -- disconnect loco and return to pickup - split_off_locomotive("A0B0") - F.add_rc({"TY_PICKUP"}) - end --if has FINAL_COLLECT then don't split off the loco. take the full rake - F.add_rc({"TY_HEADSHUNT"}) - else --train needs to bounce - atc_send("B0WRD1S4") - end -else - if F.dir() == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - F.remove_rc_match("TY_CLASS_%S+") - else --this should never come into play as it means the train has entered from the wrong end somehow - atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required - F.error(true) - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4056,12,-2655).lua b/Tyard/nodes/(-4056,12,-2655).lua deleted file mode 100644 index 4113ece..0000000 --- a/Tyard/nodes/(-4056,12,-2655).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("N",7)
\ No newline at end of file diff --git a/Tyard/nodes/(-4056,12,-2731).lua b/Tyard/nodes/(-4056,12,-2731).lua deleted file mode 100644 index edb2ef8..0000000 --- a/Tyard/nodes/(-4056,12,-2731).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("S",7)
\ No newline at end of file diff --git a/Tyard/nodes/(-4059,12,-2714).lua b/Tyard/nodes/(-4059,12,-2714).lua deleted file mode 100644 index f89a6ec..0000000 --- a/Tyard/nodes/(-4059,12,-2714).lua +++ /dev/null @@ -1 +0,0 @@ ---waiting lane
-- config'd for the southbound-waiting lane
-- train nose points south, using a north signal
local dir = "N"
local waiting_signal = "TY_WAITING_"..dir
if S.yard_active then
if atc_id then
atc_send("B0")
interrupt(10,"recheck")
end
else -- send train to "headshunt"
if not atc_id then return end
S.yard_active = true
step_fc()
local rc = get_rc() or ""
S.rc = rc
--check for RTS
if S.single_dir == true or S.rc:match("TY_RTS") then
S.dir = dir
--working end = entrance dir
S.RTS = true -- to direct train to PICKUP lane. AROUND_dir will be set by the pickup track
else
--invert S.dir
--working end ~= entrance end
if dir == "N" then
S.dir = "S"
else
S.dir = "N"
end
end
set_rc("PICKUP")
set_route(waiting_signal,"HEADSHUNT")
atc_set_text_outside("Proceeding to Classification Yard")
atc_send("S0WRS4")
end
\ No newline at end of file diff --git a/Tyard/nodes/(-4100,12,-2742).lua b/Tyard/nodes/(-4100,12,-2742).lua deleted file mode 100644 index 8ed965e..0000000 --- a/Tyard/nodes/(-4100,12,-2742).lua +++ /dev/null @@ -1,61 +0,0 @@ --- Headshunt Controller --- Note: may need customising due to track layout -local this_dir = false -- true = F.dir arrow points north. atc_arrow points towards yard - -if not F.yard_active() then return end - -__approach_callback_mode = 1 -if event.approach and not event.has_entered then - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) - return -end - -if event.train then - if not atc_arrow then --train has entered headshunt from yard. bounce or depart - atc_set_ars_disable(true) - F.remove_rc({"TY_HEADSHUNT"}) - if not F.has_rc("TY_FINAL_COLLECT") then - if not F.has_rc("TY_DEPART") then - schedule_in(";01",atc_id) - return - else - local collect = F.get_rc_safe():match("TY_COLLECT_(%S+)") - if collect then --train needs to collect a rake from the yard before departing - F.add_rc({"TY_FINAL_COLLECT","TY_CLASS_"..collect}) - schedule_in(";01",atc_id) - return - end - end - - --else let train proceed forward to the exit controller without a rake - end --else train has already collected rake. let it exit yard - else --train has bounced - if F.has_rc("TY_AROUND") then - if this_dir == F.dir() then --send train to Classification - F.remove_rc({"TY_AROUND"}) - F.add_rc({"TY_PICKUP"}) - atc_set_ars_disable(false) - return - end --if at wrong end, do nothing. train will follow TY_AROUND ARS to relevant headshunt - end -- if doesn't have TY_AROUND then let ARS classify the train - - atc_set_ars_disable(false) - end - return -end - -if event.schedule then - if not atc_id then --bounce the train that just passed - atc_send_to_train(event.msg,"B0WRD1S3A1") - else - if atc_id == event.msg then --train hasn't fully passed yet, wait a bit longer - schedule_in(";01",atc_id) - else -- somehow another train crossed the controller before the first one returned. Unlikely but possible - atc_send_to_train(event.msg,"BBOL") - atc_send("BBOL") - F.error(true) - end - end - return -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4100,12,-2745).lua b/Tyard/nodes/(-4100,12,-2745).lua deleted file mode 100644 index 7f6b3e5..0000000 --- a/Tyard/nodes/(-4100,12,-2745).lua +++ /dev/null @@ -1,38 +0,0 @@ --- Yard arrival checker --- F.dir = true if entering from south - -if F.has_rc("TY_NOSHUNT") then return end - -local function enter_yard() - F.dir(true) - F.yard_active(true) - F.add_rc({"TY_ARRIVE"}) - atc_set_ars_disable(false) - atc_send("S6") - return -end - -__approach_callback_mode = 1 -if event.approach and not event.has_entered then - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) - return -end - -if event.train then - if F.yard_active() then - schedule_in(";10","recheck") - return - else - enter_yard() - end -end - -if event.schedule then - if F.yard_active() then - schedule_in(";10","recheck") - return - else - enter_yard() - end -end
\ No newline at end of file diff --git a/Tyard/nodes/(-4167,12,-2742).lua b/Tyard/nodes/(-4167,12,-2742).lua deleted file mode 100644 index fe1b446..0000000 --- a/Tyard/nodes/(-4167,12,-2742).lua +++ /dev/null @@ -1,42 +0,0 @@ --- Headshunt Exit Controller -if not F.yard_active() then return end -local exit_signal = POS(-4178,15,-2742) -__approach_callback_mode = 1 -if event.approach and not event.has_entered then - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) - return -end - -if event.train then - if atc_arrow then - if F.has_rc("TY_DEPART") then - print("Train departs yard to mainline at full speed") - unset_autocouple() - F.remove_rc({"TY_FINAL_COLLECT","TY_DEPART"}) - F.remove_rc_match("TY_LOCOS_%d+") - F.remove_rc_match("TY_WAGONS_%d+") - atc_set_ars_disable(false) - set_route(exit_signal,"Exit Yard") - atc_send("S6D10SM") - schedule_in(";05","deactivate_check") -- wait a little to ensure train is clear from headshunt to deactivate yard - print(F.get_rc_safe()) - return - end - else - atc_send("BBOL") - F.error(true) - end -end - -if event.schedule then - if event.msg == "deactivate_check" then - if not atc_id then - F.yard_active(false) - print("Yard Disabled") - else - schedule_in(";05","deactivate_check") - return - end - end -end
\ No newline at end of file diff --git a/X_Nihilo/nodes/(-1728,10,-4338).lua b/X_Nihilo/nodes/(-1728,10,-4338).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-1728,10,-4338).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(-1857,7,-4440).lua b/X_Nihilo/nodes/(-1857,7,-4440).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-1857,7,-4440).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(-2716,16,962).lua b/X_Nihilo/nodes/(-2716,16,962).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-2716,16,962).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(-2716,16,963).lua b/X_Nihilo/nodes/(-2716,16,963).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-2716,16,963).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(-2716,16,964).lua b/X_Nihilo/nodes/(-2716,16,964).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-2716,16,964).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(-2716,16,965).lua b/X_Nihilo/nodes/(-2716,16,965).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-2716,16,965).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(-2716,16,966).lua b/X_Nihilo/nodes/(-2716,16,966).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-2716,16,966).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(-2716,16,967).lua b/X_Nihilo/nodes/(-2716,16,967).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-2716,16,967).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(-2716,16,968).lua b/X_Nihilo/nodes/(-2716,16,968).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-2716,16,968).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(-2716,16,969).lua b/X_Nihilo/nodes/(-2716,16,969).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-2716,16,969).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(-2716,16,970).lua b/X_Nihilo/nodes/(-2716,16,970).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-2716,16,970).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(-2716,16,971).lua b/X_Nihilo/nodes/(-2716,16,971).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-2716,16,971).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(-2716,16,972).lua b/X_Nihilo/nodes/(-2716,16,972).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(-2716,16,972).lua +++ /dev/null diff --git a/X_Nihilo/nodes/(926,25,3081).lua b/X_Nihilo/nodes/(926,25,3081).lua deleted file mode 100644 index e69de29..0000000 --- a/X_Nihilo/nodes/(926,25,3081).lua +++ /dev/null diff --git a/auto_yards/init_code.lua b/auto_yards/init_code.lua index 0a4312c..3d442bc 100644 --- a/auto_yards/init_code.lua +++ b/auto_yards/init_code.lua @@ -83,6 +83,17 @@ if event.init then -- error_indicator_pos = POS(-4025,13,-2671), -- }, } + S.known_trains = { + ['120684'] = "LHF #1", --Maverick2797 + ['249165'] = "LHF #2", --Maverick2797 + ['368003'] = "ARC-BY", --Maverick2797 + ['588750'] = "MMF-TY", --survivalg/erstazi + ['879136'] = "ERS-SNS", --erstazi + ['543381'] = "WOA-IP", --Maverick2797 + ['834721'] = "S27-ARC", --Maverick2797 + ['513598'] = "S27EX-ARC", --Maverick2797 + ['590988'] = "CAN-ARC", --Maverick2797 + } end ------------------------------------------------------------------------------------ -- Utility Functions @@ -220,7 +231,7 @@ F.yard_arrival = function(yard_id,this_dir, force_rts) -- arrow points towards y if S.print_debug then print(rwt.to_string(rwt.now())) - print("YARD "..yard_id..": Train "..atc_id.." enters from the "..tostring(this_dir).." direction and will exit in the "..tostring(rts).." direction") + print("YARD "..yard_id..": Train "..atc_id.." ("..(S.known_trains[atc_id] or "Unknown")..") enters from the "..tostring(this_dir).." direction and will exit in the "..tostring(rts).." direction") print("YARD "..yard_id..": Length "..train_length()) end return @@ -237,7 +248,7 @@ F.yard_arrival = function(yard_id,this_dir, force_rts) -- arrow points towards y if F.indicator(yard.active_indicator_pos) then if S.print_debug then print(rwt.to_string(rwt.now())) - print("YARD "..yard_id..": Train "..atc_id.." has arrived from the "..tostring(this_dir).." direction and has to wait for the yard to deactivate.") + print("YARD "..yard_id..": Train "..atc_id.." ("..(S.known_trains[atc_id] or "Unknown")..") has arrived from the "..tostring(this_dir).." direction and has to wait for the yard to deactivate.") end schedule_in(";10","recheck") return @@ -410,7 +421,7 @@ F.headshunt_exit = function(yard_id,this_dir) -- arrow points out of yard if F.has_rc(yard_id.."_DEPART") then if S.print_debug then print(rwt.to_string(rwt.now())) - print("YARD "..yard_id..": Train "..atc_id.." has a length of "..train_length()) + print("YARD "..yard_id..": Train "..atc_id.." ("..(S.known_trains[atc_id] or "Unknown")..") has a length of "..train_length()) print("YARD "..yard_id..": It will depart in the "..tostring(this_dir).." direction.") end S.yards[yard_id].departure_length = train_length() diff --git a/auto_yards/nodes/(-1897,10,-921).lua b/auto_yards/nodes/(-1897,10,-921).lua deleted file mode 100644 index 98955fa..0000000 --- a/auto_yards/nodes/(-1897,10,-921).lua +++ /dev/null @@ -1,16 +0,0 @@ -local function tprint (tbl, indent) - if not indent then indent = 0 end - for k, v in pairs(tbl) do - formatting = string.rep("--", indent) .."[".. k .. "]: " - if type(v) == "table" then - print(formatting) - tprint(v, indent+1) - elseif type(v) == 'boolean' then - print(formatting .. tostring(v)) - else - print(formatting .. v) - end - end -end - -if event.punch then tprint(S) end
\ No newline at end of file diff --git a/auto_yards/nodes/(-1902,10,-893).lua b/auto_yards/nodes/(-1902,10,-893).lua deleted file mode 100644 index a878623..0000000 --- a/auto_yards/nodes/(-1902,10,-893).lua +++ /dev/null @@ -1 +0,0 @@ ---EXIT
\ No newline at end of file diff --git a/auto_yards/nodes/(-1909,10,-930).lua b/auto_yards/nodes/(-1909,10,-930).lua deleted file mode 100644 index 90ea19a..0000000 --- a/auto_yards/nodes/(-1909,10,-930).lua +++ /dev/null @@ -1 +0,0 @@ --- HEADSHUNT and EXIT
\ No newline at end of file diff --git a/auto_yards/nodes/(-1909,10,-957).lua b/auto_yards/nodes/(-1909,10,-957).lua deleted file mode 100644 index 3774070..0000000 --- a/auto_yards/nodes/(-1909,10,-957).lua +++ /dev/null @@ -1 +0,0 @@ -F.pickup("BY","N","0")
\ No newline at end of file diff --git a/auto_yards/nodes/(-1909,7,-1017).lua b/auto_yards/nodes/(-1909,7,-1017).lua deleted file mode 100644 index b78dee7..0000000 --- a/auto_yards/nodes/(-1909,7,-1017).lua +++ /dev/null @@ -1 +0,0 @@ -F.pickup("BY","S","0")
\ No newline at end of file diff --git a/auto_yards/nodes/(-1910,16,837).lua b/auto_yards/nodes/(-1910,16,837).lua deleted file mode 100644 index 89349e3..0000000 --- a/auto_yards/nodes/(-1910,16,837).lua +++ /dev/null @@ -1 +0,0 @@ -F.lane_EOL("ARC",false)
\ No newline at end of file diff --git a/auto_yards/nodes/(-1912,10,-928).lua b/auto_yards/nodes/(-1912,10,-928).lua deleted file mode 100644 index afbdcef..0000000 --- a/auto_yards/nodes/(-1912,10,-928).lua +++ /dev/null @@ -1 +0,0 @@ --- ENTRY and WAITING
\ No newline at end of file diff --git a/auto_yards/nodes/(-1912,10,-957).lua b/auto_yards/nodes/(-1912,10,-957).lua deleted file mode 100644 index 68f24bb..0000000 --- a/auto_yards/nodes/(-1912,10,-957).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("BY","N","1")
\ No newline at end of file diff --git a/auto_yards/nodes/(-1912,16,839).lua b/auto_yards/nodes/(-1912,16,839).lua deleted file mode 100644 index 89349e3..0000000 --- a/auto_yards/nodes/(-1912,16,839).lua +++ /dev/null @@ -1 +0,0 @@ -F.lane_EOL("ARC",false)
\ No newline at end of file diff --git a/auto_yards/nodes/(-1912,7,-1017).lua b/auto_yards/nodes/(-1912,7,-1017).lua deleted file mode 100644 index 572ed50..0000000 --- a/auto_yards/nodes/(-1912,7,-1017).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("BY","S","1")
\ No newline at end of file diff --git a/auto_yards/nodes/(-1915,10,-957).lua b/auto_yards/nodes/(-1915,10,-957).lua deleted file mode 100644 index 40a85b3..0000000 --- a/auto_yards/nodes/(-1915,10,-957).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("BY","N","2")
\ No newline at end of file diff --git a/auto_yards/nodes/(-1915,7,-1017).lua b/auto_yards/nodes/(-1915,7,-1017).lua deleted file mode 100644 index 217f0f4..0000000 --- a/auto_yards/nodes/(-1915,7,-1017).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("BY","S","2")
\ No newline at end of file diff --git a/auto_yards/nodes/(-1918,10,-957).lua b/auto_yards/nodes/(-1918,10,-957).lua deleted file mode 100644 index f4f335b..0000000 --- a/auto_yards/nodes/(-1918,10,-957).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("BY","N","3")
\ No newline at end of file diff --git a/auto_yards/nodes/(-1918,7,-1017).lua b/auto_yards/nodes/(-1918,7,-1017).lua deleted file mode 100644 index 6c9c7d1..0000000 --- a/auto_yards/nodes/(-1918,7,-1017).lua +++ /dev/null @@ -1 +0,0 @@ -F.EOL("BY","S","3")
\ No newline at end of file diff --git a/auto_yards/nodes/(-1918,16,840).lua b/auto_yards/nodes/(-1919,16,839).lua index 2d94f29..2d94f29 100644 --- a/auto_yards/nodes/(-1918,16,840).lua +++ b/auto_yards/nodes/(-1919,16,839).lua diff --git a/auto_yards/nodes/(-1925,16,833).lua b/auto_yards/nodes/(-1925,16,833).lua deleted file mode 100644 index 2d94f29..0000000 --- a/auto_yards/nodes/(-1925,16,833).lua +++ /dev/null @@ -1 +0,0 @@ -F.classification("ARC",false)
\ No newline at end of file diff --git a/auto_yards/nodes/(-1928,16,834).lua b/auto_yards/nodes/(-1928,16,834).lua deleted file mode 100644 index 89349e3..0000000 --- a/auto_yards/nodes/(-1928,16,834).lua +++ /dev/null @@ -1 +0,0 @@ -F.lane_EOL("ARC",false)
\ No newline at end of file diff --git a/auto_yards/nodes/(-1933,16,806).lua b/auto_yards/nodes/(-1932,16,807).lua index 4503e25..4503e25 100644 --- a/auto_yards/nodes/(-1933,16,806).lua +++ b/auto_yards/nodes/(-1932,16,807).lua diff --git a/auto_yards/nodes/(-1932,3,-1053).lua b/auto_yards/nodes/(-1932,3,-1053).lua deleted file mode 100644 index 2970f21..0000000 --- a/auto_yards/nodes/(-1932,3,-1053).lua +++ /dev/null @@ -1 +0,0 @@ ---HEADSHUNT and EXIT
\ No newline at end of file diff --git a/auto_yards/nodes/(-1933,16,833).lua b/auto_yards/nodes/(-1933,16,833).lua deleted file mode 100644 index 89349e3..0000000 --- a/auto_yards/nodes/(-1933,16,833).lua +++ /dev/null @@ -1 +0,0 @@ -F.lane_EOL("ARC",false)
\ No newline at end of file diff --git a/auto_yards/nodes/(-1933,3,-1050).lua b/auto_yards/nodes/(-1933,3,-1050).lua deleted file mode 100644 index afbdcef..0000000 --- a/auto_yards/nodes/(-1933,3,-1050).lua +++ /dev/null @@ -1 +0,0 @@ --- ENTRY and WAITING
\ No newline at end of file diff --git a/auto_yards/nodes/(-1936,16,834).lua b/auto_yards/nodes/(-1936,16,834).lua deleted file mode 100644 index 89349e3..0000000 --- a/auto_yards/nodes/(-1936,16,834).lua +++ /dev/null @@ -1 +0,0 @@ -F.lane_EOL("ARC",false)
\ No newline at end of file diff --git a/auto_yards/nodes/(-1938,16,805).lua b/auto_yards/nodes/(-1937,16,806).lua index 4503e25..4503e25 100644 --- a/auto_yards/nodes/(-1938,16,805).lua +++ b/auto_yards/nodes/(-1937,16,806).lua diff --git a/auto_yards/nodes/(-1946,16,801).lua b/auto_yards/nodes/(-1945,16,802).lua index 4503e25..4503e25 100644 --- a/auto_yards/nodes/(-1946,16,801).lua +++ b/auto_yards/nodes/(-1945,16,802).lua diff --git a/auto_yards/nodes/(-1946,16,840).lua b/auto_yards/nodes/(-1946,16,840).lua index 4dd7c28..3176b25 100644 --- a/auto_yards/nodes/(-1946,16,840).lua +++ b/auto_yards/nodes/(-1946,16,840).lua @@ -13,6 +13,8 @@ local subs = { ['ARC_SB'] = {['pos'] = POS(-1973,16,800), ['msg'] = "notify"}, ['ARC_LOAD_DOCK'] = {['pos'] = POS(-1973,16,800), ['msg'] = "notify_local"}, ['CANNERY'] = {['pos'] = POS(-630,26,2454), ['msg'] = "notify"}, + ['S27_EXPORT'] = {['pos'] = POS(-1444,11,-2546), ['msg'] = "notify"}, + } if event.ext_int or event.punch then diff --git a/auto_yards/nodes/(-1947,16,837).lua b/auto_yards/nodes/(-1947,16,837).lua index 7ddaaf6..5e2841b 100644 --- a/auto_yards/nodes/(-1947,16,837).lua +++ b/auto_yards/nodes/(-1947,16,837).lua @@ -1,2 +1,2 @@ -S.yards.ARC.notify = {['ARC_LOAD'] = true} +S.yards.ARC.notify = {['S27'] = true} print(S.yards.ARC.notify)
\ No newline at end of file diff --git a/auto_yards/nodes/(-1954,16,797).lua b/auto_yards/nodes/(-1953,16,798).lua index 4503e25..4503e25 100644 --- a/auto_yards/nodes/(-1954,16,797).lua +++ b/auto_yards/nodes/(-1953,16,798).lua diff --git a/auto_yards/nodes/(-1959,16,811).lua b/auto_yards/nodes/(-1959,16,811).lua deleted file mode 100644 index 4503e25..0000000 --- a/auto_yards/nodes/(-1959,16,811).lua +++ /dev/null @@ -1 +0,0 @@ -F.lane_EOL("ARC",true)
\ No newline at end of file diff --git a/auto_yards/nodes/(-1958,16,808).lua b/auto_yards/nodes/(-1969,16,824).lua index 4503e25..4503e25 100644 --- a/auto_yards/nodes/(-1958,16,808).lua +++ b/auto_yards/nodes/(-1969,16,824).lua diff --git a/auto_yards/nodes/(-1908,16,835).lua b/auto_yards/nodes/(-1969,16,852).lua index 89349e3..89349e3 100644 --- a/auto_yards/nodes/(-1908,16,835).lua +++ b/auto_yards/nodes/(-1969,16,852).lua diff --git a/auto_yards/nodes/(-1982,3,-1079).lua b/auto_yards/nodes/(-1982,3,-1079).lua deleted file mode 100644 index a878623..0000000 --- a/auto_yards/nodes/(-1982,3,-1079).lua +++ /dev/null @@ -1 +0,0 @@ ---EXIT
\ No newline at end of file diff --git a/auto_yards/nodes/(-2004,2,-1101).lua b/auto_yards/nodes/(-2004,2,-1101).lua index c0d57ae..031f395 100644 --- a/auto_yards/nodes/(-2004,2,-1101).lua +++ b/auto_yards/nodes/(-2004,2,-1101).lua @@ -10,6 +10,7 @@ local subs = { ]]-- ['ARC'] = {['pos'] = POS(-1973,16,800), ['msg'] = "notify"}, + ['NOID'] = {['pos'] = POS(-2204,8,-676), ['msg'] = "notify"}, } if event.ext_int or event.punch then diff --git a/auto_yards/nodes/(-2006,3,-1099).lua b/auto_yards/nodes/(-2006,3,-1099).lua deleted file mode 100644 index d774476..0000000 --- a/auto_yards/nodes/(-2006,3,-1099).lua +++ /dev/null @@ -1,2 +0,0 @@ -if event.digiline then return end -print("Notification Sent")
\ No newline at end of file diff --git a/auto_yards/nodes/(-2029,19,733).lua b/auto_yards/nodes/(-2029,19,733).lua index f88c9f0..afbb94b 100644 --- a/auto_yards/nodes/(-2029,19,733).lua +++ b/auto_yards/nodes/(-2029,19,733).lua @@ -1,14 +1,37 @@ local yard_id = "ARC" + +__approach_callback_mode = 1 +if event.approach and not event.has_entered then --disable ARS for all approaching trains + atc_set_ars_disable(true) + atc_set_lzb_tsr(1) + return +end + if event.train then + if F.has_rc("ARC_YARD_REENTRY") then -- loco will use S23-S approach track as headshunt and re-enter yard -- RC will be removed by the headshunt controller (req to trigger it) -- manually set the route here before ARS has a chance set_route(POS(-2033,21,731),"Yard Reentry (LENGTH LIMIT)") - -- defer re-enabling ARS to ensure the route has been accepted, if not set + F.indicator(S.yards[yard_id].active_indicator_pos,false) + + -- Extract the second exit director from ARC_2nd_EXIT_x and insert if available + -- should be safe to add it now as the route has already been set to reenter the yard first + local rc = F.get_rc_safe():match("ARC_2ND_EXIT_(%S+)") + print("Second Exit RC: "..tostring(rc)) + if rc then + F.remove_rc_match("ARC_2ND_EXIT_%S+") + F.add_rc(rc) + print(F.get_rc_safe()) + end + + -- defer re-enabling ARS to ensure the route has been accepted, or at least queued atc_send("S4D1A1") - return + return end + + -- disregard light exit locos if F.has_rc(yard_id.."_LIGHT_EXIT") then F.remove_rc(yard_id.."_LIGHT_EXIT") atc_set_ars_disable(false) diff --git a/auto_yards/nodes/(-2035,3,-1091).lua b/auto_yards/nodes/(-2035,3,-1091).lua deleted file mode 100644 index cbce1da..0000000 --- a/auto_yards/nodes/(-2035,3,-1091).lua +++ /dev/null @@ -1 +0,0 @@ -F.lane_EOL("BY",false)
\ No newline at end of file diff --git a/auto_yards/nodes/(-2042,19,723).lua b/auto_yards/nodes/(-2042,19,723).lua new file mode 100644 index 0000000..a0d12bd --- /dev/null +++ b/auto_yards/nodes/(-2042,19,723).lua @@ -0,0 +1,8 @@ +if event.train and atc_arrow then + F.remove_rc_match("ARC_LOCOS_%S+") + F.remove_rc_match("ARC_WAGONS_%S+") + F.remove_rc({ + "ARC_DEPART", + "ARC_FINAL_COLLECT" + }) +end
\ No newline at end of file diff --git a/auto_yards/nodes/(-4148,13,-5844).lua b/auto_yards/nodes/(-4148,13,-5844).lua index 06ab20e..18e89c5 100644 --- a/auto_yards/nodes/(-4148,13,-5844).lua +++ b/auto_yards/nodes/(-4148,13,-5844).lua @@ -1,4 +1,5 @@ -- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +-- modified to bounce all trains, rc removal still works though local rev_rc = "DLG_HS_S" local rm_rc = true local autocouple = "DLG_HS_S_AC" @@ -22,10 +23,10 @@ if event.train then return end - if not F.has_rc(rev_rc) then --not our train. disregard - atc_set_ars_disable(false) - return - end + -- if not F.has_rc(rev_rc) then --not our train. disregard + -- atc_set_ars_disable(false) + -- return + -- end if rm_rc then F.remove_rc({rev_rc}) end schedule_in(";01",atc_id) return diff --git a/auto_yards/nodes/(-524,26,2481).lua b/auto_yards/nodes/(-524,26,2481).lua index 74a7624..fb7f7a6 100644 --- a/auto_yards/nodes/(-524,26,2481).lua +++ b/auto_yards/nodes/(-524,26,2481).lua @@ -1,2 +1,3 @@ +if F.has_rc("CAN_INTRA_SHUFFLE") then atc_send("S0WD2A0RS2") return end -- EOL F.lane_EOL("CAN",false)
\ No newline at end of file diff --git a/auto_yards/nodes/(-584,26,2481).lua b/auto_yards/nodes/(-584,26,2481).lua index 46e3050..2995aaa 100644 --- a/auto_yards/nodes/(-584,26,2481).lua +++ b/auto_yards/nodes/(-584,26,2481).lua @@ -1,2 +1,19 @@ +-- Cannery departures lane modified + +local ind = POS(-594,26,2488) --notification indicator + +if F.has_rc("CAN_INTRA_SHUFFLE") then + if not atc_arrow then atc_send("A0S1CplD2S1") return end + split_off_locomotive("A0B0") + F.remove_rc("CAN_CLASS_DEPARTURES") + F.add_rc({ + "CAN_HS_W", + "CAN_send_to_locostore" + }) + atc_send("A1S3") + F.indicator(ind,true) --re-enable the notification as we haven't actually left the yard yet + F.indicator(S.yards.CAN.active_indicator_pos, false) -- disable the active indicator + return +end -- EOL F.lane_EOL("CAN",true)
\ No newline at end of file diff --git a/auto_yards/nodes/(-586,26,2504).lua b/auto_yards/nodes/(-586,26,2504).lua new file mode 100644 index 0000000..e5831fc --- /dev/null +++ b/auto_yards/nodes/(-586,26,2504).lua @@ -0,0 +1,43 @@ +-- Cannery Dirt Loading Lane Modified +local ind = POS(-594,26,2488) --notification indicator +local sand_indicator = POS(-572,26,2515) --sand indicator + +if F.has_rc("CAN_INTRA_SHUFFLE") then + if not atc_arrow then return end + if F.has_rc("CAN_CLASS_DIRT_UNLOAD") then -- remove wagons, step the fc, move wagons to sand loading + F.remove_rc("CAN_CLASS_DIRT_UNLOAD") + F.add_rc({ + "CAN_HS_W", + "CAN_CLASS_SAND_LOAD", + "CAN_FROM_DIRT" + }) + step_fc() + return + end + if F.has_rc("CAN_FROM_DIRT") then --leave wagons and return to locostore, shutting down the yard as we go + F.remove_rc({ + "CAN_CLASS_SAND_LOAD", + "CAN_FROM_DIRT" + }) + split_off_locomotive("A0B0") + F.add_rc({ + "CAN_HS_W", + "CAN_send_to_locostore" + }) + F.indicator(sand_indicator, false) --ensure the sand indicator is off to allow the wagons to load + F.indicator(ind,true) --re-enable the notification as we haven't actually left the yard yet + F.indicator(S.yards.CAN.active_indicator_pos, false) -- disable the active indicator + return + end + if F.has_rc("CAN_CLASS_SAND_LOAD") then -- remove wagons, step the fc, move wagons to departures + F.remove_rc("CAN_CLASS_SAND_LOAD") + F.add_rc({ + "CAN_HS_W", --departures track has Cpl function built in + "CAN_CLASS_DEPARTURES" + }) + F.indicator(sand_indicator, false) -- Loaded wagons have been sent to departures track. Disable the request indicator + return + end + return +end +F.lane_EOL("CAN",true)
\ No newline at end of file diff --git a/auto_yards/nodes/(-586,26,2534).lua b/auto_yards/nodes/(-586,26,2534).lua new file mode 100644 index 0000000..d783815 --- /dev/null +++ b/auto_yards/nodes/(-586,26,2534).lua @@ -0,0 +1,3 @@ +if F.has_rc("CAN_INTRA_SHUFFLE") then atc_send("A0S0WRD5S3A1") return end +-- EOL +F.lane_EOL("CAN",false)
\ No newline at end of file diff --git a/auto_yards/nodes/(-588,26,2504).lua b/auto_yards/nodes/(-588,26,2504).lua index 46e3050..8b1f38e 100644 --- a/auto_yards/nodes/(-588,26,2504).lua +++ b/auto_yards/nodes/(-588,26,2504).lua @@ -1,2 +1,18 @@ --- EOL +-- Cannery Dirt Loading Lane Modified +local ind = POS(-594,26,2488) --notification indicator +local clay_indicator = POS(-570,26,2515) --clay loaded indicator + +if F.has_rc("CAN_INTRA_SHUFFLE") then + if not atc_arrow then return end + if F.has_rc("CAN_CLASS_CLAY_LOAD") then -- remove wagons, step the fc, move wagons to departures + F.remove_rc("CAN_CLASS_CLAY_LOAD") + F.add_rc({ + "CAN_HS_W", --departures track has Cpl function built in + "CAN_CLASS_DEPARTURES" + }) + F.indicator(clay_indicator, false) -- Loaded wagons have been sent to departures track. Disable the request indicator + return + end + return +end F.lane_EOL("CAN",true)
\ No newline at end of file diff --git a/auto_yards/nodes/(-588,26,2534).lua b/auto_yards/nodes/(-588,26,2534).lua index 74a7624..d783815 100644 --- a/auto_yards/nodes/(-588,26,2534).lua +++ b/auto_yards/nodes/(-588,26,2534).lua @@ -1,2 +1,3 @@ +if F.has_rc("CAN_INTRA_SHUFFLE") then atc_send("A0S0WRD5S3A1") return end -- EOL F.lane_EOL("CAN",false)
\ No newline at end of file diff --git a/auto_yards/nodes/(-590,26,2504).lua b/auto_yards/nodes/(-590,26,2504).lua new file mode 100644 index 0000000..7632bd2 --- /dev/null +++ b/auto_yards/nodes/(-590,26,2504).lua @@ -0,0 +1,43 @@ +-- Cannery Dirt Loading Lane Modified +local ind = POS(-594,26,2488) --notification indicator +local sand_indicator = POS(-572,26,2515) --sand indicator + +if F.has_rc("CAN_INTRA_SHUFFLE") then + if not atc_arrow then return end + if F.has_rc("CAN_CLASS_DIRT_UNLOAD") then -- remove wagons, step the fc, move wagons to sand loading + F.remove_rc("CAN_CLASS_DIRT_UNLOAD") + F.add_rc({ + "CAN_HS_W", + "CAN_CLASS_SAND_LOAD", + "CAN_FROM_DIRT" + }) + step_fc() + return + end + if F.has_rc("CAN_FROM_DIRT") then --leave wagons and return to locostore, shutting down the yard as we go + F.remove_rc({ + "CAN_CLASS_SAND_LOAD", + "CAN_FROM_DIRT" + }) + split_off_locomotive("A0B0") + F.add_rc({ + "CAN_HS_W", + "CAN_send_to_locostore" + }) + F.indicator(sand_indicator, false) --ensure the sand indicator is off to allow the wagons to load + F.indicator(ind,true) --re-enable the notification as we haven't actually left the yard yet + F.indicator(S.yards.CAN.active_indicator_pos, false) -- disable the active indicator + return + end + if F.has_rc("CAN_CLASS_SAND_LOAD") then -- remove wagons, step the fc, move wagons to departures + F.remove_rc("CAN_CLASS_SAND_LOAD") + F.add_rc({ + "CAN_HS_W", --departures track has Cpl function built in + "CAN_CLASS_DEPARTURES" + }) + step_fc() + return + end + return +end +F.lane_EOL("CAN",true)
\ No newline at end of file diff --git a/auto_yards/nodes/(-590,26,2534).lua b/auto_yards/nodes/(-590,26,2534).lua new file mode 100644 index 0000000..d783815 --- /dev/null +++ b/auto_yards/nodes/(-590,26,2534).lua @@ -0,0 +1,3 @@ +if F.has_rc("CAN_INTRA_SHUFFLE") then atc_send("A0S0WRD5S3A1") return end +-- EOL +F.lane_EOL("CAN",false)
\ No newline at end of file diff --git a/auto_yards/nodes/(-630,26,2454).lua b/auto_yards/nodes/(-630,26,2454).lua index 5715c34..d968800 100644 --- a/auto_yards/nodes/(-630,26,2454).lua +++ b/auto_yards/nodes/(-630,26,2454).lua @@ -1,22 +1,70 @@ +-- Cannery Loco Storage local notification_id = "CAN" -local ind = POS(-594,26,2488) -local shuffle_ind = POS(-594,26,2487) +local ind = POS(-594,26,2488) --notification indicator +local sand_indicator = POS(-572,26,2515) --sand loaded indicator +local clay_indicator = POS(-570,26,2515) --clay loaded indicator local print_notification = true + +local sections = { + clay_loading = "769966", + sand_loading = "199126", + dirt_unloading = "541313", + departures = "484515" +} + local function send_train() - set_rc("FREIGHT CAN_LOCOSTORE CAN_LIGHT_EXIT EWL-W EWL S23 ARC_AUTO ARC_RTS ARC_COLLECT_CANNERY ARC_AUTO_S23N CANNERY CAN_RTS CAN_COLLECT_ARC") + if F.indicator(S.yards[notification_id].active_indicator_pos) then -- another train already in the yard. wait for it to exit first + print("yard still active") + schedule_in("0;2","send_train") + return + end + print("Sending Train") + local base_rc = { + "FREIGHT", + "CAN_LOCOSTORE", + "EWL-W", + "EWL", + "S23", + "ARC_AUTO", + "ARC_COLLECT_CANNERY", + "ARC_AUTO_S23N", + "CANNERY", + "CAN_COLLECT_DEPARTURES" + } + if section_occupancy(sections.clay_loading)[1] and F.indicator(clay_indicator) then -- move the loaded clay wagons to the departures track when requested + base_rc[#base_rc+1] = "CAN_INTRA_SHUFFLE" + base_rc[#base_rc+1] = "CAN_HS_W" + base_rc[#base_rc+1] = "CAN_HS_W_AC" + base_rc[#base_rc+1] = "CAN_CLASS_CLAY_LOAD" + F.indicator(S.yards.CAN.active_indicator_pos, true) --activate the yard to prevent other trains entering while we're moving around + print("Collecting loaded clay wagons") + elseif section_occupancy(sections.sand_loading)[1] and F.indicator(sand_indicator) then -- move the loaded sand wagons to the departures track when requested + base_rc[#base_rc+1] = "CAN_INTRA_SHUFFLE" + base_rc[#base_rc+1] = "CAN_HS_W" + base_rc[#base_rc+1] = "CAN_HS_W_AC" + base_rc[#base_rc+1] = "CAN_CLASS_SAND_LOAD" + F.indicator(S.yards.CAN.active_indicator_pos, true) --activate the yard to prevent other trains entering while we're moving around + print("Collecting loaded sand wagons") + elseif section_occupancy(sections.dirt_unloading)[1] and not section_occupancy(sections.sand_loading)[1] then -- move the unloaded dirt wagons to the sand track if there's room + base_rc[#base_rc+1] = "CAN_INTRA_SHUFFLE" + base_rc[#base_rc+1] = "CAN_HS_W" + base_rc[#base_rc+1] = "CAN_HS_W_AC" + base_rc[#base_rc+1] = "CAN_CLASS_DIRT_UNLOAD" + F.indicator(S.yards.CAN.active_indicator_pos, true) --activate the yard to prevent other trains entering while we're moving around + print("Respotting unloaded dirt wagons to sand loading area") + elseif section_occupancy(sections.departures)[1] then --collect departures wagons before departing proper + base_rc[#base_rc+1] = "CAN_REENTER_YARD" + F.indicator(ind, false) + print("Collecting Departures") + else + base_rc[#base_rc+1] = "CAN_LIGHT_EXIT" + end + print("rc list set") + set_rc(table.concat(base_rc," ")) + print("rc set") atc_send("S0WRD2A1S4") F.indicator(ind,false) -end - -local function shuffle_wagons() - F.indicator(S.yards[notification_id].active_indicator_pos, true) --stop other trains entering the yard - F.indicator(S.yards[notification_id].dir_indicator_pos,true) - F.indicator(shuffle_ind,false) - F.indicator(ind,true) - S.yards[notification_id].shuffle_stage = 1 -- set a shuffle stage counter - set_rc("CAN_LOCOSTORE CAN_SHUFFLE") - atc_send("S0WRD2A1S4") --send train to headshunt - return + print("train sent") end if event.ext_int then @@ -30,44 +78,27 @@ if event.ext_int then F.indicator(ind,true) return end - elseif event.message == "shuffle" then - if atc_id then - if not F.indicator(S.yards[notification_id].active_indicator_pos) then - shuffle_wagons() - return - end - schedule_in(":05","shuffle") - return - else - F.indicator(shuffle_ind,true) - return - end + return end return end if event.schedule then - if event.message=="shuffle" then - if not F.idicator(S.yards[notification_id].active_indicator_pos) then - shuffle_wagons() - return - end - schedule_in(":05","shuffle") + if event.msg=="send_train" then + send_train() return end return end if event.train then - unset_autocouple() - if F.indicator(shuffle_ind) then - shuffle_wagons() - return - end + print("Train arrived") if F.indicator(ind) then + print("indicator on. Sending Train") send_train() return end + print("train movements completed") atc_send("B0") return end
\ No newline at end of file diff --git a/auto_yards/nodes/(-633,26,2456).lua b/auto_yards/nodes/(-633,26,2456).lua deleted file mode 100644 index 8dc117b..0000000 --- a/auto_yards/nodes/(-633,26,2456).lua +++ /dev/null @@ -1,4 +0,0 @@ -if event.punch then - F.indicator(S.yards.CAN.active_indicator_pos,false) - interrupt_pos(POS(-630,26,2454),"shuffle") -end
\ No newline at end of file diff --git a/auto_yards/nodes/(-643,26,2475).lua b/auto_yards/nodes/(-643,26,2475).lua index 086074b..cd822d6 100644 --- a/auto_yards/nodes/(-643,26,2475).lua +++ b/auto_yards/nodes/(-643,26,2475).lua @@ -1,37 +1,50 @@ --- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt -local rev_rc = "CAN_HS_N" -local rm_rc = true -local autocouple = "CAN_HS_N_AC" -local rm_cpl_rc = true - - -__approach_callback_mode = 1 - -if event.approach and not event.has_entered then - atc_set_lzb_tsr(3) - atc_set_ars_disable(true) - return -end +--Cannery Yard Headshunt +local yard_id = "CAN" if event.train then - if not atc_arrow then --train has bounced - if F.has_rc(autocouple) then - atc_send("CplS0WD2S1") - if rm_cpl_rc then F.remove_rc({autocouple}) end + if F.has_rc(yard_id.."_LIGHT_EXIT") then return end + if F.has_rc(yard_id.."_NOSHUNT") then return end + if F.has_rc("CAN_HS_W") then + if not atc_arrow then + atc_send("B3") + schedule_in("0;01", atc_id) + return end - return - end - - if not F.has_rc(rev_rc) then --not our train. disregard atc_set_ars_disable(false) + F.remove_rc("CAN_HS_W") + if F.has_rc("CAN_HS_W_AC") then + F.remove_rc("CAN_HS_W_AC") + atc_send("S3CplS0D2S3") + return + end return end - if rm_rc then F.remove_rc({rev_rc}) end - schedule_in(";01",atc_id) - return + if train_length() == 1 then -- eliminates near half the trains + if F.has_rc(yard_id.."_LOCOSTORE") then -- specifies only the relevant train + if F.has_rc(yard_id.."_DEPART") and F.has_rc(yard_id.."_FINAL_COLLECT") and F.has_rc(yard_id.."_HEADSHUNT") then --only activate if train is set to depart anyway + if not atc_arrow then -- train is pointing towards exit. let it pass and the reverse it + atc_set_ars_disable(true) + schedule_in(";01",atc_id) -- prepare to reverse the train + return + else --train has reversed. send it to the siding and deactivate the yard + F.remove_rc({yard_id.."_DEPART",yard_id.."_FINAL_COLLECT"}) + F.add_rc(yard_id.."_send_to_locostore") + atc_set_ars_disable(false) + F.indicator(S.yards[yard_id].active_indicator_pos, false) + S.yards[yard_id].departure_time = rwt.now() + S.yards[yard_id].departure_length = S.yards[yard_id].arrival_length + + if S.yards[yard_id].notify_pos then + interrupt_pos(S.yards[yard_id].notify_pos,"notify") + end + return + end + end + end + end end -if event.schedule then +if event.schedule then --this is a duplicate of the reversing schedule in the env anyway if not atc_id then --bounce the train that just passed atc_send_to_train(event.msg,"B0WRD1A1S3") else @@ -40,6 +53,13 @@ if event.schedule then else -- somehow another train crossed the controller before the first one returned. Unlikely but possible atc_send_to_train(event.msg,"BBOL") atc_send("BBOL") + F.indicator(yard.error_indicator_pos,true) end end -end
\ No newline at end of file + return +end + + + +-- if all else fails, do a normal headshunt_yard function +F.headshunt_yard(yard_id,true)
\ No newline at end of file diff --git a/auto_yards/nodes/(-668,20,2478).lua b/auto_yards/nodes/(-668,20,2478).lua index 7c582c0..beb2639 100644 --- a/auto_yards/nodes/(-668,20,2478).lua +++ b/auto_yards/nodes/(-668,20,2478).lua @@ -1,3 +1,3 @@ -- arrival -if not F.has_rc("CANNERY") then return end -F.yard_arrival("CAN",false)
\ No newline at end of file +if not F.has_rc("CANNERY") and not atc_arrow then return end +F.yard_arrival("CAN", false, true)
\ No newline at end of file diff --git a/auto_yards/nodes/(-719,20,2475).lua b/auto_yards/nodes/(-719,20,2475).lua index acfc06a..350ff88 100644 --- a/auto_yards/nodes/(-719,20,2475).lua +++ b/auto_yards/nodes/(-719,20,2475).lua @@ -1,6 +1,6 @@ local yard_id = "CAN" if event.train then - if F.has_rc(yard_id.."_LIGHT_EXIT") then + if F.has_rc(yard_id.."_LIGHT_EXIT") or F.has_rc(yard_id.."_REENTER_YARD") then F.remove_rc(yard_id.."_LIGHT_EXIT") atc_set_ars_disable(false) atc_send("SM") diff --git a/auto_yards/nodes/(416,17,5).lua b/auto_yards/nodes/(416,17,5).lua deleted file mode 100644 index e8c1b0e..0000000 --- a/auto_yards/nodes/(416,17,5).lua +++ /dev/null @@ -1,27 +0,0 @@ -local stack = function(t,channel,num_screens) - for i=0,math.ceil(#t/4) do - local calc = i*4 - local working_t = {t[calc+1],t[calc+2],t[calc+3],t[calc+4]} - local message = table.concat(working_t,"\n") - if i+1 > num_screens then return end - digiline_send(channel..i+1,message) - end -end - -if event.channel=="clock" or event.punch then - local txt = {"-- AUTOMATIC YARD STATUS --","Railway Time: "..rwt.to_string(rwt.now(),true),"LHF Trains: 719814"," ========================"} - local s - for yard_id,info in pairs(S.yards) do - table.insert(txt, yard_id.." - Active: " .. tostring(F.indicator(info.active_indicator_pos))) - table.insert(txt," Direction: " .. tostring(F.indicator(info.dir_indicator_pos))) - table.insert(txt," Error: ".. tostring(F.indicator(info.error_indicator_pos))) - if info.notify and info.notify[1] then - table.insert(txt,"Notify: "..table.concat(info.notify,", ")) - else - table.insert(txt,"Notify: N/A") - end - end - - stack(txt,"yard_status",4) - return -end
\ No newline at end of file diff --git a/auto_yards/nodes/(417,17,4).lua b/auto_yards/nodes/(417,17,4).lua index b634cde..b72d4eb 100644 --- a/auto_yards/nodes/(417,17,4).lua +++ b/auto_yards/nodes/(417,17,4).lua @@ -25,7 +25,7 @@ if event.channel=="clock" then txt[#txt+1] = "Active: " .. tostring(F.indicator(info.active_indicator_pos)) txt[#txt+1] = "Direction: " .. tostring(F.indicator(info.dir_indicator_pos)) - txt[#txt+1] = "Last Train: " .. tostring(info.last_id).." ("..tostring(info.arrival_length).."-"..tostring(info.departure_length)..")" + txt[#txt+1] = "Last Train: " .. tostring(S.known_trains[info.last_id] or info.last_id).." ("..tostring(info.arrival_length).."-"..tostring(info.departure_length)..")" txt2[#txt2+1] = "Time: "..tostring(rwt.to_string(info.arrival_time)).."+"..tostring(rwt.to_string(rwt.diff(info.arrival_time,info.departure_time))) digiline_send(yard_id.."_1",table.concat(txt,"\n")) diff --git a/auto_yards/nodes/(771,14,-16).lua b/auto_yards/nodes/(771,14,-16).lua new file mode 100644 index 0000000..447dce1 --- /dev/null +++ b/auto_yards/nodes/(771,14,-16).lua @@ -0,0 +1,55 @@ +--leekston collection controller +local up_dir = "North" +local down_dir = "South" +local up_dir_indicator = POS(771,13,-14) +local down_dir_indicator = POS(771,13,-15) +local exit_indicator_pos = POS(771,13,-18) + +local userlist = { + "Maverick2797", + "mary4" +} + +if event.ext_int then --to be pinged by the departing LHF train only + local dir + if F.indicator(exit_indicator_pos) then + F.indicator(up_dir_indicator, false) + dir = up_dir + else + F.indicator(down_dir_indicator, false) + dir = down_dir + end + digiline_send("lcd",string.format("%s | Train collected and departed %sbound",rwt.to_string(rwt.now()), dir)) + return +end + +--confirm user is actually allowed to use this system +local permitted_user = false +for _,name in pairs(userlist) do + if name == event.name then + permitted_user = name + break + end +end +if not permitted_user then + digiline_send("lcd","User is not permitted to use this. Contact a moderator") + return +end + +local dir = "" +--cycle through the departure options +if F.indicator(up_dir_indicator) then + F.indicator(up_dir_indicator, false) + F.indicator(down_dir_indicator, true) + dir = down_dir.."bound" +elseif F.indicator(down_dir_indicator) then + F.indicator(up_dir_indicator, false) + F.indicator(down_dir_indicator, false) + dir = "Disabled" +else + F.indicator(up_dir_indicator, true) + F.indicator(down_dir_indicator, false) + dir = up_dir.."bound" +end + +digiline_send("lcd",string.format("%s\nCollection %s.\nUser %s", rwt.to_string(rwt.now()), dir, event.name))
\ No newline at end of file diff --git a/auto_yards/nodes/(775,13,-20).lua b/auto_yards/nodes/(775,13,-20).lua new file mode 100644 index 0000000..8cd2bb9 --- /dev/null +++ b/auto_yards/nodes/(775,13,-20).lua @@ -0,0 +1 @@ +interrupt_pos(POS(771,14,-16))
\ No newline at end of file diff --git a/auto_yards/nodes/(783,10,-57).lua b/auto_yards/nodes/(783,10,-57).lua new file mode 100644 index 0000000..e56cc30 --- /dev/null +++ b/auto_yards/nodes/(783,10,-57).lua @@ -0,0 +1,2 @@ +if not F.has_rc("LEEK_EXIT") then return end +-- remove any extra yard RCs here
\ No newline at end of file diff --git a/auto_yards/nodes/(785,10,40).lua b/auto_yards/nodes/(785,10,40).lua new file mode 100644 index 0000000..e56cc30 --- /dev/null +++ b/auto_yards/nodes/(785,10,40).lua @@ -0,0 +1,2 @@ +if not F.has_rc("LEEK_EXIT") then return end +-- remove any extra yard RCs here
\ No newline at end of file diff --git a/auto_yards/nodes/(789,10,-31).lua b/auto_yards/nodes/(789,10,-31).lua new file mode 100644 index 0000000..e877483 --- /dev/null +++ b/auto_yards/nodes/(789,10,-31).lua @@ -0,0 +1 @@ +-- arrival, dir = false
\ No newline at end of file diff --git a/auto_yards/nodes/(789,10,13).lua b/auto_yards/nodes/(789,10,13).lua new file mode 100644 index 0000000..4d16159 --- /dev/null +++ b/auto_yards/nodes/(789,10,13).lua @@ -0,0 +1 @@ +-- arrival, dir = true
\ No newline at end of file diff --git a/auto_yards/nodes/(792,10,-31).lua b/auto_yards/nodes/(792,10,-31).lua new file mode 100644 index 0000000..fa98cc9 --- /dev/null +++ b/auto_yards/nodes/(792,10,-31).lua @@ -0,0 +1 @@ +-- continue onwards
\ No newline at end of file diff --git a/auto_yards/nodes/(792,10,11).lua b/auto_yards/nodes/(792,10,11).lua new file mode 100644 index 0000000..ece3c16 --- /dev/null +++ b/auto_yards/nodes/(792,10,11).lua @@ -0,0 +1 @@ +-- continue northwards
\ No newline at end of file diff --git a/auto_yards/nodes/(794,10,31).lua b/auto_yards/nodes/(794,10,31).lua new file mode 100644 index 0000000..f7e80a9 --- /dev/null +++ b/auto_yards/nodes/(794,10,31).lua @@ -0,0 +1,46 @@ +-- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +local rev_rc = "LEEK_HS_north" +local rm_rc = true +local autocouple = nil +local rm_cpl_rc = true + +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + if not F.has_rc(rev_rc) then return end + atc_set_lzb_tsr(3) + atc_set_ars_disable(true) + return +end + +if event.train then + if not atc_arrow then --train has bounced + if F.has_rc(autocouple) then + atc_send("CplS0WD2S1") + if rm_cpl_rc then F.remove_rc({autocouple}) end + end + return + end + + if not F.has_rc(rev_rc) then --not our train. disregard + atc_set_ars_disable(false) + return + end + atc_send("S3") + if rm_rc then F.remove_rc({rev_rc}) end + schedule_in(";01",atc_id) + return +end + +if event.schedule then + if not atc_id then --bounce the train that just passed + atc_send_to_train(event.msg,"B0WRD1A1S3") + else + if atc_id == event.msg then --train hasn't fully passed yet, wait a bit longer + schedule_in(";01",atc_id) + else -- somehow another train crossed the controller before the first one returned. Unlikely but possible + atc_send_to_train(event.msg,"BBOL") + atc_send("BBOL") + end + end +end
\ No newline at end of file diff --git a/auto_yards/nodes/(796,10,-39).lua b/auto_yards/nodes/(796,10,-39).lua new file mode 100644 index 0000000..265c211 --- /dev/null +++ b/auto_yards/nodes/(796,10,-39).lua @@ -0,0 +1 @@ +-- collection track (controlled by tower UI)
\ No newline at end of file diff --git a/auto_yards/nodes/(796,10,-54).lua b/auto_yards/nodes/(796,10,-54).lua new file mode 100644 index 0000000..a3f3e42 --- /dev/null +++ b/auto_yards/nodes/(796,10,-54).lua @@ -0,0 +1,46 @@ +-- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +local rev_rc = "LEEK_HS_south" +local rm_rc = true +local autocouple = nil +local rm_cpl_rc = true + +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + if not F.has_rc(rev_rc) then return end + atc_set_lzb_tsr(3) + atc_set_ars_disable(true) + return +end + +if event.train then + if not atc_arrow then --train has bounced + if F.has_rc(autocouple) then + atc_send("CplS0WD2S1") + if rm_cpl_rc then F.remove_rc({autocouple}) end + end + return + end + + if not F.has_rc(rev_rc) then --not our train. disregard + atc_set_ars_disable(false) + return + end + atc_send("S3") + if rm_rc then F.remove_rc({rev_rc}) end + schedule_in(";01",atc_id) + return +end + +if event.schedule then + if not atc_id then --bounce the train that just passed + atc_send_to_train(event.msg,"B0WRD1A1S3") + else + if atc_id == event.msg then --train hasn't fully passed yet, wait a bit longer + schedule_in(";01",atc_id) + else -- somehow another train crossed the controller before the first one returned. Unlikely but possible + atc_send_to_train(event.msg,"BBOL") + atc_send("BBOL") + end + end +end
\ No newline at end of file diff --git a/auto_yards/nodes/(796,10,3).lua b/auto_yards/nodes/(796,10,3).lua new file mode 100644 index 0000000..265c211 --- /dev/null +++ b/auto_yards/nodes/(796,10,3).lua @@ -0,0 +1 @@ +-- collection track (controlled by tower UI)
\ No newline at end of file diff --git a/auto_yards/nodes/(799,10,-37).lua b/auto_yards/nodes/(799,10,-37).lua new file mode 100644 index 0000000..1db4581 --- /dev/null +++ b/auto_yards/nodes/(799,10,-37).lua @@ -0,0 +1 @@ +-- drop off here from LFH
\ No newline at end of file diff --git a/auto_yards/nodes/(799,10,3).lua b/auto_yards/nodes/(799,10,3).lua new file mode 100644 index 0000000..1db4581 --- /dev/null +++ b/auto_yards/nodes/(799,10,3).lua @@ -0,0 +1 @@ +-- drop off here from LFH
\ No newline at end of file diff --git a/durt/init_code.lua b/durt/init_code.lua index cf4207c..291285a 100644 --- a/durt/init_code.lua +++ b/durt/init_code.lua @@ -1,9 +1,5 @@ --[[ Misc Code ]]-- -S.runarounds = { - ["M27_Breaker_Factory"] = {}, - ["DJnc_4"] = {}, -} if event.init then local list_of_yards = { ["WOA"] = {}, diff --git a/durt/nodes/(-1373,10,-2507).lua b/durt/nodes/(-1373,10,-2507).lua index 450ca4a..b48996c 100644 --- a/durt/nodes/(-1373,10,-2507).lua +++ b/durt/nodes/(-1373,10,-2507).lua @@ -1,5 +1,10 @@ -if atc_arrow and F.has_rc("S27_EXP_EXIT") then - F.remove_rc("S27_EXP_EXIT") +if atc_arrow and F.has_rc("S27_EXP_EXIT_N") then + F.remove_rc({ + "S27_EXP_EXIT_N", + "S27_EXPORT_FINAL", + "S27_EXPORT_ACTIVE" + }) + step_fc() atc_send("D10SM") return end
\ No newline at end of file diff --git a/durt/nodes/(-1403,11,-2533).lua b/durt/nodes/(-1403,11,-2533).lua index 898b856..e6f76db 100644 --- a/durt/nodes/(-1403,11,-2533).lua +++ b/durt/nodes/(-1403,11,-2533).lua @@ -1,6 +1,8 @@ -local rev_rc = "S27_REV_East" -local rm_rc = false - +-- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +local rev_rc = "S27_EXP_HS_N" +local rm_rc = true +local autocouple = "S27_EXP_HS_N_AC" +local rm_cpl_rc = true __approach_callback_mode = 1 @@ -10,38 +12,25 @@ if event.approach and not event.has_entered then return end -if event.train and atc_arrow then - if not F.has_rc(rev_rc) then - atc_set_ars_disable(false) +if event.train then + if not atc_arrow then --train has bounced + if F.has_rc("S27_EXPORT_ACTIVE") and not F.has_rc("S27_EXPORT_FINAL") then + if not section_occupancy("254098")[1] then --no more train to shuffle + F.add_rc("S27_EXPORT_FINAL") + end + end + if F.has_rc(autocouple) then + atc_send("CplS0WD2S1") + if rm_cpl_rc then F.remove_rc({autocouple}) end + end return end - if rm_rc then F.remove_rc({rev_rc}) end - if F.has_rc("S27_SHUNTER") then - local stages = { - "S27_EXP_PICKUP", - "S27_EXP_LOAD", - "S27_EXP_DEPART" - } - - for i,v in ipairs(stages) do - if F.has_rc(v) then - unset_autocouple() - F.remove_rc(v) - local next_stage = stages[i == #stages and 1 or i+1] - if next_stage == "S27_EXP_PICKUP" and not section_occupancy("254098")[1] then -- no wagons left to load. store loco - F.add_rc("S27_LOCOSTORE") - break - end - if next_stage ~= "S27_EXP_DEPART" then - set_autocouple() - end - F.add_rc(next_stage) - - break - end - end + if not F.has_rc(rev_rc) then --not our train. disregard + atc_set_ars_disable(false) + return end + if rm_rc then F.remove_rc({rev_rc}) end schedule_in(";01",atc_id) return end diff --git a/durt/nodes/(-1419,11,-2545).lua b/durt/nodes/(-1419,11,-2545).lua new file mode 100644 index 0000000..36c4310 --- /dev/null +++ b/durt/nodes/(-1419,11,-2545).lua @@ -0,0 +1,17 @@ +-- S27 Export Arrivals Splitter +if not F.has_rc("S27_EXPORT_ACTIVE") then return end + +if not atc_arrow then -- loco has rejoined from headshunt + F.remove_rc_match("S27_EXP_DIR_%S+") + return +end + +local fc = split_at_fc("A0B0",2) or "DEPART" --should be either SAND_RAMP or DIRT_LOAD. anything else goes to departures +F.add_rc({ + "S27_EXP_HS_N", + "S27_EXP_DIR_"..fc +}) +if fc == "DEPART" then + F.add_rc("S27_EXP_HS_N_AC") +end +atc_send("S3")
\ No newline at end of file diff --git a/durt/nodes/(-1426,11,-2548).lua b/durt/nodes/(-1426,11,-2548).lua new file mode 100644 index 0000000..127133d --- /dev/null +++ b/durt/nodes/(-1426,11,-2548).lua @@ -0,0 +1,21 @@ +-- S27 Export Departures splitter +if not F.has_rc("S27_SHUNTER") or not F.has_rc("S27_EXPORT_ACTIVE") then return end +if not atc_arrow then + F.remove_rc_match("S27_EXP_DIR_%S+") + return +end + +if not F.has_rc("S27_EXPORT_FINAL") then --still more train to shuffle + split_off_locomotive("A0B0",2) + F.add_rc({ + "S27_EXP_HS_N", + "S27_EXP_HS_N_AC", + "S27_EXP_DIR_ARRIVALS", + }) + return +end + +F.add_rc({ + "S27_EXP_EXIT_N" +}) +atc_send("S3") diff --git a/durt/nodes/(-1433,11,-2563).lua b/durt/nodes/(-1433,11,-2563).lua index 7ac821e..9bccb9e 100644 --- a/durt/nodes/(-1433,11,-2563).lua +++ b/durt/nodes/(-1433,11,-2563).lua @@ -1,25 +1 @@ -__approach_callback_mode = 1 - -if event.approach and not event.has_entered then - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) - return -end - -if event.train and atc_arrow then - if not F.has_rc("S27_EXP_WAIT") then - atc_set_ars_disable(false) - return - end - atc_send("S0") - return -end - -if event.ext_int and atc_id then - F.remove_rc("S27_REV_West S27_EXP_WAIT") - F.add_rc("S27_REV_East S27_EXP_DEPART") - atc_send("S3") - atc_set_ars_disable(false) - set_autocouple() - return -end
\ No newline at end of file +F.remove_rc("S27_EXP_AROUND")
\ No newline at end of file diff --git a/durt/nodes/(-1439,11,-2551).lua b/durt/nodes/(-1439,11,-2551).lua new file mode 100644 index 0000000..14b91b4 --- /dev/null +++ b/durt/nodes/(-1439,11,-2551).lua @@ -0,0 +1,17 @@ +-- S27 Load/Unload Ramp +if not F.has_rc("S27_SHUNTER") or not F.has_rc("S27_EXPORT_ACTIVE") then return end +if atc_arrow then + F.remove_rc_match("S27_EXP_DIR_%S+") + step_fc() + local fc = split_at_fc("A0B0",2) or "DEPART" --should be either DIRT_LOAD or DEPART. anything else goes to departures by default + F.add_rc({ + "S27_EXP_HS_N", + "S27_EXP_DIR_"..fc + }) + if fc == "DEPART" then + F.add_rc("S27_EXP_HS_N_AC") + end + atc_send("A1S3") + return +end +atc_send("S1")
\ No newline at end of file diff --git a/durt/nodes/(-1442,11,-2568).lua b/durt/nodes/(-1442,11,-2568).lua index 6888f6b..5346db1 100644 --- a/durt/nodes/(-1442,11,-2568).lua +++ b/durt/nodes/(-1442,11,-2568).lua @@ -1,17 +1,25 @@ -local ind = POS(-1444,10,-2546) -if event.train and atc_arrow then - if not F.has_rc("S27_SHUNTER") then - step_fc() - split_off_locomotive("BBA0") - F.add_rc("S27_REV_West S27_EXP_WAIT S27_EXP_COLLECT") - F.indicator(ind,true) - return - end - unset_autocouple() - atc_send("A0BB") - if train_length() > 2 then -- if length > 2 it would try to discouple the nose - split_at_index(train_length()-1,"BBWRD2S3A1") - return - end - atc_send("BBWRD2S3A1") -end
\ No newline at end of file +--S27 Export Arrivals +if not atc_arrow then return end +if not F.has_rc("S27_SHUNTER") then return end +if train_length() == 1 then --return loco to storage via N headshunt (backwards) + F.add_rc({ + "S27_EXP_LOCOSTORE", + "S27_EXP_HS_N", + }) + atc_send("S0WD3RS3") + return +end +if not F.has_rc("S27_EXPORT_ACTIVE") then --train has just arrived. run around + split_off_locomotive("A0B0",1) + F.add_rc({ + "S27_EXPORT_ACTIVE", + "S27_EXP_HS_S", + "S27_EXP_AROUND", + "S27_EXP_HS_N", + "S27_EXP_HS_N_AC", + "S27_EXP_DIR_ARRIVALS" + }) + return +end +F.remove_rc("S27_EXP_AROUND") +atc_send("S0WD3RS1") --bounce the train
\ No newline at end of file diff --git a/durt/nodes/(-1444,11,-2546).lua b/durt/nodes/(-1444,11,-2546).lua index 235e7d3..aeef76b 100644 --- a/durt/nodes/(-1444,11,-2546).lua +++ b/durt/nodes/(-1444,11,-2546).lua @@ -1,10 +1,23 @@ local ind = POS(-1444,10,-2546) local function send_train() - set_rc("S27_SHUNTER S27_REV_East S27") + local rc = { + "FREIGHT", + "S27_SHUNTER", + "S27_EXP_EXIT_N", + "S27_EXP", + "S23", + "ARC_AUTO", + "ARC_COLLECT_S27_EXPORT", + "ARC_AUTO_S23S", + "MGGR" + } + set_rc(table.concat(rc," ")) atc_send("S0WRD2A1S4") + print(rwt.to_string(rwt.now()).." S27_EXPORT Send Train") F.indicator(ind,false) end if event.ext_int then + print(rwt.to_string(rwt.now()).." S27_EXPORT RX Notification") if F.indicator(ind) then return end if atc_id then send_train() diff --git a/durt/nodes/(-1444,11,-2556).lua b/durt/nodes/(-1444,11,-2556).lua new file mode 100644 index 0000000..14b91b4 --- /dev/null +++ b/durt/nodes/(-1444,11,-2556).lua @@ -0,0 +1,17 @@ +-- S27 Load/Unload Ramp +if not F.has_rc("S27_SHUNTER") or not F.has_rc("S27_EXPORT_ACTIVE") then return end +if atc_arrow then + F.remove_rc_match("S27_EXP_DIR_%S+") + step_fc() + local fc = split_at_fc("A0B0",2) or "DEPART" --should be either DIRT_LOAD or DEPART. anything else goes to departures by default + F.add_rc({ + "S27_EXP_HS_N", + "S27_EXP_DIR_"..fc + }) + if fc == "DEPART" then + F.add_rc("S27_EXP_HS_N_AC") + end + atc_send("A1S3") + return +end +atc_send("S1")
\ No newline at end of file diff --git a/durt/nodes/(-1446,11,-2568).lua b/durt/nodes/(-1446,11,-2568).lua index bca38cc..6db85e3 100644 --- a/durt/nodes/(-1446,11,-2568).lua +++ b/durt/nodes/(-1446,11,-2568).lua @@ -1,7 +1,3 @@ -if event.train and atc_arrow then - if not F.has_rc("S27_SHUNTER") then return end - atc_reset() - atc_set_ars_disable(true) - atc_send("BB") - split_at_index(train_length(),"S0WRD1S3A1") -end
\ No newline at end of file +-- S27 Export Departures Bouncer +if not F.has_rc("S27_SHUNTER") or not F.has_rc("S27_EXPORT_ACTIVE") then return end +if atc_arrow then atc_send("A0B0WRD2S2A1") return end
\ No newline at end of file diff --git a/durt/nodes/(-1457,11,-2573).lua b/durt/nodes/(-1457,11,-2573).lua index 8f984b2..cb9eb3c 100644 --- a/durt/nodes/(-1457,11,-2573).lua +++ b/durt/nodes/(-1457,11,-2573).lua @@ -1,17 +1,27 @@ -local rev_rc = "S27_REV_West" -local rm_rc = false - +-- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +local rev_rc = "S27_EXP_HS_S" +local rm_rc = true +local autocouple = "S27_EXP_HS_S_AC" +local rm_cpl_rc = true __approach_callback_mode = 1 if event.approach and not event.has_entered then - atc_set_lzb_tsr(1) + atc_set_lzb_tsr(3) atc_set_ars_disable(true) return end -if event.train and atc_arrow then - if not F.has_rc(rev_rc) then +if event.train then + if not atc_arrow then --train has bounced + if F.has_rc(autocouple) then + atc_send("CplS0WD2S1") + if rm_cpl_rc then F.remove_rc({autocouple}) end + end + return + end + + if not F.has_rc(rev_rc) then --not our train. disregard atc_set_ars_disable(false) return end diff --git a/durt/nodes/(-1468,11,-2561).lua b/durt/nodes/(-1468,11,-2561).lua index df410b9..04e5a88 100644 --- a/durt/nodes/(-1468,11,-2561).lua +++ b/durt/nodes/(-1468,11,-2561).lua @@ -1,5 +1,5 @@ if event.train and atc_arrow then F.remove_rc({"S27_slag_shed"}) - F.add_rc({"S27_main_yard"}) + F.add_rc({"S27_main_yard", "S27_EXP_HS_N"}) atc_send("A0S0WRD50S3A1") end diff --git a/durt/nodes/(-1476,11,-2588).lua b/durt/nodes/(-1476,11,-2588).lua index 2701812..7c1c1d0 100644 --- a/durt/nodes/(-1476,11,-2588).lua +++ b/durt/nodes/(-1476,11,-2588).lua @@ -1,6 +1,6 @@ __approach_callback_mode = 1 -if event.approach and not event.has_entered then +if event.approach then atc_set_ars_disable(true) atc_set_lzb_tsr(1) end diff --git a/durt/nodes/(-1478,11,-2588).lua b/durt/nodes/(-1478,11,-2588).lua deleted file mode 100644 index 0239c6a..0000000 --- a/durt/nodes/(-1478,11,-2588).lua +++ /dev/null @@ -1,14 +0,0 @@ -__approach_callback_mode = 1 - -if event.approach and not event.has_entered then - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) -end - -if event.train then - if atc_arrow then - atc_send("S1") - else - digiline_send("unloader","start") - end -end
\ No newline at end of file diff --git a/durt/nodes/(-1489,11,-2588).lua b/durt/nodes/(-1489,11,-2588).lua deleted file mode 100644 index 0239c6a..0000000 --- a/durt/nodes/(-1489,11,-2588).lua +++ /dev/null @@ -1,14 +0,0 @@ -__approach_callback_mode = 1 - -if event.approach and not event.has_entered then - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) -end - -if event.train then - if atc_arrow then - atc_send("S1") - else - digiline_send("unloader","start") - end -end
\ No newline at end of file diff --git a/durt/nodes/(-149,8,-2209).lua b/durt/nodes/(-149,8,-2209).lua deleted file mode 100644 index c5bdaaf..0000000 --- a/durt/nodes/(-149,8,-2209).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Acm","E")
\ No newline at end of file diff --git a/durt/nodes/(-1497,16,-2594).lua b/durt/nodes/(-1497,16,-2594).lua deleted file mode 100644 index e0ed6bc..0000000 --- a/durt/nodes/(-1497,16,-2594).lua +++ /dev/null @@ -1,6 +0,0 @@ -if event.type=="digiline" then - if event.channel=="shunt_type" then - S.yards.S27.shunt_type = event.msg - digiline_send("lcd","====== | Shunt | Split | "..tostring(S.yards.S27.shunt_type).." | ======") - end -end
\ No newline at end of file diff --git a/durt/nodes/(-1501,11,-2588).lua b/durt/nodes/(-1501,11,-2588).lua index 2701812..7c1c1d0 100644 --- a/durt/nodes/(-1501,11,-2588).lua +++ b/durt/nodes/(-1501,11,-2588).lua @@ -1,6 +1,6 @@ __approach_callback_mode = 1 -if event.approach and not event.has_entered then +if event.approach then atc_set_ars_disable(true) atc_set_lzb_tsr(1) end diff --git a/durt/nodes/(-1506,15,-2599).lua b/durt/nodes/(-1506,15,-2599).lua deleted file mode 100644 index e0ed6bc..0000000 --- a/durt/nodes/(-1506,15,-2599).lua +++ /dev/null @@ -1,6 +0,0 @@ -if event.type=="digiline" then - if event.channel=="shunt_type" then - S.yards.S27.shunt_type = event.msg - digiline_send("lcd","====== | Shunt | Split | "..tostring(S.yards.S27.shunt_type).." | ======") - end -end
\ No newline at end of file diff --git a/durt/nodes/(-151,8,-2196).lua b/durt/nodes/(-151,8,-2196).lua deleted file mode 100644 index 602ea01..0000000 --- a/durt/nodes/(-151,8,-2196).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Acm","W")
\ No newline at end of file diff --git a/durt/nodes/(-1511,11,-2590).lua b/durt/nodes/(-1511,11,-2590).lua deleted file mode 100644 index 9c41623..0000000 --- a/durt/nodes/(-1511,11,-2590).lua +++ /dev/null @@ -1,67 +0,0 @@ -__approach_callback_mode = 1 - -if event.approach and not event.has_entered then - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) -end - -if event.train and atc_arrow then - if S.yards.S27.shunt_type == true then - - --split and run around properly. player is present to supervise autocouple - local info = { - ['rc'] = get_rc() or " ", - ['ln'] = get_line() or " ", - ['it'] = atc_get_text_inside() or " ", - ['ot'] = atc_get_text_outside() or " " - } - print("Local Info:") - print(info) - print("===========") - if info.rc ~= "S27_HEADSHUNT S27_AROUND" then - S.yards.S27['info'] = info - print("info.rc false --> S.yards.S27: ") - print(S.yards.S27) - print("===========") - split_at_index(2,"BBWR") - set_rc("S27_HEADSHUNT S27_AROUND") - set_autocouple() - else - info = S.yards.S27['info'] - print("info.rc true --> S.yards.S27: ") - print(S.yards.S27) - print("===========") - set_rc(info.rc) - set_line(info.ln) - atc_set_text_inside(info.it) - atc_set_text_outside(info.ot) - - atc_send("BBWD3RD1SM") - end - atc_set_ars_disable(false) - return - elseif S.yards.S27.shunt_type == false then - --reverse around loop. player not present to supervise autocouple operation - local rc = get_rc() or "" - - local action = 0 - local rc_list = {} - for token in rc:gmatch("[^%s]+") do - if token=="S27_LOOP" then - action = 1 - else - table.insert(rc_list,token) - end - end - - if action == 0 then - rc = rc.." S27_LOOP" - else - rc = table.concat(rc_list," ").." S27_EXIT" - end - set_rc(rc) - atc_set_ars_disable(false) - atc_send("B0WRD1S3") - return - end -end
\ No newline at end of file diff --git a/durt/nodes/(-1511,9,-2591).lua b/durt/nodes/(-1511,9,-2591).lua deleted file mode 100644 index e0ed6bc..0000000 --- a/durt/nodes/(-1511,9,-2591).lua +++ /dev/null @@ -1,6 +0,0 @@ -if event.type=="digiline" then - if event.channel=="shunt_type" then - S.yards.S27.shunt_type = event.msg - digiline_send("lcd","====== | Shunt | Split | "..tostring(S.yards.S27.shunt_type).." | ======") - end -end
\ No newline at end of file diff --git a/durt/nodes/(-1513,11,-2588).lua b/durt/nodes/(-1513,11,-2588).lua deleted file mode 100644 index c76d2ce..0000000 --- a/durt/nodes/(-1513,11,-2588).lua +++ /dev/null @@ -1 +0,0 @@ -__approach_callback_mode = 1
if event.approach and not event.has_entered then
atc_set_ars_disable(true)
atc_set_lzb_tsr(1)
end
if event.train and atc_arrow then
if S.yards.S27.shunt_type == false then
--reverse around loop. player not present to supervise autocouple
local rc = get_rc() or ""
local action = 0
local rc_list = {}
for token in rc:gmatch("[^%s]+") do
if token=="S27_LOOP" then
action = 1
else
table.insert(rc_list,token)
end
end
if action == 0 then
rc = rc.." S27_LOOP"
else
rc = table.concat(rc_list," ").." S27_EXIT"
end
set_rc(rc)
atc_set_ars_disable(false)
atc_send("B0WRD1S3")
return
elseif S.yards.S27.shunt_type == true then
--split and run around properly. player is present to supervise autocouple
local info = {
['rc'] = get_rc() or "",
['ln'] = get_line() or "",
['it'] = atc_get_text_inside() or "",
['ot'] = atc_get_text_outside() or ""
}
if info.rc == "S27_HEADSHUNT S27_AROUND" then
info = S.yards.S27.info
set_rc(info.rc)
set_line(inf.ln)
atc_set_text_inside(info.it)
atc_set_text_outside(info.ot)
atc_send("BBWD3RD1SM")
else
S.yards.S27[info] = info
split_at_index(2,"BBWR")
set_rc("S27_HEADSHUNT S27_AROUND")
set_autocouple()
end
atc_set_ars_disable(false)
return
end
end
\ No newline at end of file diff --git a/durt/nodes/(-1514,11,-2590).lua b/durt/nodes/(-1514,11,-2590).lua deleted file mode 100644 index c76d2ce..0000000 --- a/durt/nodes/(-1514,11,-2590).lua +++ /dev/null @@ -1 +0,0 @@ -__approach_callback_mode = 1
if event.approach and not event.has_entered then
atc_set_ars_disable(true)
atc_set_lzb_tsr(1)
end
if event.train and atc_arrow then
if S.yards.S27.shunt_type == false then
--reverse around loop. player not present to supervise autocouple
local rc = get_rc() or ""
local action = 0
local rc_list = {}
for token in rc:gmatch("[^%s]+") do
if token=="S27_LOOP" then
action = 1
else
table.insert(rc_list,token)
end
end
if action == 0 then
rc = rc.." S27_LOOP"
else
rc = table.concat(rc_list," ").." S27_EXIT"
end
set_rc(rc)
atc_set_ars_disable(false)
atc_send("B0WRD1S3")
return
elseif S.yards.S27.shunt_type == true then
--split and run around properly. player is present to supervise autocouple
local info = {
['rc'] = get_rc() or "",
['ln'] = get_line() or "",
['it'] = atc_get_text_inside() or "",
['ot'] = atc_get_text_outside() or ""
}
if info.rc == "S27_HEADSHUNT S27_AROUND" then
info = S.yards.S27.info
set_rc(info.rc)
set_line(inf.ln)
atc_set_text_inside(info.it)
atc_set_text_outside(info.ot)
atc_send("BBWD3RD1SM")
else
S.yards.S27[info] = info
split_at_index(2,"BBWR")
set_rc("S27_HEADSHUNT S27_AROUND")
set_autocouple()
end
atc_set_ars_disable(false)
return
end
end
\ No newline at end of file diff --git a/durt/nodes/(-1515,11,-2588).lua b/durt/nodes/(-1515,11,-2588).lua deleted file mode 100644 index b3a645f..0000000 --- a/durt/nodes/(-1515,11,-2588).lua +++ /dev/null @@ -1,6 +0,0 @@ -if event.train and atc_arrow then - atc_set_ars_disable(false) - atc_send("S3") - set_rc(get_rc().." S27_EXIT") - return -end
\ No newline at end of file diff --git a/durt/nodes/(-1515,7,-2621).lua b/durt/nodes/(-1515,7,-2621).lua index 0abb68d..5af9c6c 100644 --- a/durt/nodes/(-1515,7,-2621).lua +++ b/durt/nodes/(-1515,7,-2621).lua @@ -1,5 +1,5 @@ if event.train and atc_arrow then F.remove_rc({"S27_main_yard"}) - F.add_rc({"S27_slag_shed"}) + F.add_rc({"S27_slag_shed","S27_EXP_HS_N"}) atc_send("A0S0WRD100S3A1") end diff --git a/durt/nodes/(-1516,11,-2590).lua b/durt/nodes/(-1516,11,-2590).lua deleted file mode 100644 index 7352032..0000000 --- a/durt/nodes/(-1516,11,-2590).lua +++ /dev/null @@ -1 +0,0 @@ -if event.train and atc_arrow then
if S.yards.S27.shunt_type == false then
--reverse around loop. player not present to supervise autocouple operation
local rc = get_rc() or ""
local action = 0
local rc_list = {}
for token in rc:gmatch("[^%s]+") do
if token=="S27_LOOP" then
action = 1
else
table.insert(rc_list,token)
end
end
if action == 0 then
rc = rc.." S27_LOOP"
else
rc = table.concat(rc_list," ").." S27_EXIT"
end
set_rc(rc)
atc_set_ars_disable(false)
atc_send("B0WRD1S3")
return
end
end
\ No newline at end of file diff --git a/durt/nodes/(-168,7,-2053).lua b/durt/nodes/(-168,7,-2053).lua deleted file mode 100644 index f64a829..0000000 --- a/durt/nodes/(-168,7,-2053).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Ghd","E")
\ No newline at end of file diff --git a/durt/nodes/(-170,7,-2040).lua b/durt/nodes/(-170,7,-2040).lua deleted file mode 100644 index c17ee1f..0000000 --- a/durt/nodes/(-170,7,-2040).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Ghd","W")
\ No newline at end of file diff --git a/durt/nodes/(-1728,10,-1823).lua b/durt/nodes/(-1728,10,-1823).lua deleted file mode 100644 index 0e7dc6d..0000000 --- a/durt/nodes/(-1728,10,-1823).lua +++ /dev/null @@ -1,4 +0,0 @@ -if get_line() == "S23" or get_line() == "BH" then - atc_set_text_inside("S23 -> Arcadius") - atc_set_text_outside("S23 -> Arcadius") -end
\ No newline at end of file diff --git a/durt/nodes/(-1924,13,-1692).lua b/durt/nodes/(-1924,13,-1692).lua deleted file mode 100644 index 9d2f57f..0000000 --- a/durt/nodes/(-1924,13,-1692).lua +++ /dev/null @@ -1 +0,0 @@ -signal = "foundry_roads_sorting"
if (event.train and atc_arrow) or (event.int and event.message == "check_signal" and atc_id) then
if can_set_route(signal,"Out Road (Loadout)") then
set_route(signal,"Out Road (Loadout)")
elseif can_set_route(signal,"In Road (Fuel In)") then
set_route(signal,"In Road (Fuel In)")
else
if atc_speed > 0 then
atc_send("S0")
else
atc_send("B0")
end
interrupt(5,"check_signal")
return
end
atc_send("S1")
return
end
\ No newline at end of file diff --git a/durt/nodes/(-1973,16,800).lua b/durt/nodes/(-1973,16,800).lua index e6166e8..0e7e05c 100644 --- a/durt/nodes/(-1973,16,800).lua +++ b/durt/nodes/(-1973,16,800).lua @@ -2,11 +2,13 @@ local notification_id = "ARC" local ind = POS(-1954,16,840) local print_notification = true local sections ={ + departures = "262432", -- Destined for Byard store_4 = "032832" -- Destined for Arcadius Basement Loading Dock } local function send_train() - atc_send("S0WRD2A1S4") - local cmd = { -- collect wagons from BYARD, and park loco in loco siding if no departures at ARC + -- define default command to be overwritten if departures/local job available + -- collect wagons from BYARD, and park loco in loco siding if no departures at ARC + local cmd = { "FREIGHT", "ARC_LOCOSTORE", "ARC_AUTO", @@ -20,17 +22,34 @@ local function send_train() "E3S23N", "ARC_LIGHT_EXIT" } - if #section_occupancy(sections.store_4) ~= 0 then - if print_notification then print(rwt.to_string(rwt.now()).. " "..notification_id.." send_train() has local job from STORE_4") end + if #section_occupancy(sections.store_4) > 0 then -- perform local job to Arcadius Basement Loading Dock before taking wagons to BYARD + if print_notification then print(rwt.to_string(rwt.now()).. " "..notification_id.." send_train() has local job from STORE_4") end + cmd = { + "FREIGHT", --because it's freight + "ARC_LOCOSTORE", --technically the loco identifier until we have wagon ID. will be ignored by yard_headshunt because no "ARC_DEPART" etc + "ARC_YARD_REENTRY", --redirect back into the yard from yard_exit controller. will be checked by yard_exit before ARS triggers + "ARC_RTS", --basic yard call + "ARC_COLLECT_ARC_LOAD_DOCK", -- collect req wagons. can be left in place, if train_length == 1 then will return to siding anyway + "ARC_AUTO_LOCAL_LOADING", --direct to ARC Basement Loading Dock + "ARC_LOAD", --trigger the loading track + } + elseif #section_occupancy(sections.departures) > 0 then + -- reenter yard, collect departures and head to Byard + if print_notification then print(rwt.to_string(rwt.now()).. " "..notification_id.." send_train() has local job from DEPARTURES") end cmd = { - "FREIGHT", --because it's freight - "ARC_LOCOSTORE", --technically the loco identifier until we have wagon ID. will be ignored by yard_headshunt because no "ARC_DEPART" etc - "ARC_YARD_REENTRY", --redirect back into the yard from yard_exit controller. will be checked by yard_exit before ARS triggers - "ARC_RTS", --basic yard call - "ARC_COLLECT_ARC_LOAD_DOCK", -- collect req wagons. can be left in place, if train_length == 1 then will return to siding anyway - "ARC_AUTO_LOCAL_LOADING", --direct to ARC Basement Loading Dock - "ARC_LOAD", --trigger the loading track + "FREIGHT", + "ARC_LOCOSTORE", + "ARC_AUTO", + "ARC_YARD_REENTRY", -- trigger yard reentry on light exit + "ARC_2ND_EXIT_ARC_AUTO_S23S", -- exit direction after + "ARC_RTS", + "ARC_COLLECT_ARC_SB", + "S23E3N", + "BYARD", + "BY_RTS", + "BY_COLLECT_ARC", + "E3S23N", } end set_rc(table.concat(cmd," ")) diff --git a/durt/nodes/(-1987,13,-1700).lua b/durt/nodes/(-1987,13,-1700).lua deleted file mode 100644 index fc6a367..0000000 --- a/durt/nodes/(-1987,13,-1700).lua +++ /dev/null @@ -1,4 +0,0 @@ -if event.train and atc_arrow and atc_speed == 1 then - atc_send("SM") -end -F.M27_tracking("Exit Foundry")
\ No newline at end of file diff --git a/durt/nodes/(-1988,13,-1698).lua b/durt/nodes/(-1988,13,-1698).lua deleted file mode 100644 index 3ca3126..0000000 --- a/durt/nodes/(-1988,13,-1698).lua +++ /dev/null @@ -1 +0,0 @@ -F.M27_tracking("Enter Foundry")
\ No newline at end of file diff --git a/durt/nodes/(-20,8,-2319).lua b/durt/nodes/(-20,8,-2319).lua deleted file mode 100644 index c788356..0000000 --- a/durt/nodes/(-20,8,-2319).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Ghb","E")
\ No newline at end of file diff --git a/durt/nodes/(-2039,19,719).lua b/durt/nodes/(-2039,19,719).lua index 107d03f..5a090ad 100644 --- a/durt/nodes/(-2039,19,719).lua +++ b/durt/nodes/(-2039,19,719).lua @@ -28,6 +28,15 @@ if event.train then end if rm_rc then F.remove_rc({rev_rc}) end schedule_in(";01",atc_id) + + -- remove stray control flags + F.remove_rc_match("ARC_LOCOS_%S+") + F.remove_rc_match("ARC_WAGONS_%S+") + F.remove_rc({ + "ARC_DEPART", + "ARC_FINAL_COLLECT" + }) + return end diff --git a/durt/nodes/(-2077,3,821).lua b/durt/nodes/(-2077,3,821).lua deleted file mode 100644 index eceb40a..0000000 --- a/durt/nodes/(-2077,3,821).lua +++ /dev/null @@ -1,25 +0,0 @@ -local dir_indicator = POS(-2079,7,803) -local this_dir = true - -__approach_callback_mode = 2 -if event.approach and not event.has_entered then - atc_set_lzb_tsr(2) - atc_set_ars_disable(true) - return -end - -if event.train then - if not atc_arrow then - if F.dir(dir_indicator) == this_dir then - atc_send("B1") - end -- no else, should never happen - else - if F.has_rc("ARC_LOAD_load") and (F.dir(dir_indicator) == not this_dir) then - F.remove_rc({"ARC_LOAD_load"}) - F.add_rc("ARC_LOAD_rejoin") - atc_send("B0WRD1S2") - else - atc_send("A1S2") - end - end -end
\ No newline at end of file diff --git a/durt/nodes/(-2080,19,731).lua b/durt/nodes/(-2080,19,731).lua deleted file mode 100644 index 440ca17..0000000 --- a/durt/nodes/(-2080,19,731).lua +++ /dev/null @@ -1,32 +0,0 @@ -local dir_indicator = POS(-2079,7,803) -local this_dir = false - -if event.schedule then - if not atc_id then - atc_send_to_train(event.msg,"B0WRD1S1") - return - end - if event.msg == atc_id then - schedule_in(";01",atc_id) - return - else - atc_send("BB") - atc_send_to_train("BB") - return - end - return -end - -if event.train and atc_arrow then - if F.has_rc("ARC_LOAD_reverse") and F.dir(dir_indicator) == this_dir then - set_autocouple() - schedule_in(";01",atc_id) - return - end - if F.has_rc("ARC_LOAD_exit") then - F.remove_rc({"ARC_LOAD_exit"}) - atc_send("D5SM") - return - end -end - diff --git a/durt/nodes/(-2080,3,787).lua b/durt/nodes/(-2080,3,787).lua deleted file mode 100644 index 79ffde6..0000000 --- a/durt/nodes/(-2080,3,787).lua +++ /dev/null @@ -1,36 +0,0 @@ -local dir_indicator = POS(-2079,7,803) -local this_dir = false - -__approach_callback_mode = 2 -if event.approach and not event.has_entered then - atc_set_lzb_tsr(2) - atc_set_ars_disable(true) - return -end - -if event.train then - if not F.has_rc("ARC_LOAD") then - atc_set_ars_disable(false) - return - end - if F.has_rc("ARC_LOAD_exit") then - atc_set_ars_disable(false) - return - end - if not atc_arrow then - atc_send("S2") - return - end - - if not F.has_rc("ARC_LOAD_rejoin") then - split_at_fc("B0") - F.add_rc("ARC_LOAD_reverse ARC_LOAD_load") - atc_send("A1S2") - F.dir(dir_indicator,this_dir) - else - unset_autocouple() - F.remove_rc({"ARC_LOAD_reverse","ARC_LOAD_rejoin"}) - F.add_rc("ARC_LOAD_exit") - atc_send("B0WRD1S6A1") - end -end
\ No newline at end of file diff --git a/durt/nodes/(-2080,3,822).lua b/durt/nodes/(-2080,3,827).lua index c9d875f..74778f4 100644 --- a/durt/nodes/(-2080,3,822).lua +++ b/durt/nodes/(-2080,3,827).lua @@ -19,5 +19,5 @@ else --loco has rejoined from runaround. push through to headshunt, run over loa "ARC_AUTO" }) end -set_route(POS(-2081,4,825),"Headshunt") +set_route(POS(-2081,4,830),"Headshunt") atc_send("A1S2")
\ No newline at end of file diff --git a/durt/nodes/(-2080,3,834).lua b/durt/nodes/(-2080,3,834).lua deleted file mode 100644 index c983a88..0000000 --- a/durt/nodes/(-2080,3,834).lua +++ /dev/null @@ -1,3 +0,0 @@ -if event.train then - atc_send("S0I+WR;D2S3") -end
\ No newline at end of file diff --git a/durt/nodes/(-2080,3,837).lua b/durt/nodes/(-2080,3,837).lua deleted file mode 100644 index a765227..0000000 --- a/durt/nodes/(-2080,3,837).lua +++ /dev/null @@ -1,3 +0,0 @@ -if event.train and F.has_rc("ARC_LOAD_REVERSE") then - atc_send("S0I+WR;D2S3") -end
\ No newline at end of file diff --git a/durt/nodes/(-2080,3,832).lua b/durt/nodes/(-2080,3,839).lua index 4d71348..4d71348 100644 --- a/durt/nodes/(-2080,3,832).lua +++ b/durt/nodes/(-2080,3,839).lua diff --git a/durt/nodes/(-2081,1,811).lua b/durt/nodes/(-2081,1,811).lua deleted file mode 100644 index 1ee1917..0000000 --- a/durt/nodes/(-2081,1,811).lua +++ /dev/null @@ -1,3 +0,0 @@ -if event.punch then - interrupt_pos(POS(-4144,16,-5792)) -end
\ No newline at end of file diff --git a/durt/nodes/(-2081,19,690).lua b/durt/nodes/(-2081,19,690).lua deleted file mode 100644 index 703d4e4..0000000 --- a/durt/nodes/(-2081,19,690).lua +++ /dev/null @@ -1 +0,0 @@ -F.remove_rc({"ArcLoad_exit"},true)
\ No newline at end of file diff --git a/durt/nodes/(-2083,3,822).lua b/durt/nodes/(-2083,3,822).lua deleted file mode 100644 index 88d416f..0000000 --- a/durt/nodes/(-2083,3,822).lua +++ /dev/null @@ -1,3 +0,0 @@ -if event.punch then - print(getstate(POS(-2078,4,826))) -end
\ No newline at end of file diff --git a/durt/nodes/(-2084,21,851).lua b/durt/nodes/(-2084,21,851).lua deleted file mode 100644 index 555a3ed..0000000 --- a/durt/nodes/(-2084,21,851).lua +++ /dev/null @@ -1,9 +0,0 @@ -if get_line() == "S23" or get_line() == "BH" then - if atc_arrow then - atc_set_text_inside("S23 -> Mom Junction") - atc_set_text_outside("S23 -> Mom Junction") - else - atc_set_text_inside("Terminus: Arcadius/nChange here for S20") - atc_set_text_outside("S23") - end -end
\ No newline at end of file diff --git a/durt/nodes/(-2105,19,829).lua b/durt/nodes/(-2105,19,829).lua deleted file mode 100644 index 06660b9..0000000 --- a/durt/nodes/(-2105,19,829).lua +++ /dev/null @@ -1 +0,0 @@ -print(type(section_occupancy)=="function" and "section_occupancy() is a go" or "no dice yet. still waiting to update")
\ No newline at end of file diff --git a/durt/nodes/(-2132,8,914).lua b/durt/nodes/(-2132,8,914).lua index ec8cd4a..5229dce 100644 --- a/durt/nodes/(-2132,8,914).lua +++ b/durt/nodes/(-2132,8,914).lua @@ -1,17 +1,22 @@ -local trigger = POS(-2130,21,925) -if event.train then - if getstate(trigger)=="off" then return end - digiline_send("ars_set_query",true) - return -end +local ch = { + get = "ars_set_query", + input = "ars_set", + indicator = "ars_indicator", +} -if event.digiline and event.channel=="ars_set" and atc_id then - set_rc(event.msg) - setstate(trigger,"off") +if event.train then + digiline_send(ch.get, "GET") return end -if event.digiline and event.channel=="ars_indicator" then - setstate(trigger,event.msg) - return +if event.digiline then + if event.channel==ch.input then + if not atc_id then + digiline_send(ch.indicator, true) + return + end + set_rc(tostring(event.msg)) + digiline_send(ch.indicator, false) + return + end end
\ No newline at end of file diff --git a/durt/nodes/(-2135,21,920).lua b/durt/nodes/(-2135,21,920).lua deleted file mode 100644 index 74dac88..0000000 --- a/durt/nodes/(-2135,21,920).lua +++ /dev/null @@ -1,25 +0,0 @@ -local ch = { - output = "ars_manual_input", - get = "ars_set_query", - input = "ars_set", - indicator = "ars_indicator", - lcd = "lcd", - debug = "debug" -} - -if event.train then - digiline_send(ch.get, "GET") - return -end - -if event.digiline then - if event.channel==ch.input then - if not atc_id then - digiline_send(ch.indicator, true) - return - end - set_rc(tostring(event.msg)) - digiline_send(ch.indicator, false) - return - end -end
\ No newline at end of file diff --git a/durt/nodes/(-2204,8,-651).lua b/durt/nodes/(-2204,8,-651).lua new file mode 100644 index 0000000..d8539fb --- /dev/null +++ b/durt/nodes/(-2204,8,-651).lua @@ -0,0 +1,26 @@ +local cmd = { + "TREES_RUNAROUND", + "SHUNT_MAINLINE_REV", +} +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + atc_set_ars_disable(true) + atc_set_lzb_tsr(1) + return +end + +if event.train and atc_arrow then + if not F.has_rc("BYARD_NOID_SHUTTLE") then return end -- not our train, disregard + if not F.has_rc("TREES_RUNAROUND") then -- train has arrived from yard, split and runaround + split_off_locomotive("A0B0") --disable ARS to stop the rest of the train engaging the signal + F.add_rc(cmd) --add RC commands tomake the train runaround + atc_send("S3A1") --send the loco on its way to make the runaround + return + end + --else loco has returned from runaround + F.remove_rc(cmd) -- remove runaround RCs + atc_send("S0WRS1") --reverse the train and creep towards the other departure signal + return +end +
\ No newline at end of file diff --git a/durt/nodes/(-2204,8,-676).lua b/durt/nodes/(-2204,8,-676).lua new file mode 100644 index 0000000..834ba6c --- /dev/null +++ b/durt/nodes/(-2204,8,-676).lua @@ -0,0 +1,30 @@ +local notification_id = "NOID" +local ind = POS(-2209,8,-651) -- IMPORTANT NB: remember to update this if you move the indicator mesecon switch +local print_notification = true +local function send_train() + set_rc("FREIGHT BYARD_NOID_SHUTTLE BYARD BY_COLLECT_NOID BY_RTS NIDTH NOIDEA IND TREES") -- RC string to overwrite when departing for the autoyard, remember to include the return RCs as well + step_fc() --step the fc forward to be ready for the autoyard + atc_send("A1SM") + F.indicator(ind,false) +end +if event.ext_int then -- trigger event from the yard itself. + if event.message == "notify" then -- can also be a manual/other message, just edit this if statement + if print_notification then print(rwt.to_string(rwt.now()).. " "..notification_id.." RX Notification") end + if F.indicator(ind) then return end -- indicator is already lit, train hasn't collected the first set yet + if atc_id then --send the train to the yard for collection + send_train() + return + else -- set the indicator to await the returning train + F.indicator(ind,true) + return + end + end +end +if event.train and atc_arrow then + if F.indicator(ind) then + send_train() + return + end + atc_send("B0") + return +end
\ No newline at end of file diff --git a/durt/nodes/(-2209,9,-651).lua b/durt/nodes/(-2209,9,-651).lua new file mode 100644 index 0000000..fdf1611 --- /dev/null +++ b/durt/nodes/(-2209,9,-651).lua @@ -0,0 +1,10 @@ +local users = { +"gabriel", +"survivalg", +"Maverick2797" +} +if event.punch then + for _,name in pairs(users) do + if event.name==name then interrupt_pos(POS(-2204,8,-676),"notify") return end + end +end
\ No newline at end of file diff --git a/durt/nodes/(-2211,8,902).lua b/durt/nodes/(-2211,8,902).lua deleted file mode 100644 index 7e11761..0000000 --- a/durt/nodes/(-2211,8,902).lua +++ /dev/null @@ -1 +0,0 @@ -if event.type=="digiline" then
if event.channel ~= "trainctl" then return end
if event.msg == "send" then
if atc_id and atc_arrow then
atc_send("S0WRS5")
elseif atc_id and atc_arrow == false then
atc_send("S5")
end
end
end
\ No newline at end of file diff --git a/durt/nodes/(-2213,10,-728).lua b/durt/nodes/(-2213,10,-728).lua new file mode 100644 index 0000000..23ac35d --- /dev/null +++ b/durt/nodes/(-2213,10,-728).lua @@ -0,0 +1,2 @@ +if not F.has_rc("TREES_RUNAROUND") then return end +atc_send("CplS1")
\ No newline at end of file diff --git a/durt/nodes/(-2213,8,898).lua b/durt/nodes/(-2213,7,887).lua index 0be631f..2a67431 100644 --- a/durt/nodes/(-2213,8,898).lua +++ b/durt/nodes/(-2213,7,887).lua @@ -1,13 +1,13 @@ if event.type=="digiline" then if event.channel ~= "trainctl" then return end if not atc_id then return end - local cmd = "I+S0WR;S4" + local cmd = "I+S0WR;S3" if event.msg == "send" then atc_send(cmd) return end if event.msg == "send_cpl" then - atc_send(cmd.."CplWS0WRS4") + atc_send(cmd.."CplS0WRS3") return end end
\ No newline at end of file diff --git a/durt/nodes/(-2227,8,290).lua b/durt/nodes/(-2227,8,290).lua deleted file mode 100644 index 6e6f7ef..0000000 --- a/durt/nodes/(-2227,8,290).lua +++ /dev/null @@ -1,3 +0,0 @@ -local msg = "S23 -> Redwood" -atc_set_text_outside(msg) -atc_set_text_inside(msg)
\ No newline at end of file diff --git a/durt/nodes/(-2227,8,292).lua b/durt/nodes/(-2227,8,292).lua deleted file mode 100644 index 75c39d7..0000000 --- a/durt/nodes/(-2227,8,292).lua +++ /dev/null @@ -1,75 +0,0 @@ --- - -local delta = 4*60+20 -- HERE IS THE VALUE - -local owdata = S.BaHi_T6 -local numval = 5 -local switchbox_cp = { x=-2221,y=14,z=297} - -function save_delay(d) - if not owndata then - owndata = { false, false, false, false, false, false, false, false, } - end - for i=numval,2,-1 do - owndata[i] = owndata[i-1] - end - owndata[1] = d -end - -function delay_text() - if not owndata then - return "" - end - local rg = "" - for i=1,numval do - h = owndata[i] - if not h then h = "" end - rg = rg .. h .." " - end - return rg -end - -if event.type == "train" then - if atc_arrow then - atc_send("B0WOL") -- D20OCD3S2") --- setstate("BaHi_T5_S2","st") --- setstate("BaHi_T5_S1","st") - - if not S.BaHi_T6 then - S.BaHi_T6 = os.time() - end --- interrupt(1,"departure") --- else - now = os.time() - tempdist = now-S.BaHi_T6 - save_delay(tempdist) - delaystr = delay_text() - output = "last: "..S.BaHi_T6 .. "\nnow: " .. now .. "\ndelta: " .. tempdist.. "\n"..delta .. " " .. delaystr - digiline_send("lcd",output) - interrupt_pos( switchbox_cp, { action = "display", data = output } ) - if tempdist > delta then - interrupt(15,"departure") - else - interrupt(-tempdist+delta,"departure") - end --- end - end - return -end - -if event.type == "int" then - if event.msg == "departure" then - -- setstate("BaHi_T5_S2","st") - -- setstate("BaHi_T5_S1","st") - atc_set_text_inside("S23 -> Redwood") - atc_send("ROCD3S2") - now = os.time() - delaystr = delay_text() --- digiline_send("lcd","last: \nnow: " .. now .. "\ndelta: " .. tempdist.. "\n"..delta .. " " .. delaystr) - output = "last: " .. now .. " \n \n \n"..delta.." "..delaystr - digiline_send("lcd",output ) - interrupt_pos( switchbox_cp, { action = "display", data = output } ) - S.BaHi_T6 = now - end - return -end
\ No newline at end of file diff --git a/durt/nodes/(-2343,15,-1336).lua b/durt/nodes/(-2343,15,-1336).lua deleted file mode 100644 index c8dc75c..0000000 --- a/durt/nodes/(-2343,15,-1336).lua +++ /dev/null @@ -1 +0,0 @@ -F.M27_tracking("Tanh Depot")
\ No newline at end of file diff --git a/durt/nodes/(-2732,11,891).lua b/durt/nodes/(-2732,11,891).lua deleted file mode 100644 index e69de29..0000000 --- a/durt/nodes/(-2732,11,891).lua +++ /dev/null diff --git a/durt/nodes/(-2734,10,-1693).lua b/durt/nodes/(-2734,10,-1693).lua deleted file mode 100644 index 8043b8c..0000000 --- a/durt/nodes/(-2734,10,-1693).lua +++ /dev/null @@ -1 +0,0 @@ ---Still need to convert to a function rather than trackside
local hs_sig = "M27_Quarry_Headshunt"
local hs_route = "Headshunt"
local exit_sig = "M27_Quarry_Exit"
local exit_route = "Exit to Mainline"
local siding_id = "M27_Quarry_runaround"
local length_prefix = "Loco"
if (event.train and atc_arrow) then
local rc = get_rc() or " "
-- the RC that controls the link to split
-- rc value: "<rc><num_wagons to shunt with>" default is single loco
-- eg "Loco2" for tenders, "Loco3" for
local loco_pos = rc:match(length_prefix.."%d+") or length_prefix.."1"
loco_pos = tonumber(loco_pos:match("%d+"))+1
if not S.runarounds[siding_id].shunting then -- train to be split
--store info for later re-insertion
S.runarounds[siding_id] = {
['shunting'] = true,
['rc'] = rc,
['line'] = get_line() or " "
}
atc_send("B0S0")
interrupt(5,{['cmd'] = "split", ['leng'] = loco_pos})
-- change int time if needed, depends on approach speed slowdown
else -- train has rejoined
--re-insert info to train
if S.runarounds[siding_id].rc then set_rc(S.runarounds[siding_id].rc) end
if S.runarounds[siding_id].line then set_line(S.runarounds[siding_id].line) end
--depart
atc_send("B0WD3RSM")
set_route(exit_sig,exit_route)
S.runarounds[siding_id].shunting = false
end
end
if event.int then
if event.msg.cmd=="split" then
cmd = event.msg
split_at_index(cmd.leng,"")
set_rc(S.runarounds[siding_id].rc .. " shunt_limit")
atc_send("S2")
set_route(hs_sig,hs_route)
end
end
\ No newline at end of file diff --git a/durt/nodes/(-2734,11,891).lua b/durt/nodes/(-2734,11,891).lua deleted file mode 100644 index e69de29..0000000 --- a/durt/nodes/(-2734,11,891).lua +++ /dev/null diff --git a/durt/nodes/(-35,8,-2323).lua b/durt/nodes/(-35,8,-2323).lua deleted file mode 100644 index 401821c..0000000 --- a/durt/nodes/(-35,8,-2323).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Ghb","W")
\ No newline at end of file diff --git a/durt/nodes/(-3525,8,-2281).lua b/durt/nodes/(-3525,8,-2281).lua deleted file mode 100644 index cb3c02c..0000000 --- a/durt/nodes/(-3525,8,-2281).lua +++ /dev/null @@ -1,8 +0,0 @@ -if event.train then - if not atc_arrow then - atc_send("S1B1") - set_autocouple() - else - digiline_send("lcd",atc_id) - end -end
\ No newline at end of file diff --git a/durt/nodes/(-3530,8,-2267).lua b/durt/nodes/(-3530,8,-2267).lua deleted file mode 100644 index 40c32b6..0000000 --- a/durt/nodes/(-3530,8,-2267).lua +++ /dev/null @@ -1 +0,0 @@ ---control interface
loading_road_control_track = POS(-3544,8,-2277)
entry_exit_road_control = nil --still need to add a track for traffic balancing
if event.ext_int then
digiline_send("train_control_screen",event.message)
return
end
if event.digiline then
if event.channel ~= "train_control" then return end
if event.msg=="rehead" then
digiline_send("train_control_screen","Loco Change Ends")
interrupt_pos(loading_road_control_track,"split_around")
return
end
if event.msg=="depart" then
digiline_send("train_control_screen","Depart via Accelerator")
interrupt_pos(loading_road_control_track,"depart")
return
end
if event.msg=="shuffle_loading" then
digiline_send("train_control_screen","Loading Shuffle")
interrupt_pos(loading_road_control_track,"shuffle")
return
end
return
end
\ No newline at end of file diff --git a/durt/nodes/(-3588,8,-2277).lua b/durt/nodes/(-3588,8,-2277).lua deleted file mode 100644 index fb2ab3a..0000000 --- a/durt/nodes/(-3588,8,-2277).lua +++ /dev/null @@ -1,3 +0,0 @@ -do return end -------------------------------------------------------------------
--West End of Loading Road
local siding_id = "TreeFarm"
local control_interface = POS(-3553,18,-2261)
local hs_sig = POS(-3594,9,-2277)
local hs_route = "Shunt Around Via Loop"
if not S[siding_id] then S[siding_id] = {} end
if not atc_arrow then atc_send("B1") end
if not S[siding_id].yard_active then
if atc_arrow then
S[siding_id].yard_active = true
S[siding_id].info = {
['rc'] = get_rc() or "",
['line'] = get_line() or ""
}
-- set_rc("AROUND") - step_fc()
split_off_locomotive("B0WR")
set_route(hs_sig,hs_route)
atc_send("S4")
end
else
if atc_arrow then -- train has rejoined
atc_send("B0WD2RS1") -- reverse and load train
set_rc(S[siding_id].info.rc)
set_line(S[siding_id].info.line)
unset_autocouple()
interrupt_pos(control_interface,"Train Shunted||Now Loading")
S[siding_id].info.rc = nil
S[siding_id].info.line = nil
S[siding_id].yard_active = nil
end
end
\ No newline at end of file diff --git a/durt/nodes/(-3590,18,-3906).lua b/durt/nodes/(-3590,18,-3906).lua deleted file mode 100644 index f13c279..0000000 --- a/durt/nodes/(-3590,18,-3906).lua +++ /dev/null @@ -1,2 +0,0 @@ --- -F.M27_tracking("DJNC<-->Willow Tunnel")
\ No newline at end of file diff --git a/durt/nodes/(-3593,19,-3930).lua b/durt/nodes/(-3593,19,-3930).lua deleted file mode 100644 index b3993db..0000000 --- a/durt/nodes/(-3593,19,-3930).lua +++ /dev/null @@ -1,2 +0,0 @@ -do return end -local id = "DJnc_4" --change here
if (event.train and atc_arrow) then
setstate(POS(-3596,18,-3927),"st")
if not S.runarounds[id].active then
S.runarounds[id].active = true
atc_set_text_outside("Please Wait\nTrain Changing Ends") --change here
split_off_locomotive("B0WROL")
set_autocouple()
set_rc("runaround") --change here
return
else
S.runarounds[id].active = nil
atc_send("OCB0WRD1SM")
set_rc("sfh_service") --change here
atc_set_text_outside("Sulfur Hills Branch Line -> Sulfur Hills")
set_line("SHBL")
unset_autocouple()
setstate(POS(-3596,18,-3945),"st")
end
end
\ No newline at end of file diff --git a/durt/nodes/(-3596,18,-3920).lua b/durt/nodes/(-3596,18,-3920).lua deleted file mode 100644 index 19149fe..0000000 --- a/durt/nodes/(-3596,18,-3920).lua +++ /dev/null @@ -1,2 +0,0 @@ -do return end -if (event.train and atc_arrow) then
setstate(POS(-3596,18,-3927),"cr")
setstate(POS(-3599,18,-3951),"cr")
atc_send("B0WRD2S4")
end
\ No newline at end of file diff --git a/durt/nodes/(-3596,18,-3930).lua b/durt/nodes/(-3596,18,-3930).lua deleted file mode 100644 index 731b66e..0000000 --- a/durt/nodes/(-3596,18,-3930).lua +++ /dev/null @@ -1 +0,0 @@ -local id = "DJnc_4" --change here
if (event.train and atc_arrow) then
setstate(POS(-3596,18,-3927),"st")
if not S.runarounds[id].active then
S.runarounds[id].active = true
atc_set_text_outside("Please Wait\nTrain Changing Ends") --change here
split_off_locomotive("B0WROL")
set_autocouple()
set_rc("runaround") --change here
return
else
S.runarounds[id].active = nil
atc_send("OCB0WRD1SM")
set_rc("sfh_service") --change here
atc_set_text_outside("Sulfur Hills Branch Line -> Sulfur Hills")
set_line("SHBL")
unset_autocouple()
setstate(POS(-3596,18,-3945),"st")
end
end
\ No newline at end of file diff --git a/durt/nodes/(-3596,8,-2281).lua b/durt/nodes/(-3596,8,-2281).lua deleted file mode 100644 index 230fdd4..0000000 --- a/durt/nodes/(-3596,8,-2281).lua +++ /dev/null @@ -1 +0,0 @@ -control_interface = POS(-3530,8,-2267)
exit_road_signal = POS(-3538,9,-2282)
if event.train then
if not atc_arrow then return end
if atc_speed > 13 then
if can_set_route(exit_road_signal,"Exit to Mainline") then
set_route(exit_road_signal,"Exit to Mainline")
interrupt_pos(control_interface,"Train Merging to Mainline")
return
else
set_route(exit_road_signal,"Train Accelerator Loop")
interrupt_pos(control_interface,"Waiting for Mainline||Unable to set edxit route")
return
end
else
set_route(exit_road_signal,"Train Accelerator Loop")
interrupt_pos(control_interface,"Train too slow to merge||Looping back around")
return
end
end
\ No newline at end of file diff --git a/durt/nodes/(-3597,18,-3926).lua b/durt/nodes/(-3597,18,-3926).lua new file mode 100644 index 0000000..badf4a5 --- /dev/null +++ b/durt/nodes/(-3597,18,-3926).lua @@ -0,0 +1,28 @@ +-- DJNC Runaround +local rejoin_rc = "DJNC_REJOIN" +local runaround_cmd = { + "DJNC_RUNAROUND", --HS_Up access, runaround + "DJNC_HS_D", -- HS_Down access + "DJNC_HS_D_CPL", -- recouple in Up Direction + rejoin_rc -- Up rejoin director +} +__approach_callback_mode = 1 +if event.approach and not event.has_entered then + if not F.has_rc("SFHB") then return end + atc_set_text_inside("Next Station: Desert Junction\nService Terminates Here\nChange Here For Noob Express") + atc_set_lzb_tsr(1) + return +end +if event.train then + if not get_line() == "SFHB" then return end + if not F.has_rc(rejoin_rc) then --train has arrived. Split and run around + atc_set_text_inside("Desert Junction\nService Terminates Here\nChange Here For Noob Express") + split_off_locomotive("A0S0OL") + F.add_rc(runaround_cmd) + return + end + F.remove_rc(runaround_cmd) + atc_send("OCS0WRD5SM") + atc_set_text_inside("") + return +end
\ No newline at end of file diff --git a/durt/nodes/(-3601,18,-3961).lua b/durt/nodes/(-3601,18,-3961).lua deleted file mode 100644 index 84387eb..0000000 --- a/durt/nodes/(-3601,18,-3961).lua +++ /dev/null @@ -1,2 +0,0 @@ --- -F.M27_tracking("DJNC<-->Dcaves")
\ No newline at end of file diff --git a/durt/nodes/(-3602,18,-3962).lua b/durt/nodes/(-3602,18,-3962).lua new file mode 100644 index 0000000..f731225 --- /dev/null +++ b/durt/nodes/(-3602,18,-3962).lua @@ -0,0 +1,46 @@ +-- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +local rev_rc = "DJNC_HS_D" +local rm_rc = true +local autocouple = "DJNC_HS_D_CPL" +local rm_cpl_rc = true + +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + if not F.has_rc(rev_rc) then return end + atc_set_lzb_tsr(3) + atc_set_ars_disable(true) + return +end + +if event.train then + if not atc_arrow then --train has bounced + if F.has_rc(autocouple) then + atc_send("CplS0WD2S1") + if rm_cpl_rc then F.remove_rc({autocouple}) end + end + return + end + + if not F.has_rc(rev_rc) then --not our train. disregard + atc_set_ars_disable(false) + return + end + F.remove_rc("DJNC_RUNAROUND") + if rm_rc then F.remove_rc({rev_rc}) end + schedule_in(";01",atc_id) + return +end + +if event.schedule then + if not atc_id then --bounce the train that just passed + atc_send_to_train(event.msg,"B0WRD1A1S3") + else + if atc_id == event.msg then --train hasn't fully passed yet, wait a bit longer + schedule_in(";01",atc_id) + else -- somehow another train crossed the controller before the first one returned. Unlikely but possible + atc_send_to_train(event.msg,"BBOL") + atc_send("BBOL") + end + end +end
\ No newline at end of file diff --git a/durt/nodes/(-3604,18,-3958).lua b/durt/nodes/(-3604,18,-3958).lua deleted file mode 100644 index fa7c445..0000000 --- a/durt/nodes/(-3604,18,-3958).lua +++ /dev/null @@ -1 +0,0 @@ -if (event.train and atc_arrow) then
setstate(POS(-3599,18,-3951),"st")
setstate(POS(-3596,18,-3945),"cr")
atc_send("B0WRD2S1")
end
\ No newline at end of file diff --git a/durt/nodes/(-3642,18,-4002).lua b/durt/nodes/(-3642,18,-4002).lua deleted file mode 100644 index 7489acc..0000000 --- a/durt/nodes/(-3642,18,-4002).lua +++ /dev/null @@ -1 +0,0 @@ ---
\ No newline at end of file diff --git a/durt/nodes/(-3670,12,-3742).lua b/durt/nodes/(-3670,12,-3742).lua deleted file mode 100644 index df19540..0000000 --- a/durt/nodes/(-3670,12,-3742).lua +++ /dev/null @@ -1,2 +0,0 @@ --- -F.M27_tracking("Sinensis<-->Willow Tunnel")
\ No newline at end of file diff --git a/durt/nodes/(-3761,12,-3554).lua b/durt/nodes/(-3761,12,-3554).lua deleted file mode 100644 index 118b1c4..0000000 --- a/durt/nodes/(-3761,12,-3554).lua +++ /dev/null @@ -1,2 +0,0 @@ --- -F.M27_tracking("EV_S<-->Sinensis")
\ No newline at end of file diff --git a/durt/nodes/(-3764,12,-3562).lua b/durt/nodes/(-3764,12,-3562).lua deleted file mode 100644 index 118b1c4..0000000 --- a/durt/nodes/(-3764,12,-3562).lua +++ /dev/null @@ -1,2 +0,0 @@ --- -F.M27_tracking("EV_S<-->Sinensis")
\ No newline at end of file diff --git a/durt/nodes/(-3776,11,-4340).lua b/durt/nodes/(-3776,11,-4340).lua deleted file mode 100644 index 228f4d3..0000000 --- a/durt/nodes/(-3776,11,-4340).lua +++ /dev/null @@ -1 +0,0 @@ -if event.train then
if atc_arrow then
atc_send("B1")
--atc_set_text_outside("Unloading Cargo")
F.M27_tracking("Storage Entry")
else
atc_send("SM")
--atc_set_text_outside("M27 Foundries Inc.")
--set_rc("FREIGHT M27 Tanh_loop M27_Foundry autorun M27_tracking")
--set_rc("FREIGHT M27 M27_Quarry autorun M27_tracking")
F.M27_tracking("Storage Exit")
end
end
\ No newline at end of file diff --git a/durt/nodes/(-3818,18,-4761).lua b/durt/nodes/(-3818,18,-4761).lua deleted file mode 100644 index 64f31ae..0000000 --- a/durt/nodes/(-3818,18,-4761).lua +++ /dev/null @@ -1,10 +0,0 @@ -if (event.type == "train") then - local rc = get_rc() - if rc == "sfh_service" then - set_autocouple()
atc_send("B0")
set_rc("sfh_shunt")
interrupt(5, "proceed") - else
atc_send("B0WD3OCRSM") - unset_autocouple() - set_rc("sfh_service") - set_line("SHBL") - atc_set_text_outside("Sulfur Hills Branch Line -> Desert Junction")
end
elseif (event.type == "int") then
set_route("sfh-T1-headshunt", "Enter Headshunt")
split_off_locomotive("B0OL") - setstate("SFH-T2-S", "cr")
atc_send("S2")
end
\ No newline at end of file diff --git a/durt/nodes/(-3820,18,-4728).lua b/durt/nodes/(-3820,18,-4728).lua deleted file mode 100644 index cc4264b..0000000 --- a/durt/nodes/(-3820,18,-4728).lua +++ /dev/null @@ -1,5 +0,0 @@ -if event.train and atc_arrow then - if get_rc() == "sfh_shunt" then - atc_send("S0WRD1S2") - end -end
\ No newline at end of file diff --git a/durt/nodes/(-3820,18,-4730).lua b/durt/nodes/(-3820,18,-4730).lua deleted file mode 100644 index d1f3c8e..0000000 --- a/durt/nodes/(-3820,18,-4730).lua +++ /dev/null @@ -1,8 +0,0 @@ -do return end ---disabled while extension trackwork in progress. Service is stopped anyway - - - -if event.train and atc_arrow and get_rc() == "sfh_shunt" then - setstate("SFH-T1-N", "st")
atc_send("B0WRD1S3") -end
\ No newline at end of file diff --git a/durt/nodes/(-3820,18,-4743).lua b/durt/nodes/(-3820,18,-4743).lua deleted file mode 100644 index 3f5d585..0000000 --- a/durt/nodes/(-3820,18,-4743).lua +++ /dev/null @@ -1,3 +0,0 @@ -if atc_arrow and get_rc() == "sfh_shunt" then - set_rc("sfh_service") -end
\ No newline at end of file diff --git a/durt/nodes/(-3820,18,-4757).lua b/durt/nodes/(-3820,18,-4757).lua deleted file mode 100644 index 2dd69fd..0000000 --- a/durt/nodes/(-3820,18,-4757).lua +++ /dev/null @@ -1,14 +0,0 @@ -if event.train and atc_arrow then - if get_rc() == "sfh_service" then - set_rc("sfh_shunt") - atc_set_text_outside("Sulfur Hills -> Desert Junction") - atc_set_text_inside("Locomotive will return soon\nSulfur Hills -> Desert Junction") - split_off_locomotive("B0WD1OL") - set_autocouple() - set_route("SFH-T1S-sig","Headshunt") - elseif get_rc() =="sfh_shunt" then - atc_send("A0OLBBWRD3OCD1A1S4D10SM") - atc_set_text_inside("") - set_rc("sfh_service") - end -end
\ No newline at end of file diff --git a/durt/nodes/(-3821,18,-4730).lua b/durt/nodes/(-3821,18,-4730).lua deleted file mode 100644 index d1f3c8e..0000000 --- a/durt/nodes/(-3821,18,-4730).lua +++ /dev/null @@ -1,8 +0,0 @@ -do return end ---disabled while extension trackwork in progress. Service is stopped anyway - - - -if event.train and atc_arrow and get_rc() == "sfh_shunt" then - setstate("SFH-T1-N", "st")
atc_send("B0WRD1S3") -end
\ No newline at end of file diff --git a/durt/nodes/(-3821,18,-4761).lua b/durt/nodes/(-3821,18,-4761).lua deleted file mode 100644 index 64f31ae..0000000 --- a/durt/nodes/(-3821,18,-4761).lua +++ /dev/null @@ -1,10 +0,0 @@ -if (event.type == "train") then - local rc = get_rc() - if rc == "sfh_service" then - set_autocouple()
atc_send("B0")
set_rc("sfh_shunt")
interrupt(5, "proceed") - else
atc_send("B0WD3OCRSM") - unset_autocouple() - set_rc("sfh_service") - set_line("SHBL") - atc_set_text_outside("Sulfur Hills Branch Line -> Desert Junction")
end
elseif (event.type == "int") then
set_route("sfh-T1-headshunt", "Enter Headshunt")
split_off_locomotive("B0OL") - setstate("SFH-T2-S", "cr")
atc_send("S2")
end
\ No newline at end of file diff --git a/durt/nodes/(-3823,18,-4774).lua b/durt/nodes/(-3823,18,-4774).lua deleted file mode 100644 index 8ece33e..0000000 --- a/durt/nodes/(-3823,18,-4774).lua +++ /dev/null @@ -1,7 +0,0 @@ -if event.type == "train" and atc_arrow and get_rc() == "sfh_shunt" then - atc_send("B0WRS4") ---setstate("SFH-T2-S", "st") --- interrupt(3, "proceed") ---elseif (event.type == "int") then --- atc_send("R S4") -end
\ No newline at end of file diff --git a/durt/nodes/(-3824,18,-4774).lua b/durt/nodes/(-3824,18,-4774).lua deleted file mode 100644 index 8ece33e..0000000 --- a/durt/nodes/(-3824,18,-4774).lua +++ /dev/null @@ -1,7 +0,0 @@ -if event.type == "train" and atc_arrow and get_rc() == "sfh_shunt" then - atc_send("B0WRS4") ---setstate("SFH-T2-S", "st") --- interrupt(3, "proceed") ---elseif (event.type == "int") then --- atc_send("R S4") -end
\ No newline at end of file diff --git a/durt/nodes/(-3843,20,-4372).lua b/durt/nodes/(-3843,20,-4372).lua deleted file mode 100644 index fa4d49f..0000000 --- a/durt/nodes/(-3843,20,-4372).lua +++ /dev/null @@ -1 +0,0 @@ -if (event.punch or event.channel=="clock") then
--digiline_send("lcd","test")
digiline_send("lcd"," --Foundry Train Status-- \nPrevious: ".. tostring(S.M27_tracking.last or "No Data").."\nCurrent :" ..tostring(S.M27_tracking.now or "No Data"))
end
\ No newline at end of file diff --git a/durt/nodes/(-4002,12,-2768).lua b/durt/nodes/(-4002,12,-2768).lua deleted file mode 100644 index 7d5ef08..0000000 --- a/durt/nodes/(-4002,12,-2768).lua +++ /dev/null @@ -1,2 +0,0 @@ --- -F.M27_tracking("Iceberg On Bamboo")
\ No newline at end of file diff --git a/durt/nodes/(-4117,13,-5765).lua b/durt/nodes/(-4117,13,-5765).lua index 599792f..f1087c7 100644 --- a/durt/nodes/(-4117,13,-5765).lua +++ b/durt/nodes/(-4117,13,-5765).lua @@ -2,6 +2,17 @@ local arrivals_indicator = POS(-4107, 20, -5793) local departures_indicator = POS(-4107, 20, -5791) local road_loco_storage = POS(-4152,13,-5840) + +if event.schedule then + if event.msg=="send_road_loco" then + interrupt_pos(road_loco_storage,"departures") + return + end + return +end +if not event.train then return end + + if not atc_arrow then --clean up RC from directing RC's F.remove_rc_match("DLG_DIR_%S+_N") return @@ -16,8 +27,12 @@ end -- --we'll deal with the yard shunter later if F.has_rc("DLG_SHUNTER") then F.indicator(departures_indicator, true) - interrupt_pos(road_loco_storage,"departures") split_off_locomotive("B0S0A0",1) + schedule_in("0;20","send_road_loco") + local cmd = { + "DLG_HS_N" + } + F.add_rc(cmd) -- if not F.indicator(arrivals_indicator) then --send shunter to its storage siding -- F.add_rc({ -- "DLG_HS_N", diff --git a/durt/nodes/(-4117,16,-5770).lua b/durt/nodes/(-4117,16,-5770).lua deleted file mode 100644 index ee1ea3f..0000000 --- a/durt/nodes/(-4117,16,-5770).lua +++ /dev/null @@ -1 +0,0 @@ -print(get_aspect(POS(-4119,18,-5770)))
\ No newline at end of file diff --git a/durt/nodes/(-4117,16,-5793).lua b/durt/nodes/(-4117,16,-5793).lua deleted file mode 100644 index 8331ec8..0000000 --- a/durt/nodes/(-4117,16,-5793).lua +++ /dev/null @@ -1,2 +0,0 @@ -do return end -if event.train then print(atc_id) end
\ No newline at end of file diff --git a/durt/nodes/(-4120,13,-5818).lua b/durt/nodes/(-4120,13,-5818).lua index ae273e3..2f93993 100644 --- a/durt/nodes/(-4120,13,-5818).lua +++ b/durt/nodes/(-4120,13,-5818).lua @@ -25,7 +25,8 @@ if event.train then split_off_locomotive("B0S0", 3) local cmd = { "DLG_HS_S", - "DLG_HS_KICKBACK", + "DLG_HS_Transfer_S_N2", + "DLG_HS_N2", "DLG_Loco_Storage" } F.add_rc(cmd) --send the road loco to collect departures or storage diff --git a/durt/nodes/(-4125,13,-5731).lua b/durt/nodes/(-4125,13,-5731).lua index c3fcc71..3a8d669 100644 --- a/durt/nodes/(-4125,13,-5731).lua +++ b/durt/nodes/(-4125,13,-5731).lua @@ -1,4 +1,5 @@ -- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +-- Modified to bounce all trains. RC Removal still works though local rev_rc = "DLG_HS_N" local rm_rc = true local autocouple = "DLG_HS_N_AC" @@ -26,10 +27,10 @@ if event.train then return end - if not F.has_rc(rev_rc) then --not our train. disregard - atc_set_ars_disable(false) - return - end +-- if not F.has_rc(rev_rc) then --not our train. disregard +-- atc_set_ars_disable(false) +-- return +-- end if rm_rc then F.remove_rc({rev_rc}) end schedule_in(";01",atc_id) return diff --git a/durt/nodes/(-4127,5,-5624).lua b/durt/nodes/(-4127,5,-5624).lua deleted file mode 100644 index d30218f..0000000 --- a/durt/nodes/(-4127,5,-5624).lua +++ /dev/null @@ -1,24 +0,0 @@ -local lights = { - POS(-4131,5,-5623), - POS(-4127,5,-5623), - POS(-4127,5,-5617), - POS(-4131,5,-5617) -} - -if event.train then - if atc_arrow then - schedule_in(";05",true) - return - end -end - -if event.schedule then - if atc_id then - schedule_in(";05",true) - return - else - for _,v in pairs(lights) do - setstate(v,"off") - end - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4128,5,-5630).lua b/durt/nodes/(-4128,5,-5630).lua deleted file mode 100644 index ef978ad..0000000 --- a/durt/nodes/(-4128,5,-5630).lua +++ /dev/null @@ -1,21 +0,0 @@ -local pt = POS(-4129,5,-5628) -local bt = POS(-4132,4,-5626) -local dir = "l" -if event.train then - if atc_arrow then - setstate(pt,dir) - setstate(bt,"on") - atc_send("S5") - schedule_in(";05",true) - end -end - -if event.schedule then - if atc_id then - schedule_in(";05",true) - return - else - setstate(bt,"off") - return - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4128,6,-5692).lua b/durt/nodes/(-4128,6,-5692).lua deleted file mode 100644 index 19d83df..0000000 --- a/durt/nodes/(-4128,6,-5692).lua +++ /dev/null @@ -1,20 +0,0 @@ -if atc_arrow then - if get_rc():match("DLG_shunt") then - atc_send("BBWRSM") - F.remove_rc({"DLG_shunt"},true) - else - atc_send("BB") - end -end - -if event.channel=="train_ctl" and event.msg=="send" then - if not atc_id or not atc_arrow then - digiline_send("error","Error "..os.time().."\nArrow:"..tostring(atc_arrow).."\nID:"..tostring(atc_id)) - return - end - atc_send("S3") - set_rc((get_rc() or "").." DLG_shunt") - split_at_index(2,"BB") - set_autocouple() - return -end
\ No newline at end of file diff --git a/durt/nodes/(-4129,13,-5726).lua b/durt/nodes/(-4129,13,-5726).lua deleted file mode 100644 index 2f179db..0000000 --- a/durt/nodes/(-4129,13,-5726).lua +++ /dev/null @@ -1,28 +0,0 @@ -if event.train then - if atc_arrow then - if F.has_rc("DLG_exit_north") then - F.remove_rc({"DLG_exit_north"}) - return - end - if F.has_rc("DLG_north_reverse") then - schedule_in(";01",atc_id) - return - end - else - if F.has_rc("DLG_north_reverse_couple") then - atc_send("CplD1S2") - return - end - end -end - - -if event.schedule then - if event.msg == atc_id then - schedule_in(";01",event.msg) - return - else - atc_send_to_train(event.msg,"S0WRS3") - return - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4129,16,-5745).lua b/durt/nodes/(-4129,16,-5745).lua deleted file mode 100644 index 7ba350f..0000000 --- a/durt/nodes/(-4129,16,-5745).lua +++ /dev/null @@ -1,14 +0,0 @@ -local signal = POS(-4128,16,-5754) -if event.train and atc_arrow then - local rc = (get_rc() or "") - if rc:match("DLG_shunt_platforms") then - atc_send("B0WD2A0RS3CplS1") - if rc:match("DLG_shunt_Platform1") then - set_route(signal,"SHUNT Platform 1") - return - elseif rc:match("DLG_shunt_Platform2") then - set_route(signal,"SHUNT Platform 2") - return - end - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4129,16,-5802).lua b/durt/nodes/(-4129,16,-5802).lua deleted file mode 100644 index 2e1142d..0000000 --- a/durt/nodes/(-4129,16,-5802).lua +++ /dev/null @@ -1,26 +0,0 @@ -local split_indicator = POS(-4128,17,-5768) -__approach_callback_mode = 1 - -if event.approach and not event.has_entered then - if get_line() ~= "DLG_OFB" then return end - - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) -end - -if event.train then - if get_line() ~= "DLG_OFB" then return end - if not atc_arrow then return end - local state = getstate(split_indicator) - if state == "red" then - split_off_locomotive("A0B0OL",1) - atc_send("S3") - atc_set_ars_disable(false) - setstate(split_indicator,"green") - set_rc((get_rc() or "").." DLG_south_reverse DLG_around_short DLG_north_reverse DLG_shunt_platforms DLG_shunt_Platform2") - elseif state == "green" then - atc_send("B0WROCA1D2S4D10SM") - setstate(split_indicator,"red") - F.remove_rc({"DLG_south_reverse","DLG_around_long","DLG_north_reverse","DLG_shunt_platforms","DLG_shunt_Platform2"}) - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4129,5,-5616).lua b/durt/nodes/(-4129,5,-5616).lua deleted file mode 100644 index d30218f..0000000 --- a/durt/nodes/(-4129,5,-5616).lua +++ /dev/null @@ -1,24 +0,0 @@ -local lights = { - POS(-4131,5,-5623), - POS(-4127,5,-5623), - POS(-4127,5,-5617), - POS(-4131,5,-5617) -} - -if event.train then - if atc_arrow then - schedule_in(";05",true) - return - end -end - -if event.schedule then - if atc_id then - schedule_in(";05",true) - return - else - for _,v in pairs(lights) do - setstate(v,"off") - end - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4129,5,-5624).lua b/durt/nodes/(-4129,5,-5624).lua deleted file mode 100644 index d30218f..0000000 --- a/durt/nodes/(-4129,5,-5624).lua +++ /dev/null @@ -1,24 +0,0 @@ -local lights = { - POS(-4131,5,-5623), - POS(-4127,5,-5623), - POS(-4127,5,-5617), - POS(-4131,5,-5617) -} - -if event.train then - if atc_arrow then - schedule_in(";05",true) - return - end -end - -if event.schedule then - if atc_id then - schedule_in(";05",true) - return - else - for _,v in pairs(lights) do - setstate(v,"off") - end - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4129,5,-5626).lua b/durt/nodes/(-4129,5,-5626).lua deleted file mode 100644 index 2dd69c1..0000000 --- a/durt/nodes/(-4129,5,-5626).lua +++ /dev/null @@ -1,12 +0,0 @@ -local lights = { - POS(-4131,5,-5623), - POS(-4127,5,-5623), - POS(-4127,5,-5617), - POS(-4131,5,-5617) -} - -if event.train and atc_arrow then - for _,v in pairs(lights) do - setstate(v,"on") - end -end diff --git a/durt/nodes/(-4129,5,-5630).lua b/durt/nodes/(-4129,5,-5630).lua deleted file mode 100644 index 26a4ecb..0000000 --- a/durt/nodes/(-4129,5,-5630).lua +++ /dev/null @@ -1,21 +0,0 @@ -local pt = POS(-4129,5,-5628) -local bt = POS(-4132,4,-5626) -local dir = "s" -if event.train then - if atc_arrow then - setstate(pt,dir) - setstate(bt,"on") - atc_send("S5") - schedule_in(";05",true) - end -end - -if event.schedule then - if atc_id then - schedule_in(";05",true) - return - else - setstate(bt,"off") - return - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4129,9,-5588).lua b/durt/nodes/(-4129,9,-5588).lua deleted file mode 100644 index 86a9f95..0000000 --- a/durt/nodes/(-4129,9,-5588).lua +++ /dev/null @@ -1,44 +0,0 @@ -local lights = { - POS(-4131,5,-5623), - POS(-4127,5,-5623), - POS(-4127,5,-5617), - POS(-4131,5,-5617) -} -local pt = POS(-4129,5,-5628) -local bt = POS(-4132,4,-5626) - -if event.train then - if atc_arrow then - for _,v in pairs(lights) do - setstate(v,"on") - end - if getstate(bt)=="on" then - atc_send("BB") - schedule_in(";05",true) - else - if (get_rc() or ""):match("CAN_corn") then - setstate(pt,"r") - atc_send("B1") - else - setstate(pt,"s") - atc_send("S3") - end - end - else - if tostring(get_rc() or ""):match("DLG_shunt") then - atc_send("S3D5S0WRD1S3") - else - atc_send("SM") - end - end -end - -if event.schedule then - if getstate(bt)=="on" then - atc_send("BB") - schedule_in(";05",true) - else - setstate(pt,"r") - atc_send("S3") - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4130,5,-5630).lua b/durt/nodes/(-4130,5,-5630).lua deleted file mode 100644 index 0045f17..0000000 --- a/durt/nodes/(-4130,5,-5630).lua +++ /dev/null @@ -1,21 +0,0 @@ -local pt = POS(-4129,5,-5628) -local bt = POS(-4132,4,-5626) -local dir = "r" -if event.train then - if atc_arrow then - setstate(pt,dir) - setstate(bt,"on") - atc_send("S5") - schedule_in(";05",true) - end -end - -if event.schedule then - if atc_id then - schedule_in(";05",true) - return - else - setstate(bt,"off") - return - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4132,6,-5690).lua b/durt/nodes/(-4132,6,-5690).lua deleted file mode 100644 index a30b837..0000000 --- a/durt/nodes/(-4132,6,-5690).lua +++ /dev/null @@ -1,20 +0,0 @@ -if atc_arrow then - if get_rc():match("DLG_shunt") then - atc_send("BBWRSM") - F.remove_rc({"DLG_shunt"},true) - else - atc_send("BB") - end -end - -if event.channel=="train_ctl" and event.msg=="send" then - if not atc_id or not atc_arrow then - digiline_send("error","Error "..os.time()) - return - end - atc_send("S3") - set_rc((get_rc() or "").." DLG_shunt") - split_at_index(2,"BB") - set_autocouple() - return -end
\ No newline at end of file diff --git a/durt/nodes/(-4134,5,-5629).lua b/durt/nodes/(-4134,5,-5629).lua deleted file mode 100644 index 7dab90e..0000000 --- a/durt/nodes/(-4134,5,-5629).lua +++ /dev/null @@ -1,14 +0,0 @@ -local lights = { - POS(-4131,5,-5623), - POS(-4127,5,-5623), - POS(-4127,5,-5617), - POS(-4131,5,-5617) -} - -if event.train then - if atc_arrow then - for _,v in pairs(lights) do - setstate(v,"on") - end - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4134,5,-5631).lua b/durt/nodes/(-4134,5,-5631).lua deleted file mode 100644 index d30218f..0000000 --- a/durt/nodes/(-4134,5,-5631).lua +++ /dev/null @@ -1,24 +0,0 @@ -local lights = { - POS(-4131,5,-5623), - POS(-4127,5,-5623), - POS(-4127,5,-5617), - POS(-4131,5,-5617) -} - -if event.train then - if atc_arrow then - schedule_in(";05",true) - return - end -end - -if event.schedule then - if atc_id then - schedule_in(";05",true) - return - else - for _,v in pairs(lights) do - setstate(v,"off") - end - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4135,16,-5809).lua b/durt/nodes/(-4135,16,-5809).lua deleted file mode 100644 index 28ae5f2..0000000 --- a/durt/nodes/(-4135,16,-5809).lua +++ /dev/null @@ -1,27 +0,0 @@ -local split_indicator = POS(-4134,17,-5811) -__approach_callback_mode = 1 - -if event.approach and not event.has_entered then - if not F.has_rc("DLG_ArcRun") then return end - - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) -end - -if event.train then - if not F.has_rc("DLG_ArcRun") then return end - if not atc_arrow then return end - local state = getstate(split_indicator) - if state == "red" then - split_off_locomotive("A0B0OL",1) - atc_send("S3") - atc_set_ars_disable(false) - setstate(split_indicator,"green") - set_rc(F.get_rc_safe().." DLG_south_reverse DLG_around_long DLG_north_reverse DLG_north_reverse_couple DLG_shunt_platforms DLG_shunt_Freight2") - elseif state == "green" then - atc_send("B0WROCA1D2S4") - setstate(split_indicator,"red") - F.remove_rc({"DLG_south_reverse","DLG_around_long","DLG_north_reverse_couple","DLG_shunt_Freight2"}) - set_rc(F.get_rc_safe().." DLG_shunt_Freight4") - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4138,13,-5778).lua b/durt/nodes/(-4138,13,-5778).lua new file mode 100644 index 0000000..7d57cd6 --- /dev/null +++ b/durt/nodes/(-4138,13,-5778).lua @@ -0,0 +1,7 @@ +print(rwt.to_string(rwt.now())) +local fc_array = get_fc() +for idx,list in ipairs(fc_array) do + fc_array[idx] = list:split("!",true) +end +print(fc_array) +print(get_fc_index())
\ No newline at end of file diff --git a/durt/nodes/(-4138,16,-5809).lua b/durt/nodes/(-4138,16,-5809).lua deleted file mode 100644 index 7489acc..0000000 --- a/durt/nodes/(-4138,16,-5809).lua +++ /dev/null @@ -1 +0,0 @@ ---
\ No newline at end of file diff --git a/durt/nodes/(-4142,17,-5792).lua b/durt/nodes/(-4142,17,-5792).lua deleted file mode 100644 index a82d158..0000000 --- a/durt/nodes/(-4142,17,-5792).lua +++ /dev/null @@ -1,4 +0,0 @@ -if event.punch then - interrupt_pos(POS(-4144,16,-5792)) -end -
\ No newline at end of file diff --git a/durt/nodes/(-4142,17,-5841).lua b/durt/nodes/(-4142,17,-5841).lua deleted file mode 100644 index 24270e4..0000000 --- a/durt/nodes/(-4142,17,-5841).lua +++ /dev/null @@ -1,24 +0,0 @@ -if event.train then - if atc_arrow then - if F.has_rc("DLG_south_reverse") then - schedule_in(";01",atc_id) - return - end - else - if F.has_rc("DLG_south_reverse_couple") then - atc_send("CplD1S2") - return - end - end -end - - -if event.schedule then - if event.msg == atc_id then - schedule_in(";01",event.msg) - return - else - atc_send_to_train(event.msg,"S0WRS3") - return - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4144,13,-5793).lua b/durt/nodes/(-4144,13,-5793).lua new file mode 100644 index 0000000..059c6ef --- /dev/null +++ b/durt/nodes/(-4144,13,-5793).lua @@ -0,0 +1,45 @@ +-- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +local rev_rc = "DLG_HS_N2" +local rm_rc = true +local autocouple = "DLG_HS_N2_AC" +local rm_cpl_rc = true + + +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + atc_set_lzb_tsr(3) + atc_set_ars_disable(true) + return +end + +if event.train then + if not atc_arrow then --train has bounced + if F.has_rc(autocouple) then + atc_send("CplS0WD2S1") + if rm_cpl_rc then F.remove_rc({autocouple}) end + end + return + end + + if not F.has_rc(rev_rc) then --not our train. disregard + atc_set_ars_disable(false) + return + end + if rm_rc then F.remove_rc({rev_rc}) end + schedule_in(";01",atc_id) + return +end + +if event.schedule then + if not atc_id then --bounce the train that just passed + atc_send_to_train(event.msg,"B0WRD1A1S3") + else + if atc_id == event.msg then --train hasn't fully passed yet, wait a bit longer + schedule_in(";01",atc_id) + else -- somehow another train crossed the controller before the first one returned. Unlikely but possible + atc_send_to_train(event.msg,"BBOL") + atc_send("BBOL") + end + end +end
\ No newline at end of file diff --git a/durt/nodes/(-4144,16,-5792).lua b/durt/nodes/(-4144,16,-5792).lua deleted file mode 100644 index 53bf8c4..0000000 --- a/durt/nodes/(-4144,16,-5792).lua +++ /dev/null @@ -1,19 +0,0 @@ -if event.ext_int then - if not atc_id then - print("No train") - return - end - F.remove_rc({"DLG_north_reverse","DLG_shunt_platforms","DLG_shunt_Freight4"}) - F.add_rc("DLG_exit_north") - atc_send("I+S0WR;S4D10SM") - print("Train departing DLG\nTrain id: "..atc_id) -end - -__approach_callback_mode = 1 -if event.approach and not event.has_entered then - atc_set_lzb_tsr(1) -end - -if event.train and atc_arrow then - atc_send("S1") -end
\ No newline at end of file diff --git a/durt/nodes/(-4146,16,-5793).lua b/durt/nodes/(-4146,16,-5793).lua deleted file mode 100644 index a82d158..0000000 --- a/durt/nodes/(-4146,16,-5793).lua +++ /dev/null @@ -1,4 +0,0 @@ -if event.punch then - interrupt_pos(POS(-4144,16,-5792)) -end -
\ No newline at end of file diff --git a/durt/nodes/(-4147,19,-5792).lua b/durt/nodes/(-4147,19,-5792).lua deleted file mode 100644 index c53ad9d..0000000 --- a/durt/nodes/(-4147,19,-5792).lua +++ /dev/null @@ -1,3 +0,0 @@ -local track = POS(-4144,16,-5792) -local message = "ArcRun" -if event.punch then interrupt_pos(track,message) end
\ No newline at end of file diff --git a/durt/nodes/(-4152,13,-5840).lua b/durt/nodes/(-4152,13,-5840).lua index 2611c48..8ef8f3d 100644 --- a/durt/nodes/(-4152,13,-5840).lua +++ b/durt/nodes/(-4152,13,-5840).lua @@ -35,13 +35,14 @@ local function send_train() end --no departures to collect, go straight to TYARD set_rc(table.concat(cmd," ")) - atc_send("S0WRD2A1S4") + atc_send("I+S0WR;D2A1S4") F.indicator(TYARD_notify_indicator,false) return true end if event.schedule then - if event.message == "check_again" then + print(rwt.to_string(rwt.now())..tostring(event.msg)) + if event.msg == "check_again" then if not send_train() then --will either send train or continue clock schedule_in("1;0","check_again") return diff --git a/durt/nodes/(-4158,12,-2742).lua b/durt/nodes/(-4158,12,-2742).lua deleted file mode 100644 index b18dc7f..0000000 --- a/durt/nodes/(-4158,12,-2742).lua +++ /dev/null @@ -1 +0,0 @@ ---Still need to convert to a function rather than trackside
local hs_sig = "TheStacks_hs"
local hs_route = "Right to Wye"
local exit_sig = "TheStacks_exit"
local exit_route = "Exit to Mainline"
local siding_id = "TheStacks"
local length_prefix = "Loco"
if (event.train and atc_arrow) then
local rc = get_rc() or " "
-- the RC that controls the link to split
-- rc value: "<rc><num_wagons to shunt with>" default is single loco
-- eg "Loco2" for tenders, "Loco3" for
local loco_pos = rc:match(length_prefix.."%d+") or length_prefix.."1"
loco_pos = tonumber(loco_pos:match("%d+"))+1
if not S.runarounds[siding_id].shunting then -- train to be split
--store info for later re-insertion
S.runarounds[siding_id] = {
['shunting'] = true,
['rc'] = rc,
['line'] = get_line() or " "
}
atc_send("B0S0")
interrupt(5,{['cmd'] = "split", ['leng'] = loco_pos})
-- change int time if needed, depends on approach speed slowdown
else -- train has rejoined
--re-insert info to train
if S.runarounds[siding_id].rc then set_rc(S.runarounds[siding_id].rc) end
if S.runarounds[siding_id].line then set_line(S.runarounds[siding_id].line) end
--depart
atc_send("B0S0WD1RSM")
set_route(exit_sig,exit_route)
S.runarounds[siding_id].shunting = false
end
end
if event.int then
if event.msg.cmd=="split" then
cmd = event.msg
split_at_index(cmd.leng,"")
atc_send("S2")
set_route(hs_sig,hs_route)
end
end
\ No newline at end of file diff --git a/durt/nodes/(-4181,13,-5787).lua b/durt/nodes/(-4181,13,-5787).lua new file mode 100644 index 0000000..15a77da --- /dev/null +++ b/durt/nodes/(-4181,13,-5787).lua @@ -0,0 +1,16 @@ +if not atc_arrow then return end +if F.has_rc("COLLECT") then atc_send("B2CplS2") return end +local options = { + {route = "SHUNT Centre", section = "250710"}, + {route = "SHUNT Right", section = "403524"}, + {route = "SHUNT Left", section = "779419"}, + {route = "SHUNT Far Right", section = "810627"}, +} +for _,v in ipairs(options) do + if not section_occupancy(v.section)[1] then + set_route(POS(-4183,13,-5788),v.route) + atc_set_ars_disable(true) + return + end +end +print("No automatic routes available. Check manually")
\ No newline at end of file diff --git a/durt/nodes/(-4197,13,-5781).lua b/durt/nodes/(-4197,13,-5781).lua new file mode 100644 index 0000000..4f3ca65 --- /dev/null +++ b/durt/nodes/(-4197,13,-5781).lua @@ -0,0 +1,7 @@ +if atc_arrow then + if not F.has_rc("COLLECT") then + split_off_locomotive("A0B0") + end + atc_set_ars_disable(false) + return +end
\ No newline at end of file diff --git a/durt/nodes/(-4197,13,-5784).lua b/durt/nodes/(-4197,13,-5784).lua new file mode 100644 index 0000000..4f3ca65 --- /dev/null +++ b/durt/nodes/(-4197,13,-5784).lua @@ -0,0 +1,7 @@ +if atc_arrow then + if not F.has_rc("COLLECT") then + split_off_locomotive("A0B0") + end + atc_set_ars_disable(false) + return +end
\ No newline at end of file diff --git a/durt/nodes/(-4197,13,-5787).lua b/durt/nodes/(-4197,13,-5787).lua new file mode 100644 index 0000000..4f3ca65 --- /dev/null +++ b/durt/nodes/(-4197,13,-5787).lua @@ -0,0 +1,7 @@ +if atc_arrow then + if not F.has_rc("COLLECT") then + split_off_locomotive("A0B0") + end + atc_set_ars_disable(false) + return +end
\ No newline at end of file diff --git a/durt/nodes/(-4197,13,-5790).lua b/durt/nodes/(-4197,13,-5790).lua new file mode 100644 index 0000000..4f3ca65 --- /dev/null +++ b/durt/nodes/(-4197,13,-5790).lua @@ -0,0 +1,7 @@ +if atc_arrow then + if not F.has_rc("COLLECT") then + split_off_locomotive("A0B0") + end + atc_set_ars_disable(false) + return +end
\ No newline at end of file diff --git a/durt/nodes/(-4599,7,-6502).lua b/durt/nodes/(-4599,7,-6502).lua deleted file mode 100644 index 748b242..0000000 --- a/durt/nodes/(-4599,7,-6502).lua +++ /dev/null @@ -1,24 +0,0 @@ -if event.train then - if atc_arrow == true then - if F.has_rc("BFT_Mainline_Headshunt") then - atc_send("S2") - schedule_in(";01",atc_id) - return - end - else - if F.has_rc("BFT_rejoin_from_north") then - atc_send("CplS1") - return - end - end -end - -if event.schedule then - if atc_id and event.msg == atc_id then - schedule_in(";01",event.msg) - return - else - atc_send_to_train(event.msg,"S0WRS3") - return - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4623,7,-6597).lua b/durt/nodes/(-4623,7,-6597).lua deleted file mode 100644 index 4a4dcb0..0000000 --- a/durt/nodes/(-4623,7,-6597).lua +++ /dev/null @@ -1,35 +0,0 @@ -local split_indicator = POS(-4627,8,-6597) -__approach_callback_mode = 1 - -local shunt_actions = { - "BFT_Siding_B", - "BFT_shunt_platforms", - "BFT_shunt_around_Track2", - "BFT_Mainline_Headshunt", - "BFT_rejoin_from_north", - "BFT_Platform1" -} - -if event.approach and not event.has_entered then - if F.has_rc("BFT_around_test") == false then return end - - atc_set_ars_disable(true) - atc_set_lzb_tsr(1) -end - -if event.train then - if F.has_rc("BFT_around_test") == false then return end - if not atc_arrow then return end - local state = getstate(split_indicator) - if state == "off" then - split_off_locomotive("A0B0OR",1) - atc_send("S3") - atc_set_ars_disable(false) - setstate(split_indicator,"on") - set_rc(F.get_rc_safe() .." ".. table.concat(shunt_actions," ")) - elseif state == "on" then - atc_send("I>1B0ES0;WROCA1D2S4D10SM") - setstate(split_indicator,"off") - F.remove_rc(shunt_actions) - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4626,7,-6638).lua b/durt/nodes/(-4626,7,-6638).lua deleted file mode 100644 index b22f859..0000000 --- a/durt/nodes/(-4626,7,-6638).lua +++ /dev/null @@ -1,19 +0,0 @@ -local signal = POS(-4626,7,-6616) -if event.train and atc_arrow then - if F.has_rc("BFT_shunt_platforms") then - local control = {"A0S0WD2RA1"} - if F.has_rc("BFT_shunt_Platform1") then - set_route(signal,"SHUNT Platform 1") - control[2] = "S3CplS1" - elseif F.has_rc("BFT_shunt_Track2") then - set_route(signal,"SHUNT Track 2") - control[2] = "S3CplS1" - elseif F.has_rc("BFT_shunt_around_Track2") then - set_route(signal,"Around via Track 2") - control[2] = "S4" - end - control = table.concat(control,"") - atc_send(control) - return - end -end
\ No newline at end of file diff --git a/durt/nodes/(-4818,13,-6820).lua b/durt/nodes/(-4818,13,-6820).lua new file mode 100644 index 0000000..526cb6d --- /dev/null +++ b/durt/nodes/(-4818,13,-6820).lua @@ -0,0 +1,46 @@ +-- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +local rev_rc = "KKD_HS_U" +local rm_rc = true +local autocouple = "KKD_HS_U_CPL" +local rm_cpl_rc = true + +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + if not F.has_rc(rev_rc) then return end + atc_set_lzb_tsr(3) + atc_set_ars_disable(true) + return +end + +if event.train then + if not atc_arrow then --train has bounced + if F.has_rc(autocouple) then + atc_send("CplS0WD2S1") + if rm_cpl_rc then F.remove_rc({autocouple}) end + end + return + end + + if not F.has_rc(rev_rc) then --not our train. disregard + atc_set_ars_disable(false) + return + end + F.remove_rc("KKD_RUNAROUND") + if rm_rc then F.remove_rc({rev_rc}) end + schedule_in(";01",atc_id) + return +end + +if event.schedule then + if not atc_id then --bounce the train that just passed + atc_send_to_train(event.msg,"B0WRD1A1S3") + else + if atc_id == event.msg then --train hasn't fully passed yet, wait a bit longer + schedule_in(";01",atc_id) + else -- somehow another train crossed the controller before the first one returned. Unlikely but possible + atc_send_to_train(event.msg,"BBOL") + atc_send("BBOL") + end + end +end
\ No newline at end of file diff --git a/durt/nodes/(-4896,13,-6820).lua b/durt/nodes/(-4896,13,-6820).lua new file mode 100644 index 0000000..103c52f --- /dev/null +++ b/durt/nodes/(-4896,13,-6820).lua @@ -0,0 +1,28 @@ +-- KKD Runaround +local rejoin_rc = "KKD_REJOIN" +local runaround_cmd = { + "KKD_RUNAROUND", --HS_Down access, runaround + "KKD_HS_U", -- HS_Up access + "KKD_HS_U_CPL", -- recouple in Down Direction + rejoin_rc -- Down rejoin director +} +__approach_callback_mode = 1 +if event.approach and not event.has_entered then + if not F.has_rc("SFHB") then return end + atc_set_text_inside("Next Station: Kokardine\nService Terminates Here") + atc_set_lzb_tsr(1) + return +end +if event.train then + if not get_line() == "SFHB" then return end + if not F.has_rc(rejoin_rc) then --train has arrived. Split and run around + atc_set_text_inside("Kokardine\nService Terminates Here") + split_off_locomotive("A0S0OL") + F.add_rc(runaround_cmd) + return + end + F.remove_rc(runaround_cmd) + atc_send("OCS0WRD5SM") + atc_set_text_inside("") + return +end
\ No newline at end of file diff --git a/durt/nodes/(-541,26,2469).lua b/durt/nodes/(-541,26,2469).lua deleted file mode 100644 index ea080ea..0000000 --- a/durt/nodes/(-541,26,2469).lua +++ /dev/null @@ -1 +0,0 @@ --- arrow points towards loco HS for Bounce
local lane = 1
if S.yard_active then
if atc_arrow and S.exiting then
set_rc("EXIT")
set_route("CANNERY_W"..lane, "EXIT")
atc_send("B0WRD1SM")
else
atc_send("B0WD1RS4")
end
end
\ No newline at end of file diff --git a/durt/nodes/(-541,26,2472).lua b/durt/nodes/(-541,26,2472).lua deleted file mode 100644 index d5d7bd4..0000000 --- a/durt/nodes/(-541,26,2472).lua +++ /dev/null @@ -1 +0,0 @@ --- arrow points towards loco HS for Bounce
local lane = 2
if S.yard_active then
if atc_arrow and S.exiting then
set_rc("EXIT")
set_route("CANNERY_W"..lane, "EXIT")
atc_send("B0WRD1SM")
else
atc_send("B0WD1RS4")
end
end
\ No newline at end of file diff --git a/durt/nodes/(-541,26,2475).lua b/durt/nodes/(-541,26,2475).lua deleted file mode 100644 index 58c5e8b..0000000 --- a/durt/nodes/(-541,26,2475).lua +++ /dev/null @@ -1 +0,0 @@ --- arrow points towards loco HS for Bounce
local lane = 3
if S.yard_active then
if atc_arrow and S.exiting then
set_rc("EXIT")
set_route("CANNERY_W"..lane, "EXIT")
atc_send("B0WRD1SM")
else
atc_send("B0WD1RS4")
end
end
\ No newline at end of file diff --git a/durt/nodes/(-549,26,2478).lua b/durt/nodes/(-549,26,2478).lua deleted file mode 100644 index 90eb7a9..0000000 --- a/durt/nodes/(-549,26,2478).lua +++ /dev/null @@ -1 +0,0 @@ ---LOCO SPLITTER
local lane = 4
if S.yard_active then
if not S.first_pass then
S.first_pass = true
set_route("CANNERY_E"..lane,"HEADSHUNT")
split_off_locomotive("B0")
set_rc("AROUND")
else
-- has collected wagons, now bounce back to sorting splitter
atc_send("B0WRD1S4")
end
end
\ No newline at end of file diff --git a/durt/nodes/(-571,26,2515).lua b/durt/nodes/(-571,26,2515).lua new file mode 100644 index 0000000..17d8bf3 --- /dev/null +++ b/durt/nodes/(-571,26,2515).lua @@ -0,0 +1,2 @@ +if not (event.name == "Maverick2797" or event.name=="Wile-E-Coyote") then return end +interrupt_pos(POS(-630,26,2454), "notify")
\ No newline at end of file diff --git a/durt/nodes/(-585,26,2478).lua b/durt/nodes/(-585,26,2478).lua deleted file mode 100644 index f79b2c9..0000000 --- a/durt/nodes/(-585,26,2478).lua +++ /dev/null @@ -1 +0,0 @@ ---arrow points west towards working HS
local lane = 4
if S.yard_active == true then
if atc_arrow then
set_route("CANNERY_W"..lane, "HEADSHUNT")
-- turnouts should already be set by the train returning from HS
local plen = train_length()
local rc = split_at_fc("B0",3)
local trc = "CAN_"..rc
if plen == train_length() and (rc == "" or S.rc:match(trc)) then
S.exiting = true
end
if rc and rc ~= "" then
set_rc("CAN_"..rc)
else
set_rc(S.rc)
S.exiting = true
end
end
end
\ No newline at end of file diff --git a/durt/nodes/(-615,26,2475).lua b/durt/nodes/(-615,26,2475).lua deleted file mode 100644 index 96871b7..0000000 --- a/durt/nodes/(-615,26,2475).lua +++ /dev/null @@ -1,7 +0,0 @@ -__approach_callback_mode = 1 -if event.approach and not event.has_entered then - atc_set_lzb_tsr(1) -end -if event.train and atc_arrow then - atc_send("S1") -end
\ No newline at end of file diff --git a/durt/nodes/(-620,26,2464).lua b/durt/nodes/(-620,26,2464).lua deleted file mode 100644 index cb7688f..0000000 --- a/durt/nodes/(-620,26,2464).lua +++ /dev/null @@ -1,9 +0,0 @@ -__approach_callback_mode = 1 - -if event.approach and not event.has_entered then - atc_set_lzb_tsr(1) -end -if event.train and atc_arrow then - atc_send("S1") -end -if event.digiline and event.channel=="trainctl" then atc_send("I+S0WR;D1S3") end
\ No newline at end of file diff --git a/durt/nodes/(-621,26,2469).lua b/durt/nodes/(-621,26,2469).lua deleted file mode 100644 index 80f4e52..0000000 --- a/durt/nodes/(-621,26,2469).lua +++ /dev/null @@ -1 +0,0 @@ --- arrow points towards Sorting HS for Bounce
local lane = 1
if S.yard_active == true then
if (atc_arrow and not S.exiting) then
split_off_locomotive("B0WR")
set_route("CANNERY_W"..lane,"HEADSHUNT")
set_rc("PICKUP")
elseif atc_arrow and S.exiting then
set_route("CANNERY_W"..lane,"EXIT")
end
end
\ No newline at end of file diff --git a/durt/nodes/(-621,26,2472).lua b/durt/nodes/(-621,26,2472).lua deleted file mode 100644 index de4552e..0000000 --- a/durt/nodes/(-621,26,2472).lua +++ /dev/null @@ -1 +0,0 @@ --- arrow points towards Sorting HS for Bounce
local lane = 2
if S.yard_active == true then
if (atc_arrow and not S.exiting) then
split_off_locomotive("B0WR")
set_route("CANNERY_W"..lane,"HEADSHUNT")
set_rc("PICKUP")
elseif atc_arrow and S.exiting then
set_route("CANNERY_W"..lane,"EXIT")
end
end
\ No newline at end of file diff --git a/durt/nodes/(-621,26,2475).lua b/durt/nodes/(-621,26,2475).lua deleted file mode 100644 index 35e4773..0000000 --- a/durt/nodes/(-621,26,2475).lua +++ /dev/null @@ -1 +0,0 @@ --- arrow points towards Sorting HS for Bounce
local lane = 3
if S.yard_active == true then
if (atc_arrow and not S.exiting) then
split_off_locomotive("B0WR")
set_route("CANNERY_W"..lane,"HEADSHUNT")
set_rc("PICKUP")
elseif atc_arrow and S.exiting then
set_route("CANNERY_W"..lane,"EXIT")
end
end
\ No newline at end of file diff --git a/durt/nodes/(-638,26,2475).lua b/durt/nodes/(-638,26,2475).lua deleted file mode 100644 index 2b808a1..0000000 --- a/durt/nodes/(-638,26,2475).lua +++ /dev/null @@ -1 +0,0 @@ ---Yard Exit
--arrow points away from yard
if S.yard_active == true then
if atc_arrow then --exiting yard after shunt sequence
set_rc(S.rc)
S.yard_active = nil
S.rc = nil
S.first_pass = nil
S.exiting = nil
unset_autocouple()
end
end
\ No newline at end of file diff --git a/durt/nodes/(-646,26,2469).lua b/durt/nodes/(-646,26,2469).lua deleted file mode 100644 index 1158ddb..0000000 --- a/durt/nodes/(-646,26,2469).lua +++ /dev/null @@ -1,6 +0,0 @@ --- -if S.yard_active then - if atc_arrow then - set_autocouple() - end -end
\ No newline at end of file diff --git a/durt/nodes/(-678,20,2478).lua b/durt/nodes/(-678,20,2478).lua deleted file mode 100644 index 9d4e471..0000000 --- a/durt/nodes/(-678,20,2478).lua +++ /dev/null @@ -1,3 +0,0 @@ -do return end --- approach siding
atc_send("B0")
if S.yard_active then
interrupt(10, "recheck")
else
atc_send("S4")
S.rc = get_rc()
step_fc()
S.yard_active = true
set_route("CANNERY_WAITING", "APPROACH YARD") -set_route("CANNERY_APPROACH","PICKUP")
end
\ No newline at end of file diff --git a/durt/nodes/(-716,3,1894).lua b/durt/nodes/(-716,3,1894).lua index 7345c4a..01123f0 100644 --- a/durt/nodes/(-716,3,1894).lua +++ b/durt/nodes/(-716,3,1894).lua @@ -1,4 +1,4 @@ if event then return end --temporarily disable the track ------------------------------------------------------------------------------------------- -factory_exit_sig = "icebreaker_factory_exit"
inside_maniest = "Cargo: Empty\nOrigin: Icebreaker Factory\nDestination: Auto Plantation"
outside_naming = "DURT Logs to Diamond Conversion Train"
mainline_rc = "autorun FREIGHT"
mainline_ln = "Maverick2797_diamonds"
if event.train then
digiline_send("train_response","Train "..atc_id.." ready||Entered factory:||Speed: "..atc_speed)
set_line(mainline_ln)
set_rc(mainline_rc)
atc_set_text_outside(outside_naming)
atc_set_text_inside(inside_maniest)
end
if event.digiline then
if event.channel=="train_control" then
if not atc_id then
digiline_send("train_response","No Train Detected")
return
end
if event.msg=="shuffle" then
if atc_speed > 0 then
digiline_send("train_response","Please wait:||train still moving||Speed: "..atc_speed)
return
elseif not can_set_route(factory_exit_sig,"Reverse to Breaker-side Siding") then
digiline_send("train_response","Unable to set route to:||Breaker-side Siding")
return
else
set_route(factory_exit_sig,"Reverse to Breaker-side Siding")
atc_send("R S1 D5 SM D13 S0 W R S1")
digiline_send("train_response","Refilling Input Chests||Shuffling Train")
return
end
return
elseif event.msg=="exit" then
if atc_speed > 0 then
digiline_send("train_response","Please wait:||train still moving||Speed: "..atc_speed)
return
elseif not can_set_route(factory_exit_sig,"Exit to Mainline South") then
digiline_send("train_response","Unable to set route to:||Mainline South")
return
else
set_route(factory_exit_sig,"Exit to Mainline South")
atc_send("R SM")
digiline_send("train_response","Train Departing")
return
end
return
elseif event.msg=="rehead" then
if atc_speed > 0 then
digiline_send("train_response","Please wait:||train still moving||Speed: "..atc_speed)
return
elseif not can_set_route(factory_exit_sig,"Reverse for loco run-around") then
digiline_send("train_response","Unable to set route to:||Loco Run Around Sequence")
return
else
set_route(factory_exit_sig,"Reverse for loco run-around")
set_rc("split_around")
atc_send("R SM D15 S0 W R S1")
digiline_send("train_response","Loco Changind Ends")
return
end
return
end
return
end
return
end
\ No newline at end of file +factory_exit_sig = "icebreaker_factory_exit"
inside_maniest = "Cargo: Empty\nOrigin: Icebreaker Factory\nDestination: Auto Plantation"
outside_naming = "DURT Logs to Diamond Conversion Train"
mainline_rc = "autorun FREIGHT"
mainline_ln = "Maverick2797_diamonds"
if event.train then
digiline_send("train_response","Train "..atc_id.." ready||Entered factory:||Speed: "..atc_speed)
set_line(mainline_ln)
set_rc(mainline_rc)
atc_set_text_outside(outside_naming)
atc_set_text_inside(inside_maniest)
end
if event.digiline then
if event.channel=="train_control" then
if not atc_id then
digiline_send("train_response","No Train Detected")
return
end
if event.msg=="shuffle" then
if atc_speed > 0 then
digiline_send("train_response","Please wait:||train still moving||Speed: "..atc_speed)
return
elseif not can_set_route(factory_exit_sig,"Reverse to Breaker-side Siding") then
digiline_send("train_response","Unable to set route to:||Breaker-side Siding")
return
else
set_route(factory_exit_sig,"Reverse to Breaker-side Siding")
atc_send("R S1 D5 SM D13 S0 W R S1")
digiline_send("train_response","Refilling Input Chests||Shuffling Train")
return
end
return
elseif event.msg=="exit" then
if atc_speed > 0 then
digiline_send("train_response","Please wait:||train still moving||Speed: "..atc_speed)
return
elseif not can_set_route(factory_exit_sig,"Exit to Mainline South") then
digiline_send("train_response","Unable to set route to:||Mainline South")
return
else
set_route(factory_exit_sig,"Exit to Mainline South")
atc_send("R SM")
digiline_send("train_response","Train Departing")
return
end
return
elseif event.msg=="rehead" then
if atc_speed > 0 then
digiline_send("train_response","Please wait:||train still moving||Speed: "..atc_speed)
return
elseif not can_set_route(factory_exit_sig,"Reverse for loco run-around") then
digiline_send("train_response","Unable to set route to:||Loco Run Around Sequence")
return
else
set_route(factory_exit_sig,"Reverse for loco run-around")
set_rc("split_around")
atc_send("R SM D15 S0 W R S1")
digiline_send("train_response","Loco Changing Ends")
return
end
return
end
return
end
return
end
\ No newline at end of file diff --git a/durt/nodes/(-736,3,1857).lua b/durt/nodes/(-736,3,1857).lua deleted file mode 100644 index b40529e..0000000 --- a/durt/nodes/(-736,3,1857).lua +++ /dev/null @@ -1 +0,0 @@ -mainline_rc = "autorun FREIGHT"
mainline_ln = "Maverick2797_diamonds"
function speed_check()
if atc_speed > 0 then
interrupt(1,"speed_check")
return
else
interrupt(1,"split_train")
return
end
end
if event.train then
if atc_arrow then
if get_rc()=="split_around" then
if atc_speed > 0 then
speed_check()
end
return
else
set_rc(mainline_rc)
set_line(mainline_ln)
set_route("icebreaker_shunt1","return to factory")
atc_send("S3")
return
end
return
end
return
end
if event.int then
if event.message == "speed_check" then speed_check() end
if event.message=="split_train" then
atc_send("S0")
split_at_index(2,"")
set_route("icebreaker_shunt1","split->headhunt")
atc_send("S3")
return
end
return
end
\ No newline at end of file diff --git a/durt/nodes/(-743,18,2424).lua b/durt/nodes/(-743,18,2424).lua new file mode 100644 index 0000000..3c5008c --- /dev/null +++ b/durt/nodes/(-743,18,2424).lua @@ -0,0 +1,46 @@ +-- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +local rev_rc = "CAN_REENTER_YARD" +local rm_rc = true +-- local autocouple = "ARC_LOAD_HS_N_AC" +-- local rm_cpl_rc = true + +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + if not F.has_rc("CAN_REENTER_YARD") then return end + atc_set_lzb_tsr(3) + atc_set_ars_disable(true) + return +end + +if event.train then + if not atc_arrow then --train has bounced + -- if F.has_rc(autocouple) then + -- atc_send("CplS0WD2S1") + -- if rm_cpl_rc then F.remove_rc({autocouple}) end + -- end + return + end + + if not F.has_rc(rev_rc) then --not our train. disregard + atc_set_ars_disable(false) + return + end + if rm_rc then F.remove_rc({rev_rc}) end + atc_send("S3") + schedule_in(";01",atc_id) + return +end + +if event.schedule then + if not atc_id then --bounce the train that just passed + atc_send_to_train(event.msg,"B0WRD1A1S3") + else + if atc_id == event.msg then --train hasn't fully passed yet, wait a bit longer + schedule_in(";01",atc_id) + else -- somehow another train crossed the controller before the first one returned. Unlikely but possible + atc_send_to_train(event.msg,"BBOL") + atc_send("BBOL") + end + end +end
\ No newline at end of file diff --git a/durt/nodes/(-743,3,1888).lua b/durt/nodes/(-743,3,1888).lua deleted file mode 100644 index 7489acc..0000000 --- a/durt/nodes/(-743,3,1888).lua +++ /dev/null @@ -1 +0,0 @@ ---
\ No newline at end of file diff --git a/durt/nodes/(-759,3,1861).lua b/durt/nodes/(-759,3,1861).lua deleted file mode 100644 index 117ee31..0000000 --- a/durt/nodes/(-759,3,1861).lua +++ /dev/null @@ -1,6 +0,0 @@ -if (event.train and atc_arrow) then - set_rc("merge_from_shunt") - atc_set_text_inside("merge_from_shunt") - atc_send("S0WRS3") - return -end
\ No newline at end of file diff --git a/durt/nodes/(-799,3,1863).lua b/durt/nodes/(-799,3,1863).lua deleted file mode 100644 index 77cc579..0000000 --- a/durt/nodes/(-799,3,1863).lua +++ /dev/null @@ -1 +0,0 @@ -if event.train then
if get_rc() ~= "mainline_running_code" then
set_rc("mainline_running_code")
atc_set_text_inside("mainline_running_code")
atc_send("S0WRS3")
return
end
return
end
if event.digiline then
if event.msg=="switch_ends" then
if not atc_id then return end
if atc_speed > 0 then return end
atc_send("S0")
interrupt(1,"braking delay")
return
end
return
end
if event.int then
if event.message=="braking delay" then
split_at_index(2,"")
set_route(POS(-802,4,1864),"to wye")
interrupt(1,"split delay")
return
end
if event.message=="split delay" then
atc_set_text_inside("engine")
atc_send("S3")
return
end
return
end
\ No newline at end of file diff --git a/durt/nodes/(139,8,-2054).lua b/durt/nodes/(139,8,-2054).lua deleted file mode 100644 index da88c32..0000000 --- a/durt/nodes/(139,8,-2054).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Gcl","W")
\ No newline at end of file diff --git a/durt/nodes/(151,8,-2046).lua b/durt/nodes/(151,8,-2046).lua deleted file mode 100644 index 24a6c0b..0000000 --- a/durt/nodes/(151,8,-2046).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Gcl","E")
\ No newline at end of file diff --git a/durt/nodes/(1704,17,4652).lua b/durt/nodes/(1704,17,4652).lua new file mode 100644 index 0000000..ca0506c --- /dev/null +++ b/durt/nodes/(1704,17,4652).lua @@ -0,0 +1,44 @@ +-- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +local rev_rc = "MCR_HS_W" +local rm_rc = true +local autocouple = "MCR_HS_W_AC" +local rm_cpl_rc = true + +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + atc_set_lzb_tsr(3) + atc_set_ars_disable(true) + return +end + +if event.train then + if not atc_arrow then --train has bounced + if F.has_rc(autocouple) then + atc_send("CplS0WD2S1") + if rm_cpl_rc then F.remove_rc({autocouple}) end + end + return + end + -- -- commented out as we want all trains to bounce here + -- if not F.has_rc(rev_rc) then --not our train. disregard + -- atc_set_ars_disable(false) + -- return + -- end + if rm_rc then F.remove_rc({rev_rc}) end + schedule_in(";01",atc_id) + return +end + +if event.schedule then + if not atc_id then --bounce the train that just passed + atc_send_to_train(event.msg,"B0WRD1A1S3") + else + if atc_id == event.msg then --train hasn't fully passed yet, wait a bit longer + schedule_in(";01",atc_id) + else -- somehow another train crossed the controller before the first one returned. Unlikely but possible + atc_send_to_train(event.msg,"BBOL") + atc_send("BBOL") + end + end +end
\ No newline at end of file diff --git a/durt/nodes/(1710,17,4637).lua b/durt/nodes/(1710,17,4637).lua new file mode 100644 index 0000000..69bc3a1 --- /dev/null +++ b/durt/nodes/(1710,17,4637).lua @@ -0,0 +1,17 @@ +-- MCR Arrivals track +local rc = "MCR_runaround" +local list = { + rc, + "MCR_HS_W", + "MCR_HS_E", + "MCR_HS_E_AC" +} +if not F.has_rc(rc) then + split_off_locomotive("A0B0") + F.add_rc(list) + set_route(POS(1706,18,4638), "Headshunt") + atc_send("A1S3") + return +end +F.remove_rc(list) +atc_send("A0S0WD5RS2")
\ No newline at end of file diff --git a/durt/nodes/(1740,17,4636).lua b/durt/nodes/(1740,17,4636).lua new file mode 100644 index 0000000..3bab629 --- /dev/null +++ b/durt/nodes/(1740,17,4636).lua @@ -0,0 +1,15 @@ +if event.train then + if not atc_arrow then return end + local fc = split_at_fc("A0B0", 2) + local cmd = { + "MCR_HS_E", + "MCR_HS_E_AC", + "MCR_DIR_"..fc + } + if #section_occupancy("115343") == 1 then + table.insert(cmd, "MCR_LAST_SORT") + end + F.add_rc(cmd) + atc_send("A1S3") + return +end
\ No newline at end of file diff --git a/Crossroads/nodes/(1760,5,1000).lua b/durt/nodes/(1742,17,4642).lua index 7489acc..7489acc 100644 --- a/Crossroads/nodes/(1760,5,1000).lua +++ b/durt/nodes/(1742,17,4642).lua diff --git a/Crossroads/nodes/(1795,5,1000).lua b/durt/nodes/(1751,17,4655).lua index 7489acc..7489acc 100644 --- a/Crossroads/nodes/(1795,5,1000).lua +++ b/durt/nodes/(1751,17,4655).lua diff --git a/durt/nodes/(1759,17,4623).lua b/durt/nodes/(1759,17,4623).lua new file mode 100644 index 0000000..c8a4bbd --- /dev/null +++ b/durt/nodes/(1759,17,4623).lua @@ -0,0 +1,44 @@ +-- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +local rev_rc = "MCR_HS_E" +local rm_rc = true +local autocouple = "MCR_HS_E_AC" +local rm_cpl_rc = true + +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + atc_set_lzb_tsr(3) + atc_set_ars_disable(true) + return +end + +if event.train then + if not atc_arrow then --train has bounced + if F.has_rc(autocouple) then + atc_send("CplS0WD2S1") + if rm_cpl_rc then F.remove_rc({autocouple}) end + end + return + end + + if not F.has_rc(rev_rc) then --not our train. disregard + atc_set_ars_disable(false) + return + end + if rm_rc then F.remove_rc({rev_rc}) end + schedule_in(";01",atc_id) + return +end + +if event.schedule then + if not atc_id then --bounce the train that just passed + atc_send_to_train(event.msg,"B0WRD1A1S3") + else + if atc_id == event.msg then --train hasn't fully passed yet, wait a bit longer + schedule_in(";01",atc_id) + else -- somehow another train crossed the controller before the first one returned. Unlikely but possible + atc_send_to_train(event.msg,"BBOL") + atc_send("BBOL") + end + end +end
\ No newline at end of file diff --git a/Tyard/nodes/(-4063,12,-2669).lua b/durt/nodes/(1780,18,4595).lua index 7489acc..7489acc 100644 --- a/Tyard/nodes/(-4063,12,-2669).lua +++ b/durt/nodes/(1780,18,4595).lua diff --git a/durt/nodes/(1852,8,9034).lua b/durt/nodes/(1852,8,9034).lua deleted file mode 100644 index 7489acc..0000000 --- a/durt/nodes/(1852,8,9034).lua +++ /dev/null @@ -1 +0,0 @@ ---
\ No newline at end of file diff --git a/durt/nodes/(1858,17,4242).lua b/durt/nodes/(1858,17,4242).lua index 4f60fe8..e40678b 100644 --- a/durt/nodes/(1858,17,4242).lua +++ b/durt/nodes/(1858,17,4242).lua @@ -67,14 +67,28 @@ if event.schedule then if not F.has_rc("OAF_BRANCH_REVERSE_RECOUPLED") then if dir == "SHOVE" then -- loco first into platform, run around to shove out -- split_off_locomotive("S0OLA0",2) --ideally each pax wagon has a generic FC, but not likely as few people use them at all - split_at_index(2,"S0OLA0") - atc_send("S3") - F.add_rc(movelist[dir]) + if train_length() > 1 then + split_at_index(2,"B0S0OLA0") + atc_send("S3") + F.add_rc(movelist[dir]) + else + -- don't bother splitting, there's nothing to split anyway! + -- depart light (fallback) + F.add_rc("OAF_BRANCH_REVERSE_DONE") --triggers the ARS to depart + atc_send("SM") + print("DEPARTING LIGHT") + end else --dir == "HEAD" --shoved into platform, run around to put loco first F.add_rc(movelist[dir]) - split_at_index(train_length(),"S0WRA1S3") - F.remove_rc(movelist[dir]) - atc_send("S0WROR") + if train_length() > 1 then + split_at_index(train_length(),"S0WRA1S3") + F.remove_rc(movelist[dir]) + atc_send("S0WROR") + else --don't bother splitting, there's nothing to split anyway! + F.add_rc("OAF_BRANCH_REVERSE_DONE") --triggers the ARS to depart + atc_send("SM") + print("DEPARTING LIGHT") + end end print("SPLIT") return diff --git a/durt/nodes/(1864,17,4296).lua b/durt/nodes/(1864,17,4296).lua index b0f62d1..1f0d6ff 100644 --- a/durt/nodes/(1864,17,4296).lua +++ b/durt/nodes/(1864,17,4296).lua @@ -67,14 +67,28 @@ if event.schedule then if not F.has_rc("OAF_BRANCH_REVERSE_RECOUPLED") then if dir == "SHOVE" then -- loco first into platform, run around to shove out -- split_off_locomotive("S0OLA0",2) --ideally each pax wagon has a generic FC, but not likely as few people use them at all - split_at_index(2,"S0OLA0") - atc_send("S3") - F.add_rc(movelist[dir]) + if train_length() > 1 then + split_at_index(2,"B0S0OLA0") + atc_send("S3") + F.add_rc(movelist[dir]) + else + -- don't bother splitting, there's nothing to split anyway! + -- depart light (fallback) + F.add_rc("OAF_BRANCH_REVERSE_DONE") --triggers the ARS to depart + atc_send("SM") + print("DEPARTING LIGHT") + end else --dir == "HEAD" --shoved into platform, run around to put loco first F.add_rc(movelist[dir]) - split_at_index(train_length(),"S0WRA1S3") - F.remove_rc(movelist[dir]) - atc_send("S0WROR") + if train_length() > 1 then + split_at_index(train_length(),"S0WRA1S3") + F.remove_rc(movelist[dir]) + atc_send("S0WROR") + else --don't bother splitting, there's nothing to split anyway! + F.add_rc("OAF_BRANCH_REVERSE_DONE") --triggers the ARS to depart + atc_send("SM") + print("DEPARTING LIGHT") + end end print("SPLIT") return diff --git a/durt/nodes/(1894,23,4548).lua b/durt/nodes/(1894,23,4548).lua index 5245388..c27d386 100644 --- a/durt/nodes/(1894,23,4548).lua +++ b/durt/nodes/(1894,23,4548).lua @@ -7,6 +7,7 @@ end if event.train then if not atc_arrow then return end if not F.has_rc("OAF_BRANCH_REVERSE") then return end + atc_send("S2") schedule_in(";01",atc_id) print("start ping") return @@ -18,7 +19,7 @@ if event.schedule then return end print("end ping") - atc_send_to_train(event.msg, "S0WRD2SM") + atc_send_to_train(event.msg, "B0WRD2SM") local newstate = getstate(POS(1894, 21, 4548)) setstate(POS(1892, 23, 4547)) return diff --git a/durt/nodes/(1904,7,9133).lua b/durt/nodes/(1904,7,9133).lua deleted file mode 100644 index 64329a2..0000000 --- a/durt/nodes/(1904,7,9133).lua +++ /dev/null @@ -1 +0,0 @@ -local yard_id = "WOA"
__approach_callback_mode = 1
if event.approach and not event.has_entered then
atc_set_ars_disable(true)
atc_set_lzb_tsr(1)
end
if event.train then
local init = false
if not S.WOA_stats then
S.WOA_stats = true
init = true
end
F.stat("WOA_mine",init)
end
\ No newline at end of file diff --git a/durt/nodes/(1904,8,9057).lua b/durt/nodes/(1904,8,9057).lua deleted file mode 100644 index 0851b53..0000000 --- a/durt/nodes/(1904,8,9057).lua +++ /dev/null @@ -1,17 +0,0 @@ -__approach_callback_mode = 1 -if event.approach and not event.has_entered then - atc_set_ars_disable(true) - atc_set_lzb_tsr(4) -end - -if event.train and atc_arrow then - atc_send("S4") - if F.has_rc("WOA_mine_around") then - if train_length() == 1 then - F.add_rc("WOA_ttb_s") - else - F.add_rc("WOA_shed_left") - end - end - atc_set_ars_disable(false) -end
\ No newline at end of file diff --git a/durt/nodes/(1905,0,9143).lua b/durt/nodes/(1905,0,9143).lua deleted file mode 100644 index 500f0a0..0000000 --- a/durt/nodes/(1905,0,9143).lua +++ /dev/null @@ -1,5 +0,0 @@ -if event.punch then - S.yards.WOA.mine_count = 1 - print("WOA Mine: reset counter") - digiline_send("train_ctl","send") -end
\ No newline at end of file diff --git a/durt/nodes/(1907,9,9129).lua b/durt/nodes/(1907,9,9129).lua deleted file mode 100644 index e4e4500..0000000 --- a/durt/nodes/(1907,9,9129).lua +++ /dev/null @@ -1,3 +0,0 @@ -local yard_id = "WOA"
if event.schedule then
local now = rwt.now()
local last = S.yards[yard_id].last_pass1
local dtime = rwt.diff(last,now)
local rtt = rwt.diff(S.yards[yard_id].last_pass2,last)
digiline_send("lcd",string.format("Now: %s |Last Pass: %s |ID: %s Delta: %s |TBT: %s ",rwt.to_string(now),rwt.to_string(last),S.yards.WOA.last_id,rwt.to_string(dtime),rwt.to_string(rtt)))
schedule(rwt.next_rpt(rwt.now(), "0;05", 0))
end
if event.punch then - schedule(rwt.next_rpt(rwt.now(), "0;05", 0)) - if S.WOA_stats == true then S.WOA_stats = false end
end
\ No newline at end of file diff --git a/durt/nodes/(1909,8,9115).lua b/durt/nodes/(1909,8,9115).lua deleted file mode 100644 index 224bafc..0000000 --- a/durt/nodes/(1909,8,9115).lua +++ /dev/null @@ -1,5 +0,0 @@ -do return end - - - -local foundry_track = POS(-1962,13,-1709)
local warmoneaye_track = POS(1918,7,9099)
if event.ext_int then
if type(event.msg) == "string" then digiline_send("lcd",event.msg) end
if type(event.msg) == "table" then
local m = event.msg
local location = m.location
local message = m.msg
digiline_send(location,message)
return
end
end
if event.digiline then
if event.channel=="send" then
-- interrupt_pos(foundry_track,"send")
interrupt_pos(warmoneaye_track,"send")
end
end
if event.punch then
digiline_send("Foundry","test")
digiline_send("Warmoneaye","test")
end
\ No newline at end of file diff --git a/durt/nodes/(1918,7,9099).lua b/durt/nodes/(1918,7,9099).lua deleted file mode 100644 index 3df43db..0000000 --- a/durt/nodes/(1918,7,9099).lua +++ /dev/null @@ -1 +0,0 @@ -local location = "Warmoneaye"
local ctl_pan = POS(1919,7,9093)
local signal = POS(1919,10,9094)
local route = "Exit South"
err = interrupt_pos
if event.ext_int then
if not atc_id then
err(ctl_pan,{['location'] = location, ['msg'] = " | No Train"})
end
if event.msg == "send" then
set_route(signal,route)
if atc_arrow then
atc_send("SM")
else
atc_send("S0WRSM")
end
end
end
\ No newline at end of file diff --git a/durt/nodes/(1918,7,9147).lua b/durt/nodes/(1918,7,9147).lua deleted file mode 100644 index 7489acc..0000000 --- a/durt/nodes/(1918,7,9147).lua +++ /dev/null @@ -1 +0,0 @@ ---
\ No newline at end of file diff --git a/durt/nodes/(1921,7,9148).lua b/durt/nodes/(1921,7,9148).lua deleted file mode 100644 index 7489acc..0000000 --- a/durt/nodes/(1921,7,9148).lua +++ /dev/null @@ -1 +0,0 @@ ---
\ No newline at end of file diff --git a/durt/nodes/(1950,7,9108).lua b/durt/nodes/(1950,7,9108).lua deleted file mode 100644 index a3a64b6..0000000 --- a/durt/nodes/(1950,7,9108).lua +++ /dev/null @@ -1 +0,0 @@ -interrupt_pos(POS(1949,7,9112),"send")
\ No newline at end of file diff --git a/durt/nodes/(258,2,-2054).lua b/durt/nodes/(258,2,-2054).lua deleted file mode 100644 index 23e79be..0000000 --- a/durt/nodes/(258,2,-2054).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Sfs","W")
\ No newline at end of file diff --git a/durt/nodes/(273,2,-2046).lua b/durt/nodes/(273,2,-2046).lua deleted file mode 100644 index 36cbad2..0000000 --- a/durt/nodes/(273,2,-2046).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Sfs","E")
\ No newline at end of file diff --git a/durt/nodes/(363,-3,-2026).lua b/durt/nodes/(363,-3,-2026).lua deleted file mode 100644 index a15195a..0000000 --- a/durt/nodes/(363,-3,-2026).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Jms","W")
\ No newline at end of file diff --git a/durt/nodes/(377,-3,-2018).lua b/durt/nodes/(377,-3,-2018).lua deleted file mode 100644 index a06c323..0000000 --- a/durt/nodes/(377,-3,-2018).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Jms","E")
\ No newline at end of file diff --git a/durt/nodes/(430,17,19).lua b/durt/nodes/(430,17,19).lua deleted file mode 100644 index ed65c79..0000000 --- a/durt/nodes/(430,17,19).lua +++ /dev/null @@ -1 +0,0 @@ -local line = "S23"
if event.punch or (event.channel=="clock" and event.msg=="pulse")then
digiline_send("status_update",S.lines[line].monitoring)
end
\ No newline at end of file diff --git a/durt/nodes/(430,17,7).lua b/durt/nodes/(430,17,7).lua deleted file mode 100644 index 07c8260..0000000 --- a/durt/nodes/(430,17,7).lua +++ /dev/null @@ -1 +0,0 @@ -local line = "U21"
if event.punch or (event.channel=="clock" and event.msg=="pulse")then
digiline_send("status_update",S.lines[line].monitoring)
end
\ No newline at end of file diff --git a/durt/nodes/(501,-3,-2026).lua b/durt/nodes/(501,-3,-2026).lua deleted file mode 100644 index 708c331..0000000 --- a/durt/nodes/(501,-3,-2026).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Bam","W")
\ No newline at end of file diff --git a/durt/nodes/(515,-3,-2018).lua b/durt/nodes/(515,-3,-2018).lua deleted file mode 100644 index ef7d6a4..0000000 --- a/durt/nodes/(515,-3,-2018).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Bam","E")
\ No newline at end of file diff --git a/durt/nodes/(596,-3,-1963).lua b/durt/nodes/(596,-3,-1963).lua deleted file mode 100644 index ef232c3..0000000 --- a/durt/nodes/(596,-3,-1963).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Cli","W")
\ No newline at end of file diff --git a/durt/nodes/(608,-3,-1957).lua b/durt/nodes/(608,-3,-1957).lua deleted file mode 100644 index 37f35ff..0000000 --- a/durt/nodes/(608,-3,-1957).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Cli","E")
\ No newline at end of file diff --git a/durt/nodes/(686,-3,-1961).lua b/durt/nodes/(686,-3,-1961).lua deleted file mode 100644 index 94c23fb..0000000 --- a/durt/nodes/(686,-3,-1961).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Wat","W")
\ No newline at end of file diff --git a/durt/nodes/(698,-3,-1959).lua b/durt/nodes/(698,-3,-1959).lua deleted file mode 100644 index f646518..0000000 --- a/durt/nodes/(698,-3,-1959).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Wat","E")
\ No newline at end of file diff --git a/durt/nodes/(74,8,-2124).lua b/durt/nodes/(74,8,-2124).lua deleted file mode 100644 index 4589804..0000000 --- a/durt/nodes/(74,8,-2124).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Dri","E")
\ No newline at end of file diff --git a/durt/nodes/(74,8,-2297).lua b/durt/nodes/(74,8,-2297).lua deleted file mode 100644 index 02cba9c..0000000 --- a/durt/nodes/(74,8,-2297).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Ged","E")
\ No newline at end of file diff --git a/durt/nodes/(770,6,-1938).lua b/durt/nodes/(770,6,-1938).lua deleted file mode 100644 index af2e64f..0000000 --- a/durt/nodes/(770,6,-1938).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Duf", "W")
\ No newline at end of file diff --git a/durt/nodes/(771,25,8503).lua b/durt/nodes/(771,25,8503).lua deleted file mode 100644 index 58252f0..0000000 --- a/durt/nodes/(771,25,8503).lua +++ /dev/null @@ -1,3 +0,0 @@ -if atc_arrow == true and get_line() == "DTLS1" then - atc_set_text_outside("DTL S1 -> Azena Transirejo") -end
\ No newline at end of file diff --git a/durt/nodes/(78,8,-2139).lua b/durt/nodes/(78,8,-2139).lua deleted file mode 100644 index d16d287..0000000 --- a/durt/nodes/(78,8,-2139).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Dri","W")
\ No newline at end of file diff --git a/durt/nodes/(78,8,-2312).lua b/durt/nodes/(78,8,-2312).lua deleted file mode 100644 index 6a061ac..0000000 --- a/durt/nodes/(78,8,-2312).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Ged","W")
\ No newline at end of file diff --git a/durt/nodes/(782,6,-1930).lua b/durt/nodes/(782,6,-1930).lua deleted file mode 100644 index 56e8aa5..0000000 --- a/durt/nodes/(782,6,-1930).lua +++ /dev/null @@ -1 +0,0 @@ -F.station("Duf","E")
\ No newline at end of file diff --git a/ers/nodes/(1655,1,1261).lua b/ers/nodes/(1655,1,1261).lua deleted file mode 100644 index 2d9ef7a..0000000 --- a/ers/nodes/(1655,1,1261).lua +++ /dev/null @@ -1,30 +0,0 @@ --- luaatctrack_main_depot_01.lua -local show_print = false -if event.train then - if atc_arrow then - local passive_name = "ErsDepotTurnaround" - local track_route = "" - local can_do_route = false - F.train_duration("start") - F.train_info(passive_name, show_print) - - if F.does_train_have_rc("ERSTAZIDEPOTUNLOAD") then - track_route = "01 UNLOADING TRACK" - F.send_route(passive_name, track_route, show_print) - elseif F.does_train_have_rc("ERSTAZITST") then - track_route = "02 LOADING TRACK" - F.send_route(passive_name, track_route, show_print) - else - track_route = "03 EXTRA" - can_do_route = F.send_route(passive_name, track_route, show_print) - if can_do_route == false then - track_route = "04 EXTRA" - F.send_route(passive_name, track_route, show_print) - end - end - else - local passive_name = "ErsDepotTurnaround" - F.train_duration("end") - F.train_info(passive_name, show_print) - end -end
\ No newline at end of file diff --git a/ers/nodes/(1655,1,1264).lua b/ers/nodes/(1655,1,1264).lua deleted file mode 100644 index 0cb6ef7..0000000 --- a/ers/nodes/(1655,1,1264).lua +++ /dev/null @@ -1,6 +0,0 @@ --- luaoperatingpanel_depot_01.lua -local show_print = false -if event.type == "punch" then - F.train_info("RESETALL", show_print) - return -end
\ No newline at end of file diff --git a/ers/nodes/(1655,6,1260).lua b/ers/nodes/(1655,6,1260).lua deleted file mode 100644 index 0cb6ef7..0000000 --- a/ers/nodes/(1655,6,1260).lua +++ /dev/null @@ -1,6 +0,0 @@ --- luaoperatingpanel_depot_01.lua -local show_print = false -if event.type == "punch" then - F.train_info("RESETALL", show_print) - return -end
\ No newline at end of file diff --git a/ers/nodes/(1657,1,1240).lua b/ers/nodes/(1657,1,1240).lua deleted file mode 100644 index d0d33a8..0000000 --- a/ers/nodes/(1657,1,1240).lua +++ /dev/null @@ -1,38 +0,0 @@ --- luaatctrack_main_depot_01.lua -local show_print = false -if event.train then - if atc_arrow then - local passive_name = "ErsDepotTurnaround" - local track_route = "01 EXTRA" - local can_do_route1 = false - local can_do_route2 = false - F.train_duration("start") - F.train_info(passive_name, show_print) - - if F.does_train_have_rc("ERSTAZIDEPOTUNLOAD") then - track_route = "03 UNLOADING TRACK" - elseif F.does_train_have_rc("DEPOTUNLOADING") then - track_route = "03 UNLOADING TRACK" - elseif F.does_train_have_rc("FERTRUNNER") then - track_route = "03 UNLOADING TRACK" - elseif F.does_train_have_rc("DEPOTLOADING") then - track_route = "02 LOADING TRACK" - elseif F.does_train_have_rc("ERSTAZITST") then - track_route = "02 LOADING TRACK" - end - - can_do_route1 = F.send_route(passive_name, track_route, show_print) - if can_do_route1 == false then - track_route = "01 EXTRA" - can_do_route2 = F.send_route(passive_name, track_route, show_print) - if can_do_route2 == false then - track_route = "04 EXTRA" - F.send_route(passive_name, track_route, show_print) - end - end - else - local passive_name = "ErsDepotTurnaround" - F.train_duration("end") - F.train_info(passive_name, show_print) - end -end
\ No newline at end of file diff --git a/durt/nodes/(-3594,18,-3954).lua b/ers/nodes/(1719,16,4662).lua index 7489acc..7489acc 100644 --- a/durt/nodes/(-3594,18,-3954).lua +++ b/ers/nodes/(1719,16,4662).lua diff --git a/ers/nodes/(2545,64,-3274).lua b/ers/nodes/(2545,64,-3274).lua deleted file mode 100644 index e69de29..0000000 --- a/ers/nodes/(2545,64,-3274).lua +++ /dev/null diff --git a/ers/nodes/(2549,64,-3274).lua b/ers/nodes/(2549,64,-3274).lua deleted file mode 100644 index e69de29..0000000 --- a/ers/nodes/(2549,64,-3274).lua +++ /dev/null diff --git a/ers/nodes/(3159,74,2331).lua b/ers/nodes/(3159,74,2331).lua deleted file mode 100644 index e69de29..0000000 --- a/ers/nodes/(3159,74,2331).lua +++ /dev/null diff --git a/ers_mtn/nodes/(1779,10,1235).lua b/ers_mtn/nodes/(1779,10,1235).lua deleted file mode 100644 index 3de7f76..0000000 --- a/ers_mtn/nodes/(1779,10,1235).lua +++ /dev/null @@ -1,91 +0,0 @@ --- --- --- 1779,10,1235 - - - -local einblendung = { -{ " Bergbahn Zugpositionen", "", "", "" }, -{ "", "", "", "" }, -{ "", "", "", "" }, -{ "", "Tal:", "Gleis A/B: %-6s %-6s", "Gleis A Gleis B" }, -} - --- ------------------------------ - - - -local function disp_update() - - for t=1,4 do - local tl = "" - for z=1,4 do - if z>1 then tl = tl.."\n" end - local h = einblendung[t][z] - if #h < 1 then h = " " end - tl = tl .. h - end - digiline_send("txt"..t,tl) - end - return -end - --- ------------------------------ - - -if event.type == "punch" then - local text = " AUA!!!" - for i=1,4 do - digiline_send("txt"..i," "..i.."\n"..text) - end - - interrupt(10,"clear") - return -end - - -if event.type == "int" then - if event.message == "clear" then - disp_update() --- for i=1,4 do --- digiline_send("txt"..i,i) --- end - end - return -end - - - - -local zeilen = {"gleisa","gleisb","tal" } - - -if event.type == "ext_int" then - local nachricht = event.message - if nachricht == nil then return end - if type(nachricht) == "string" then - if nachricht == "update" then - local t - local z - local e=1 - for t = 1,4 do - local ausgabe = "" - for z = 1,4 do - if z>1 then ausgabe = ausgabe.."\n" end - ausgabe = ausgabe .. S.daten[e] - e = e+1 - end - digiline_send("txt"..t,ausgabe) - end - return - end - return - end - if type(nachricht) == "table" then - if not nachricht.von_pos then return end - - return - end - return -end - diff --git a/ers_mtn/nodes/(1793,3,1280).lua b/ers_mtn/nodes/(1793,3,1280).lua deleted file mode 100644 index dd48338..0000000 --- a/ers_mtn/nodes/(1793,3,1280).lua +++ /dev/null @@ -1,8 +0,0 @@ --- --- --- --- stop for trains which should not run --- --- 1793,3,1280 --- --- diff --git a/far/init_code.lua b/far/init_code.lua index 55f685c..49b0be6 100644 --- a/far/init_code.lua +++ b/far/init_code.lua @@ -1,15 +1,42 @@ -- environment_far.lua +--[[ +local STOP_TIME = 40 +local STOPCMD="B0WO" +local DEPCMD="A1OCD1SM" +local RDEPCMD="RA1OCD1SM" +local DYNAMIC_THR = 10 +local DYNAMIC_EN = false +]] + if S.trains == nil then S.trains = {} end if S.d == nil then S.d = {} end if S.datetime == nil then S.datetime = "" end if S.stop_display == nil then S.stop_display = false end if S.show_farpass_only == nil then S.show_farpass_only = false end +if S.timetake == nil then S.timetake = {} end +if S.ttp == nil then S.ttp = {} end +if S.ttt == nil then S.ttt = {} end + +F.ttp={ + FAR_E = { + outside_text = "[FAR] Fareast End\nvia Halfway, Bayonne, Fucking", + inside_line_desc = "FAR to Fareast End", + stn_display = "FAR Fareast End", + }, + FAR_W = { + outside_text = "[FAR] Salt Factory\nvia Fucking, Bayonne, Halfway", + inside_line_desc = "FAR to Salt Factory", + stn_display = "FAR Salt Factory", + }, +} +-- S.ttp["FAR_E"].force_tt_reset = true F.print = function (str) if F.debug then print("".. (str or "nil") ) end end F.isempty = function (s) return s == nil or s == "" end F.get_rc_safe = function() return get_rc() or "" end F.get_line_safe = function() return get_line() or "" end F.get_train_length_safe = function() return train_length() or 0 end + F.avg = function(t) local sum = 0 local count = 0 @@ -26,6 +53,12 @@ if event.init then F.debug = true F.printAllTrainsInfo = true F.max_displays = 15 + F.STOP_TIME = 40 + F.STOPCMD="B0WO" + F.DEPCMD="A1OCD1SM" + F.RDEPCMD="RA1OCD1SM" + F.DYNAMIC_THR = 10 + F.DYNAMIC_EN = false F.print("Initialized") end @@ -56,21 +89,32 @@ F.send_route = function(passive_name, route, show_print) return return_value end -F.save_train = function(pos) - if not atc_id then return end - if S.trains then - if F.isempty(pos) then - pos_string = "" - else - pos_string = pos["x"] .. "," .. pos["y"] .. "," .. pos["z"] - end - if F.has_rc("FAREAST", F.get_rc_safe()) then - S.trains[atc_id] = { ["id"] = atc_id, ["rc"] = F.get_rc_safe(), ["ln"] = F.get_line_safe(), ["cars_count"] = F.get_train_length_safe(), ["pos"] = pos_string } - -- F.print("Train ID: " .. S.trains[atc_id]["id"] .. " at " .. S.trains[atc_id]["pos"]) - -- remote_track = POS(30919,13,1812) - -- interrupt_pos(remote_track, "display") +--[[ +F.save_train(POS(26201,24,1417), "east") +]] + +F.save_train = function(pos, direction) + if event.train then + if not atc_id then return end + if S.trains then + if F.isempty(pos) then + pos_string = "" + else + pos_string = pos["x"] .. "," .. pos["y"] .. "," .. pos["z"] + end + if F.has_rc("FAREAST", F.get_rc_safe()) then + if direction == nil or direction == "" then + S.trains[atc_id] = { ["id"] = atc_id, ["rc"] = F.get_rc_safe(), ["ln"] = F.get_line_safe(), ["cars_count"] = F.get_train_length_safe(), ["pos"] = pos_string , ["direction"] = nil } + else + S.trains[atc_id] = { ["id"] = atc_id, ["rc"] = F.get_rc_safe(), ["ln"] = F.get_line_safe(), ["cars_count"] = F.get_train_length_safe(), ["pos"] = pos_string , ["direction"] = direction } + end + -- F.print("Train ID: " .. S.trains[atc_id]["id"] .. " at " .. S.trains[atc_id]["pos"]) + -- remote_track = POS(30919,13,1812) + -- interrupt_pos(remote_track, "display") + end end end + return end F.get_real_split_count = function(train_length_count, split_count) @@ -114,6 +158,7 @@ F.list_trains = function(print_info) F.clear_main_depot_displays() number_of_displays = number_of_displays + 1 count_keys = 0 + direction_display = "" trains_table = {} for k in pairs(S.trains) do table.insert(trains_table, k) @@ -167,13 +212,18 @@ F.list_trains = function(print_info) rc_display = rc_display .. "| RC:" .. rc_list_unknown end end + if v["direction"] == nil or v["direction"] == "" then + direction_display = " D: ??" + else + direction_display = " D: " .. v["direction"] + end if v["cars_count"] == nil or v["cars_count"] == "" then - cars_count_display = " Len: 0" + cars_count_display = " L: 0" else cars_count = tonumber(v["cars_count"]) - cars_count_display = " Len: " .. cars_count + cars_count_display = " L: " .. cars_count end - message = " ID: " .. v["id"] .. cars_count_display .. rc_display .. line_number .. pos_string + message = " ID: " .. v["id"] .. cars_count_display .. direction_display .. rc_display .. line_number .. pos_string if x > 0 then digiline_send("train_display" .. x, message) end if print_info then F.print(x .. ": " .. message) @@ -201,3 +251,532 @@ F.slow_train_down = function(id) F.print("Train ID " .. id .. " is slowed down to B1") end end + +-- init code for FAR timetable env + +-- stop, scheduled departure every +-- 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) + if event.train then + local timenow = os.time() + local timerdy = timenow + minstoptime + local wait = d_int - ((timerdy-d_off) % d_int) + local waitcorr = math.floor(wait*0.66) + digiline_send("monitor", "Departure scheduled for: | "..os.date("%H:%M:%S", timenow+wait)) + atc_send("B0 W O"..doors.." D"..waitcorr.." OCD1"..departcommand) + else + local timenow = os.time() + digiline_send("monitor", "Time: "..os.date("%H:%M:%S", timenow)) + end +end + +function F.stop_sd_sched(st_name, doors, departcommand, minstoptime, d_int, d_off) + depart = false + if event.train then + local time_now = rwt.now() + local next_dep_time = rwt.next_rpt(rwt.add(time_now, minstoptime), d_int, d_off) + digiline_send("monitor", "Departure scheduled for: | "..rwt.to_string(next_dep_time, true)) + atc_set_text_inside(st_name.."\nDeparture: "..rwt.to_string(next_dep_time, true)) + atc_send("B0 W O"..doors) + schedule(next_dep_time, "depart") + elseif event.schedule then + atc_send("OCD1"..departcommand) + digiline_send("monitor", "Last Departure: | "..rwt.to_string(rwt.now(), true)) + atc_set_text_inside("") + depart = true + end +end + +function F.timedisplay() + digiline_send("time", "Time: | "..rwt.to_string(rwt.now(),true).." | "..os.date("%H:%M:%S")) + schedule(rwt.next_rpt(rwt.now(),5,0), "") +end + +-- Stat counter and timetaking utilities +-- Stat from subway +F.stat=function(line, init) + -- statistics + + if init then + reftrain = atc_id + a_tbt = 30 + a_tbtmax = 30 + a_rtt = 500 + a_not = 0 + c_not = 0 + c_tbtmax = 0 + time_lt = os.time() + time_rt=os.time() + end + if not a_tbtmax then a_tbtmax = 30 end + if not c_tbtmax then c_tbtmax = 0 end + + if event.train then + local time = os.time() + c_not = c_not + 1 + a_tbt = (a_tbt + (time - time_lt)) / 2 + c_tbtmax = math.max(c_tbtmax, (time - time_lt)) + if atc_id == reftrain then + a_rtt = (a_rtt*0.2 + (time - time_rt)*0.8) + a_not = c_not + c_not = 0 + a_tbtmax = (a_tbtmax + c_tbtmax) / 2 + c_tbtmax = 0 + end + digiline_send("stats", "Stat: "..line.. + " NoT:"..a_not.."("..c_not..")".. + " TbT:"..math.floor(a_tbt).."("..(time-time_lt)..")".. + " Tmx:"..math.floor(a_tbtmax).."("..c_tbtmax..")".. + " R:"..math.floor(a_rtt).."("..(time - time_rt)..")" + ) + time_lt = time + if atc_id == reftrain then + time_rt = time + end + end +end + +function F.timetake_start(ttname) + if not atc_id then return end + local nouw = rwt.to_secs(rwt.now()) + if not S.timetake[ttname] then + S.timetake[ttname] = {} + end + S.timetake[ttname][atc_id] = nouw +end + +function F.timetake_end(ttname) + if not atc_id then return end + if not S.timetake[ttname] or not S.timetake[ttname][atc_id] then + digiline_send("timetake", "No start time for "..atc_id) + return + end + local first = S.timetake[ttname][atc_id] + local nouw = rwt.to_secs(rwt.now()) + local tdiff = nouw - first + local cavg = S.timetake[ttname].avg + local cmax = S.timetake[ttname].max + local cmin = S.timetake[ttname].min + if cavg and cmax and cmin then + S.timetake[ttname].avg = tdiff*0.1 + cavg*0.9 + S.timetake[ttname].min = math.min(tdiff, cmin) + S.timetake[ttname].max = math.max(tdiff, cmax) + else + S.timetake[ttname].avg = tdiff + S.timetake[ttname].min = tdiff + S.timetake[ttname].max = tdiff + end + digiline_send("timetake", ttname.. + " this:"..tdiff.. + " min:"..math.floor(S.timetake[ttname].min).. + " avg:"..math.floor(S.timetake[ttname].avg).. + " max:"..math.floor(S.timetake[ttname].max) + ) +end + +--== Timetable prototype (TTP) === +--[[ table structures: +F.ttp - static timetable data - see below +S.ttp[tt_name] = { - dynamic tt data + recording_train = <id of the train that is recording travel times, or nil> + travel_times = { + <station name> = <time in seconds from initial departure at first station of the line to departure at this station> + } + station_order = { <station 1>, <station 2>...} +} +S.ttt[train_id] = { - trains + timetable = <timetable ID that the train is currently using>, + initial_dep = <departure at first station of the line>, + location = <Station where the train was last seen>, + desired_dep = <Departure time as in timetable>, + planned_dep = <real departure time calculated as the train reaches station>, + actual_dep = <actual departure time at last station. is nil while train is stopped>, + last_delay = <last known delay of the train - calculated every departure>, + } +} +]] + +--[[ +Timetable entry point. The train finalizes its last timetable and +registers itself on the given timetable instance. It departs at the next time slot +(given by interval and offset). +F.ttp_begin({ + stn = "Warmoneaye", -- station name + tt = "CFE_S", -- timetable ID + depint = "12;00", --departure slot interval + depoff = "00;00", --departure slot offset + doorside = "L", + reverse = true, + only_lines = nil, --if given a table, only trains where only_lines[get_line()] is true are considered + force_tt_reset = false, -- force reset of travel times for this timetable +}) + + +F.ttp_begin({ + stn = "Salt Factory", -- station name + tt = "FAR_E", -- timetable ID + depint = "12;00", --departure slot interval + depoff = "00;00", --departure slot offset + doorside = "L", + reverse = true, + only_lines = {['FAR'] = true}, + force_tt_reset = false, + pos = POS(1755,8,1570), + direction = "west", +}) +]] +-- Make train depart at the next time slot, and save its start time +function F.ttp_begin(p) + __approach_callback_mode = 1 + + if not F.ttp[p.tt] then error("No TT instance "..p.tt) end + if not atc_id then + print(p.stn,"missing train!",event) + return + end + if not atc_arrow then return end + if p.only_lines and not p.only_lines[get_line()] then return end + if not S.ttp[p.tt] then S.ttp[p.tt] = {} end + local tti = S.ttp[p.tt] + --L150 + if event.approach and not event.has_entered then + -- make the train stop + atc_set_ars_disable(true) + atc_set_lzb_tsr(2) + atc_set_text_inside("Next stop: "..p.stn.."\nTerminal Station.\nThis train continues as "..F.ttp[p.tt].inside_line_desc) + end + if event.train then + if p.pos and p.direction then + F.save_train(p.pos, p.direction) + end + -- train arrived, planning departure + atc_send(F.STOPCMD .. p.doorside) + + local time_now = rwt.now() + -- Train might have had another TT before, do the cleanup from ttp_end here. + local trno = S.ttt[atc_id] + if trno then + local ttio = S.ttp[trno.timetable] + if ttio.recording_train == atc_id then + ttio.travel_times[p.stn] = rwt.diff(trno.initial_dep, time_now) + ttio.station_order[#ttio.station_order+1] = p.stn + print(atc_id,"for",p.tt,"at",p.stn,"-> travel time",rwt.to_string(ttio.travel_times[p.stn]),"-route end") + end + end + + local next_dep_time = rwt.next_rpt(rwt.add(time_now, 10), p.depint, p.depoff) + schedule(next_dep_time, "departure") + S.ttt[atc_id] = { + timetable = p.tt, + initial_dep = next_dep_time, + location = p.stn, + desired_dep = next_dep_time, + planned_dep = next_dep_time, + last_delay = 0, + } + -- if no travel times are available yet, set this train as recording + if not tti.travel_times or p.force_tt_reset or tti.force_tt_reset then + tti.travel_times = {} + tti.station_order = {p.stn} + tti.recording_train = atc_id + tti.force_tt_reset = false + print(atc_id,"starting TT recording for",p.tt) + elseif tti.recording_train == atc_id then + tti.recording_train = nil + end + atc_set_text_outside(F.ttp[p.tt].outside_text) + atc_set_text_inside(p.stn.."\nArr: " + ..rwt.to_string(time_now, true).." Dep: " + ..rwt.to_string(next_dep_time, true)) + end + if event.schedule then + -- departure. save actual departure time in tt + if S.ttt[atc_id] then -- failsafe: if entry is deleted externally somehow, train just departs and is not tracked by tt (makes resetting S.ttt possible) + S.ttt[atc_id].actual_dep = rwt.now() + local delay = rwt.diff(S.ttt[atc_id].desired_dep, S.ttt[atc_id].actual_dep) + atc_set_text_inside(F.ttp[p.tt].inside_line_desc .. "\nDelay: " .. rwt.to_string(delay, true)) + S.ttt[atc_id].last_delay = delay + end + if p.reverse then + atc_send(F.RDEPCMD) + else + atc_send(F.DEPCMD) + end + end +end +--[[ +Generic stop on timetable. Any train that has a TT instance registered +stops here, waits F.STOP_TIME and continues. Behavior can be altered by options: +F.ttp_stop({ + stn = "Personhood West", -- station name + doorside = "L", + only_lines = nil, --if given a table, only trains where only_lines[get_line()] is true are considered + end_of_tt = { TT_ID = true }, + -- if present and key is true for a TT identifier, this is the last station on this timetable. Trains will stop recording timetable and be deregistered. + departure = { TT_ID = RWT relative to initial departure }, + -- If present, override desired departure time. Defaults to travel time + F.STOP_TIME if not provided + no_disable_ars = nil, + -- if true, does not disable ARS on approach (used for example at INTERCAL) + pos = POS(1,1,1), + direction = "east", +}) + +F.ttp_stop({ + stn = "The Cube", + doorside = "R", + pos = POS(1,1,1), + direction = "east", +}) + +]] +function F.ttp_stop(p) + -- set my approach callback mode + __approach_callback_mode = 1 + if not atc_id then + print(p.stn,"missing train!",event) + return + end + if not S.ttt[atc_id] then return end + if p.only_lines and not p.only_lines[get_line()] then return end + local trn = S.ttt[atc_id] + local tt = trn.timetable + if not F.ttp[tt] then + S.ttt[atc_id] = nil + end + local tti = S.ttp[tt] + if event.approach and not event.has_entered then + -- make the train stop + if not p.no_disable_ars then + atc_set_ars_disable(true) + end + atc_set_lzb_tsr(2) + atc_set_text_inside("Next stop: "..p.stn) + end + +--!-- disaster recovery --!-- +-- if event.approach and event.has_entered then +-- print(atc_id,p.stn,"Disaster Recovery...") +-- atc_send(F.DEPCMD) +-- end + + + if event.train then + if p.pos and p.direction then + F.save_train(p.pos, p.direction) + end + -- train arrived, planning departure + atc_send(F.STOPCMD..p.doorside) + local time_now = rwt.now() + -- update our location and determine desired and planned departure + local next_dep_time = rwt.add(time_now, F.STOP_TIME) + trn.location = p.stn + trn.desired_dep = nil + trn.actual_dep = nil + + -- calculate desired departure nouw + if p.departure and p.departure[tt] then + trn.desired_dep = rwt.add(trn.initial_dep or 0, + p.departure[tt]) + elseif tti.travel_times[p.stn] then + trn.desired_dep = rwt.add(trn.initial_dep or 0, + tti.travel_times[p.stn] + F.STOP_TIME) + -- dyn travel time + if F.DYNAMIC_EN then + local ttpd = rwt.diff(next_dep_time, trn.desired_dep) + if ttpd > F.DYNAMIC_THR then + local new_trav = rwt.diff(trn.initial_dep, time_now) + F.DYNAMIC_THR + print(atc_id,tt,"arrived at",p.stn,ttpd,"s early, TT",tti.travel_times[p.stn],"->",new_trav) + tti.travel_times[p.stn] = new_trav + trn.desired_dep = rwt.add(trn.initial_dep or 0, + new_trav + F.STOP_TIME) + end + end + end + + if trn.desired_dep then + -- if we had a source for desired departure, update planned daparture time + if rwt.to_secs(next_dep_time) < rwt.to_secs(trn.desired_dep) then + -- don't depart before the planned departure time + next_dep_time = trn.desired_dep + end + atc_set_text_inside(p.stn.."\nArr: " + ..rwt.to_string(time_now, true).." Plan: " + ..rwt.to_string(trn.desired_dep, true).." Dep: " + ..rwt.to_string(next_dep_time, true)) + + local delay = rwt.diff(trn.desired_dep, next_dep_time) + trn.last_delay = delay + else + atc_set_text_inside(p.stn.."\nAa " + ..rwt.to_string(time_now, true).." Dd ? Da" + ..rwt.to_string(next_dep_time, true)) + end + + if tti.recording_train == atc_id then + -- we are recording. save travel time + tti.travel_times[p.stn] = rwt.diff(trn.initial_dep or 0, time_now) + print(atc_id,"for",tt,"at",p.stn,"-> travel time",rwt.to_string(tti.travel_times[p.stn])) + tti.station_order[#tti.station_order+1] = p.stn + atc_set_text_inside(p.stn.."\nRec TT " + ..rwt.to_string(tti.travel_times[p.stn], true).." Da" + ..rwt.to_string(next_dep_time, true)) + end + + trn.planned_dep = next_dep_time + schedule(next_dep_time, "departure") + end + if event.schedule then + -- departure. save actual departure time in tt + trn.actual_dep = rwt.now() + local delay = rwt.diff(trn.desired_dep or trn.actual_dep, trn.actual_dep) + atc_set_text_inside(F.ttp[tt].inside_line_desc + .."\nDelay: "..rwt.to_string(delay, true)) + S.ttt[atc_id].last_delay = delay + atc_send(F.DEPCMD) + if p.end_of_tt and p.end_of_tt[tt] then + -- end of timetable. Deregister train + if tti.recording_train == atc_id then + tti.recording_train = nil + end + S.ttt[atc_id] = nil + end + end +end + + +function F.ttp_info_times(tt, starttime) + local ttf = F.ttp[tt] + local tti = S.ttp[tt] + local p = {} + if tti.recording_train then + p[#p+1] = ("recording "..tti.recording_train) + end + p[#p+1] = ("Di "..rwt.to_string(starttime, false).." "..tti.station_order[1]) + for i=2,#tti.station_order do + local ap = rwt.add(starttime, tti.travel_times[tti.station_order[i]]) + p[#p+1] = ("Ap "..rwt.to_string(ap, true).. + " Dp "..rwt.to_string(rwt.add(ap, F.STOP_TIME), false).. + " "..tti.station_order[i]) + end + return p +end + +function F.ttp_info_trains(tt, starttime) + local ttf = F.ttp[tt] + local tti = S.ttp[tt] + local p = {} + for tid,trn in pairs(S.ttt) do + if trn.timetable==tt then + if trn.actual_dep then + p[#p+1] = ("Trn "..tid.. + " after "..trn.location.. + " Dd "..rwt.to_string(trn.desired_dep or 0, false).. + " Da "..rwt.to_string(trn.actual_dep, false).. + " Delay "..rwt.to_string(trn.last_delay or "59;59")) + else + p[#p+1] = ("Trn "..tid.. + " at "..trn.location.. + " Dd "..rwt.to_string(trn.desired_dep or 0, false).. + " Delay "..rwt.to_string(trn.last_delay or "59;59")) + end + end + end + return p +end + +--[[F.ttp_station_display({ + lines = {"CFE_S", "NX_S", "E1_S"}, + departure = {}, + station = "The Cube", + title = "The Cube (Track 2)", + interval = 30, + display1 = "d1", + display2 = "d2", + display3 = "d3", + show_trainid = false, +}]] +function F.ttp_station_display(p) + -- { dep, text } + local next_trains = {} + local function is_past_station(tstn, stnorder) + for _,s in ipairs(stnorder) do + if s==p.station then return true end + if s==tstn then return false end + end + return true + end + + local function add_train(deptime, line, train, tid) + local tent = {dep = deptime, text = + rwt.to_string(deptime,true) + .." "..(p.show_trainid and tid.." " or "") + ..F.ttp[line].stn_display + .." +"..train.last_delay} + for i,ntrn in ipairs(next_trains) do + if rwt.diff(ntrn.dep, deptime)<0 then + table.insert(next_trains, i, tent) + return + end + end + table.insert(next_trains, tent) + end + + for _,line in ipairs(p.lines) do + local fttp = F.ttp[line] + local sttp = S.ttp[line] + -- find all trains on this line + for id, train in pairs(S.ttt) do + if train.timetable == line then + if train.location == p.station and not train.actual_dep then + -- the train is currently standing at this station + add_train(train.planned_dep, line, train, id) + elseif not is_past_station(train.location, sttp.station_order) then + -- train is still approaching, calculate arrival time + local trav_dep = rwt.add(train.initial_dep, (sttp.travel_times[p.station] or 0) + F.STOP_TIME) + local act_dep = rwt.add(trav_dep, train.last_delay) + if p.departure and p.departure[line] then + local plan_dep = rwt.add(train.initial_dep, p.departure[line]) + if rwt.to_secs(act_dep) < rwt.to_secs(plan_dep) then + act_dep = plan_dep + end + end + add_train(act_dep, line, train, id) + end + end + end + end + + -- make output + local i + local text1 = p.title .. " * "..rwt.to_string(rwt.now(), true).." * " + for i=1,3 do + if next_trains[i] then + text1 = text1 .. "\n".. next_trains[i].text + end + end + + digiline_send(p.display1, text1) + if p.display2 then + local text2 = "" + for i=4,7 do + if next_trains[i] then + text2 = text2 .. next_trains[i].text .. "\n" + end + 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 +end diff --git a/far/nodes/(10018,5,1360).lua b/far/nodes/(10018,5,1360).lua index 91d86ab..669928e 100644 --- a/far/nodes/(10018,5,1360).lua +++ b/far/nodes/(10018,5,1360).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 10018,5,1360 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 10018,5,1360 ), "west") diff --git a/far/nodes/(10022,5,1355).lua b/far/nodes/(10022,5,1355).lua index 740a8eb..39d0cf7 100644 --- a/far/nodes/(10022,5,1355).lua +++ b/far/nodes/(10022,5,1355).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 10022,5,1355 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 10022,5,1355 ), "east") diff --git a/far/nodes/(10438,13,1604).lua b/far/nodes/(10438,13,1604).lua index 83c14a4..3174135 100644 --- a/far/nodes/(10438,13,1604).lua +++ b/far/nodes/(10438,13,1604).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 10438,13,1604 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 10438,13,1604 ), "east") diff --git a/far/nodes/(10438,13,1610).lua b/far/nodes/(10438,13,1610).lua index 495e96a..1f29a27 100644 --- a/far/nodes/(10438,13,1610).lua +++ b/far/nodes/(10438,13,1610).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 10438,13,1610 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 10438,13,1610 ), "west") diff --git a/far/nodes/(10723,49,1227).lua b/far/nodes/(10723,49,1227).lua new file mode 100644 index 0000000..4602c1b --- /dev/null +++ b/far/nodes/(10723,49,1227).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Turbulent Hills", + title = "Turbulent Hills", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(10723,49,1246).lua b/far/nodes/(10723,49,1246).lua new file mode 100644 index 0000000..4602c1b --- /dev/null +++ b/far/nodes/(10723,49,1246).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Turbulent Hills", + title = "Turbulent Hills", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(10728,46,1225).lua b/far/nodes/(10728,46,1225).lua index d66a544..1737450 100644 --- a/far/nodes/(10728,46,1225).lua +++ b/far/nodes/(10728,46,1225).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(10728,46,1225) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(10728,46,1225), "east") +]] + +F.ttp_stop({ + stn = "Turbulent Hills", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(10728,46,1225), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(10731,46,1251).lua b/far/nodes/(10731,46,1251).lua index a5de8b7..86fcc5c 100644 --- a/far/nodes/(10731,46,1251).lua +++ b/far/nodes/(10731,46,1251).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(10731,46,1251) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(10731,46,1251), "west") +]] + +F.ttp_stop({ + stn = "Turbulent Hills", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(10731,46,1251), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(10736,49,1227).lua b/far/nodes/(10736,49,1227).lua new file mode 100644 index 0000000..41e5020 --- /dev/null +++ b/far/nodes/(10736,49,1227).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Turbulent Hills", + title = "Turbulent Hills", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(10736,49,1246).lua b/far/nodes/(10736,49,1246).lua new file mode 100644 index 0000000..41e5020 --- /dev/null +++ b/far/nodes/(10736,49,1246).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Turbulent Hills", + title = "Turbulent Hills", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(11242,4,932).lua b/far/nodes/(11242,4,932).lua index a876224..3becaa4 100644 --- a/far/nodes/(11242,4,932).lua +++ b/far/nodes/(11242,4,932).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 11242,4,932 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 11242,4,932 ), "east") diff --git a/far/nodes/(11256,4,928).lua b/far/nodes/(11256,4,928).lua index 2dad637..d475b87 100644 --- a/far/nodes/(11256,4,928).lua +++ b/far/nodes/(11256,4,928).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 11256,4,928 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 11256,4,928 ), "west") diff --git a/far/nodes/(11743,15,756).lua b/far/nodes/(11743,15,756).lua index 25b165c..1052d4a 100644 --- a/far/nodes/(11743,15,756).lua +++ b/far/nodes/(11743,15,756).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 11743,15,756 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 11743,15,756 ), "east") diff --git a/far/nodes/(11743,15,762).lua b/far/nodes/(11743,15,762).lua index fd92811..29940e9 100644 --- a/far/nodes/(11743,15,762).lua +++ b/far/nodes/(11743,15,762).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 11743,15,762 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 11743,15,762 ), "west") diff --git a/far/nodes/(12285,28,730).lua b/far/nodes/(12285,28,730).lua index 7c45261..893a3fe 100644 --- a/far/nodes/(12285,28,730).lua +++ b/far/nodes/(12285,28,730).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 12285,28,730 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 12285,28,730 ), "east") diff --git a/far/nodes/(12288,28,733).lua b/far/nodes/(12288,28,733).lua index ace9308..188b215 100644 --- a/far/nodes/(12288,28,733).lua +++ b/far/nodes/(12288,28,733).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 12288,28,733 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 12288,28,733 ), "west") diff --git a/far/nodes/(12829,10,676).lua b/far/nodes/(12829,10,676).lua index 9fb5699..765c806 100644 --- a/far/nodes/(12829,10,676).lua +++ b/far/nodes/(12829,10,676).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 12829,10,676 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 12829,10,676 ), "east") diff --git a/far/nodes/(12829,10,680).lua b/far/nodes/(12829,10,680).lua index 16f0730..24fdad6 100644 --- a/far/nodes/(12829,10,680).lua +++ b/far/nodes/(12829,10,680).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 12829,10,680 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 12829,10,680 ), "west") diff --git a/far/nodes/(13448,13,717).lua b/far/nodes/(13448,13,717).lua index 66f6352..0dec211 100644 --- a/far/nodes/(13448,13,717).lua +++ b/far/nodes/(13448,13,717).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(13448,13,717) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(13448,13,717), "west") +]] + +F.ttp_stop({ + stn = "Beggars Hole", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(13448,13,717), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(13464,16,706).lua b/far/nodes/(13464,16,706).lua new file mode 100644 index 0000000..0d1c421 --- /dev/null +++ b/far/nodes/(13464,16,706).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Beggars Hole", + title = "Beggars Hole", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(13464,16,724).lua b/far/nodes/(13464,16,724).lua new file mode 100644 index 0000000..3698ad7 --- /dev/null +++ b/far/nodes/(13464,16,724).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Beggars Hole", + title = "Beggars Hole", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(13481,13,713).lua b/far/nodes/(13481,13,713).lua index 4d8275c..b33b15c 100644 --- a/far/nodes/(13481,13,713).lua +++ b/far/nodes/(13481,13,713).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(13481,13,713) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(13481,13,713), "east") +]] + +F.ttp_stop({ + stn = "Beggars Hole", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(13481,13,713), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(13843,20,672).lua b/far/nodes/(13843,20,672).lua index 47de8b0..07ef7ef 100644 --- a/far/nodes/(13843,20,672).lua +++ b/far/nodes/(13843,20,672).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 13843,20,672 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 13843,20,672 ), "east") diff --git a/far/nodes/(13843,20,682).lua b/far/nodes/(13843,20,682).lua index 99facb5..9d5894a 100644 --- a/far/nodes/(13843,20,682).lua +++ b/far/nodes/(13843,20,682).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 13843,20,682 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 13843,20,682 ), "west") diff --git a/far/nodes/(14396,20,712).lua b/far/nodes/(14396,20,712).lua index 31245a3..0a3e703 100644 --- a/far/nodes/(14396,20,712).lua +++ b/far/nodes/(14396,20,712).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 14396,20,712 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 14396,20,712 ), "west") diff --git a/far/nodes/(14398,20,708).lua b/far/nodes/(14398,20,708).lua index 4c62a82..3995fb8 100644 --- a/far/nodes/(14398,20,708).lua +++ b/far/nodes/(14398,20,708).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 14398,20,708 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 14398,20,708 ), "east") diff --git a/far/nodes/(14934,6,731).lua b/far/nodes/(14934,6,731).lua index 5e81009..9834f95 100644 --- a/far/nodes/(14934,6,731).lua +++ b/far/nodes/(14934,6,731).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 14934,6,731 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 14934,6,731 ), "east") diff --git a/far/nodes/(14934,6,736).lua b/far/nodes/(14934,6,736).lua index 4de8fe6..bbf45fa 100644 --- a/far/nodes/(14934,6,736).lua +++ b/far/nodes/(14934,6,736).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 14934,6,736 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 14934,6,736 ), "west") diff --git a/far/nodes/(15454,14,1055).lua b/far/nodes/(15454,14,1055).lua index 989dfc1..bf386d3 100644 --- a/far/nodes/(15454,14,1055).lua +++ b/far/nodes/(15454,14,1055).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(15454,14,1055) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(15454,14,1055), "west") +]] + +F.ttp_stop({ + stn = "Halfway", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(15454,14,1055), + direction = "west", +}) diff --git a/far/nodes/(15455,19,1064).lua b/far/nodes/(15455,19,1064).lua new file mode 100644 index 0000000..dceb219 --- /dev/null +++ b/far/nodes/(15455,19,1064).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Halfway", + title = "Halfway", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(15455,19,1075).lua b/far/nodes/(15455,19,1075).lua new file mode 100644 index 0000000..dceb219 --- /dev/null +++ b/far/nodes/(15455,19,1075).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Halfway", + title = "Halfway", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(15471,19,1110).lua b/far/nodes/(15471,19,1110).lua new file mode 100644 index 0000000..cd3d65d --- /dev/null +++ b/far/nodes/(15471,19,1110).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Halfway", + title = "Halfway", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(15471,19,1121).lua b/far/nodes/(15471,19,1121).lua new file mode 100644 index 0000000..cd3d65d --- /dev/null +++ b/far/nodes/(15471,19,1121).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Halfway", + title = "Halfway", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(15472,14,1131).lua b/far/nodes/(15472,14,1131).lua index f45c7b6..3428cf8 100644 --- a/far/nodes/(15472,14,1131).lua +++ b/far/nodes/(15472,14,1131).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(15472,14,1131) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(15472,14,1131), "east") +]] + +F.ttp_stop({ + stn = "Halfway", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(15472,14,1131), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(15478,14,1140).lua b/far/nodes/(15478,14,1140).lua deleted file mode 100644 index 0bf4df5..0000000 --- a/far/nodes/(15478,14,1140).lua +++ /dev/null @@ -1,9 +0,0 @@ - -local show_print = false -if event.type == "punch" then - --- F.delete_train_info("595542") - - F.list_trains(15) - return -end
\ No newline at end of file diff --git a/far/nodes/(15907,25,945).lua b/far/nodes/(15907,25,945).lua index 9a4d746..a8c8762 100644 --- a/far/nodes/(15907,25,945).lua +++ b/far/nodes/(15907,25,945).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 15907,25,945 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 15907,25,945 ), "east") diff --git a/far/nodes/(15907,25,950).lua b/far/nodes/(15907,25,950).lua index 0e37631..6a6520e 100644 --- a/far/nodes/(15907,25,950).lua +++ b/far/nodes/(15907,25,950).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 15907,25,950 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 15907,25,950 ), "west") diff --git a/far/nodes/(16806,10,696).lua b/far/nodes/(16806,10,696).lua index f961531..a6be584 100644 --- a/far/nodes/(16806,10,696).lua +++ b/far/nodes/(16806,10,696).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 16806,10,696 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 16806,10,696 ), "east") diff --git a/far/nodes/(16806,10,700).lua b/far/nodes/(16806,10,700).lua index 2e458fd..a4b3122 100644 --- a/far/nodes/(16806,10,700).lua +++ b/far/nodes/(16806,10,700).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 16806,10,700 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 16806,10,700 ), "west") diff --git a/far/nodes/(1753,8,1570).lua b/far/nodes/(1753,8,1570).lua new file mode 100644 index 0000000..7d945dc --- /dev/null +++ b/far/nodes/(1753,8,1570).lua @@ -0,0 +1,18 @@ +-- far_luaatctrack_spot_check_01.lua + +--[[ +F.save_train(POS(1755,8,1570), "west") +]] + +F.ttp_begin({ + stn = "Salt Factory", -- station name + tt = "FAR_E", -- timetable ID + depint = "8;00", --departure slot interval + depoff = "00;00", --departure slot offset + doorside = "L", + reverse = true, + only_lines = {['FAR'] = true}, + force_tt_reset = false, + pos = POS(1755,8,1570), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(1755,8,1570).lua b/far/nodes/(1755,8,1570).lua deleted file mode 100644 index 5c9fe05..0000000 --- a/far/nodes/(1755,8,1570).lua +++ /dev/null @@ -1,12 +0,0 @@ --- far_luaatctrack_spot_check_01.lua --- POS(dd,dd,dd) ---[[ -POS(1755,8,1570) -]] - -local show_print = false -if event.train then - local posTable = POS(1755,8,1570) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(1771,10,1563).lua b/far/nodes/(1771,10,1563).lua new file mode 100644 index 0000000..3150a83 --- /dev/null +++ b/far/nodes/(1771,10,1563).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Salt Factory", + title = "Salt Factory", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(17862,14,599).lua b/far/nodes/(17862,14,599).lua index b43042b..e6df89c 100644 --- a/far/nodes/(17862,14,599).lua +++ b/far/nodes/(17862,14,599).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 17862,14,599 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 17862,14,599 ), "east") diff --git a/far/nodes/(17862,14,602).lua b/far/nodes/(17862,14,602).lua index 4e030e5..3dd5ac7 100644 --- a/far/nodes/(17862,14,602).lua +++ b/far/nodes/(17862,14,602).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 17862,14,602 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 17862,14,602 ), "west") diff --git a/far/nodes/(17950,25,599).lua b/far/nodes/(17950,25,599).lua index 16ac692..cddd24d 100644 --- a/far/nodes/(17950,25,599).lua +++ b/far/nodes/(17950,25,599).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 17950,25,599 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 17950,25,599 ), "east") diff --git a/far/nodes/(17950,25,602).lua b/far/nodes/(17950,25,602).lua index 85cb8b4..cca8ffc 100644 --- a/far/nodes/(17950,25,602).lua +++ b/far/nodes/(17950,25,602).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 17950,25,602 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 17950,25,602 ), "west") diff --git a/far/nodes/(18288,36,607).lua b/far/nodes/(18288,36,607).lua index de4f9c8..6c37e96 100644 --- a/far/nodes/(18288,36,607).lua +++ b/far/nodes/(18288,36,607).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(18288,36,607) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(18288,36,607), "west") +]] + +F.ttp_stop({ + stn = "Tardigrades", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(18288,36,607), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(1829,8,1548).lua b/far/nodes/(1829,8,1548).lua index 942c05a..984f24c 100644 --- a/far/nodes/(1829,8,1548).lua +++ b/far/nodes/(1829,8,1548).lua @@ -1,8 +1,5 @@ -- far_luaatctrack_spot_check_01.lua local show_print = false -if event.train then - local posTable = POS( 1829,8,1548 ) - F.save_train(posTable) - return -end
\ No newline at end of file + +F.save_train(POS( 1829,8,1548 ), "east")
\ No newline at end of file diff --git a/far/nodes/(18304,39,595).lua b/far/nodes/(18304,39,595).lua new file mode 100644 index 0000000..7f41ca4 --- /dev/null +++ b/far/nodes/(18304,39,595).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Tardigrades", + title = "Tardigrades", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(18304,39,614).lua b/far/nodes/(18304,39,614).lua new file mode 100644 index 0000000..e8b85fd --- /dev/null +++ b/far/nodes/(18304,39,614).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Tardigrades", + title = "Tardigrades", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(18320,36,602).lua b/far/nodes/(18320,36,602).lua index cede5c7..10ed638 100644 --- a/far/nodes/(18320,36,602).lua +++ b/far/nodes/(18320,36,602).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(18320,36,602) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(18320,36,602), "east") +]] + +F.ttp_stop({ + stn = "Tardigrades", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(18320,36,602), + direction = "east", +}) diff --git a/far/nodes/(1860,7,1570).lua b/far/nodes/(1860,7,1570).lua deleted file mode 100644 index a3f7a71..0000000 --- a/far/nodes/(1860,7,1570).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS( 1860,7,1570 ) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(1860,8,1570).lua b/far/nodes/(1860,8,1570).lua new file mode 100644 index 0000000..2850e88 --- /dev/null +++ b/far/nodes/(1860,8,1570).lua @@ -0,0 +1,4 @@ +-- far_luaatctrack_spot_check_01.lua + +local show_print = false +F.save_train(POS( 1860,8,1570 ), "west") diff --git a/far/nodes/(18971,14,854).lua b/far/nodes/(18971,14,854).lua index 22e8cbb..76e1f7e 100644 --- a/far/nodes/(18971,14,854).lua +++ b/far/nodes/(18971,14,854).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 18971,14,854 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 18971,14,854 ), "west") diff --git a/far/nodes/(18974,14,851).lua b/far/nodes/(18974,14,851).lua index d1f1881..9f8ddb3 100644 --- a/far/nodes/(18974,14,851).lua +++ b/far/nodes/(18974,14,851).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 18974,14,851 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 18974,14,851 ), "east") diff --git a/far/nodes/(1936,10,1543).lua b/far/nodes/(1936,10,1543).lua deleted file mode 100644 index add2167..0000000 --- a/far/nodes/(1936,10,1543).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS( 1936,10,1543 ) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(1936,10,1546).lua b/far/nodes/(1936,10,1546).lua deleted file mode 100644 index 9449cee..0000000 --- a/far/nodes/(1936,10,1546).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS( 1936,10,1546 ) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(1957,9,1535).lua b/far/nodes/(1957,9,1535).lua new file mode 100644 index 0000000..c5742ed --- /dev/null +++ b/far/nodes/(1957,9,1535).lua @@ -0,0 +1,5 @@ +-- far_luaatctrack_spot_check_01.lua + +local show_print = false + +F.save_train(POS( 1957,9,1535 ), "east")
\ No newline at end of file diff --git a/far/nodes/(1963,9,1535).lua b/far/nodes/(1963,9,1535).lua new file mode 100644 index 0000000..09150cb --- /dev/null +++ b/far/nodes/(1963,9,1535).lua @@ -0,0 +1,5 @@ +-- far_luaatctrack_spot_check_01.lua + +local show_print = false + +F.save_train(POS( 1963,9,1535 ), "west") diff --git a/far/nodes/(19710,8,689).lua b/far/nodes/(19710,8,689).lua index 0b4c30a..4830494 100644 --- a/far/nodes/(19710,8,689).lua +++ b/far/nodes/(19710,8,689).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(19710,8,689) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(19710,8,689), "west") +]] + +F.ttp_stop({ + stn = "Greenport", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(19710,8,689), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(19725,9,677).lua b/far/nodes/(19725,9,677).lua new file mode 100644 index 0000000..ffe21ff --- /dev/null +++ b/far/nodes/(19725,9,677).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Greenport", + title = "Greenport", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(19725,9,696).lua b/far/nodes/(19725,9,696).lua new file mode 100644 index 0000000..1c87bd6 --- /dev/null +++ b/far/nodes/(19725,9,696).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Greenport", + title = "Greenport", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(19741,8,684).lua b/far/nodes/(19741,8,684).lua index 0eb5cfc..959c682 100644 --- a/far/nodes/(19741,8,684).lua +++ b/far/nodes/(19741,8,684).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(19741,8,684) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(19741,8,684), "east") +]] + +F.ttp_stop({ + stn = "Greenport", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(19741,8,684), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(20279,14,683).lua b/far/nodes/(20279,14,683).lua index 27e74d1..e43d146 100644 --- a/far/nodes/(20279,14,683).lua +++ b/far/nodes/(20279,14,683).lua @@ -1,8 +1,4 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 20279,14,683 ) - F.save_train(posTable) - return -end
\ No newline at end of file + +F.save_train(POS( 20279,14,683 ), "east") diff --git a/far/nodes/(20280,14,687).lua b/far/nodes/(20280,14,687).lua index 89ba70e..6f811b0 100644 --- a/far/nodes/(20280,14,687).lua +++ b/far/nodes/(20280,14,687).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 20280,14,687 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 20280,14,687 ), "west") diff --git a/far/nodes/(2049,9,1480).lua b/far/nodes/(2049,9,1480).lua index 08e6c2a..bf11028 100644 --- a/far/nodes/(2049,9,1480).lua +++ b/far/nodes/(2049,9,1480).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(2049,9,1480) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(2049,9,1480), "west") +]] + +F.ttp_stop({ + stn = "Rubbamboo", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(2049,9,1480), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(2060,14,1478).lua b/far/nodes/(2060,14,1478).lua new file mode 100644 index 0000000..a3a338d --- /dev/null +++ b/far/nodes/(2060,14,1478).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Rubbamboo", + title = "Rubbamboo", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(2061,14,1457).lua b/far/nodes/(2061,14,1457).lua new file mode 100644 index 0000000..93ddbd1 --- /dev/null +++ b/far/nodes/(2061,14,1457).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Rubbamboo", + title = "Rubbamboo", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(2066,9,1459).lua b/far/nodes/(2066,9,1459).lua index d3d6fe7..a9cb161 100644 --- a/far/nodes/(2066,9,1459).lua +++ b/far/nodes/(2066,9,1459).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(2066,9,1459) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(2066,9,1459), "east") +]] + +F.ttp_stop({ + stn = "Rubbamboo", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(2066,9,1459), + direction = "east", +}) diff --git a/far/nodes/(21333,13,880).lua b/far/nodes/(21333,13,880).lua deleted file mode 100644 index 863fc83..0000000 --- a/far/nodes/(21333,13,880).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(21333,13,880) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(21433,9,957).lua b/far/nodes/(21433,9,957).lua index 5141cff..0fbf73f 100644 --- a/far/nodes/(21433,9,957).lua +++ b/far/nodes/(21433,9,957).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(21433,9,957) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(21433,9,957), "west") +]] + +F.ttp_stop({ + stn = "Bayonne", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(21433,9,957), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(21435,15,970).lua b/far/nodes/(21435,15,970).lua new file mode 100644 index 0000000..2e9e515 --- /dev/null +++ b/far/nodes/(21435,15,970).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Bayonne", + title = "Bayonne", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(21435,9,957).lua b/far/nodes/(21435,9,957).lua deleted file mode 100644 index 95420c8..0000000 --- a/far/nodes/(21435,9,957).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(21435,9,957) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(21443,15,970).lua b/far/nodes/(21443,15,970).lua new file mode 100644 index 0000000..3cf84d1 --- /dev/null +++ b/far/nodes/(21443,15,970).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Bayonne", + title = "Bayonne", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(21443,9,984).lua b/far/nodes/(21443,9,984).lua deleted file mode 100644 index 6b7cd0a..0000000 --- a/far/nodes/(21443,9,984).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(21443,9,984) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(21445,9,984).lua b/far/nodes/(21445,9,984).lua index 4350569..4a7e799 100644 --- a/far/nodes/(21445,9,984).lua +++ b/far/nodes/(21445,9,984).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(21445,9,984) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(21445,9,984), "east") +]] + +F.ttp_stop({ + stn = "Bayonne", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(21445,9,984), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(21823,25,1293).lua b/far/nodes/(21823,25,1293).lua index 491b28a..fa2aa30 100644 --- a/far/nodes/(21823,25,1293).lua +++ b/far/nodes/(21823,25,1293).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 21823,25,1293 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 21823,25,1293 ), "west") diff --git a/far/nodes/(21825,25,1289).lua b/far/nodes/(21825,25,1289).lua index ebc9c7d..78a6586 100644 --- a/far/nodes/(21825,25,1289).lua +++ b/far/nodes/(21825,25,1289).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 21825,25,1289 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 21825,25,1289 ), "east") diff --git a/far/nodes/(22976,16,1392).lua b/far/nodes/(22976,16,1392).lua index a457581..e0c805e 100644 --- a/far/nodes/(22976,16,1392).lua +++ b/far/nodes/(22976,16,1392).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 22976,16,1392 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 22976,16,1392 ), "east") diff --git a/far/nodes/(22976,16,1396).lua b/far/nodes/(22976,16,1396).lua index 29d6638..6095c33 100644 --- a/far/nodes/(22976,16,1396).lua +++ b/far/nodes/(22976,16,1396).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 22976,16,1396 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 22976,16,1396 ), "west") diff --git a/far/nodes/(23184,18,1496).lua b/far/nodes/(23184,18,1496).lua new file mode 100644 index 0000000..86720a4 --- /dev/null +++ b/far/nodes/(23184,18,1496).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Savicott", + title = "Savicott", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(23191,15,1481).lua b/far/nodes/(23191,15,1481).lua index f9ce8ba..ae9b3d5 100644 --- a/far/nodes/(23191,15,1481).lua +++ b/far/nodes/(23191,15,1481).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(23191,15,1481) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(23191,15,1481), "west") +]] + +F.ttp_stop({ + stn = "Savicott", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(23191,15,1481), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(23195,15,1512).lua b/far/nodes/(23195,15,1512).lua index e9af33e..cc60a88 100644 --- a/far/nodes/(23195,15,1512).lua +++ b/far/nodes/(23195,15,1512).lua @@ -1,8 +1,7 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(23195,15,1512) - F.save_train(posTable) - return +if atc_arrow == false then + F.save_train(POS(23195,15,1512), "west") +else + F.save_train(POS(23195,15,1512), "east") end
\ No newline at end of file diff --git a/far/nodes/(23199,15,1512).lua b/far/nodes/(23199,15,1512).lua index 569eb68..3cd8b5b 100644 --- a/far/nodes/(23199,15,1512).lua +++ b/far/nodes/(23199,15,1512).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(23199,15,1512) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(23199,15,1512), "east") +]] + +F.ttp_stop({ + stn = "Savicott", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(23199,15,1512), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(23206,18,1496).lua b/far/nodes/(23206,18,1496).lua new file mode 100644 index 0000000..f5c10d8 --- /dev/null +++ b/far/nodes/(23206,18,1496).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Savicott", + title = "Savicott", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(23263,7,1701).lua b/far/nodes/(23263,7,1701).lua index 826ae2c..e3b2c5e 100644 --- a/far/nodes/(23263,7,1701).lua +++ b/far/nodes/(23263,7,1701).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 23263,7,1701 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 23263,7,1701 ), "east") diff --git a/far/nodes/(23263,7,1704).lua b/far/nodes/(23263,7,1704).lua index f714792..4dc459f 100644 --- a/far/nodes/(23263,7,1704).lua +++ b/far/nodes/(23263,7,1704).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 23263,7,1704 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 23263,7,1704 ), "west") diff --git a/far/nodes/(23736,12,1706).lua b/far/nodes/(23736,12,1706).lua index d4b4a27..fddfbd0 100644 --- a/far/nodes/(23736,12,1706).lua +++ b/far/nodes/(23736,12,1706).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 23736,12,1706 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 23736,12,1706 ), "east") diff --git a/far/nodes/(23736,12,1710).lua b/far/nodes/(23736,12,1710).lua index 1f4021e..395f178 100644 --- a/far/nodes/(23736,12,1710).lua +++ b/far/nodes/(23736,12,1710).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 23736,12,1710 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 23736,12,1710 ), "west") diff --git a/far/nodes/(24292,24,1570).lua b/far/nodes/(24292,24,1570).lua index 7fb6c8b..5166239 100644 --- a/far/nodes/(24292,24,1570).lua +++ b/far/nodes/(24292,24,1570).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 24292,24,1570 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 24292,24,1570 ), "east") diff --git a/far/nodes/(24295,24,1573).lua b/far/nodes/(24295,24,1573).lua index 14e99ec..35f2881 100644 --- a/far/nodes/(24295,24,1573).lua +++ b/far/nodes/(24295,24,1573).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 24295,24,1573 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 24295,24,1573 ), "west") diff --git a/far/nodes/(25147,24,1460).lua b/far/nodes/(25147,24,1460).lua index ff8823c..34218c8 100644 --- a/far/nodes/(25147,24,1460).lua +++ b/far/nodes/(25147,24,1460).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 25147,24,1460 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 25147,24,1460 ), "west") diff --git a/far/nodes/(25150,24,1457).lua b/far/nodes/(25150,24,1457).lua index f910641..afe5c19 100644 --- a/far/nodes/(25150,24,1457).lua +++ b/far/nodes/(25150,24,1457).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 25150,24,1457 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 25150,24,1457 ), "east") diff --git a/far/nodes/(25670,10,1575).lua b/far/nodes/(25670,10,1575).lua index 30f0da6..4edc9d0 100644 --- a/far/nodes/(25670,10,1575).lua +++ b/far/nodes/(25670,10,1575).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(25670,10,1575) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(25670,10,1575), "west") +]] + +F.ttp_stop({ + stn = "Tundra Solstice", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(25670,10,1575), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(25687,14,1572).lua b/far/nodes/(25687,14,1572).lua new file mode 100644 index 0000000..4bc9d1e --- /dev/null +++ b/far/nodes/(25687,14,1572).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Tundra Solstice", + title = "Tundra Solstice", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(25700,14,1526).lua b/far/nodes/(25700,14,1526).lua new file mode 100644 index 0000000..8297d97 --- /dev/null +++ b/far/nodes/(25700,14,1526).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Tundra Solstice", + title = "Tundra Solstice", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(25720,10,1519).lua b/far/nodes/(25720,10,1519).lua index f5ddc3c..1182163 100644 --- a/far/nodes/(25720,10,1519).lua +++ b/far/nodes/(25720,10,1519).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(25720,10,1519) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(25720,10,1519), "east") +]] + +F.ttp_stop({ + stn = "Tundra Solstice", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(25720,10,1519), + direction = "east", +}) diff --git a/far/nodes/(26198,24,1421).lua b/far/nodes/(26198,24,1421).lua new file mode 100644 index 0000000..a052ef9 --- /dev/null +++ b/far/nodes/(26198,24,1421).lua @@ -0,0 +1,3 @@ +-- far_luaatctrack_spot_check_01.lua + +F.save_train(POS(26198,24,1421), "west") diff --git a/far/nodes/(26201,24,1417).lua b/far/nodes/(26201,24,1417).lua new file mode 100644 index 0000000..6b23d9e --- /dev/null +++ b/far/nodes/(26201,24,1417).lua @@ -0,0 +1,3 @@ +-- far_luaatctrack_spot_check_01.lua + +F.save_train(POS(26201,24,1417), "east") diff --git a/far/nodes/(26341,34,1514).lua b/far/nodes/(26341,34,1514).lua new file mode 100644 index 0000000..fdd2c71 --- /dev/null +++ b/far/nodes/(26341,34,1514).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Fucking", + title = "Fucking", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(26343,30,1503).lua b/far/nodes/(26343,30,1503).lua deleted file mode 100644 index 9d4321f..0000000 --- a/far/nodes/(26343,30,1503).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS( 26343,30,1503 ) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(26345,30,1505).lua b/far/nodes/(26345,30,1505).lua deleted file mode 100644 index 0b528fe..0000000 --- a/far/nodes/(26345,30,1505).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS( 26345,30,1505 ) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(26346,30,1500).lua b/far/nodes/(26346,30,1500).lua deleted file mode 100644 index 16e0708..0000000 --- a/far/nodes/(26346,30,1500).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS( 26346,30,1500 ) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(26347,30,1502).lua b/far/nodes/(26347,30,1502).lua deleted file mode 100644 index ace4109..0000000 --- a/far/nodes/(26347,30,1502).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS( 26347,30,1502 ) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(26348,30,1508).lua b/far/nodes/(26348,30,1508).lua new file mode 100644 index 0000000..b40051c --- /dev/null +++ b/far/nodes/(26348,30,1508).lua @@ -0,0 +1,13 @@ +-- far_luaatctrack_spot_check_01.lua + +--[[ +F.save_train(POS(26348,30,1508), "west") +]] + +F.ttp_stop({ + stn = "Fucking", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(26348,30,1508), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(26357,34,1498).lua b/far/nodes/(26357,34,1498).lua new file mode 100644 index 0000000..bb239d2 --- /dev/null +++ b/far/nodes/(26357,34,1498).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Fucking", + title = "Fucking", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(26363,34,1535).lua b/far/nodes/(26363,34,1535).lua new file mode 100644 index 0000000..fdd2c71 --- /dev/null +++ b/far/nodes/(26363,34,1535).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Fucking", + title = "Fucking", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(26372,30,1526).lua b/far/nodes/(26372,30,1526).lua new file mode 100644 index 0000000..9e2133a --- /dev/null +++ b/far/nodes/(26372,30,1526).lua @@ -0,0 +1,13 @@ +-- far_luaatctrack_spot_check_01.lua + +--[[ +F.save_train(POS( 26372,30,1526 ), "east") +]] + +F.ttp_stop({ + stn = "Fucking", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS( 26372,30,1526 ), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(26378,34,1520).lua b/far/nodes/(26378,34,1520).lua new file mode 100644 index 0000000..bb239d2 --- /dev/null +++ b/far/nodes/(26378,34,1520).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Fucking", + title = "Fucking", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(26551,30,1691).lua b/far/nodes/(26551,30,1691).lua new file mode 100644 index 0000000..3a8659a --- /dev/null +++ b/far/nodes/(26551,30,1691).lua @@ -0,0 +1 @@ +F.save_train(POS(26551,30,1691), "west")
\ No newline at end of file diff --git a/far/nodes/(26554,30,1687).lua b/far/nodes/(26554,30,1687).lua new file mode 100644 index 0000000..6e0943c --- /dev/null +++ b/far/nodes/(26554,30,1687).lua @@ -0,0 +1 @@ +F.save_train(POS(26554,30,1687), "east")
\ No newline at end of file diff --git a/far/nodes/(2715,8,1423).lua b/far/nodes/(2715,8,1423).lua new file mode 100644 index 0000000..10b8890 --- /dev/null +++ b/far/nodes/(2715,8,1423).lua @@ -0,0 +1,4 @@ +-- far_luaatctrack_spot_check_01.lua + + +F.save_train(POS( 2715,8,1423 ), "east") diff --git a/far/nodes/(2715,8,1427).lua b/far/nodes/(2715,8,1427).lua new file mode 100644 index 0000000..655f7cf --- /dev/null +++ b/far/nodes/(2715,8,1427).lua @@ -0,0 +1,3 @@ +-- far_luaatctrack_spot_check_01.lua + +F.save_train(POS( 2715,8,1427 ), "west")
\ No newline at end of file diff --git a/far/nodes/(27154,12,1730).lua b/far/nodes/(27154,12,1730).lua index 25b9f95..fa247a3 100644 --- a/far/nodes/(27154,12,1730).lua +++ b/far/nodes/(27154,12,1730).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 27154,12,1730 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 27154,12,1730 ), "west") diff --git a/far/nodes/(27156,12,1727).lua b/far/nodes/(27156,12,1727).lua index ee30401..8be651d 100644 --- a/far/nodes/(27156,12,1727).lua +++ b/far/nodes/(27156,12,1727).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 27156,12,1727 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 27156,12,1727 ), "east") diff --git a/far/nodes/(27668,6,1622).lua b/far/nodes/(27668,6,1622).lua index a5d4ad8..bc06698 100644 --- a/far/nodes/(27668,6,1622).lua +++ b/far/nodes/(27668,6,1622).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 27668,6,1622 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 27668,6,1622 ), "east") diff --git a/far/nodes/(27671,6,1625).lua b/far/nodes/(27671,6,1625).lua index 575737e..3d84426 100644 --- a/far/nodes/(27671,6,1625).lua +++ b/far/nodes/(27671,6,1625).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 27671,6,1625 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 27671,6,1625 ), "west") diff --git a/far/nodes/(28048,8,1612).lua b/far/nodes/(28048,8,1612).lua index 3f12a6c..b8a3cdc 100644 --- a/far/nodes/(28048,8,1612).lua +++ b/far/nodes/(28048,8,1612).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 28048,8,1612 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 28048,8,1612 ), "east")
\ No newline at end of file diff --git a/far/nodes/(28048,8,1616).lua b/far/nodes/(28048,8,1616).lua index aa44767..b5ea048 100644 --- a/far/nodes/(28048,8,1616).lua +++ b/far/nodes/(28048,8,1616).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 28048,8,1616 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 28048,8,1616 ), "west") diff --git a/far/nodes/(2839,14,1562).lua b/far/nodes/(2839,14,1562).lua new file mode 100644 index 0000000..4b27fd8 --- /dev/null +++ b/far/nodes/(2839,14,1562).lua @@ -0,0 +1,13 @@ +-- far_luaatctrack_spot_check_01.lua + +--[[ +F.save_train(POS( 2839,14,1562 ), "west") +]] + +F.ttp_stop({ + stn = "Warzenschwein", + doorside = "L", + only_lines = {['FAR'] = true}, + pos = POS( 2839,14,1562 ), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(2847,18,1563).lua b/far/nodes/(2847,18,1563).lua new file mode 100644 index 0000000..4b38fbf --- /dev/null +++ b/far/nodes/(2847,18,1563).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E","FAR_W"}, + departure = {}, + station = "Warzenschwein", + title = "Warzenschwein", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(2857,18,1573).lua b/far/nodes/(2857,18,1573).lua new file mode 100644 index 0000000..4b38fbf --- /dev/null +++ b/far/nodes/(2857,18,1573).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E","FAR_W"}, + departure = {}, + station = "Warzenschwein", + title = "Warzenschwein", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(2865,14,1575).lua b/far/nodes/(2865,14,1575).lua new file mode 100644 index 0000000..4b5ce90 --- /dev/null +++ b/far/nodes/(2865,14,1575).lua @@ -0,0 +1,14 @@ +-- far_luaatctrack_spot_check_01.lua + + +--[[ +F.save_train(POS( 2865,14,1575 ), "east") +]] + +F.ttp_stop({ + stn = "Warzenschwein", + doorside = "L", + only_lines = {['FAR'] = true}, + pos = POS( 2865,14,1575 ), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(28834,24,1382).lua b/far/nodes/(28834,24,1382).lua index b23e5ec..5a5e32d 100644 --- a/far/nodes/(28834,24,1382).lua +++ b/far/nodes/(28834,24,1382).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(28834,24,1382) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(28834,24,1382), "west") +]] + +F.ttp_stop({ + stn = "Wildecliff", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(28834,24,1382), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(28850,25,1370).lua b/far/nodes/(28850,25,1370).lua new file mode 100644 index 0000000..416ad56 --- /dev/null +++ b/far/nodes/(28850,25,1370).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Wildecliff", + title = "Wildecliff", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(28850,25,1390).lua b/far/nodes/(28850,25,1390).lua new file mode 100644 index 0000000..a8ce46e --- /dev/null +++ b/far/nodes/(28850,25,1390).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Wildecliff", + title = "Wildecliff", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(28866,24,1378).lua b/far/nodes/(28866,24,1378).lua index 6c5427b..523fd9f 100644 --- a/far/nodes/(28866,24,1378).lua +++ b/far/nodes/(28866,24,1378).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(28866,24,1378) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(28866,24,1378), "east") +]] + +F.ttp_stop({ + stn = "Wildecliff", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(28866,24,1378), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(29459,26,1427).lua b/far/nodes/(29459,26,1427).lua index e915653..1b6f9a1 100644 --- a/far/nodes/(29459,26,1427).lua +++ b/far/nodes/(29459,26,1427).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 29459,26,1427 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 29459,26,1427 ), "east") diff --git a/far/nodes/(29459,26,1433).lua b/far/nodes/(29459,26,1433).lua index c08dcd5..8473313 100644 --- a/far/nodes/(29459,26,1433).lua +++ b/far/nodes/(29459,26,1433).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 29459,26,1433 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 29459,26,1433 ), "west")
\ No newline at end of file diff --git a/far/nodes/(30147,27,1732).lua b/far/nodes/(30147,27,1732).lua index 883c82a..d388be0 100644 --- a/far/nodes/(30147,27,1732).lua +++ b/far/nodes/(30147,27,1732).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 30147,27,1732 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 30147,27,1732 ), "west")
\ No newline at end of file diff --git a/far/nodes/(30150,27,1729).lua b/far/nodes/(30150,27,1729).lua index df2b3cb..d7c6f95 100644 --- a/far/nodes/(30150,27,1729).lua +++ b/far/nodes/(30150,27,1729).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 30150,27,1729 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 30150,27,1729 ), "east")
\ No newline at end of file diff --git a/far/nodes/(30548,25,1613).lua b/far/nodes/(30548,25,1613).lua index a0ba611..bb411a2 100644 --- a/far/nodes/(30548,25,1613).lua +++ b/far/nodes/(30548,25,1613).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 30548,25,1613 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 30548,25,1613 ), "east")
\ No newline at end of file diff --git a/far/nodes/(30551,25,1616).lua b/far/nodes/(30551,25,1616).lua index e5cf0a6..b20feed 100644 --- a/far/nodes/(30551,25,1616).lua +++ b/far/nodes/(30551,25,1616).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 30551,25,1616 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 30551,25,1616 ), "west")
\ No newline at end of file diff --git a/far/nodes/(30676,20,1636).lua b/far/nodes/(30676,20,1636).lua index 440f1a9..22c8a55 100644 --- a/far/nodes/(30676,20,1636).lua +++ b/far/nodes/(30676,20,1636).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 30676,20,1636 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 30676,20,1636 ), "east")
\ No newline at end of file diff --git a/far/nodes/(30676,20,1641).lua b/far/nodes/(30676,20,1641).lua index dfad573..a3756f5 100644 --- a/far/nodes/(30676,20,1641).lua +++ b/far/nodes/(30676,20,1641).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 30676,20,1641 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 30676,20,1641 ), "west")
\ No newline at end of file diff --git a/far/nodes/(30777,15,1712).lua b/far/nodes/(30777,15,1712).lua index 75e9ff9..3ca78f4 100644 --- a/far/nodes/(30777,15,1712).lua +++ b/far/nodes/(30777,15,1712).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 30777,15,1712 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 30777,15,1712 ), "west")
\ No newline at end of file diff --git a/far/nodes/(30785,15,1711).lua b/far/nodes/(30785,15,1711).lua index 668b0c7..4ae2af0 100644 --- a/far/nodes/(30785,15,1711).lua +++ b/far/nodes/(30785,15,1711).lua @@ -2,12 +2,11 @@ local signal_pos = "FareastEndEntrySignal" local last_route = "3" local proposed_route_name = "" -local posTable = POS( 30785,15,1711 ) if event.type == "train" then if not atc_id then return end - F.save_train(posTable) + F.save_train(POS( 30785,15,1711 ), "east") if atc_arrow then atc_send("B0") @@ -18,7 +17,7 @@ if event.type == "train" then if can_set_route(signal_pos, proposed_route_name) then set_route(signal_pos, proposed_route_name) -- F.print("Train ID " .. atc_id .. " going on " .. proposed_route_name) - atc_send("SM") + atc_send("B8S8") end end end diff --git a/far/nodes/(30828,16,1858).lua b/far/nodes/(30828,16,1858).lua index 2f245be..9afe08f 100644 --- a/far/nodes/(30828,16,1858).lua +++ b/far/nodes/(30828,16,1858).lua @@ -1,6 +1,6 @@ if event.type == "punch" then --- F.delete_train_info("240661") +-- F.delete_train_info("547028") -- F.slow_train_down("010765") -- F.slow_train_down("164132") diff --git a/far/nodes/(30834,16,1863).lua b/far/nodes/(30834,16,1863).lua deleted file mode 100644 index f19117f..0000000 --- a/far/nodes/(30834,16,1863).lua +++ /dev/null @@ -1,33 +0,0 @@ --- far_luaatctrack_farcom_op_01.lua - - -if event.type == "punch" then --- F.delete_train_info("298909") - S.stop_display = true - - F.send_update_displays() - - if S.stop_display then - date = F.date_formatted() - time = F.time_formatted() - digiline_send("time", " FAR COM\n\n " .. date .. "\n " .. time) - F.list_trains(true) - else - local pos = POS(30848,15,1852) - interrupt_pos(pos, "display") - end - - return -end - -if event.type == "digiline" then - if event.channel == "display" then - if event.msg == "update" then - date = F.date_formatted() - time = F.time_formatted() - digiline_send("time", " FAR COM\n\n " .. date .. "\n " .. time) - F.list_trains(false) - end - end - return -end diff --git a/far/nodes/(30836,16,1863).lua b/far/nodes/(30836,16,1863).lua deleted file mode 100644 index d478fb1..0000000 --- a/far/nodes/(30836,16,1863).lua +++ /dev/null @@ -1,13 +0,0 @@ - -if event.type == "punch" then --- F.delete_train_info("240661") - --- F.slow_train_down("010765") --- F.slow_train_down("264353") --- F.slow_train_down("403053") --- F.slow_train_down("428934") - - F.clear_main_depot_displays() - F.print("Cleared displays at FARCOM") - return -end
\ No newline at end of file diff --git a/far/nodes/(30848,15,1852).lua b/far/nodes/(30848,15,1852).lua index 0f5348e..70a18bb 100644 --- a/far/nodes/(30848,15,1852).lua +++ b/far/nodes/(30848,15,1852).lua @@ -1,8 +1,7 @@ -- far_luaatctrack_spot_check_01.lua if event.type == "train" then - local posTable = POS(30848,15,1852) - F.save_train(posTable) + F.save_train(POS(30848,15,1852), "west") digiline_send("display", "update") return end diff --git a/far/nodes/(30851,19,1800).lua b/far/nodes/(30851,19,1800).lua new file mode 100644 index 0000000..89bee96 --- /dev/null +++ b/far/nodes/(30851,19,1800).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Fareast End", + title = "Fareast End", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(30856,15,1814).lua b/far/nodes/(30856,15,1814).lua index 04c43dc..919a0cc 100644 --- a/far/nodes/(30856,15,1814).lua +++ b/far/nodes/(30856,15,1814).lua @@ -1,8 +1,18 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(30856,15,1814) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(30856,15,1814), "east") +]] + +F.ttp_begin({ + stn = "Fareast End", -- station name + tt = "FAR_W", -- timetable ID + depint = "8;00", --departure slot interval + depoff = "00;00", --departure slot offset + doorside = "R", + reverse = false, + only_lines = {['FAR'] = true}, + force_tt_reset = false, + pos = POS(30856,15,1814), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(30858,19,1793).lua b/far/nodes/(30858,19,1793).lua new file mode 100644 index 0000000..89bee96 --- /dev/null +++ b/far/nodes/(30858,19,1793).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Fareast End", + title = "Fareast End", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(30863,15,1807).lua b/far/nodes/(30863,15,1807).lua index ce3a9c4..f42aa48 100644 --- a/far/nodes/(30863,15,1807).lua +++ b/far/nodes/(30863,15,1807).lua @@ -1,8 +1,18 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(30863,15,1807) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(30863,15,1807), "east") +]] + +F.ttp_begin({ + stn = "Fareast End", -- station name + tt = "FAR_W", -- timetable ID + depint = "8;00", --departure slot interval + depoff = "00;00", --departure slot offset + doorside = "R", + reverse = false, + only_lines = {['FAR'] = true}, + force_tt_reset = false, + pos = POS(30863,15,1807), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(30866,19,1785).lua b/far/nodes/(30866,19,1785).lua new file mode 100644 index 0000000..89bee96 --- /dev/null +++ b/far/nodes/(30866,19,1785).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Fareast End", + title = "Fareast End", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(30870,15,1800).lua b/far/nodes/(30870,15,1800).lua index b50e6aa..273875d 100644 --- a/far/nodes/(30870,15,1800).lua +++ b/far/nodes/(30870,15,1800).lua @@ -1,8 +1,18 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(30870,15,1800) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(30870,15,1800), "east") +]] + +F.ttp_begin({ + stn = "Fareast End", -- station name + tt = "FAR_W", -- timetable ID + depint = "8;00", --departure slot interval + depoff = "00;00", --departure slot offset + doorside = "R", + reverse = false, + only_lines = {['FAR'] = true}, + force_tt_reset = false, + pos = POS(30870,15,1800), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(30919,13,1812).lua b/far/nodes/(30919,13,1812).lua deleted file mode 100644 index 392f2a6..0000000 --- a/far/nodes/(30919,13,1812).lua +++ /dev/null @@ -1,10 +0,0 @@ -if event.type == "ext_int" then - if event.message == "display" then - S.datetime = os.date("%Y-%m-%d %H:%M:%S") - digiline_send("time", " \n " .. S.datetime) - F.list_trains(true) - F.print("INSIDE A LUA TRACK: " .. S.datetime) - end - return -end - diff --git a/far/nodes/(30919,13,1814).lua b/far/nodes/(30919,13,1814).lua deleted file mode 100644 index 738d0c0..0000000 --- a/far/nodes/(30919,13,1814).lua +++ /dev/null @@ -1,27 +0,0 @@ --- far_luaatctrack_farcom_op_01.lua - - -if event.type == "punch" then --- F.delete_train_info("298909") - digiline_send("time", " \nUPDATE") - - S.datetime = os.date("%Y-%m-%d %H:%M:%S") - digiline_send("time", " \n " .. S.datetime) - F.list_trains(false) --- local pos = POS(30919,13,1812) --- interrupt_pos(pos, "display") --- interrupt(1, "farcom_display") - return -end - - ---[[ - -if event.iid == "farcom_display" then - local pos = POS(30919,13,1812) - interrupt_pos(pos, "display") - - interrupt(30, "farcom_display") - return -end -]]
\ No newline at end of file diff --git a/far/nodes/(30919,13,1815).lua b/far/nodes/(30919,13,1815).lua deleted file mode 100644 index 5624662..0000000 --- a/far/nodes/(30919,13,1815).lua +++ /dev/null @@ -1,12 +0,0 @@ - -local show_print = false -if event.type == "punch" then - - F.slow_train_down("010765") --- F.slow_train_down("403053") --- F.slow_train_down("428934") - - F.clear_main_depot_displays() - F.print("Cleared displays at FARCOM") - return -end
\ No newline at end of file diff --git a/far/nodes/(3161,16,1586).lua b/far/nodes/(3161,16,1586).lua index cbf0ef6..6e2ce09 100644 --- a/far/nodes/(3161,16,1586).lua +++ b/far/nodes/(3161,16,1586).lua @@ -1,7 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -if event.train then - local posTable = POS( 3161,16,1586 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 3161,16,1586 ), "east") diff --git a/far/nodes/(3161,16,1592).lua b/far/nodes/(3161,16,1592).lua index 3962ceb..fad484e 100644 --- a/far/nodes/(3161,16,1592).lua +++ b/far/nodes/(3161,16,1592).lua @@ -1,7 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -if event.train then - local posTable = POS( 3161,16,1592 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 3161,16,1592 ), "west")
\ No newline at end of file diff --git a/far/nodes/(3695,10,1715).lua b/far/nodes/(3695,10,1715).lua index 2eec319..d6885e6 100644 --- a/far/nodes/(3695,10,1715).lua +++ b/far/nodes/(3695,10,1715).lua @@ -1,7 +1,4 @@ -- 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 + +F.save_train(POS( 3695,10,1715 ), "east") diff --git a/far/nodes/(3695,10,1719).lua b/far/nodes/(3695,10,1719).lua index 657a65a..c311cfb 100644 --- a/far/nodes/(3695,10,1719).lua +++ b/far/nodes/(3695,10,1719).lua @@ -1,7 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -if event.train then - local posTable = POS( 3695,10,1719 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 3695,10,1719 ), "west")
\ No newline at end of file diff --git a/far/nodes/(3773,10,1715).lua b/far/nodes/(3773,10,1715).lua index 3c13feb..249125c 100644 --- a/far/nodes/(3773,10,1715).lua +++ b/far/nodes/(3773,10,1715).lua @@ -1,7 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -if event.train then - local posTable = POS( 3773,10,1715 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 3773,10,1715 ), "east")
\ No newline at end of file diff --git a/far/nodes/(3773,10,1719).lua b/far/nodes/(3773,10,1719).lua index 50be201..090896f 100644 --- a/far/nodes/(3773,10,1719).lua +++ b/far/nodes/(3773,10,1719).lua @@ -1,7 +1,4 @@ -- far_luaatctrack_spot_check_01.lua -if event.train then - local posTable = POS( 3773,10,1719 ) - F.save_train(posTable) - return -end
\ No newline at end of file + +F.save_train(POS( 3773,10,1719 ), "west") diff --git a/far/nodes/(3847,10,1715).lua b/far/nodes/(3847,10,1715).lua index 274d03f..155649c 100644 --- a/far/nodes/(3847,10,1715).lua +++ b/far/nodes/(3847,10,1715).lua @@ -1,7 +1,4 @@ -- far_luaatctrack_spot_check_01.lua -if event.train then - local posTable = POS( 3847,10,1715 ) - F.save_train(posTable) - return -end
\ No newline at end of file + +F.save_train(POS( 3847,10,1715 ), "east") diff --git a/far/nodes/(3847,10,1719).lua b/far/nodes/(3847,10,1719).lua index 274d03f..439f83d 100644 --- a/far/nodes/(3847,10,1719).lua +++ b/far/nodes/(3847,10,1719).lua @@ -1,7 +1,4 @@ -- far_luaatctrack_spot_check_01.lua -if event.train then - local posTable = POS( 3847,10,1715 ) - F.save_train(posTable) - return -end
\ No newline at end of file + +F.save_train(POS( 3847,10,1715 ), "west") diff --git a/far/nodes/(3972,13,1765).lua b/far/nodes/(3972,13,1765).lua new file mode 100644 index 0000000..bb2f202 --- /dev/null +++ b/far/nodes/(3972,13,1765).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Little Lake", + title = "Little Lake", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(3978,8,1756).lua b/far/nodes/(3978,8,1756).lua index e9059d7..d421275 100644 --- a/far/nodes/(3978,8,1756).lua +++ b/far/nodes/(3978,8,1756).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(3978,8,1756) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(3978,8,1756), "west") +]] + +F.ttp_stop({ + stn = "Little Lake (FAR)", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(3978,8,1756), + direction = "west", +}) diff --git a/far/nodes/(3983,8,1774).lua b/far/nodes/(3983,8,1774).lua index 41ef5de..e039644 100644 --- a/far/nodes/(3983,8,1774).lua +++ b/far/nodes/(3983,8,1774).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(3983,8,1774) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS(3983,8,1774), "east") + +--[[ +F.ttp_stop({ + stn = "Little Lake (FAR)", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(3983,8,1774), + direction = "east", +}) +]] diff --git a/far/nodes/(3989,13,1765).lua b/far/nodes/(3989,13,1765).lua new file mode 100644 index 0000000..5226451 --- /dev/null +++ b/far/nodes/(3989,13,1765).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Little Lake", + title = "Little Lake", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(4162,16,1866).lua b/far/nodes/(4162,16,1866).lua index 9421349..949aba1 100644 --- a/far/nodes/(4162,16,1866).lua +++ b/far/nodes/(4162,16,1866).lua @@ -1,8 +1,4 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(4162,16,1866) - F.save_train(posTable) - return -end
\ No newline at end of file + +F.save_train(POS(4162,16,1866), "east") diff --git a/far/nodes/(4162,16,1870).lua b/far/nodes/(4162,16,1870).lua index e14be3e..421cbaf 100644 --- a/far/nodes/(4162,16,1870).lua +++ b/far/nodes/(4162,16,1870).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(4162,16,1870) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS(4162,16,1870), "west") diff --git a/far/nodes/(4364,-2,1953).lua b/far/nodes/(4364,-2,1953).lua index 3c25727..9f749ec 100644 --- a/far/nodes/(4364,-2,1953).lua +++ b/far/nodes/(4364,-2,1953).lua @@ -1,7 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -if event.train then - local posTable = POS( 4364,-2,1953 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 4364,-2,1953 ), "west") diff --git a/far/nodes/(4368,-2,1952).lua b/far/nodes/(4368,-2,1952).lua index 80d9c20..2fa07fa 100644 --- a/far/nodes/(4368,-2,1952).lua +++ b/far/nodes/(4368,-2,1952).lua @@ -1,7 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -if event.train then - local posTable = POS( 4368,-2,1952 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 4368,-2,1952 ), "east") diff --git a/far/nodes/(4423,-2,2054).lua b/far/nodes/(4423,-2,2054).lua index 46397c1..6a5a3ea 100644 --- a/far/nodes/(4423,-2,2054).lua +++ b/far/nodes/(4423,-2,2054).lua @@ -1,7 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -if event.train then - local posTable = POS( 4423,-2,2054 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 4423,-2,2054 ), "west") diff --git a/far/nodes/(4426,-2,2052).lua b/far/nodes/(4426,-2,2052).lua index a752812..7fc1a96 100644 --- a/far/nodes/(4426,-2,2052).lua +++ b/far/nodes/(4426,-2,2052).lua @@ -1,7 +1,4 @@ -- far_luaatctrack_spot_check_01.lua -if event.train then - local posTable = POS( 4426,-2,2052 ) - F.save_train(posTable) - return -end
\ No newline at end of file + +F.save_train(POS( 4426,-2,2052 ), "east") diff --git a/far/nodes/(4579,7,2162).lua b/far/nodes/(4579,7,2162).lua new file mode 100644 index 0000000..211e329 --- /dev/null +++ b/far/nodes/(4579,7,2162).lua @@ -0,0 +1,14 @@ +-- far_luaatctrack_spot_check_01.lua + +--[[ +F.save_train(POS(4579,7,2162), "west") +]] + + +F.ttp_stop({ + stn = "Morija North", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(4579,7,2162), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(4586,7,2162).lua b/far/nodes/(4586,7,2162).lua deleted file mode 100644 index 25dcde7..0000000 --- a/far/nodes/(4586,7,2162).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(4586,7,2162) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(4602,10,2133).lua b/far/nodes/(4602,10,2133).lua new file mode 100644 index 0000000..8e06ef7 --- /dev/null +++ b/far/nodes/(4602,10,2133).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Morija North", + title = "Morija North", + interval = 30, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(4602,10,2166).lua b/far/nodes/(4602,10,2166).lua new file mode 100644 index 0000000..159ae02 --- /dev/null +++ b/far/nodes/(4602,10,2166).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Morija North", + title = "Morija North", + interval = 30, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(4614,7,2137).lua b/far/nodes/(4614,7,2137).lua deleted file mode 100644 index ea184ff..0000000 --- a/far/nodes/(4614,7,2137).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(4614,7,2137) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(4622,7,2137).lua b/far/nodes/(4622,7,2137).lua new file mode 100644 index 0000000..fa1e5e0 --- /dev/null +++ b/far/nodes/(4622,7,2137).lua @@ -0,0 +1,13 @@ +-- far_luaatctrack_spot_check_01.lua + +--[[ +F.save_train(POS(4622,7,2137), "east") +]] + +F.ttp_stop({ + stn = "Morija North", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(4622,7,2137), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(4725,11,2214).lua b/far/nodes/(4725,11,2214).lua deleted file mode 100644 index ca726c1..0000000 --- a/far/nodes/(4725,11,2214).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(4725,11,2214) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(4728,11,2211).lua b/far/nodes/(4728,11,2211).lua deleted file mode 100644 index bc2d604..0000000 --- a/far/nodes/(4728,11,2211).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(4728,11,2211) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(4831,12,2223).lua b/far/nodes/(4831,12,2223).lua index 163d6b7..2102e1b 100644 --- a/far/nodes/(4831,12,2223).lua +++ b/far/nodes/(4831,12,2223).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(4831,12,2223) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS(4831,12,2223), "west") diff --git a/far/nodes/(4835,7,2210).lua b/far/nodes/(4835,7,2210).lua index d11d3f7..3683318 100644 --- a/far/nodes/(4835,7,2210).lua +++ b/far/nodes/(4835,7,2210).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(4835,7,2210) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS(4835,7,2210), "east") diff --git a/far/nodes/(4839,7,2222).lua b/far/nodes/(4839,7,2222).lua deleted file mode 100644 index ea0ca9a..0000000 --- a/far/nodes/(4839,7,2222).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(4839,7,2222) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(4839,7,2226).lua b/far/nodes/(4839,7,2226).lua deleted file mode 100644 index 37eee58..0000000 --- a/far/nodes/(4839,7,2226).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(4839,7,2226) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(5326,32,2311).lua b/far/nodes/(5326,32,2311).lua new file mode 100644 index 0000000..66c932f --- /dev/null +++ b/far/nodes/(5326,32,2311).lua @@ -0,0 +1,3 @@ +-- far_luaatctrack_spot_check_01.lua + +F.save_train(POS(5326,32,2311), "east") diff --git a/far/nodes/(5326,32,2314).lua b/far/nodes/(5326,32,2314).lua index fe2fee9..55a3267 100644 --- a/far/nodes/(5326,32,2314).lua +++ b/far/nodes/(5326,32,2314).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(5326,32,2314) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS(5326,32,2314), "east") diff --git a/far/nodes/(5326,32,2318).lua b/far/nodes/(5326,32,2318).lua index f16da09..a1c4ed8 100644 --- a/far/nodes/(5326,32,2318).lua +++ b/far/nodes/(5326,32,2318).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(5326,32,2318) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS(5326,32,2318), "west") diff --git a/far/nodes/(5326,32,2321).lua b/far/nodes/(5326,32,2321).lua new file mode 100644 index 0000000..8a91c1c --- /dev/null +++ b/far/nodes/(5326,32,2321).lua @@ -0,0 +1,3 @@ +-- far_luaatctrack_spot_check_01.lua + +F.save_train(POS(5326,32,2321), "west") diff --git a/far/nodes/(5409,33,2336).lua b/far/nodes/(5409,33,2336).lua new file mode 100644 index 0000000..45fd236 --- /dev/null +++ b/far/nodes/(5409,33,2336).lua @@ -0,0 +1,3 @@ +-- far_luaatctrack_spot_check_01.lua + +F.save_train(POS(5409,33,2336), "west") diff --git a/far/nodes/(5409,33,2339).lua b/far/nodes/(5409,33,2339).lua new file mode 100644 index 0000000..25280d4 --- /dev/null +++ b/far/nodes/(5409,33,2339).lua @@ -0,0 +1,3 @@ +-- far_luaatctrack_spot_check_01.lua + +F.save_train(POS(5409,33,2339), "west") diff --git a/far/nodes/(5434,33,2329).lua b/far/nodes/(5434,33,2329).lua new file mode 100644 index 0000000..d550a23 --- /dev/null +++ b/far/nodes/(5434,33,2329).lua @@ -0,0 +1,3 @@ +-- far_luaatctrack_spot_check_01.lua + +F.save_train(POS(5434,33,2329), "east") diff --git a/far/nodes/(5434,33,2332).lua b/far/nodes/(5434,33,2332).lua new file mode 100644 index 0000000..7cf6feb --- /dev/null +++ b/far/nodes/(5434,33,2332).lua @@ -0,0 +1,3 @@ +-- far_luaatctrack_spot_check_01.lua + +F.save_train(POS(5434,33,2332), "east") diff --git a/far/nodes/(5856,21,2306).lua b/far/nodes/(5856,21,2306).lua deleted file mode 100644 index 72eeb79..0000000 --- a/far/nodes/(5856,21,2306).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(5856,21,2306) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(5856,21,2314).lua b/far/nodes/(5856,21,2314).lua new file mode 100644 index 0000000..16b02a4 --- /dev/null +++ b/far/nodes/(5856,21,2314).lua @@ -0,0 +1,3 @@ +-- far_luaatctrack_spot_check_01.lua + +F.save_train(POS(5856,21,2314), "west") diff --git a/far/nodes/(5856,21,2315).lua b/far/nodes/(5856,21,2315).lua deleted file mode 100644 index 60a9817..0000000 --- a/far/nodes/(5856,21,2315).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(5856,21,2315) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(5856,21,2317).lua b/far/nodes/(5856,21,2317).lua deleted file mode 100644 index fc0cc91..0000000 --- a/far/nodes/(5856,21,2317).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(5856,21,2317) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(5857,21,2308).lua b/far/nodes/(5857,21,2308).lua index c7ec3fa..b8d18e4 100644 --- a/far/nodes/(5857,21,2308).lua +++ b/far/nodes/(5857,21,2308).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(5857,21,2308) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS(5857,21,2308), "east") diff --git a/far/nodes/(6173,24,2309).lua b/far/nodes/(6173,24,2309).lua index e9c58b6..1407989 100644 --- a/far/nodes/(6173,24,2309).lua +++ b/far/nodes/(6173,24,2309).lua @@ -1,8 +1,4 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(6173,25,2309) - F.save_train(posTable) - return -end
\ No newline at end of file + +F.save_train(POS(6173,25,2309), "east") diff --git a/far/nodes/(6173,24,2314).lua b/far/nodes/(6173,24,2314).lua index 2c43ca9..ef62f70 100644 --- a/far/nodes/(6173,24,2314).lua +++ b/far/nodes/(6173,24,2314).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(6173,25,2314) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS(6173,25,2314), "west") diff --git a/far/nodes/(6173,25,2302).lua b/far/nodes/(6173,25,2302).lua deleted file mode 100644 index 690af51..0000000 --- a/far/nodes/(6173,25,2302).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(6173,25,2302) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(6173,25,2312).lua b/far/nodes/(6173,25,2312).lua deleted file mode 100644 index ab08a5c..0000000 --- a/far/nodes/(6173,25,2312).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(6173,25,2312) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(6575,10,2347).lua b/far/nodes/(6575,10,2347).lua index 3f71a74..f9695cc 100644 --- a/far/nodes/(6575,10,2347).lua +++ b/far/nodes/(6575,10,2347).lua @@ -1,8 +1,4 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(6575,10,2347) - F.save_train(posTable) - return -end
\ No newline at end of file + +F.save_train(POS(6575,10,2347), "east") diff --git a/far/nodes/(6575,10,2351).lua b/far/nodes/(6575,10,2351).lua index 9b82d8f..6a035e3 100644 --- a/far/nodes/(6575,10,2351).lua +++ b/far/nodes/(6575,10,2351).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(6575,10,2351) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS(6575,10,2351), "west") diff --git a/far/nodes/(6865,28,2186).lua b/far/nodes/(6865,28,2186).lua new file mode 100644 index 0000000..b1be5a7 --- /dev/null +++ b/far/nodes/(6865,28,2186).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Krapol", + title = "Krapol", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(6872,28,2179).lua b/far/nodes/(6872,28,2179).lua new file mode 100644 index 0000000..b1be5a7 --- /dev/null +++ b/far/nodes/(6872,28,2179).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Krapol", + title = "Krapol", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(6874,23,2199).lua b/far/nodes/(6874,23,2199).lua index a108f44..9964e46 100644 --- a/far/nodes/(6874,23,2199).lua +++ b/far/nodes/(6874,23,2199).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(6874,23,2199) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(6874,23,2199), "west") +]] + +F.ttp_stop({ + stn = "Krapol", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(6874,23,2199), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(6885,27,2202).lua b/far/nodes/(6885,27,2202).lua new file mode 100644 index 0000000..6674304 --- /dev/null +++ b/far/nodes/(6885,27,2202).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Krapol", + title = "Krapol", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(6888,27,2199).lua b/far/nodes/(6888,27,2199).lua new file mode 100644 index 0000000..6674304 --- /dev/null +++ b/far/nodes/(6888,27,2199).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Krapol", + title = "Krapol", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(6890,23,2175).lua b/far/nodes/(6890,23,2175).lua index dbdaa99..b9f100d 100644 --- a/far/nodes/(6890,23,2175).lua +++ b/far/nodes/(6890,23,2175).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(6890,23,2175) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(6890,23,2175), "east") +]] + +F.ttp_stop({ + stn = "Krapol", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(6890,23,2175), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(7288,5,1987).lua b/far/nodes/(7288,5,1987).lua deleted file mode 100644 index 07f806b..0000000 --- a/far/nodes/(7288,5,1987).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(7288,5,1987) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(7288,5,1991).lua b/far/nodes/(7288,5,1991).lua deleted file mode 100644 index 50c0fac..0000000 --- a/far/nodes/(7288,5,1991).lua +++ /dev/null @@ -1,8 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -local show_print = false -if event.train then - local posTable = POS(7288,5,1991) - F.save_train(posTable) - return -end
\ No newline at end of file diff --git a/far/nodes/(7321,8,1987).lua b/far/nodes/(7321,8,1987).lua index f373ca9..46805a5 100644 --- a/far/nodes/(7321,8,1987).lua +++ b/far/nodes/(7321,8,1987).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(7321,8,1987) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS(7321,8,1987), "east") diff --git a/far/nodes/(7321,8,1991).lua b/far/nodes/(7321,8,1991).lua index 02b2115..821b79e 100644 --- a/far/nodes/(7321,8,1991).lua +++ b/far/nodes/(7321,8,1991).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(7321,8,1991) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS(7321,8,1991), "west") diff --git a/far/nodes/(7795,11,1987).lua b/far/nodes/(7795,11,1987).lua index 28aa696..87dcbe7 100644 --- a/far/nodes/(7795,11,1987).lua +++ b/far/nodes/(7795,11,1987).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 7795,11,1987 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 7795,11,1987 ), "east") diff --git a/far/nodes/(7795,11,1991).lua b/far/nodes/(7795,11,1991).lua index 507ad82..98f02e0 100644 --- a/far/nodes/(7795,11,1991).lua +++ b/far/nodes/(7795,11,1991).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 7795,11,1991 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 7795,11,1991 ), "west") diff --git a/far/nodes/(8242,6,2060).lua b/far/nodes/(8242,6,2060).lua index d1636fa..67d306c 100644 --- a/far/nodes/(8242,6,2060).lua +++ b/far/nodes/(8242,6,2060).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 8242,6,2060 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 8242,6,2060 ), "east") diff --git a/far/nodes/(8242,6,2064).lua b/far/nodes/(8242,6,2064).lua index 8dc8759..16767f7 100644 --- a/far/nodes/(8242,6,2064).lua +++ b/far/nodes/(8242,6,2064).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 8242,6,2064 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 8242,6,2064 ), "west") diff --git a/far/nodes/(8534,11,1789).lua b/far/nodes/(8534,11,1789).lua index 17d7aa0..b7e9594 100644 --- a/far/nodes/(8534,11,1789).lua +++ b/far/nodes/(8534,11,1789).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(8534,11,1789) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(8534,11,1789), "west") +]] + +F.ttp_stop({ + stn = "Klaraj Fontoj", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(8534,11,1789), + direction = "west", +})
\ No newline at end of file diff --git a/far/nodes/(8540,14,1766).lua b/far/nodes/(8540,14,1766).lua new file mode 100644 index 0000000..d289d87 --- /dev/null +++ b/far/nodes/(8540,14,1766).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_E"}, + departure = {}, + station = "Klaraj Fontoj", + title = "Klaraj Fontoj", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(8553,14,1779).lua b/far/nodes/(8553,14,1779).lua new file mode 100644 index 0000000..2a087c2 --- /dev/null +++ b/far/nodes/(8553,14,1779).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + departure = {}, + station = "Klaraj Fontoj", + title = "Klaraj Fontoj", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(8558,11,1758).lua b/far/nodes/(8558,11,1758).lua index ba5264c..41625ac 100644 --- a/far/nodes/(8558,11,1758).lua +++ b/far/nodes/(8558,11,1758).lua @@ -1,8 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS(8558,11,1758) - F.save_train(posTable) - return -end
\ No newline at end of file +--[[ +F.save_train(POS(8558,11,1758), "east") +]] + +F.ttp_stop({ + stn = "Klaraj Fontoj", + doorside = "R", + only_lines = {['FAR'] = true}, + pos = POS(8558,11,1758), + direction = "east", +})
\ No newline at end of file diff --git a/far/nodes/(8630,14,1686).lua b/far/nodes/(8630,14,1686).lua index 50c7834..a42c2dd 100644 --- a/far/nodes/(8630,14,1686).lua +++ b/far/nodes/(8630,14,1686).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 8630,14,1686 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 8630,14,1686 ), "east") diff --git a/far/nodes/(8633,14,1688).lua b/far/nodes/(8633,14,1688).lua index bafbb3a..ecfa641 100644 --- a/far/nodes/(8633,14,1688).lua +++ b/far/nodes/(8633,14,1688).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 8633,14,1688 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 8633,14,1688 ), "west") diff --git a/far/nodes/(8783,18,1304).lua b/far/nodes/(8783,18,1304).lua index 882c2be..bbfe635 100644 --- a/far/nodes/(8783,18,1304).lua +++ b/far/nodes/(8783,18,1304).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 8783,18,1304 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 8783,18,1304 ), "east") diff --git a/far/nodes/(8787,18,1307).lua b/far/nodes/(8787,18,1307).lua index b95567a..640d3fc 100644 --- a/far/nodes/(8787,18,1307).lua +++ b/far/nodes/(8787,18,1307).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 8787,18,1307 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 8787,18,1307 ), "west") diff --git a/far/nodes/(9076,26,963).lua b/far/nodes/(9076,26,963).lua index 70ebbb9..3d1fd1e 100644 --- a/far/nodes/(9076,26,963).lua +++ b/far/nodes/(9076,26,963).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 9076,26,963 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 9076,26,963 ), "east") diff --git a/far/nodes/(9080,26,966).lua b/far/nodes/(9080,26,966).lua index a75f21b..b638786 100644 --- a/far/nodes/(9080,26,966).lua +++ b/far/nodes/(9080,26,966).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 9080,26,966 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 9080,26,966 ), "west") diff --git a/far/nodes/(9603,7,761).lua b/far/nodes/(9603,7,761).lua index 51652bf..0634c56 100644 --- a/far/nodes/(9603,7,761).lua +++ b/far/nodes/(9603,7,761).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 9603,7,761 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 9603,7,761 ), "east") diff --git a/far/nodes/(9603,7,765).lua b/far/nodes/(9603,7,765).lua index 51652bf..d9f3bf2 100644 --- a/far/nodes/(9603,7,765).lua +++ b/far/nodes/(9603,7,765).lua @@ -1,8 +1,3 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false -if event.train then - local posTable = POS( 9603,7,761 ) - F.save_train(posTable) - return -end
\ No newline at end of file +F.save_train(POS( 9603,7,761 ), "west") diff --git a/il_timetable/init_code.lua b/il_timetable/init_code.lua index 322b0a4..c28ae86 100644 --- a/il_timetable/init_code.lua +++ b/il_timetable/init_code.lua @@ -150,8 +150,8 @@ local STOP_TIME = 10 local STOPCMD="B0WO" local DEPCMD="A1OCD1SM" local RDEPCMD="RA1OCD1SM" -local DYNAMIC_THR = 10 -local DYNAMIC_EN = false +local DYNAMIC_THR = 15 +local DYNAMIC_EN = true if not S.ttp then S.ttp = {} end if not S.ttt then S.ttt = {} end @@ -236,6 +236,16 @@ F.ttp={ inside_line_desc = "E16 to Personhood", stn_display = "E16 Personhood ", }, + KVE_N = { + outside_text = "[KVE] Kangasvarkaa Express\n->Kangasvarkaan Rata", + inside_line_desc = "KVE to Kangasvarkaa", + stn_display = "KVE Kangasvarkaa", + }, + KVE_S = { + outside_text = "[KVE] Kangasvarkaa Express\n->Spawn Main Station", + inside_line_desc = "KVE to Spawn Main Station", + stn_display = "KVE Spawn Main ", + }, } --[[ @@ -309,8 +319,8 @@ function F.ttp_begin(p) tti.recording_train = nil end atc_set_text_outside(F.ttp[p.tt].outside_text) - atc_set_text_inside(p.stn.."\nAa: " - ..rwt.to_string(time_now, true).." Da: " + atc_set_text_inside(p.stn.."\nArr: " + ..rwt.to_string(time_now, true).." Dep: " ..rwt.to_string(next_dep_time, true)) end if event.schedule then @@ -319,7 +329,7 @@ function F.ttp_begin(p) S.ttt[atc_id].actual_dep = rwt.now() local delay = rwt.diff(S.ttt[atc_id].desired_dep, S.ttt[atc_id].actual_dep) atc_set_text_inside(F.ttp[p.tt].inside_line_desc - .."\nDelay:"..rwt.to_string(delay, true)) + .."\nDelay: "..rwt.to_string(delay, true)) S.ttt[atc_id].last_delay = delay end if p.reverse then @@ -411,9 +421,9 @@ F.ttp_stop({ -- don't depart before the planned departure time next_dep_time = trn.desired_dep end - atc_set_text_inside(p.stn.."\nAa " - ..rwt.to_string(time_now, true).." Dd" - ..rwt.to_string(trn.desired_dep, true).." Da" + atc_set_text_inside(p.stn.."\nArr: " + ..rwt.to_string(time_now, true).." Plan: " + ..rwt.to_string(trn.desired_dep, true).." Dep: " ..rwt.to_string(next_dep_time, true)) local delay = rwt.diff(trn.desired_dep, next_dep_time) @@ -442,7 +452,7 @@ F.ttp_stop({ trn.actual_dep = rwt.now() local delay = rwt.diff(trn.desired_dep or trn.actual_dep, trn.actual_dep) atc_set_text_inside(F.ttp[tt].inside_line_desc - .."\nDelay:"..rwt.to_string(delay, true)) + .."\nDelay: "..rwt.to_string(delay, true)) S.ttt[atc_id].last_delay = delay atc_send(DEPCMD) if p.end_of_tt and p.end_of_tt[tt] then @@ -507,7 +517,8 @@ end interval = 30, display1 = "d1", display2 = "d2", - display3 = "d3" + display3 = "d3", + show_trainid = false, }]] function F.ttp_station_display(p) --L425 @@ -522,7 +533,9 @@ local function is_past_station(tstn, stnorder) end local function add_train(deptime, line, train, tid) local tent = {dep = deptime, text = - rwt.to_string(deptime,true).." "..F.ttp[line].stn_display + rwt.to_string(deptime,true) + .." "..(p.show_trainid and tid.." " or "") + ..F.ttp[line].stn_display .." +"..train.last_delay} for i,ntrn in ipairs(next_trains) do if rwt.diff(ntrn.dep, deptime)<0 then diff --git a/il_timetable/nodes/(-1725,-1,-4420).lua b/il_timetable/nodes/(-1725,-1,-4420).lua deleted file mode 100644 index 2a9ff56..0000000 --- a/il_timetable/nodes/(-1725,-1,-4420).lua +++ /dev/null @@ -1,3 +0,0 @@ -if event.train and get_line() == "E1" then - atc_send("B1") -end
\ No newline at end of file diff --git a/il_timetable/nodes/(-1728,10,-4324).lua b/il_timetable/nodes/(-1728,10,-4324).lua deleted file mode 100644 index b364ebd..0000000 --- a/il_timetable/nodes/(-1728,10,-4324).lua +++ /dev/null @@ -1,4 +0,0 @@ -F.ttp_stop({ - stn = "Town of Abyss", - doorside = "R", -})
\ No newline at end of file diff --git a/il_timetable/nodes/(-1728,7,-4381).lua b/il_timetable/nodes/(-1728,7,-4381).lua deleted file mode 100644 index b364ebd..0000000 --- a/il_timetable/nodes/(-1728,7,-4381).lua +++ /dev/null @@ -1,4 +0,0 @@ -F.ttp_stop({ - stn = "Town of Abyss", - doorside = "R", -})
\ No newline at end of file diff --git a/il_timetable/nodes/(-1731,7,-4402).lua b/il_timetable/nodes/(-1731,7,-4402).lua deleted file mode 100644 index c9dae37..0000000 --- a/il_timetable/nodes/(-1731,7,-4402).lua +++ /dev/null @@ -1,14 +0,0 @@ -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 -F.ttp_stop({ - stn = "Town of Abyss", - doorside = "R", -})
\ No newline at end of file diff --git a/il_timetable/nodes/(-1735,-1,-4398).lua b/il_timetable/nodes/(-1735,-1,-4398).lua deleted file mode 100644 index 2e1f620..0000000 --- a/il_timetable/nodes/(-1735,-1,-4398).lua +++ /dev/null @@ -1 +0,0 @@ --- You forgot to change the env from ers so I did it for you. you had it as ers. It was blank as well. - erstazi
\ No newline at end of file diff --git a/il_timetable/nodes/(-1921,13,-4541).lua b/il_timetable/nodes/(-1921,13,-4541).lua index 921af94..b752e61 100644 --- a/il_timetable/nodes/(-1921,13,-4541).lua +++ b/il_timetable/nodes/(-1921,13,-4541).lua @@ -1,2 +1,2 @@ -- reset timetable for this train -S.ttt[atc_id] = nil
\ No newline at end of file +S.ttt[atc_id] = nil diff --git a/il_timetable/nodes/(-1937,21,-4581).lua b/il_timetable/nodes/(-1937,21,-4581).lua index 007736b..fcdffda 100644 --- a/il_timetable/nodes/(-1937,21,-4581).lua +++ b/il_timetable/nodes/(-1937,21,-4581).lua @@ -8,5 +8,6 @@ F.ttp_station_display({ -- interval = 15, display1 = "d1", -- display2 = "d2", + --show_trainid = true, }) end
\ No newline at end of file diff --git a/il_timetable/nodes/(-2091,9,-4569).lua b/il_timetable/nodes/(-2091,9,-4569).lua deleted file mode 100644 index b130beb..0000000 --- a/il_timetable/nodes/(-2091,9,-4569).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.stop_sd_sched("Melinka", "L", "RSM", 10, 120, 0) -atc_set_text_outside("[E1] Personhood") diff --git a/il_timetable/nodes/(-4248,20,-3104).lua b/il_timetable/nodes/(-4248,20,-3104).lua index a8081e9..7535834 100644 --- a/il_timetable/nodes/(-4248,20,-3104).lua +++ b/il_timetable/nodes/(-4248,20,-3104).lua @@ -1 +1 @@ -atc_set_text_outside("S31 - Asha Cliffs <> Trisiston")
\ No newline at end of file +atc_set_text_outside("S32 - Asha Cliffs <> Trisiston")
\ No newline at end of file diff --git a/il_timetable/nodes/(-5595,6,-3553).lua b/il_timetable/nodes/(-5595,6,-3553).lua deleted file mode 100644 index 3bcd906..0000000 --- a/il_timetable/nodes/(-5595,6,-3553).lua +++ /dev/null @@ -1 +0,0 @@ -atc_set_text_outside("E3 - Euler Street\n via Trisiston")
\ No newline at end of file diff --git a/il_timetable/nodes/(-643,15,-424).lua b/il_timetable/nodes/(-643,15,-424).lua index f5190dc..a1278f2 100644 --- a/il_timetable/nodes/(-643,15,-424).lua +++ b/il_timetable/nodes/(-643,15,-424).lua @@ -5,4 +5,5 @@ F.ttp_station_display({ title = "Spawn Main T5/6", interval = 15, display1 = "display1", + --show_trainid = true, })
\ No newline at end of file diff --git a/il_timetable/nodes/(-699,1,-426).lua b/il_timetable/nodes/(-699,1,-426).lua index 908ee47..03c7dd0 100644 --- a/il_timetable/nodes/(-699,1,-426).lua +++ b/il_timetable/nodes/(-699,1,-426).lua @@ -1,4 +1,4 @@ if get_line()=="KVE" then set_rc("KVE_E") - atc_set_text_outside("[KVE] Kangasvarkaa Express\n-> KANGASVARKAA\nvia Sameary, Morija") + atc_set_text_outside("[KVE] Kangasvarkaa Express\n-> KANGASVARKAA\nvia Kameary, Morija") end
\ No newline at end of file diff --git a/il_timetable/nodes/(1020,10,1021).lua b/il_timetable/nodes/(1020,10,1021).lua deleted file mode 100644 index dc3083a..0000000 --- a/il_timetable/nodes/(1020,10,1021).lua +++ /dev/null @@ -1,8 +0,0 @@ -F.ttp_station_display({ - lines = {"S12_S"}, - departure = {}, - station = "Ehlodex", - title = "Ehlodex", - interval = 30, - display1 = "d", -})
\ No newline at end of file diff --git a/il_timetable/nodes/(115,16,-74).lua b/il_timetable/nodes/(115,16,-74).lua deleted file mode 100644 index 6928a9d..0000000 --- a/il_timetable/nodes/(115,16,-74).lua +++ /dev/null @@ -1,5 +0,0 @@ --- 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) -atc_set_text_outside("E8 - Morija Center") -F.stop_sd_sched("Origin Marcuse Street", "L", "RSM", 10, 1200, 300)
\ No newline at end of file diff --git a/il_timetable/nodes/(1199,18,6127).lua b/il_timetable/nodes/(1187,21,6115).lua index 47bed36..47bed36 100644 --- a/il_timetable/nodes/(1199,18,6127).lua +++ b/il_timetable/nodes/(1187,21,6115).lua diff --git a/il_timetable/nodes/(1194,16,6141).lua b/il_timetable/nodes/(1194,16,6141).lua deleted file mode 100644 index 2120196..0000000 --- a/il_timetable/nodes/(1194,16,6141).lua +++ /dev/null @@ -1,10 +0,0 @@ -F.ttp_begin({ - stn = "Namespace Mountains", -- station name - tt = "E85_S", -- timetable ID - depint = "10;00", --departure slot interval - depoff = "02;30", --departure slot offset - doorside = "R", - reverse = true, - only_lines = { E85 = true }, - force_tt_reset = false, -})
\ No newline at end of file diff --git a/il_timetable/nodes/(1604,-1,7982).lua b/il_timetable/nodes/(1604,-1,7982).lua index 1326eab..540c7b7 100644 --- a/il_timetable/nodes/(1604,-1,7982).lua +++ b/il_timetable/nodes/(1604,-1,7982).lua @@ -2,7 +2,7 @@ F.ttp_begin({ stn = "New Roses Gardens", -- station name tt = "NRG_E", -- timetable ID depint = "10;00", --departure slot interval - depoff = "01;30", --departure slot offset + depoff = "03;30", --departure slot offset doorside = "L", reverse = true, only_lines = nil, diff --git a/il_timetable/nodes/(1618,-1,7982).lua b/il_timetable/nodes/(1618,-1,7982).lua index c1b0bce..9a51353 100644 --- a/il_timetable/nodes/(1618,-1,7982).lua +++ b/il_timetable/nodes/(1618,-1,7982).lua @@ -2,7 +2,7 @@ F.ttp_begin({ stn = "New Roses Gardens", -- station name tt = "NRG_E", -- timetable ID depint = "10;00", --departure slot interval - depoff = "06;30", --departure slot offset + depoff = "08;30", --departure slot offset doorside = "R", reverse = true, only_lines = nil, diff --git a/il_timetable/nodes/(1623,9,4628).lua b/il_timetable/nodes/(1623,9,4628).lua deleted file mode 100644 index 59c5b0c..0000000 --- a/il_timetable/nodes/(1623,9,4628).lua +++ /dev/null @@ -1,5 +0,0 @@ -F.ttp_stop({ - stn = "INTERCAL", - doorside = "L", - only_lines = {CFE=true}, -})
\ No newline at end of file diff --git a/il_timetable/nodes/(1626,9,4615).lua b/il_timetable/nodes/(1626,9,4615).lua deleted file mode 100644 index 36c8603..0000000 --- a/il_timetable/nodes/(1626,9,4615).lua +++ /dev/null @@ -1,6 +0,0 @@ -F.ttp_stop({ - stn = "INTERCAL", - doorside = "L", - only_lines = {CFE=true}, - no_disable_ars = true, -})
\ No newline at end of file diff --git a/il_timetable/nodes/(1708,29,3041).lua b/il_timetable/nodes/(1708,29,3041).lua deleted file mode 100644 index 02dec18..0000000 --- a/il_timetable/nodes/(1708,29,3041).lua +++ /dev/null @@ -1,12 +0,0 @@ -F.ttp_begin({ - stn = "Personhood Main", -- station name - tt = "E1_S", -- timetable ID - depint = "02;30", --departure slot interval - depoff = "00;00", --departure slot offset - doorside = "R", - reverse = true, - only_lines = { E1 = true }, - force_tt_reset = true, -}) - -atc_set_text_outside("[E1] Melinka Town via Spawn")
\ No newline at end of file diff --git a/il_timetable/nodes/(1730,26,2915).lua b/il_timetable/nodes/(1730,26,2915).lua deleted file mode 100644 index 44b483e..0000000 --- a/il_timetable/nodes/(1730,26,2915).lua +++ /dev/null @@ -1,12 +0,0 @@ --- 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("Personhood Main", "L", "RSM", 10, 120, 70) -atc_set_text_outside("E1: Personhood <-> Spawn <-> Melinka Town") -if event.train then - F.stat("E1", false) - F.timetake_end("E1-Ehl-Psh") -end -if depart then - F.timetake_start("E1-Psh-Ehl") -end diff --git a/il_timetable/nodes/(1730,26,2926).lua b/il_timetable/nodes/(1730,26,2926).lua deleted file mode 100644 index b2341c2..0000000 --- a/il_timetable/nodes/(1730,26,2926).lua +++ /dev/null @@ -1,5 +0,0 @@ --- 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) -atc_set_text_outside("E11 - Oasis") -F.stop_sd_sched("Personhood Main Station", "R", "RSM", 10, 300, 0)
\ No newline at end of file diff --git a/il_timetable/nodes/(1732,27,2924).lua b/il_timetable/nodes/(1732,27,2924).lua deleted file mode 100644 index 6c2907f..0000000 --- a/il_timetable/nodes/(1732,27,2924).lua +++ /dev/null @@ -1 +0,0 @@ -F.timedisplay()
\ No newline at end of file diff --git a/il_timetable/nodes/(1734,26,2905).lua b/il_timetable/nodes/(1734,26,2905).lua deleted file mode 100644 index ec82f24..0000000 --- a/il_timetable/nodes/(1734,26,2905).lua +++ /dev/null @@ -1,10 +0,0 @@ -F.ttp_begin({ - stn = "Personhood Main", -- station name - tt = "E84_N", -- timetable ID - depint = "10;00", --departure slot interval - depoff = "07;30", --departure slot offset - doorside = "L", - reverse = true, - only_lines = { E84 = true }, - force_tt_reset = false, -}) diff --git a/il_timetable/nodes/(1734,26,2921).lua b/il_timetable/nodes/(1734,26,2921).lua deleted file mode 100644 index 6d92d95..0000000 --- a/il_timetable/nodes/(1734,26,2921).lua +++ /dev/null @@ -1,5 +0,0 @@ --- 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("Personhood Main", "R", "RSM", 10, 120, 70) -atc_set_text_outside("E1: Personhood <-> Spawn <-> Melinka Town")
\ No newline at end of file diff --git a/il_timetable/nodes/(1734,26,2922).lua b/il_timetable/nodes/(1734,26,2922).lua deleted file mode 100644 index 2980622..0000000 --- a/il_timetable/nodes/(1734,26,2922).lua +++ /dev/null @@ -1,10 +0,0 @@ -F.ttp_begin({ - stn = "Personhood Main", -- station name - tt = "E1_S", -- timetable ID - depint = "02;30", --departure slot interval - depoff = "00;45", --departure slot offset - doorside = "R", - reverse = true, - only_lines = { E1 = true }, - force_tt_reset = false, -}) diff --git a/il_timetable/nodes/(1899,19,8223).lua b/il_timetable/nodes/(1899,19,8223).lua deleted file mode 100644 index c07fbb8..0000000 --- a/il_timetable/nodes/(1899,19,8223).lua +++ /dev/null @@ -1,4 +0,0 @@ -F.ttp_stop({ - stn = "Krasnograd", - doorside = "R", -})
\ No newline at end of file diff --git a/il_timetable/nodes/(1932,8,9112).lua b/il_timetable/nodes/(1932,8,9112).lua deleted file mode 100644 index 15f2c53..0000000 --- a/il_timetable/nodes/(1932,8,9112).lua +++ /dev/null @@ -1,22 +0,0 @@ ---S.ttp["CFE_S"].travel_times["Personhood West"] = 890 - -print(S.ttt) - -lines = F.ttp_info_times("CFE_S", "00;00") -linestr = F.ttp_info_trains("CFE_S", "00;00") -local li = lines -for i=1,#linestr do li[#li+1] = linestr[i] end -print(" CFE\n"..table.concat(li, "\n")) - ---[[ -lines = F.ttp_info_times("NX_S", "00;00") -linestr = F.ttp_info_trains("NX_S", "00;00") -li = lines -for i=1,#linestr do li[#li+1] = linestr[i] end -print(" NX\n"..table.concat(li, "\n")) -]] -lines = F.ttp_info_times("E1_S", "00;00") ---linestr = F.ttp_info_trains("E1_S", "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 diff --git a/il_timetable/nodes/(1953,19,8220).lua b/il_timetable/nodes/(1953,19,8220).lua index c07fbb8..66e9723 100644 --- a/il_timetable/nodes/(1953,19,8220).lua +++ b/il_timetable/nodes/(1953,19,8220).lua @@ -1,4 +1,5 @@ F.ttp_stop({ stn = "Krasnograd", doorside = "R", + departure = { NRG_E = "3;00" } })
\ No newline at end of file diff --git a/il_timetable/nodes/(1973,42,8384).lua b/il_timetable/nodes/(1973,42,8384).lua deleted file mode 100644 index 8fe1919..0000000 --- a/il_timetable/nodes/(1973,42,8384).lua +++ /dev/null @@ -1,9 +0,0 @@ -F.ttp_station_display({ - lines = {"CFE_S", "NRG_W", "NRG_E"}, - departure = {}, - station = "Azena Transirejo", - title = "Azena Transirejo", - interval = 30, - display1 = "display1", - display2 = "display2", -}) diff --git a/il_timetable/nodes/(2648,13,4352).lua b/il_timetable/nodes/(2648,13,4352).lua deleted file mode 100644 index 565febb..0000000 --- a/il_timetable/nodes/(2648,13,4352).lua +++ /dev/null @@ -1,4 +0,0 @@ -F.ttp_stop({ - stn = "GRUB Valley (GVMER)", - doorside = "R" -})
\ No newline at end of file diff --git a/il_timetable/nodes/(286,4,206).lua b/il_timetable/nodes/(286,4,206).lua deleted file mode 100644 index ccba33d..0000000 --- a/il_timetable/nodes/(286,4,206).lua +++ /dev/null @@ -1,27 +0,0 @@ -if event.train then -st_name = "NYE Square" -flip = not flip -end - -doors = "L" - if event.train then - local time_now = rwt.now() - local next_dep_time = rwt.next_rpt(rwt.add(time_now, 10), 120, 0) -if flip then - atc_set_text_outside("4 - Showroom") - digiline_send("monitor", "4 Showroom "..rwt.to_string(next_dep_time, true)) - set_rc("SH") -else - digiline_send("monitor", "4 Ice Mountain "..rwt.to_string(next_dep_time, true)) - atc_set_text_outside("4 - Ice Mountain") - set_rc("IM") -end - atc_set_text_inside(st_name.."\nDeparture: "..rwt.to_string(next_dep_time, true)) - atc_send("A0 B0 W O"..doors) - schedule(next_dep_time, "depart") - elseif event.schedule then - atc_send("A1OCD1SM") - digiline_send("monitor", "Last Departure: | "..rwt.to_string(rwt.now(), true)) - atc_set_text_inside("") - depart = true - end diff --git a/il_timetable/nodes/(4100,4,5242).lua b/il_timetable/nodes/(4100,4,5242).lua index 2c1e7f7..67edfcf 100644 --- a/il_timetable/nodes/(4100,4,5242).lua +++ b/il_timetable/nodes/(4100,4,5242).lua @@ -1,4 +1,4 @@ if get_line()=="KVE" then set_rc("KVE_W") - atc_set_text_outside("[KVE] Kangasvarkaa Express\n-> SPAWN\nvia Morija, Sameary, Origin") + atc_set_text_outside("[KVE] Kangasvarkaa Express\n-> SPAWN\nvia Morija, Kameary, Origin") end
\ No newline at end of file diff --git a/il_timetable/nodes/(4401,-2,1976).lua b/il_timetable/nodes/(4401,-2,1976).lua deleted file mode 100644 index 0c7a9c5..0000000 --- a/il_timetable/nodes/(4401,-2,1976).lua +++ /dev/null @@ -1,5 +0,0 @@ --- 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) -atc_set_text_outside("E8 - Origin Marcuse Street") -F.stop_sd_sched("Morija Center", "L", "RSM", 10, 1200, 300)
\ No newline at end of file diff --git a/il_timetable/nodes/(4602,9,2181).lua b/il_timetable/nodes/(4602,9,2181).lua new file mode 100644 index 0000000..52448e2 --- /dev/null +++ b/il_timetable/nodes/(4602,9,2181).lua @@ -0,0 +1,7 @@ +F.ttp_station_display({ + lines = {"E85_N", "E85_S", }, + departure = {}, + station = "Morija North", + title = "Morija North", + display1 = "d1", +})
\ No newline at end of file diff --git a/il_timetable/nodes/(4892,9,2307).lua b/il_timetable/nodes/(4892,9,2307).lua deleted file mode 100644 index fdffe90..0000000 --- a/il_timetable/nodes/(4892,9,2307).lua +++ /dev/null @@ -1,10 +0,0 @@ -F.ttp_begin({ - stn = "BRIC / Morija North", -- station name - tt = "E85_N", -- timetable ID - depint = "10;00", --departure slot interval - depoff = "07;30", --departure slot offset - doorside = "L", - reverse = true, - only_lines = { E85 = true }, - force_tt_reset = false, -})
\ No newline at end of file diff --git a/il_timetable/nodes/(790,8,-109).lua b/il_timetable/nodes/(790,8,-109).lua deleted file mode 100644 index 78cf1f7..0000000 --- a/il_timetable/nodes/(790,8,-109).lua +++ /dev/null @@ -1,5 +0,0 @@ --- 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) -atc_set_text_outside("Line 1 - Palm Bay") -F.stop_sd_sched("Szymon's Dam Regional", "L", "RSM", 10, 120, 0)
\ No newline at end of file diff --git a/il_timetable/nodes/(943,14,1025).lua b/il_timetable/nodes/(943,14,1025).lua deleted file mode 100644 index b94fa87..0000000 --- a/il_timetable/nodes/(943,14,1025).lua +++ /dev/null @@ -1 +0,0 @@ -setstate("Ehl6ARSPreventer", "cr")
\ No newline at end of file diff --git a/il_timetable/nodes/(969,14,1049).lua b/il_timetable/nodes/(969,14,1049).lua deleted file mode 100644 index bf63cf8..0000000 --- a/il_timetable/nodes/(969,14,1049).lua +++ /dev/null @@ -1,4 +0,0 @@ --- 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("Ehlodex", "L", "RSM", 10, 120, 85)
\ No newline at end of file diff --git a/il_timetable/nodes/(972,14,1053).lua b/il_timetable/nodes/(972,14,1053).lua deleted file mode 100644 index c316b90..0000000 --- a/il_timetable/nodes/(972,14,1053).lua +++ /dev/null @@ -1,7 +0,0 @@ --- 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("Ehlodex", "R", "RSM", 10, 240, 65) -if event.train then -atc_set_text_outside("S12 - Spawn Main Station\nvia Schwarzschild Street, Anju Crossing") -end
\ 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 b40c49c..b1c789c 100644 --- a/il_timetable/nodes/(981,15,1041).lua +++ b/il_timetable/nodes/(981,15,1041).lua @@ -5,5 +5,6 @@ F.ttp_station_display({ title = "Ehlodex", display1 = "d1", display2 = "d2", - display3 = "d3" + display3 = "d3", + show_trainid = get_mesecon_input("d"), })
\ No newline at end of file diff --git a/il_timetable/nodes/(981,19,1053).lua b/il_timetable/nodes/(981,19,1053).lua index ae36742..b46cebe 100644 --- a/il_timetable/nodes/(981,19,1053).lua +++ b/il_timetable/nodes/(981,19,1053).lua @@ -1,6 +1,13 @@ + +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\n"..table.concat(li, "\n")) + lines = F.ttp_info_times("CFE_S", "00;00") linestr = F.ttp_info_trains("CFE_S", "00;00") local li = lines for i=1,#linestr do li[#li+1] = linestr[i] end -print(" CFE\n"..table.concat(li, "\n")) +print(" CFE_S\n"..table.concat(li, "\n")) diff --git a/il_timetable/nodes/(981,21,1053).lua b/il_timetable/nodes/(981,21,1053).lua index 567de55..be19fda 100644 --- a/il_timetable/nodes/(981,21,1053).lua +++ b/il_timetable/nodes/(981,21,1053).lua @@ -1,6 +1,14 @@ +--N/S +local line = "E85" -lines = F.ttp_info_times("CFE_N", "00;00") -linestr = F.ttp_info_trains("CFE_N", "00;00") +lines = F.ttp_info_times(line.."_N", "00;00") +linestr = F.ttp_info_trains(line.."_N", "00;00") local li = lines for i=1,#linestr do li[#li+1] = linestr[i] end -print(" CFE\n"..table.concat(li, "\n")) +print(line.."_N\n"..table.concat(li, "\n")) + +lines = F.ttp_info_times(line.."_S", "00;00") +linestr = F.ttp_info_trains(line.."_S", "00;00") +local li = lines +for i=1,#linestr do li[#li+1] = linestr[i] end +print(line.."_S\n"..table.concat(li, "\n"))
\ No newline at end of file diff --git a/il_timetable/nodes/(981,22,1053).lua b/il_timetable/nodes/(981,22,1053).lua index 2a52ca4..9e79f93 100644 --- a/il_timetable/nodes/(981,22,1053).lua +++ b/il_timetable/nodes/(981,22,1053).lua @@ -1,9 +1,7 @@ ---S.ttt["901424"] = nil ---S.ttp["E85_N"] = nil - -local tr="E85" -S.ttp[tr.."_N"].force_tt_reset = true -S.ttp[tr.."_S"].force_tt_reset = true +-- E/W +local tr="E11" +S.ttp[tr.."_E"].force_tt_reset = true +S.ttp[tr.."_W"].force_tt_reset = true print(tr.." resetting timetable") diff --git a/il_timetable/nodes/(982,19,1053).lua b/il_timetable/nodes/(982,19,1053).lua index 1acc131..88a245f 100644 --- a/il_timetable/nodes/(982,19,1053).lua +++ b/il_timetable/nodes/(982,19,1053).lua @@ -1,5 +1,11 @@ +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\n"..table.concat(li, "\n")) + lines = F.ttp_info_times("NX_S", "00;00") linestr = F.ttp_info_trains("NX_S", "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 +print(" NX_S\n"..table.concat(li, "\n"))
\ No newline at end of file diff --git a/il_timetable/nodes/(982,21,1053).lua b/il_timetable/nodes/(982,21,1053).lua index 4f6e3d8..00928a4 100644 --- a/il_timetable/nodes/(982,21,1053).lua +++ b/il_timetable/nodes/(982,21,1053).lua @@ -1,5 +1,14 @@ -lines = F.ttp_info_times("NX_N", "00;00") -linestr = F.ttp_info_trains("NX_N", "00;00") -li = lines +--W/E +local line = "FAR" + +lines = F.ttp_info_times(line.."_W", "00;00") +linestr = F.ttp_info_trains(line.."_W", "00;00") +local 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 +print(line.."_W\n"..table.concat(li, "\n")) + +lines = F.ttp_info_times(line.."_E", "00;00") +linestr = F.ttp_info_trains(line.."_E", "00;00") +local li = lines +for i=1,#linestr do li[#li+1] = linestr[i] end +print(line.."_E\n"..table.concat(li, "\n"))
\ No newline at end of file diff --git a/il_timetable/nodes/(982,22,1053).lua b/il_timetable/nodes/(982,22,1053).lua index a30cd5d..73b9d08 100644 --- a/il_timetable/nodes/(982,22,1053).lua +++ b/il_timetable/nodes/(982,22,1053).lua @@ -1,6 +1,5 @@ - -lines = F.ttp_info_times("E84_S", "00;00") -linestr = F.ttp_info_trains("E84_S", "00;00") -local li = lines -for i=1,#linestr do li[#li+1] = linestr[i] end -print(" E84\n"..table.concat(li, "\n"))
\ No newline at end of file +-- N/S +local tr="CFE" +S.ttp[tr.."_N"].force_tt_reset = true +S.ttp[tr.."_S"].force_tt_reset = true +print(tr.." resetting timetable")
\ No newline at end of file diff --git a/il_timetable/nodes/(983,19,1053).lua b/il_timetable/nodes/(983,19,1053).lua index fcd6179..9f41faa 100644 --- a/il_timetable/nodes/(983,19,1053).lua +++ b/il_timetable/nodes/(983,19,1053).lua @@ -1,5 +1,11 @@ +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\n"..table.concat(li, "\n")) + lines = F.ttp_info_times("E1_S", "00;00") linestr = F.ttp_info_trains("E1_S", "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 +print(" E1_S\n"..table.concat(li, "\n"))
\ No newline at end of file diff --git a/il_timetable/nodes/(983,21,1053).lua b/il_timetable/nodes/(983,21,1053).lua index 4c89cef..84bed9c 100644 --- a/il_timetable/nodes/(983,21,1053).lua +++ b/il_timetable/nodes/(983,21,1053).lua @@ -1,5 +1,3 @@ -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 +for key,_ in pairs(S.ttp) do + print(key) +end
\ No newline at end of file diff --git a/il_timetable/nodes/(983,22,1053).lua b/il_timetable/nodes/(983,22,1053).lua new file mode 100644 index 0000000..493aeb1 --- /dev/null +++ b/il_timetable/nodes/(983,22,1053).lua @@ -0,0 +1 @@ +S.ttt["732702"] = nil
\ No newline at end of file diff --git a/m4/init_code.lua b/m4/init_code.lua index 8133311..d32be9f 100644 --- a/m4/init_code.lua +++ b/m4/init_code.lua @@ -94,3 +94,130 @@ function F.cpl_looparound(ln) end --end of new cpl functions + +--[[ Utility Functions +]]-- +F.indicator = function(indicator,set) + if set ~= nil then + if type(set) == string then + setstate(indicator,set) + else + setstate(indicator,(set and "on") or "off") + end + end + return (getstate(indicator) == "on") or false +end + +F.get_rc_safe = function() + return get_rc() or "" +end + +F.has_rc = function(query,rc_list) -- query = string, single entry + if not atc_id then return false end + if rc_list == "" or query == nil or query=="" then return false end + if not rc_list then rc_list = F.get_rc_safe() end + for word in rc_list:gmatch("[^%s]+") do + if word == query then return true end + end + -- print(F.get_rc_safe()) + return false +end + +F.has_rc_match = function(query,rc_list) -- query = pattern string, single entry + if not atc_id then return false end + if rc_list == "" or query == nil or query=="" then return false end + if not rc_list then rc_list = F.get_rc_safe() end + + local rc = {} + for v in rc_list:gmatch("("..query..")") do + table.insert(rc,v) + end + + if rc[1] == true then + return true, rc + else + return nil + end +end + +F.add_rc = function(rc_list) -- rc_list = string or table, eg: {"rc1","rc2"} OR "rc1 rc2" + if not atc_id then return false end + if type(rc_list) == "table" then + rc_list = table.concat(rc_list," ") + end + set_rc(F.get_rc_safe().." "..rc_list) + -- print(F.get_rc_safe()) + return true +end + +F.remove_rc = function(rc_list,arrow_mode) -- rc_list = string eg: "rc1 rc2 rc3" OR table eg: {"rc1","rc2","rc3"} + -- Arrow Modes: + -- true: with arrow direction + -- false: against arrow direction + -- nil: ignores arrow direction + + if not atc_id then return false end + if not rc_list then return false end + + if (arrow_mode == nil) or (atc_arrow == arrow_mode) then + -- prep rc_list to useable format + local rc_remove = {} + if type(rc_list) == "string" then + for word in rc_list:gmatch("[^%s]+") do + rc_remove[word] = true + end + elseif type(rc_list) == "table" then + for _,word in pairs(rc_list) do + rc_remove[word] = true + end + end + + -- remove codes from train's rc + local rc = F.get_rc_safe() + local reinsert = {} + for token in rc:gmatch("[^%s]+") do + if not rc_remove[token] then + table.insert(reinsert,token) + end + end + -- insert new string to train's rc + set_rc(table.concat(reinsert," ")) + end + -- print(F.get_rc_safe()) + return reinsert +end + +F.remove_rc_match = function(rc_list) -- rc_list = pattern string, single entry, eg: "rc_%d+" + if not atc_id then return false end + if not rc_list then return false end + local rm = {} + for v in F.get_rc_safe():gmatch("("..rc_list..")") do + table.insert(rm,v) + end + F.remove_rc(rm) + -- print(F.get_rc_safe()) + return rm +end + +F.yard_road_count = function(yard,section_id,monitoring_light) + if not S.yards[yard][section_id] then S.yards[yard][section_id] = {['car_count'] = 0} end + + local car_count = S.yards[yard][section_id].car_count + + if event.train then + if atc_arrow then --arrow points into section, add to length + car_count = car_count + train_length() + else -- subtract from + car_count = car_count - train_length() + end + + if car_count > 0 then -- light = on + setstate(monitoring_light,"on") + else + car_count = 0 + setstate(monitoring_light,"off") + end + + S.yards[yard][section_id].car_count = car_count + end +end diff --git a/m4/nodes/(-1524,-11,-4611).lua b/m4/nodes/(-1524,-11,-4611).lua new file mode 100644 index 0000000..6272a7b --- /dev/null +++ b/m4/nodes/(-1524,-11,-4611).lua @@ -0,0 +1,3 @@ +if get_line()=="52" then + atc_set_text_outside("Line 52 - Olo Beach") +end
\ No newline at end of file diff --git a/m4/nodes/(-1921,13,-4576).lua b/m4/nodes/(-1921,13,-4576).lua new file mode 100644 index 0000000..eb9b943 --- /dev/null +++ b/m4/nodes/(-1921,13,-4576).lua @@ -0,0 +1,5 @@ +if event.train then + if get_line()=="E36" then + atc_set_text_outside("[E36] Souford\nSouthbound Express (SBX)") + end +end
\ No newline at end of file diff --git a/m4/nodes/(-1967,-11,-4415).lua b/m4/nodes/(-1967,-11,-4415).lua new file mode 100644 index 0000000..afb0335 --- /dev/null +++ b/m4/nodes/(-1967,-11,-4415).lua @@ -0,0 +1,3 @@ +if get_line()=="52" then + atc_set_text_outside("Line 52 - Merliansas Ruins") +end
\ No newline at end of file diff --git a/m4/nodes/(1345,3,-5637).lua b/m4/nodes/(1345,3,-5637).lua new file mode 100644 index 0000000..b34a162 --- /dev/null +++ b/m4/nodes/(1345,3,-5637).lua @@ -0,0 +1,5 @@ +if event.train then + if get_line()=="E36" then + atc_set_text_outside("[E36] Melinka\nSouthbound Express (SBX)") + end +end
\ No newline at end of file diff --git a/m4/nodes/(4045,24,5650).lua b/m4/nodes/(4045,24,5650).lua new file mode 100644 index 0000000..037b135 --- /dev/null +++ b/m4/nodes/(4045,24,5650).lua @@ -0,0 +1,19 @@ +do return end +-- delete above line to re-enable reversing into Factory +if event.schedule then + if atc_id and atc_id == event.msg then + schedule_in("0;04",atc_id) + print("ping") + return + end + atc_send_to_train(event.msg, "B0WRS3") + setstate(POS(4051,24,5653),"cr") + print("end: "..event.msg) + return +end +if event.train and atc_arrow and get_line() == "E8" then + atc_send("B2") + schedule_in("0;04",atc_id) + print("Start "..atc_id) + return +end
\ No newline at end of file diff --git a/m4/nodes/(5397,13,6916).lua b/m4/nodes/(5397,13,6916).lua new file mode 100644 index 0000000..e9f1e05 --- /dev/null +++ b/m4/nodes/(5397,13,6916).lua @@ -0,0 +1,3 @@ +if event.train and get_line()=="E16" then +atc_set_text_outside("[E16] Personhood\nvia Grub Valley\nC&C Rail") +end
\ No newline at end of file diff --git a/nlvcross/nodes/(-144,8,-1980).lua b/nlvcross/nodes/(-144,8,-1980).lua deleted file mode 100644 index 5bf45a6..0000000 --- a/nlvcross/nodes/(-144,8,-1980).lua +++ /dev/null @@ -1,5 +0,0 @@ -if atc_arrow then - F.off("SF1SouthWest", 1, true) -else - F.on("SF1SouthWest", 1, true) -end
\ No newline at end of file diff --git a/nlvcross/nodes/(-159,8,-1995).lua b/nlvcross/nodes/(-159,8,-1995).lua deleted file mode 100644 index e0ebb06..0000000 --- a/nlvcross/nodes/(-159,8,-1995).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("SF1SouthWest", 1, true)
\ No newline at end of file diff --git a/nlvcross/nodes/(-257,19,-339).lua b/nlvcross/nodes/(-257,19,-339).lua deleted file mode 100644 index b230511..0000000 --- a/nlvcross/nodes/(-257,19,-339).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("MOriStn", "R1")
\ No newline at end of file diff --git a/nlvcross/nodes/(-333,19,-342).lua b/nlvcross/nodes/(-333,19,-342).lua deleted file mode 100644 index cdf78c1..0000000 --- a/nlvcross/nodes/(-333,19,-342).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.off("MOriStn", "R2") -F.off("MOriStn", "R2_ug")
\ No newline at end of file diff --git a/nlvcross/nodes/(-359,19,-325).lua b/nlvcross/nodes/(-359,19,-325).lua deleted file mode 100644 index d8f0d8b..0000000 --- a/nlvcross/nodes/(-359,19,-325).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.off("MOriStn", "R1") -F.on("LovelaceAve", 1)
\ No newline at end of file diff --git a/nlvcross/nodes/(-362,19,-326).lua b/nlvcross/nodes/(-362,19,-326).lua deleted file mode 100644 index 65b69f9..0000000 --- a/nlvcross/nodes/(-362,19,-326).lua +++ /dev/null @@ -1 +0,0 @@ -F.off("MOriStn", "R1") diff --git a/nlvcross/nodes/(-4955,6,-3553).lua b/nlvcross/nodes/(-4955,6,-3553).lua deleted file mode 100644 index 1e4449c..0000000 --- a/nlvcross/nodes/(-4955,6,-3553).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("ML1_Scl1", "W")
\ No newline at end of file diff --git a/nlvcross/nodes/(-5063,6,-3553).lua b/nlvcross/nodes/(-5063,6,-3553).lua deleted file mode 100644 index 7abf5fe..0000000 --- a/nlvcross/nodes/(-5063,6,-3553).lua +++ /dev/null @@ -1 +0,0 @@ -F.off("ML1_Scl1", "E")
\ No newline at end of file diff --git a/nlvcross/nodes/(-5063,6,-3556).lua b/nlvcross/nodes/(-5063,6,-3556).lua deleted file mode 100644 index 7abf5fe..0000000 --- a/nlvcross/nodes/(-5063,6,-3556).lua +++ /dev/null @@ -1 +0,0 @@ -F.off("ML1_Scl1", "E")
\ No newline at end of file diff --git a/nlvcross/nodes/(-5078,6,-3553).lua b/nlvcross/nodes/(-5078,6,-3553).lua deleted file mode 100644 index 1e4449c..0000000 --- a/nlvcross/nodes/(-5078,6,-3553).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("ML1_Scl1", "W")
\ No newline at end of file diff --git a/nlvcross/nodes/(-5089,6,-3556).lua b/nlvcross/nodes/(-5089,6,-3556).lua deleted file mode 100644 index 1e4449c..0000000 --- a/nlvcross/nodes/(-5089,6,-3556).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("ML1_Scl1", "W")
\ No newline at end of file diff --git a/nlvcross/nodes/(-5111,7,-3553).lua b/nlvcross/nodes/(-5111,7,-3553).lua deleted file mode 100644 index 00f0234..0000000 --- a/nlvcross/nodes/(-5111,7,-3553).lua +++ /dev/null @@ -1 +0,0 @@ -F.off("ML1_Scl1", "W")
\ No newline at end of file diff --git a/nlvcross/nodes/(-5181,7,-3556).lua b/nlvcross/nodes/(-5181,7,-3556).lua deleted file mode 100644 index 6f08c7f..0000000 --- a/nlvcross/nodes/(-5181,7,-3556).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("ML1_Scl1", "E")
\ No newline at end of file diff --git a/nlvcross/nodes/(-602,14,-560).lua b/nlvcross/nodes/(-602,14,-560).lua deleted file mode 100644 index 41ee727..0000000 --- a/nlvcross/nodes/(-602,14,-560).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("spneul_jnc", "")
\ No newline at end of file diff --git a/nlvcross/nodes/(-740,8,-712).lua b/nlvcross/nodes/(-740,8,-712).lua deleted file mode 100644 index 248fddb..0000000 --- a/nlvcross/nodes/(-740,8,-712).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("smlpatha", 1)
\ No newline at end of file diff --git a/nlvcross/nodes/(-740,8,-715).lua b/nlvcross/nodes/(-740,8,-715).lua deleted file mode 100644 index 5751df0..0000000 --- a/nlvcross/nodes/(-740,8,-715).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("smlpatha", 2)
\ No newline at end of file diff --git a/nlvcross/nodes/(-821,8,-712).lua b/nlvcross/nodes/(-821,8,-712).lua deleted file mode 100644 index 856d35f..0000000 --- a/nlvcross/nodes/(-821,8,-712).lua +++ /dev/null @@ -1 +0,0 @@ -F.off("smlpatha", 1)
\ No newline at end of file diff --git a/nlvcross/nodes/(-821,8,-715).lua b/nlvcross/nodes/(-821,8,-715).lua deleted file mode 100644 index 7a5d486..0000000 --- a/nlvcross/nodes/(-821,8,-715).lua +++ /dev/null @@ -1 +0,0 @@ -F.off("smlpatha", 2)
\ No newline at end of file diff --git a/nlvcross/nodes/(-861,8,-712).lua b/nlvcross/nodes/(-861,8,-712).lua deleted file mode 100644 index 856d35f..0000000 --- a/nlvcross/nodes/(-861,8,-712).lua +++ /dev/null @@ -1 +0,0 @@ -F.off("smlpatha", 1)
\ No newline at end of file diff --git a/nlvcross/nodes/(-861,8,-715).lua b/nlvcross/nodes/(-861,8,-715).lua deleted file mode 100644 index 7a5d486..0000000 --- a/nlvcross/nodes/(-861,8,-715).lua +++ /dev/null @@ -1 +0,0 @@ -F.off("smlpatha", 2)
\ No newline at end of file diff --git a/nlvcross/nodes/(-88,2,-1984).lua b/nlvcross/nodes/(-88,2,-1984).lua deleted file mode 100644 index cdcec9a..0000000 --- a/nlvcross/nodes/(-88,2,-1984).lua +++ /dev/null @@ -1,5 +0,0 @@ -if atc_arrow then - F.on("SF1SouthWest", 1) -else - F.off("SF1SouthWest", 1, true) -end
\ No newline at end of file diff --git a/nlvcross/nodes/(1683,26,8223).lua b/nlvcross/nodes/(1683,26,8223).lua deleted file mode 100644 index c3a20cf..0000000 --- a/nlvcross/nodes/(1683,26,8223).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("NRG", "S")
\ No newline at end of file diff --git a/nlvcross/nodes/(1801,8,-43).lua b/nlvcross/nodes/(1801,8,-43).lua deleted file mode 100644 index 71cd7d6..0000000 --- a/nlvcross/nodes/(1801,8,-43).lua +++ /dev/null @@ -1,15 +0,0 @@ -local d = os.date() -local m = d.min -if event.train then -atc_send("B0WOL") -end -if m % 10 == 5 then -atc_send("B0WOCD1RSM") -local h = d.hour -local mm = (m + 10)%60 -if mm<10 and m>10 then h=h+1 end -digiline_send("depmon", "Train to | Marcuse Street | Next dep.: | "..h..":"..mm) -else -digiline_send("depmon", "Train to | Marcuse Street | in "..(4-(m%10)).."m"..(59-d.sec).."s") -interrupt(10) -end
\ No newline at end of file diff --git a/nlvcross/nodes/(256,2,-2054).lua b/nlvcross/nodes/(256,2,-2054).lua deleted file mode 100644 index b42d779..0000000 --- a/nlvcross/nodes/(256,2,-2054).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("SF1Station", 2)
\ No newline at end of file diff --git a/nlvcross/nodes/(4990,18,5960).lua b/nlvcross/nodes/(4990,18,5960).lua deleted file mode 100644 index e69de29..0000000 --- a/nlvcross/nodes/(4990,18,5960).lua +++ /dev/null diff --git a/nlvcross/nodes/(572,14,1011).lua b/nlvcross/nodes/(572,14,1011).lua deleted file mode 100644 index 4d71073..0000000 --- a/nlvcross/nodes/(572,14,1011).lua +++ /dev/null @@ -1,5 +0,0 @@ -if atc_id then - if get_line()=="E1" and get_aspect("gardonst_lvc_sig1").main == -1 then - F.on("gardonst","1") - end -end
\ No newline at end of file diff --git a/nlvcross/nodes/(613,14,1011).lua b/nlvcross/nodes/(613,14,1011).lua deleted file mode 100644 index 7468080..0000000 --- a/nlvcross/nodes/(613,14,1011).lua +++ /dev/null @@ -1,5 +0,0 @@ -if atc_id then - if get_line()=="E1" then - F.on("gardonst","1") - end -end
\ No newline at end of file diff --git a/nlvcross/nodes/(633,11,-23).lua b/nlvcross/nodes/(633,11,-23).lua deleted file mode 100644 index 93da240..0000000 --- a/nlvcross/nodes/(633,11,-23).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.off("Snb", 1) -atc_send("B2")
\ No newline at end of file diff --git a/nlvcross/nodes/(664,14,1014).lua b/nlvcross/nodes/(664,14,1014).lua deleted file mode 100644 index a13454f..0000000 --- a/nlvcross/nodes/(664,14,1014).lua +++ /dev/null @@ -1 +0,0 @@ -F.off("gardonst","2")
\ No newline at end of file diff --git a/nlvcross/nodes/(668,14,1011).lua b/nlvcross/nodes/(668,14,1011).lua deleted file mode 100644 index 5f2b6b1..0000000 --- a/nlvcross/nodes/(668,14,1011).lua +++ /dev/null @@ -1,5 +0,0 @@ -if event.train and get_line()~="E1" then - interrupt(6,"lvon") -elseif event.int then - F.on("gardonst","1") -end
\ No newline at end of file diff --git a/nlvcross/nodes/(702,14,1011).lua b/nlvcross/nodes/(702,14,1011).lua deleted file mode 100644 index ab471ad..0000000 --- a/nlvcross/nodes/(702,14,1011).lua +++ /dev/null @@ -1 +0,0 @@ -F.off("gardonst","1")
\ No newline at end of file diff --git a/nlvcross/nodes/(704,12,-42).lua b/nlvcross/nodes/(704,12,-42).lua deleted file mode 100644 index 80c6783..0000000 --- a/nlvcross/nodes/(704,12,-42).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("Snb", 1)
\ No newline at end of file diff --git a/nlvcross/nodes/(706,14,1004).lua b/nlvcross/nodes/(706,14,1004).lua deleted file mode 100644 index ab471ad..0000000 --- a/nlvcross/nodes/(706,14,1004).lua +++ /dev/null @@ -1 +0,0 @@ -F.off("gardonst","1")
\ No newline at end of file diff --git a/nlvcross/nodes/(803,14,1014).lua b/nlvcross/nodes/(803,14,1014).lua deleted file mode 100644 index 5776672..0000000 --- a/nlvcross/nodes/(803,14,1014).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("gardonst","2")
\ No newline at end of file diff --git a/nlvcross/nodes/(841,14,1008).lua b/nlvcross/nodes/(841,14,1008).lua deleted file mode 100644 index 5776672..0000000 --- a/nlvcross/nodes/(841,14,1008).lua +++ /dev/null @@ -1 +0,0 @@ -F.on("gardonst","2")
\ No newline at end of file diff --git a/ocean_city/nodes/(-23138,11,467).lua b/ocean_city/nodes/(-23138,11,467).lua deleted file mode 100644 index e69de29..0000000 --- a/ocean_city/nodes/(-23138,11,467).lua +++ /dev/null diff --git a/ocean_city/nodes/(-23138,11,470).lua b/ocean_city/nodes/(-23138,11,470).lua deleted file mode 100644 index e69de29..0000000 --- a/ocean_city/nodes/(-23138,11,470).lua +++ /dev/null diff --git a/ondemand/nodes/(-543,-5,-772).lua b/ondemand/nodes/(-543,-5,-772).lua deleted file mode 100644 index 6fc7189..0000000 --- a/ondemand/nodes/(-543,-5,-772).lua +++ /dev/null @@ -1,3 +0,0 @@ -depart=false -F.stn("Wbb3N", "Rsi3N", "Leo3N", "L") -F.stat("Line 3", false)
\ No newline at end of file diff --git a/subway/init_code.lua b/subway/init_code.lua index cc77426..bf750ca 100644 --- a/subway/init_code.lua +++ b/subway/init_code.lua @@ -231,8 +231,13 @@ end F.stn_union=function(line1, prev1, prev2, this, next, doors, dps, osig, ret_sw, ret_st, nohalt, waittime) if not atc_id then - atc_send("B0") - error("Train has disappeared!") + -- orwell 2025-03-24 + if (event.int and event.message=="ready") then + print(this,": Missing train on ready!") + interrupt(F.rant(), "ready") + end + -- otherwise ignore + return end if not atc_arrow then atc_send("B0") diff --git a/subway/nodes/(-1088,16,-221).lua b/subway/nodes/(-1088,16,-221).lua deleted file mode 100644 index 5ee1ede..0000000 --- a/subway/nodes/(-1088,16,-221).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Mnn4W", "Max4W", "Snp4W", "R")
\ No newline at end of file diff --git a/subway/nodes/(-1090,16,-233).lua b/subway/nodes/(-1090,16,-233).lua deleted file mode 100644 index 861e8b5..0000000 --- a/subway/nodes/(-1090,16,-233).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Snp4E", "Max4E", "Mnn4E", "R")
\ No newline at end of file diff --git a/subway/nodes/(-113,16,-472).lua b/subway/nodes/(-113,16,-472).lua deleted file mode 100644 index e7c10f5..0000000 --- a/subway/nodes/(-113,16,-472).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.stn_return_free("Ppo8W", "Uic8SW", "st") -F.stn("Uic8E", "Ppo8E", "Ctd8E", "R")
\ No newline at end of file diff --git a/subway/nodes/(-121,16,-472).lua b/subway/nodes/(-121,16,-472).lua deleted file mode 100644 index 3c5035e..0000000 --- a/subway/nodes/(-121,16,-472).lua +++ /dev/null @@ -1 +0,0 @@ -set_line(8)
\ No newline at end of file diff --git a/subway/nodes/(-1249,20,-207).lua b/subway/nodes/(-1249,20,-207).lua deleted file mode 100644 index 229d355..0000000 --- a/subway/nodes/(-1249,20,-207).lua +++ /dev/null @@ -1 +0,0 @@ ---F.stn_return_free("Max4W", "Snp4ES", "st")
\ No newline at end of file diff --git a/subway/nodes/(-125,3,-283).lua b/subway/nodes/(-125,3,-283).lua deleted file mode 100644 index 2cb728a..0000000 --- a/subway/nodes/(-125,3,-283).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_ilk("Uic4E", "ioa4E", "Erd4E", "R")
\ No newline at end of file diff --git a/subway/nodes/(-128,3,-295).lua b/subway/nodes/(-128,3,-295).lua deleted file mode 100644 index b5c395c..0000000 --- a/subway/nodes/(-128,3,-295).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_ilk("Erd4W", "ioa1W", "Jun1W", "R")
\ No newline at end of file diff --git a/subway/nodes/(-1301,20,-207).lua b/subway/nodes/(-1301,20,-207).lua deleted file mode 100644 index a8b3932..0000000 --- a/subway/nodes/(-1301,20,-207).lua +++ /dev/null @@ -1,2 +0,0 @@ ---F.stn_return_free("Snp4W", "Wpy4ES", "st") -F.stn("Wpy4E", "Snp4E", "Max4E", "R")
\ No newline at end of file diff --git a/subway/nodes/(-1311,20,-203).lua b/subway/nodes/(-1311,20,-203).lua deleted file mode 100644 index eb7a692..0000000 --- a/subway/nodes/(-1311,20,-203).lua +++ /dev/null @@ -1,3 +0,0 @@ ---F.stn_return("Max4W", "Snp4W", "Max4E", "R", "Snp4ES", "cr") ---atc_set_text_outside("Line 4 - Jungle") -F.stn("Max4W", "Snp4W", "Wpy4E", "R", 10)
\ No newline at end of file diff --git a/subway/nodes/(-1364,20,-207).lua b/subway/nodes/(-1364,20,-207).lua deleted file mode 100644 index c88df58..0000000 --- a/subway/nodes/(-1364,20,-207).lua +++ /dev/null @@ -1,8 +0,0 @@ -F.stn("Gho4E", "Wpy4E", "Snp4E", "R", 10) -if event.train then -S.Wpy4E_lvcross=false -if not (S.Wpy4E_lvcross or S.Wpy4W_lvcross) then -setstate("WpyLvcross1", "off") -setstate("WpyLvcross2", "off") -end -end
\ No newline at end of file diff --git a/subway/nodes/(-1377,20,-203).lua b/subway/nodes/(-1377,20,-203).lua deleted file mode 100644 index 9b5ddc1..0000000 --- a/subway/nodes/(-1377,20,-203).lua +++ /dev/null @@ -1,10 +0,0 @@ ---F.stn_return("Snp4W", "Wpy4E", "Snp4E", "R", "Wpy4ES", "cr") ---atc_set_text_outside("Line 4 - Origin") -if event.int and getstate("Wpy4W")=="green" and getstate("WpyLvcross1")=="off" then -S.Wpy4W_lvcross=true -setstate("WpyLvcross1", "on") -setstate("WpyLvcross2", "on") -interrupt(4, "ready") -return -end -F.stn("Snp4W", "Wpy4W", "Gho4E","R")
\ No newline at end of file diff --git a/subway/nodes/(-1392,13,-321).lua b/subway/nodes/(-1392,13,-321).lua deleted file mode 100644 index 4de8346..0000000 --- a/subway/nodes/(-1392,13,-321).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_return_free("LihXN", "Lhsw", "st")
\ No newline at end of file diff --git a/subway/nodes/(-1407,20,-166).lua b/subway/nodes/(-1407,20,-166).lua deleted file mode 100644 index 2fda15f..0000000 --- a/subway/nodes/(-1407,20,-166).lua +++ /dev/null @@ -1,3 +0,0 @@ -S.Wpy4E_lvcross=true -setstate("WpyLvcross1", "on") -setstate("WpyLvcross2", "on")
\ No newline at end of file diff --git a/subway/nodes/(-1415,19,-7).lua b/subway/nodes/(-1415,19,-7).lua deleted file mode 100644 index f37dde7..0000000 --- a/subway/nodes/(-1415,19,-7).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Wpy4W", "Gho4W", "Lvc4W", "R")
\ No newline at end of file diff --git a/subway/nodes/(-1415,19,335).lua b/subway/nodes/(-1415,19,335).lua deleted file mode 100644 index e585906..0000000 --- a/subway/nodes/(-1415,19,335).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Lvc4W", "Dev4W", "Dem4W", "L")
\ No newline at end of file diff --git a/subway/nodes/(-1415,19,98).lua b/subway/nodes/(-1415,19,98).lua deleted file mode 100644 index 7b70d57..0000000 --- a/subway/nodes/(-1415,19,98).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Gho4W", "Lvc4W", "Dev4W", "L")
\ No newline at end of file diff --git a/subway/nodes/(-1415,5,516).lua b/subway/nodes/(-1415,5,516).lua deleted file mode 100644 index 4c3c605..0000000 --- a/subway/nodes/(-1415,5,516).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Dev4W", "Dem4W", "App4W", "L")
\ No newline at end of file diff --git a/subway/nodes/(-1417,19,-19).lua b/subway/nodes/(-1417,19,-19).lua deleted file mode 100644 index 6702b68..0000000 --- a/subway/nodes/(-1417,19,-19).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Lvc4E", "Gho4E", "Wpy4E", "R")
\ No newline at end of file diff --git a/subway/nodes/(-1417,5,481).lua b/subway/nodes/(-1417,5,481).lua deleted file mode 100644 index ff6d574..0000000 --- a/subway/nodes/(-1417,5,481).lua +++ /dev/null @@ -1,2 +0,0 @@ -setstate("Dem4LV1", "off") -setstate("Dem4LV2", "off")
\ No newline at end of file diff --git a/subway/nodes/(-1420,5,502).lua b/subway/nodes/(-1420,5,502).lua deleted file mode 100644 index 352b654..0000000 --- a/subway/nodes/(-1420,5,502).lua +++ /dev/null @@ -1,7 +0,0 @@ -if event.int and getstate("Dem4E")=="green" and getstate("Dem4LV1")=="off" then -setstate("Dem4LV1", "on") -setstate("Dem4LV2", "on") -interrupt(4,"ready") -return -end -F.stn("App4E", "Dem4E", "Dev4E", "L")
\ No newline at end of file diff --git a/subway/nodes/(-1422,19,85).lua b/subway/nodes/(-1422,19,85).lua deleted file mode 100644 index 9651671..0000000 --- a/subway/nodes/(-1422,19,85).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Dev4E", "Lvc4E", "Gho4E","L")
\ No newline at end of file diff --git a/subway/nodes/(-1423,19,323).lua b/subway/nodes/(-1423,19,323).lua deleted file mode 100644 index 82ad8c4..0000000 --- a/subway/nodes/(-1423,19,323).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Dem4E", "Dev4E", "Lvc4E", "L")
\ No newline at end of file diff --git a/subway/nodes/(-1425,5,723).lua b/subway/nodes/(-1425,5,723).lua deleted file mode 100644 index f74838f..0000000 --- a/subway/nodes/(-1425,5,723).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Dem4W", "App4W", "Eft4W", "R")
\ No newline at end of file diff --git a/subway/nodes/(-1427,5,712).lua b/subway/nodes/(-1427,5,712).lua deleted file mode 100644 index 46fd24d..0000000 --- a/subway/nodes/(-1427,5,712).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_return("Eft4E", "App4E", "Dem4E", "R")
\ No newline at end of file diff --git a/subway/nodes/(-1473,5,-169).lua b/subway/nodes/(-1473,5,-169).lua deleted file mode 100644 index a517a79..0000000 --- a/subway/nodes/(-1473,5,-169).lua +++ /dev/null @@ -1 +0,0 @@ -set_line(4)
\ No newline at end of file diff --git a/subway/nodes/(-1478,3,1010).lua b/subway/nodes/(-1478,3,1010).lua deleted file mode 100644 index 3036b69..0000000 --- a/subway/nodes/(-1478,3,1010).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("App4W", "Eft4W", "Icm4W", "R")
\ No newline at end of file diff --git a/subway/nodes/(-1481,3,1083).lua b/subway/nodes/(-1481,3,1083).lua deleted file mode 100644 index 7489acc..0000000 --- a/subway/nodes/(-1481,3,1083).lua +++ /dev/null @@ -1 +0,0 @@ ---
\ No newline at end of file diff --git a/subway/nodes/(-1481,3,1175).lua b/subway/nodes/(-1481,3,1175).lua deleted file mode 100644 index dda0fe0..0000000 --- a/subway/nodes/(-1481,3,1175).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.stn_return("Eft4W", "Icm4W", "Eft4E", "L", "Icm4SW", "st") -F.lineset("4", "E")
\ No newline at end of file diff --git a/subway/nodes/(-1481,3,999).lua b/subway/nodes/(-1481,3,999).lua deleted file mode 100644 index bc59be3..0000000 --- a/subway/nodes/(-1481,3,999).lua +++ /dev/null @@ -1,4 +0,0 @@ -F.stn("Icm4W", "Eft4E", "App4E", "R") -if event.train then - F.stn_return_free("Eft4W", "Icm4SW", "cr") -end
\ No newline at end of file diff --git a/subway/nodes/(-181,5,-1).lua b/subway/nodes/(-181,5,-1).lua deleted file mode 100644 index 84743b3..0000000 --- a/subway/nodes/(-181,5,-1).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Snl2N", "Ram2N", "Ori2N", "L")
\ No newline at end of file diff --git a/subway/nodes/(-192,5,7).lua b/subway/nodes/(-192,5,7).lua deleted file mode 100644 index 813d9a2..0000000 --- a/subway/nodes/(-192,5,7).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Ori2S", "Ram2S", "Snl2S", "L")
\ No newline at end of file diff --git a/subway/nodes/(-232,8,-446).lua b/subway/nodes/(-232,8,-446).lua deleted file mode 100644 index 9b0d845..0000000 --- a/subway/nodes/(-232,8,-446).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.stn_ilkentry("Jng4E", "Uic4E", "ioa4E", "L") -F.lineset("4", "E")
\ No newline at end of file diff --git a/subway/nodes/(-250,8,-458).lua b/subway/nodes/(-250,8,-458).lua deleted file mode 100644 index fe76b25..0000000 --- a/subway/nodes/(-250,8,-458).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("ioa4W", "Uic4W", "Jng4W", "L", 8)
\ No newline at end of file diff --git a/subway/nodes/(-252,16,-474).lua b/subway/nodes/(-252,16,-474).lua deleted file mode 100644 index 458aefe..0000000 --- a/subway/nodes/(-252,16,-474).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_return("Ppo8W", "Uic8E", "Ppo8E", "R", "Uic8SW", "cr")
\ No newline at end of file diff --git a/subway/nodes/(-253,5,-911).lua b/subway/nodes/(-253,5,-911).lua deleted file mode 100644 index f324ddc..0000000 --- a/subway/nodes/(-253,5,-911).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_ilkentry("Uaa2S", "Ora2S", "Oni2R", "L", 12)
\ No newline at end of file diff --git a/subway/nodes/(-265,5,-904).lua b/subway/nodes/(-265,5,-904).lua deleted file mode 100644 index 5841aed..0000000 --- a/subway/nodes/(-265,5,-904).lua +++ /dev/null @@ -1,4 +0,0 @@ -F.stn("Oni2R", "Ora2N", "Uaa2N", "L") ---if event.train then ---F.stn_return_free("Ora2S", "Oni2ES", "cr") ---end
\ No newline at end of file diff --git a/subway/nodes/(-29,3,-246).lua b/subway/nodes/(-29,3,-246).lua deleted file mode 100644 index 83a8de5..0000000 --- a/subway/nodes/(-29,3,-246).lua +++ /dev/null @@ -1,4 +0,0 @@ -F.stn_ilk("ioa4E", "Erd4E", "iob4E", "R") ---if depart then ---interrupt_pos(POS(10,0,-10), "dnn"..S.line[atc_id]) ---end
\ No newline at end of file diff --git a/subway/nodes/(-294,5,1).lua b/subway/nodes/(-294,5,1).lua deleted file mode 100644 index 27d19f4..0000000 --- a/subway/nodes/(-294,5,1).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Sys2N", "Snl2N", "Ram2N", "L")
\ No newline at end of file diff --git a/subway/nodes/(-305,5,9).lua b/subway/nodes/(-305,5,9).lua deleted file mode 100644 index a316e6c..0000000 --- a/subway/nodes/(-305,5,9).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Ram2S", "Snl2S", "Sys2S", "L", "M") diff --git a/subway/nodes/(-318,-3,-834).lua b/subway/nodes/(-318,-3,-834).lua deleted file mode 100644 index daead0b..0000000 --- a/subway/nodes/(-318,-3,-834).lua +++ /dev/null @@ -1,2 +0,0 @@ ---Ich hab keine idee wie ich diese station nennen soll.... -F.stn("Ora2N", "Uaa2N", "Bnf2N", "L")
\ No newline at end of file diff --git a/subway/nodes/(-325,-3,-846).lua b/subway/nodes/(-325,-3,-846).lua deleted file mode 100644 index ed0e085..0000000 --- a/subway/nodes/(-325,-3,-846).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Wbb2S", "Uaa2S", "Ora2S", "L")
\ No newline at end of file diff --git a/subway/nodes/(-3321,6,487).lua b/subway/nodes/(-3321,6,487).lua deleted file mode 100644 index e69de29..0000000 --- a/subway/nodes/(-3321,6,487).lua +++ /dev/null diff --git a/subway/nodes/(-3350,6,487).lua b/subway/nodes/(-3350,6,487).lua deleted file mode 100644 index e69de29..0000000 --- a/subway/nodes/(-3350,6,487).lua +++ /dev/null diff --git a/subway/nodes/(-3387,6,487).lua b/subway/nodes/(-3387,6,487).lua deleted file mode 100644 index e69de29..0000000 --- a/subway/nodes/(-3387,6,487).lua +++ /dev/null diff --git a/subway/nodes/(-3387,6,495).lua b/subway/nodes/(-3387,6,495).lua deleted file mode 100644 index e69de29..0000000 --- a/subway/nodes/(-3387,6,495).lua +++ /dev/null diff --git a/subway/nodes/(-3468,11,478).lua b/subway/nodes/(-3468,11,478).lua deleted file mode 100644 index e69de29..0000000 --- a/subway/nodes/(-3468,11,478).lua +++ /dev/null diff --git a/subway/nodes/(-3468,11,481).lua b/subway/nodes/(-3468,11,481).lua deleted file mode 100644 index e69de29..0000000 --- a/subway/nodes/(-3468,11,481).lua +++ /dev/null diff --git a/subway/nodes/(-359,10,-406).lua b/subway/nodes/(-359,10,-406).lua deleted file mode 100644 index 561dbbc..0000000 --- a/subway/nodes/(-359,10,-406).lua +++ /dev/null @@ -1,4 +0,0 @@ -if event.train and atc_arrow then -atc_send("B0") -print("Train reversed mysteriously at Jungle!") -end
\ No newline at end of file diff --git a/subway/nodes/(-364,-5,-786).lua b/subway/nodes/(-364,-5,-786).lua deleted file mode 100644 index 45edc24..0000000 --- a/subway/nodes/(-364,-5,-786).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Rsi2S", "Wbb2S", "Uaa2S", "L")
\ No newline at end of file diff --git a/subway/nodes/(-376,-5,-779).lua b/subway/nodes/(-376,-5,-779).lua deleted file mode 100644 index 7c0e83e..0000000 --- a/subway/nodes/(-376,-5,-779).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Uaa2N", "Wbb2N", "Rsi2N", "L")
\ No newline at end of file diff --git a/subway/nodes/(-376,13,-1476).lua b/subway/nodes/(-376,13,-1476).lua deleted file mode 100644 index 4cc8b80..0000000 --- a/subway/nodes/(-376,13,-1476).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_return_free("Mrh7S", "Plt7ES", "st")
\ No newline at end of file diff --git a/subway/nodes/(-376,24,-1299).lua b/subway/nodes/(-376,24,-1299).lua deleted file mode 100644 index 41dacee..0000000 --- a/subway/nodes/(-376,24,-1299).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Plt7R", "Mrh7N", "Boz7N", "R")
\ No newline at end of file diff --git a/subway/nodes/(-378,24,-1311).lua b/subway/nodes/(-378,24,-1311).lua deleted file mode 100644 index fbb093d..0000000 --- a/subway/nodes/(-378,24,-1311).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Boz7S", "Mrh7S", "Plt7R", "R")
\ No newline at end of file diff --git a/subway/nodes/(-378,7,-1528).lua b/subway/nodes/(-378,7,-1528).lua deleted file mode 100644 index 3d7f546..0000000 --- a/subway/nodes/(-378,7,-1528).lua +++ /dev/null @@ -1,4 +0,0 @@ -F.stn_return("Mrh7S", "Plt7R", "Mrh7N", "R", "Plt7ES", "cr") -S.line[atc_id]="7" -set_line(7) -atc_set_text_outside("Line 7 - Birch Bay East")
\ No newline at end of file diff --git a/subway/nodes/(-400,5,1).lua b/subway/nodes/(-400,5,1).lua deleted file mode 100644 index c5b1699..0000000 --- a/subway/nodes/(-400,5,1).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Lin2N", "Sys2N", "Snl2N", "R")
\ No newline at end of file diff --git a/subway/nodes/(-403,3,237).lua b/subway/nodes/(-403,3,237).lua deleted file mode 100644 index 5186087..0000000 --- a/subway/nodes/(-403,3,237).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.stn_nohalt("Sys5E", "Fpa5E", "Hhs5E", "10") -setstate("Fpa5E", "green")
\ No newline at end of file diff --git a/subway/nodes/(-404,12,-105).lua b/subway/nodes/(-404,12,-105).lua deleted file mode 100644 index 7cd7bc4..0000000 --- a/subway/nodes/(-404,12,-105).lua +++ /dev/null @@ -1,6 +0,0 @@ -F.stn("Rea7E", "Ack5E", "Sys5E", "R", 1) -if depart then -S.Ack5E_lvcross=true -setstate("AckLvcross1", "on") -setstate("AckLvcross2", "on") -end
\ No newline at end of file diff --git a/subway/nodes/(-404,12,9).lua b/subway/nodes/(-404,12,9).lua deleted file mode 100644 index 8fadaa3..0000000 --- a/subway/nodes/(-404,12,9).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Ack5E", "Sys5E", "Fpa5E", "R")
\ No newline at end of file diff --git a/subway/nodes/(-408,12,-116).lua b/subway/nodes/(-408,12,-116).lua deleted file mode 100644 index e8b546a..0000000 --- a/subway/nodes/(-408,12,-116).lua +++ /dev/null @@ -1,8 +0,0 @@ -F.stn("Sys5W", "Ack5W", "Rea5W", "R") -if event.train then -S.Ack5W_lvcross=false -if not (S.Ack5E_lvcross or S.Ack5W_lvcross) then -setstate("AckLvcross1", "off") -setstate("AckLvcross2", "off") -end -end
\ No newline at end of file diff --git a/subway/nodes/(-408,12,-2).lua b/subway/nodes/(-408,12,-2).lua deleted file mode 100644 index 8ea1f9e..0000000 --- a/subway/nodes/(-408,12,-2).lua +++ /dev/null @@ -1,6 +0,0 @@ -F.stn("Fpa5W", "Sys5W", "Ack5W", "R") -if depart then -S.Ack5W_lvcross=true -setstate("AckLvcross1", "on") -setstate("AckLvcross2", "on") -end
\ No newline at end of file diff --git a/subway/nodes/(-409,3,222).lua b/subway/nodes/(-409,3,222).lua deleted file mode 100644 index 1dc1655..0000000 --- a/subway/nodes/(-409,3,222).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_nohalt("Hhs5W", "Fpa5W", "Sys5W", "10")
\ No newline at end of file diff --git a/subway/nodes/(-412,5,6).lua b/subway/nodes/(-412,5,6).lua deleted file mode 100644 index eee5168..0000000 --- a/subway/nodes/(-412,5,6).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Snl2S", "Sys2S", "Lin2S", "R")
\ No newline at end of file diff --git a/subway/nodes/(-419,24,-1178).lua b/subway/nodes/(-419,24,-1178).lua deleted file mode 100644 index f1c3fa1..0000000 --- a/subway/nodes/(-419,24,-1178).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Rkb7S", "Boz7S", "Mrh7S", "R")
\ No newline at end of file diff --git a/subway/nodes/(-429,8,-501).lua b/subway/nodes/(-429,8,-501).lua deleted file mode 100644 index dff25df..0000000 --- a/subway/nodes/(-429,8,-501).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Hts4E", "Jng4E", "Uic4E", "L", 8)
\ No newline at end of file diff --git a/subway/nodes/(-430,24,-1176).lua b/subway/nodes/(-430,24,-1176).lua deleted file mode 100644 index 886d66d..0000000 --- a/subway/nodes/(-430,24,-1176).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Mrh7N", "Boz7N", "Rkb7N", "R")
\ No newline at end of file diff --git a/subway/nodes/(-433,9,-239).lua b/subway/nodes/(-433,9,-239).lua deleted file mode 100644 index 5a0175d..0000000 --- a/subway/nodes/(-433,9,-239).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Bld7E", "Rea7E", "Ack5E", "L")
\ No newline at end of file diff --git a/subway/nodes/(-436,-3,519).lua b/subway/nodes/(-436,-3,519).lua deleted file mode 100644 index 1b54098..0000000 --- a/subway/nodes/(-436,-3,519).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Pyr5W", "Lis5W", "Hhs5W", "L")
\ No newline at end of file diff --git a/subway/nodes/(-441,8,-493).lua b/subway/nodes/(-441,8,-493).lua deleted file mode 100644 index b0633a3..0000000 --- a/subway/nodes/(-441,8,-493).lua +++ /dev/null @@ -1,4 +0,0 @@ -F.stn("Uic4W", "Jng4W", "Hts3W", "L") -if depart then - S.line[atc_id]="4" -end
\ No newline at end of file diff --git a/subway/nodes/(-445,9,-232).lua b/subway/nodes/(-445,9,-232).lua deleted file mode 100644 index 30a8237..0000000 --- a/subway/nodes/(-445,9,-232).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.stn("Ack5W", "Rea7W", "Bld7W", "L") -S.line[atc_id]="7"
\ No newline at end of file diff --git a/subway/nodes/(-448,-3,526).lua b/subway/nodes/(-448,-3,526).lua deleted file mode 100644 index 4fdaff6..0000000 --- a/subway/nodes/(-448,-3,526).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Hhs5E", "Lis5E", "Pyr5E", "L")
\ No newline at end of file diff --git a/subway/nodes/(-522,5,0).lua b/subway/nodes/(-522,5,0).lua deleted file mode 100644 index 305a923..0000000 --- a/subway/nodes/(-522,5,0).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Rfo2N", "Lin2N", "Sys2N", "L")
\ No newline at end of file diff --git a/subway/nodes/(-529,-5,-797).lua b/subway/nodes/(-529,-5,-797).lua deleted file mode 100644 index 289e95b..0000000 --- a/subway/nodes/(-529,-5,-797).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Uni2S", "Rsi2S", "Wbb2S", "L")
\ No newline at end of file diff --git a/subway/nodes/(-534,5,7).lua b/subway/nodes/(-534,5,7).lua deleted file mode 100644 index 29e65f7..0000000 --- a/subway/nodes/(-534,5,7).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Sys2S", "Lin2S", "Rfo2S", "L")
\ No newline at end of file diff --git a/subway/nodes/(-543,-5,-786).lua b/subway/nodes/(-543,-5,-786).lua deleted file mode 100644 index 563f861..0000000 --- a/subway/nodes/(-543,-5,-786).lua +++ /dev/null @@ -1,7 +0,0 @@ -depart=false -F.stn("Wbb2N", "Rsi2N", "Uni2N", "L", "M", "Rsi2NPref") -if depart then -setstate("Dar7N", "red") -setstate("Uni2NDivIn", "cr") -end -S.line[atc_id]="2";
\ No newline at end of file diff --git a/subway/nodes/(-546,9,-245).lua b/subway/nodes/(-546,9,-245).lua deleted file mode 100644 index 2785607..0000000 --- a/subway/nodes/(-546,9,-245).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Cat7N", "Bld7E", "Rea7E", "L")
\ No newline at end of file diff --git a/subway/nodes/(-548,8,-502).lua b/subway/nodes/(-548,8,-502).lua deleted file mode 100644 index 010bd1e..0000000 --- a/subway/nodes/(-548,8,-502).lua +++ /dev/null @@ -1,12 +0,0 @@ ---if S.line[atc_id]=="4" then - F.stn("Spn3E", "Hts4E", "Jng4E", "L") -set_line(4) --- if depart then --- setstate("Hts4DivOut", "cr") --- end ---else --- F.stn("Spn3E", "Hts3E", "Brn3E", "L") --- if depart then --- setstate("Hts4DivOut", "st") --- end ---end
\ No newline at end of file diff --git a/subway/nodes/(-558,9,-239).lua b/subway/nodes/(-558,9,-239).lua deleted file mode 100644 index 26ab37c..0000000 --- a/subway/nodes/(-558,9,-239).lua +++ /dev/null @@ -1,7 +0,0 @@ -F.stn("Rea7W", "Bld7W", "Cat7S", "L") ---if depart then ---setstate("Cat2SDivIn", "st") ---setstate("Dca2S", "red") ---end -S.line[atc_id]="7" ---F.union_wait("Bld7W")
\ No newline at end of file diff --git a/subway/nodes/(-567,1,-490).lua b/subway/nodes/(-567,1,-490).lua deleted file mode 100644 index 27c4624..0000000 --- a/subway/nodes/(-567,1,-490).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Jng4W", "Hts3W", "Spn3W", "L")
\ No newline at end of file diff --git a/subway/nodes/(-5972,-1,-3899).lua b/subway/nodes/(-5972,-1,-3899).lua deleted file mode 100644 index 133e07e..0000000 --- a/subway/nodes/(-5972,-1,-3899).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_return("WfrSS", "SpaSN", "WfrSN", "L", "SpaSW", "cr")
\ No newline at end of file diff --git a/subway/nodes/(-6,5,14).lua b/subway/nodes/(-6,5,14).lua deleted file mode 100644 index 39e5a85..0000000 --- a/subway/nodes/(-6,5,14).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Chu2S", "Ori2S", "Ram2S", "L")
\ No newline at end of file diff --git a/subway/nodes/(-617,14,-408).lua b/subway/nodes/(-617,14,-408).lua deleted file mode 100644 index 08e1ee3..0000000 --- a/subway/nodes/(-617,14,-408).lua +++ /dev/null @@ -1,2 +0,0 @@ - -atc_set_text_outside("S12 - Silver Coast\nvia Lesnoi, Anju Crossing, Schwarzschild St., Ehlodex")
\ No newline at end of file diff --git a/subway/nodes/(-623,5,1).lua b/subway/nodes/(-623,5,1).lua deleted file mode 100644 index e960ffc..0000000 --- a/subway/nodes/(-623,5,1).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Thh2N", "Rfo2N", "Lin2N", "R")
\ No newline at end of file diff --git a/subway/nodes/(-626,13,-1145).lua b/subway/nodes/(-626,13,-1145).lua deleted file mode 100644 index 098f150..0000000 --- a/subway/nodes/(-626,13,-1145).lua +++ /dev/null @@ -1,9 +0,0 @@ -F.stn("Boz7N", "Rkb7N", "Unv7N", "R") ---F.union_wait("Rkb7N") - ---if depart then ---setstate("Unv6EDivIn", "cr") ---setstate("Swr6E", "red") - ---setstate("Unv6WCross", "red") ---end
\ No newline at end of file diff --git a/subway/nodes/(-628,13,-1159).lua b/subway/nodes/(-628,13,-1159).lua deleted file mode 100644 index aad41f3..0000000 --- a/subway/nodes/(-628,13,-1159).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Unv7S", "Rkb7S", "Boz7S", "R") diff --git a/subway/nodes/(-636,5,6).lua b/subway/nodes/(-636,5,6).lua deleted file mode 100644 index c6098f9..0000000 --- a/subway/nodes/(-636,5,6).lua +++ /dev/null @@ -1,4 +0,0 @@ -F.stn("Lin2S", "Rfo2S", "Thh2S", "R") -if depart then -interrupt_pos(POS(-662,8,-296), "dep3") -end
\ No newline at end of file diff --git a/subway/nodes/(-642,1,-259).lua b/subway/nodes/(-642,1,-259).lua deleted file mode 100644 index fd4248d..0000000 --- a/subway/nodes/(-642,1,-259).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Shn7N", "Cat7N", "Bld7E", "R")
\ No newline at end of file diff --git a/subway/nodes/(-645,14,-402).lua b/subway/nodes/(-645,14,-402).lua deleted file mode 100644 index 4e9e447..0000000 --- a/subway/nodes/(-645,14,-402).lua +++ /dev/null @@ -1,6 +0,0 @@ -F.stn("Spn2N", "Stn2N", "Cat2N", "L") -if depart then - interrupt_pos(POS(-649,9,-283), "dep1") -elseif event.train then - interrupt_pos(POS(-649,9,-283), "arr1") -end
\ No newline at end of file diff --git a/subway/nodes/(-648,5,-199).lua b/subway/nodes/(-648,5,-199).lua deleted file mode 100644 index 1fa0d39..0000000 --- a/subway/nodes/(-648,5,-199).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Cat2N", "Dca2N", "Thh2N", "R")
\ No newline at end of file diff --git a/subway/nodes/(-648,5,-287).lua b/subway/nodes/(-648,5,-287).lua deleted file mode 100644 index 88f9ae5..0000000 --- a/subway/nodes/(-648,5,-287).lua +++ /dev/null @@ -1,12 +0,0 @@ ---if S.line[atc_id]=="7" then --- F.stn("Stn2N", "Cat7N", "Bld7E", "L") --- if depart then --- setstate("Cat2NDivOut", "cr") --- end ---else - F.stn("Stn2N", "Cat2N", "Dca2N", "L") - if depart then - setstate("Cat2NDivOut", "st") - interrupt_pos(POS(-649,9,-283), "pass") - end ---end
\ No newline at end of file diff --git a/subway/nodes/(-648,5,-98).lua b/subway/nodes/(-648,5,-98).lua deleted file mode 100644 index 417ebf3..0000000 --- a/subway/nodes/(-648,5,-98).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Dca2N", "Thh2N", "Rfo2N", "L")
\ No newline at end of file diff --git a/subway/nodes/(-651,5,-303).lua b/subway/nodes/(-651,5,-303).lua deleted file mode 100644 index 62b78e7..0000000 --- a/subway/nodes/(-651,5,-303).lua +++ /dev/null @@ -1,7 +0,0 @@ -F.stn_return("Stn7N", "Cat7R", "Stn2S", "L", "Cat7ES", "st") -if depart then -setstate("Stn2SDivIn", "st") -setstate("Cat2S", "red") -end -atc_set_text_outside("Line 7 - Robert Koch Boulevard") -S.line[atc_id]="7"
\ No newline at end of file diff --git a/subway/nodes/(-652,14,-490).lua b/subway/nodes/(-652,14,-490).lua deleted file mode 100644 index d085d58..0000000 --- a/subway/nodes/(-652,14,-490).lua +++ /dev/null @@ -1,6 +0,0 @@ -F.stn("Kav2N", "Spn2N", "Stn2N", "R") -if depart then - interrupt_pos(POS(-649,9,-283), "dep2") -elseif event.train then - interrupt_pos(POS(-649,9,-283), "arr2") -end
\ No newline at end of file diff --git a/subway/nodes/(-653,14,-377).lua b/subway/nodes/(-653,14,-377).lua deleted file mode 100644 index d7e8e9c..0000000 --- a/subway/nodes/(-653,14,-377).lua +++ /dev/null @@ -1,4 +0,0 @@ -atc_send("B2") -if S.line[atc_id]=="7" then -F.stn_return_free("Stn7N", "Cat7ES", "cr") -end
\ No newline at end of file diff --git a/subway/nodes/(-654,5,-209).lua b/subway/nodes/(-654,5,-209).lua deleted file mode 100644 index fa29dbb..0000000 --- a/subway/nodes/(-654,5,-209).lua +++ /dev/null @@ -1,7 +0,0 @@ -F.stn("Thh2S", "Dca2S", "Cat2S", "R") -if event.train then -interrupt_pos(POS(-662,8,-296), "arr1") -end -if depart then -interrupt_pos(POS(-662,8,-296), "dep1") -end
\ No newline at end of file diff --git a/subway/nodes/(-654,5,-335).lua b/subway/nodes/(-654,5,-335).lua deleted file mode 100644 index 061a7a1..0000000 --- a/subway/nodes/(-654,5,-335).lua +++ /dev/null @@ -1 +0,0 @@ -S.line[atc_id]="7"
\ No newline at end of file diff --git a/subway/nodes/(-655,14,-412).lua b/subway/nodes/(-655,14,-412).lua deleted file mode 100644 index 1156820..0000000 --- a/subway/nodes/(-655,14,-412).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Cat2S", "Stn2S", "Spn2S", "L") diff --git a/subway/nodes/(-655,14,-502).lua b/subway/nodes/(-655,14,-502).lua deleted file mode 100644 index 5b09f76..0000000 --- a/subway/nodes/(-655,14,-502).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Stn2S", "Spn2S", "Kav2S", "R")
\ No newline at end of file diff --git a/subway/nodes/(-655,5,-110).lua b/subway/nodes/(-655,5,-110).lua deleted file mode 100644 index 1ae68d6..0000000 --- a/subway/nodes/(-655,5,-110).lua +++ /dev/null @@ -1,7 +0,0 @@ -F.stn("Rfo2S", "Thh2S", "Dca2S", "L") -if event.train then -interrupt_pos(POS(-662,8,-296), "arr2") -end -if depart then -interrupt_pos(POS(-662,8,-296), "dep2") -end
\ No newline at end of file diff --git a/subway/nodes/(-658,8,-497).lua b/subway/nodes/(-658,8,-497).lua deleted file mode 100644 index dc353f4..0000000 --- a/subway/nodes/(-658,8,-497).lua +++ /dev/null @@ -1,7 +0,0 @@ -F.stn("Trp3E", "Spn3E", "Hts3E", "R") -if not S.line[atc_id]=="4" then - atc_set_text_outside("Line 3 - Counter-clockwise Ring Line") -end -if depart then - setstate("Gpl4E", "green") -end
\ No newline at end of file diff --git a/subway/nodes/(-659,5,-304).lua b/subway/nodes/(-659,5,-304).lua deleted file mode 100644 index 1cf3a92..0000000 --- a/subway/nodes/(-659,5,-304).lua +++ /dev/null @@ -1,4 +0,0 @@ -F.stn("Dca2S", "Cat2S", "Stn2S", "L") -if depart then -interrupt_pos(POS(-662,8,-296), "pass") -end
\ No newline at end of file diff --git a/subway/nodes/(-671,8,-495).lua b/subway/nodes/(-671,8,-495).lua deleted file mode 100644 index a9393d6..0000000 --- a/subway/nodes/(-671,8,-495).lua +++ /dev/null @@ -1,13 +0,0 @@ -if S.line[atc_id]=="4" then - F.stn("Hts3W", "Spn4W", "Gpl4W", "R") - if depart then - setstate("Spn4ups", "cr") - --setstate("Trp3ECross", "red") - end -else - F.stn("Hts3W", "Spn3W", "Trp3W", "R") - atc_set_text_outside("Line 3 - Clockwise Ring Line") - if depart then - setstate("Spn4ups", "st") - end -end
\ No newline at end of file diff --git a/subway/nodes/(-677,1,-257).lua b/subway/nodes/(-677,1,-257).lua deleted file mode 100644 index 6f75165..0000000 --- a/subway/nodes/(-677,1,-257).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Bld7W", "Cat7S", "Shn7S", "R")
\ No newline at end of file diff --git a/subway/nodes/(-696,2,-1060).lua b/subway/nodes/(-696,2,-1060).lua deleted file mode 100644 index 72de4e8..0000000 --- a/subway/nodes/(-696,2,-1060).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.stn("Hks7S", "Unv7S", "Rkb7S", "R") -set_line(7)
\ No newline at end of file diff --git a/subway/nodes/(-696,8,-497).lua b/subway/nodes/(-696,8,-497).lua deleted file mode 100644 index 01a3d1a..0000000 --- a/subway/nodes/(-696,8,-497).lua +++ /dev/null @@ -1 +0,0 @@ -atc_send("B2")
\ No newline at end of file diff --git a/subway/nodes/(-702,9,-648).lua b/subway/nodes/(-702,9,-648).lua deleted file mode 100644 index e90d83c..0000000 --- a/subway/nodes/(-702,9,-648).lua +++ /dev/null @@ -1,4 +0,0 @@ -F.stn("Uni2N", "Kav2N", "Spn2N", "R") -if depart then - interrupt_pos(POS(-649,9,-283), "dep3") -end
\ No newline at end of file diff --git a/subway/nodes/(-709,2,-1058).lua b/subway/nodes/(-709,2,-1058).lua deleted file mode 100644 index e43ec69..0000000 --- a/subway/nodes/(-709,2,-1058).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Rkb7N", "Unv7N", "Hks7N", "R")
\ No newline at end of file diff --git a/subway/nodes/(-713,9,-646).lua b/subway/nodes/(-713,9,-646).lua deleted file mode 100644 index fdbf098..0000000 --- a/subway/nodes/(-713,9,-646).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Spn2S", "Kav2S", "Uni2S", "R")
\ No newline at end of file diff --git a/subway/nodes/(-723,10,-375).lua b/subway/nodes/(-723,10,-375).lua deleted file mode 100644 index efdd2fa..0000000 --- a/subway/nodes/(-723,10,-375).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Trp7N", "Shn7N", "Cat7N", "L")
\ No newline at end of file diff --git a/subway/nodes/(-727,-2,-886).lua b/subway/nodes/(-727,-2,-886).lua deleted file mode 100644 index 5b046c7..0000000 --- a/subway/nodes/(-727,-2,-886).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Unv7N", "Hks7N", "Uni7N", "L")
\ No newline at end of file diff --git a/subway/nodes/(-729,-2,-764).lua b/subway/nodes/(-729,-2,-764).lua deleted file mode 100644 index 4653aa6..0000000 --- a/subway/nodes/(-729,-2,-764).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Hks7N", "Uni7N", "Hmi7N", "R")
\ No newline at end of file diff --git a/subway/nodes/(-729,3,-757).lua b/subway/nodes/(-729,3,-757).lua deleted file mode 100644 index b53c9d8..0000000 --- a/subway/nodes/(-729,3,-757).lua +++ /dev/null @@ -1,7 +0,0 @@ -F.stn("Rsi2N", "Uni2N", "Kav2N", "R") -if event.train then -setstate("Uni2SCross", "green") -end -if depart then -setstate("Dar7N", "green") -end
\ No newline at end of file diff --git a/subway/nodes/(-729,8,-435).lua b/subway/nodes/(-729,8,-435).lua deleted file mode 100644 index a254584..0000000 --- a/subway/nodes/(-729,8,-435).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Gpl7N", "Trp7N", "Shn7N", "R", 10)
\ No newline at end of file diff --git a/subway/nodes/(-731,8,-448).lua b/subway/nodes/(-731,8,-448).lua deleted file mode 100644 index 484a64b..0000000 --- a/subway/nodes/(-731,8,-448).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Shn7S", "Trp7S", "Gpl7S", "R")
\ No newline at end of file diff --git a/subway/nodes/(-732,-2,-777).lua b/subway/nodes/(-732,-2,-777).lua deleted file mode 100644 index e707895..0000000 --- a/subway/nodes/(-732,-2,-777).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Hmi7S", "Uni7S", "Hks7S", "R")
\ No newline at end of file diff --git a/subway/nodes/(-732,3,-777).lua b/subway/nodes/(-732,3,-777).lua deleted file mode 100644 index 7977383..0000000 --- a/subway/nodes/(-732,3,-777).lua +++ /dev/null @@ -1,2 +0,0 @@ - -F.stn("Kav2S", "Uni2S", "Rsi2S", "R", "M")
\ No newline at end of file diff --git a/subway/nodes/(-734,-2,-898).lua b/subway/nodes/(-734,-2,-898).lua deleted file mode 100644 index 10d6c4b..0000000 --- a/subway/nodes/(-734,-2,-898).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Uni7S", "Hks7S", "Unv7S", "L")
\ No newline at end of file diff --git a/subway/nodes/(-737,10,-386).lua b/subway/nodes/(-737,10,-386).lua deleted file mode 100644 index a61f2b3..0000000 --- a/subway/nodes/(-737,10,-386).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Cat7S", "Shn7S", "Trp7S", "L", 10)
\ No newline at end of file diff --git a/subway/nodes/(-748,6,-387).lua b/subway/nodes/(-748,6,-387).lua deleted file mode 100644 index 4f8a12a..0000000 --- a/subway/nodes/(-748,6,-387).lua +++ /dev/null @@ -1,6 +0,0 @@ -if S.line[atc_id]~="1a" then - setstate("Shn1aCrossW", "green") -else - F.stn_return_free("scl1aW", "Scl1aES", "cr") -end -atc_send("B2")
\ No newline at end of file diff --git a/subway/nodes/(-755,7,-499).lua b/subway/nodes/(-755,7,-499).lua deleted file mode 100644 index adbe3b1..0000000 --- a/subway/nodes/(-755,7,-499).lua +++ /dev/null @@ -1,6 +0,0 @@ -F.stn("Fmn4E", "Gpl4E", "Spn3E", "L") -if depart then - S.line[atc_id]="4" - setstate("Trp3E", "red") - setstate("Spn4DivIn", "st") -end
\ No newline at end of file diff --git a/subway/nodes/(-755,7,-511).lua b/subway/nodes/(-755,7,-511).lua deleted file mode 100644 index fa923af..0000000 --- a/subway/nodes/(-755,7,-511).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Per7N", "Gpl7N", "Trp7N", "L")
\ No newline at end of file diff --git a/subway/nodes/(-765,7,-491).lua b/subway/nodes/(-765,7,-491).lua deleted file mode 100644 index 247efc1..0000000 --- a/subway/nodes/(-765,7,-491).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.stn("Spn4W", "Gpl4W", "Fmn4W", "L") -F.stat("Line 4", false)
\ No newline at end of file diff --git a/subway/nodes/(-767,8,-282).lua b/subway/nodes/(-767,8,-282).lua index fcb170e..d36ddb9 100644 --- a/subway/nodes/(-767,8,-282).lua +++ b/subway/nodes/(-767,8,-282).lua @@ -1,2 +1,4 @@ + F.stn("Shn1W", "Jus1W", "Fre1W", "R") + S.line[atc_id]="1" diff --git a/subway/nodes/(-796,5,-601).lua b/subway/nodes/(-796,5,-601).lua deleted file mode 100644 index 14c9553..0000000 --- a/subway/nodes/(-796,5,-601).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Hmi7N", "Per7N", "Gpl7N", "L")
\ No newline at end of file diff --git a/subway/nodes/(-80,-2,136).lua b/subway/nodes/(-80,-2,136).lua deleted file mode 100644 index 613fb7c..0000000 --- a/subway/nodes/(-80,-2,136).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("ONb2", "OIs2", "OSm2", "L", 10)
\ No newline at end of file diff --git a/subway/nodes/(-80,-2,56).lua b/subway/nodes/(-80,-2,56).lua deleted file mode 100644 index c304322..0000000 --- a/subway/nodes/(-80,-2,56).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("OOr2", "OSc2", "ONb2", "R", 8)
\ No newline at end of file diff --git a/subway/nodes/(-803,5,-611).lua b/subway/nodes/(-803,5,-611).lua deleted file mode 100644 index 751a16b..0000000 --- a/subway/nodes/(-803,5,-611).lua +++ /dev/null @@ -1,8 +0,0 @@ -F.stn("Gpl7S", "Per7S", "Hmi7S", "L") ---F.union_wait("Per7S") ---if depart then ---S.line[atc_id]="7" --- setstate("Hmi6WDivIn", "cr") --- setstate("Fmn6W", "red") ---setstate("Hmi6ECross", "red") ---end
\ No newline at end of file diff --git a/subway/nodes/(-836,4,-698).lua b/subway/nodes/(-836,4,-698).lua deleted file mode 100644 index 58ccaad..0000000 --- a/subway/nodes/(-836,4,-698).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Uni7N", "Hmi7N", "Per7N", "R")
\ No newline at end of file diff --git a/subway/nodes/(-838,4,-708).lua b/subway/nodes/(-838,4,-708).lua deleted file mode 100644 index d764347..0000000 --- a/subway/nodes/(-838,4,-708).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Per7S", "Hmi7S", "Uni7S", "R")
\ No newline at end of file diff --git a/subway/nodes/(-845,8,-497).lua b/subway/nodes/(-845,8,-497).lua deleted file mode 100644 index 55be2b6..0000000 --- a/subway/nodes/(-845,8,-497).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Fms4E", "Fmn4E", "Gpl4E", "R")
\ No newline at end of file diff --git a/subway/nodes/(-857,8,-495).lua b/subway/nodes/(-857,8,-495).lua deleted file mode 100644 index 8293a02..0000000 --- a/subway/nodes/(-857,8,-495).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Gpl4W", "Fmn4W", "Fms4W", "R")
\ No newline at end of file diff --git a/subway/nodes/(-924,10,-396).lua b/subway/nodes/(-924,10,-396).lua deleted file mode 100644 index 8ef04e8..0000000 --- a/subway/nodes/(-924,10,-396).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Fmn4W", "Fms4W", "Mnn4W", "R") diff --git a/subway/nodes/(-926,10,-408).lua b/subway/nodes/(-926,10,-408).lua deleted file mode 100644 index a17db5c..0000000 --- a/subway/nodes/(-926,10,-408).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Mnn4E", "Fms4E", "Fmn4E", "R")
\ No newline at end of file diff --git a/subway/nodes/(-973,19,-321).lua b/subway/nodes/(-973,19,-321).lua deleted file mode 100644 index dfeca2b..0000000 --- a/subway/nodes/(-973,19,-321).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Max4E", "Mnn4E", "Fms4E", "R")
\ No newline at end of file diff --git a/subway/nodes/(-983,19,-319).lua b/subway/nodes/(-983,19,-319).lua deleted file mode 100644 index 34315e8..0000000 --- a/subway/nodes/(-983,19,-319).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Fms4W", "Mnn4W", "Max4W", "R")
\ No newline at end of file diff --git a/subway/nodes/(10,0,-10).lua b/subway/nodes/(10,0,-10).lua index 447cb5f..37b1da9 100644 --- a/subway/nodes/(10,0,-10).lua +++ b/subway/nodes/(10,0,-10).lua @@ -92,7 +92,7 @@ if du_line then end local line4 = "" if dd_line and nwt then - line4 = "Line "..(dd_line).." - "..nwt.."s" + line4 = "Line "..(dd_line).."- "..nwt.."s" end digiline_send("l14e", line1.." | "..line2.." | "..line3.." | ----------- | "..line4) diff --git a/subway/nodes/(104,8,-38).lua b/subway/nodes/(104,8,-38).lua deleted file mode 100644 index 73e7722..0000000 --- a/subway/nodes/(104,8,-38).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Ewd2S", "Chu2S", "Ori2S", "L")
\ No newline at end of file diff --git a/subway/nodes/(109,9,34).lua b/subway/nodes/(109,9,34).lua deleted file mode 100644 index 966271e..0000000 --- a/subway/nodes/(109,9,34).lua +++ /dev/null @@ -1,8 +0,0 @@ -F.stn_ilkentry("Rru1W", "Wcs1W", "Ori1W", "L") -F.lineset("1", "W") ---if event.train then ---interrupt_pos(POS(-14,3,4), "arr1") ---end ---if depart then ---interrupt_pos(POS(-14,3,4), "dep1") ---end
\ No newline at end of file diff --git a/subway/nodes/(115,8,-47).lua b/subway/nodes/(115,8,-47).lua deleted file mode 100644 index 0964cf7..0000000 --- a/subway/nodes/(115,8,-47).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Ori2N", "Chu2N", "Ewd2N", "L")
\ No newline at end of file diff --git a/subway/nodes/(119,11,-190).lua b/subway/nodes/(119,11,-190).lua deleted file mode 100644 index 50a2f7d..0000000 --- a/subway/nodes/(119,11,-190).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_nohalt("Cht2aN", "Msu2aN", "Ewd2aR")
\ No newline at end of file diff --git a/subway/nodes/(121,9,26).lua b/subway/nodes/(121,9,26).lua deleted file mode 100644 index 2f10290..0000000 --- a/subway/nodes/(121,9,26).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Ori1E", "Wcs1E", "Rru1E", "L")
\ No newline at end of file diff --git a/subway/nodes/(123,13,-12).lua b/subway/nodes/(123,13,-12).lua deleted file mode 100644 index 27f4a4c..0000000 --- a/subway/nodes/(123,13,-12).lua +++ /dev/null @@ -1,4 +0,0 @@ -if event.type == "ext_int" then - digiline_send("orhb","toggle") - return -end
\ No newline at end of file diff --git a/subway/nodes/(159,11,865).lua b/subway/nodes/(159,11,865).lua deleted file mode 100644 index 68d51db..0000000 --- a/subway/nodes/(159,11,865).lua +++ /dev/null @@ -1,6 +0,0 @@ -if get_line() ~= "XST" then --- atc_set_text_outside("Line 4 - Ice Mountain") - atc_set_text_inside("Schwarzschildt Street\nNext Stop: McFly Street") --- set_line("4") - F.lineset("4", "W") -end
\ No newline at end of file diff --git a/subway/nodes/(203,11,-186).lua b/subway/nodes/(203,11,-186).lua deleted file mode 100644 index 68b441a..0000000 --- a/subway/nodes/(203,11,-186).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Ewb2S", "Ewd2S", "Chu2S", "L")
\ No newline at end of file diff --git a/subway/nodes/(209,17,-190).lua b/subway/nodes/(209,17,-190).lua deleted file mode 100644 index 9876c81..0000000 --- a/subway/nodes/(209,17,-190).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_return("Msu2aN", "Ewd2aR", "Msu2aS", "L", "Ewd2aES", "cr", 10, nil, 10)
\ No newline at end of file diff --git a/subway/nodes/(214,11,-194).lua b/subway/nodes/(214,11,-194).lua deleted file mode 100644 index fc1a8e3..0000000 --- a/subway/nodes/(214,11,-194).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Chu2N", "Ewd2N", "Ewb2N", "L")
\ No newline at end of file diff --git a/subway/nodes/(24,5,3).lua b/subway/nodes/(24,5,3).lua deleted file mode 100644 index b359cad..0000000 --- a/subway/nodes/(24,5,3).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_return("Cht2aS", "Ori2aR", "Cht2aN", "R", "Ori2aES", "st", nil, nil, 7)
\ No newline at end of file diff --git a/subway/nodes/(2644,15,4349).lua b/subway/nodes/(2644,15,4349).lua deleted file mode 100644 index e69de29..0000000 --- a/subway/nodes/(2644,15,4349).lua +++ /dev/null diff --git a/subway/nodes/(27,16,-470).lua b/subway/nodes/(27,16,-470).lua deleted file mode 100644 index f961cdd..0000000 --- a/subway/nodes/(27,16,-470).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Smp8W", "Ctd8W", "Ppo8W", "R")
\ No newline at end of file diff --git a/subway/nodes/(27,25,26).lua b/subway/nodes/(27,25,26).lua deleted file mode 100644 index a168756..0000000 --- a/subway/nodes/(27,25,26).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.stn("OIr2", "OTh2", "OLv2", "R", 10) -atc_set_text_outside("Line O2 - Bracket Road - Origin - North Bridge - SCSI Connector Mess")
\ No newline at end of file diff --git a/subway/nodes/(317,9,26).lua b/subway/nodes/(317,9,26).lua deleted file mode 100644 index 43677f0..0000000 --- a/subway/nodes/(317,9,26).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.stn("Wcs1E", "Rru1E", "Adb1E", "L") - diff --git a/subway/nodes/(421,14,-48).lua b/subway/nodes/(421,14,-48).lua deleted file mode 100644 index e34a22e..0000000 --- a/subway/nodes/(421,14,-48).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Snb1W", "Adb1W", "Rru1W", "L")
\ No newline at end of file diff --git a/subway/nodes/(43,11,-124).lua b/subway/nodes/(43,11,-124).lua deleted file mode 100644 index 30ec325..0000000 --- a/subway/nodes/(43,11,-124).lua +++ /dev/null @@ -1,2 +0,0 @@ -set_line(2) -F.stn("Ori2aR", "Cht2aN", "Ewd2aR", "L")
\ No newline at end of file diff --git a/subway/nodes/(43,5,-64).lua b/subway/nodes/(43,5,-64).lua deleted file mode 100644 index 9a455f3..0000000 --- a/subway/nodes/(43,5,-64).lua +++ /dev/null @@ -1,3 +0,0 @@ -if event.train then - F.stn_return_free("Cht2aS", "Ori2aES", "cr") -end
\ No newline at end of file diff --git a/subway/nodes/(433,14,-54).lua b/subway/nodes/(433,14,-54).lua deleted file mode 100644 index 5b8a3dc..0000000 --- a/subway/nodes/(433,14,-54).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Rru1E", "Adb1E", "Snb1E", "L")
\ No newline at end of file diff --git a/subway/nodes/(479,3,-156).lua b/subway/nodes/(479,3,-156).lua deleted file mode 100644 index 50654f5..0000000 --- a/subway/nodes/(479,3,-156).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Dam2S", "Ewb2S", "Ewd2S", "L")
\ No newline at end of file diff --git a/subway/nodes/(491,3,-163).lua b/subway/nodes/(491,3,-163).lua deleted file mode 100644 index 0db64db..0000000 --- a/subway/nodes/(491,3,-163).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Ewd2N", "Ewb2N", "Dam2N", "L")
\ No newline at end of file diff --git a/subway/nodes/(514,-3,-2026).lua b/subway/nodes/(514,-3,-2026).lua deleted file mode 100644 index 534c3e3..0000000 --- a/subway/nodes/(514,-3,-2026).lua +++ /dev/null @@ -1 +0,0 @@ -F.stat("U21")
\ No newline at end of file diff --git a/subway/nodes/(6,5,1).lua b/subway/nodes/(6,5,1).lua deleted file mode 100644 index 5d9771a..0000000 --- a/subway/nodes/(6,5,1).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Ram2N", "Ori2N", "Chu2N", "L")
\ No newline at end of file diff --git a/subway/nodes/(628,11,-23).lua b/subway/nodes/(628,11,-23).lua deleted file mode 100644 index 7d950f0..0000000 --- a/subway/nodes/(628,11,-23).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Dam1W", "Snb1W", "Adb1W","L")
\ No newline at end of file diff --git a/subway/nodes/(640,11,-31).lua b/subway/nodes/(640,11,-31).lua deleted file mode 100644 index 4c658dc..0000000 --- a/subway/nodes/(640,11,-31).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Adb1E", "Snb1E", "Dam1E","L")
\ No newline at end of file diff --git a/subway/nodes/(711,12,-103).lua b/subway/nodes/(711,12,-103).lua deleted file mode 100644 index 0760eba..0000000 --- a/subway/nodes/(711,12,-103).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Dam2R", "Dam2S", "Ewb2S", "R")
\ No newline at end of file diff --git a/subway/nodes/(711,12,-95).lua b/subway/nodes/(711,12,-95).lua deleted file mode 100644 index dc65951..0000000 --- a/subway/nodes/(711,12,-95).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Wva1W", "Dam1W", "Snb1W", "L") diff --git a/subway/nodes/(731,4,-103).lua b/subway/nodes/(731,4,-103).lua deleted file mode 100644 index b9e1b50..0000000 --- a/subway/nodes/(731,4,-103).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Ewb2N", "Dam2N", "Dam2R", "L", 8)
\ No newline at end of file diff --git a/subway/nodes/(731,4,-95).lua b/subway/nodes/(731,4,-95).lua deleted file mode 100644 index 57f33fe..0000000 --- a/subway/nodes/(731,4,-95).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Snb1E", "Dam1E", "Wva1E","R")
\ No newline at end of file diff --git a/subway/nodes/(757,12,-100).lua b/subway/nodes/(757,12,-100).lua deleted file mode 100644 index 4ee8121..0000000 --- a/subway/nodes/(757,12,-100).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_return_free("Dam2N", "Dam2ES", "st")
\ No newline at end of file diff --git a/subway/nodes/(799,8,-103).lua b/subway/nodes/(799,8,-103).lua deleted file mode 100644 index a6dc8b1..0000000 --- a/subway/nodes/(799,8,-103).lua +++ /dev/null @@ -1,3 +0,0 @@ -F.stn_return("Dam2N", "Dam2R", "Dam2S", "C", "Dam2ES", "cr", 6, nil, 20) -F.stat("Line 2", false) -atc_set_text_outside("Line 2 - Chasm of Segfault")
\ No newline at end of file diff --git a/subway/nodes/(827,6,-222).lua b/subway/nodes/(827,6,-222).lua deleted file mode 100644 index 0154d59..0000000 --- a/subway/nodes/(827,6,-222).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Dam1E", "Wva1E", "Wvb1E","L")
\ No newline at end of file diff --git a/subway/nodes/(834,6,-210).lua b/subway/nodes/(834,6,-210).lua deleted file mode 100644 index 66125e9..0000000 --- a/subway/nodes/(834,6,-210).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Wvb1W", "Wva1W", "Dam1W", "L") diff --git a/subway/nodes/(841,18,-327).lua b/subway/nodes/(841,18,-327).lua deleted file mode 100644 index fa2857b..0000000 --- a/subway/nodes/(841,18,-327).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Wva1E", "Wvb1E", "Wvc1E","R")
\ No newline at end of file diff --git a/subway/nodes/(843,18,-315).lua b/subway/nodes/(843,18,-315).lua deleted file mode 100644 index a7857cc..0000000 --- a/subway/nodes/(843,18,-315).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Wvc1W", "Wvb1W", "Wva1W", "R")
\ No newline at end of file diff --git a/subway/nodes/(884,18,-415).lua b/subway/nodes/(884,18,-415).lua deleted file mode 100644 index 6b7fe81..0000000 --- a/subway/nodes/(884,18,-415).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Wim1R", "Wvc1W", "Wvb1W", "L")
\ No newline at end of file diff --git a/subway/nodes/(896,18,-422).lua b/subway/nodes/(896,18,-422).lua deleted file mode 100644 index 641a592..0000000 --- a/subway/nodes/(896,18,-422).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn("Wvb1E", "Wvc1E", "Wim1R","L") diff --git a/subway/nodes/(941,18,-509).lua b/subway/nodes/(941,18,-509).lua deleted file mode 100644 index 062873e..0000000 --- a/subway/nodes/(941,18,-509).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn_return_free("Wvc1E", "Wim1ES", "cr")
\ No newline at end of file diff --git a/subway/nodes/(941,18,-571).lua b/subway/nodes/(941,18,-571).lua deleted file mode 100644 index c353219..0000000 --- a/subway/nodes/(941,18,-571).lua +++ /dev/null @@ -1,2 +0,0 @@ -F.stn_return("Wvc1E", "Wim1R", "Wvc1W","R", "Wim1ES", "st") -F.lineset("1", "W")
\ No newline at end of file diff --git a/subway/nodes/(959,14,1038).lua b/subway/nodes/(959,14,1038).lua deleted file mode 100644 index d5862ff..0000000 --- a/subway/nodes/(959,14,1038).lua +++ /dev/null @@ -1,3 +0,0 @@ --- if atc_arrow then --- atc_set_text_outside("E1 - Mom Junction") --- end
\ No newline at end of file diff --git a/subway/nodes/(972,14,1052).lua b/subway/nodes/(972,14,1052).lua deleted file mode 100644 index bf0517b..0000000 --- a/subway/nodes/(972,14,1052).lua +++ /dev/null @@ -1 +0,0 @@ -atc_set_text_outside("S12 - Spawn\nvia Gardon St., Schwarzschild St., Anju Crossing, Lesnoi")
\ No newline at end of file |