From ddce8f640fb8753b814daa7844074d47a4ced84d Mon Sep 17 00:00:00 2001
From: morphed <morphed@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Thu, 9 Jul 2009 20:35:42 +0000
Subject: [PATCH] new cl_gentle fx

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7173 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/effectinfo.txt | 106 ++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index 10baf4307..8013b023b 100644
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -2362,92 +2362,92 @@ velocityjitter 256 256 256
 
 // Zero-violence effects
 
-// impact effect indicating damage
+// cl_gentle impact effect indicating damage
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum("damage_hit"), org, vel, amount * 16)
 effect damage_hit
-tex 48 55
-count 1
-type alphastatic
-color 0x00FFFF 0xFF00FF
-size 16 16
-sizeincrease -24
-alpha 128 128 192
-gravity -0.4
-bounce 1.5
-airfriction 5
-liquidfriction 10
-velocityjitter 256 256 256
-effect damage_hit
-tex 48 55
+tex 43 43
 count 1
-type alphastatic
-color 0xFF00FF 0xFFFF00
-size 16 16
+type spark
+color 0xffffff 0x9271fb
+size 14 24
 sizeincrease -24
-alpha 128 128 192
+alpha 128 128 292
 gravity -0.4
-bounce 1.5
 airfriction 5
 liquidfriction 10
-velocityjitter 256 256 256
+velocityjitter 356 356 456
+
 effect damage_hit
-tex 48 55
+tex 0 8
 count 1
-type alphastatic
-color 0xFFFF00 0x00FFFF
-size 16 16
+type smoke
+color 0xffffff 0x9271fb
+size 24 24
 sizeincrease -24
-alpha 128 128 192
-gravity -0.4
-bounce 1.5
+alpha 128 128 292
 airfriction 5
 liquidfriction 10
-velocityjitter 256 256 256
+originjitter 10 10 10
+
 
 // effect for removing player model
 // "teleport"
 
-// large sparks
+// cl_gentle deathfx
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum("damage_dissolve"), org, vel, amount)
 effect damage_dissolve
-tex 48 55
-count 30
-type alphastatic
-color 0x00FFFF 0xFF00FF
-size 32 32
+tex 43 43
+count 20
+type spark
+color 0xffffff 0x9271fb
+size 62 62
 sizeincrease -16
-alpha 256 256 128
+alpha 256 256 328
 gravity -0.4
-bounce 1.5
 airfriction 3
 liquidfriction 6
-velocityjitter 512 512 512
+velocityjitter 256 256 512
+
 effect damage_dissolve
-tex 48 55
-count 30
-type alphastatic
-color 0xFF00FF 0xFFFF00
-size 32 32
+tex 43 43
+count 5
+type spark
+color 0x7bdbff 0xbed2ff
+size 62 62
 sizeincrease -16
-alpha 256 256 128
-gravity -0.4
-bounce 1.5
+alpha 256 256 328
+gravity -0.8
+airfriction 5
+liquidfriction 6
+velocityjitter 256 256 512
+
+effect damage_dissolve
+tex 0 8
+count 10
+type smoke
+color 0xffffff 0x9271fb
+size 44 44
+sizeincrease -16
+alpha 256 256 228
 airfriction 3
 liquidfriction 6
-velocityjitter 512 512 512
+originjitter 32 32 96
+
+
 effect damage_dissolve
-tex 48 55
+tex 46 46
 count 30
-type alphastatic
-color 0xFFFF00 0x00FFFF
+type smoke
+color 0xffffff 0x9271fb
 size 32 32
 sizeincrease -16
-alpha 256 256 128
-gravity -0.4
+alpha 256 256 228
+gravity 1
 bounce 1.5
 airfriction 3
 liquidfriction 6
-velocityjitter 512 512 512
+velocityjitter 400 400 0
+
 
 // decal
 // used in qcsrc/server/g_triggers.qc:					self.cnt = particleeffectnum("laser_deadly")
-- 
2.39.2