Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --git a/balance25.cfg b/balance25.cfg
index 158f676844e4c348a85e9015853fee0a21b20b86..8fb2e008abe24d533d1283178d548505fa736b70 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -444,6 +444,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 0
 set g_balance_nex_charge 0
 set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
+set g_balance_nex_charge_limit 0.5
 set g_balance_nex_charge_shot_multiplier 0.5
 set g_balance_nex_charge_velocity_rate 0.2
 set g_balance_nex_charge_minspeed 400

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 11d85e4335640df92ab106a87df097491e73372a..eaff81828b33d704520959dabc0e8083ff37f725 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -455,6 +455,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 9999999
 set g_balance_nex_charge 0
 set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
+set g_balance_nex_charge_limit 0.5
 set g_balance_nex_charge_shot_multiplier 0.5
 set g_balance_nex_charge_velocity_rate 0.2
 set g_balance_nex_charge_minspeed 400

diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg
index 654ec6cc10a4baad704f416a09b2d777133f0144..445e8b156bbde7da0e87cb2859f21a235cc64b68 100644 (file)
--- a/balanceNexSVN.cfg
+++ b/balanceNexSVN.cfg
@@ -443,6 +443,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
 set g_balance_nex_charge 0
 set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
+set g_balance_nex_charge_limit 0.5
 set g_balance_nex_charge_shot_multiplier 0.5
 set g_balance_nex_charge_velocity_rate 0.2
 set g_balance_nex_charge_minspeed 400

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 9a49f3da96d7918954d3e9171b4466486252a640..517f5c9cfbcb15c5daef1f99b74f27ed4e68ea0a 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -444,6 +444,7 @@ set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
 set g_balance_nex_charge 0
 set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
+set g_balance_nex_charge_limit 0.5
 set g_balance_nex_charge_shot_multiplier 0.5
 set g_balance_nex_charge_velocity_rate 0.2
 set g_balance_nex_charge_minspeed 400

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 9d4f67a94c6206a08a75c354f20aea20324fc239..66c1e991a7c0e2a8f5fdd05168c383faecd5b25f 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -430,22 +430,23 @@ set g_balance_nex_primary_damagefalloff_forcehalflife 2000
 
 set g_balance_nex_secondary 1
 set g_balance_nex_secondary_charge 1
-set g_balance_nex_secondary_charge_rate 0.1
+set g_balance_nex_secondary_charge_rate 0.15
 set g_balance_nex_secondary_damage 0
 set g_balance_nex_secondary_force 0
 set g_balance_nex_secondary_refire 0
 set g_balance_nex_secondary_animtime 0
-set g_balance_nex_secondary_ammo 5
+set g_balance_nex_secondary_ammo 4
 set g_balance_nex_secondary_damagefalloff_mindist 0
 set g_balance_nex_secondary_damagefalloff_maxdist 0
 set g_balance_nex_secondary_damagefalloff_halflife 0
 set g_balance_nex_secondary_damagefalloff_forcehalflife 0
 
 set g_balance_nex_charge 1
-set g_balance_nex_charge_start 0.25
-set g_balance_nex_charge_rate 0.025
+set g_balance_nex_charge_start 0.2
+set g_balance_nex_charge_rate 0.05
+set g_balance_nex_charge_limit 0.5
 set g_balance_nex_charge_shot_multiplier 0.675
-set g_balance_nex_charge_velocity_rate 0.175
+set g_balance_nex_charge_velocity_rate 0.15
 set g_balance_nex_charge_minspeed 400
 set g_balance_nex_charge_maxspeed 1000
 // }}}

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 050a2915df005d8183456c873e5d9adfb720ccc2..2a0a24b19202b74ac1a0fbde01820dffcb45084e 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1968,3 +1968,7 @@ r_shadow_glossexact 1
 
 // use fake light if map has no lightmaps
 r_fakelight 1
