diff options
91 files changed, 894 insertions, 89 deletions
diff --git a/far/init_code.lua b/far/init_code.lua index 15dfbf8..429d6ac 100644 --- a/far/init_code.lua +++ b/far/init_code.lua @@ -1,15 +1,41 @@ -- 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", + }, +} 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 +52,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 +261,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 +296,7 @@ end -- Stat from subway F.stat=function(line, init) -- statistics - -- init + if init then reftrain = atc_id a_tbt = 30 @@ -278,7 +310,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 +336,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 +345,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 +396,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 +403,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 +446,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 +492,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 +514,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 +547,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 +556,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 +579,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 +632,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 +645,6 @@ end function F.ttp_info_times(tt, starttime) - --L307 local ttf = F.ttp[tt] local tti = S.ttp[tt] local p = {} @@ -619,14 +655,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 +696,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 +732,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..e6e9bd4 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 = "13;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..3150a83 --- /dev/null +++ b/far/nodes/(1771,10,1563).lua @@ -0,0 +1,9 @@ +F.ttp_station_display({ + lines = {"FAR_W"}, + 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..f8811e3 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 = "13;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..955f13d 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 = "13;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..13f4924 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 = "13;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/(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..c28ae86 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,16 @@ 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 ", + }, } --[[ 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/(981,22,1053).lua b/il_timetable/nodes/(981,22,1053).lua index 8f5f90c..de30463 100644 --- a/il_timetable/nodes/(981,22,1053).lua +++ b/il_timetable/nodes/(981,22,1053).lua @@ -2,9 +2,9 @@ --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 +local tr="NRG" +S.ttp[tr.."_E"].force_tt_reset = true +S.ttp[tr.."_W"].force_tt_reset = true print(tr.." resetting timetable") |