]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Grabber alt fire will also stun players, making it difficult for them to walk for...
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 2 Jan 2012 15:10:12 +0000 (17:10 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 2 Jan 2012 15:10:12 +0000 (17:10 +0200)
data/balanceVT.cfg
data/qcsrc/server/cl_physics.qc
data/qcsrc/server/defs.qh
data/qcsrc/server/w_grabber.qc
docs/Release notes.txt

index 29784c8978efab9ef0554b3e832f6d2f1a8c6fb5..bdcf77a8b168e11e30ec448279f49728c351a2a0 100644 (file)
@@ -183,6 +183,8 @@ set g_balance_grabber_secondary_refire 1.1
 set g_balance_grabber_secondary_animtime 1 // good melee anim\r
 set g_balance_grabber_secondary_damage 10\r
 set g_balance_grabber_secondary_armordamage 50\r
+set g_balance_grabber_secondary_stun_maxtime 3\r
+set g_balance_grabber_secondary_stun_rate 0.65\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
index 7f25bb205209c4e08c690c53030e05aef48c2c52..d03319591a4e856c85cd07170485a2b8033d6e61 100644 (file)
@@ -517,6 +517,8 @@ void PM_Accelerate(vector wishdir, float wishspeed, float wishspeed0, float acce
                        wishspeed *= 1 - (self.swallow_progress_prey * cvar("g_balance_vore_swallow_speed_cutspd_prey"));\r
                if(self.swallow_progress_pred) // cut speed based on swallow progress for preds\r
                        wishspeed *= 1 - (self.swallow_progress_pred * cvar("g_balance_vore_swallow_speed_cutspd_pred"));\r
+               if(self.grabber_stunned > time && random() <= cvar("g_balance_grabber_secondary_stun_rate")) // randomly cut speed while the player is stunned\r
+                       wishspeed = 0;\r
        }\r
 \r
        if(cvar("sv_gameplayfix_q2airaccelerate"))\r
index a401f69713c097bfbb9b93f902e28198ab8a0916..9862d2c2448027116ac514a25fb8295f3521b301 100644 (file)
@@ -625,6 +625,8 @@ float client_cefc_accumulatortime;
 .float old_clip_load;\r
 .float clip_size;\r
 \r
+.float grabber_stunned;\r
+\r
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE\r
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX\r
 \r
index 50beef714322dbc0d5c10fa66ac1cf3adb277636..dee920e4d1e2b767fd2f81cd90948ee06d50ec5d 100644 (file)
@@ -46,6 +46,7 @@ void W_Grabber_Attack2()
        {\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
+               trace_ent.grabber_stunned = time + cvar("g_balance_grabber_secondary_stun_maxtime") * random();\r
 \r
                pointparticles(particleeffectnum("grabber_impact2"), trace_endpos, '0 0 0', 1);\r
                if(trace_ent.classname == "player")\r
index 5e839cad90ab085a4104b5b2edcd1afd1cd83324..37bc1dc944b171e5378c1112fc88d0702f2f43b8 100644 (file)
@@ -280,6 +280,8 @@ Features:
 \r
 - Picking up health items no longer increases your health immediately. Health is now eaten and digested like players, and increase stomach load while carried. Players inside the stomach will also be able to see the food inside. Health items can also be thrown up at their existing consumption and eaten by other players, as unpleasant as the thought might sound to some :)\r
 \r
+- Grabber alt fire barely deals any damage now. However, it will heavily decrease the victim's armor, and also stun them (making it difficult to walk for a few seconds).\r
+\r
 - Helper system. A voice will talk in the background when the player is in a dangerous situation (similar to the suit in Half Life, which warns you when you're low on health).\r
 \r
 - Bootable subsystems. The crosshair, HUD, and helper voice will take 2 seconds to startup when the player spawns. Also, if armor (now considered charge) is below 5, you will not have enough energy to run your subsystems, and must wait for your armor to recharge.\r