end
minetest.log("action", "A sapling grows into a tree at "..
- minetest.pos_to_string(pos))
- default.grow_tree(pos, random(1, 4) == 1)
+ minetest.pos_to_string(pos))
+ if minetest.get_mapgen_params().mgname == "v6" then
+ default.grow_tree(pos, random(1, 4) == 1)
+ else
+ default.grow_new_apple_tree(pos)
+ end
end
})
end
minetest.log("action", "A jungle sapling grows into a tree at "..
- minetest.pos_to_string(pos))
- default.grow_jungletree(pos)
+ minetest.pos_to_string(pos))
+ if minetest.get_mapgen_params().mgname == "v6" then
+ default.grow_jungle_tree(pos)
+ else
+ default.grow_new_jungle_tree(pos)
+ end
end
})
end
minetest.log("action", "A pine sapling grows into a tree at "..
- minetest.pos_to_string(pos))
- default.grow_pinetree(pos)
+ minetest.pos_to_string(pos))
+ if minetest.get_mapgen_params().mgname == "v6" then
+ default.grow_pine_tree(pos)
+ else
+ default.grow_new_pine_tree(pos)
+ end
+ end
+})
+
+minetest.register_abm({
+ nodenames = {"default:acacia_sapling"},
+ interval = 13,
+ chance = 50,
+ action = function(pos, node)
+ if not can_grow(pos) then
+ return
+ end
+
+ minetest.log("action", "An acacia sapling grows into a tree at "..
+ minetest.pos_to_string(pos))
+ default.grow_new_acacia_tree(pos)
end
})
local c_apple = minetest.get_content_id("default:apple")
-- Trunk
- for y_dist = 0, height - 1 do
- local vi = a:index(x, y + y_dist, z)
+ data[a:index(x, y, z)] = tree_cid -- Force-place lowest trunk node to replace sapling
+ for yy = y + 1, y + height - 1 do
+ local vi = a:index(x, yy, z)
local node_id = data[vi]
- if y_dist == 0 or node_id == c_air or node_id == c_ignore
- or node_id == leaves_cid then
+ if node_id == c_air or node_id == c_ignore or node_id == leaves_cid then
data[vi] = tree_cid
end
end
-- Jungletree
-function default.grow_jungletree(pos, bad)
+function default.grow_jungle_tree(pos, bad)
--[[
NOTE: Jungletree-placing code is currently duplicated in the engine
and in games that have saplings; both are deprecated but not
replaced yet
--]]
if bad then
- error("Deprecated use of default.grow_jungletree")
+ error("Deprecated use of default.grow_jungle_tree")
end
local x, y, z = pos.x, pos.y, pos.z
-- Pinetree from mg mapgen mod, design by sfan5, pointy top added by paramat
local function add_pine_needles(data, vi, c_air, c_ignore, c_snow, c_pine_needles)
- if data[vi] == c_air or data[vi] == c_ignore or data[vi] == c_snow then
+ local node_id = data[vi]
+ if node_id == c_air or node_id == c_ignore or node_id == c_snow then
data[vi] = c_pine_needles
end
end
local function add_snow(data, vi, c_air, c_ignore, c_snow)
- if data[vi] == c_air or data[vi] == c_ignore then
+ local node_id = data[vi]
+ if node_id == c_air or node_id == c_ignore then
data[vi] = c_snow
end
end
-function default.grow_pinetree(pos)
+function default.grow_pine_tree(pos)
local x, y, z = pos.x, pos.y, pos.z
local maxy = y + random(9, 13) -- Trunk top
local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
local data = vm:get_data()
- -- Scan for snow nodes near sapling
+ -- Scan for snow nodes near sapling to enable snow on branches
local snow = false
for yy = y - 1, y + 1 do
for zz = z - 1, z + 1 do
local vi = a:index(x - 1, yy, zz)
for xx = x - 1, x + 1 do
local nodid = data[vi]
- if nodid == c_snow
- or nodid == c_snowblock
- or nodid == c_dirtsnow then
+ if nodid == c_snow or nodid == c_snowblock or nodid == c_dirtsnow then
snow = true
end
vi = vi + 1
for xx = x - dev, x + dev do
if random() < 0.95 - dev * 0.05 then
add_pine_needles(data, vi, c_air, c_ignore, c_snow,
- c_pine_needles)
+ c_pine_needles)
if snow then
add_snow(data, via, c_air, c_ignore, c_snow)
end
-- Centre top nodes
add_pine_needles(data, a:index(x, maxy + 1, z), c_air, c_ignore, c_snow,
- c_pine_needles)
+ c_pine_needles)
add_pine_needles(data, a:index(x, maxy + 2, z), c_air, c_ignore, c_snow,
- c_pine_needles) -- Paramat added a pointy top node
+ c_pine_needles) -- Paramat added a pointy top node
if snow then
add_snow(data, a:index(x, maxy + 3, z), c_air, c_ignore, c_snow)
end
local via = a:index(xi, yy + 1, zz)
for xx = xi, xi + 1 do
add_pine_needles(data, vi, c_air, c_ignore, c_snow,
- c_pine_needles)
+ c_pine_needles)
if snow then
add_snow(data, via, c_air, c_ignore, c_snow)
end
for xx = x - dev, x + dev do
if random() < 0.95 - dev * 0.05 then
add_pine_needles(data, vi, c_air, c_ignore, c_snow,
- c_pine_needles)
+ c_pine_needles)
if snow then
add_snow(data, via, c_air, c_ignore, c_snow)
end
end
-- Trunk
- for yy = y, maxy do
+ data[a:index(x, y, z)] = c_pinetree -- Force-place lowest trunk node to replace sapling
+ for yy = y + 1, maxy do
local vi = a:index(x, yy, z)
- data[vi] = c_pinetree
+ local node_id = data[vi]
+ if node_id == c_air or node_id == c_ignore or node_id == c_pine_needles then
+ data[vi] = c_pinetree
+ end
end
vm:set_data(data)
vm:update_map()
end
+-- New tree
+
+function default.grow_new_apple_tree(pos)
+ local path = minetest.get_modpath("default") .. "/schematics/apple_tree.mts"
+ minetest.place_schematic({x = pos.x - 2, y = pos.y - 1, z = pos.z - 2},
+ path, 0, nil, false)
+end
+
+-- New jungle tree
+
+function default.grow_new_jungle_tree(pos)
+ local path = minetest.get_modpath("default") .. "/schematics/jungle_tree.mts"
+ minetest.place_schematic({x = pos.x - 2, y = pos.y - 1, z = pos.z - 2},
+ path, 0, nil, false)
+end
+
+-- New pine tree
+
+function default.grow_new_pine_tree(pos)
+ local path = minetest.get_modpath("default") .. "/schematics/pine_tree.mts"
+ minetest.place_schematic({x = pos.x - 2, y = pos.y - 1, z = pos.z - 2},
+ path, 0, nil, false)
+end
+
+-- New acacia tree
+
+function default.grow_new_acacia_tree(pos)
+ local path = minetest.get_modpath("default") .. "/schematics/acacia_tree.mts"
+ minetest.place_schematic({x = pos.x - 4, y = pos.y - 1, z = pos.z - 4},
+ path, random, nil, false)
+end
projects / oweals / minetest_game.git / blobdiff