From: PilzAdam <adam-k@outlook.com>
Date: Fri, 28 Dec 2012 19:05:40 +0000 (+0100)
Subject: Convert old mese to the new mese block and generate it deep underground
X-Git-Tag: 0.4.5~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=33ec25caed35945359be1d78c0226180797e35a2;p=oweals%2Fminetest_game.git

Convert old mese to the new mese block and generate it deep underground
---

diff --git a/mods/default/init.lua b/mods/default/init.lua
index 76d7729e..b2ace5cd 100644
--- a/mods/default/init.lua
+++ b/mods/default/init.lua
@@ -487,7 +487,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:mese_block',
+	output = 'default:mese',
 	recipe = {
 		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
 		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
@@ -498,7 +498,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'default:mese_crystal 9',
 	recipe = {
-		{'default:mese_block'},
+		{'default:mese'},
 	}
 })
 
@@ -509,16 +509,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	type = "shapeless",
-	output = 'default:mese',
-	recipe = {
-		'default:mese_crystal',
-		'default:stone',
-	}
-})
-
-
 --
 -- Crafting (tool repair)
 --
@@ -613,12 +603,6 @@ minetest.register_craft({
 	burntime = 7,
 })
 
-minetest.register_craft({
-	type = "fuel",
-	recipe = "default:mese_crystal",
-	burntime = 30,
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:lava_source",
@@ -794,7 +778,7 @@ minetest.register_node("default:stone_with_iron", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
-minetest.register_node("default:mese", {
+minetest.register_node("default:stone_with_mese", {
 	description = "Mese Crystals in Stone",
 	tiles = {"default_stone.png^default_mineral_mese.png"},
 	is_ground_content = true,
@@ -1565,13 +1549,14 @@ minetest.register_node("default:steelblock", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
-minetest.register_node("default:mese_block", {
+minetest.register_node("default:mese", {
 	description = "Mese Block",
 	tiles = {"default_mese_block.png"},
 	is_ground_content = true,
 	groups = {cracky=1},
 	sounds = default.node_sound_stone_defaults(),
 })
+minetest.register_alias("default:mese_block", "default:mese")
 
 minetest.register_node("default:nyancat", {
 	description = "Nyan Cat",
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 419861c3..977aac7d 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -146,8 +146,10 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+1, 1/12/12/12, 2, 3,    -15,   2)
 	generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+2, 1/9/9/9,    3, 5,    -63, -16)
 	generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+3, 1/7/7/7,    3, 5, -31000, -64)
-	generate_ore("default:mese",            "default:stone", minp, maxp, seed+4, 1/16/16/16, 2, 3,   -127, -64)
-	generate_ore("default:mese",            "default:stone", minp, maxp, seed+5, 1/9/9/9,    3, 5, -31000,-128)
+	
+	generate_ore("default:stone_with_mese", "default:stone", minp, maxp, seed+4, 1/16/16/16, 2, 3,   -127,  -64)
+	generate_ore("default:stone_with_mese", "default:stone", minp, maxp, seed+5, 1/9/9/9,    3, 5, -31000, -128)
+	generate_ore("default:mese",            "default:stone", minp, maxp, seed+8, 1/16/16/16, 2, 3, -31000,-1024)
 	
 	generate_ore("default:stone_with_coal", "default:stone", minp, maxp, seed+7, 1/24/24/24, 6,27, -31000,  0)
 	generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+6, 1/24/24/24, 6,27, -31000, -64)