From 4acb073e8ca5e61779e860b3670215d92b135d00 Mon Sep 17 00:00:00 2001 From: Splizard Date: Thu, 26 Jul 2012 15:43:56 +1200 Subject: [PATCH] Pine trees now have pine needles and drop saplings. --- init.lua | 57 +++++++++++++++++++++++++ mapgen.lua | 121 ++++++++++++++++++++++++++++------------------------- 2 files changed, 122 insertions(+), 56 deletions(-) diff --git a/init.lua b/init.lua index 5856005..2e0ef31 100644 --- a/init.lua +++ b/init.lua @@ -55,6 +55,53 @@ minetest.register_node(":default:leaves", { sounds = default.node_sound_leaves_defaults(), }) +--Pine leaves. +minetest.register_node("snow:needles", { + description = "Pine Needles", + drawtype = "allfaces_optional", + visual_scale = 1.3, + tiles = {"snow_needles.png"}, + paramtype = "light", + groups = {snappy=3, leafdecay=3, flammable=2}, + drop = { + max_items = 1, + items = { + { + -- player will get sapling with 1/20 chance + items = {'snow:sapling_pine'}, + rarity = 20, + }, + { + -- player will get leaves only if he get no saplings, + -- this is because max_items is 1 + items = {'snow:needles'}, + } + } + }, + --Remove snow above leaves after decay. + after_destruct = function(pos, node, digger) + pos.y = pos.y + 1 + local nodename = minetest.env:get_node(pos).name + if nodename == "snow:snow" then + minetest.env:remove_node(pos) + end + end, + sounds = default.node_sound_leaves_defaults(), +}) + +minetest.register_node("snow:sapling_pine", { + description = "Pine Sapling", + drawtype = "plantlike", + visual_scale = 1.0, + tiles = {"snow_sapling_pine.png"}, + inventory_image = "snow_sapling_pine.png", + wield_image = "snow_sapling_pine.png", + paramtype = "light", + walkable = false, + groups = {snappy=2,dig_immediate=3,flammable=2}, + sounds = default.node_sound_defaults(), +}) + --Snowballs ------------- snowball_GRAVITY=9 @@ -304,6 +351,16 @@ minetest.register_abm({ end, }) +--Grow saplings +minetest.register_abm({ + nodenames = {"snow:sapling_pine"}, + interval = 10, + chance = 50, + action = function(pos, node, active_object_count, active_object_count_wider) + snow.make_pine(pos,false) + end, +}) + if snow.enable_snowfall then --Snowing (WIP) diff --git a/mapgen.lua b/mapgen.lua index 77a2489..ac7cf3d 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -1,3 +1,64 @@ +--Makes pine tree +function snow.make_pine(pos,snow) + local env = minetest.env + local perlin1 = env:get_perlin(112,3, 0.5, 150) + --Clear ground. + for x=-1,1 do + for z=-1,1 do + if env:get_node({x=pos.x+x,y=pos.y,z=pos.z+z}).name == "snow:snow" then + env:remove_node({x=pos.x+x,y=pos.y,z=pos.z+z}) + end + end + end + --Make tree. + for i=0, 4 do + local env = minetest.env + if i==1 or i==2 then + for x=-1,1 do + for z=-1,1 do + local x = pos.x + x + local z = pos.z + z + env:add_node({x=x,y=pos.y+i,z=z},{name="snow:needles"}) + if snow and x ~= 0 and z ~= 0 and perlin1:get2d({x=x,y=z}) > 0.53 then + env:add_node({x=x,y=pos.y+i+1,z=z},{name="snow:snow"}) + end + end + end + end + if i==3 or i==4 then + local x = pos.x + local y = pos.y+i + local z = pos.z + env:add_node({x=x+1,y=y,z=z},{name="snow:needles"}) + env:add_node({x=x-1,y=y,z=z},{name="snow:needles"}) + env:add_node({x=x,y=y,z=z+1},{name="snow:needles"}) + env:add_node({x=x,y=y,z=z-1},{name="snow:needles"}) + if snow then + if perlin1:get2d({x=x+1,y=z}) > 0.53 then + env:add_node({x=x+1,y=y+1,z=z},{name="snow:snow"}) + end + if perlin1:get2d({x=x+1,y=z}) > 0.53 then + env:add_node({x=x-1,y=y+1,z=z},{name="snow:snow"}) + end + if perlin1:get2d({x=x,y=z+1}) > 0.53 then + env:add_node({x=x,y=y+1,z=z+1},{name="snow:snow"}) + end + if perlin1:get2d({x=x,y=z-1}) > 0.53 then + env:add_node({x=x,y=y+1,z=z-1},{name="snow:snow"}) + end + end + end + env:add_node({x=pos.x,y=pos.y+i,z=pos.z},{name="default:tree"}) + end + env:add_node({x=pos.x,y=pos.y+5,z=pos.z},{name="snow:needles"}) + env:add_node({x=pos.x,y=pos.y+6,z=pos.z},{name="snow:needles"}) + if snow and perlin1:get2d({x=pos.x,y=pos.z}) > 0.53 then + env:add_node({x=pos.x,y=pos.y+7,z=pos.z},{name="snow:snow"}) + end +end + + + --Snow biomes are found at 0.53 and greater perlin noise. minetest.register_on_generated(function(minp, maxp, seed) if maxp.y >= -10 then @@ -52,60 +113,7 @@ if maxp.y >= -10 then else return "unknown "..num end end - local function make_pine(pos) - local perlin1 = env:get_perlin(112,3, 0.5, 150) - --Clear ground. - for x=-1,1 do - for z=-1,1 do - if env:get_node({x=pos.x+x,y=pos.y,z=pos.z+z}).name == "snow:snow" then - env:remove_node({x=pos.x+x,y=pos.y,z=pos.z+z}) - end - end - end - --Make tree. - for i=0, 4 do - local env = minetest.env - if i==1 or i==2 then - for x=-1,1 do - for z=-1,1 do - local x = pos.x + x - local z = pos.z + z - env:add_node({x=x,y=pos.y+i,z=z},{name="default:leaves"}) - if x ~= 0 and z ~= 0 and perlin1:get2d({x=x,y=z}) > 0.53 then - env:add_node({x=x,y=pos.y+i+1,z=z},{name="snow:snow"}) - end - end - end - end - if i==3 or i==4 then - local x = pos.x - local y = pos.y+i - local z = pos.z - env:add_node({x=x+1,y=y,z=z},{name="default:leaves"}) - env:add_node({x=x-1,y=y,z=z},{name="default:leaves"}) - env:add_node({x=x,y=y,z=z+1},{name="default:leaves"}) - env:add_node({x=x,y=y,z=z-1},{name="default:leaves"}) - if perlin1:get2d({x=x+1,y=z}) > 0.53 then - env:add_node({x=x+1,y=y+1,z=z},{name="snow:snow"}) - end - if perlin1:get2d({x=x+1,y=z}) > 0.53 then - env:add_node({x=x-1,y=y+1,z=z},{name="snow:snow"}) - end - if perlin1:get2d({x=x,y=z+1}) > 0.53 then - env:add_node({x=x,y=y+1,z=z+1},{name="snow:snow"}) - end - if perlin1:get2d({x=x,y=z-1}) > 0.53 then - env:add_node({x=x,y=y+1,z=z-1},{name="snow:snow"}) - end - end - env:add_node({x=pos.x,y=pos.y+i,z=pos.z},{name="default:tree"}) - end - env:add_node({x=pos.x,y=pos.y+5,z=pos.z},{name="default:leaves"}) - env:add_node({x=pos.x,y=pos.y+6,z=pos.z},{name="default:leaves"}) - if perlin1:get2d({x=pos.x,y=pos.z}) > 0.53 then - env:add_node({x=pos.x,y=pos.y+7,z=pos.z},{name="snow:snow"}) - end - end + local make_pine = snow.make_pine --Reseed random. pr = PseudoRandom(seed+68) @@ -160,7 +168,7 @@ if maxp.y >= -10 then elseif pines and pr:next(1,36) == 1 then --Spawns pines. env:add_node({x=x,y=ground_y,z=z}, {name="default:dirt_with_grass"}) - make_pine({x=x,y=ground_y+1,z=z}) + make_pine({x=x,y=ground_y+1,z=z},true) else --Spawns snow. env:add_node({x=x,y=ground_y,z=z}, {name="snow:dirt_with_snow"}) @@ -221,7 +229,8 @@ if maxp.y >= -10 then return elseif ground_y and node.name == "snow:snow" and node.name ~= "snow:ice" then --Abort genaration. - if env:get_node({x=x,y=ground_y-1,z=z}).name ~= "default:leaves" then + local name = env:get_node({x=x,y=ground_y-1,z=z}).name + if name ~= "default:leaves" and name ~= "snow:needles" then if debug then print(biomeToString(biome)..": snow found ABORTED!") end