load edited version

depends.txt

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

init (Kopie).lua

@@ -0,0 +1,230 @@
+NYANLAND_HEIGHT=30688
+NYANCAT_PROP=1
+NYANLAND_TREESIZE=2
+
+local nyanland={}
+
+--Cloudstone
+minetest.register_node("nyanland:cloudstone", {
+	drawtype = "allfaces_optional",
+	tile_images = {"nyanland_cloudstone.png"},
+	inventory_image = minetest.inventorycube("nyanland_cloudstone.png"),
+	dug_item = '',
+	light_source = 10,
+	groups = {dig_immediate = 3},
+})
+
+-- MESE Leaves
+minetest.register_node("nyanland:meseleaves", {
+	drawtype = "allfaces_optional",
+	visual_scale = 2,
+	tile_images = {"nyanland_meseleaves.png"},
+	inventory_image = minetest.inventorycube("nyanland_meseleaves.png"),
+	paramtype = "light",
+	furnace_burntime = 5,
+	groups = {snappy=3, leafdecay=3, flammable=2},
+})
+
+-- Clonestone
+minetest.register_node("nyanland:clonestone", {
+	tile_images = {"nyanland_clonestone.png"},
+	inventory_image = minetest.inventorycube("nyanland_clonestone.png"),
+	furnace_burntime = 100,
+	groups = {cracky = 1},
+})
+
+-- Clone items
+minetest.register_abm(
+	{nodenames = {"nyanland:clonestone"},
+	interval = 1.0,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		local pos_over ={x=pos.x, y=pos.y+1, z=pos.z}
+		local pos_under={x=pos.x, y=pos.y-1, z=pos.z}
+		if minetest.env:get_node(pos_under).name=="air" then
+			minetest.env:add_node(pos_under, {name=minetest.env:get_node(pos_over).name})
+		end
+		nodeupdate(pos_under)
+	end,
+})
+
+-- Healstone
+minetest.register_node("nyanland:healstone", {
+	tile_images = {"nyanland_healstone.png"},
+	inventory_image = minetest.inventorycube("nyanland_healstone.png"),
+	furnace_burntime = 100,
+	groups = {cracky = 1},
+})
+
+-- Clone items
+minetest.register_abm(
+	{nodenames = {"nyanland:healstone"},
+	interval = 1.0,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		local objs = minetest.env:get_objects_inside_radius(pos, 3)
+		for k, obj in pairs(objs) do
+			obj:set_hp(obj:get_hp()+2)
+		end
+	end,
+})
+
+minetest.register_on_generated(function(minp, maxp)
+	local addpos={}
+	if minp.y==NYANLAND_HEIGHT then
+		for x=minp.x, maxp.x, 1 do
+			for z=minp.z, maxp.z, 1 do
+				addpos={x=x, y=minp.y, z=z}
+				minetest.env:add_node(addpos, {name="nyanland:cloudstone"})
+				if math.random(1000)==1 then
+					nyanland:grow_mesetree(addpos)
+				elseif math.random(5000)==1 then
+					minetest.env:add_node(addpos,{name="nyanland:clonestone"})
+				end
+			end
+		end
+
+		if math.random(NYANCAT_PROP)==1 then
+			local nyan_headpos={}
+			nyan_headpos={x=minp.x+math.random(80), y=minp.y+math.random(20)+10, z=minp.z+math.random(80)}	
+			nyanland:add_nyancat(nyan_headpos, minp)
+		end
+	end
+
+end)
+
+function nyanland:add_nyancat(nyan_headpos)
+	local nyan_tailpos={}
+	minetest.env:add_node(nyan_headpos, {name="default:nyancat"})
+	local length=math.random(4,15)
+	for z=nyan_headpos.z+1, nyan_headpos.z+length, 1 do
+		nyan_tailpos={x=nyan_headpos.x, y=nyan_headpos.y, z=z}
+		minetest.env:add_node(nyan_tailpos, {name="default:nyancat_rainbow"})
+	end
+end
+
+function nyanland:grow_mesetree(pos)
+	--TRUNK
+	pos.y=pos.y+1
+	local trunkpos={x=pos.x, z=pos.z}
+	for y=pos.y, pos.y+4+math.random(2) do
+		trunkpos.y=y
+		if math.random(200)>1 then
+			minetest.env:add_node(trunkpos, {name="default:mese_block"})
+		else
+			minetest.env:add_node(trunkpos, {name="nyanland:healstone"})
+		end
+	end
+	--LEAVES
+	local leafpos={}
+	for x=(trunkpos.x-NYANLAND_TREESIZE), (trunkpos.x+NYANLAND_TREESIZE), 1 do
+       		for y=(trunkpos.y-NYANLAND_TREESIZE), (trunkpos.y+NYANLAND_TREESIZE), 1 do
+       			for z=(trunkpos.z-NYANLAND_TREESIZE), (trunkpos.z+NYANLAND_TREESIZE), 1 do
+		       		if (x-trunkpos.x)*(x-trunkpos.x)
+				+(y-trunkpos.y)*(y-trunkpos.y)
+				+(z-trunkpos.z)*(z-trunkpos.z)
+				<= NYANLAND_TREESIZE*NYANLAND_TREESIZE + NYANLAND_TREESIZE then	
+					leafpos={x=x, y=y, z=z}
+					if minetest.env:get_node(leafpos).name=="air" then
+						if math.random(5)==1 then
+							minetest.env:add_node(leafpos, {name="default:apple"})
+						else
+							minetest.env:add_node(leafpos, {name="nyanland:meseleaves"})
+						end				
+					end				
+				end
+			end
+		end
+	end
+end
+
+--MOVING NYAN CATS
+minetest.register_abm(
+	{nodenames = {"default:nyancat"},
+	interval = 1.0,
+	chance = 10,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		if pos.y>NYANLAND_HEIGHT then
+			minetest.env:remove_node(pos)
+			local meseentity = minetest.env:add_entity(pos, "nyanland:head_entity")
+
+			local tailpos={x=pos.x, y=pos.y, z=pos.z+1}
+			while minetest.env:get_node(tailpos).name=="default:nyancat_rainbow" do
+				minetest.env:remove_node(tailpos)
+				minetest.env:add_entity(tailpos, "nyanland:tail_entity")
+				tailpos.z=tailpos.z+1
+			end
+		end
+	end,
+})
+
+minetest.register_entity("nyanland:head_entity", {
+	physical = false,
+	visual = "sprite",
+	timer=0,
+	textures = {"default_nc_side.png", "default_nc_side.png", "default_nc_side.png",
+		"default_nc_side.png", "default_nc_back.png", "default_nc_front.png"},
+	collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
+	visual = "cube",
+	on_activate = function(self, staticdata)
+		self.object:setvelocity({x=0, y=0, z=-2})
+	end,
+
+	on_punch = function(self, hitter)
+		local mesepos=self.object:getpos()
+		mesepos.y=mesepos.y-1
+		minetest.env:add_entity(mesepos, "nyanland:mese")
+	end,
+
+	on_step = function(self, dtime)
+		self.timer=self.timer+dtime
+		if self.timer>=16 then	
+			minetest.env:add_node(self.object:getpos(), {name="default:nyancat"})
+			self.object:remove()
+		end
+	end
+})
+
+minetest.register_entity("nyanland:tail_entity", {
+	physical = false,
+	visual = "sprite",
+	timer=0,
+	textures = {"default_nc_rb.png", "default_nc_rb.png", "default_nc_rb.png", "default_nc_rb.png", "default_nc_rb.png", "default_nc_rb.png"},
+	collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
+	visual = "cube",
+	on_activate = function(self, staticdata)
+		self.object:setvelocity({x=0, y=0, z=-2})
+	end,
+
+	on_step = function(self, dtime)
+		self.timer=self.timer+dtime
+		if self.timer>10 then	
+			minetest.env:add_node(self.object:getpos(), {name="default:nyancat_rainbow"})
+			self.object:remove()
+		end
+	end
+})
+
+minetest.register_entity("nyanland:mese", {
+	physical = true,
+	collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
+	visual = "cube",
+	textures = {"default_mese.png","default_mese.png","default_mese.png","default_mese.png","default_mese.png","default_mese.png"},
+	on_activate = function(self)
+		self.object:setvelocity({x=0, y=-.1, z =0})
+	end,
+	on_step = function(self, dtime)
+		self.object:setacceleration({x=0, y=-10, z=0})
+		local pos = self.object:getpos()
+		local bcp = {x=pos.x, y=pos.y-0.7, z=pos.z} 
+		local bcn = minetest.env:get_node(bcp)
+		--if bcn.name ~= "air" then
+		--	local np = {x=bcp.x, y=bcp.y+1, z=bcp.z}
+		if self.object:getvelocity().y == 0 then
+			minetest.env:add_node(self.object:getpos(), {name="default:mese_block"})
+			self.object:remove()
+		end
+		--	
+		--end
+	end
+})

