State at 2020-11-06

29 files changed, 85 insertions, 10 deletions

diff --git a/Crossroads/nodes/(-1904,2,706).lua b/Crossroads/nodes/(-1904,2,706).lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Crossroads/nodes/(-1904,2,706).lua
diff --git a/Crossroads/nodes/(-1906,2,698).lua b/Crossroads/nodes/(-1906,2,698).lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Crossroads/nodes/(-1906,2,698).lua
diff --git a/Crossroads/nodes/(1114,18,2767).lua b/Crossroads/nodes/(1114,18,2767).lua
new file mode 100644
index 0000000..1d543d8
--- /dev/null
+++ b/Crossroads/nodes/(1114,18,2767).lua
@@ -0,0 +1,5 @@
+if event.type == "punch" then
+  digiline_send("s", "<- Track 2 | Track 3 ->")
+elseif event.type == "digiline" and event.channel == "pis" then
+  F.disp2gen("grsc")
+end
\ No newline at end of file
diff --git a/Crossroads/nodes/(1116,12,2621).lua b/Crossroads/nodes/(1116,12,2621).lua
new file mode 100644
index 0000000..3b6577d
--- /dev/null
+++ b/Crossroads/nodes/(1116,12,2621).lua
@@ -0,0 +1 @@
+F.disp2gen("phsc")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1116,12,2653).lua b/Crossroads/nodes/(1116,12,2653).lua
new file mode 100644
index 0000000..3b6577d
--- /dev/null
+++ b/Crossroads/nodes/(1116,12,2653).lua
@@ -0,0 +1 @@
+F.disp2gen("phsc")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1119,16,2760).lua b/Crossroads/nodes/(1119,16,2760).lua
new file mode 100644
index 0000000..dde01ed
--- /dev/null
+++ b/Crossroads/nodes/(1119,16,2760).lua
@@ -0,0 +1 @@
+F.stn2gen("grsc", "3", "R")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1122,10,2639).lua b/Crossroads/nodes/(1122,10,2639).lua
new file mode 100644
index 0000000..5d35b02
--- /dev/null
+++ b/Crossroads/nodes/(1122,10,2639).lua
@@ -0,0 +1 @@
+F.stn2gen("phsc", "N", "L")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1122,16,2768).lua b/Crossroads/nodes/(1122,16,2768).lua
new file mode 100644
index 0000000..27a6f78
--- /dev/null
+++ b/Crossroads/nodes/(1122,16,2768).lua
@@ -0,0 +1 @@
+F.stn2gen("grsc", "4", "R")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1122,19,3014).lua b/Crossroads/nodes/(1122,19,3014).lua
new file mode 100644
index 0000000..da8687d
--- /dev/null
+++ b/Crossroads/nodes/(1122,19,3014).lua
@@ -0,0 +1 @@
+F.stn2gen("phwest", "1", "R", true, true)
\ No newline at end of file
diff --git a/Crossroads/nodes/(1171,0,852).lua b/Crossroads/nodes/(1171,0,852).lua
new file mode 100644
index 0000000..a49b39e
--- /dev/null
+++ b/Crossroads/nodes/(1171,0,852).lua
@@ -0,0 +1 @@
+F.stn2gen("scs", "S2", "R")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1185,5,857).lua b/Crossroads/nodes/(1185,5,857).lua
new file mode 100644
index 0000000..7e492db
--- /dev/null
+++ b/Crossroads/nodes/(1185,5,857).lua
@@ -0,0 +1 @@
+F.stn2gen("scs","N2","L")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1187,-6,1084).lua b/Crossroads/nodes/(1187,-6,1084).lua
new file mode 100644
index 0000000..50b540e
--- /dev/null
+++ b/Crossroads/nodes/(1187,-6,1084).lua
@@ -0,0 +1 @@
+F.stn2gen("scn", "S2", "R")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1187,-6,996).lua b/Crossroads/nodes/(1187,-6,996).lua
new file mode 100644
index 0000000..5c86126
--- /dev/null
+++ b/Crossroads/nodes/(1187,-6,996).lua
@@ -0,0 +1 @@
+F.stn2gen("scc", "S2", "R")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1190,-6,1081).lua b/Crossroads/nodes/(1190,-6,1081).lua
index 7a13d35..2779b52 100644
--- a/Crossroads/nodes/(1190,-6,1081).lua
+++ b/Crossroads/nodes/(1190,-6,1081).lua
@@ -1 +1,2 @@
-F.stn2gen("scn","S","R")
\ No newline at end of file
+if atc_id and get_line() == "AZ" then atc_set_text_outside("ATL Zinc Line") end
+F.stn2gen("scn","S1","L")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1198,-6,1092).lua b/Crossroads/nodes/(1198,-6,1092).lua
index 345042a..9023aa8 100644
--- a/Crossroads/nodes/(1198,-6,1092).lua
+++ b/Crossroads/nodes/(1198,-6,1092).lua
@@ -1 +1 @@
-F.stn2gen("scn","N","R")
\ No newline at end of file
+F.stn2gen("scn","N1","L")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1201,-6,1087).lua b/Crossroads/nodes/(1201,-6,1087).lua
new file mode 100644
index 0000000..e0c8632
--- /dev/null
+++ b/Crossroads/nodes/(1201,-6,1087).lua
@@ -0,0 +1 @@
+F.stn2gen("scn","N2","R")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1201,-6,999).lua b/Crossroads/nodes/(1201,-6,999).lua
new file mode 100644
index 0000000..855f755
--- /dev/null
+++ b/Crossroads/nodes/(1201,-6,999).lua
@@ -0,0 +1 @@
+F.stn2gen("scc", "N2", "R")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1400,21,819).lua b/Crossroads/nodes/(1400,21,819).lua
index 5fbaddf..97c3d17 100644
--- a/Crossroads/nodes/(1400,21,819).lua
+++ b/Crossroads/nodes/(1400,21,819).lua
@@ -1,4 +1 @@
--- F.bhf("crwm","scs","L","M",nil,"FW")
-if event.type == 'train' then
-atc_set_text_inside('This train does not stop at Crossroads West Mountains due to the state of emergency in Crossroads.\nNext stop: Silver Coast South')
-end
\ No newline at end of file
+-- F.bhf("crwm","scs","L","M",nil,"FW")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1755,27,942).lua b/Crossroads/nodes/(1755,27,942).lua
index f208c95..f8ddd3f 100644
--- a/Crossroads/nodes/(1755,27,942).lua
+++ b/Crossroads/nodes/(1755,27,942).lua
@@ -1,5 +1,3 @@
-if event.type == "digiline" then
-  if event.channel == "upd_wrapper" then
-    digiline_send("upd_main","")
-  end
+if event.type == "digiline" and event.channel == "upd" then
+  digiline_send("upd_main","")
 end
