Merge remote-tracking branch 'upstream/master'

cavestuff/init.lua

@@ -7,6 +7,8 @@ local mname		= "cavestuff"
 -- support for i18n
 local S = minetest.get_translator("cavestuff")
 
+cavestuff = {}
+
 dofile(minetest.get_modpath("cavestuff").."/nodes.lua")
 dofile(minetest.get_modpath("cavestuff").."/mapgen.lua")
 

cavestuff/mapgen.lua

@@ -1,55 +1,39 @@
 --Map Generation Stuff
 
-local random = math.random
-local floor = math.floor
+biome_lib:register_generate_plant(
+	{
+		surface = {
+			"default:dirt_with_grass",
+			"default:gravel",
+			"default:stone",
+			"default:permafrost_with_stones"
+		},
+		max_count = 50,
+		rarity = 0,
+		plantlife_limit = -1,
+		check_air = true,
+		random_facedir = {0, 3}
+	},
+	{
+		"cavestuff:pebble_1",
+		"cavestuff:pebble_2"
+	}
+)
 
-minetest.register_on_generated(function(minp, maxp, seed)
-	if maxp.y >= 2 and minp.y <= 0 then
-		-- Generate pebbles
-		local perlin1 = minetest.get_perlin(329, 3, 0.6, 100)
-		-- Assume X and Z lengths are equal
-		local divlen = 16
-		local divs = (maxp.x-minp.x)/divlen+1;
-		for divx=0,divs-1 do
-		for divz=0,divs-1 do
-			local x0 = minp.x + floor((divx+0)*divlen)
-			local z0 = minp.z + floor((divz+0)*divlen)
-			local x1 = minp.x + floor((divx+1)*divlen)
-			local z1 = minp.z + floor((divz+1)*divlen)
-			-- Determine pebble amount from perlin noise
-			local pebble_amount = floor(perlin1:get2d({x=x0, y=z0}) ^ 2 * 2)
-			-- Find random positions for pebbles based on this random
-			local pr = PseudoRandom(seed+1)
-			for i=0,pebble_amount do
-				local x = pr:next(x0, x1)
-				local z = pr:next(z0, z1)
-				-- Find ground level (0...15)
-				local ground_y = nil
-				for y=30,0,-1 do
-					if minetest.get_node({x=x,y=y,z=z}).name ~= "air" then
-						ground_y = y
-						break
-					end
-				end
-
-				if ground_y then
-					local p = {x=x,y=ground_y+1,z=z}
-					local nn = minetest.get_node(p).name
-					-- Check if the node can be replaced
-					if minetest.registered_nodes[nn] and
-						minetest.registered_nodes[nn].buildable_to then
-						nn = minetest.get_node({x=x,y=ground_y,z=z}).name
-						-- If desert sand, add dry shrub
-						if nn == "default:dirt_with_grass" then
-							minetest.swap_node(p,{name="cavestuff:pebble_"..pr:next(1,2), param2=random(0,3)})
-						elseif nn == "default:desert_sand" then
-							minetest.swap_node(p,{name="cavestuff:desert_pebble_"..pr:next(1,2), param2=random(0,3)})
-					    end
-					end
-				end
-
-			end
-		end
-		end
-	end
-end)
+biome_lib:register_generate_plant(
+	{
+		surface = {
+			"default:desert_sand",
+			"default:desert_stone"
+		},
+		max_count = 50,
+		rarity = 0,
+		plantlife_limit = -1,
+		check_air = true,
+		random_facedir = {0, 3}
+	},
+	{
+		"cavestuff:desert_pebble_1",
+		"cavestuff:desert_pebble_2"
+	}
+)

cavestuff/mod.conf

@@ -1,2 +1,2 @@
 name = cavestuff
-depends = default
+depends = default,biome_lib

dryplants/moregrass.lua

@@ -7,27 +7,24 @@
 -- Looked at code from:		default
 -----------------------------------------------------------------------------------------------
 
-local random = math.random
-
-abstract_dryplants.grow_grass = function(pos)
-	local right_here = {x=pos.x, y=pos.y+1, z=pos.z}
-	if minetest.get_node(right_here).name == "air"  -- instead of check_air = true,
-	or minetest.get_node(right_here).name == "default:junglegrass" then
-		minetest.swap_node(right_here, {name="default:grass_"..random(1,5)})
-	end
-end
-
-biome_lib:register_generate_plant({
-    surface = {
-		"default:dirt_with_grass",
-		"stoneage:grass_with_silex",
-		"sumpf:peat",
-		"sumpf:sumpf"
+biome_lib:register_generate_plant(
+	{
+		surface = {
+			"default:dirt_with_grass",
+			"stoneage:grass_with_silex",
+			"sumpf:peat",
+			"sumpf:sumpf"
+		},
+		max_count = TALL_GRASS_PER_MAPBLOCK,
+		rarity = 101 - TALL_GRASS_RARITY,
+		min_elevation = 1, -- above sea level
+		plantlife_limit = -0.9,
+		check_air = true,
 	},
-    max_count = TALL_GRASS_PER_MAPBLOCK,
-    rarity = 101 - TALL_GRASS_RARITY,
-    min_elevation = 1, -- above sea level
-	plantlife_limit = -0.9,
-  },
-  abstract_dryplants.grow_grass
+	{	"default:grass_1",
+		"default:grass_2",
+		"default:grass_3",
+		"default:grass_4",
+		"default:grass_5"
+	}
 )