bringed back old cl_gentle 2

diff --git a/effectinfo.txt b/effectinfo.txt
index 2bff78253d342c31e98c87f4cd3f599ba52f37cd..a644a84d47bd6b337f221d40eff538143dd3a5f2 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -2564,44 +2564,44 @@ velocityjitter 256 256 256
 // impact effect indicating damage
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("damage_hit"), org, vel, amount * 16)
 effect damage_hit
-tex 69 69
-count 0.2
+tex 48 55
+count 1
 type alphastatic
 color 0x00FFFF 0xFF00FF
-size 26 26
-sizeincrease -28
+size 16 16
+sizeincrease -24
 alpha 128 128 192
 gravity -0.4
 bounce 1.5
 airfriction 5
 liquidfriction 10
-velocityjitter 156 156 156
+velocityjitter 256 256 256
 effect damage_hit
-tex 69 69
-count 0.2
+tex 48 55
+count 1
 type alphastatic
 color 0xFF00FF 0xFFFF00
-size 26 26
-sizeincrease -28
+size 16 16
+sizeincrease -24
 alpha 128 128 192
 gravity -0.4
 bounce 1.5
 airfriction 5
 liquidfriction 10
-velocityjitter 156 156 156
+velocityjitter 256 256 256
 effect damage_hit
-tex 69 69
-count 0.2
+tex 48 55
+count 1
 type alphastatic
 color 0xFFFF00 0x00FFFF
-size 26 26
-sizeincrease -28
+size 16 16
+sizeincrease -24
 alpha 128 128 192
 gravity -0.4
 bounce 1.5
 airfriction 5
 liquidfriction 10
-velocityjitter 156 156 156
+velocityjitter 256 256 256
 
 // effect for removing player model
 // "teleport"
@@ -2609,44 +2609,45 @@ velocityjitter 156 156 156
 // large sparks
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("damage_dissolve"), org, vel, amount)
 effect damage_dissolve
-tex 69 69
+tex 48 55
 count 30
 type alphastatic
 color 0x00FFFF 0xFF00FF
 size 32 32
-sizeincrease -10
-alpha 256 256 228
+sizeincrease -16
+alpha 256 256 128
 gravity -0.4
 bounce 1.5
 airfriction 3
 liquidfriction 6
-velocityjitter 312 312 312
+velocityjitter 512 512 512
 effect damage_dissolve
-tex 69 69
+tex 48 55
 count 30
 type alphastatic
 color 0xFF00FF 0xFFFF00
 size 32 32
-sizeincrease -10
-alpha 256 256 228
+sizeincrease -16
+alpha 256 256 128
 gravity -0.4
 bounce 1.5
 airfriction 3
 liquidfriction 6
-velocityjitter 312 312 312
+velocityjitter 512 512 512
 effect damage_dissolve
-tex 69 69
+tex 48 55
 count 30
 type alphastatic
 color 0xFFFF00 0x00FFFF
 size 32 32
-sizeincrease -10
-alpha 256 256 228
+sizeincrease -16
+alpha 256 256 128
 gravity -0.4
 bounce 1.5
 airfriction 3
 liquidfriction 6
-velocityjitter 312 312 312
+velocityjitter 512 512 512
+
 
 // decal
 // used in qcsrc/server/g_triggers.qc:                                 self.cnt = particleeffectnum("laser_deadly")
@@ -4823,3 +4824,86 @@ originjitter 10 10 10
 velocitymultiplier 20
 velocityoffset 0 0 10
 airfriction 1
+
+//happy death fx for cl_gentle
+effect happy_damage_dissolve
+tex 69 69
+count 30
+type alphastatic
+color 0x00FFFF 0xFF00FF
+size 32 32
+sizeincrease -10
+alpha 256 256 228
+gravity -0.4
+bounce 1.5
+airfriction 3
+liquidfriction 6
+velocityjitter 312 312 312
+effect happy_damage_dissolve
+tex 69 69
+count 30
+type alphastatic
+color 0xFF00FF 0xFFFF00
+size 32 32
+sizeincrease -10
+alpha 256 256 228
+gravity -0.4
+bounce 1.5
+airfriction 3
+liquidfriction 6
+velocityjitter 312 312 312
+effect happy_damage_dissolve
+tex 69 69
+count 30
+type alphastatic
+color 0xFFFF00 0x00FFFF
+size 32 32
+sizeincrease -10
+alpha 256 256 228
+gravity -0.4
+bounce 1.5
+airfriction 3
+liquidfriction 6
+velocityjitter 312 312 312
+
+
+//happy damage fx for cl_gentle
+effect happy_damage_hit
+tex 69 69
+count 0.2
+type alphastatic
+color 0x00FFFF 0xFF00FF
+size 26 26
+sizeincrease -28
+alpha 128 128 192
+gravity -0.4
+bounce 1.5
+airfriction 5
+liquidfriction 10
+velocityjitter 156 156 156
+effect happy_damage_hit
+tex 69 69
+count 0.2
+type alphastatic
+color 0xFF00FF 0xFFFF00
+size 26 26
+sizeincrease -28
+alpha 128 128 192
+gravity -0.4
+bounce 1.5
+airfriction 5
+liquidfriction 10
+velocityjitter 156 156 156
+effect happy_damage_hit
+tex 69 69
+count 0.2
+type alphastatic
+color 0xFFFF00 0x00FFFF
+size 26 26
+sizeincrease -28
+alpha 128 128 192
+gravity -0.4
+bounce 1.5
+airfriction 5
+liquidfriction 10
+velocityjitter 156 156 156
\ No newline at end of file