Make dripping particles MC-like

mods/ENTITIES/drippingwater/init.lua

@@ -5,110 +5,61 @@ local math = math
 
 -- License of code, textures & sounds: CC0
 
---Drop entities
+local function register_drop(liquid, glow, sound, nodes)
-
+	minetest.register_entity("drippingwater:drop_" .. liquid, {
---water
-
-local water_tex = "default_water_source_animated.png^[verticalframe:16:0"
-minetest.register_entity("drippingwater:drop_water", {
 		hp_max = 1,
 		physical = true,
 		collide_with_objects = false,
-	collisionbox = {-0.025,-0.05,-0.025,0.025,-0.01,0.025},
+		collisionbox = {-0.01, 0.01, -0.01, 0.01, 0.01, 0.01},
+		glow = glow,
 		pointable = false,
-	visual = "cube",
+		visual = "sprite",
-	visual_size = {x=0.05, y=0.1},
+		visual_size = {x = 0.1, y = 0.1},
-	textures = {water_tex, water_tex, water_tex, water_tex, water_tex, water_tex},
+		textures = {""},
 		spritediv = {x = 1, y = 1},
 		initial_sprite_basepos = {x = 0, y = 0},
 		static_save = false,
-	on_activate = function(self, staticdata)
+		_dropped = false,
-		self.object:set_sprite({x=0,y=0}, 1, 1, true)
+		on_activate = function(self)
+			self.object:set_properties({
+				textures = {"[combine:2x2:" .. -math.random(1, 16) .. "," .. -math.random(1, 16) .. "=default_" .. liquid .. "_source_animated.png"}
+			})
 		end,
 		on_step = function(self, dtime)
 			local k = math.random(1, 222)
 			local ownpos = self.object:get_pos()
 			if k == 1 then
-			self.object:set_acceleration({x=0, y=-5, z=0})
+				self.object:set_acceleration(vector.new(0, -5, 0))
 			end
-		if minetest.get_node({x=ownpos.x, y=ownpos.y +0.5, z=ownpos.z}).name == "air" then
+			if minetest.get_node(vector.offset(ownpos, 0, 0.5, 0)).name == "air" then
-			self.object:set_acceleration({x=0, y=-5, z=0})
+				self.object:set_acceleration(vector.new(0, -5, 0))
 			end
-		if minetest.get_node({x=ownpos.x, y=ownpos.y -0.5, z=ownpos.z}).name ~= "air" then
+			if minetest.get_node(vector.offset(ownpos, 0, -0.1, 0)).name ~= "air" then
+				if not self.object:get_luaentity()._dropped then
+					self.object:get_luaentity()._dropped = true
+					minetest.sound_play({name = "drippingwater_" .. sound .. "drip"}, {pos = ownpos, gain = 0.5, max_hear_distance = 8}, true)
+				end
+				if k < 3 then
 					self.object:remove()
-			minetest.sound_play({name="drippingwater_drip"}, {pos = ownpos, gain = 0.5, max_hear_distance = 8}, true)
+				end
 			end
 		end,
 	})
-
-
---lava
-
-local lava_tex = "default_lava_source_animated.png^[verticalframe:16:0"
-minetest.register_entity("drippingwater:drop_lava", {
-	hp_max = 1,
-	physical = true,
-	collide_with_objects = false,
-	collisionbox = {-0.025,-0.05,-0.025,0.025,-0.01,0.025},
-	glow = math.max(7, minetest.registered_nodes["mcl_core:lava_source"].light_source - 3),
-	pointable = false,
-	visual = "cube",
-	visual_size = {x=0.05, y=0.1},
-	textures = {lava_tex, lava_tex, lava_tex, lava_tex, lava_tex, lava_tex},
-	spritediv = {x=1, y=1},
-	initial_sprite_basepos = {x=0, y=0},
-	static_save = false,
-	on_activate = function(self, staticdata)
-		self.object:set_sprite({x=0,y=0}, 1, 0, true)
-	end,
-	on_step = function(self, dtime)
-		local k = math.random(1,222)
-		local ownpos = self.object:get_pos()
-		if k == 1 then
-			self.object:set_acceleration({x=0, y=-5, z=0})
-		end
-		if minetest.get_node({x=ownpos.x, y=ownpos.y +0.5, z=ownpos.z}).name == "air" then
-			self.object:set_acceleration({x=0, y=-5, z=0})
-		end
-		if minetest.get_node({x=ownpos.x, y=ownpos.y -0.5, z=ownpos.z}).name ~= "air" then
-			self.object:remove()
-			minetest.sound_play({name="drippingwater_lavadrip"}, {pos = ownpos, gain = 0.5, max_hear_distance = 8}, true)
-		end
-	end,
-})
-
-
-
---Create drop
-
 	minetest.register_abm({
-	label = "Create water drops",
+		label = "Create drops",
-	nodenames = {"group:opaque", "group:leaves"},
+		nodenames = nodes,
-	neighbors = {"group:water"},
+		neighbors = {"group:" .. liquid},
 		interval = 2,
 		chance = 22,
 		action = function(pos)
-		if minetest.get_item_group(minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name, "water") ~= 0
+			if minetest.get_item_group(minetest.get_node(vector.offset(pos, 0, 1, 0)).name, liquid) ~= 0
-			and minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name == "air" then
+			and minetest.get_node(vector.offset(pos, 0, -1, 0)).name == "air" then
-			local i = math.random(-45,45) / 100
+				local x, z = math.random(-45, 45) / 100, math.random(-45, 45) / 100
-			minetest.add_entity({x=pos.x + i, y=pos.y - 0.501, z=pos.z + i}, "drippingwater:drop_water")
+				minetest.add_entity(vector.offset(pos, x, -0.520, z), "drippingwater:drop_" .. liquid)
 			end
 		end,
 	})
-
---Create lava drop
-
-minetest.register_abm({
-	label = "Create lava drops",
-	nodenames = {"group:opaque"},
-	neighbors = {"group:lava"},
-	interval = 2,
-	chance = 22,
-	action = function(pos)
-		if minetest.get_item_group(minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name, "lava") ~= 0
-			and	minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name == "air" then
-			local i = math.random(-45,45) / 100
-			minetest.add_entity({x=pos.x + i, y=pos.y - 0.501, z=pos.z + i}, "drippingwater:drop_lava")
 end
-	end,
+
-})
+register_drop("water", 1, "", {"group:opaque", "group:leaves"})
+register_drop("lava", math.max(7, minetest.registered_nodes["mcl_core:lava_source"].light_source - 3), "lava", {"group:opaque"})