\ No newline at end of file
diff --git a/Crossroads/nodes/(1756,4,1010).lua b/Crossroads/nodes/(1756,4,1010).lua
new file mode 100644
index 0000000..b5d5a9d
--- /dev/null
+++ b/Crossroads/nodes/(1756,4,1010).lua
@@ -0,0 +1 @@
+-- test
\ No newline at end of file
diff --git a/Crossroads/nodes/(2006,3,5953).lua b/Crossroads/nodes/(2006,3,5953).lua
new file mode 100644
index 0000000..cd35a9e
--- /dev/null
+++ b/Crossroads/nodes/(2006,3,5953).lua
@@ -0,0 +1,6 @@
+if event.type == "train" and atc_arrow then
+  if getstate("mary4-testturnout-2") ~= "cr" then
+    atc_send("BB")
+    error("Incorrect turnout position - correct route and test again")
+  end
+end
\ No newline at end of file
diff --git a/Crossroads/nodes/(2010,3,5938).lua b/Crossroads/nodes/(2010,3,5938).lua
new file mode 100644
index 0000000..99bcc37
--- /dev/null
+++ b/Crossroads/nodes/(2010,3,5938).lua
@@ -0,0 +1,6 @@
+if event.type == "punch" then
+  for i = 1, 4, 1 do
+    cancel_route("mary4-testsignal-"..tostring(i))
+  end
+  digiline_send("lcd", tostring(os.time()).."\nRoutes canceled")
+end
\ No newline at end of file
diff --git a/Crossroads/nodes/(2013,3,5923).lua b/Crossroads/nodes/(2013,3,5923).lua
new file mode 100644
index 0000000..373dd5a
--- /dev/null
+++ b/Crossroads/nodes/(2013,3,5923).lua
@@ -0,0 +1,6 @@
+if event.type == "train" and atc_arrow then
+  if getstate("mary4-testturnout-1") ~= "cr" then
+    atc_send("BB")
+    error("Incorrect turnout position - correct route and test again")
+  end
+end
\ No newline at end of file
diff --git a/Crossroads/nodes/(2013,3,5931).lua b/Crossroads/nodes/(2013,3,5931).lua
new file mode 100644
index 0000000..9674660
--- /dev/null
+++ b/Crossroads/nodes/(2013,3,5931).lua
@@ -0,0 +1,6 @@
+if event.type == "train" and atc_arrow then
+  if getstate("mary4-testturnout-1") ~= "st" then
+    atc_send("BB")
+    error("Incorrect turnout position - correct route and test again")
+  end
+end
\ No newline at end of file
diff --git a/Crossroads/nodes/(2013,3,5961).lua b/Crossroads/nodes/(2013,3,5961).lua
new file mode 100644
index 0000000..45e3f0a
--- /dev/null
+++ b/Crossroads/nodes/(2013,3,5961).lua
@@ -0,0 +1,6 @@
+if event.type == "train" and atc_arrow then
+  if getstate("mary4-testturnout-2") ~= "st" then
+    atc_send("BB")
+    error("Incorrect turnout position - correct route and test again")
+  end
+end
\ No newline at end of file
diff --git a/Crossroads/nodes/(2065,5,978).lua b/Crossroads/nodes/(2065,5,978).lua
index 29f42b5..e4c501a 100644
--- a/Crossroads/nodes/(2065,5,978).lua
+++ b/Crossroads/nodes/(2065,5,978).lua
@@ -1,9 +1,15 @@
+local outline = "AB"
+local outrc = ""
 if event.type=="train" then
   if atc_arrow then
     atc_send("OC")
     atc_set_text_outside("")
     atc_set_text_inside("")
     set_rc("")
