diff options
194 files changed, 1450 insertions, 207 deletions
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/(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/(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/auto_yards/init_code.lua b/auto_yards/init_code.lua index f3b4282..3d442bc 100644 --- a/auto_yards/init_code.lua +++ b/auto_yards/init_code.lua @@ -86,8 +86,9 @@ if event.init then S.known_trains = { ['120684'] = "LHF #1", --Maverick2797 ['249165'] = "LHF #2", --Maverick2797 - ['734206'] = "ARC-BY", --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 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/(-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/(-1947,16,837).lua b/auto_yards/nodes/(-1947,16,837).lua index 0a82dfd..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 = {['S27_EXPORT'] = 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/(-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/(-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/(-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/(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/(-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/(-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/(-1973,16,800).lua b/durt/nodes/(-1973,16,800).lua index 5456ccc..0e7e05c 100644 --- a/durt/nodes/(-1973,16,800).lua +++ b/durt/nodes/(-1973,16,800).lua @@ -6,8 +6,9 @@ local sections ={ 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", @@ -22,27 +23,28 @@ local function send_train() "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 -- 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 + "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 - if print_notification then print(rwt.to_string(rwt.now()).. " "..notification_id.." send_train() has local job from STORE_4") end - cmd = { -- collect wagons from BYARD, and park loco in loco siding if no departures at ARC + -- 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", "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", - "ARC_YARD_REENTRY", - "ARC_2ND_EXIT_ARC_AUTO_S23S", "S23E3N", "BYARD", "BY_RTS", 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/(-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/(-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/(-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/(-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/(-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/(-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,-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/(-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/(-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/(-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/(-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/far/init_code.lua b/far/init_code.lua index 15dfbf8..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 @@ -229,7 +262,7 @@ function F.stop_sd(st_name, doors, departcommand, minstoptime, d_int, d_off) local timenow = os.time() local timerdy = timenow + minstoptime local wait = d_int - ((timerdy-d_off) % d_int) - local waitcorr = math.floor(wait*0.66) + 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 @@ -264,7 +297,7 @@ end -- Stat from subway F.stat=function(line, init) -- statistics - -- init + if init then reftrain = atc_id a_tbt = 30 @@ -278,7 +311,7 @@ F.stat=function(line, init) end if not a_tbtmax then a_tbtmax = 30 end if not c_tbtmax then c_tbtmax = 0 end - --real code + if event.train then local time = os.time() c_not = c_not + 1 @@ -304,7 +337,6 @@ F.stat=function(line, init) end end -S.timetake = {} function F.timetake_start(ttname) if not atc_id then return end local nouw = rwt.to_secs(rwt.now()) @@ -314,7 +346,6 @@ function F.timetake_start(ttname) S.timetake[ttname][atc_id] = nouw end ---L100 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 @@ -366,28 +397,6 @@ S.ttt[train_id] = { - trains } ]] -local STOP_TIME = 10 -local STOPCMD="B0WO" -local DEPCMD="A1OCD1SM" -local RDEPCMD="RA1OCD1SM" -local DYNAMIC_THR = 10 -local DYNAMIC_EN = false - -if not S.ttp then S.ttp = {} end -if not S.ttt 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", - }, -} - --[[ Timetable entry point. The train finalizes its last timetable and registers itself on the given timetable instance. It departs at the next time slot @@ -395,13 +404,27 @@ registers itself on the given timetable instance. It departs at the next time sl F.ttp_begin({ stn = "Warmoneaye", -- station name tt = "CFE_S", -- timetable ID - depint = "05;00", --departure slot interval + 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) @@ -424,8 +447,11 @@ function F.ttp_begin(p) 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(STOPCMD .. p.doorside) + 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. @@ -467,21 +493,21 @@ function F.ttp_begin(p) 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 + 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(RDEPCMD) + atc_send(F.RDEPCMD) else - atc_send(DEPCMD) + atc_send(F.DEPCMD) end end end --[[ Generic stop on timetable. Any train that has a TT instance registered -stops here, waits STOP_TIME and continues. Behavior can be altered by options: +stops here, waits F.STOP_TIME and continues. Behavior can be altered by options: F.ttp_stop({ stn = "Personhood West", -- station name doorside = "L", @@ -489,10 +515,20 @@ F.ttp_stop({ 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 + STOP_TIME if not provided + -- 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 @@ -512,7 +548,7 @@ function F.ttp_stop(p) 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) + atc_set_ars_disable(true) end atc_set_lzb_tsr(2) atc_set_text_inside("Next stop: "..p.stn) @@ -521,17 +557,19 @@ function F.ttp_stop(p) --!-- disaster recovery --!-- -- if event.approach and event.has_entered then -- print(atc_id,p.stn,"Disaster Recovery...") --- atc_send(DEPCMD) +-- 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(STOPCMD..p.doorside) + atc_send(F.STOPCMD..p.doorside) local time_now = rwt.now() -- update our location and determine desired and planned departure ---L200 - local next_dep_time = rwt.add(time_now, STOP_TIME) + local next_dep_time = rwt.add(time_now, F.STOP_TIME) trn.location = p.stn trn.desired_dep = nil trn.actual_dep = nil @@ -542,16 +580,16 @@ function F.ttp_stop(p) 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] + STOP_TIME) + tti.travel_times[p.stn] + F.STOP_TIME) -- dyn travel time - if DYNAMIC_EN then + if F.DYNAMIC_EN then local ttpd = rwt.diff(next_dep_time, trn.desired_dep) - if ttpd > DYNAMIC_THR then - local new_trav = rwt.diff(trn.initial_dep, time_now) + DYNAMIC_THR + 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 + STOP_TIME) + new_trav + F.STOP_TIME) end end end @@ -595,7 +633,7 @@ function F.ttp_stop(p) 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(DEPCMD) + 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 @@ -608,7 +646,6 @@ end function F.ttp_info_times(tt, starttime) - --L307 local ttf = F.ttp[tt] local tti = S.ttp[tt] local p = {} @@ -619,14 +656,13 @@ function F.ttp_info_times(tt, starttime) 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, STOP_TIME), false).. + " 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) - --L307 local ttf = F.ttp[tt] local tti = S.ttp[tt] local p = {} @@ -661,7 +697,6 @@ end show_trainid = false, }]] function F.ttp_station_display(p) - --L425 -- { dep, text } local next_trains = {} local function is_past_station(tstn, stnorder) @@ -698,7 +733,7 @@ function F.ttp_station_display(p) 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) + STOP_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]) 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 6c35d7e..1737450 100644 --- a/far/nodes/(10728,46,1225).lua +++ b/far/nodes/(10728,46,1225).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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 79b390d..86fcc5c 100644 --- a/far/nodes/(10731,46,1251).lua +++ b/far/nodes/(10731,46,1251).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(13448,13,717).lua b/far/nodes/(13448,13,717).lua index 1504037..0dec211 100644 --- a/far/nodes/(13448,13,717).lua +++ b/far/nodes/(13448,13,717).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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 7a55833..b33b15c 100644 --- a/far/nodes/(13481,13,713).lua +++ b/far/nodes/(13481,13,713).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(15454,14,1055).lua b/far/nodes/(15454,14,1055).lua index 6382c79..bf386d3 100644 --- a/far/nodes/(15454,14,1055).lua +++ b/far/nodes/(15454,14,1055).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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 3390fa6..3428cf8 100644 --- a/far/nodes/(15472,14,1131).lua +++ b/far/nodes/(15472,14,1131).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(1753,8,1570).lua b/far/nodes/(1753,8,1570).lua index 52fa2df..7d945dc 100644 --- a/far/nodes/(1753,8,1570).lua +++ b/far/nodes/(1753,8,1570).lua @@ -1,16 +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 = "05;00", --departure slot interval - depoff = "03;15", --departure slot offset + depint = "8;00", --departure slot interval + depoff = "00;00", --departure slot offset doorside = "L", reverse = true, only_lines = {['FAR'] = true}, force_tt_reset = false, -}) -]] - -F.save_train(POS(1755,8,1570), "west") + pos = POS(1755,8,1570), + direction = "west", +})
\ 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..a70b572 --- /dev/null +++ b/far/nodes/(1771,10,1563).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W", "FAR_E"}, + departure = {}, + station = "Salt Factory", + title = "Salt Factory", + interval = 15, + display1 = "d1", +-- display2 = "d2", +})
\ No newline at end of file diff --git a/far/nodes/(18288,36,607).lua b/far/nodes/(18288,36,607).lua index df6d078..6c37e96 100644 --- a/far/nodes/(18288,36,607).lua +++ b/far/nodes/(18288,36,607).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(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 a5be393..10ed638 100644 --- a/far/nodes/(18320,36,602).lua +++ b/far/nodes/(18320,36,602).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(19710,8,689).lua b/far/nodes/(19710,8,689).lua index 0b52efb..4830494 100644 --- a/far/nodes/(19710,8,689).lua +++ b/far/nodes/(19710,8,689).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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 f0f99a3..959c682 100644 --- a/far/nodes/(19741,8,684).lua +++ b/far/nodes/(19741,8,684).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(2049,9,1480).lua b/far/nodes/(2049,9,1480).lua index 95b9702..bf11028 100644 --- a/far/nodes/(2049,9,1480).lua +++ b/far/nodes/(2049,9,1480).lua @@ -1,5 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false - +--[[ 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 ba7bc9a..a9cb161 100644 --- a/far/nodes/(2066,9,1459).lua +++ b/far/nodes/(2066,9,1459).lua @@ -1,5 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -local show_print = false - +--[[ 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/(21433,9,957).lua b/far/nodes/(21433,9,957).lua index e08ab8b..0fbf73f 100644 --- a/far/nodes/(21433,9,957).lua +++ b/far/nodes/(21433,9,957).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(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/(21445,9,984).lua b/far/nodes/(21445,9,984).lua index 50cec1a..4a7e799 100644 --- a/far/nodes/(21445,9,984).lua +++ b/far/nodes/(21445,9,984).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(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 599cfb4..ae9b3d5 100644 --- a/far/nodes/(23191,15,1481).lua +++ b/far/nodes/(23191,15,1481).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(23199,15,1512).lua b/far/nodes/(23199,15,1512).lua index c2d2bf1..3cd8b5b 100644 --- a/far/nodes/(23199,15,1512).lua +++ b/far/nodes/(23199,15,1512).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(25670,10,1575).lua b/far/nodes/(25670,10,1575).lua index 4968064..4edc9d0 100644 --- a/far/nodes/(25670,10,1575).lua +++ b/far/nodes/(25670,10,1575).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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 e542f39..1182163 100644 --- a/far/nodes/(25720,10,1519).lua +++ b/far/nodes/(25720,10,1519).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(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 d859796..0000000 --- a/far/nodes/(26343,30,1503).lua +++ /dev/null @@ -1,3 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -F.save_train(POS( 26343,30,1503 ), "west") diff --git a/far/nodes/(26346,30,1500).lua b/far/nodes/(26346,30,1500).lua deleted file mode 100644 index 832d48d..0000000 --- a/far/nodes/(26346,30,1500).lua +++ /dev/null @@ -1,3 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -F.save_train(POS( 26346,30,1500 ), "east")
\ 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/(2839,14,1562).lua b/far/nodes/(2839,14,1562).lua index b533050..4b27fd8 100644 --- a/far/nodes/(2839,14,1562).lua +++ b/far/nodes/(2839,14,1562).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -F.save_train(POS( 2839,14,1562 ), "west")
\ No newline at end of file +--[[ +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 index ce64f69..4b5ce90 100644 --- a/far/nodes/(2865,14,1575).lua +++ b/far/nodes/(2865,14,1575).lua @@ -1,4 +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 f3f6838..5a5e32d 100644 --- a/far/nodes/(28834,24,1382).lua +++ b/far/nodes/(28834,24,1382).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -F.save_train(POS(28834,24,1382), "west")
\ 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 4171373..523fd9f 100644 --- a/far/nodes/(28866,24,1378).lua +++ b/far/nodes/(28866,24,1378).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(30785,15,1711).lua b/far/nodes/(30785,15,1711).lua index ea86beb..4ae2af0 100644 --- a/far/nodes/(30785,15,1711).lua +++ b/far/nodes/(30785,15,1711).lua @@ -17,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/(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 3a560e0..919a0cc 100644 --- a/far/nodes/(30856,15,1814).lua +++ b/far/nodes/(30856,15,1814).lua @@ -1,3 +1,18 @@ -- far_luaatctrack_spot_check_01.lua -F.save_train(POS(30856,15,1814), "east")
\ 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 9f3ec31..f42aa48 100644 --- a/far/nodes/(30863,15,1807).lua +++ b/far/nodes/(30863,15,1807).lua @@ -1,3 +1,18 @@ -- far_luaatctrack_spot_check_01.lua -F.save_train(POS(30863,15,1807), "east")
\ 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 03de4fa..273875d 100644 --- a/far/nodes/(30870,15,1800).lua +++ b/far/nodes/(30870,15,1800).lua @@ -1,3 +1,18 @@ -- far_luaatctrack_spot_check_01.lua -F.save_train(POS(30870,15,1800), "east")
\ 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/(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 4e143ee..d421275 100644 --- a/far/nodes/(3978,8,1756).lua +++ b/far/nodes/(3978,8,1756).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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 d59fa08..e039644 100644 --- a/far/nodes/(3983,8,1774).lua +++ b/far/nodes/(3983,8,1774).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua -F.save_train(POS(3983,8,1774), "east")
\ 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/(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 ad7151c..0000000 --- a/far/nodes/(4586,7,2162).lua +++ /dev/null @@ -1,3 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -F.save_train(POS(4586,7,2162), "west") 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 2f23135..0000000 --- a/far/nodes/(4614,7,2137).lua +++ /dev/null @@ -1,3 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -F.save_train(POS(4614,7,2137), "east") 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/(5323,32,2321).lua b/far/nodes/(5323,32,2321).lua new file mode 100644 index 0000000..dccf23d --- /dev/null +++ b/far/nodes/(5323,32,2321).lua @@ -0,0 +1,3 @@ +-- far_luaatctrack_spot_check_01.lua + +F.save_train(POS(5323,32,2321), "west") 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/(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,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 9e62790..0000000 --- a/far/nodes/(5856,21,2315).lua +++ /dev/null @@ -1,3 +0,0 @@ --- far_luaatctrack_spot_check_01.lua - -F.save_train(POS(5856,21,2315), "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 dc7e197..9964e46 100644 --- a/far/nodes/(6874,23,2199).lua +++ b/far/nodes/(6874,23,2199).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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 a0ca339..b9f100d 100644 --- a/far/nodes/(6890,23,2175).lua +++ b/far/nodes/(6890,23,2175).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/(8534,11,1789).lua b/far/nodes/(8534,11,1789).lua index 5dd7543..b7e9594 100644 --- a/far/nodes/(8534,11,1789).lua +++ b/far/nodes/(8534,11,1789).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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 b644cc5..41625ac 100644 --- a/far/nodes/(8558,11,1758).lua +++ b/far/nodes/(8558,11,1758).lua @@ -1,3 +1,13 @@ -- far_luaatctrack_spot_check_01.lua +--[[ 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/il_timetable/init_code.lua b/il_timetable/init_code.lua index 9357130..eb89e27 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,26 @@ 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 ", + }, + DTLE1_N = { + outside_text = "[DTLE1] Banana Place", + inside_line_desc = "Dario Train Lines Express 1 (DTLE1) to Banana Place", + stn_display = "DTLE1 Banana Pl.", + }, + DTLE1_S = { + outside_text = "[BAK] Morija North", + inside_line_desc = "Baka Express (BAK) to Morija North", + stn_display = "DTLE1 Morija N. ", + }, } --[[ 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/(-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/(-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/(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/(1191,16,6123).lua b/il_timetable/nodes/(1191,16,6123).lua new file mode 100644 index 0000000..0dff8a1 --- /dev/null +++ b/il_timetable/nodes/(1191,16,6123).lua @@ -0,0 +1,9 @@ +F.ttp_begin({ + stn = "Namespace Mountains", -- station name + tt = "DTLE1_S", -- timetable ID + depint = "00;30", --departure slot interval + depoff = "00;00", --departure slot offset + doorside = "R", + only_lines = { DTLE1 = true }, + force_tt_reset = false, +})
\ No newline at end of file diff --git a/il_timetable/nodes/(1194,16,6140).lua b/il_timetable/nodes/(1194,16,6140).lua new file mode 100644 index 0000000..6a555f2 --- /dev/null +++ b/il_timetable/nodes/(1194,16,6140).lua @@ -0,0 +1,6 @@ +F.ttp_stop({ + stn = "Namespace Mountains", -- station name + doorside = "R", + only_lines = { DTLE1 = true }, + end_of_tt = { DTLE1 = true, DTLE1_N = true }, +})
\ 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 05dd00b..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 = "02;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 ba93d1d..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 = "07;30", --departure slot offset + depoff = "08;30", --departure slot offset doorside = "R", reverse = true, only_lines = nil, 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/(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/(4587,7,2174).lua b/il_timetable/nodes/(4587,7,2174).lua index 5e9d62c..5ed6e8e 100644 --- a/il_timetable/nodes/(4587,7,2174).lua +++ b/il_timetable/nodes/(4587,7,2174).lua @@ -7,4 +7,14 @@ F.ttp_begin({ reverse = true, only_lines = { E85 = true }, force_tt_reset = false, +}) +F.ttp_begin({ + stn = "Morija North", -- station name + tt = "DTLE1_N", -- timetable ID + depint = "05;00", --departure slot interval + depoff = "07;30", --departure slot offset + doorside = "L", + reverse = true, + only_lines = { DTLE1 = true }, + force_tt_reset = false, })
\ 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..c4bed49 --- /dev/null +++ b/il_timetable/nodes/(4602,9,2181).lua @@ -0,0 +1,7 @@ +F.ttp_station_display({ + lines = {"E85_N", "E85_S", "DTLE1_N", "DTLE1_S"}, + departure = {}, + station = "Morija North", + title = "Morija North", + display1 = "d1", +})
\ 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 8f5f90c..9e79f93 100644 --- a/il_timetable/nodes/(981,22,1053).lua +++ b/il_timetable/nodes/(981,22,1053).lua @@ -1,10 +1,7 @@ ---S.ttt["901424"] = nil ---S.ttp["E85_N"] = nil -nope() - -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,21,1053).lua b/il_timetable/nodes/(982,21,1053).lua index c00a6ff..00928a4 100644 --- a/il_timetable/nodes/(982,21,1053).lua +++ b/il_timetable/nodes/(982,21,1053).lua @@ -1,5 +1,5 @@ --W/E -local line = "E16" +local line = "FAR" lines = F.ttp_info_times(line.."_W", "00;00") linestr = F.ttp_info_trains(line.."_W", "00;00") diff --git a/il_timetable/nodes/(982,22,1053).lua b/il_timetable/nodes/(982,22,1053).lua new file mode 100644 index 0000000..73b9d08 --- /dev/null +++ b/il_timetable/nodes/(982,22,1053).lua @@ -0,0 +1,5 @@ +-- 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,21,1053).lua b/il_timetable/nodes/(983,21,1053).lua new file mode 100644 index 0000000..84bed9c --- /dev/null +++ b/il_timetable/nodes/(983,21,1053).lua @@ -0,0 +1,3 @@ +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 index 23b5dea..493aeb1 100644 --- a/il_timetable/nodes/(983,22,1053).lua +++ b/il_timetable/nodes/(983,22,1053).lua @@ -1 +1 @@ -S.ttt["187794"] = nil
\ No newline at end of file +S.ttt["732702"] = nil
\ No newline at end of file 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/(4049,24,5652).lua b/m4/nodes/(4045,24,5650).lua index 037b135..037b135 100644 --- a/m4/nodes/(4049,24,5652).lua +++ b/m4/nodes/(4045,24,5650).lua 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/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/(-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/(-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/(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) |