From b31e2adf918ae05b13bcee6c6904485552cb7094 Mon Sep 17 00:00:00 2001 From: Samual Date: Wed, 28 Sep 2011 10:51:46 -0400 Subject: [PATCH] g_balance_grapplehook_damagedbycontents cvar --- balance25.cfg | 1 + balanceFruit.cfg | 1 + balanceLeeStricklin.cfg | 1 + balanceXonotic.cfg | 1 + balancetZork.cfg | 1 + qcsrc/server/autocvars.qh | 1 + qcsrc/server/g_hook.qc | 1 + 7 files changed, 7 insertions(+) diff --git a/balance25.cfg b/balance25.cfg index 017805c4e..fe16d2de0 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -214,6 +214,7 @@ set g_balance_grapplehook_length_min 50 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 // }}} // {{{ weapon properties diff --git a/balanceFruit.cfg b/balanceFruit.cfg index 86fb6b10b..b6d298515 100644 --- a/balanceFruit.cfg +++ b/balanceFruit.cfg @@ -214,6 +214,7 @@ set g_balance_grapplehook_length_min 50 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 // }}} // {{{ weapon properties diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index 345bc919a..4d9f8180a 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -214,6 +214,7 @@ set g_balance_grapplehook_length_min 50 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 // }}} // {{{ weapon properties diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index fda8de4dc..c2bc31ac0 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -214,6 +214,7 @@ set g_balance_grapplehook_length_min 50 set g_balance_grapplehook_stretch 50 set g_balance_grapplehook_airfriction 0.2 set g_balance_grapplehook_health 30 +set g_balance_grapplehook_damagedbycontents 1 // }}} // {{{ weapon properties diff --git a/balancetZork.cfg b/balancetZork.cfg index d7dd843c8..865356c32 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -215,6 +215,7 @@ set g_balance_grapplehook_length_min 50 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 // }}} // {{{ weapon properties diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 8f0c3f015..1e21a7c8a 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -285,6 +285,7 @@ float autocvar_g_balance_grapplehook_length_min; 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_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 4f655ca57..544d197cb 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -349,6 +349,7 @@ void FireGrapplingHook (void) missile.event_damage = GrapplingHook_Damage; missile.takedamage = DAMAGE_AIM; missile.damageforcescale = 0; + missile.damagedbycontents = (autocvar_g_balance_grapplehook_damagedbycontents); missile.hook_start = missile.hook_end = missile.origin; -- 2.39.2