From c41f6509cf2758945fbc0810ff9d7ab0fc077228 Mon Sep 17 00:00:00 2001
From: _TarkFrench <39446667+Tarku@users.noreply.github.com>
Date: Sat, 26 Oct 2019 19:34:17 +0200
Subject: [PATCH] French translation: fix some errors and ortho (#513)

---
 technic/machines/LV/geothermal.lua |  169 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 86 insertions(+), 83 deletions(-)

diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua
index 6066192..c66547e 100644
--- a/technic/machines/LV/geothermal.lua
+++ b/technic/machines/LV/geothermal.lua
@@ -10,40 +10,18 @@
 minetest.register_craft({
 	output = 'technic:geothermal',
 	recipe = {
-		{'default:stone', 'default:stone', 'default:stone'},
-		{'default:copper_ingot', 'default:diamond', 'default:copper_ingot'},
-		{'default:stone', 'default:copper_ingot', 'default:stone'},
-	}
+		{'technic:granite',          'default:diamond',        'technic:granite'},
+		{'basic_materials:copper_wire', 'technic:machine_casing', 'basic_materials:copper_wire'},
+		{'technic:granite',          'technic:lv_cable',       'technic:granite'},
+	},
+	replacements = {
+		{"basic_materials:copper_wire", "basic_materials:empty_spool"},
+		{"basic_materials:copper_wire", "basic_materials:empty_spool"}
+	},
 })
 
 minetest.register_craftitem("technic:geothermal", {
-	description = S("Geothermal Generator"),
-}) 
-
-minetest.register_node("technic:geothermal", {
-	description = S("Geothermal Generator"),
-	tiles = {"technic_geothermal_top.png", "technic_machine_bottom.png", "technic_geothermal_side.png",
-	         "technic_geothermal_side.png", "technic_geothermal_side.png", "technic_geothermal_side.png"},
-	paramtype2 = "facedir",
-	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
-	legacy_facedir_simple = true,
-	sounds = default.node_sound_wood_defaults(),
-	on_construct = function(pos)
-		local meta = minetest.get_meta(pos)
-		meta:set_string("infotext", S("Geothermal Generator"))
-		meta:set_int("LV_EU_supply", 0)
-	end,	
-})
-
-minetest.register_node("technic:geothermal_active", {
-	description = S("Geothermal Generator"),
-	tiles = {"technic_geothermal_top_active.png", "technic_machine_bottom.png", "technic_geothermal_side.png",
-	         "technic_geothermal_side.png", "technic_geothermal_side.png", "technic_geothermal_side.png"},
-	paramtype2 = "facedir",
-	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1},
-	legacy_facedir_simple = true,
-	sounds = default.node_sound_wood_defaults(),
-	drop = "technic:geothermal",
+	description = S("Geothermal %s Generator"):format("LV"),
 })
 
 local check_node_around = function(pos)
@@ -53,61 +31,86 @@
 	return 0
 end
 
