Flowers: Make flower spread a public function to enable override

Remove search for 'group:flora_block'
Enable flora spread on 'dirt with dry grass'
This commit is contained in:
paramat 2016-04-16 22:33:08 +01:00
parent 80664f9f8a
commit ab7b7c7504

@ -71,20 +71,17 @@ end
-- Flower spread -- Flower spread
-- Public function to enable override by mods
minetest.register_abm({ function flowers.flower_spread(pos, node)
nodenames = {"group:flora"},
neighbors = {"default:dirt_with_grass", "default:desert_sand"},
interval = 13,
chance = 96,
action = function(pos, node)
pos.y = pos.y - 1 pos.y = pos.y - 1
local under = minetest.get_node(pos) local under = minetest.get_node(pos)
pos.y = pos.y + 1 pos.y = pos.y + 1
if under.name == "default:desert_sand" then if under.name == "default:desert_sand" then
minetest.set_node(pos, {name = "default:dry_shrub"}) minetest.set_node(pos, {name = "default:dry_shrub"})
return return
elseif under.name ~= "default:dirt_with_grass" then elseif under.name ~= "default:dirt_with_grass" and
under.name ~= "default:dirt_with_dry_grass" then
return return
end end
@ -95,12 +92,12 @@ minetest.register_abm({
local pos0 = vector.subtract(pos, 4) local pos0 = vector.subtract(pos, 4)
local pos1 = vector.add(pos, 4) local pos1 = vector.add(pos, 4)
if #minetest.find_nodes_in_area(pos0, pos1, "group:flora") > 3 or if #minetest.find_nodes_in_area(pos0, pos1, "group:flora") > 3 then
#minetest.find_nodes_in_area(pos0, pos1, "group:flora_block") > 0 then
return return
end end
local seedling = minetest.find_nodes_in_area_under_air(pos0, pos1, "default:dirt_with_grass") local seedling = minetest.find_nodes_in_area_under_air(pos0, pos1,
{"default:dirt_with_grass", "default:dirt_with_dry_grass"})
if #seedling > 0 then if #seedling > 0 then
seedling = seedling[math.random(#seedling)] seedling = seedling[math.random(#seedling)]
seedling.y = seedling.y + 1 seedling.y = seedling.y + 1
@ -110,6 +107,16 @@ minetest.register_abm({
end end
minetest.set_node(seedling, {name = node.name}) minetest.set_node(seedling, {name = node.name})
end end
end
minetest.register_abm({
nodenames = {"group:flora"},
neighbors = {"default:dirt_with_grass", "default:dirt_with_dry_grass",
"default:desert_sand"},
interval = 13,
chance = 96,
action = function(...)
flowers.flower_spread(...)
end, end,
}) })
@ -156,7 +163,9 @@ minetest.register_node("flowers:mushroom_brown", {
} }
}) })
-- mushroom spread and death
-- Mushroom spread and death
minetest.register_abm({ minetest.register_abm({
nodenames = {"flowers:mushroom_brown", "flowers:mushroom_red"}, nodenames = {"flowers:mushroom_brown", "flowers:mushroom_red"},
interval = 11, interval = 11,
@ -190,7 +199,9 @@ minetest.register_abm({
end end
}) })
-- these old mushroom related nodes can be simplified now
-- These old mushroom related nodes can be simplified now
minetest.register_alias("flowers:mushroom_spores_brown", "flowers:mushroom_brown") minetest.register_alias("flowers:mushroom_spores_brown", "flowers:mushroom_brown")
minetest.register_alias("flowers:mushroom_spores_red", "flowers:mushroom_red") minetest.register_alias("flowers:mushroom_spores_red", "flowers:mushroom_red")
minetest.register_alias("flowers:mushroom_fertile_brown", "flowers:mushroom_brown") minetest.register_alias("flowers:mushroom_fertile_brown", "flowers:mushroom_brown")