From: BlockMen <nmuelll@web.de>
Date: Thu, 5 Mar 2015 15:46:49 +0000 (+0100)
Subject: Add Meselamps
X-Git-Tag: 0.4.13~90
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F446%2Fhead;p=oweals%2Fminetest_game.git

Add Meselamps

- Mese glows
- Glass + Mese = Meselamp
- New mese mineral texture
---

diff --git a/mods/default/README.txt b/mods/default/README.txt
index 888aae46..9a7e1930 100644
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -131,6 +131,8 @@ BlockMen (CC BY-SA 3.0):
   default_chest_lock.png
   default_chest_side.png
   default_chest_top.png
+  default_mineral_mese.png
+  default_meselamp.png
   bubble.png
   heart.png
   gui_*.png
diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index 71f00a7e..8ca4f5e3 100644
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -564,6 +564,14 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:meselamp 1',
+	recipe = {
+		{'', 'default:mese_crystal',''},
+		{'default:mese_crystal', 'default:glass', 'default:mese_crystal'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:obsidian_shard 9',
 	recipe = {
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index e64bd101..ef12559b 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -127,6 +127,8 @@ default:rail
 
 default:brick
 
+default:meselamp
+
 Misc
 ----
 default:cloud
@@ -674,18 +676,22 @@ minetest.register_node("default:bronzeblock", {
 minetest.register_node("default:stone_with_mese", {
 	description = "Mese Ore",
 	tiles = {"default_stone.png^default_mineral_mese.png"},
+	paramtype = "light",
 	is_ground_content = true,
-	groups = {cracky=1},
+	groups = {cracky = 1},
 	drop = "default:mese_crystal",
 	sounds = default.node_sound_stone_defaults(),
+	light_source = 1,
 })
 
 minetest.register_node("default:mese", {
 	description = "Mese Block",
 	tiles = {"default_mese_block.png"},
+	paramtype = "light",
 	is_ground_content = true,
-	groups = {cracky=1,level=2},
+	groups = {cracky = 1, level = 2},
 	sounds = default.node_sound_stone_defaults(),
+	light_source = 3,
 })
 
 
@@ -1446,6 +1452,19 @@ minetest.register_node("default:brick", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+
+minetest.register_node("default:meselamp", {
+	description = "Mese Lamp",
+	drawtype = "glasslike",
+	tiles = {"default_meselamp.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = false,
+	groups = {cracky = 3, oddly_breakable_by_hand = 3},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 12,
+})
+
 --
 -- Misc
 --
diff --git a/mods/default/textures/default_meselamp.png b/mods/default/textures/default_meselamp.png
new file mode 100644
index 00000000..b227a254
Binary files /dev/null and b/mods/default/textures/default_meselamp.png differ
diff --git a/mods/default/textures/default_mineral_mese.png b/mods/default/textures/default_mineral_mese.png
index 4e374481..566d379a 100644
Binary files a/mods/default/textures/default_mineral_mese.png and b/mods/default/textures/default_mineral_mese.png differ