diff options
Diffstat (limited to 'subway')
| -rw-r--r-- | subway/nodes/(-14,3,4).lua | 11 | ||||
| -rw-r--r-- | subway/nodes/(-29,3,-80).lua | 20 | ||||
| -rw-r--r-- | subway/nodes/(10,0,-10).lua | 9 |
3 files changed, 37 insertions, 3 deletions
diff --git a/subway/nodes/(-14,3,4).lua b/subway/nodes/(-14,3,4).lua index 825989c..2a14ddc 100644 --- a/subway/nodes/(-14,3,4).lua +++ b/subway/nodes/(-14,3,4).lua @@ -11,6 +11,12 @@ if event.ext_int then nwaiting = nnwaiting nnwaiting = nil setint=true + elseif event.message == "dep44" then + next_appr = 44 + appr_tmr = appr_time[4] + nwaiting = nnwaiting + nnwaiting = nil + setint=true elseif event.message == "dep1" then next_appr = 1 appr_tmr = appr_time[1] @@ -21,6 +27,8 @@ if event.ext_int then if nwaiting then nnwaiting = 1 else nwaiting = 1 end elseif event.message == "arr4" then if nwaiting then nnwaiting = 4 else nwaiting = 4 end + elseif event.message == "arr44" then + if nwaiting then nnwaiting = 44 else nwaiting = 44 end elseif event.message == "depo" then next_appr = nil end @@ -47,7 +55,8 @@ if appr_tmr <= 0 then end local txt = { [1] = "Palm Bay", - [4] = "Apple Grove", + [4] = "Ice Mntn", + [44] = "Showroom", } local line1, line2, line3 = "", "", "" if next_appr then diff --git a/subway/nodes/(-29,3,-80).lua b/subway/nodes/(-29,3,-80).lua index e10cb8f..c1c1488 100644 --- a/subway/nodes/(-29,3,-80).lua +++ b/subway/nodes/(-29,3,-80).lua @@ -1,7 +1,23 @@ F.stn_ilk("Erd4E", "iob4E", "Ori4E", "R") if event.train then -interrupt_pos(POS(10,0,-10), "arr"..S.line[atc_id]) +if get_line()=="4" then + if get_rc()=="NY" then + interrupt_pos(POS(10,0,-10), "arr44") + else + interrupt_pos(POS(10,0,-10), "arr4") + end +else + interrupt_pos(POS(10,0,-10), "arr1") +end end if depart then -interrupt_pos(POS(10,0,-10), "dep"..S.line[atc_id]) +if get_line()=="4" then + if get_rc()=="NY" then + interrupt_pos(POS(10,0,-10), "dep44") + else + interrupt_pos(POS(10,0,-10), "dep4") + end +else + interrupt_pos(POS(10,0,-10), "dep1") +end end
\ No newline at end of file diff --git a/subway/nodes/(10,0,-10).lua b/subway/nodes/(10,0,-10).lua index 9121a78..447cb5f 100644 --- a/subway/nodes/(10,0,-10).lua +++ b/subway/nodes/(10,0,-10).lua @@ -17,10 +17,18 @@ if event.ext_int then n_wait = nil appr_tmr = appr_time setint=true + elseif event.message == "dep44" then + if n_appr then in_stn = n_appr + 0 end + n_appr = 44 + n_wait = nil + appr_tmr = appr_time + setint=true elseif event.message == "arr1" then n_wait = 1 elseif event.message == "arr4" then n_wait = 4 + elseif event.message == "arr44" then + n_wait = 44 elseif event.message == "arro" and not in_stn then in_stn = n_appr n_appr = nil @@ -74,6 +82,7 @@ end local txt = { [1] = "Windy Mtns.", [4] = "Schwarzs.", + [44] = "NYE Sq.", } local line1, line2, line3 = "", "", "" if du_line then |