-minetest.register_abm({
-	nodenames = {"technic:geothermal","technic:geothermal_active"},
-	interval = 1,
-	chance   = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		local meta             = minetest.get_meta(pos)
-		local water_nodes      = 0
-		local lava_nodes       = 0
-		local production_level = 0
-		local eu_supply        = 0
+local run = function(pos, node)
+	local meta             = minetest.get_meta(pos)
+	local water_nodes      = 0
+	local lava_nodes       = 0
+	local production_level = 0
+	local eu_supply        = 0
 
-		-- Correct positioning is water on one side and lava on the other.
-		-- The two cannot be adjacent because the lava the turns into obsidian or rock.
-		-- To get to 100% production stack the water and lava one extra block down as well:
-		--    WGL (W=Water, L=Lava, G=the generator, |=an LV cable)
-		--    W|L
+	-- Correct positioning is water on one side and lava on the other.
+	-- The two cannot be adjacent because the lava the turns into obsidian or rock.
+	-- To get to 100% production stack the water and lava one extra block down as well:
+	--    WGL (W=Water, L=Lava, G=the generator, |=an LV cable)
+	--    W|L
 
-		local positions = {
-			{x=pos.x+1, y=pos.y,   z=pos.z},
-			{x=pos.x+1, y=pos.y-1, z=pos.z},
-			{x=pos.x-1, y=pos.y,   z=pos.z},
-			{x=pos.x-1, y=pos.y-1, z=pos.z},
-			{x=pos.x,   y=pos.y,   z=pos.z+1},
-			{x=pos.x,   y=pos.y-1, z=pos.z+1},
-			{x=pos.x,   y=pos.y,   z=pos.z-1},
-			{x=pos.x,   y=pos.y-1, z=pos.z-1},
-		}
-		for _, p in pairs(positions) do
-			local check = check_node_around(p)
-			if check == 1 then water_nodes = water_nodes + 1 end
-			if check == 2 then lava_nodes  = lava_nodes  + 1 end
-		end
-
-		if water_nodes == 1 and lava_nodes == 1 then production_level =  25; eu_supply = 50 end
-		if water_nodes == 2 and lava_nodes == 1 then production_level =  50; eu_supply = 100 end
-		if water_nodes == 1 and lava_nodes == 2 then production_level =  75; eu_supply = 200 end
-		if water_nodes == 2 and lava_nodes == 2 then production_level = 100; eu_supply = 300 end
-
-		if production_level > 0 then
-			meta:set_int("LV_EU_supply", eu_supply)
-		end
-
-		meta:set_string("infotext",
-			S("Geothermal Generator").." ("..production_level.."%)")
-
-		if production_level > 0 and minetest.get_node(pos).name == "technic:geothermal" then
-			hacky_swap_node (pos, "technic:geothermal_active")
-			return
-		end
-		if production_level == 0 then
-			hacky_swap_node(pos, "technic:geothermal")
-			meta:set_int("LV_EU_supply", 0)
-		end
+	local positions = {
+		{x=pos.x+1, y=pos.y,   z=pos.z},
+		{x=pos.x+1, y=pos.y-1, z=pos.z},
+		{x=pos.x-1, y=pos.y,   z=pos.z},
+		{x=pos.x-1, y=pos.y-1, z=pos.z},
+		{x=pos.x,   y=pos.y,   z=pos.z+1},
+		{x=pos.x,   y=pos.y-1, z=pos.z+1},
+		{x=pos.x,   y=pos.y,   z=pos.z-1},
+		{x=pos.x,   y=pos.y-1, z=pos.z-1},
+	}
+	for _, p in pairs(positions) do
+		local check = check_node_around(p)
+		if check == 1 then water_nodes = water_nodes + 1 end
+		if check == 2 then lava_nodes  = lava_nodes  + 1 end
 	end
-}) 
+
+	if water_nodes == 1 and lava_nodes == 1 then production_level =  25; eu_supply = 50 end
+	if water_nodes == 2 and lava_nodes == 1 then production_level =  50; eu_supply = 100 end
+	if water_nodes == 1 and lava_nodes == 2 then production_level =  75; eu_supply = 200 end
+	if water_nodes == 2 and lava_nodes == 2 then production_level = 100; eu_supply = 300 end
+
+	if production_level > 0 then
+		meta:set_int("LV_EU_supply", eu_supply)
+	end
+
+	meta:set_string("infotext",
+		S("Geothermal %s Generator"):format("LV").." ("..production_level.."%)")
+
+	if production_level > 0 and minetest.get_node(pos).name == "technic:geothermal" then
+		technic.swap_node (pos, "technic:geothermal_active")
+		return
+	end
+	if production_level == 0 then
+		technic.swap_node(pos, "technic:geothermal")
+		meta:set_int("LV_EU_supply", 0)
+	end
+end
+
+minetest.register_node("technic:geothermal", {
+	description = S("Geothermal %s Generator"):format("LV"),
+	tiles = {"technic_geothermal_top.png", "technic_machine_bottom.png", "technic_geothermal_side.png",
+	         "technic_geothermal_side.png", "technic_geothermal_side.png", "technic_geothermal_side.png"},
+	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,
+		technic_machine=1, technic_lv=1},
+	paramtype2 = "facedir",
+	legacy_facedir_simple = true,
+	sounds = default.node_sound_wood_defaults(),
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_string("infotext", S("Geothermal %s Generator"):format("LV"))
+		meta:set_int("LV_EU_supply", 0)
+	end,
+	technic_run = run,
+})
+
+minetest.register_node("technic:geothermal_active", {
+	description = S("Geothermal %s Generator"):format("LV"),
+	tiles = {"technic_geothermal_top_active.png", "technic_machine_bottom.png", "technic_geothermal_side.png",
+	         "technic_geothermal_side.png", "technic_geothermal_side.png", "technic_geothermal_side.png"},
+	paramtype2 = "facedir",
+	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,
+		technic_machine=1, technic_lv=1, not_in_creative_inventory=1},
+	legacy_facedir_simple = true,
+	sounds = default.node_sound_wood_defaults(),
+	drop = "technic:geothermal",
+	technic_run = run,
+})
 
 technic.register_machine("LV", "technic:geothermal",        technic.producer)
 technic.register_machine("LV", "technic:geothermal_active", technic.producer)

--
Gitblit v1.8.0