charset=UTF-8 Content-Disposition: inline; filename="ac853fa04d0d8a6489320dfe7dbd60c9371d756b..4ffe2e563e879169d12f66098c6d4d4dea6ddd69.patch" Last-Modified: Mon, 02 Nov 2026 00:23:25 GMT Expires: Thu, 30 Oct 2036 00:23:25 GMT From 4ffe2e563e879169d12f66098c6d4d4dea6ddd69 Mon Sep 17 00:00:00 2001 From: autocommitter Date: Mon, 22 Apr 2024 14:57:44 +0200 Subject: State at 2022-06-20 --- auto_yards/init_code.lua | 25 ++++--------------------- durt/nodes/(1902,8,9059).lua | 26 ++++++++++++++++++++++++++ durt/nodes/(1904,8,9057).lua | 18 ++++++++++++++++++ durt/nodes/(1906,7,9136).lua | 33 +++++++++++++++++++++++++++++++++ durt/nodes/(1920,7,9187).lua | 26 ++++++++++++++++++++++++++ durt/nodes/(1949,7,9112).lua | 27 +++++++++++++++++++++++++++ durt/nodes/(1950,7,9108).lua | 1 + 7 files changed, 135 insertions(+), 21 deletions(-) create mode 100644 durt/nodes/(1902,8,9059).lua create mode 100644 durt/nodes/(1904,8,9057).lua create mode 100644 durt/nodes/(1906,7,9136).lua create mode 100644 durt/nodes/(1920,7,9187).lua create mode 100644 durt/nodes/(1949,7,9112).lua create mode 100644 durt/nodes/(1950,7,9108).lua diff --git a/auto_yards/init_code.lua b/auto_yards/init_code.lua index 6e4551f..689b7e3 100644 --- a/auto_yards/init_code.lua +++ b/auto_yards/init_code.lua @@ -8,8 +8,6 @@ if event.init then active_indicator_pos = POS(), dir_indicator_pos = POS(), error_indicator_pos = POS(), - ext_notify_pos = POS(), - notify = table, headshunt_max = number, }, @@ -24,8 +22,6 @@ if event.init then active_indicator_pos = POS(-2002,3,-1099), dir_indicator_pos = POS(-2009,3,-1101), error_indicator_pos = POS(-1999,3,-1099), - ext_notify_pos = POS(-2004,2,-1101), - notify = {}, headshunt_max = 5, }, IP = { @@ -167,7 +163,7 @@ F.yard_arrival = function(yard_id,this_dir) -- arrow points towards yard end atc_set_ars_disable(false) atc_send("S6") - print("Train "..atc_id.." enters yard ".. yard_id.." from the "..tostring(this_dir).." direction and "..((rts and "will") or "won't").." return in the same direction") + 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") return end @@ -180,7 +176,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("Train "..atc_id.." has arrived at "..yard_id.." yard and has to wait for the yard to deactivate.") + print("YARD: "..yard_id..": Train "..atc_id.." has arrived and has to wait for the yard to deactivate.") schedule_in(";10","recheck") return else @@ -350,8 +346,8 @@ 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("Train "..atc_id.." has a length of "..train_length()) - print("It will depart in the "..tostring(this_dir).." direction.") + 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() F.remove_rc({yard_id.."_FINAL_COLLECT",yard_id.."_DEPART"}) F.remove_rc_match(yard_id.."_LOCOS_%d+") @@ -377,7 +373,6 @@ 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) - if yard.ext_notify_pos then interrupt_pos(yard.ext_notify_pos,{command="EXIT"}) end print(yard_id.." yard Disabled") else schedule_in(";05","deactivate_check") @@ -410,18 +405,6 @@ F.lane_EOL = function(yard_id,this_dir) -- arrow points towards headshunt end else if F.indicator(yard.dir_indicator_pos) == this_dir then - --train is clasifying wagons, let it pass and couple to the rest of the rake - --send a notification to the yard controller to trigger external functions - if yard.ext_notify_pos then - local fc = F.get_rc_safe():match(yard_id.."_CLASS_(%S+)") or nil - if fc then - if F.has_rc(yard_id.."_COLLECT_"..fc) then - interrupt_pos(yard.ext_notify_pos,{command="COLLECTED",msg=fc}) - else - interrupt_pos(yard.ext_notify_pos,{command="NOTIFY",msg=fc}) - end - end - end F.remove_rc_match(yard_id.."_CLASS_%S+") else --this should never come into play as it means the train has entered from the wrong end somehow atc_send("BBOL") --stop the train and open the doors (if available) to signify assistance required diff --git a/durt/nodes/(1902,8,9059).lua b/durt/nodes/(1902,8,9059).lua new file mode 100644 index 0000000..88b402f --- /dev/null +++ b/durt/nodes/(1902,8,9059).lua @@ -0,0 +1,26 @@ +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + atc_set_lzb_tsr(4) + return +end + +if event.train and atc_arrow then + if not F.has_rc("WOA_rev_south") then return end + F.remove_rc({"WOA_rev_south"}) + schedule_in(";01",atc_id) + return +end + +if event.schedule then + if not atc_id then --bounce the train that just passed + atc_send_to_train(event.msg,"B0WRD1A1S3") + else + if atc_id == event.msg then --train hasn't fully passed yet, wait a bit longer + schedule_in(";01",atc_id) + else -- somehow another train crossed the controller before the first one returned. Unlikely but possible + atc_send_to_train(event.msg,"BBOL") + atc_send("BBOL") + end + end +end \ No newline at end of file diff --git a/durt/nodes/(1904,8,9057).lua b/durt/nodes/(1904,8,9057).lua new file mode 100644 index 0000000..4858c34 --- /dev/null +++ b/durt/nodes/(1904,8,9057).lua @@ -0,0 +1,18 @@ +__approach_callback_mode = 1 +if event.approach and not event.has_entered then + atc_set_ars_disable(true) + atc_set_lzb_tsr(4) +end + +if event.train and atc_arrow then + atc_send("S4") + if F.has_rc("WOA_mine_around") then + if train_length() == 1 then + F.remove_rc("FREIGHT") + F.add_rc("WOA_ttb_s") + else + F.add_rc("WOA_freight_left") + end + end + atc_set_ars_disable(false) +end \ No newline at end of file diff --git a/durt/nodes/(1906,7,9136).lua b/durt/nodes/(1906,7,9136).lua new file mode 100644 index 0000000..a80aa6a --- /dev/null +++ b/durt/nodes/(1906,7,9136).lua @@ -0,0 +1,33 @@ +local around_rc_list = { + "WOA_around_active", + "WOA_rev_north", + "WOA_around_station", + "WOA_rev_south", + "WOA_rejoin_overburden" +} + +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + atc_set_ars_disable(true) + atc_set_lzb_tsr(1) + return +end + +if event.train and atc_arrow then + if F.has_rc("WOA_mine_around") then + if F.has_rc("WOA_around_active") then + F.remove_rc(around_rc_list) + unset_autocouple() + atc_send("B0WRD3SMA1") + atc_set_text_outside("Warmonaye Mining Co.") + return + end + atc_set_text_outside("Warmoneaye Mining Co.\nLocomotive Switching Ends") + split_off_locomotive("B0A0") + set_autocouple() + F.add_rc(around_rc_list) + atc_send("S4A1") + return + end +end \ No newline at end of file diff --git a/durt/nodes/(1920,7,9187).lua b/durt/nodes/(1920,7,9187).lua new file mode 100644 index 0000000..d477345 --- /dev/null +++ b/durt/nodes/(1920,7,9187).lua @@ -0,0 +1,26 @@ +__approach_callback_mode = 1 + +if event.approach and not event.has_entered then + atc_set_lzb_tsr(1) + return +end + +if event.train and atc_arrow then + if not F.has_rc("WOA_rev_north") then return end + F.remove_rc({"WOA_rev_north"}) + schedule_in(";01",atc_id) + return +end + +if event.schedule then + if not atc_id then --bounce the train that just passed + atc_send_to_train(event.msg,"B0WRD1A1S3") + else + if atc_id == event.msg then --train hasn't fully passed yet, wait a bit longer + schedule_in(";01",atc_id) + else -- somehow another train crossed the controller before the first one returned. Unlikely but possible + atc_send_to_train(event.msg,"BBOL") + atc_send("BBOL") + end + end +end \ No newline at end of file diff --git a/durt/nodes/(1949,7,9112).lua b/durt/nodes/(1949,7,9112).lua new file mode 100644 index 0000000..f434548 --- /dev/null +++ b/durt/nodes/(1949,7,9112).lua @@ -0,0 +1,27 @@ +local ind = POS(1951,7,9111) +__approach_callback_mode = 1 +if event.approach and not event.has_entered then + atc_set_ars_disable(true) + atc_set_lzb_tsr(1) +end + +if event.train and atc_arrow then + F.remove_rc({"WOA_ttb_s"}) + if F.indicator(ind) then + schedule_in(";02","send") + end + atc_send("B0WR") +end + +if (event.channel == "train_ctl" and event.msg == "send") or ((event.ext_int or event.schedule) and event.message == "send") then + print("RX Notification") + if not atc_id then + 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) + return +end \ No newline at end of file diff --git a/durt/nodes/(1950,7,9108).lua b/durt/nodes/(1950,7,9108).lua new file mode 100644 index 0000000..a3a64b6 --- /dev/null +++ b/durt/nodes/(1950,7,9108).lua @@ -0,0 +1 @@ +interrupt_pos(POS(1949,7,9112),"send") \ No newline at end of file -- cgit v1.2.3 d='n187' href='#n187'>187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 
--advtrains by orwell96, see readme.txt
local print=function(t) minetest.log("action", t) minetest.chat_send_all(t) end

advtrains.dir_trans_tbl={
	[0]={x=0, z=1},
	[1]={x=1, z=2},
	[2]={x=1, z=1},
	[3]={x=2, z=1},
	[4]={x=1, z=0},
	[5]={x=2, z=-1},
	[6]={x=1, z=-1},
	[7]={x=1, z=-2},
	[8]={x=0, z=-1},
	[9]={x=-1, z=-2},
	[10]={x=-1, z=-1},
	[11]={x=-2, z=-1},
	[12]={x=-1, z=0},
	[13]={x=-2, z=1},
	[14]={x=-1, z=1},
	[15]={x=-1, z=2},
}

function advtrains.dirCoordSet(coord, dir)
	local x,z
	if advtrains.dir_trans_tbl[dir] then
		x,z=advtrains.dir_trans_tbl[dir].x, advtrains.dir_trans_tbl[dir].z
	else
		error("advtrains: in helpers.lua/dirCoordSet() given dir="..(dir or "nil"))
	end
	return {x=coord.x+x, y=coord.y, z=coord.z+z}
end
function advtrains.dirToCoord(dir)
	return advtrains.dirCoordSet({x=0, y=0, z=0}, dir)
end

function advtrains.maxN(list, expectstart)
	local n=expectstart or 0
	while list[n] do
		n=n+1
	end
	return n-1
end

function advtrains.minN(list, expectstart)
	local n=expectstart or 0
	while list[n] do
		n=n-1
	end
	return n+1
end

--vertical_transmit:
--[[
rely1, rely2 tell to which height the connections are pointed to. 1 means it will go up the next node

]]

function advtrains.conway(midreal, prev, traintype)--in order prev,mid,return
	local mid=advtrains.round_vector_floor_y(midreal)
	local drives_on=advtrains.all_traintypes[traintype].drives_on
	
	if not advtrains.get_rail_info_at(advtrains.round_vector_floor_y(prev), traintype) then
		return nil
	end
	
	local midnode_ok, middir1, middir2, midrely1, midrely2=advtrains.get_rail_info_at(advtrains.round_vector_floor_y(mid), traintype)
	if not midnode_ok then
		return nil 
	end
	
	local next, chkdir, chkrely, y_offset
	y_offset=0
	--print("[advtrains] in order mid1,mid2",middir1,middir2)
	--try if it is dir1
	local cor1=advtrains.dirCoordSet(mid, middir2)--<<<<
	if math.floor(cor1.x+0.5)==math.floor(prev.x+0.5) and math.floor(cor1.z+0.5)==math.floor(prev.z+0.5) then--this was previous
		next=advtrains.dirCoordSet(mid, middir1)
		if midrely1>=1 then
			next.y=next.y+1
			--print("[advtrains]found midrely1 to be >=1: next is now "..(next and minetest.pos_to_string(next) or "nil"))
			y_offset=1
		end
		chkdir=middir1
		chkrely=midrely1
		--print("[advtrains]dir2 applied next pos:",minetest.pos_to_string(next),"(chkdir is ",chkdir,")")
	end
	--dir2???
	local cor2=advtrains.dirCoordSet(mid, middir1)--<<<<
	if math.floor(cor2.x+0.5)==math.floor(prev.x+0.5) and math.floor(cor2.z+0.5)==math.floor(prev.z+0.5) then
		next=advtrains.dirCoordSet(mid, middir2)--dir2 wird überprüft, alles gut.
		if midrely2>=1 then
			next.y=next.y+1
			--print("[advtrains]found midrely2 to be >=1: next is now "..(next and minetest.pos_to_string(next) or "nil"))
			y_offset=1
		end
		chkdir=middir2
		chkrely=midrely2
		--print("[advtrains] dir2 applied next pos:",minetest.pos_to_string(next),"(chkdir is ",chkdir,")")
	end
	--print("[advtrains]dir applied next pos: "..(next and minetest.pos_to_string(next) or "nil").."(chkdir is "..(chkdir or "nil")..", y-offset "..y_offset..")")
	--is there a next
	if not next then
		--print("[advtrains]in conway: no next rail(nil), returning!")
		return nil
	end
	
	local nextnode_ok, nextdir1, nextdir2, nextrely1, nextrely2, nextrailheight=advtrains.get_rail_info_at(advtrains.round_vector_floor_y(next), traintype)
	
	--is it a rail?
	if(not nextnode_ok) then
		--print("[advtrains]in conway: next "..minetest.pos_to_string(next).." not a rail, trying one node below!")
		next.y=next.y-1
		y_offset=y_offset-1
		
		nextnode_ok, nextdir1, nextdir2, nextrely1, nextrely2, nextrailheight=advtrains.get_rail_info_at(advtrains.round_vector_floor_y(next), traintype)
		if(not nextnode_ok) then
			--print("[advtrains]in conway: one below "..minetest.pos_to_string(next).." is not a rail either, returning!")
			return nil
		end
	end
	
	--is this next rail connecting to the mid?
	if not ( (((nextdir1+8)%16)==chkdir and nextrely1==chkrely-y_offset) or (((nextdir2+8)%16)==chkdir and nextrely2==chkrely-y_offset) ) then
		--print("[advtrains]in conway: next "..minetest.pos_to_string(next).." not connecting, trying one node below!")
		next.y=next.y-1
		y_offset=y_offset-1
		
		nextnode_ok, nextdir1, nextdir2, nextrely1, nextrely2, nextrailheight=advtrains.get_rail_info_at(advtrains.round_vector_floor_y(next), traintype)
		if(not nextnode_ok) then
			--print("[advtrains]in conway: (at connecting if check again) one below "..minetest.pos_to_string(next).." is not a rail either, returning!")
			return nil
		end
		if not ( (((nextdir1+8)%16)==chkdir and nextrely1==chkrely) or (((nextdir2+8)%16)==chkdir and nextrely2==chkrely) ) then
			--print("[advtrains]in conway: one below "..minetest.pos_to_string(next).." rail not connecting, returning!")
			--print("[advtrains] in order mid1,2,next1,2,chkdir "..middir1.." "..middir2.." "..nextdir1.." "..nextdir2.." "..chkdir)
			return nil
		end
	end
	
	--print("[advtrains]conway found rail.")
	return vector.add(advtrains.round_vector_floor_y(next), {x=0, y=nextrailheight, z=0}), chkdir
end
--TODO use this
function advtrains.oppd(dir)
	return ((dir+8)%16)
end

function advtrains.round_vector_floor_y(vec)
	return {x=math.floor(vec.x+0.5), y=math.floor(vec.y), z=math.floor(vec.z+0.5)}
end

function advtrains.yawToDirection(yaw, conn1, conn2)
	if not conn1 or not conn2 then
		error("given nil to yawToDirection: conn1="..(conn1 or "nil").." conn2="..(conn1 or "nil"))
	end
	local yaw1=math.pi*(conn1/4)
	local yaw2=math.pi*(conn2/4)
	if advtrains.minAngleDiffRad(yaw, yaw1)<advtrains.minAngleDiffRad(yaw, yaw2) then--change to > if weird behavior
		return conn2
	else
		return conn1
	end
end

function advtrains.minAngleDiffRad(r1, r2)
	local try1=r2-r1
	local try2=(r2+2*math.pi)-r1
	local try3=r2-(r1+2*math.pi)
	if math.min(math.abs(try1), math.abs(try2), math.abs(try3))==math.abs(try1) then
		return try1
	end
	if math.min(math.abs(try1), math.abs(try2), math.abs(try3))==math.abs(try2) then
		return try2
	end
	if math.min(math.abs(try1), math.abs(try2), math.abs(try3))==math.abs(try3) then
		return try3
	end
end
function advtrains.dumppath(path)
	if not path then print("dumppath: no path(nil)") return end
	local min=advtrains.minN(path)
	local max=advtrains.maxN(path)
	for i=min, max do print("["..i.."] "..(path[i] and minetest.pos_to_string(path[i]) or "nil")) end
end

function advtrains.merge_tables(a, ...)
	local new={}
	for _,t in ipairs({a,...}) do
		for k,v in pairs(t) do new[k]=v end
	end
	return new
end
function advtrains.yaw_from_3_positions(prev, curr, next)
	local pts=minetest.pos_to_string
	--print("p3 "..pts(prev)..pts(curr)..pts(next))
	local prev2curr=math.atan2((curr.x-prev.x), (prev.z-curr.z))
	local curr2next=math.atan2((next.x-curr.x), (curr.z-next.z))
	--print("y3 "..(prev2curr*360/(2*math.pi)).." "..(curr2next*360/(2*math.pi)))
	return prev2curr+(advtrains.minAngleDiffRad(prev2curr, curr2next)/2)
end
function advtrains.get_wagon_yaw(front, first, second, back, pct)
	local pts=minetest.pos_to_string
	--print("p "..pts(front)..pts(first)..pts(second)..pts(back))
	local y2=advtrains.yaw_from_3_positions(second, first, front)
	local y1=advtrains.yaw_from_3_positions(back, second, first)
	--print("y "..(y1*360/(2*math.pi)).." "..(y2*360/(2*math.pi)))
	return y1+advtrains.minAngleDiffRad(y1, y2)*pct
end
function advtrains.get_real_index_position(path, index)
	if not path or not index then return end
	
	local first_pos=path[math.floor(index)]
	local second_pos=path[math.floor(index)+1]
	
	if not first_pos or not second_pos then return nil end
	
	local factor=index-math.floor(index)
	local actual_pos={x=first_pos.x-(first_pos.x-second_pos.x)*factor, y=first_pos.y-(first_pos.y-second_pos.y)*factor, z=first_pos.z-(first_pos.z-second_pos.z)*factor,}
	return actual_pos
end
function advtrains.pos_median(pos1, pos2)
	return {x=pos1.x-(pos1.x-pos2.x)*0.5, y=pos1.y-(pos1.y-pos2.y)*0.5, z=pos1.z-(pos1.z-pos2.z)*0.5}
end
function advtrains.abs_ceil(i)
	return math.ceil(math.abs(i))*math.sign(i)
end

function advtrains.serialize_inventory(inv)
	local ser={}
	local liszts=inv:get_lists()
	for lisztname, liszt in pairs(liszts) do
		ser[lisztname]={}
		for idx, item in ipairs(liszt) do
			local istring=item:to_string()
			if istring~="" then
				ser[lisztname][idx]=istring
			end
		end
	end
	return minetest.serialize(ser)
end
function advtrains.deserialize_inventory(sers, inv)
	local ser=minetest.deserialize(sers)
	if ser then
		inv:set_lists(ser)
		return true
	end
	return false
end
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-02 00:23:25 +0000