Merge remote branch 'origin/fruitiex/fruitbalance'

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index a421e98dc7940ce03c5d444d024623abaa17d5e0..d50669f3a00875831821987dd17098175c51560f 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -382,7 +382,7 @@ set g_balance_crylink_primary_damage 8
 set g_balance_crylink_primary_edgedamage 6
 set g_balance_crylink_primary_force 40
 set g_balance_crylink_primary_radius 80
-set g_balance_crylink_primary_speed 1100
+set g_balance_crylink_primary_speed 1200
 set g_balance_crylink_primary_spread 0.1
 set g_balance_crylink_primary_shots 7
 set g_balance_crylink_primary_bounces 2

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 29b8be7ef0e6efd823fb934de4afd5eac1f959fe..68790617dffab9b2df702495c2c7f9e2a3308801 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -50,8 +50,8 @@ void W_Nex_Attack (float issecondary)
        }
        else
                charge = 1;
-       mydmg *= charge;
-       myforce *= charge;
+       mydmg = mydmg * charge;
+       myforce = myforce * charge;
 
        W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", mydmg);
 

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index f47077a2573ff286b9e400d88ec6399a43ca1cd3..c5f1ed12c02143b993bb15d92e7c3d27c7c4d5b1 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -146,6 +146,7 @@ float w_shotgun(float req)
 };
 #endif
 #ifdef CSQC
+.float prevric;
 float w_shotgun(float req)
 {
        if(req == WR_IMPACTEFFECT)
@@ -153,14 +154,15 @@ float w_shotgun(float req)
                vector org2;
                org2 = w_org + w_backoff * 2;
                pointparticles(particleeffectnum("shotgun_impact"), org2, w_backoff * 1000, 1);
-               if(!w_issilent)
+               if(!w_issilent && time - self.prevric > 0.25)
                {
-                       if(w_random < 0.05)
+                       if(w_random < 0.0165)
                                sound(self, CHAN_PROJECTILE, "weapons/ric1.wav", VOL_BASE, ATTN_NORM);
-                       else if(w_random < 0.1)
+                       else if(w_random < 0.033)
                                sound(self, CHAN_PROJECTILE, "weapons/ric2.wav", VOL_BASE, ATTN_NORM);
-                       else if(w_random < 0.2)
+                       else if(w_random < 0.05)
                                sound(self, CHAN_PROJECTILE, "weapons/ric3.wav", VOL_BASE, ATTN_NORM);
+                       self.prevric = time;
                }
        }
        else if(req == WR_PRECACHE)