From 1b9809da8b7b72ae9c59dbeabbfe76a26191f1a0 Mon Sep 17 00:00:00 2001 From: autocommitter Date: Mon, 28 Oct 2024 00:00:01 +0100 Subject: State at 2024-10-28 --- durt/nodes/(-2080,3,822).lua | 23 --------------------- durt/nodes/(-2080,3,827).lua | 23 +++++++++++++++++++++ durt/nodes/(-2080,3,832).lua | 44 ----------------------------------------- durt/nodes/(-2080,3,839).lua | 44 +++++++++++++++++++++++++++++++++++++++++ durt/nodes/(-4152,13,-5840).lua | 5 +++-- 5 files changed, 70 insertions(+), 69 deletions(-) delete mode 100644 durt/nodes/(-2080,3,822).lua create mode 100644 durt/nodes/(-2080,3,827).lua delete mode 100644 durt/nodes/(-2080,3,832).lua create mode 100644 durt/nodes/(-2080,3,839).lua (limited to 'durt/nodes') diff --git a/durt/nodes/(-2080,3,822).lua b/durt/nodes/(-2080,3,822).lua deleted file mode 100644 index c9d875f..0000000 --- a/durt/nodes/(-2080,3,822).lua +++ /dev/null @@ -1,23 +0,0 @@ -if not event.train then return end --not sure why we'd need anythign else, but just in case -if not atc_arrow then return end --not used in this case -if not F.has_rc("ARC_LOAD") then return end --not the train for this runaround - -if not F.has_rc("ARC_LOAD_RUNAROUND") then --train has arrived from yard. split and runaround - split_off_locomotive("A0B0",1) - F.add_rc({ - "ARC_LOAD_RUNAROUND", --runaround flag - "ARC_LOAD_HS_N", - "ARC_LOAD_AROUND", -- actual RC to send through runaround - "ARC_LOAD_HS_S", - "ARC_LOAD_HS_S_AC" - }) -else --loco has rejoined from runaround. push through to headshunt, run over loading tracks and prepare for departure - F.remove_rc("ARC_LOAD_AROUND") - F.add_rc({ - "ARC_LOAD_HS_N", - "ARC_LOAD_LOADING", - "ARC_AUTO" - }) -end -set_route(POS(-2081,4,825),"Headshunt") -atc_send("A1S2") \ No newline at end of file diff --git a/durt/nodes/(-2080,3,827).lua b/durt/nodes/(-2080,3,827).lua new file mode 100644 index 0000000..74778f4 --- /dev/null +++ b/durt/nodes/(-2080,3,827).lua @@ -0,0 +1,23 @@ +if not event.train then return end --not sure why we'd need anythign else, but just in case +if not atc_arrow then return end --not used in this case +if not F.has_rc("ARC_LOAD") then return end --not the train for this runaround + +if not F.has_rc("ARC_LOAD_RUNAROUND") then --train has arrived from yard. split and runaround + split_off_locomotive("A0B0",1) + F.add_rc({ + "ARC_LOAD_RUNAROUND", --runaround flag + "ARC_LOAD_HS_N", + "ARC_LOAD_AROUND", -- actual RC to send through runaround + "ARC_LOAD_HS_S", + "ARC_LOAD_HS_S_AC" + }) +else --loco has rejoined from runaround. push through to headshunt, run over loading tracks and prepare for departure + F.remove_rc("ARC_LOAD_AROUND") + F.add_rc({ + "ARC_LOAD_HS_N", + "ARC_LOAD_LOADING", + "ARC_AUTO" + }) +end +set_route(POS(-2081,4,830),"Headshunt") +atc_send("A1S2") \ No newline at end of file diff --git a/durt/nodes/(-2080,3,832).lua b/durt/nodes/(-2080,3,832).lua deleted file mode 100644 index 4d71348..0000000 --- a/durt/nodes/(-2080,3,832).lua +++ /dev/null @@ -1,44 +0,0 @@ --- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt -local rev_rc = "ARC_LOAD_HS_N" -local rm_rc = true -local autocouple = "ARC_LOAD_HS_N_AC" -local rm_cpl_rc = true - -__approach_callback_mode = 1 - -if event.approach and not event.has_entered then - atc_set_lzb_tsr(3) - atc_set_ars_disable(true) - return -end - -if event.train then - if not atc_arrow then --train has bounced - if F.has_rc(autocouple) then - atc_send("CplS0WD2S1") - if rm_cpl_rc then F.remove_rc({autocouple}) end - end - return - end - - if not F.has_rc(rev_rc) then --not our train. disregard - atc_set_ars_disable(false) - return - end - if rm_rc then F.remove_rc({rev_rc}) end - schedule_in(";01",atc_id) - return -end - -if event.schedule then - if not atc_id then --bounce the train that just passed - atc_send_to_train(event.msg,"B0WRD1A1S1") - 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/(-2080,3,839).lua b/durt/nodes/(-2080,3,839).lua new file mode 100644 index 0000000..4d71348 --- /dev/null +++ b/durt/nodes/(-2080,3,839).lua @@ -0,0 +1,44 @@ +-- Automatic bouncer for headshunts, assuming longer headshunt than train length. Arrow points into headshunt +local rev_rc = "ARC_LOAD_HS_N" +local rm_rc = true +local autocouple = "ARC_LOAD_HS_N_AC" +local rm_cpl_rc = true + +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + atc_set_lzb_tsr(3) + atc_set_ars_disable(true) + return +end + +if event.train then + if not atc_arrow then --train has bounced + if F.has_rc(autocouple) then + atc_send("CplS0WD2S1") + if rm_cpl_rc then F.remove_rc({autocouple}) end + end + return + end + + if not F.has_rc(rev_rc) then --not our train. disregard + atc_set_ars_disable(false) + return + end + if rm_rc then F.remove_rc({rev_rc}) end + schedule_in(";01",atc_id) + return +end + +if event.schedule then + if not atc_id then --bounce the train that just passed + atc_send_to_train(event.msg,"B0WRD1A1S1") + 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/(-4152,13,-5840).lua b/durt/nodes/(-4152,13,-5840).lua index 2611c48..8ef8f3d 100644 --- a/durt/nodes/(-4152,13,-5840).lua +++ b/durt/nodes/(-4152,13,-5840).lua @@ -35,13 +35,14 @@ local function send_train() end --no departures to collect, go straight to TYARD set_rc(table.concat(cmd," ")) - atc_send("S0WRD2A1S4") + atc_send("I+S0WR;D2A1S4") F.indicator(TYARD_notify_indicator,false) return true end if event.schedule then - if event.message == "check_again" then + print(rwt.to_string(rwt.now())..tostring(event.msg)) + if event.msg == "check_again" then if not send_train() then --will either send train or continue clock schedule_in("1;0","check_again") return -- cgit v1.2.3