diff options
Diffstat (limited to 'Crossroads')
41 files changed, 37 insertions, 41 deletions
diff --git a/Crossroads/init_code.lua b/Crossroads/init_code.lua index 7c92ec2..410b600 100644 --- a/Crossroads/init_code.lua +++ b/Crossroads/init_code.lua @@ -350,7 +350,10 @@ end function F.pdisp(stn, trk, dn) if not (stn and trk and dn) then return end - if not F.stndet[stn] or not F.stndet[stn][trk] then return end + if not F.stndet[stn] or not F.stndet[stn][trk] then + digiline_send("track"..trk, ("Track: %s\nNo departures"):format(trk)) + return + end if not S.pd[stn] then S.pd[stn] = { [trk] = {[dn] = 0} } end if not S.pd[stn][trk] then S.pd[stn][trk] = {[dn] = 0} end if not S.pd[stn][trk][dn] then S.pd[stn][trk][dn] = 0 end @@ -363,12 +366,14 @@ function F.pdisp(stn, trk, dn) trk, F.lines[v[1]].name, F.stnlist[v[4] or "N/A"] or v[4] or "N/A", F.stnlist[v[2] or "N/A"] or v[2] or "N/A") end + if #t == 0 then + t[1] = ("Track: %s\nNo departures"):format(trk) + end S.pdt[stn][trk] = t end - local n = S.pd[stn][trk][dn] + 1 local t = S.pdt[stn][trk] + local n = S.pd[stn][trk][dn] % #t + 1 digiline_send("track"..trk,t[n]) - if n >= #t then n = 0 end S.pd[stn][trk][dn] = n end @@ -425,6 +430,8 @@ F.stnlist = { cg = "Colored Grasses", clockwise = "Clockwise", counterclockwise = "Counterclockwise", + cr = "Crossroads", + cra = "Crossroads Airport", cras = "ARSE7's Shop", crbfost = "Station East", crbfsm = "Station St. Central", @@ -433,10 +440,11 @@ F.stnlist = { crch = "Crossroads City Hall", crchs = "City Hall South", crmtrail = "Mountain Railway Terminus", + crne = "Crossroads Northeast", crshelter1 = "Shelter I", crsfterm = "South Forest St. Terminal", crsmacker = "Smacker's Station", - crwm = "West Mountains", + crwm = "Crossroads West", elchateau = "Chateau d'Erstazi", elgp = "Greener Pastures", elsf = "Salt Factory", @@ -463,9 +471,10 @@ F.stnlist = { occrt = "CRT Office", ocmushroom = "Mushroom Market", ocoutskirts = "Ocean City Outskirts", - phsc = "Southern Crossing", + phsc = "Southern Cross", phwest = "Personhood West", scc = "Silver Coast Central", + sce = "Silver Coast East", scn = "Silver Coast North", scs = "Silver Coast South", ["SWALD-harbor"] = "Sakurawäldle Hafen", @@ -493,21 +502,21 @@ end F.lines = { ["AB"] = { - name = "ATL-B Commuter", short = "ATL-B/C", + name = "ATL Bronze Line", short = "ATL-B", ring = false, interval = 240, - [1] = { {"crch","2"}, --[[ {"crwm","3"},]] {"scs","N1"}, {"scc","N1"}, {"scn","N1"}, {"cg","1"}, {"thecube","4"}, --[[{"phsc","N"},]] {"grsc", "4"}, {"phwest","1"} }, - [2] = { {"phwest","1"}, {"grsc", "3"}, --[[{"phsc","S"},]] {"thecube","1"}, {"cg","2"}, {"scn","S1"}, {"scc","S1"}, {"scs","S1"}, --[[ {"crwm","4"}, ]] {"crch","2"} }, + [1] = { {"crne","3"}, {"cr","34"}, --[[ {"crwm","3"},]] {"scs","N1"}, {"scc","N1"}, {"scn","N1"}, {"cg","1"}, {"thecube","4"}, {"phsc","4"}, {"grsc", "4"}, {"phwest","1"} }, + [2] = { {"phwest","1"}, {"grsc", "3"}, {"phsc","3"}, {"thecube","1"}, {"cg","2"}, {"scn","S1"}, {"scc","S1"}, {"scs","S1"}, --[[ {"crwm","4"}, ]] {"cr","31"}, {"crne", "3"} }, }, - ["ABE"] = { - name = "ATL-B Express", short = "ATL-B/E", + ["AM"] = { + name = "ATL Mithril Line", short = "ATL-M", ring = false, interval = 240, - [1] = {{"crch","1"}, {"scc","N2"}, {"cg","1"}, {"thecube", "4"}, {"phwest", "2"}}, - [2] = {{"phwest", "2"}, {"thecube", "1"}, {"cg", "2"}, {"scc", "S2"}, {"crch", "1"}}, + [1] = {{"cra","1"}, {"cr","32"}, {"sce", "1"}}, + [2] = {{"sce","1"}, {"cr","33"}, {"cra", "1"}}, }, ["AZ"] = { - name = "ATL-Z", short = "ATL-Z", + name = "ATL Zinc Line", short = "ATL-Z", ring = false, interval = 480, [1] = { {"Bts","3"}, {"evo","N/A"}, {"scs","N1"}, {"scc","N1"}, {"scn","N1"}, {"oc","K1"}, --[[{"elgp","N"}, {"elsf","E"}, {"elchateau","S"}]] }, diff --git a/Crossroads/nodes/(1112,10,2629).lua b/Crossroads/nodes/(1112,10,2629).lua new file mode 100644 index 0000000..51a8690 --- /dev/null +++ b/Crossroads/nodes/(1112,10,2629).lua @@ -0,0 +1 @@ +F.stn2gen("phsc", "3", "L")
\ No newline at end of file diff --git a/Crossroads/nodes/(1112,10,2635).lua b/Crossroads/nodes/(1112,10,2635).lua deleted file mode 100644 index 2333864..0000000 --- a/Crossroads/nodes/(1112,10,2635).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("phsc","S","L")
\ No newline at end of file diff --git a/Crossroads/nodes/(1119,16,2757).lua b/Crossroads/nodes/(1119,16,2753).lua index dde01ed..dde01ed 100644 --- a/Crossroads/nodes/(1119,16,2757).lua +++ b/Crossroads/nodes/(1119,16,2753).lua diff --git a/Crossroads/nodes/(1122,10,2639).lua b/Crossroads/nodes/(1122,10,2639).lua deleted file mode 100644 index 5d35b02..0000000 --- a/Crossroads/nodes/(1122,10,2639).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("phsc", "N", "L")
\ No newline at end of file diff --git a/Crossroads/nodes/(1122,10,2645).lua b/Crossroads/nodes/(1122,10,2645).lua new file mode 100644 index 0000000..2d79a8d --- /dev/null +++ b/Crossroads/nodes/(1122,10,2645).lua @@ -0,0 +1 @@ +F.stn2gen("phsc", "4", "L")
\ No newline at end of file diff --git a/Crossroads/nodes/(1299,8,978).lua b/Crossroads/nodes/(1299,8,978).lua new file mode 100644 index 0000000..ec79ea5 --- /dev/null +++ b/Crossroads/nodes/(1299,8,978).lua @@ -0,0 +1 @@ +F.stn2gen("sce", "1", "R", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1310,8,975).lua b/Crossroads/nodes/(1310,8,975).lua new file mode 100644 index 0000000..f5a31b7 --- /dev/null +++ b/Crossroads/nodes/(1310,8,975).lua @@ -0,0 +1 @@ +F.stn2gen("sce", "2", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1637,-6,919).lua b/Crossroads/nodes/(1637,-6,919).lua new file mode 100644 index 0000000..f43bd43 --- /dev/null +++ b/Crossroads/nodes/(1637,-6,919).lua @@ -0,0 +1 @@ +F.stn2gen("cr", "34", "L")
\ No newline at end of file diff --git a/Crossroads/nodes/(1645,-6,919).lua b/Crossroads/nodes/(1645,-6,919).lua new file mode 100644 index 0000000..7c7f66b --- /dev/null +++ b/Crossroads/nodes/(1645,-6,919).lua @@ -0,0 +1 @@ +F.stn2gen("cr", "33", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1648,-6,944).lua b/Crossroads/nodes/(1648,-6,944).lua new file mode 100644 index 0000000..0da0573 --- /dev/null +++ b/Crossroads/nodes/(1648,-6,944).lua @@ -0,0 +1 @@ +F.stn2gen("cr", "32", "R")
\ No newline at end of file diff --git a/Crossroads/nodes/(1656,-6,944).lua b/Crossroads/nodes/(1656,-6,944).lua new file mode 100644 index 0000000..4a14c98 --- /dev/null +++ b/Crossroads/nodes/(1656,-6,944).lua @@ -0,0 +1 @@ +F.stn2gen("cr", "31", "L")
\ No newline at end of file diff --git a/Crossroads/nodes/(1671,7,990).lua b/Crossroads/nodes/(1671,7,990).lua deleted file mode 100644 index 839b9ed..0000000 --- a/Crossroads/nodes/(1671,7,990).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crsmacker", "R3", "L", true, true)
\ 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/(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/(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/(1723,10,790).lua b/Crossroads/nodes/(1723,10,790).lua deleted file mode 100644 index 10cf496..0000000 --- a/Crossroads/nodes/(1723,10,790).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crsfterm", "1N", "L", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1757,-1,673).lua b/Crossroads/nodes/(1757,-1,673).lua new file mode 100644 index 0000000..58e48bb --- /dev/null +++ b/Crossroads/nodes/(1757,-1,673).lua @@ -0,0 +1 @@ +F.stn2gen("cra", "1", "L", true, true)
\ No newline at end of file diff --git a/Crossroads/nodes/(1763,20,996).lua b/Crossroads/nodes/(1763,20,996).lua new file mode 100644 index 0000000..17833ac --- /dev/null +++ b/Crossroads/nodes/(1763,20,996).lua @@ -0,0 +1,5 @@ +if atc_arrow then + if get_line() == "ABE" then + set_line("AB") + end +end
\ 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/(1791,-6,1007).lua b/Crossroads/nodes/(1791,-6,1007).lua deleted file mode 100644 index 6c812ee..0000000 --- a/Crossroads/nodes/(1791,-6,1007).lua +++ /dev/null @@ -1 +0,0 @@ -F.stn2gen("crch", "11", "L", true, true)
\ 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/(2284,-6,978).lua b/Crossroads/nodes/(2284,-6,978).lua new file mode 100644 index 0000000..cef4930 --- /dev/null +++ b/Crossroads/nodes/(2284,-6,978).lua @@ -0,0 +1 @@ +F.stn2gen("crne", "3", "R", true, true)
\ No newline at end of file |