From 6d5f046d41c28e7243876f6ab349b0710ed51d22 Mon Sep 17 00:00:00 2001
From: LoneWolfHT <lonewolf04361@gmail.com>
Date: Tue, 4 May 2021 10:05:14 -0700
Subject: [PATCH] Fix texurepacks being able to hide grenade smoke (#876)

* Fix texurepacks being able to hide grenade smoke

* Update smoke texture
---
 mods/pvp/grenades/grenades.lua                |  22 +++++++++---------
 mods/pvp/grenades/textures/grenades_smoke.png | Bin 145 -> 175 bytes
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mods/pvp/grenades/grenades.lua b/mods/pvp/grenades/grenades.lua
index 1e8a811..0895eef 100644
--- a/mods/pvp/grenades/grenades.lua
+++ b/mods/pvp/grenades/grenades.lua
@@ -120,24 +120,24 @@ grenades.register_grenade("grenades:smoke", {
 
 		minetest.after(SMOKE_GRENADE_TIME, minetest.sound_stop, hiss)
 
-		for i = 0, 5, 1 do
+		for i = 0, 4, 1 do
 			minetest.add_particlespawner({
 				amount = 40,
 				time = SMOKE_GRENADE_TIME + 3,
-				minpos = vector.subtract(pos, 2),
-				maxpos = vector.add(pos, 2),
-				minvel = {x = 0, y = 2, z = 0},
-				maxvel = {x = 0, y = 3, z = 0},
-				minacc = {x = 1, y = 0.2, z = 1},
-				maxacc = {x = 1, y = 0.2, z = 1},
+				minpos = vector.new(pos.x-4, pos.y+1, pos.z-4),
+				maxpos = vector.new(pos.x+4, pos.y+2, pos.z+4),
+				minvel = vector.new(-1, 0, -1),
+				maxvel = vector.new(1, 0.3, 1),
+				minacc = vector.new(-1, 0, -1),
+				maxacc = vector.new(1, 1, 1),
 				minexptime = 1,
-				maxexptime = 1,
-				minsize = 125,
-				maxsize = 140,
+				maxexptime = 2,
+				minsize = 50,
+				maxsize = 40,
 				collisiondetection = false,
 				collision_removal = false,
 				vertical = false,
-				texture = "grenades_smoke.png",
+				texture = "grenades_smoke.png^[noalpha^[colorize:#" .. math.random(7, 9)*111 ..":255^grenades_smoke.png",
 			})
 		end
 	end,
diff --git a/mods/pvp/grenades/textures/grenades_smoke.png b/mods/pvp/grenades/textures/grenades_smoke.png
index 254be1dbaf1a2e14255a6440a603b5dba5c7ac55..8a345ff37465a795fba625aaecb47194d7ff7351 100644
GIT binary patch
delta 147
zcmV;E0Brw}0j~j&B!2;OQb$4nuFf3k0001KNkl<ZIE|%~OAf#w2t>JmxO2PF#<cTh
zG-abf=7VC@i0;1Ty6$TUnI}NnKRHs_IYTEWMAqWlt|OI%ADfDVR1^?v(sLbIS70Kt
zEnv^4Rw_ggS_3y$J<Wq`Wp|YAO#J#xsVH6K4P&1VrJ>tujtl?*002ovPDHLkV1gVU
BK1=`r

delta 116
zcmV-)0E_>x0g(ZaByCtpL_t(IjlEOJ2>>t%%la<is_m;#i#O6&P>hBU!ORN)x`?|V
zB6aBPi#j4(c;->LtfED-(Dk6Tq)QeaWXYonga?+qe+r_olyWed#FVns!#I7{gA8uP
W&|!TM8K4>f0000<MNUMnLSTaNJ2RpH