+
+// strength sound settings
+set sv_strengthsound_antispam_time 0.1 "minimum distance of strength sounds"
+set sv_strengthsound_antispam_refire_threshold 0.04 "apply minimum distance only if refire of the gun is smaller than this"

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index f41620f7c0d567fd35c16200dee56128fc9c76b3..1d2117defffb0388fe023f9bf4ec7db3fd1ea6c0 100644 (file)
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -1335,7 +1335,7 @@ void SV_PlayerPhysics()
                float f;
                f = (xyspeed - cvar("g_balance_nex_charge_minspeed")) / (cvar("g_balance_nex_charge_maxspeed") - cvar("g_balance_nex_charge_minspeed"));
                // add the extra charge
-               self.nex_charge += cvar("g_balance_nex_charge_velocity_rate") * f * frametime;
+               self.nex_charge = min(1, self.nex_charge + cvar("g_balance_nex_charge_velocity_rate") * f * frametime);
        }
 :end
        if(self.flags & FL_ONGROUND)

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index c9a5dfc4aa1b9d61236355e94824506004053edb..9e1eedae0339cac49b07111f5f2a04beee7ee49c 100644 (file)
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -130,6 +130,8 @@ vector w_shotend;
 // this function calculates w_shotorg and w_shotdir based on the weapon model
 // offset, trueaim and antilag, and won't put w_shotorg inside a wall.
 // make sure you call makevectors first (FIXME?)
+.float prevstrengthsound;
+.float prevstrengthsoundattempt;
 void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector mi, vector ma, float antilag, float recoil, string snd, float maxdamage, float range)
 {
        float nudge = 1; // added to traceline target and subtracted from result
@@ -245,9 +247,18 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
                sound (ent, CHAN_WEAPON, snd, VOL_BASE, ATTN_NORM);
        }
 
-       if (ent.items & IT_STRENGTH)
-       if (!g_minstagib)
-               sound (ent, CHAN_AUTO, "weapons/strength_fire.wav", VOL_BASE, ATTN_NORM);
+       if(ent.items & IT_STRENGTH)
+       if(!g_minstagib)
+       if(
+               (time > ent.prevstrengthsound + cvar("sv_strengthsound_antispam_time"))
+               ||
+               (time > ent.prevstrengthsoundattempt + cvar("sv_strengthsound_antispam_refire_threshold"))
+       ) // prevent insane sound spam
+       {
+               sound(ent, CHAN_AUTO, "weapons/strength_fire.wav", VOL_BASE, ATTN_NORM);
+               ent.prevstrengthsound = time;
+       }
+       ent.prevstrengthsoundattempt = time;
 
        // nudge w_shotend so a trace to w_shotend hits
        w_shotend = w_shotend + normalize(w_shotend - w_shotorg) * nudge;

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index a50dc11fb9ecb36fc1dfb9a7e029e8d310a5d5a6..b30b2255df9dd28f3147ac26ee870b38736253c0 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -81,7 +81,7 @@ float w_nex(float req)
        }
        else if (req == WR_THINK)
        {
-               if(cvar("g_balance_nex_charge"))
+               if(cvar("g_balance_nex_charge") && self.nex_charge < cvar("g_balance_nex_charge_limit"))
                        self.nex_charge = min(1, self.nex_charge + cvar("g_balance_nex_charge_rate") * frametime / W_TICSPERFRAME);
                if (self.BUTTON_ATCK)
                {
@@ -95,7 +95,7 @@ float w_nex(float req)
                {
                        if(cvar("g_balance_nex_secondary_charge"))
                        {
-                               if(self.ammo_cells)
+                               if(self.ammo_cells && self.nex_charge < 1)
                                {
                                        self.nex_charge = min(1, self.nex_charge + cvar("g_balance_nex_secondary_charge_rate") * frametime / W_TICSPERFRAME);
                                        self.ammo_cells = max(0, self.ammo_cells - cvar("g_balance_nex_secondary_ammo") * frametime / W_TICSPERFRAME);