Merge remote-tracking branch 'origin/icicles'

mods/default/mapgen.lua

@@ -19,9 +19,6 @@ minetest.register_alias("mapgen_cobble", "default:cobble")
 minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
 minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
 minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
-minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal")
-minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron")
-minetest.register_alias("mapgen_mese", "default:mese")
 minetest.register_alias("mapgen_desert_sand", "default:desert_sand")
 minetest.register_alias("mapgen_desert_stone", "default:desert_stone")
 
@@ -80,65 +77,7 @@ function default.make_cactus(pos, size)
 	end
 end
 
--- facedir: 0/1/2/3 (head node facedir value)
--- length: length of rainbow tail
-function default.make_nyancat(pos, facedir, length)
-	local tailvec = {x=0, y=0, z=0}
-	if facedir == 0 then
-		tailvec.z = 1
-	elseif facedir == 1 then
-		tailvec.x = 1
-	elseif facedir == 2 then
-		tailvec.z = -1
-	elseif facedir == 3 then
-		tailvec.x = -1
-	else
-		print("default.make_nyancat(): Invalid facedir: "+dump(facedir))
-		facedir = 0
-		tailvec.z = 1
-	end
-	local p = {x=pos.x, y=pos.y, z=pos.z}
-	minetest.env:set_node(p, {name="default:nyancat", param2=facedir})
-	for i=1,length do
-		p.x = p.x + tailvec.x
-		p.z = p.z + tailvec.z
-		minetest.env:set_node(p, {name="default:nyancat_rainbow"})
-	end
-end
-
-function generate_nyancats(seed, minp, maxp)
-	local height_min = -31000
-	local height_max = -32
-	if maxp.y < height_min or minp.y > height_max then
-		return
-	end
-	local y_min = math.max(minp.y, height_min)
-	local y_max = math.min(maxp.y, height_max)
-	local volume = (maxp.x-minp.x+1)*(y_max-y_min+1)*(maxp.z-minp.z+1)
-	local pr = PseudoRandom(seed + 9324342)
-	local max_num_nyancats = math.floor(volume / (16*16*16))
-	for i=1,max_num_nyancats do
-		if pr:next(0, 1000) == 0 then
-			local x0 = pr:next(minp.x, maxp.x)
-			local y0 = pr:next(minp.y, maxp.y)
-			local z0 = pr:next(minp.z, maxp.z)
-			local p0 = {x=x0, y=y0, z=z0}
-			default.make_nyancat(p0, pr:next(0,3), pr:next(3,15))
-		end
-	end
-end
-
 minetest.register_on_generated(function(minp, maxp, seed)
-	-- Generate regular ores
-	generate_ore("default:stone_with_coal", "default:stone", minp, maxp, seed+0, 1/8/8/8,    3, 8, -31000,  64)
-	generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+1, 1/12/12/12, 2, 3,    -15,   2)
-	generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+2, 1/9/9/9,    3, 5,    -63, -16)
-	generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+3, 1/7/7/7,    3, 5, -31000, -64)
-	generate_ore("default:mese",            "default:stone", minp, maxp, seed+4, 1/16/16/16, 2, 3,   -127, -64)
-	generate_ore("default:mese",            "default:stone", minp, maxp, seed+5, 1/9/9/9,    3, 5, -31000,-128)
-	
-	generate_ore("default:stone_with_coal", "default:stone", minp, maxp, seed+7, 1/24/24/24, 6,27, -31000,  0)
-	generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+6, 1/24/24/24, 6,27, -31000, -64)
 
 	if maxp.y >= 2 and minp.y <= 0 then
 		-- Generate clay
@@ -268,8 +207,5 @@ minetest.register_on_generated(function(minp, maxp, seed)
 		end
 		end
 	end
-
-	-- Generate nyan cats
-	generate_nyancats(seed, minp, maxp)
 end)
 

mods/icicles/depends.txt

@@ -0,0 +1 @@
+default

mods/icicles/init.lua

@@ -0,0 +1,88 @@
+for i = 1,4 do
+	minetest.register_node("icicles:icicle_"..i, {
+		description = "Icicle "..i,
+		groups = {cracky=3, icicle=1},
+		tiles = {"default_stone.png"},
+		is_ground_content = true,
+		sounds = default.node_sound_stone_defaults(),
+		drop = "",
+		drawtype = "nodebox",
+		paramtype = "light",
+		node_box = {
+			type = "fixed",
+			fixed = {-i/10, -0.5, -i/10, i/10, 0.5, i/10}
+		},
+		selection_box = {
+			type = "fixed",
+			fixed = {-i/10, -0.5, -i/10, i/10, 0.5, i/10}
+		},
+	})
+	minetest.register_alias("icicle_"..5-i, "icicles:icicle_"..5-i)
+end
+
+icicles = {}
+
+function icicles.make_stalactite(pos, length)
+	for i = length,1,-1 do
+		if minetest.env:get_node({x=pos.x,y=pos.y-i+1,z=pos.z}).name == "air" then
+			minetest.env:set_node({x=pos.x,y=pos.y-i+1,z=pos.z}, {name = "icicles:icicle_"..5-i})
+		else return end
+	end
+end
+
+function icicles.make_stalagmite(pos, length)
+	for i = length,1,-1 do
+		if minetest.env:get_node({x=pos.x,y=pos.y+i-1,z=pos.z}).name == "air" then
+			minetest.env:set_node({x=pos.x,y=pos.y+i-1,z=pos.z}, {name = "icicles:icicle_"..5-i})
+		else return end
+	end
+end
+
+local function generate(minp, maxp, seed, chunks_per_volume, icicles_per_chunk, height_min, height_max)
+	if maxp.y < height_min or minp.y > height_max then
+		return
+	end
+	local y_min = math.max(minp.y, height_min)
+	local y_max = math.min(maxp.y, height_max)
+	local volume = (maxp.x-minp.x+1)*(y_max-y_min+1)*(maxp.z-minp.z+1)
+	local pr = PseudoRandom(seed)
+	local num_chunks = math.floor(chunks_per_volume * volume)
+	local chunk_size = 3
+	if icicles_per_chunk <= 4 then
+		chunk_size = 2
+	end
+	local inverse_chance = math.floor(chunk_size*chunk_size*chunk_size / icicles_per_chunk)
+	for i=1,num_chunks do
+		local y0 = pr:next(y_min, y_max-chunk_size+1)
+		if y0 >= height_min and y0 <= height_max then
+			local x0 = pr:next(minp.x, maxp.x-chunk_size+1)
+			local z0 = pr:next(minp.z, maxp.z-chunk_size+1)
+			local p0 = {x=x0, y=y0, z=z0}
+			for x1=0,chunk_size-1 do
+				for y1=0,chunk_size-1 do
+					for z1=0,chunk_size-1 do
+						if pr:next(1,inverse_chance) == 1 then
+							local x2 = x0+x1
+							local y2 = y0+y1
+							local z2 = z0+z1
+							local p2 = {x=x2, y=y2, z=z2}
+							local p3 = {x=x2, y=y2+1, z=z2}
+							local p4 = {x=x2, y=y2-1, z=z2}
+							if minetest.env:get_node(p2).name == "air" then
+								if minetest.env:get_node(p3).name == "default:stone" then
+									icicles.make_stalactite(p2, pr:next(2, 4))
+								elseif minetest.env:get_node(p4).name == "default:stone" then
+									icicles.make_stalagmite(p2, pr:next(2, 4))
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+minetest.register_on_generated(function(minp, maxp, seed)
+	generate(minp, maxp, seed, 1/8, 1, -31000, -200)
+end)