Merge commit 'origin/master' into divVerent/tag_seeker

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / damage.qc

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 59e84690b852e95353118c3d7e390b37733f1a67..9e90bee2240161c7293450712830d826fac63b53 100644 (file)
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -218,6 +218,56 @@ void Ent_DamageInfo(float isNew)
                                if(!issilent)
                                        sound(self, CHAN_PROJECTILE, "weapons/hookbomb_impact.wav", VOL_BASE, ATTN_NORM);
                                break;
+                       case WEP_SEEKER:
+                               org2 = org + backoff * 6;
+                               if(secondary)
+                               {
+                                       pointparticles(particleeffectnum("flac_explode"), org2, '0 0 0', 1);
+                                       if(!issilent)
+                                       {
+                                               if (r<0.15)
+                                                       sound(self, CHAN_PROJECTILE, "weapons/flacexp1.wav", 1, ATTN_NORM);
+                                               else if (r<0.7)
+                                                       sound(self, CHAN_PROJECTILE, "weapons/flacexp2.wav", 1, ATTN_NORM);
+                                               else
+                                                       sound(self, CHAN_PROJECTILE, "weapons/flacexp3.wav", 1, ATTN_NORM);
+                                       }
+                               }
+                               else
+                               {
+                                       if(bounce)
+                                       {
+                                               pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1);
+                                               if(!issilent)
+                                               {
+                                                       if (r<0.15)
+                                                               sound(self, CHAN_PROJECTILE, "weapons/tagexp1.wav", 1, ATTN_NORM);
+                                                       else if (r<0.7)
+                                                               sound(self, CHAN_PROJECTILE, "weapons/tagexp2.wav", 1, ATTN_NORM);
+                                                       else
+                                                               sound(self, CHAN_PROJECTILE, "weapons/tagexp3.wav", 1, ATTN_NORM);
+                                               }
+                                       }
+                                       else if(headshot)
+                                       {
+                                               if(!issilent)
+                                                       sound(self, CHAN_PROJECTILE, "weapons/tag_impact.wav", 1, ATTN_NORM);
+                                       }
+                                       else
+                                       {
+                                               pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1);
+                                               if(!issilent)
+                                               {
+                                                       if (r<0.15)
+                                                               sound(self, CHAN_PROJECTILE, "weapons/seekerexp1.wav", 1, ATTN_NORM);
+                                                       else if (r<0.7)
+                                                               sound(self, CHAN_PROJECTILE, "weapons/seekerexp2.wav", 1, ATTN_NORM);
+                                                       else
+                                                               sound(self, CHAN_PROJECTILE, "weapons/seekerexp3.wav", 1, ATTN_NORM);
+                                               }
+                                       }
+                               }
+                               break;
                        case WEP_HLAC:
                                org2 = org + backoff * 6;
                                pointparticles(particleeffectnum("laser_impact"), org2, backoff * 1000, 1);
@@ -265,6 +315,9 @@ void DamageInfo_Precache()
        precache_sound("weapons/crylink_impact.wav");
        precache_sound("weapons/electro_impact.wav");
        precache_sound("weapons/electro_impact_combo.wav");
+       precache_sound("weapons/flacexp1.wav");
+       precache_sound("weapons/flacexp2.wav");
+       precache_sound("weapons/flacexp3.wav");
        precache_sound("weapons/grenade_impact.wav");
        precache_sound("weapons/hagexp1.wav");
        precache_sound("weapons/hagexp2.wav");
@@ -281,4 +334,11 @@ void DamageInfo_Precache()
        precache_sound("weapons/rocket_impact.wav");
        precache_sound("weapons/fireball_impact.wav");
        precache_sound("weapons/fireball_impact2.wav");
+       precache_sound("weapons/seekerexp1.wav");
+       precache_sound("weapons/seekerexp2.wav");
+       precache_sound("weapons/seekerexp3.wav");
+       precache_sound("weapons/tagexp1.wav");
+       precache_sound("weapons/tagexp2.wav");
+       precache_sound("weapons/tagexp3.wav");
+       precache_sound("weapons/tag_impact.wav");
 }