diff options
| -rw-r--r-- | auto_yards/init_code.lua | 6 | ||||
| -rw-r--r-- | durt/nodes/(-678,20,2478).lua | 1 | ||||
| -rw-r--r-- | durt/nodes/(1904,8,9057).lua | 3 | ||||
| -rw-r--r-- | durt/nodes/(1906,7,9136).lua | 2 | ||||
| -rw-r--r-- | durt/nodes/(1949,7,9112).lua | 1 | ||||
| -rw-r--r-- | il_timetable/nodes/(1936,7,9131).lua | 2 |
6 files changed, 11 insertions, 4 deletions
diff --git a/auto_yards/init_code.lua b/auto_yards/init_code.lua index ebab6e2..7c37bc1 100644 --- a/auto_yards/init_code.lua +++ b/auto_yards/init_code.lua @@ -166,6 +166,8 @@ F.yard_arrival = function(yard_id,this_dir) -- arrow points towards yard end atc_set_ars_disable(false) atc_send("S6") + + print(rwt.to_string(rwt.now())) print("YARD: "..yard_id..": Train "..atc_id.." enters from the "..tostring(this_dir).." direction and "..((rts and "will") or "won't").." return in the same direction") print("YARD: "..yard_id..": Length "..train_length()) return @@ -180,6 +182,7 @@ F.yard_arrival = function(yard_id,this_dir) -- arrow points towards yard if event.train and atc_arrow then if F.indicator(yard.active_indicator_pos) then + print(rwt.to_string(rwt.now())) print("YARD: "..yard_id..": Train "..atc_id.." has arrived and has to wait for the yard to deactivate.") schedule_in(";10","recheck") return @@ -286,6 +289,7 @@ F.headshunt_yard = function(yard_id,this_dir) -- arrow points toward yard schedule_in(";01",atc_id) return else + print(rwt.to_string(rwt.now())) print("Preparing train "..atc_id.." to depart "..yard_id.." yard.") if get_line() ~= "LHF" then -- LHF trains will always only collect the * lane for that direction. This code is for other trains local collect = F.get_rc_safe():match(yard_id.."_COLLECT_(%S+)") -- will only match to the first _COLLECT RC to avoid excessively long trains in the headshunt @@ -350,6 +354,7 @@ F.headshunt_exit = function(yard_id,this_dir) -- arrow points out of yard if event.train then if atc_arrow and (F.indicator(yard.dir_indicator_pos) == this_dir) then if F.has_rc(yard_id.."_DEPART") then + print(rwt.to_string(rwt.now())) print("YARD: "..yard_id..": Train "..atc_id.." has a length of "..train_length()) print("YARD: "..yard_id..": It will depart in the "..tostring(this_dir).." direction.") unset_autocouple() @@ -384,6 +389,7 @@ F.headshunt_exit = function(yard_id,this_dir) -- arrow points out of yard if event.msg == "deactivate_check" then if not atc_id then F.indicator(yard.active_indicator_pos,false) + print(rwt.to_string(rwt.now())) print(yard_id.." yard Disabled") else schedule_in(";05","deactivate_check") diff --git a/durt/nodes/(-678,20,2478).lua b/durt/nodes/(-678,20,2478).lua index 7b0b847..9d4e471 100644 --- a/durt/nodes/(-678,20,2478).lua +++ b/durt/nodes/(-678,20,2478).lua @@ -1,2 +1,3 @@ +do return end -- approach siding
atc_send("B0")
if S.yard_active then
interrupt(10, "recheck")
else
atc_send("S4")
S.rc = get_rc()
step_fc()
S.yard_active = true
set_route("CANNERY_WAITING", "APPROACH YARD") set_route("CANNERY_APPROACH","PICKUP")
end
\ No newline at end of file diff --git a/durt/nodes/(1904,8,9057).lua b/durt/nodes/(1904,8,9057).lua index 90f6a15..0851b53 100644 --- a/durt/nodes/(1904,8,9057).lua +++ b/durt/nodes/(1904,8,9057).lua @@ -7,11 +7,10 @@ end if event.train and atc_arrow then atc_send("S4") if F.has_rc("WOA_mine_around") then - F.remove_rc("FREIGHT") if train_length() == 1 then F.add_rc("WOA_ttb_s") else - F.add_rc("WOA_freight_left") + F.add_rc("WOA_shed_left") end end atc_set_ars_disable(false) diff --git a/durt/nodes/(1906,7,9136).lua b/durt/nodes/(1906,7,9136).lua index a80aa6a..df38109 100644 --- a/durt/nodes/(1906,7,9136).lua +++ b/durt/nodes/(1906,7,9136).lua @@ -1,3 +1,4 @@ +--base RC: FREIGHT WOA_IYARD IYARD IP_COLLECT_WOA_mine_empty IP_RTS WOA_mine_around local around_rc_list = { "WOA_around_active", "WOA_rev_north", @@ -26,6 +27,7 @@ if event.train and atc_arrow then atc_set_text_outside("Warmoneaye Mining Co.\nLocomotive Switching Ends") split_off_locomotive("B0A0") set_autocouple() + F.remove_rc({"WOA_shed_left"}) F.add_rc(around_rc_list) atc_send("S4A1") return diff --git a/durt/nodes/(1949,7,9112).lua b/durt/nodes/(1949,7,9112).lua index f434548..06aee8c 100644 --- a/durt/nodes/(1949,7,9112).lua +++ b/durt/nodes/(1949,7,9112).lua @@ -19,7 +19,6 @@ if (event.channel == "train_ctl" and event.msg == "send") or ((event.ext_int or F.indicator(ind,true) return end - F.add_rc("FREIGHT") set_route(POS(1942,8,9102),"Exit South") atc_send("I+S0WRD2;SMA1") F.indicator(ind,false) diff --git a/il_timetable/nodes/(1936,7,9131).lua b/il_timetable/nodes/(1936,7,9131).lua index 5668d0b..cef8d24 100644 --- a/il_timetable/nodes/(1936,7,9131).lua +++ b/il_timetable/nodes/(1936,7,9131).lua @@ -5,7 +5,7 @@ F.ttp_begin({ depoff = "04;15", --departure slot offset doorside = "L", reverse = true, - only_lines = nil, + only_lines = {['CFE'] = true}, force_tt_reset = false, }) F.stat("CFE")
\ No newline at end of file |