+  else
+    if outline then set_line(outline) end
+    if outrc then set_rc(outrc) end
+    atc_set_text_outside("Not in service")
   end
   --unset_shunt()
 end
\ No newline at end of file
diff --git a/Crossroads/nodes/(2260,5,837).lua b/Crossroads/nodes/(2260,5,837).lua
new file mode 100644
index 0000000..e1cd252
--- /dev/null
+++ b/Crossroads/nodes/(2260,5,837).lua
@@ -0,0 +1,10 @@
+if event.type == "train" then
+  atc_send("OCBBWI+R;")
+end
+if event.type == "ext_int" then
+  if atc_id then
+    set_line("2")
+    atc_set_text_outside("LINE 2")
+    atc_send("S4")
+  end
+end
\ No newline at end of file
diff --git a/Crossroads/nodes/(2260,5,893).lua b/Crossroads/nodes/(2260,5,893).lua
new file mode 100644
index 0000000..2149070
--- /dev/null
+++ b/Crossroads/nodes/(2260,5,893).lua
@@ -0,0 +1,10 @@
+if event.type == "train" then
+  atc_send("OCBBWI+R;")
+end
+if event.type == "ext_int" then
+  if atc_id then
+    set_line("1")
+    atc_set_text_outside("LINE 1")
+    atc_send("S4")
+  end
+end
\ No newline at end of file
diff --git a/Crossroads/nodes/(2263,5,897).lua b/Crossroads/nodes/(2263,5,897).lua
new file mode 100644
index 0000000..6656f49
--- /dev/null
+++ b/Crossroads/nodes/(2263,5,897).lua
@@ -0,0 +1,5 @@
+local status = false
+if event.type == "punch" and status then
+  interrupt_pos(POS(2260,5,893), "")
+  interrupt_pos(POS(2260,5,837), "")
+end
\ No newline at end of file