Merge pull request 'Tweak crying obsidian particles' (#2395) from crying_particles into master

Reviewed-on: MineClone2/MineClone2#2395
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>

mods/ITEMS/mcl_core/functions.lua

@@ -1702,40 +1702,64 @@ end
 
 -- Obsidian crying
 
-local crying_obsidian_tears = {
+local crobby_psdef = {
-	"mcl_core_crying_obsidian_tear.png",
+			amount = 1,
-	"mcl_core_crying_obsidian_tear2.png",
-	"mcl_core_crying_obsidian_tear3.png"
-}
-
-local psdef = {
-			amount = 10,
 			time = 0.9, --everything longer than 1 is a coord exploit
-			minvel = vector.new(0,-0.15,0),
+			minvel = vector.new(0,-2,0),
-			maxvel = vector.new(0,-0.001,0),
+			maxvel = vector.new(0,-0.5,0),
-			minacc = vector.new(0,-0.1,0),
+			minacc = vector.new(0,-10,0),
-			maxacc = vector.new(0,-0.001,0),
+			maxacc = vector.new(0,-8,0),
 			minexptime = 1,
 			maxexptime = 6,
-			minsize = 0.1,
+			minsize = 1.5,
-			maxsize = 0.25,
+			maxsize = 2,
 			collisiondetection = true,
 			collision_removal = true,
 			object_collision = true,
 			vertical = true,
+			texture = "mcl_core_crying_obsidian_tear.png",
+}
+local crobby_psdef2 = {
+			amount = 1,
+			time = 0.9, --everything longer than 1 is a coord exploit
+			minvel = vector.new(0,-0.01,0),
+			maxvel = vector.new(0,-0.005,0),
+			minacc = vector.new(0,-0.1,0),
+			maxacc = vector.new(0,-0.01,0),
+			minexptime = 2,
+			maxexptime = 3,
+			minsize = 0.3,
+			maxsize = 0.6,
+			collisiondetection = true,
+			collision_removal = true,
+			object_collision = true,
+			vertical = true,
+			texture = "mcl_core_crying_obsidian_tear.png",
 }
 
 minetest.register_abm({
 	label = "Obsidian cries",
 	nodenames = {"mcl_core:crying_obsidian"},
-	interval = 60,
+	interval = 5,
 	chance = 10,
 	action = function(pos, node)
-		psdef.minpos = vector.offset(pos,-0.6,-0.51,-0.6)
+		minetest.after(math.random(0.1,1.5),function()
-		psdef.maxpos = vector.offset(pos,0.6,-0.51,0.6)
+			crobby_psdef.minpos = vector.offset(pos,-0.6,-0.51,-0.6)
-		for _,t in pairs(crying_obsidian_tears) do
+			crobby_psdef.maxpos = vector.offset(pos,0.6,0.51,0.6)
-			psdef.texture = t
+			minetest.add_particlespawner(crobby_psdef)
-			minetest.add_particlespawner(psdef)
+			crobby_psdef2.minpos = vector.offset(pos,-0.51,-0.51,-0.51)
-		end
+			crobby_psdef2.maxpos = vector.offset(pos,-0.5,0.51,-0.5)
+			minetest.add_particlespawner(crobby_psdef2)
+			crobby_psdef2.minpos = vector.offset(pos,0.51,-0.51,-0.51)
+			crobby_psdef2.maxpos = vector.offset(pos,0.5,0.51,-0.5)
+			minetest.add_particlespawner(crobby_psdef2)
+			crobby_psdef2.minpos = vector.offset(pos,0.51,-0.51,0.51)
+			crobby_psdef2.maxpos = vector.offset(pos,0.5,0.51,0.5)
+			minetest.add_particlespawner(crobby_psdef2)
+			crobby_psdef2.minpos = vector.offset(pos,-0.51,-0.51,0.51)
+			crobby_psdef2.maxpos = vector.offset(pos,-0.5,0.51,0.5)
+			minetest.add_particlespawner(crobby_psdef2)
+
+		end)
 	end
 })