Created
December 28, 2012 18:02
-
-
Save PilzAdam/4400320 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/mods/default/init.lua b/mods/default/init.lua | |
index 7b8a58c..6b70b02 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,29 @@ minetest.register_craft({ | |
} | |
}) | |
+minetest.register_craft({ | |
+ output = 'default:mese', | |
+ 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'}, | |
+ } | |
+}) | |
+ | |
+minetest.register_craft({ | |
+ output = 'default:mese_crystal_fragment 9', | |
+ recipe = { | |
+ {'default:mese_crystal'}, | |
+ } | |
+}) | |
+ | |
-- | |
-- Crafting (tool repair) | |
-- | |
@@ -582,12 +605,6 @@ minetest.register_craft({ | |
minetest.register_craft({ | |
type = "fuel", | |
- recipe = "default:mese", | |
- burntime = 30, | |
-}) | |
- | |
-minetest.register_craft({ | |
- type = "fuel", | |
recipe = "default:lava_source", | |
burntime = 60, | |
}) | |
@@ -761,6 +778,15 @@ minetest.register_node("default:stone_with_iron", { | |
sounds = default.node_sound_stone_defaults(), | |
}) | |
+minetest.register_node("default:stone_with_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 +1032,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 +1549,14 @@ minetest.register_node("default:steelblock", { | |
sounds = default.node_sound_stone_defaults(), | |
}) | |
+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_node("default:nyancat", { | |
description = "Nyan Cat", | |
tiles = {"default_nc_side.png", "default_nc_side.png", "default_nc_side.png", | |
@@ -1629,6 +1655,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 +1670,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/leafdecay.lua b/mods/default/leafdecay.lua | |
index fe84573..330bb33 100644 | |
--- a/mods/default/leafdecay.lua | |
+++ b/mods/default/leafdecay.lua | |
@@ -86,6 +86,7 @@ minetest.register_abm({ | |
end | |
-- Remove node | |
minetest.env:remove_node(p0) | |
+ nodeupdate(p0) | |
end | |
end | |
}) | |
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua | |
index 419861c..339f80a 100644 | |
--- a/mods/default/mapgen.lua | |
+++ b/mods/default/mapgen.lua | |
@@ -142,12 +142,13 @@ end | |
minetest.register_on_generated(function(minp, maxp, seed) | |
-- Generate regular ores | |
- generate_ore("default:stone_with_coal", "default:stone", minp, maxp, seed+0, 1/8/8/8, 3, 8, -31000, 64) | |
- 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_coal", "default:stone", minp, maxp, seed+0, 1/8/8/8, 3, 8, -31000, 64) | |
+ 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: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+6, 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) | |
diff --git a/mods/default/models/character.png b/mods/default/models/character.png | |
index 8d0dd99..6af7db6 100644 | |
Binary files a/mods/default/models/character.png and b/mods/default/models/character.png differ | |
diff --git a/mods/default/textures/default_dirt.png b/mods/default/textures/default_dirt.png | |
index 30cd4bf..380ee37 100755 | |
Binary files a/mods/default/textures/default_dirt.png and b/mods/default/textures/default_dirt.png differ | |
diff --git a/mods/default/textures/default_grass_side.png b/mods/default/textures/default_grass_side.png | |
index 6ca1a6f..f5e9799 100755 | |
Binary files a/mods/default/textures/default_grass_side.png and b/mods/default/textures/default_grass_side.png differ | |
diff --git a/mods/default/textures/default_mese_block.png b/mods/default/textures/default_mese_block.png | |
new file mode 100644 | |
index 0000000..307eea2 | |
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 0000000..34fba2f | |
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 0000000..496f4bc | |
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 0000000..2be9944 | |
Binary files /dev/null and b/mods/default/textures/default_mineral_mese.png differ | |
diff --git a/mods/fire/init.lua b/mods/fire/init.lua | |
index b1c21e4..83bec41 100644 | |
--- a/mods/fire/init.lua | |
+++ b/mods/fire/init.lua | |
@@ -178,6 +178,7 @@ minetest.register_abm({ | |
return | |
end | |
minetest.env:remove_node(p) | |
+ nodeupdate(p) | |
end | |
else | |
-- remove flame |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment