Remove faceless pumpkins from survival again

The top face rotates when you use shears on the pumpkin.
This commit is contained in:
Wuzzy 2017-11-27 12:40:07 +01:00
parent 060a853840
commit 72684f36ff
3 changed files with 13 additions and 9 deletions

View file

@ -78,8 +78,8 @@ local stem_def = {
-- Template for pumpkin -- Template for pumpkin
local pumpkin_base_def = { local pumpkin_base_def = {
description = "Pumpkin", description = "Faceless Pumpkin",
_doc_items_longdesc = "A pumpkin is a naturally occouring block from the grasslands. Pumpkins are grown from pumpkin stems, which in turn are grown from pumpkin seeds. Pumpkins can be carved with shears.", _doc_items_longdesc = "A faceless pumpkin is a decorative block. It can be carved with shears to obtain pumpkin seeds.",
_doc_items_usagehelp = "To carve a face into the pumpkin, use the shears on the side you want to carve.", _doc_items_usagehelp = "To carve a face into the pumpkin, use the shears on the side you want to carve.",
stack_max = 64, stack_max = 64,
paramtype = "light", paramtype = "light",
@ -90,21 +90,20 @@ local pumpkin_base_def = {
_mcl_blast_resistance = 5, _mcl_blast_resistance = 5,
_mcl_hardness = 1, _mcl_hardness = 1,
} }
minetest.register_node("mcl_farming:pumpkin", pumpkin_base_def)
local pumpkin_face_base_def = table.copy(pumpkin_base_def) local pumpkin_face_base_def = table.copy(pumpkin_base_def)
pumpkin_face_base_def.description = "Carved Pumpkin" pumpkin_face_base_def.description = "Pumpkin"
pumpkin_face_base_def.doc_items_longdesc = "A carved pumpkin can be worn as a helmet for fun, but it doesn't offer any protection. Carved pumpkins are created by using shears on a pumpkin." pumpkin_face_base_def._doc_items_longdesc = "A pumpkin can be worn as a helmet for fun, but it doesn't offer any protection. Pumpkins grow from pumpkin stems, which in turn grow from pumpkin seeds."
pumpkin_face_base_def.tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_face.png"} pumpkin_face_base_def.tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_face.png"}
pumpkin_face_base_def.groups.armor_head=1 pumpkin_face_base_def.groups.armor_head=1
pumpkin_face_base_def.groups.non_combat_armor=1 pumpkin_face_base_def.groups.non_combat_armor=1
minetest.register_node("mcl_farming:pumpkin_face", pumpkin_face_base_def)
-- Register stem growth -- Register stem growth
mcl_farming:add_plant("plant_pumpkin_stem", "mcl_farming:pumpkintige_unconnect", {"mcl_farming:pumpkin_1", "mcl_farming:pumpkin_2", "mcl_farming:pumpkin_3", "mcl_farming:pumpkin_4", "mcl_farming:pumpkin_5", "mcl_farming:pumpkin_6", "mcl_farming:pumpkin_7"}, 30, 5) mcl_farming:add_plant("plant_pumpkin_stem", "mcl_farming:pumpkintige_unconnect", {"mcl_farming:pumpkin_1", "mcl_farming:pumpkin_2", "mcl_farming:pumpkin_3", "mcl_farming:pumpkin_4", "mcl_farming:pumpkin_5", "mcl_farming:pumpkin_6", "mcl_farming:pumpkin_7"}, 30, 5)
-- Register actual pumpkin, connected stems and stem-to-pumpkin growth -- Register actual pumpkin, connected stems and stem-to-pumpkin growth
mcl_farming:add_gourd("mcl_farming:pumpkintige_unconnect", "mcl_farming:pumpkintige_linked", "mcl_farming:pumpkintige_unconnect", stem_def, stem_drop, "mcl_farming:pumpkin", pumpkin_base_def, 30, 15, "mcl_farming_pumpkin_stem_connected.png^[colorize:#FFA800:127", mcl_farming:add_gourd("mcl_farming:pumpkintige_unconnect", "mcl_farming:pumpkintige_linked", "mcl_farming:pumpkintige_unconnect", stem_def, stem_drop, "mcl_farming:pumpkin_face", pumpkin_face_base_def, 30, 15, "mcl_farming_pumpkin_stem_connected.png^[colorize:#FFA800:127",
function(pos) function(pos)
-- Attempt to spawn iron golem or snow golem -- Attempt to spawn iron golem or snow golem
mobs_mc.tools.check_iron_golem_summon(pos) mobs_mc.tools.check_iron_golem_summon(pos)
@ -146,6 +145,11 @@ minetest.register_craft({
recipe = {{"mcl_farming:pumpkin"}} recipe = {{"mcl_farming:pumpkin"}}
}) })
minetest.register_craft({
output = "mcl_farming:pumpkin_seeds 4",
recipe = {{"mcl_farming:pumpkin_face"}}
})
minetest.register_craftitem("mcl_farming:pumpkin_pie", { minetest.register_craftitem("mcl_farming:pumpkin_pie", {
description = "Pumpkin Pie", description = "Pumpkin Pie",
_doc_items_longdesc = "A pumpkin pie is a tasty food item which can be eaten.", _doc_items_longdesc = "A pumpkin pie is a tasty food item which can be eaten.",

View file

@ -2858,7 +2858,7 @@ local function register_decorations()
size = { x=1, y=2, z=1 }, size = { x=1, y=2, z=1 },
data = { data = {
{ name = "air", prob = 0 }, { name = "air", prob = 0 },
{ name = "mcl_farming:pumpkin", param1=255, }, { name = "mcl_farming:pumpkin_face", param1=255, },
}, },
}, },
place_on = {"group:grass_block_no_snow"}, place_on = {"group:grass_block_no_snow"},

View file

@ -842,7 +842,7 @@ local function register_mgv6_decorations()
size = { x=1, y=2, z=1 }, size = { x=1, y=2, z=1 },
data = { data = {
{ name = "air", prob = 0 }, { name = "air", prob = 0 },
{ name = "mcl_farming:pumpkin" }, { name = "mcl_farming:pumpkin_face" },
}, },
}, },
place_on = {"group:grass_block_no_snow"}, place_on = {"group:grass_block_no_snow"},