diff options
| -rw-r--r-- | auto_yards/nodes/(-2029,19,733).lua | 15 | ||||
| -rw-r--r-- | durt/nodes/(-1476,11,-2588).lua | 2 | ||||
| -rw-r--r-- | durt/nodes/(-1501,11,-2588).lua | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/auto_yards/nodes/(-2029,19,733).lua b/auto_yards/nodes/(-2029,19,733).lua index f88c9f0..58ed28c 100644 --- a/auto_yards/nodes/(-2029,19,733).lua +++ b/auto_yards/nodes/(-2029,19,733).lua @@ -1,5 +1,7 @@ local yard_id = "ARC" if event.train then + + -- direct train to the headshunt to reenter the yard 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) @@ -9,6 +11,19 @@ if event.train then atc_send("S4D1A1") return end + + -- deal with ARC_2nd_EXIT_rc + local rc = F.get_rc_safe():match("ARC_2ND_EXIT_(%S+)") + print(rc) + if rc then + F.remove_rc_match("ARC_2ND_EXIT_%S+") + F.add_rc(rc) + print(F.get_rc_safe()) + atc_set_ars_disable(false) + atc_send("SM") + 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/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 |