init.lua

@@ -1,32 +1,90 @@
 NYANLAND_HEIGHT=30688
 NYANCAT_PROP=1
 NYANLAND_TREESIZE=2
+local info = true
 
 local nyanland={}
 
 --Cloudstone
 minetest.register_node("nyanland:cloudstone", {
-	drawtype = "allfaces_optional",
+	description = "nyanland:cloudstone",
 	tile_images = {"nyanland_cloudstone.png"},
 	inventory_image = minetest.inventorycube("nyanland_cloudstone.png"),
+	use_texture_alpha = true,
+	sunlight_propagates = true,
 	dug_item = '',
 	light_source = 10,
 	groups = {dig_immediate = 3},
 })
 
--- MESE Leaves
+minetest.register_node("nyanland:cloudstone_var", {
+	description = "nyanland:cloudstone_var",
+	tile_images = {"nyanland_cloudstone_var.png", "nyanland_cloudstone_var.png", "nyanland_cloudstone.png"},
+	inventory_image = minetest.inventorycube("nyanland_cloudstone_var.png"),
+	use_texture_alpha = true,
+	sunlight_propagates = true,
+	drop = '',
+	light_source = 10,
+	groups = {dig_immediate = 3},
+})
+
+
+minetest.register_node("nyanland:mesetree", {
+	description = "Mese Tree",
+	tiles = {"nyanland_mesetree_top.png", "nyanland_mesetree_top.png", "nyanland_mesetree.png"},
+	groups = {tree=1,cracky=1,level=2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("nyanland:meseleaves", {
+	description = "nyanland:meseleaves",
 	drawtype = "allfaces_optional",
 	visual_scale = 2,
 	tile_images = {"nyanland_meseleaves.png"},
 	inventory_image = minetest.inventorycube("nyanland_meseleaves.png"),
 	paramtype = "light",
 	furnace_burntime = 5,
-	groups = {snappy=3, leafdecay=3, flammable=2},
+	groups = {snappy=3, flammable=2},
+--	groups = {snappy=3, leafdecay=3, flammable=2},
+})
+
+minetest.register_node("nyanland:mese_shrub", {
+	description = "Mese Shrub",
+	drawtype = "plantlike",
+	tiles = {"nyanland_mese_shrub.png"},
+	inventory_image = "nyanland_mese_shrub.png",
+	wield_image = "nyanland_mese_shrub.png",
+	paramtype = "light",
+	walkable = false,
+	buildable_to = true,
+	groups = {snappy=3,flammable=3,attached_node=1},
+	sounds = default.node_sound_leaves_defaults(),
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+	},
+})
+
+minetest.register_node("nyanland:mese_shrub_fruits", {
+	description = "Mese Shrub with fruits",
+	drawtype = "plantlike",
+	tiles = {"nyanland_mese_shrub_fruits.png"},
+	inventory_image = "nyanland_mese_shrub_fruits.png",
+	wield_image = "nyanland_mese_shrub_fruits.png",
+	paramtype = "light",
+	walkable = false,
+	buildable_to = true,
+	groups = {snappy=3,flammable=3,attached_node=1},
+	sounds = default.node_sound_leaves_defaults(),
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+	},
 })
 
 -- Clonestone
 minetest.register_node("nyanland:clonestone", {
+	description = "nyanland:clonestone",
 	tile_images = {"nyanland_clonestone.png"},
 	inventory_image = minetest.inventorycube("nyanland_clonestone.png"),
 	furnace_burntime = 100,
@@ -34,64 +92,125 @@ minetest.register_node("nyanland:clonestone", {
 })
 
 -- Clone items
-minetest.register_abm(
-	{nodenames = {"nyanland:clonestone"},
-	interval = 1.0,
+minetest.register_abm({
+	nodenames = {"nyanland:clonestone"},
+	interval = 1,
 	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		local pos_over ={x=pos.x, y=pos.y+1, z=pos.z}
-		local pos_under={x=pos.x, y=pos.y-1, z=pos.z}
-		if minetest.env:get_node(pos_under).name=="air" then
-			minetest.env:add_node(pos_under, {name=minetest.env:get_node(pos_over).name})
+	action = function(pos)
+		local pos_under = {x=pos.x, y=pos.y-1, z=pos.z}
+		local node_over = minetest.env:get_node({x=pos.x, y=pos.y+1, z=pos.z}).name
+		if minetest.env:get_node(pos_under).name == "air"
+		and node_over ~= "air"
+		and node_over ~= "nyanland:clonestone" then
+			minetest.env:add_node(pos_under, {name=node_over})
 		end
-		nodeupdate(pos_under)
+--		nodeupdate(pos_under)
 	end,
 })
 
 -- Healstone
 minetest.register_node("nyanland:healstone", {
+	description = "nyanland:healstone",
 	tile_images = {"nyanland_healstone.png"},
 	inventory_image = minetest.inventorycube("nyanland_healstone.png"),
 	furnace_burntime = 100,
 	groups = {cracky = 1},
 })
 
--- Clone items
 minetest.register_abm(
 	{nodenames = {"nyanland:healstone"},
 	interval = 1.0,
 	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
+	action = function(pos)
 		local objs = minetest.env:get_objects_inside_radius(pos, 3)
 		for k, obj in pairs(objs) do
-			obj:set_hp(obj:get_hp()+2)
+			local hp = obj:get_hp()
+			if hp >= 20 then return end
+			obj:set_hp(hp+2)
 		end
 	end,
 })
 
---Creating the NyanLand
-minetest.register_on_generated(function(minp, maxp)
-	local addpos={}
-	if minp.y==NYANLAND_HEIGHT then
-		for x=minp.x, maxp.x, 1 do
-			for z=minp.z, maxp.z, 1 do
-				addpos={x=x, y=minp.y, z=z}
-				minetest.env:add_node(addpos, {name="nyanland:cloudstone"})
-				if math.random(1000)==1 then
-					nyanland:grow_mesetree(addpos)
-				elseif math.random(5000)==1 then
-					minetest.env:add_node(addpos,{name="nyanland:clonestone"})
+
+local c_cloudstone = minetest.get_content_id("nyanland:cloudstone")
+local c_cloudstone2 = minetest.get_content_id("nyanland:cloudstone_var")
+local c_clonestone = minetest.get_content_id("nyanland:clonestone")
+local c_mese_shrub = minetest.get_content_id("nyanland:mese_shrub")
+local c_mese_shrub_fruits = minetest.get_content_id("nyanland:mese_shrub_fruits")
+local c_cloud = minetest.get_content_id("default:cloud")
+
+local ypse = NYANLAND_HEIGHT
+
+minetest.register_on_generated(function(minp, maxp, seed)
+	if (minp.y >= ypse+10 or maxp.y <= ypse-10) then
+		return
+	end
+
+	if info then
+		t1 = os.clock()
+		local geninfo = "[nyanland] generates: x=["..minp.x.."; "..maxp.x.."]; y=["..minp.y.."; "..maxp.y.."]; z=["..minp.z.."; "..maxp.z.."]"
+		print(geninfo)
+		minetest.chat_send_all(geninfo)
+	end
+	local pr = PseudoRandom(seed+112)
+	local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
+	local data = vm:get_data()
+	local area = VoxelArea:new{MinEdge=emin, MaxEdge=emax}
+
+	local perlin1 = minetest.get_perlin(13,3, 0.5, 500)	--Get map specific perlin
+	local perlin2 = minetest.get_perlin(133,3, 0.5, 100)
+
+	local num = 1
+	local tab = {}
+
+	for x=minp.x, maxp.x, 1 do
+		for z=minp.z, maxp.z, 1 do
+			local test = math.floor(perlin1:get2d({x=x, y=z})*3+0.5)
+			local test2 = math.floor(perlin2:get2d({x=x, y=z})*1000+0.5)
+			local p_addpos = area:index(x, ypse+test, z)
+			local p_plantpos = area:index(x, ypse+test+1, z)
+			local d_p_addpos = data[p_addpos]
+			if pr:next(1, 1000) == 1 then
+				tab[num] = {x=x, y=ypse+test, z=z}
+				num = num+1
+				data[p_addpos] = c_cloud
+			elseif pr:next(1, 5000) == 1 then
+				data[p_addpos] = c_clonestone
+			elseif pr:next(1, 300) == 1 then
+				data[p_addpos] = c_cloudstone2
+			else
+				data[p_addpos] = c_cloudstone
+			end
+			if pr:next(1, 1000) == 4 then
+				if pr:next(1, 1000) == 2 then
+					data[p_plantpos] = c_mese_shrub_fruits
+				else
+					data[p_plantpos] = c_mese_shrub
 				end
 			end
 		end
-
-		if math.random(NYANCAT_PROP)==1 then
-			local nyan_headpos={}
-			nyan_headpos={x=minp.x+math.random(80), y=minp.y+math.random(20)+10, z=minp.z+math.random(80)}	
-			nyanland:add_nyancat(nyan_headpos, minp)
-		end
 	end
 
+	vm:set_data(data)
+	--vm:set_lighting({day=0, night=0})
+	vm:calc_lighting()
+	vm:update_liquids()
+	vm:write_to_map()
+
+	for _,v in ipairs(tab) do
+		nyanland:grow_mesetree(v)
+	end
+
+	if math.random(NYANCAT_PROP)==1 then
+		local nyan_headpos={}
+		nyan_headpos={x=minp.x+pr:next(1, 80), y=ypse+pr:next(1, 20)+10, z=minp.z+pr:next(1, 80)}	
+		nyanland:add_nyancat(nyan_headpos, minp)
+	end
+	if info then
+		local geninfo = string.format("[nyanland] done after: %.2fs", os.clock() - t1)
+		print(geninfo)
+		minetest.chat_send_all(geninfo)
+	end
 end)
 
 function nyanland:add_nyancat(nyan_headpos)
@@ -104,57 +223,84 @@ function nyanland:add_nyancat(nyan_headpos)
 	end
 end
 
+local get_volume = function(pos1, pos2)
+	return (pos2.x - pos1.x + 1) * (pos2.y - pos1.y + 1) * (pos2.z - pos1.z + 1)
+end
+
 function nyanland:grow_mesetree(pos)
+	local t1 = os.clock()
+	local manip = minetest.get_voxel_manip()
+	local vwidth = NYANLAND_TREESIZE
+	local vheight = 7+vwidth
+	local emerged_pos1, emerged_pos2 = manip:read_from_map({x=pos.x-vwidth, y=pos.y, z=pos.z-vwidth},
+		{x=pos.x+vwidth, y=pos.y+vheight, z=pos.z+vwidth})
+	local area = VoxelArea:new({MinEdge=emerged_pos1, MaxEdge=emerged_pos2})
+
+	local nodes = {}
+	local ignore = minetest.get_content_id("ignore")
+	for i = 1, get_volume(emerged_pos1, emerged_pos2) do
+		nodes[i] = ignore
+	end
+
+	local c_tree = minetest.get_content_id("nyanland:mesetree")
+	local c_hls = minetest.get_content_id("nyanland:healstone")
+	local c_apple = minetest.get_content_id("default:apple")
+	local c_leaves = minetest.get_content_id("nyanland:meseleaves")
+	local c_air = minetest.get_content_id("air")
+
 	--TRUNK
 	pos.y=pos.y+1
+	local pr = PseudoRandom(math.abs(pos.x+pos.y*3+pos.z*5))
 	local trunkpos={x=pos.x, z=pos.z}
-	for y=pos.y, pos.y+4+math.random(2) do
+	local tran=math.random(2)
+	for y=pos.y, pos.y+4+tran do
 		trunkpos.y=y
+		p_trunkpos=area:index(trunkpos.x, trunkpos.y, trunkpos.z)
 		if math.random(200)>1 then
-			minetest.env:add_node(trunkpos, {name="default:mese_block"})
+			nodes[p_trunkpos] = c_tree
 		else
-			minetest.env:add_node(trunkpos, {name="nyanland:healstone"})
+			nodes[p_trunkpos] = c_hls
 		end
 	end
 	--LEAVES
 	local leafpos={}
 	for x=(trunkpos.x-NYANLAND_TREESIZE), (trunkpos.x+NYANLAND_TREESIZE), 1 do
-       		for y=(trunkpos.y-NYANLAND_TREESIZE), (trunkpos.y+NYANLAND_TREESIZE), 1 do
-       			for z=(trunkpos.z-NYANLAND_TREESIZE), (trunkpos.z+NYANLAND_TREESIZE), 1 do
-		       		if (x-trunkpos.x)*(x-trunkpos.x)
-				+(y-trunkpos.y)*(y-trunkpos.y)
-				+(z-trunkpos.z)*(z-trunkpos.z)
-				<= NYANLAND_TREESIZE*NYANLAND_TREESIZE + NYANLAND_TREESIZE then	
+		for y=(trunkpos.y-NYANLAND_TREESIZE), (trunkpos.y+NYANLAND_TREESIZE), 1 do
+			for z=(trunkpos.z-NYANLAND_TREESIZE), (trunkpos.z+NYANLAND_TREESIZE), 1 do
+				if (x-trunkpos.x)^2+(y-trunkpos.y)^2+(z-trunkpos.z)^2<= NYANLAND_TREESIZE^2 + NYANLAND_TREESIZE then	
 					leafpos={x=x, y=y, z=z}
-					if minetest.env:get_node(leafpos).name=="air" then
-						if math.random(5)==1 then
-							minetest.env:add_node(leafpos, {name="default:apple"})
+					p_leafpos=area:index(leafpos.x, leafpos.y, leafpos.z)
+					if minetest.env:get_node(leafpos).name=="air"
+					and nodes[p_leafpos]==ignore then
+						if pr:next(1,5)==1 then
+							if pr:next(1,2)==1 then
+								nodes[p_leafpos] = c_apple
+							end
 						else
-							minetest.env:add_node(leafpos, {name="nyanland:meseleaves"})
-						end				
+							nodes[p_leafpos] = c_leaves
+						end
 					end				
 				end
 			end
 		end
 	end
+	manip:set_data(nodes)
+	manip:write_to_map()
+	if info then
+		print(string.format("[nyanland] a mesetree grew at ("..pos.x.."|"..pos.y.."|"..pos.z..") in: %.2fms", (os.clock() - t1) * 1000))
+	end
+	manip:update_map()	--calc shadows
 end
 
 --MOVING NYAN CATS
 minetest.register_abm(
 	{nodenames = {"default:nyancat"},
-	interval = 1.0,
-	chance = 10,
+	interval = 10,
+	chance = 100,
 	action = function(pos, node, active_object_count, active_object_count_wider)
 		if pos.y>NYANLAND_HEIGHT then
 			minetest.env:remove_node(pos)
-			local meseentity = minetest.env:add_entity(pos, "nyanland:head_entity")
-
-			local tailpos={x=pos.x, y=pos.y, z=pos.z+1}
-			while minetest.env:get_node(tailpos).name=="default:nyancat_rainbow" do
-				minetest.env:remove_node(tailpos)
-				minetest.env:add_entity(tailpos, "nyanland:tail_entity")
-				tailpos.z=tailpos.z+1
-			end
+			minetest.env:add_entity(pos, "nyanland:head_entity")
 		end
 	end,
 })
@@ -178,10 +324,31 @@ minetest.register_entity("nyanland:head_entity", {
 	end,
 
 	on_step = function(self, dtime)
+		local pos = self.object:getpos()
+		local pos = {x=math.floor(pos.x+0.5), y=math.floor(pos.y+0.5), z=math.floor(pos.z+0.5)}
 		self.timer=self.timer+dtime
 		if self.timer>=16 then	
-			minetest.env:add_node(self.object:getpos(), {name="default:nyancat"})
+			minetest.env:add_node(pos, {name="default:nyancat"})
 			self.object:remove()
+			return
+		end
+		if minetest.env:get_node(pos).name == "default:nyancat_rainbow" then	
+			self.object:remove()
+			return
+		end
+		for i = math.random(6)+18,30,1 do
+			local p = {x=pos.x, y=pos.y, z=pos.z+i}
+			if minetest.env:get_node(p).name == "default:nyancat_rainbow" then
+				minetest.env:remove_node(p)
+			end
+		end
+		for i = 1,5,1 do
+			local p = {x=pos.x, y=pos.y, z=pos.z+i}
+			if minetest.env:get_node(p).name == "air" then
+				minetest.env:add_node(p, {name="default:nyancat_rainbow"})
+			else
+				return
+			end
 		end
 	end
 })
@@ -190,19 +357,10 @@ minetest.register_entity("nyanland:tail_entity", {
 	physical = false,
 	visual = "sprite",
 	timer=0,
-	textures = {"default_nc_rb.png", "default_nc_rb.png", "default_nc_rb.png", "default_nc_rb.png", "default_nc_rb.png", "default_nc_rb.png"},
 	collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
 	visual = "cube",
-	on_activate = function(self, staticdata)
-		self.object:setvelocity({x=0, y=0, z=-2})
-	end,
-
-	on_step = function(self, dtime)
-		self.timer=self.timer+dtime
-		if self.timer>10 then	
-			minetest.env:add_node(self.object:getpos(), {name="default:nyancat_rainbow"})
-			self.object:remove()
-		end
+	on_step = function(self)
+		self.object:remove()
 	end
 })
 
@@ -210,7 +368,7 @@ minetest.register_entity("nyanland:mese", {
 	physical = true,
 	collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
 	visual = "cube",
-	textures = {"default_mese.png","default_mese.png","default_mese.png","default_mese.png","default_mese.png","default_mese.png"},
+	textures = {"default_mese_block.png", "default_mese_block.png", "default_mese_block.png", "default_mese_block.png", "default_mese_block.png", "default_mese_block.png"},
 	on_activate = function(self)
 		self.object:setvelocity({x=0, y=-.1, z =0})
 	end,