From ef7d73e1cd69a2d23f95cd1bb55383ff17e591a5 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Mon, 18 Dec 2017 21:44:36 +0100 Subject: Rewrite rail connection system... ...to support an arbitrary number of connections for rails, which leads to these new features: - switches now get recognized by the trackworker correctly - ability to add real rail crosses During this, I also rewrote the rail registering system and the conway function (important part of path prediction) Note, developers: the track preset format changed, you might need to rewrite them according to the presets in tracks.lua if you wrote your own (possibly breaks advcarts) --- advtrains_train_subway/init.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/advtrains_train_subway/init.lua b/advtrains_train_subway/init.lua index 9dd6f28..310ccf8 100644 --- a/advtrains_train_subway/init.lua +++ b/advtrains_train_subway/init.lua @@ -128,8 +128,14 @@ minetest.register_craftitem(":advtrains:subway_train", { minetest.record_protection_violation(pointed_thing.under, placer:get_player_name()) return end - local conn1=advtrains.get_track_connections(node.name, node.param2) - local id=advtrains.create_new_train_at(pointed_thing.under, advtrains.dirCoordSet(pointed_thing.under, conn1)) + + local tconns=advtrains.get_track_connections(node.name, node.param2) + local yaw = placer:get_look_horizontal() + (math.pi/2) + local plconnid = advtrains.yawToClosestConn(yaw, tconns) + + local prevpos = advtrains.get_adjacent_rail(pointed_thing.under, tconns, plconnid, prototype.drives_on) + if not prevpos then return end + local id=advtrains.create_new_train_at(pointed_thing.under, prevpos) for i=1,3 do local ob=minetest.add_entity(pointed_thing.under, "advtrains:subway_wagon") -- cgit v1.2.3