State at 2022-05-09

5 files changed, 40 insertions, 35 deletions

diff --git a/durt/nodes/(-2077,3,788).lua b/durt/nodes/(-2077,3,788).lua
index 908f668..26580c1 100644
--- a/durt/nodes/(-2077,3,788).lua
+++ b/durt/nodes/(-2077,3,788).lua
@@ -1,6 +1,17 @@
-local rc = (get_rc() or "")
-if atc_arrow and rc:match("ArcLoad_around") then
-	if rc:match("ArcLoad_rejoin") then
-		atc_send("S5D5S0WRD1S2CplA0S1")
+__approach_callback_method == 1
+if event.approach and not event.has_entered then
+	if not F.has_rc("ARC_load_reverse") then return end
+	atc_set_lzb_tsr(1)
+	atc_set_ars_disable(true)
+	return
+end
+
+if event.train then
+	if atc_arrow then
+		if F.has_rc("ARC_load_reverse") then
+			atc_send("S0WRD1A1S3")
+			F.add_rc("ARC_load_rejoin")
+			return
+		end
 	end
 end
\ No newline at end of file
diff --git a/durt/nodes/(-2080,3,787).lua b/durt/nodes/(-2080,3,787).lua
index de91e5a..7489acc 100644
--- a/durt/nodes/(-2080,3,787).lua
+++ b/durt/nodes/(-2080,3,787).lua
@@ -1,7 +1 @@
-__approach_callback_method = 1
-if event.approach then
-    atc_set_lzb_tsr(1)
-end
-if event.train and atc_arrow then
-    atc_send("I>1B1;")
-end
\ No newline at end of file
+--
\ No newline at end of file
diff --git a/durt/nodes/(-2080,3,822).lua b/durt/nodes/(-2080,3,822).lua
index bc97348..202a5d7 100644
--- a/durt/nodes/(-2080,3,822).lua
+++ b/durt/nodes/(-2080,3,822).lua
@@ -1,25 +1,25 @@
-local indicator = POS(-2080,6,826)
-local rc = (get_rc or "")
-local shunting_rc = {"ArcLoad_split","ArcLoad_around","ArcLoad_rejoin"}
-
-if type(rc) == "string" then rc = function() return "" end end
-if rc():match("ArcLoad_NOSHUNT") then return end
-
-if event.train and atc_arrow then
-	if getstate(indicator) == "green" then
-		F.remove_rc(shunting_rc,true)
-		atc_send("S0WRD1A1S2D10SM")
-		setstate(indicator,"red")
-		set_rc(rc().." ArcLoad_exit")
-		print("Arcload departing")
+__approach_callback_method = 2
+if event.approach and not event.has_entered then
+	if atc_arrow then
+		atc_set_lzb_tsr(1)
 	else
-		print("Arcload arrived")
-		local o_text = atc_get_text_outside() or ""
-		atc_set_text_outside("Waiting for Locomotive")
-		split_off_locomotive("A0B0",1)
-		atc_set_text_outside(o_text)
-		set_rc(rc().." "..table.concat(shunting_rc," "))
-		setstate(indicator,"green")
+		atc_set_lzb_tsr(2)
+	end
+end
+
+if event.train then
+	if atc_arrow then
+		if F.has_rc("ARC_load") then
+			if F.has_rc("ARC_load_rejoin") then
+				F.remove_rc({"Arc_load_reverse","ARC_load_rejoin"})
+				atc_send("SM")
+				return
+			else
+				split_at_fc("S0",5)
+				F.add_rc({"ARC_load_reverse"})
+				atc_send("S2")
+				return
+			end
+		end
 	end
-	print(get_rc())
 end
\ No newline at end of file
diff --git a/durt/nodes/(-2080,3,837).lua b/durt/nodes/(-2080,3,837).lua
index c983a88..a765227 100644
--- a/durt/nodes/(-2080,3,837).lua
+++ b/durt/nodes/(-2080,3,837).lua
@@ -1,3 +1,3 @@
-if event.train then
+if event.train and F.has_rc("ARC_LOAD_REVERSE") then
 	atc_send("S0I+WR;D2S3")
 end
\ No newline at end of file
diff --git a/durt/nodes/(-2083,3,822).lua b/durt/nodes/(-2083,3,822).lua
index b04d445..88d416f 100644
--- a/durt/nodes/(-2083,3,822).lua
+++ b/durt/nodes/(-2083,3,822).lua
@@ -1,3 +1,3 @@
 if event.punch then
-    print(getstate(POS(-2080,6,826)))
+    print(getstate(POS(-2078,4,826)))
 end
\ No newline at end of file