From: FruitieX Date: Fri, 15 Apr 2011 18:12:32 +0000 (+0300) Subject: cvar this behaviour X-Git-Tag: xonotic-v0.5.0~264^2^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ff8197dd5b6a83f66976c09e4f0a7bf75c32825;p=xonotic%2Fxonotic-data.pk3dir.git cvar this behaviour --- diff --git a/balance25.cfg b/balance25.cfg index 482edc142..63bfe62d8 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -262,6 +262,7 @@ set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim set g_balance_shotgun_secondary_melee_range 60 set g_balance_shotgun_secondary_melee_swing 50 set g_balance_shotgun_secondary_melee_time 0.1 +set g_balance_shotgun_secondary_melee_no_doubleslap 1 set g_balance_shotgun_secondary_damage 115 set g_balance_shotgun_secondary_force 150 set g_balance_shotgun_secondary_refire 1.1 diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index 7232f876c..41e0f66f8 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -262,6 +262,7 @@ set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim set g_balance_shotgun_secondary_melee_range 85 set g_balance_shotgun_secondary_melee_swing 50 set g_balance_shotgun_secondary_melee_time 0.1 +set g_balance_shotgun_secondary_melee_no_doubleslap 1 set g_balance_shotgun_secondary_damage 84 set g_balance_shotgun_secondary_force 147 set g_balance_shotgun_secondary_refire 1.1 diff --git a/balanceSamual.cfg b/balanceSamual.cfg index 4617606df..6a63638d9 100644 --- a/balanceSamual.cfg +++ b/balanceSamual.cfg @@ -262,6 +262,7 @@ set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim set g_balance_shotgun_secondary_melee_range 85 set g_balance_shotgun_secondary_melee_swing 50 set g_balance_shotgun_secondary_melee_time 0.1 +set g_balance_shotgun_secondary_melee_no_doubleslap 1 set g_balance_shotgun_secondary_damage 115 set g_balance_shotgun_secondary_force 150 set g_balance_shotgun_secondary_refire 1.1 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index 55dde194b..bfa62e034 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -262,6 +262,7 @@ set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim set g_balance_shotgun_secondary_melee_range 85 set g_balance_shotgun_secondary_melee_swing 50 set g_balance_shotgun_secondary_melee_time 0.1 +set g_balance_shotgun_secondary_melee_no_doubleslap 0 set g_balance_shotgun_secondary_damage 110 set g_balance_shotgun_secondary_force 150 set g_balance_shotgun_secondary_refire 1.1 diff --git a/balancetZork.cfg b/balancetZork.cfg index 72f938ba5..d966c5b67 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -262,6 +262,7 @@ set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim set g_balance_shotgun_secondary_melee_range 85 set g_balance_shotgun_secondary_melee_swing 50 set g_balance_shotgun_secondary_melee_time 0.1 +set g_balance_shotgun_secondary_melee_no_doubleslap 1 set g_balance_shotgun_secondary_damage 110 set g_balance_shotgun_secondary_force 150 set g_balance_shotgun_secondary_refire 1.1 diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index d5652b775..2f1978ee0 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -641,6 +641,7 @@ float autocvar_g_balance_shotgun_secondary_melee_delay; float autocvar_g_balance_shotgun_secondary_melee_range; float autocvar_g_balance_shotgun_secondary_melee_swing; float autocvar_g_balance_shotgun_secondary_melee_time; +float autocvar_g_balance_shotgun_secondary_melee_no_doubleslap; float autocvar_g_balance_shotgun_secondary_refire; float autocvar_g_balance_shotgun_reload_ammo; float autocvar_g_balance_shotgun_reload_time; diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index adcb7db4d..01fb50717 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -77,7 +77,7 @@ void shotgun_meleethink (void) Damage (trace_ent, self.owner, self.owner, autocvar_g_balance_shotgun_secondary_damage * min(1, f + 1), WEP_SHOTGUN | HITTYPE_SECONDARY , self.owner.origin + self.owner.view_ofs, force); remove(self); } - else if(time >= self.cnt + meleetime || self.owner.deadflag != DEAD_NO) // missed or owner died, remove ent + else if(time >= self.cnt + meleetime || self.owner.deadflag != DEAD_NO && autocvar_g_balance_shotgun_secondary_melee_no_doubleslap) // missed or owner died, remove ent remove(self); else // continue swinging the weapon in hope of hitting someone :) self.nextthink = time;