From: MirceaKitsune Date: Tue, 19 Jul 2011 13:03:42 +0000 (+0300) Subject: Allow grabber secondary to be toggled X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e0aa4f2f8df14888f2d2a6bb291062ef970a28d4;p=voretournament%2Fvoretournament.git Allow grabber secondary to be toggled --- diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index 22446574..dbe24064 100644 --- a/data/balanceVT.cfg +++ b/data/balanceVT.cfg @@ -173,6 +173,7 @@ set g_balance_grabber_primary_grabbered_time_max 0 // infinite set g_balance_grabber_primary_grabbered_time_free 1 // 1s being grabbered are free set g_balance_grabber_primary_grabbered_fuel 5 // fuel per second grabbered set g_balance_grabber_primary_recoil 2.5 +set g_balance_grabber_secondary 1 set g_balance_grabber_secondary_ammo 15 set g_balance_grabber_secondary_refire 1.1 set g_balance_grabber_secondary_animtime 1 // good melee anim diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index cbd202b6..bd5f3431 100644 --- a/data/qcsrc/server/w_grabber.qc +++ b/data/qcsrc/server/w_grabber.qc @@ -81,7 +81,7 @@ float w_grabber(float req) // determine by distance if this will be primary fire or alternate fire W_SetupShot (self, TRUE, 0, "", 0); // do this to update w_shotorg WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), FALSE, self, ANTILAG_LATENCY(self)); - if(trace_fraction < 1 && !self.grabber) // not if hooked or firing the hook + if(cvar("g_balance_grabber_secondary") && trace_fraction < 1 && !self.grabber) // not if hooked or firing the hook self.stat_crosshair_style = 1; else self.stat_crosshair_style = 0;