g_balance_grapplehook_damagedbycontents cvar

diff --git a/balance25.cfg b/balance25.cfg
index 017805c4e25fbe98c1f6ac3effebca39691cc14c..fe16d2de0273573972db91f4ed76295d71b74a19 100644 (file)
--- 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 86fb6b10b67524a6a6c0b3eccd5c1c0935c3d94f..b6d2985154bc972b3860069828fb57efdae5924e 100644 (file)
--- 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 345bc919a23398061e7eeba6dd1e0cfd14ddd537..4d9f8180a0f0efbdd752274e1d68a383e78d4bed 100644 (file)
--- 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 fda8de4dc609eccc36b6f1fcd09d0970a7cc7d26..c2bc31ac0757b5fbeb79314fc5cfdb1e2d97cb4a 100644 (file)
--- 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 d7dd843c8f91839565ec3676d7be5f033c242e39..865356c32e1c5766de2951e382d7f42b8041b866 100644 (file)
--- 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 8f0c3f015f169da0ea8376cbc29b56dd80fd8aa3..1e21a7c8a8c80aa5e3387223d9dc75538e6c7c8c 100644 (file)
--- 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 4f655ca5738220c1dc75da1c95849f347b2cef68..544d197cb7a14be203e2a0588e70dba145bfda0d 100644 (file)
--- 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;