v1.20 Add traffic lights

joe7575 · Jan 8, 2025 · 3948135 · 3948135
1 parent 1856622
commit 3948135
Show file tree

Hide file tree

Showing 27 changed files with 665 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -96,6 +96,13 @@ Available worlds will be converted to 'lsqlite3', but there is no way back, so:
 
 ### History
 
+**2025-01-08 V1.20**
+
+- Add Traffic Lights and accesories
+- Add TA4 water remover device
+- Improve door and fly controller
+- Fix several issues
+
 **2024-12-31 V1.19**
 
 - Add Everness support #187 (ore sieving)

diff --git a/doc/manual_ta4_DE.lua b/doc/manual_ta4_DE.lua
@@ -63,6 +63,7 @@ return {
     "3,TA4 LED Pflanzenlampe / TA4 LED Grow Light",
     "3,TA4 LED Straßenlampe / TA4 LED Street Lamp",
     "3,TA4 LED Industrielampe / TA4 LED Industrial Lamp",
+    "3,TA4 Ampel / TA4 Traffic Light",
     "2,TA4 Flüssigkeitsfilter",
     "3,Fundament-Ebene",
     "3,Schotter-Ebene",
@@ -605,6 +606,17 @@ return {
     "\n"..
     "\n"..
     "\n",
+    "Die TA4 Ampel gibt es in zwei Ausführungen: in schwarz (europäische Version) und in gelb (amerikanische Version). Zusätzlich gibt es\n"..
+    "einen Mast\\, einen Arm und einen Verbinder-Block. Die Ampel kann auf oder an einen Mast montiert werden. Sie kann aber nicht\n"..
+    "an einen Arm montiert werden. Dies hat technische Gründe. Dafür gibt es den Verbinder-Block\\, der zwischen Arm und Ampel gesetzt wird.\n"..
+    "\n"..
+    "Die Ampel kann über Kommandos wie beim TA4 Signal Tower angesteuert werden.\n"..
+    "Wird zusätzlich der TA4 Spieler Detektor eingesetzt\\, so kann die Ampel auch auf Fußgänger oder Fahrzeuge reagieren.\n"..
+    "\n"..
+    "Die Ampel benötigt keinen Strom.\n"..
+    "\n"..
+    "\n"..
+    "\n",
     "Im Flüssigkeitsfilter wird Rotschlamm gefiltert.\n"..
     "Dabei entsteht entweder Lauge\\, welche unten in einem Tank gesammelt werden kann oder Wüstenkopfsteinpflaster\\, welches sich im Filter absetzt.\n"..
     "Wenn der Filter zu sehr verstopft ist\\, muss er geleert und neu befüllt werden.\n"..
@@ -940,6 +952,7 @@ return {
     "ta4_growlight",
     "ta4_streetlamp",
     "ta4_industriallamp",
+    "ta4_trafficlight",
     "ta4_liquid_filter",
     "",
     "",
@@ -1036,6 +1049,7 @@ return {
     "",
     "",
     "",
+    "",
     "ta4_liquid_filter_base",
     "ta4_liquid_filter_gravel",
     "ta4_liquid_filter_top",

diff --git a/doc/manual_ta4_EN.lua b/doc/manual_ta4_EN.lua
@@ -63,6 +63,7 @@ return {
     "3,TA4 LED Grow Light",
     "3,TA4 Street Lamp",
     "3,TA4 LED Industrial Lamp",
+    "3,TA4 traffic light",
     "2,TA4 Liquid Filter",
     "3,Base Layer",
     "3,Gravel Layer",
@@ -603,6 +604,14 @@ return {
     "\n"..
     "\n"..
     "\n",
+    "The TA4 traffic light is available in two versions: black (European version) and yellow (American version). In addition\\, there is a mast\\, an arm and a connector block. The traffic light can be mounted on or to a mast. However\\, it cannot be mounted to an arm. This is for technical reasons. This is why there is the connector block\\, which is placed between the arm and the traffic light.\n"..
+    "\n"..
+    "The traffic light can be controlled using commands like the TA4 signal tower. If the TA4 player detector is also used\\, the traffic light can also react to pedestrians or vehicles.\n"..
+    "\n"..
+    "The traffic light does not require any electricity.\n"..
+    "\n"..
+    "\n"..
+    "\n",
     "The liquid filter filters red mud.\n"..
     "A part of the red mud becomes lye\\, which can be collected at the bottom in a tank.\n"..
     "The other part becomes desert cobblestone and clutters the filter material.\n"..
@@ -941,6 +950,7 @@ return {
     "ta4_growlight",
     "ta4_streetlamp",
     "ta4_industriallamp",
+    "ta4_trafficlight",
     "ta4_liquid_filter",
     "",
     "",
@@ -1037,6 +1047,7 @@ return {
     "",
     "",
     "",
+    "",
     "ta4_liquid_filter_base",
     "ta4_liquid_filter_gravel",
     "ta4_liquid_filter_top",

diff --git a/init.lua b/init.lua
@@ -13,7 +13,7 @@
 techage = {}
 
 -- Version for compatibility checks, see readme.md/history
-techage.version = 1.19
+techage.version = 1.20
 
 if minetest.global_exists("tubelib") then
 	minetest.log("error", "[techage] Techage can't be used together with the mod tubelib!")
@@ -305,6 +305,7 @@ dofile(MP.."/logic/button_2x.lua")
 dofile(MP.."/logic/button_4x.lua")
 dofile(MP.."/logic/signallamp_2x.lua")
 dofile(MP.."/logic/signallamp_4x.lua")
+dofile(MP.."/logic/trafficlight.lua")
 if minetest.global_exists("mesecon") then
 	dofile(MP.."/logic/mesecons_converter.lua")
 end

diff --git a/iron_age/recipes.lua b/iron_age/recipes.lua
@@ -142,8 +142,11 @@ end
 --
 if techage.modified_recipes_enabled then
 	minetest.clear_craft({
-		output = "default:bronze_ingot",
-		type = "crafting",
+		recipe = {
+		{"default:copper_ingot", "default:copper_ingot", "default:copper_ingot"},
+		{"default:copper_ingot", "default:tin_ingot", "default:copper_ingot"},
+		{"default:copper_ingot", "default:copper_ingot", "default:copper_ingot"},
+	}
 	})
 	-- delete cooking iron lumps into steel ingots
 	minetest.clear_craft({
@@ -159,14 +162,6 @@ if techage.modified_recipes_enabled then
 		})
 	end
 
-	-- add again
-	minetest.register_craft({
-		output = 'default:bronze_ingot 9',
-		recipe = {
-			{'default:bronzeblock'},
-		}
-	})
-
 	techage.ironage_register_recipe({
 		output = "default:bronze_ingot 4",
 		recipe = {"default:copper_ingot", "default:copper_ingot", "default:copper_ingot", "default:tin_ingot"},

diff --git a/locale/techage.de.tr b/locale/techage.de.tr
@@ -1522,6 +1522,13 @@ TA4 Derrick=TA4 Bohrturm
 [TA] Derrick is being built!=[TA] Bohrturm wird errichtet
 [TA] Derrick is being removed!=[TA] Bohrturm wird abgebaut
 
+### trafficlight.lua ###
+
+TA4 Traffic Light=TA4 Ampel
+TA4 Traffic Light Arm=TA4 Ampel Arm
+TA4 Traffic Light Connector=TA4 Ampel Verbinder
+TA4 Traffic Light Pole=TA4 Ampel Mast
+
 ### transformer.lua ###
 
 TA4 Isolation Transformer=TA4 Trenntransformator

diff --git a/locale/techage.fr.tr b/locale/techage.fr.tr
@@ -1522,6 +1522,13 @@ TA4 Derrick=TA4 Derrick
 [TA] Derrick is being built!=[TA] Le derrick est en cours de construction!
 [TA] Derrick is being removed!=[TA] Le derrick est retiré!
 
+### trafficlight.lua ###
+
+TA4 Traffic Light=
+TA4 Traffic Light Arm=
+TA4 Traffic Light Connector=
+TA4 Traffic Light Pole=
+
 ### transformer.lua ###
 
 TA4 Isolation Transformer=

diff --git a/locale/techage.ru.tr b/locale/techage.ru.tr
@@ -1518,6 +1518,13 @@ TA4 Derrick=TA4 Буровая вышка
 [TA] Derrick is being built!=[TA] Буровая вышка построена!
 [TA] Derrick is being removed!=[TA] Буровая вышка удалена!
 
+### trafficlight.lua ###
+
+TA4 Traffic Light=
+TA4 Traffic Light Arm=
+TA4 Traffic Light Connector=
+TA4 Traffic Light Pole=
+
 ### transformer.lua ###
 
 TA4 Isolation Transformer=TA4 Изолирующий трансформатор

diff --git a/locale/template.txt b/locale/template.txt
@@ -1522,6 +1522,13 @@ TA4 Derrick=
 [TA] Derrick is being built!=
 [TA] Derrick is being removed!=
 
+### trafficlight.lua ###
+
+TA4 Traffic Light=
+TA4 Traffic Light Arm=
+TA4 Traffic Light Connector=
+TA4 Traffic Light Pole=
+
 ### transformer.lua ###
 
 TA4 Isolation Transformer=