From 94eb2eb2fc24f171796f878669b9f5649a7076c5 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 8 Jan 2014 15:17:31 +1100 Subject: [PATCH] Add a new cvar for offhand hook refire --- balance25.cfg | 1 + balanceFruitieX.cfg | 1 + balanceXDF.cfg | 1 + balanceXPM.cfg | 1 + balanceXonotic.cfg | 1 + qcsrc/server/autocvars.qh | 1 + qcsrc/server/g_hook.qc | 2 +- 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/balance25.cfg b/balance25.cfg index 557acfcc5..be0e84f3f 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -223,6 +223,7 @@ set g_balance_grapplehook_stretch 50 set g_balance_grapplehook_airfriction 0.2 set g_balance_grapplehook_health 130 set g_balance_grapplehook_damagedbycontents 0 +set g_balance_grapplehook_refire 0.2 // }}} // {{{ weapon properties diff --git a/balanceFruitieX.cfg b/balanceFruitieX.cfg index 102e8c735..99d458d1d 100644 --- a/balanceFruitieX.cfg +++ b/balanceFruitieX.cfg @@ -223,6 +223,7 @@ set g_balance_grapplehook_stretch 50 set g_balance_grapplehook_airfriction 0.2 set g_balance_grapplehook_health 130 set g_balance_grapplehook_damagedbycontents 0 +set g_balance_grapplehook_refire 0.2 // }}} // {{{ weapon properties diff --git a/balanceXDF.cfg b/balanceXDF.cfg index 662ab0457..41d193619 100644 --- a/balanceXDF.cfg +++ b/balanceXDF.cfg @@ -223,6 +223,7 @@ set g_balance_grapplehook_stretch 50 set g_balance_grapplehook_airfriction 0.2 set g_balance_grapplehook_health 130 set g_balance_grapplehook_damagedbycontents 0 +set g_balance_grapplehook_refire 0.2 // }}} // {{{ weapon properties diff --git a/balanceXPM.cfg b/balanceXPM.cfg index 87464e9f8..f560aee10 100644 --- a/balanceXPM.cfg +++ b/balanceXPM.cfg @@ -223,6 +223,7 @@ set g_balance_grapplehook_stretch 50 set g_balance_grapplehook_airfriction 0.2 set g_balance_grapplehook_health 50 set g_balance_grapplehook_damagedbycontents 1 +set g_balance_grapplehook_refire 0.2 // }}} // {{{ weapon properties diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index 6cf1b434f..198801547 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -223,6 +223,7 @@ set g_balance_grapplehook_stretch 50 set g_balance_grapplehook_airfriction 0.2 set g_balance_grapplehook_health 50 set g_balance_grapplehook_damagedbycontents 1 +set g_balance_grapplehook_refire 0.2 // }}} // {{{ weapon properties diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index ada0d4bda..46c9d9551 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -260,6 +260,7 @@ float autocvar_g_balance_grapplehook_speed_fly; float autocvar_g_balance_grapplehook_speed_pull; float autocvar_g_balance_grapplehook_stretch; float autocvar_g_balance_grapplehook_damagedbycontents; +float autocvar_g_balance_grapplehook_refire; float autocvar_g_balance_grenadelauncher_bouncefactor; float autocvar_g_balance_grenadelauncher_bouncestop; float autocvar_g_balance_grenadelauncher_primary_ammo; diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index b7828e521..4e1b63400 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -426,7 +426,7 @@ void GrapplingHookFrame() RemoveGrapplingHook(self); FireGrapplingHook(); self.hook_state &= ~HOOK_FIRING; - self.hook_refire = max(self.hook_refire, time + autocvar_g_balance_hook_primary_refire * W_WeaponRateFactor()); + self.hook_refire = max(self.hook_refire, time + autocvar_g_balance_grapplehook_refire * W_WeaponRateFactor()); } else if(self.hook_state & HOOK_REMOVING) { -- 2.39.2