From 69614dc20d85779248a8c79e5e16fbb48cf120f2 Mon Sep 17 00:00:00 2001 From: paramat Date: Thu, 4 Dec 2014 03:47:46 +0000 Subject: [PATCH] Pinetree (by sfan5, from mg mapgen) lua generation and sapling ABM. Add checks for ignore to other trees --- mods/default/nodes.lua | 2 +- mods/default/trees.lua | 201 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 182 insertions(+), 21 deletions(-) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 31d8aa6e..90b6dbd7 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -114,7 +114,7 @@ minetest.register_node("default:dirt_with_snow", { description = "Dirt with Snow", tiles = {"default_snow.png", "default_dirt.png", "default_dirt.png^default_snow_side.png"}, is_ground_content = true, - groups = {crumbly=3}, + groups = {crumbly=3,soil=1}, drop = 'default:dirt', sounds = default.node_sound_dirt_defaults({ footstep = {name="default_snow_footstep", gain=0.25}, diff --git a/mods/default/trees.lua b/mods/default/trees.lua index 5752fe0d..f2baaf85 100644 --- a/mods/default/trees.lua +++ b/mods/default/trees.lua @@ -17,6 +17,8 @@ local function can_grow(pos) return true end +-- Sapling ABMs + minetest.register_abm({ nodenames = {"default:sapling"}, interval = 10, @@ -26,14 +28,15 @@ minetest.register_abm({ return end - minetest.log("action", "A sapling grows into a tree at "..minetest.pos_to_string(pos)) + minetest.log("action", "A sapling grows into a tree at ".. + minetest.pos_to_string(pos)) default.grow_tree(pos, random(1, 4) == 1) end }) minetest.register_abm({ nodenames = {"default:junglesapling"}, - interval = 10, + interval = 11, chance = 50, action = function(pos, node) if not can_grow(pos) then @@ -46,18 +49,36 @@ minetest.register_abm({ end }) +minetest.register_abm({ + nodenames = {"default:pine_sapling"}, + interval = 12, + chance = 50, + action = function(pos, node) + if not can_grow(pos) then + return + end -local c_air = minetest.get_content_id("air") -local c_apple = minetest.get_content_id("default:apple") + minetest.log("action", "A pine sapling grows into a tree at ".. + minetest.pos_to_string(pos)) + default.grow_pinetree(pos) + end +}) + +-- Appletree, jungletree function local function add_trunk_and_leaves(data, a, pos, tree_cid, leaves_cid, height, size, iters, is_apple_tree) local x, y, z = pos.x, pos.y, pos.z + local c_air = minetest.get_content_id("air") + local c_ignore = minetest.get_content_id("ignore") + 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) - if y_dist == 0 or data[vi] == c_air or data[vi] == leaves_cid then + 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 data[vi] = tree_cid end end @@ -67,7 +88,7 @@ local function add_trunk_and_leaves(data, a, pos, tree_cid, leaves_cid, for y_dist = -size, 1 do local vi = a:index(x - 1, y + height + y_dist, z + z_dist) for x_dist = -1, 1 do - if data[vi] == c_air then + if data[vi] == c_air or data[vi] == c_ignore then if is_apple_tree and random(1, 8) == 1 then data[vi] = c_apple else @@ -89,7 +110,7 @@ local function add_trunk_and_leaves(data, a, pos, tree_cid, leaves_cid, for yi = 0, 1 do for zi = 0, 1 do local vi = a:index(clust_x + xi, clust_y + yi, clust_z + zi) - if data[vi] == c_air then + if data[vi] == c_air or data[vi] == c_ignore then if is_apple_tree and random(1, 8) == 1 then data[vi] = c_apple else @@ -102,9 +123,7 @@ local function add_trunk_and_leaves(data, a, pos, tree_cid, leaves_cid, end end - -local c_tree = minetest.get_content_id("default:tree") -local c_leaves = minetest.get_content_id("default:leaves") +-- Appletree function default.grow_tree(pos, is_apple_tree, bad) --[[ @@ -118,11 +137,13 @@ function default.grow_tree(pos, is_apple_tree, bad) local x, y, z = pos.x, pos.y, pos.z local height = random(4, 5) + local c_tree = minetest.get_content_id("default:tree") + local c_leaves = minetest.get_content_id("default:leaves") local vm = minetest.get_voxel_manip() local minp, maxp = vm:read_from_map( - {x = pos.x - 2, y = pos.y, z = pos.z - 2}, - {x = pos.x + 2, y = pos.y + height + 1, z = pos.z + 2} + {x = pos.x - 2, y = pos.y, z = pos.z - 2}, + {x = pos.x + 2, y = pos.y + height + 1, z = pos.z + 2} ) local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp}) local data = vm:get_data() @@ -134,12 +155,11 @@ function default.grow_tree(pos, is_apple_tree, bad) vm:update_map() end -local c_jungletree = minetest.get_content_id("default:jungletree") -local c_jungleleaves = minetest.get_content_id("default:jungleleaves") +-- Jungletree function default.grow_jungletree(pos, bad) --[[ - NOTE: Tree-placing code is currently duplicated in the engine + NOTE: Jungletree-placing code is currently duplicated in the engine and in games that have saplings; both are deprecated but not replaced yet --]] @@ -149,11 +169,16 @@ function default.grow_jungletree(pos, bad) local x, y, z = pos.x, pos.y, pos.z local height = random(8, 12) + local c_air = minetest.get_content_id("air") + local c_ignore = minetest.get_content_id("ignore") + local c_jungletree = minetest.get_content_id("default:jungletree") + local c_jungleleaves = minetest.get_content_id("default:jungleleaves") local vm = minetest.get_voxel_manip() local minp, maxp = vm:read_from_map( - {x = pos.x - 3, y = pos.y - 1, z = pos.z - 3}, - {x = pos.x + 3, y = pos.y + height + 1, z = pos.z + 3}) + {x = pos.x - 3, y = pos.y - 1, z = pos.z - 3}, + {x = pos.x + 3, y = pos.y + height + 1, z = pos.z + 3} + ) local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp}) local data = vm:get_data() @@ -162,12 +187,12 @@ function default.grow_jungletree(pos, bad) -- Roots for z_dist = -1, 1 do local vi_1 = a:index(x - 1, y - 1, z + z_dist) - local vi_2 = a:index(x - 1, y, z + z_dist) + local vi_2 = a:index(x - 1, y, z + z_dist) for x_dist = -1, 1 do if random(1, 3) >= 2 then - if data[vi_1] == c_air then + if data[vi_1] == c_air or data[vi_1] == c_ignore then data[vi_1] = c_jungletree - elseif data[vi_2] == c_air then + elseif data[vi_2] == c_air or data[vi_2] == c_ignore then data[vi_2] = c_jungletree end end @@ -181,3 +206,139 @@ function default.grow_jungletree(pos, bad) vm:update_map() end +-- 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 + 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 + data[vi] = c_snow + end +end + +function default.grow_pinetree(pos) + local x, y, z = pos.x, pos.y, pos.z + local maxy = y + random(9, 13) -- Trunk top + + local c_air = minetest.get_content_id("air") + local c_ignore = minetest.get_content_id("ignore") + local c_pinetree = minetest.get_content_id("default:pinetree") + local c_pine_needles = minetest.get_content_id("default:pine_needles") + local c_snow = minetest.get_content_id("default:snow") + local c_snowblock = minetest.get_content_id("default:snowblock") + local c_dirtsnow = minetest.get_content_id("default:dirt_with_snow") + + local vm = minetest.get_voxel_manip() + local minp, maxp = vm:read_from_map( + {x = x - 3, y = y - 1, z = z - 3}, + {x = x + 3, y = maxy + 3, z = z + 3} + ) + local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp}) + local data = vm:get_data() + + -- Scan for snow nodes near sapling + 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 + snow = true + end + vi = vi + 1 + end + end + end + + -- Upper branches layer + local dev = 3 + for yy = maxy - 1, maxy + 1 do + for zz = z - dev, z + dev do + local vi = a:index(x - dev, yy, zz) + local via = a:index(x - dev, yy + 1, zz) + 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) + if snow then + add_snow(data, via, c_air, c_ignore, c_snow) + end + end + vi = vi + 1 + via = via + 1 + end + end + dev = dev - 1 + end + + -- Centre top nodes + add_pine_needles(data, a:index(x, maxy + 1, z), c_air, c_ignore, c_snow, + 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 + if snow then + add_snow(data, a:index(x, maxy + 3, z), c_air, c_ignore, c_snow) + end + + -- Lower branches layer + local my = 0 + for i = 1, 20 do -- Random 2x2 squares of needles + local xi = x + random(-3, 2) + local yy = maxy + random(-6, -5) + local zi = z + random(-3, 2) + if yy > my then + my = yy + end + for zz = zi, zi+1 do + local vi = a:index(xi, yy, zz) + 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) + if snow then + add_snow(data, via, c_air, c_ignore, c_snow) + end + vi = vi + 1 + via = via + 1 + end + end + end + + local dev = 2 + for yy = my + 1, my + 2 do + for zz = z - dev, z + dev do + local vi = a:index(x - dev, yy, zz) + local via = a:index(x - dev, yy + 1, zz) + 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) + if snow then + add_snow(data, via, c_air, c_ignore, c_snow) + end + end + vi = vi + 1 + via = via + 1 + end + end + dev = dev - 1 + end + + -- Trunk + for yy = y, maxy do + local vi = a:index(x, yy, z) + data[vi] = c_pinetree + end + + vm:set_data(data) + vm:write_to_map() + vm:update_map() +end +