Grabber secondary will do less damage, but heavily decrease the victim's armor now

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index b04e310ef60b48c423b6cb6d02de94bbd26a6d94..29784c8978efab9ef0554b3e832f6d2f1a8c6fb5 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -181,7 +181,8 @@ set g_balance_grabber_secondary 1
 set g_balance_grabber_secondary_ammo 15\r
 set g_balance_grabber_secondary_refire 1.1\r
 set g_balance_grabber_secondary_animtime 1 // good melee anim\r
-set g_balance_grabber_secondary_damage 60\r
+set g_balance_grabber_secondary_damage 10\r
+set g_balance_grabber_secondary_armordamage 50\r
 set g_balance_grabber_secondary_force 250\r
 set g_balance_grabber_secondary_radius 130\r
 set g_balance_grabber_secondary_recoil 5\r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index f738a1edbd4cdbbfdac136803f0af7b6fd9052ad..50beef714322dbc0d5c10fa66ac1cf3adb277636 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -45,6 +45,8 @@ void W_Grabber_Attack2()
        if(trace_fraction < 1) // should always be true, but just in case\r
        {\r
                Damage(trace_ent, self, self, cvar("g_balance_grabber_secondary_damage"), WEP_GRABBER | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_grabber_secondary_force") * w_shotdir);\r
+               trace_ent.armorvalue = bound(0, trace_ent.armorvalue - cvar("g_balance_grabber_secondary_armordamage"), cvar("g_balance_armor_limit"));\r
+\r
                pointparticles(particleeffectnum("grabber_impact2"), trace_endpos, '0 0 0', 1);\r
                if(trace_ent.classname == "player")\r
                        sound (self, CHAN_PROJECTILE, "weapons/grabber_impact2_player.wav", VOL_BASE, ATTN_NORM);\r