Fix farming API

This commit is contained in:
BlockMen 2015-11-06 15:50:56 +01:00
parent 55db68e68b
commit dce00ba128

View File

@ -167,7 +167,11 @@ farming.place_seed = function(itemstack, placer, pointed_thing, plantname)
end
-- add the node and remove 1 item from the itemstack
minetest.add_node(pt.above, {name = plantname, param2 = 1})
local ndef = core.registered_items[plantname]
if ndef and not ndef.drawtype then
plantname = plantname .. "_1"
end
minetest.set_node(pt.above, {name = plantname, param2 = 1})
if not minetest.setting_getbool("creative_mode") then
itemstack:take_item()
end
@ -198,7 +202,7 @@ farming.register_plant = function(name, def)
if not def.fertility then
def.fertility = {}
end
if not def.has_seed then
if def.has_seed ~= false then
def.has_seed = true
end
@ -228,7 +232,8 @@ farming.register_plant = function(name, def)
fertility = def.fertility,
on_place = function(itemstack, placer, pointed_thing)
return farming.place_seed(itemstack, placer, pointed_thing, mname .. ":seed_" .. pname)
end
end,
on_use = def.on_use,
})
-- Register harvest
@ -237,56 +242,37 @@ farming.register_plant = function(name, def)
inventory_image = mname .. "_" .. pname .. ".png",
})
else
minetest.register_node(":" .. mname .. ":" .. pname, {
minetest.register_craftitem(":" .. mname .. ":" .. pname, {
description = def.description,
tiles = {def.inventory_image},
inventory_image = def.inventory_image,
wield_image = def.inventory_image,
drawtype = "signlike",
groups = g,
paramtype = "light",
paramtype2 = "wallmounted",
walkable = false,
sunlight_propagates = true,
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
},
fertility = def.fertility,
on_place = function(itemstack, placer, pointed_thing)
return farming.place_seed(itemstack, placer, pointed_thing, mname .. ":" .. pname)
end
end,
on_use = def.on_use,
})
end
-- Register growing steps
local max_step = def.steps + 1
for i = 1,def.steps do
if i < def.steps and def.has_seed == true then
local drop = mname .. ":seed_" .. pname
elseif i < def.steps and def.has_seed == false then
local drop = mname .. ":" .. pname
elseif i == def.steps and def.has_seed == true then
local drop = def.drop or {
items = {
{items = {mname .. ":" .. pname}},
{items = {mname .. ":" .. pname}, rarity = 2},
{items = {mname .. ":" .. pname}, rarity = 10},
{items = {mname .. ":seed_" .. pname}},
{items = {mname .. ":seed_" .. pname}, rarity = 2.25},
{items = {mname .. ":seed_" .. pname}, rarity = 10},
}
}
elseif i == def.steps and def.has_seed == false then
local drop = def.drop or {
items = {
{items = {mname .. ":" .. pname}},
{items = {mname .. ":" .. pname}, rarity = 1.2},
{items = {mname .. ":" .. pname}, rarity = 2},
{items = {mname .. ":" .. pname}, rarity = 4},
{items = {mname .. ":" .. pname}, rarity = 16},
{items = {mname .. ":" .. pname}, rarity = max_step - i},
{items = {mname .. ":" .. pname}, rarity = (max_step - i) * 2},
{items = {mname .. ":seed_" .. pname}, rarity = max_step - i},
{items = {mname .. ":seed_" .. pname}, rarity = (max_step - i) * 2},
}
}
if def.has_seed == false then
drop.items[3] = {items = {mname .. ":" .. pname}, rarity = (max_step - i) * 4}
drop.items[4] = {items = {mname .. ":" .. pname}, rarity = (max_step - i) * 6}
end
local nodegroups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1}
nodegroups[pname] = i
minetest.register_node(":" .. mname .. ":" .. pname .. "_" .. i, {
@ -323,7 +309,7 @@ farming.register_plant = function(name, def)
local node_def = minetest.registered_items[node.name] or nil
-- grow seed
if minetest.get_item_group(node.name, "seed") and node_def.fertility then
if def.has_seed and minetest.get_item_group(node.name, "seed") and node_def.fertility then
local can_grow = false
local soil_node = minetest.get_node_or_nil({x = pos.x, y = pos.y - 1, z = pos.z})
if not soil_node then
@ -334,10 +320,8 @@ farming.register_plant = function(name, def)
can_grow = true
end
end
if can_grow and def.has_seed then
if can_grow then
minetest.set_node(pos, {name = node.name:gsub("seed_", "") .. "_1"})
else
minetest.set_node(pos, {name = node.name .. "_1"})
end
return
end