From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Fri, 14 Dec 2012 17:07:16 +0000 (-0500)
Subject: Changed Mese to act like an object cut out of a block of stone, rather than an
X-Git-Tag: 0.4.5~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1bf62bbad43b8687bf5ca47126e9eb60e1eae118;p=oweals%2Fminetest_game.git

Changed Mese to act like an object cut out of a block of stone, rather than an
object found *among* the stone.

That is, mese should behave such that you get something potentially useful out
of the aggregate block you just broke, rather than just collecting the whole
block when mined.

Mese crystals in stone give a single Mese Crystal when mines. Craft three of
those + 2 sticks for Mese Pickaxe, or 9 for a Mese block. Craft one Mese
Crystal by itself to get 9 Mese Crystal fragments, which all mods should use
when a full Mese Crystal is too much.

This includes new textures for the above objects, tweaks to the sounds used for
them, and naming tweaks for the textures used for default mese in stone, so
that old texture packs don't use the "wrong" image.

This represents my best effort to match C55's suggestions.
---

diff --git a/mods/default/init.lua b/mods/default/init.lua
index 7b8a58c7..76d7729e 100644
--- a/mods/default/init.lua
+++ b/mods/default/init.lua
@@ -275,7 +275,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'default:pick_mese',
 	recipe = {
-		{'default:mese', 'default:mese', 'default:mese'},
+		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
 		{'', 'default:stick', ''},
 		{'', 'default:stick', ''},
 	}
@@ -486,6 +486,39 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:mese_block',
+	recipe = {
+		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:mese_crystal 9',
+	recipe = {
+		{'default:mese_block'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:mese_crystal_fragment 9',
+	recipe = {
+		{'default:mese_crystal'},
+	}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = 'default:mese',
+	recipe = {
+		'default:mese_crystal',
+		'default:stone',
+	}
+})
+
+
 --
 -- Crafting (tool repair)
 --
@@ -582,7 +615,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "default:mese",
+	recipe = "default:mese_crystal",
 	burntime = 30,
 })
 
@@ -761,6 +794,15 @@ minetest.register_node("default:stone_with_iron", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:mese", {
+	description = "Mese Crystals in Stone",
+	tiles = {"default_stone.png^default_mineral_mese.png"},
+	is_ground_content = true,
+	groups = {cracky=1},
+	drop = "default:mese_crystal",
+	sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("default:dirt_with_grass", {
 	description = "Dirt with Grass",
 	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
@@ -1006,14 +1048,6 @@ minetest.register_node("default:wood", {
 	sounds = default.node_sound_wood_defaults(),
 })
 
-minetest.register_node("default:mese", {
-	description = "Mese",
-	tiles = {"default_mese.png"},
-	is_ground_content = true,
-	groups = {cracky=1},
-	sounds = default.node_sound_defaults(),
-})
-
 minetest.register_node("default:cloud", {
 	description = "Cloud",
 	tiles = {"default_cloud.png"},
@@ -1531,6 +1565,14 @@ minetest.register_node("default:steelblock", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:mese_block", {
+	description = "Mese Block",
+	tiles = {"default_mese_block.png"},
+	is_ground_content = true,
+	groups = {cracky=1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("default:nyancat", {
 	description = "Nyan Cat",
 	tiles = {"default_nc_side.png", "default_nc_side.png", "default_nc_side.png",
@@ -1629,6 +1671,11 @@ minetest.register_craftitem("default:iron_lump", {
 	inventory_image = "default_iron_lump.png",
 })
 
+minetest.register_craftitem("default:mese_crystal", {
+	description = "Mese Crystal",
+	inventory_image = "default_mese_crystal.png",
+})
+
 minetest.register_craftitem("default:clay_lump", {
 	description = "Clay Lump",
 	inventory_image = "default_clay_lump.png",
@@ -1639,6 +1686,11 @@ minetest.register_craftitem("default:steel_ingot", {
 	inventory_image = "default_steel_ingot.png",
 })
 
+minetest.register_craftitem("default:mese_crystal_fragment", {
+	description = "Mese Crystal Fragment",
+	inventory_image = "default_mese_crystal_fragment.png",
+})
+
 minetest.register_craftitem("default:clay_brick", {
 	description = "Clay Brick",
 	inventory_image = "default_steel_ingot.png",
diff --git a/mods/default/textures/default_mese_block.png b/mods/default/textures/default_mese_block.png
new file mode 100644
index 00000000..307eea24
Binary files /dev/null and b/mods/default/textures/default_mese_block.png differ
diff --git a/mods/default/textures/default_mese_crystal.png b/mods/default/textures/default_mese_crystal.png
new file mode 100644
index 00000000..34fba2fd
Binary files /dev/null and b/mods/default/textures/default_mese_crystal.png differ
diff --git a/mods/default/textures/default_mese_crystal_fragment.png b/mods/default/textures/default_mese_crystal_fragment.png
new file mode 100644
index 00000000..496f4bc2
Binary files /dev/null and b/mods/default/textures/default_mese_crystal_fragment.png differ
diff --git a/mods/default/textures/default_mineral_mese.png b/mods/default/textures/default_mineral_mese.png
new file mode 100644
index 00000000..2be9944b
Binary files /dev/null and b/mods/default/textures/default_mineral_mese.png differ