State at 2020-12-14

21 files changed, 32 insertions, 8 deletions

diff --git a/Crossroads/init_code.lua b/Crossroads/init_code.lua
index d6fb5f4..ce984ab 100644
--- a/Crossroads/init_code.lua
+++ b/Crossroads/init_code.lua
@@ -1,4 +1,5 @@
 if S.trains == nil then S.trains = {} end
+if not S.odsd then S.odsd = {} end
 
 F.odj = {}
 
@@ -163,10 +164,10 @@ function F.stn2gen(stn, trk, door, ret, chout)
     end
   end
   if event.type == "schedule" then
-    if type(event.msg) == "string" then
+    --[[if type(event.msg) == "string" then
       atc_set_text_inside(event.msg)
       atc_send(ret and "OCD1RSM" or "OCD1SM")
-    end
+    end]]
   end
 end
 
@@ -338,6 +339,7 @@ F.depint = {
 
 F.dpts = {
   ['CRT1'] = POS(1835,5,1000),
+  ["CRT2"] = POS(1741,-1,1020),
   ['AG'] = POS(1399,4,2020),
 }
 
diff --git a/Crossroads/nodes/(-5301,13,-2560).lua b/Crossroads/nodes/(-5301,13,-2560).lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Crossroads/nodes/(-5301,13,-2560).lua
diff --git a/Crossroads/nodes/(-5314,13,-2568).lua b/Crossroads/nodes/(-5314,13,-2568).lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Crossroads/nodes/(-5314,13,-2568).lua
diff --git a/Crossroads/nodes/(1741,-1,1020).lua b/Crossroads/nodes/(1741,-1,1020).lua
new file mode 100644
index 0000000..479b44d
--- /dev/null
+++ b/Crossroads/nodes/(1741,-1,1020).lua
@@ -0,0 +1 @@
+F.odd("CRT2")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1787,-1,1020).lua b/Crossroads/nodes/(1787,-1,1020).lua
new file mode 100644
index 0000000..56956f8
--- /dev/null
+++ b/Crossroads/nodes/(1787,-1,1020).lua
@@ -0,0 +1 @@
+F.ods("CRT2Ecrch")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1790,-1,1020).lua b/Crossroads/nodes/(1790,-1,1020).lua
new file mode 100644
index 0000000..586acca
--- /dev/null
+++ b/Crossroads/nodes/(1790,-1,1020).lua
@@ -0,0 +1 @@
+F.ods("CRT2Wcrch","L")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1801,1,1016).lua b/Crossroads/nodes/(1801,1,1016).lua
new file mode 100644
index 0000000..bab001c
--- /dev/null
+++ b/Crossroads/nodes/(1801,1,1016).lua
@@ -0,0 +1 @@
+F.odc("CRT2","CRT2Ecrch RCRT2Ecrnsw")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1801,1,1017).lua b/Crossroads/nodes/(1801,1,1017).lua
new file mode 100644
index 0000000..837e17a
--- /dev/null
+++ b/Crossroads/nodes/(1801,1,1017).lua
@@ -0,0 +1 @@
+F.odc("CRT2", "CRT2Ecrch RCRT2Ecrbfsw")
\ No newline at end of file
diff --git a/Crossroads/nodes/(2003,6,989).lua b/Crossroads/nodes/(2003,6,989).lua
new file mode 100644
index 0000000..8a682f9
--- /dev/null
+++ b/Crossroads/nodes/(2003,6,989).lua
@@ -0,0 +1 @@
+F.odc("CRT2", "RCRT2Ecrbfsw CRT2Wcrch")
\ No newline at end of file
diff --git a/Crossroads/nodes/(2009,4,991).lua b/Crossroads/nodes/(2009,4,991).lua
index 3485289..b8d502f 100644
--- a/Crossroads/nodes/(2009,4,991).lua
+++ b/Crossroads/nodes/(2009,4,991).lua
@@ -1 +1 @@
-F.stn2gen ('crbfsw','E','R')
\ No newline at end of file
+F.ods ('CRT2Ecrbfsw')
\ No newline at end of file
diff --git a/Crossroads/nodes/(2022,4,991).lua b/Crossroads/nodes/(2022,4,991).lua
index 62124ef..79aff62 100644
--- a/Crossroads/nodes/(2022,4,991).lua
+++ b/Crossroads/nodes/(2022,4,991).lua
@@ -1 +1 @@
-F.stn2gen ('crbfsw', 'W', 'L')
\ No newline at end of file
+F.ods("CRT2Wcrbfsw","L")
\ No newline at end of file
diff --git a/Crossroads/nodes/(2028,6,989).lua b/Crossroads/nodes/(2028,6,989).lua
new file mode 100644
index 0000000..4f23690
--- /dev/null
+++ b/Crossroads/nodes/(2028,6,989).lua
@@ -0,0 +1 @@
+F.odc("CRT2","CRT2Ecrbfsw RCRT2Ecrnsw")
\ No newline at end of file
diff --git a/Crossroads/nodes/(2065,5,978).lua b/Crossroads/nodes/(2065,5,978).lua
index e4c501a..3ddbf0f 100644
--- a/Crossroads/nodes/(2065,5,978).lua
+++ b/Crossroads/nodes/(2065,5,978).lua
@@ -1,4 +1,4 @@
-local outline = "AB"
+local outline = ""
 local outrc = ""
 if event.type=="train" then
   if atc_arrow then
