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 a9a615e27987a55a36b0cd6b335a1dbe84875734..e5157453c2e7229168e924fd4378f3facf67711e 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -43,8 +43,8 @@ float Swallow_condition_check(entity prey)
                        swallow_complain = "You cannot swallow your team mates\n";\r
                else if(!cvar("g_vore_spawnshield") && prey.spawnshieldtime > time)\r
                        swallow_complain = "You cannot swallow someone protected by the spawn shield\n";\r
-               else if(self.stomach_load >= cvar("g_balance_vore_swallow_limit"))\r
-                       swallow_complain = strcat("You cannot swallow more than ^2", cvar_string("g_balance_vore_swallow_limit"), "^7 players at a time\n");\r
+               else if(self.stomach_load >= g_balance_vore_swallow_limit)\r
+                       swallow_complain = strcat("You cannot swallow more than ^2", ftos(g_balance_vore_swallow_limit), "^7 players at a time\n");\r
                else if(cvar("g_vore_biggergut") && prey.stomach_load > self.stomach_load)\r
                        swallow_complain = "You cannot swallow someone with a bigger stomach than yours\n";\r
                else if(cvar("g_vore_biggersize") && prey.scale > self.scale)\r
@@ -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
@@ -371,9 +371,23 @@ void Vore_Digest()
 \r
        if(time > self.digestion_step)\r
        {\r
-               Damage(self, self.predator, self.predator, cvar("g_balance_vore_digestion_damage"), DEATH_DIGESTION, self.origin, '0 0 0');\r
+               // if distributed digestion is enabled, reduce digestion strength by the number of prey in our stomach\r
+               float reduce;\r
+               if(cvar("g_balance_vore_digestion_distribute"))\r
+                       reduce = self.predator.stomach_load;\r
+               else\r
+                       reduce = 1;\r
+\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");\r
+                       self.predator.health += cvar("g_balance_vore_digestion_vampire") / reduce;\r
 \r
                if (self.predator.digestsound_finished < time)\r
                {\r
@@ -415,10 +429,19 @@ 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
-               sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.wav", VOL_BASE, ATTN_NORM);\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
 \r