From 20c08a4e03c6aa66067135bc13bb5c72b6b26093 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Fri, 28 Dec 2012 02:57:47 -0500 Subject: [PATCH] Tweaked Mese behavior so that the old Mese object is still available. In old map areas, structures where Mese was used, and player inventorues, the old black-on-yellow block is present as it used to be. In newly-generated map areas, Mese Crystals in Stone will generate instead, as default:stone_with_mese. Old Mese is not generated at all anymore, as this object is deprecated. When dug, the new Mese Crystals in Stone drops a single Mese Crystal as before, while digging the old Mese object returns exactly those objects as before. Mese Crystals can be crafted into Mese Blocks or into Fragments as before. Mese pickaxes are crafted from Mese Crystals and sticks. The original default:mese, if needed, can be obtained by crafting two Mese Crystals, which yields two of the old Mese object. Two of these can be crafted back into two Crystals if needed. --- mods/default/init.lua | 22 ++++++++++++++++++++-- mods/default/mapgen.lua | 6 +++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/mods/default/init.lua b/mods/default/init.lua index 76d7729e..497b0b52 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -511,13 +511,21 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", - output = 'default:mese', + output = 'default:mese 2', recipe = { 'default:mese_crystal', - 'default:stone', + 'default:mese_crystal', } }) +minetest.register_craft({ + type = "shapeless", + output = 'default:mese_crystal 2', + recipe = { + 'default:mese', + 'default:mese', + } +}) -- -- Crafting (tool repair) @@ -795,6 +803,16 @@ minetest.register_node("default:stone_with_iron", { }) minetest.register_node("default:mese", { + description = "Mese (Old)", + tiles = {"default_mese.png"}, + is_ground_content = true, + groups = {cracky=1}, + sounds = default.node_sound_stone_defaults(), +}) + +-- minetest.register_alias("default:mese", "default:mese_block") + +minetest.register_node("default:stone_with_mese", { description = "Mese Crystals in Stone", tiles = {"default_stone.png^default_mineral_mese.png"}, is_ground_content = true, diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua index 419861c3..faa479ef 100644 --- a/mods/default/mapgen.lua +++ b/mods/default/mapgen.lua @@ -21,7 +21,7 @@ minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass") minetest.register_alias("mapgen_junglegrass", "default:junglegrass") minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal") minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron") -minetest.register_alias("mapgen_mese", "default:mese") +minetest.register_alias("mapgen_mese", "default:stone_with_mese") minetest.register_alias("mapgen_desert_sand", "default:desert_sand") minetest.register_alias("mapgen_desert_stone", "default:desert_stone") @@ -146,8 +146,8 @@ 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: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)