Merge remote-tracking branch 'upstream/master'

À cause du merge précédent mal fait.

.luacheckrc

@@ -30,5 +30,4 @@ read_globals = {
 	"frame",
 	"mg",
 	"toolranks",
-	"mcl_sounds"
 }

_config.txt

@@ -54,47 +54,27 @@ moreores.mithril_clust_size_high = 3
 moreores.mithril_clust_size = 3
 moreores.mithril_clust_size_deep = 3
 
+-- Maximal and minimal depths of ore generation (Y coordinate, 0 being sea level by default)
+-- Tin
+moreores.tin_max_depth_high = 31000
+moreores.tin_min_depth_high = 1025
+moreores.tin_max_depth = -64           -- For v6 mapgen, -32 fits better
+moreores.tin_min_depth = -127
+moreores.tin_max_depth_deep = -128
+moreores.tin_min_depth_deep = -31000
 
-if minetest.get_modpath("mcl_core") then
-	-- Example adjustments for MineClone2
-	moreores.tin_max_depth_high = 0
-	moreores.tin_min_depth_high = -10
-	moreores.tin_max_depth = -11
-	moreores.tin_min_depth = -57
+-- Silver
+moreores.silver_max_depth_high = 31000
+moreores.silver_min_depth_high = 1025
+moreores.silver_max_depth = -64         -- For v6 mapgen, -32 fits better
+moreores.silver_min_depth = -127        -- For v6 mapgen, -63 fits better
+moreores.silver_max_depth_deep = -128   -- For v6 mapgen, -64 fits better
+moreores.silver_min_depth_deep = -31000
 
-	-- Similar adjustments for silver and mithril
-	moreores.silver_max_depth_high = 0
-	moreores.silver_min_depth_high = -10
-	moreores.silver_max_depth = -11
-	moreores.silver_min_depth = -57
-
-	moreores.mithril_max_depth_high = 0
-	moreores.mithril_min_depth_high = -20
-	moreores.mithril_max_depth = -21
-	moreores.mithril_min_depth = -57
-else
-  -- Maximal and minimal depths of ore generation (Y coordinate, 0 being sea level by default)
-  -- Tin
-  moreores.tin_max_depth_high = 31000
-  moreores.tin_min_depth_high = 1025
-  moreores.tin_max_depth = -64           -- For v6 mapgen, -32 fits better
-  moreores.tin_min_depth = -127
-  moreores.tin_max_depth_deep = -128
-  moreores.tin_min_depth_deep = -31000
-
-  -- Silver
-  moreores.silver_max_depth_high = 31000
-  moreores.silver_min_depth_high = 1025
-  moreores.silver_max_depth = -64         -- For v6 mapgen, -32 fits better
-  moreores.silver_min_depth = -127        -- For v6 mapgen, -63 fits better
-  moreores.silver_max_depth_deep = -128   -- For v6 mapgen, -64 fits better
-  moreores.silver_min_depth_deep = -31000
-
-  -- Mithril
-  moreores.mithril_max_depth_high = 31000
-  moreores.mithril_min_depth_high = 2049
-  moreores.mithril_max_depth = -2048          -- For v6 mapgen, -256 fits better
-  moreores.mithril_min_depth = -4095          -- For v6 mapgen, -511 fits better
-  moreores.mithril_max_depth_deep = -4096     -- For v6 mapgen, -512 fits better
-  moreores.mithril_min_depth_deep = -31000
-end
+-- Mithril
+moreores.mithril_max_depth_high = 31000
+moreores.mithril_min_depth_high = 2049
+moreores.mithril_max_depth = -2048          -- For v6 mapgen, -256 fits better
+moreores.mithril_min_depth = -4095          -- For v6 mapgen, -511 fits better
+moreores.mithril_max_depth_deep = -4096     -- For v6 mapgen, -512 fits better
+moreores.mithril_min_depth_deep = -31000

init.lua

@@ -25,32 +25,11 @@ end
 -- `frame` support
 local use_frame = minetest.get_modpath("frame")
 
-local is_mcl_core_present = minetest.get_modpath("mcl_core") ~= nil
-local is_mcl_sounds_present = minetest.get_modpath("mcl_sounds") ~= nil
-local is_mcl_copper_present = minetest.registered_items["mcl_copper:copper_ingot"] ~= nil
-local stone_ingredient = is_mcl_core_present and "mcl_core:stone" or "default:stone"
-
-local copper_ingredient =
-is_mcl_core_present and "mcl_copper:copper_ingot" or 'default:copper_ingot'
-
-local default_stone_sounds
-local default_metal_sounds
-
-if is_mcl_sounds_present then
-	default_stone_sounds = mcl_sounds.node_sound_stone_defaults()
-	default_metal_sounds = mcl_sounds.node_sound_metal_defaults()
-else
-	default_stone_sounds = default.node_sound_stone_defaults()
-	default_metal_sounds = default.node_sound_metal_defaults()
-end
-
+local default_stone_sounds = default.node_sound_stone_defaults()
+local default_metal_sounds = default.node_sound_metal_defaults()
 
 -- Returns the crafting recipe table for a given material and item.
 local function get_recipe(material, item)
-	if is_mcl_core_present then
-		material = material:gsub("default:", "mcl_core:")
-	end
-
 	if item == "sword" then
 		return {
 			{material},
@@ -95,12 +74,7 @@ local function get_recipe(material, item)
 	end
 end
 
-local function add_ore(modname, description, mineral_name, oredef, extra_node_def)
-
-	if mineral_name == "copper" and is_mcl_copper_present then
-		return
-	end
-
+local function add_ore(modname, description, mineral_name, oredef)
 	local img_base = modname .. "_" .. mineral_name
 	local toolimg_base = modname .. "_tool_"..mineral_name
 	local tool_base = modname .. ":"
@@ -109,34 +83,14 @@ local function add_ore(modname, description, mineral_name, oredef, extra_node_de
 	local ingot = item_base .. "_ingot"
 	local lump_item = item_base .. "_lump"
 
-	local function merge_tables(t1, t2)
-	    for k, v in pairs(t2) do
-	        if type(v) == "table" and type(t1[k]) == "table" then
-	            -- If both t1[k] and v are tables, merge them recursively
-	            merge_tables(t1[k], v)
-	        else
-	            -- Otherwise, simply set the value
-	            t1[k] = v
-	        end
-	    end
-	    return t1
-	end
-
-
 	if oredef.makes.ore then
-        local node_def_tbl = {
-            description = S("@1 Ore", S(description)),
-            tiles = {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name ..
-						".png"},
-            groups = {cracky = 2},
-            sounds = default_stone_sounds,
-            drop = lump_item,
-        }
-		if extra_node_def then
-			node_def_tbl = merge_tables(node_def_tbl, extra_node_def)
-		end
-        minetest.register_node(modname .. ":mineral_" .. mineral_name, node_def_tbl)
-
+		minetest.register_node(modname .. ":mineral_" .. mineral_name, {
+			description = S("@1 Ore", S(description)),
+			tiles = {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name .. ".png"},
+			groups = {cracky = 2},
+			sounds = default_stone_sounds,
+			drop = lump_item,
+		})
 
 		if use_frame then
 			frame.register(modname .. ":mineral_" .. mineral_name)
@@ -149,7 +103,6 @@ local function add_ore(modname, description, mineral_name, oredef, extra_node_de
 			description = S("@1 Block", S(description)),
 			tiles = {img_base .. "_block.png"},
 			groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2},
-			is_ground_content = false,
 			sounds = default_metal_sounds,
 		})
 		minetest.register_alias(mineral_name.."_block", block_item)
@@ -200,7 +153,6 @@ local function add_ore(modname, description, mineral_name, oredef, extra_node_de
 	end
 
 	if oredef.makes.chest then
-		if not is_mcl_core_present then
 		minetest.register_craft( {
 			output = "default:chest_locked",
 			recipe = {
@@ -208,25 +160,23 @@ local function add_ore(modname, description, mineral_name, oredef, extra_node_de
 				{"default:chest"},
 			}
 		})
-
 		minetest.register_craft( {
 			output = "default:chest_locked",
 			recipe = get_recipe(ingot, "lockedchest")
 		})
 	end
-	end
 
 	oredef.oredef_high.ore_type = "scatter"
 	oredef.oredef_high.ore = modname .. ":mineral_" .. mineral_name
-	oredef.oredef_high.wherein = stone_ingredient
+	oredef.oredef_high.wherein = "default:stone"
 
 	oredef.oredef.ore_type = "scatter"
 	oredef.oredef.ore = modname .. ":mineral_" .. mineral_name
-	oredef.oredef.wherein = stone_ingredient
+	oredef.oredef.wherein = "default:stone"
 
 	oredef.oredef_deep.ore_type = "scatter"
 	oredef.oredef_deep.ore = modname .. ":mineral_" .. mineral_name
-	oredef.oredef_deep.wherein = stone_ingredient
+	oredef.oredef_deep.wherein = "default:stone"
 
 	minetest.register_ore(oredef.oredef_high)
 	minetest.register_ore(oredef.oredef)
@@ -243,46 +193,26 @@ local function add_ore(modname, description, mineral_name, oredef, extra_node_de
 				full_punch_interval = oredef.full_punch_interval,
 			},
 			sound = {breaks = "default_tool_breaks"},
-			_repair_material = ingot,
-			_mcl_toollike_wield = true,
-      mcl_diggroups = tooldef._mcl_diggroups,
-			groups = tooldef.groups,
 		}
 
 		if tool_name == "sword" then
 			tdef.description = S("@1 Sword", S(description))
-			if tdef.groups then
-				tdef.groups = merge_tables(tdef.groups, {sword = 1})
-			else
-				tdef.groups = {sword = 1}
-			end
+			tdef.groups = {sword = 1}
 		end
 
 		if tool_name == "pick" then
 			tdef.description = S("@1 Pickaxe", S(description))
-			if tdef.groups then
-				tdef.groups = merge_tables(tdef.groups, {pickaxe = 1, tool=1})
-			else
-				tdef.groups = {pickaxe = 1, tool=1}
-			end
+			tdef.groups = {pickaxe = 1}
 		end
 
 		if tool_name == "axe" then
 			tdef.description = S("@1 Axe", S(description))
-			if tdef.groups then
-				tdef.groups = merge_tables(tdef.groups, {axe = 1, tool=1})
-			else
-				tdef.groups = {axe = 1, tool=1}
-			end
+			tdef.groups = {axe = 1}
 		end
 
 		if tool_name == "shovel" then
 			tdef.description = S("@1 Shovel", S(description))
-			if tdef.groups then
-				tdef.groups = merge_tables(tdef.groups, {shovel = 1, tool=1})
-			else
-				tdef.groups = {shovel = 1, tool=1}
-			end
+			tdef.groups = {shovel = 1}
 			tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90"
 		end
 
@@ -356,23 +286,15 @@ local oredefs = {
 					cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1},
 				},
 				damage_groups = {fleshy = 4},
