From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 5 Jan 2012 00:50:17 +0000 (+0200)
Subject: Don't show fire and some plasma damage effects underwater
X-Git-Tag: xonotic-v0.6.0~110^2^2~53
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c1ee9191bfd90692940db4c46cd8fa3a2d80396d

Don't show fire and some plasma damage effects underwater
---

diff --git a/effectinfo.txt b/effectinfo.txt
index dfc83b7ae..88d75cba6 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -6542,6 +6542,7 @@ rotate -180 180 -20 20
 // laser damage effect
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_laser
+notunderwater
 count 3
 type smoke
 tex 0 8
@@ -6715,7 +6716,7 @@ originjitter 0 0 0
 // minelayer damage effect
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_minelayer
-//notunderwater
+notunderwater
 count 3
 type smoke
 tex 48 55
@@ -6728,6 +6729,7 @@ originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
 effect weapondamage_minelayer
+notunderwater
 type alphastatic
 count 2
 tex 0 8
@@ -6740,6 +6742,7 @@ originjitter 4 4 4
 velocityjitter 11 11 50
 // light
 effect weapondamage_minelayer
+notunderwater
 trailspacing 8
 lightradius 60
 lightradiusfade 280
@@ -6748,7 +6751,7 @@ lightcolor 0.7 0.4 0.2
 // grenadelauncher damage effect
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_grenadelauncher
-//notunderwater
+notunderwater
 count 3
 type smoke
 tex 48 55
@@ -6761,6 +6764,7 @@ originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
 effect weapondamage_grenadelauncher
+notunderwater
 type alphastatic
 count 2
 tex 0 8
@@ -6773,6 +6777,7 @@ originjitter 4 4 4
 velocityjitter 11 11 50
 // light
 effect weapondamage_grenadelauncher
+notunderwater
 trailspacing 8
 lightradius 60
 lightradiusfade 280
@@ -6781,6 +6786,7 @@ lightcolor 0.7 0.4 0.2
 // electro damage effect
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_electro
+notunderwater
 count 2
 type static
 tex 47 47
@@ -6798,6 +6804,7 @@ airfriction -0.5
 rotate 180 360 -30 30
 // plasma smoke
 effect weapondamage_electro
+notunderwater
 count 4
 type smoke
 tex 0 8
@@ -6813,7 +6820,6 @@ airfriction -0.35
 rotate 0 180 -30 30
 // bouncing sparks
 effect weapondamage_electro
-notunderwater
 count 0.5
 type spark
 color 0x003090 0x00CCFF
@@ -6827,6 +6833,7 @@ velocityoffset 0 0 20
 velocityjitter 64 64 64
 // light
 effect weapondamage_electro
+notunderwater
 trailspacing 8
 lightradius 50
 lightradiusfade 220
@@ -6835,6 +6842,7 @@ lightcolor 0.2 0.6 0.8
 // crylink damage effect
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_crylink
+notunderwater
 count 2
 type static
 tex 38 38
@@ -6852,6 +6860,7 @@ airfriction -0.5
 rotate 180 360 -30 30
 // plasma smoke
 effect weapondamage_crylink
+notunderwater
 count 4
 type smoke
 tex 0 8
@@ -6867,7 +6876,6 @@ airfriction -0.35
 rotate 0 180 -30 30
 // floating sparks
 effect weapondamage_crylink
-notunderwater
 count 0.2
 type spark
 color 0x903090 0xFFD0FF
@@ -6881,6 +6889,7 @@ velocityoffset 0 0 0
 velocityjitter 48 48 48
 // light
 effect weapondamage_crylink
+notunderwater
 trailspacing 8
 lightradius 50
 lightradiusfade 240
@@ -6889,6 +6898,7 @@ lightcolor 0.6 0.2 0.8
 // hlac damage effect
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_hlac
+notunderwater
 count 3
 type smoke
 tex 0 8
@@ -7092,7 +7102,7 @@ originjitter 0 0 0
 // seeker damage effect
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_seeker
-//notunderwater
+notunderwater
 count 3
 type smoke
 tex 48 55
@@ -7105,6 +7115,7 @@ originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
 effect weapondamage_seeker
+notunderwater
 type alphastatic
 count 2
 tex 0 8
@@ -7117,6 +7128,7 @@ originjitter 4 4 4
 velocityjitter 11 11 50
 // light
 effect weapondamage_seeker
+notunderwater
 trailspacing 8
 lightradius 65
 lightradiusfade 280
@@ -7125,7 +7137,7 @@ lightcolor 0.7 0.5 0.1
 // hagar damage effect
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_hagar
-//notunderwater
+notunderwater
 count 3
 type smoke
 tex 48 55
@@ -7138,6 +7150,7 @@ originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
 effect weapondamage_hagar
+notunderwater
 type alphastatic
 count 2
 tex 0 8
@@ -7150,6 +7163,7 @@ originjitter 4 4 4
 velocityjitter 11 11 50
 // light
 effect weapondamage_hagar
+notunderwater
 trailspacing 8
 lightradius 65
 lightradiusfade 280
@@ -7158,7 +7172,7 @@ lightcolor 0.7 0.5 0.1
 // fireball damage effect
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_fireball
-//notunderwater
+notunderwater
 count 4
 type smoke
 tex 48 55
@@ -7171,6 +7185,7 @@ originjitter 8 8 8
 velocityjitter 22 22 50
 // smoke
 effect weapondamage_fireball
+notunderwater
 type alphastatic
 count 4
 tex 0 8
@@ -7183,6 +7198,7 @@ originjitter 6 6 6
 velocityjitter 11 11 50
 // light
 effect weapondamage_fireball
+notunderwater
 trailspacing 8
 lightradius 65
 lightradiusfade 280
@@ -7191,7 +7207,7 @@ lightcolor 1.0 0.8 0.4
 // rocketlauncher damage effect
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_rocketlauncher
-//notunderwater
+notunderwater
 count 3
 type smoke
 tex 48 55
@@ -7204,6 +7220,7 @@ originjitter 4 4 4
 velocityjitter 22 22 30
 // smoke
 effect weapondamage_rocketlauncher
+notunderwater
 type alphastatic
 count 3
 tex 0 8
@@ -7216,6 +7233,7 @@ originjitter 4 4 4
 velocityjitter 11 11 50
 // light
 effect weapondamage_rocketlauncher
+notunderwater
 trailspacing 8
 lightradius 60
 lightradiusfade 280