Increase / decrease digestion damage and stomach kick damage based on the size of...

[voretournament/voretournament.git] / data / qcsrc / server / vore.qc

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 498376c413e5e3b991d03ad03541424a8effc767..e5157453c2e7229168e924fd4378f3facf67711e 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -231,7 +231,7 @@ void Vore_Swallow(entity e)
                        centerprint(e.predator, "^3You have swallowed a team mate, don't digest!");\r
        }\r
 \r
-       PlayerSound(e.predator, playersound_swallow, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
+       PlayerSound(e.predator, playersound_swallow, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
        setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
        e.predator.punchangle_x -= cvar("g_balance_vore_swallow_punchangle");\r
        e.predator.stomach_load += 1;\r
@@ -271,7 +271,7 @@ void Vore_Regurgitate(entity e)
        e.pusher = e.predator; // allows us to frag players by regurgitating them in deadly pits\r
        e.pushltime = time + cvar("g_maxpushtime");\r
 \r
-       PlayerSound(e.predator, playersound_regurgitate, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
+       PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
        setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
        pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1);\r
        e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle");\r
@@ -378,7 +378,14 @@ void Vore_Digest()
                else\r
                        reduce = 1;\r
 \r
-               Damage(self, self.predator, self.predator, cvar("g_balance_vore_digestion_damage") / reduce, DEATH_DIGESTION, self.origin, '0 0 0');\r
+               float damage;\r
+               damage = cvar("g_balance_vore_digestion_damage") / reduce;\r
+\r
+               // apply player scale to digestion damage\r
+               if(cvar("g_balance_vore_digestion_playerscale"))\r
+                       damage *= self.predator.scale;\r
+\r
+               Damage(self, self.predator, self.predator, damage, DEATH_DIGESTION, self.origin, '0 0 0');\r
                if(cvar("g_balance_vore_digestion_vampire") && self.predator.health < cvar("g_balance_vore_digestion_vampire_stable"))\r
                        self.predator.health += cvar("g_balance_vore_digestion_vampire") / reduce;\r
 \r
@@ -422,9 +429,18 @@ void Vore_StomachKick()
        if(time > self.stomachkick_delay)\r
        {\r
                float damage;\r
+               vector force;\r
                damage = ceil(random() * (cvar("g_balance_vore_kick_damage_max") - cvar("g_balance_vore_kick_damage_min")) + cvar("g_balance_vore_kick_damage_min"));\r
+               force = v_forward * cvar("g_balance_vore_kick_force");\r
+\r
+               // apply player scale to the damage / force of the kick\r
+               if(cvar("g_balance_vore_kick_playerscale"))\r
+               {\r
+                       damage *= self.scale;\r
+                       force *= self.scale;\r
+               }\r
 \r
-               Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, v_forward * cvar("g_balance_vore_kick_force"));\r
+               Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, force);\r
                sound(self.predator, CHAN_PROJECTILE, strcat("weapons/hit", ftos(floor(random() * 8)), ".wav"), VOL_BASE, ATTN_NORM);\r
                self.predator.punchangle_x -= cvar("g_balance_vore_kick_predator_punchangle");\r
                self.punchangle_x += cvar("g_balance_vore_kick_prey_punchangle");\r