-				groups = {dig_speed_class=4, enchantability=14},
-				_mcl_diggroups = {
-					pickaxey = { speed = 6, level = 4, uses = 126 }
-			},
 			},
 			hoe = {
-				max_uses = 150,
+				max_uses = 300,
 			},
 			shovel = {
 				groupcaps = {
 					crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1},
 				},
 				damage_groups = {fleshy = 3},
-				groups = {dig_speed_class=4, enchantability=14},
-				_mcl_diggroups = {
-					shovely = { speed = 6, level = 4, uses = 126 }
-			},
 			},
 			axe = {
 				groupcaps = {
@@ -380,10 +302,6 @@ local oredefs = {
 					fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1},
 				},
 				damage_groups = {fleshy = 5},
-				groups = {dig_speed_class=4, enchantability=14},
-				_mcl_diggroups = {
-					axey = { speed = 6, level = 4, uses = 126 }
-			},
 			},
 			sword = {
 				groupcaps = {
@@ -392,19 +310,9 @@ local oredefs = {
 					choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0},
 				},
 				damage_groups = {fleshy = 6},
-				_mcl_diggroups = {
-					swordy = { speed = 6, level = 4, uses = 126 },
-					swordy_cobweb = { speed = 6, level = 4, uses = 126 }
-			},
 			},
 		},
 		full_punch_interval = 1.0,
-		extra_node_def = {
-			_mcl_blast_resistance =  3,
-			_mcl_hardness =  4,
-			_mcl_silk_touch_drop = true,
-			groups = {pickaxey = 4}
-		}
 	},
 	mithril = {
 		description = "Mithril",
@@ -433,58 +341,36 @@ local oredefs = {
 		tools = {
 			pick = {
 				groupcaps = {
-					cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 3126, maxlevel = 3},
+					cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 3},
 				},
 				damage_groups = {fleshy = 6},
-				groups = {dig_speed_class=5, enchantability=10},
-				_mcl_diggroups = {
-					pickaxey = { speed = 8, level = 5, uses = 3126 }
-				},
 			},
 			hoe = {
-				max_uses = 2000,
+				max_uses = 1000,
 			},
 			shovel = {
 				groupcaps = {
-					crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 3126, maxlevel = 3},
-				},
-				damage_groups = {fleshy = 6},
-				groups = {dig_speed_class=5, enchantability=10},
-				_mcl_diggroups = {
-					shovely = { speed = 8, level = 5, uses = 3126 }
+					crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 3},
 				},
+				damage_groups = {fleshy = 5},
 			},
 			axe = {
 				groupcaps = {
-					choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 3126, maxlevel = 3},
-					fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 3126, maxlevel = 3},
-				},
-				damage_groups = {fleshy = 10},
-				groups = {dig_speed_class=5, enchantability=10},
-				_mcl_diggroups = {
-					axey = { speed = 8, level = 5, uses = 3126 }
+					choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 3},
+					fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 2},
 				},
