e.vore_oldstomachload = e.stomach_load;\r
}\r
\r
+.entity pusher;\r
+.float pushltime;\r
void Vore_Swallow(entity e)\r
{\r
// this player is beening swallowed by another player, apply the proper changes\r
e.alpha = -1; // best way of hiding / showing the eaten player\r
e.aiment = e.eater; // follow the predator. Is automatically unset\r
\r
- Vore_CameraEffect_Set(e);\r
-\r
// drop keys (KH) and flags (CTF) when we get swallowed\r
kh_Key_DropAll(e, FALSE);\r
if(e.flagcarried)\r
DropFlag(e.flagcarried, world, e.eater);\r
\r
+ Vore_CameraEffect_Set(e);\r
+\r
if(stov(cvar_string("g_vore_regurgitatecolor_released")))\r
e.colormod = stov(cvar_string("g_vore_regurgitatecolor_released"));\r
\r
- if(e.eater.team == e.team && teamplay)\r
- centerprint(e.eater, "^4You have swallowed a team mate, use caution!");\r
+ if(e.team == e.eater.team && teamplay)\r
+ {\r
+ centerprint(e, "^3You have been swallowed by a team mate, don't kick!");\r
+ centerprint(e.eater, "^3You have swallowed a team mate, use caution!");\r
+ }\r
\r
PlayerSound(e.eater, playersound_swallow, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
setanim(e.eater, e.eater.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
v_right = oldright;\r
v_up = oldup;\r
\r
+ e.pusher = e.eater; // so we can frag players by regurgitating them in deadly pits\r
+ e.pushltime = time + cvar("g_maxpushtime");\r
+\r
PlayerSound(e.eater, playersound_regurgitate, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
setanim(e.eater, e.eater.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
pointparticles(particleeffectnum("regurgitate"), e.eater.origin, '0 0 0', 1);\r
e.eater.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
Vore_Weight_apply(e.eater);\r
\r
+ // block firing for a small amount of time when getting regurgitated, or we'll be firing the next frame\r
+ e.weapon_delay = time + button_delay;\r
e.system_delay = e.eater.system_delay = time + system_delay_time;\r
e.eater = world;\r
}\r
}\r
}\r
\r
+void Vore_StomachLeave()\r
+{\r
+ // allows players to get out of their predator at will in some circumstances, such as team mates\r
+\r
+ float canleave;\r
+ canleave = (teams_matter && self.team == self.eater.team); // currently, the only circumstance where you can use this if for team mates\r
+\r
+ if(canleave)\r
+ Vore_Regurgitate(self);\r
+ else if(time > self.complain_swallow)\r
+ {\r
+ play2(self, "weapons/unavailable.wav");\r
+ sprint(self, strcat("You can't willingly get out of ", self.eater.netname, "\n"));\r
+ self.complain_swallow = time + complain_delay;\r
+ }\r
+}\r
+\r
.float gurglesound_finished, gurglesound_oldstomachload;\r
void Vore_Gurglesound()\r
{\r
if(time > self.regurgitate_button_delay)\r
{\r
self.regurgitate_prepare = time + cvar("g_balance_vore_regurgitate_delay");\r
- PlayerSound(self, playersound_regurgitate_prepare, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
+ PlayerSound(self, playersound_regurgitate_prepare, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
self.regurgitate_button_delay = time + button_delay;\r
}\r
}\r
\r
if(self.BUTTON_ATCK)\r
Vore_StomachKick();\r
+ else if(self.BUTTON_ATCK2)\r
+ Vore_StomachLeave();\r
\r
Vore_CameraEffect_Apply();\r
}
\ No newline at end of file