Improve code so that carts exactly follow the rails and can be controlled by speed limit signs

README.md

@@ -67,7 +67,7 @@ Introduction
 5. Drive from buffer to buffer in both directions using the Minecart(!) to record the 
    routes (use 'right-left' keys to control the Minecart)
 6. Punch the buffers to check the connection data (e.g. "Oxford: connected to Cambridge")
-7. Optional: Configure the Minecart stop time in one or both buffers. The Minecart 
+7. Optional: Configure the Minecart waiting time in both buffers. The Minecart
    will then start automatically after the configured time
 8. Optional: Protect your rail network with the Protection Landmarks (one Landmark 
    at least every 16 nodes/meters)

buffer.lua

@@ -155,7 +155,8 @@ minetest.register_lbm({
 	nodenames = {"minecart:buffer"},
 	run_at_every_load = false,
 	action = function(pos, node)
-		M(pos):set_int("time", 0)
+		-- delete old data
+		minecart.get_route(pos)
 		M(pos):set_string("formspec", formspec(pos))
 	end,
 })

doc.lua

@@ -29,7 +29,7 @@ local summary_doc = table.concat({
 	S("4. Place a Minecart at a buffer and give it a cart number (1..999)"),
 	S("5. Drive from buffer to buffer in both directions using the Minecart(!) to record the routes (use 'right-left' keys to control the Minecart)."),
 	S("6. Punch the buffers to check the connection data (e.g. 'Oxford: connected to Cambridge')."),
-	S("7. Optional: Configure the Minecart stop time in one or both buffers. The Minecart will then start automatically after the configured time."),
+	S("7. Optional: Configure the Minecart waiting time in both buffers. The Minecart will then start automatically after the configured time."),
 	S("8. Optional: Protect your rail network with the Protection Landmarks (one Landmark at least every 16 nodes/meters)."),
 	S("9. Place a Minecart in front of the buffer and check whether it starts after the configured time."),
 	S("10. Check the cart state via the chat command: /mycart <num>\n   '<num>' is the cart number"),
@@ -45,6 +45,7 @@ local landmark_doc = S("Protect your rails with the Landmarks (one Landmark at l
 
 local hopper_doc = S("Used to load/unload Minecart. The Hopper can push/pull items to/from chests and drop/pickup items to/from Minecarts. To unload a Minecart place the hopper below the rail. To load the Minecart, place the hopper right next to the Minecart.")
 
+local speed_doc = S("Limit the cart speed with speed limit signs")
 
 local function formspec(data)
 	if data.image then
@@ -90,6 +91,11 @@ doc.add_entry("minecart", "landmark", {
 	data = {text = landmark_doc, item="minecart:landmark"},
 })
 
+doc.add_entry("minecart", "speed signs", {
+	name = S("Minecart Speed Signs"),
+	data = {text = speed_doc, item="minecart:speed4"},
+})
+
 if minecart.hopper_enabled then
 	doc.add_entry("minecart", "hopper", {
 		name = S("Minecart Hopper"),

locale/minecart.de.tr

@@ -1,8 +1,7 @@
 # textdomain: minecart
 Station name=Stationsname
-Stop time/sec=Haltezeit/s
+Waiting time/sec=Wartezeit/s
 connected to=verbunden mit
-Minecart Railway Buffer=Minecart Prellbock
 Summary=Zusammenfassung
 1. Place your rails and build a route with two endpoints. Junctions are allowed as long as each route has its own start and endpoint.=1. Baue eine Schienenstrecke mit zwei Enden. Kreuzungen sind zulässig, solange jede Route ihre eigenen Start- und Endpunkte hat.
 2. Place a Railway Buffer at both endpoints (buffers are always needed, they store the route and timing information).=2. Platziere einen Prellbock an beide Schienenenden (Prellböcke sind zwingend notwendig, sie speichern die Routen- und Zeit-Informationen).
@@ -10,7 +9,7 @@ Summary=Zusammenfassung
 4. Place a Minecart at a buffer and give it a cart number (1..999)=4. Platziere einen Minecart Wagen an einem Prellbock und gib dem Wagen eine Wagennummer (1..999)
 5. Drive from buffer to buffer in both directions using the Minecart(!) to record the routes (use 'right-left' keys to control the Minecart).=5. Um eine Route aufzuzeichnen, fahre die Route in beide Richtungen von Prellbock zu Prellbock mit dem Minecart Wagen(!). Nutze 'links-rechts' Tasten zur Steuerung.
 6. Punch the buffers to check the connection data (e.g. 'Oxford: connected to Cambridge').=6. Schlage auf die Prellböcke um die Verbindungsdaten zu prüfen (bspw.: 'München: verbunden mit Stuttgart')
-7. Optional: Configure the Minecart stop time in one or both buffers. The Minecart will then start automatically after the configured time.=7. Optional: Konfiguriere die Wagenwartezeit in einem oder in beiden Prellböcken. Der Wagen startet dann nach dieser Zeit automatisch.
+7. Optional: Configure the Minecart waiting time in both buffers. The Minecart will then start automatically after the configured time.=7. Optional: Konfiguriere die Wagenwartezeit in beiden Prellböcken. Der Wagen startet dann nach dieser Zeit automatisch.
 8. Optional: Protect your rail network with the Protection Landmarks (one Landmark at least every 16 nodes/meters).=8. Optional: Schütze deine Schienen mit Hilfe der Meilensteine (ein Meilenstein mindestens alle 16 Blöcke).
 9. Place a Minecart in front of the buffer and check whether it starts after the configured time.=9. Platziere einen Wagen direkt vor einem Prellbock und prüfe, ob er nach der konfigurierten Zeit startet.
 10. Check the cart state via the chat command: /mycart <num>@n   '<num>' is the cart number=Prüfe den Status des Wagen mit dem Chat Kommando: /mycart <num>@n    <num> ist die Wagennummer
@@ -20,9 +19,12 @@ Primary used to transport items. You can drop items into the Minecart and punch
 Used as buffer on both rail ends. Needed to be able to record the cart routes=Preckblöcke müssen an beiden Schienenenden platziert sein, so dass Aufzeichnungen der Strecke gemacht werden können.
 Protect your rails with the Landmarks (one Landmark at least every 16 blocks near the rail)=Schütze deine Schienen mit Hilfe der Meilensteine (ein Meilenstein mindestens alle 16 Blöcke der Strecke entlang)
 Used to load/unload Minecart. The Hopper can push/pull items to/from chests and drop/pickup items to/from Minecarts. To unload a Minecart place the hopper below the rail. To load the Minecart, place the hopper right next to the Minecart.=Um Wagen zu be- und entladen. Der Hopper kann Gegenstände aus Kisten Holen und legen, sowie diese in Wagen fallen lassen bzw. aus Wagen entnehmen. Um einen Wagen zu entladen, muss der Hopper unter die Schiene platziert werden. Um einen Wagen zu beladen, muss der Hopper direkt neben die Schiene platziert werden.
+Limit the cart speed with speed limit signs=Begrenze die Geschwindigkeit der Wagen mit Geschwindigkeitsbegrenzungszeichen
 Minecart=Minecart
 Minecart, the lean railway transportation automation system=Minecart, das schlanke Schienentransport Automatisierungssystem
 Minecart Cart=Wagen
+Minecart Speed Signs=Geschwindigkeitsbegrenzungszeichen
+Minecart Railway Buffer=Minecart Prellbock
 Minecart Hopper=Minecart Hopper
 Minecart (Sneak+Click to pick up)=Minecart (Shift+Klick zum Entfernen des Carts)
 Output cart state and position, or a list of carts, if no cart number is given.=Gibt Status und Position des Wagens, oder eine Liste aller Wagen aus, wenn keine Wagennummer angegeben ist.

locale/template.txt

@@ -1,8 +1,7 @@
 # textdomain: minecart
 Station name=
-Stop time/sec=
+Waiting time/sec=
 connected to=
-Minecart Railway Buffer=
 Summary=
 1. Place your rails and build a route with two endpoints. Junctions are allowed as long as each route has its own start and endpoint.=
 2. Place a Railway Buffer at both endpoints (buffers are always needed, they store the route and timing information).=
@@ -10,7 +9,7 @@ Summary=
 4. Place a Minecart at a buffer and give it a cart number (1..999)=
 5. Drive from buffer to buffer in both directions using the Minecart(!) to record the routes (use 'right-left' keys to control the Minecart).=
 6. Punch the buffers to check the connection data (e.g. 'Oxford: connected to Cambridge').=
-7. Optional: Configure the Minecart stop time in one or both buffers. The Minecart will then start automatically after the configured time.=
+7. Optional: Configure the Minecart waiting time in both buffers. The Minecart will then start automatically after the configured time.=
 8. Optional: Protect your rail network with the Protection Landmarks (one Landmark at least every 16 nodes/meters).=
 9. Place a Minecart in front of the buffer and check whether it starts after the configured time.=
 10. Check the cart state via the chat command: /mycart <num>@n   '<num>' is the cart number=
@@ -20,9 +19,12 @@ Primary used to transport items. You can drop items into the Minecart and punch
 Used as buffer on both rail ends. Needed to be able to record the cart routes=
 Protect your rails with the Landmarks (one Landmark at least every 16 blocks near the rail)=
 Used to load/unload Minecart. The Hopper can push/pull items to/from chests and drop/pickup items to/from Minecarts. To unload a Minecart place the hopper below the rail. To load the Minecart, place the hopper right next to the Minecart.=
+Limit the cart speed with speed limit signs=
 Minecart=
 Minecart, the lean railway transportation automation system=
 Minecart Cart=
+Minecart Speed Signs=
+Minecart Railway Buffer=
 Minecart Hopper=
 Minecart (Sneak+Click to pick up)=
 Output cart state and position, or a list of carts, if no cart number is given.=

rails.lua

@@ -122,9 +122,14 @@ local function has_metadata(pos)
 end
 
 local function get_metadata(pos)
+	local hash = P2H(pos)
+	if tWaypoints[hash] then 
+		return tWaypoints[hash]
+	end
     local s = M(pos):get_string("waypoints")
     if s ~= "" then
-        return minetest.deserialize(s)
+        tWaypoints[hash] = minetest.deserialize(s)
+		return tWaypoints[hash]
     end
 end
 
@@ -136,10 +141,11 @@ local function get_oldmetadata(meta)
 end
 
 local function set_metadata(pos, t)
+	local hash = P2H(pos)
+	tWaypoints[hash] = t
 	local s = minetest.serialize(t)
 	M(pos):set_string("waypoints", s)
-	-- debugging
-	--print("set_metadata", P2S(pos))
+	-- visualization
 	local name = get_node_lvm(pos).name
 	if name == "carts:rail" then
 		minetest.swap_node(pos, {name = "minecart:rail"})
@@ -149,11 +155,12 @@ local function set_metadata(pos, t)
 end
 
 local function del_metadata(pos)
+	local hash = P2H(pos)
+	tWaypoints[hash] = nil
 	local meta = M(pos)
     if meta:contains("waypoints") then
         meta:set_string("waypoints", "")
-		-- debugging
-		--print("del_metadata", P2S(pos))
+		-- visualization
 		local name = get_node_lvm(pos).name
 		if name == "minecart:rail" then
 			minetest.swap_node(pos, {name = "carts:rail"})