+				damage_groups = {fleshy = 8},
 			},
 			sword = {
 				groupcaps = {
-					fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 3126, maxlevel = 3},
-					snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.30}, uses = 3126, maxlevel = 3},
-					choppy = {times = {[3] = 0.80}, uses = 3126, maxlevel = 0},
-				},
-				damage_groups = {fleshy = 7},
-				_mcl_diggroups = {
-					swordy = { speed = 8, level = 5, uses = 3126 },
-					swordy_cobweb = { speed = 8, level = 5, uses = 3126 }
+					fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2},
+					snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 3},
+					choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0},
 				},
+				damage_groups = {fleshy = 10},
 			},
 		},
 		full_punch_interval = 0.45,
-		extra_node_def = {
-			_mcl_blast_resistance =  3,
-			_mcl_hardness =  5,
-			_mcl_silk_touch_drop = true,
-			groups = {pickaxey = 5}
-		},
 	}
 }
 
@@ -527,12 +413,6 @@ else
 			y_max = moreores.tin_max_depth_deep,
 		},
 		tools = {},
-		extra_node_def = {
-			_mcl_blast_resistance =  3,
-			_mcl_hardness =  3,
-			_mcl_silk_touch_drop = true,
-			groups = {pickaxey = 3}
-		},
 	}
 
 	-- Bronze has some special cases, because it is made from copper and tin
@@ -541,8 +421,8 @@ else
 		output = "default:bronze_ingot 3",
 		recipe = {
 			"moreores:tin_ingot",
-			copper_ingredient,
-			copper_ingredient,
+			"default:copper_ingot",
+			"default:copper_ingot",
 		},
 	})
 end
@@ -564,15 +444,15 @@ if minetest.get_modpath("carts") then
 end
 
 minetest.register_craft({
-	output = "moreores:copper_rail 24",
+	output = "moreores:copper_rail 18",
 	recipe = {
-		{copper_ingredient, "", copper_ingredient},
-		{copper_ingredient, "group:stick", copper_ingredient},
-		{copper_ingredient, "", copper_ingredient},
+		{"default:copper_ingot", "group:wood", "default:copper_ingot"},
+		{"default:copper_ingot", "", "default:copper_ingot"},
+		{"default:copper_ingot", "group:wood", "default:copper_ingot"},
 	},
 })
 
 for orename, def in pairs(oredefs) do
 	-- Register everything
-	add_ore("moreores", def.description, orename, def, def.extra_node_def)
+	add_ore("moreores", def.description, orename, def)
 end

locale/moreores.pl.tr

@@ -7,7 +7,7 @@
 @1 Ingot=@1 Sztabka
 @1 Block=@1 Blok
 @1 Pickaxe=@1 Kilof
-@1 Shovel=@1 Łopata
+@1 Shovel=@1 Łopatka
 @1 Axe=@1 Siekiera
 @1 Sword=@1 Miecz
 
@@ -17,4 +17,4 @@ Bronze=Brąz
 Silver=Srebro
 Gold=Złoto
 Mithril=Mithril
-Copper Rail=Miedziany Tor
+Copper Rail=Miedziany tor

locale/moreores.ru.tr

@@ -1,19 +0,0 @@
-# textdomain: moreores
-
-@1 Ore=Руда @1
-@1 Lump=Кусок @1
-@1 Ingot=Слиток @1
-@1 Block=Блок @1
-@1 Pickaxe=Кирка из @1
-@1 Shovel=Лопата из @1
-@1 Axe=Топор из @1
-@1 Sword=Меч из @1
-@1 Hoe=Мотыга из @1
-
-Copper=меди
-Tin=олова
-Bronze=бронзы
-Silver=серебра
-Gold=золота
-Mithril=мифрила
-Copper Rail=медные рельсы

locale/moreores.uk.tr

@@ -1,22 +0,0 @@
-# textdomain: moreores
-
-More Ores=Більше Руд
-Adds new ore types.=Додає нові типи руд.
-
-@1 Ore=Руда @1
-@1 Lump=Шматок @1
-@1 Ingot=Злиток @1
-@1 Block=Блок @1
-@1 Pickaxe=Кайло з @1
-@1 Shovel=Лопата з @1
-@1 Axe=Сокира з @1
-@1 Sword=Меч з @1
-@1 Hoe=Мотика з @1
-
-Copper=міді
-Tin=олова
-Bronze=бронзи
-Silver=срібла
-Gold=золота
-Mithril=міфрілу
-Copper Rail=Мідні рейки

mod.conf

@@ -1,5 +1,5 @@
 name = moreores
 description = Adds new ore types.
-optional_depends = carts,farming,frame,mg,toolranks,mcl_core,mcl_sounds
+depends = default
+optional_depends = carts,farming,frame,mg,toolranks
 min_minetest_version = 5.0.0
-supported_games = mineclone2,mineclonia,minetest_game