@@ -6,6 +6,7 @@ if event.type=="train" then
     atc_set_text_outside("")
     atc_set_text_inside("")
     set_rc("")
+    set_line("")
   else
     if outline then set_line(outline) end
     if outrc then set_rc(outrc) end
diff --git a/Crossroads/nodes/(2244,5,989).lua b/Crossroads/nodes/(2244,5,989).lua
new file mode 100644
index 0000000..46cdf14
--- /dev/null
+++ b/Crossroads/nodes/(2244,5,989).lua
@@ -0,0 +1 @@
+F.odc("CRT2","RCRT2Ecrnsw CRT2Wcrch")
\ No newline at end of file
diff --git a/Crossroads/nodes/(2245,5,989).lua b/Crossroads/nodes/(2245,5,989).lua
new file mode 100644
index 0000000..7787a34
--- /dev/null
+++ b/Crossroads/nodes/(2245,5,989).lua
@@ -0,0 +1 @@
+F.odc("CRT2","RCRT2Ecrnsw CRT2Wcrbfsw")
\ No newline at end of file
diff --git a/Crossroads/nodes/(2254,4,991).lua b/Crossroads/nodes/(2254,4,991).lua
index 99c3448..5f18052 100644
--- a/Crossroads/nodes/(2254,4,991).lua
+++ b/Crossroads/nodes/(2254,4,991).lua
@@ -1 +1 @@
-F.stn2gen ('crnsw', 'R1', 'R', true, true)
\ No newline at end of file
+F.ods ('CRT2Ecrnsw', "R", true)
\ No newline at end of file
diff --git a/durt/nodes/(-2084,9,918).lua b/durt/nodes/(-2084,9,918).lua
new file mode 100644
index 0000000..ae8e76f
--- /dev/null
+++ b/durt/nodes/(-2084,9,918).lua
@@ -0,0 +1 @@
+if event.type=="digiline" then
	if event.channel ~= "trainctl" then return end
	if event.msg == "send" then
		setstate(POS(-2085,11,918),"green")
		if atc_id and atc_arrow then
			atc_send("B5S5")
		elseif atc_id and atc_arrow == false then
			atc_send("B0S0WRS5")
		end
		interrupt(10,"clear_signal")
		return
	elseif event.msg == "open" then
		setstate(POS(-2085,11,918),"green")
		return
	elseif event.msg == "close" then
		setstate(POS(-2085,11,918),"red")
		return
	end
	return
end
if event.type=="int" then
	if event.msg=="clear_signal" then
		setstate(POS(-2085,11,918),"red")
	end
	return
end
\ No newline at end of file
diff --git a/durt/nodes/(-2211,8,902).lua b/durt/nodes/(-2211,8,902).lua
new file mode 100644
index 0000000..7e11761
--- /dev/null
+++ b/durt/nodes/(-2211,8,902).lua
@@ -0,0 +1 @@
+if event.type=="digiline" then
	if event.channel ~= "trainctl" then return end
	if event.msg == "send" then
		if atc_id and atc_arrow then
			atc_send("S0WRS5")
		elseif atc_id and atc_arrow == false then
			atc_send("S5")
		end
	end
end
\ No newline at end of file
diff --git a/il_timetable/nodes/(115,16,-74).lua b/il_timetable/nodes/(115,16,-74).lua
new file mode 100644
index 0000000..6928a9d
--- /dev/null
+++ b/il_timetable/nodes/(115,16,-74).lua
@@ -0,0 +1,5 @@
+-- d_int: Departure every n seconds (epoch modulo)
+-- d_off: Departure time offset
+-- function F.stop_sd(st_name, doors, departcommand, minstoptime, d_int, d_off)
+atc_set_text_outside("E8 - Morija Center")
+F.stop_sd_sched("Origin Marcuse Street", "L", "RSM", 10, 1200, 300)
\ No newline at end of file
diff --git a/il_timetable/nodes/(4401,-2,1976).lua b/il_timetable/nodes/(4401,-2,1976).lua
new file mode 100644
index 0000000..0c7a9c5
--- /dev/null
+++ b/il_timetable/nodes/(4401,-2,1976).lua
@@ -0,0 +1,5 @@
+-- d_int: Departure every n seconds (epoch modulo)
+-- d_off: Departure time offset
+-- function F.stop_sd(st_name, doors, departcommand, minstoptime, d_int, d_off)
+atc_set_text_outside("E8 - Origin Marcuse Street")
+F.stop_sd_sched("Morija Center", "L", "RSM", 10, 1200, 300)
\ No newline at end of file
diff --git a/ondemand/nodes/(24,5,3).lua b/ondemand/nodes/(24,5,3).lua
index 5849086..f25d143 100644
--- a/ondemand/nodes/(24,5,3).lua
+++ b/ondemand/nodes/(24,5,3).lua
@@ -3,7 +3,7 @@ if event.type == "ext_int" and atc_arrow then
     if not event.message == "origin" then
           atc_send("OCD1RSM")
     else
-          atc_send("D5OCD1RSM")
+          atc_send("ORD5OCD1RSM")
     end
 end
 
@@ -11,5 +11,5 @@ end
 if event.train then
 S.avail = true
 F.send_station("Origin")
-atc_send("B0WOR")
+atc_send("B0WORD10OC")
 end
\ No newline at end of file