local float step;\r
step = self.cvar_cl_vore_cameraspeed * frametime;\r
\r
+ // not sure if these maths are good, as the effect should be smoother\r
if(self.cameraeffect_current >= self.cameraeffect_target + step)\r
self.cameraeffect_current -= step;\r
else if(self.cameraeffect_current <= self.cameraeffect_target - step)\r
e.vore_oldsolid = e.solid;\r
e.vore_oldview_ofs_z = e.view_ofs_z;\r
\r
+ e.eater = self;\r
setorigin(e, e.eater.origin);\r
e.velocity = '0 0 0';\r
e.movetype = MOVETYPE_FOLLOW;\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
- /*e.cameraeffect_current = e.view_ofs_z * 2;\r
- e.cameraeffect_target = e.view_ofs_z / 2; // best positioning for the stomach model*/\r
-\r
Vore_CameraEffect_Set(e);\r
\r
// drop keys (KH) and flags (CTF) when we get swallowed\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
+\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
+ setanim(e.eater, e.eater.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
e.eater.stomach_load += 1;\r
e.eater.regurgitate_prepare = 0;\r
Vore_Weight_apply(e.eater);\r
\r
+ // block firing for a small amount of time when voring, or we'll be firing the next frame after we swallow\r
+ e.eater.weapon_delay = time + button_delay;\r
+ e.eater.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
e.system_delay = e.eater.system_delay = time + system_delay_time;\r
}\r
\r
e.view_ofs_z = e.vore_oldview_ofs_z;\r
e.alpha = default_player_alpha; // best way of hiding / showing the eaten player\r
\r
- //e.view_ofs_z *= 2; // best positioning for the stomach model\r
-\r
// velocities\r
local vector oldforward, oldright, oldup;\r
oldforward = v_forward;\r
v_up = oldup;\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
+ 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.stomach_load -= 1;\r
e.eater.regurgitate_prepare = 0;\r
// prey disconnects or goes spectating while inside someone's belly:\r
if(self.eater.classname == "player")\r
{\r
- self.view_ofs_z += 25;\r
+ self.view_ofs_z = self.vore_oldview_ofs_z;\r
self.eater.stomach_load -= 1;\r
Vore_Weight_apply(self.eater);\r
self.eater = world;\r
.float stomachkick_delay;\r
void Vore_StomachKick()\r
{\r
- // allows prey to kick the predator's stomach and do some damage / attempt to escape, or bring the predator's digestion upon their self when there's no other option\r
+ // allows prey to kick the predator's stomach and do some damage or attempt to escape\r
if(self.eater.classname != "player")\r
return;\r
\r
- // kick the predator's stomach and do damage, or escape if we are lucky\r
- if(self.BUTTON_ATCK)\r
if(time > self.stomachkick_delay)\r
{\r
float damage;\r
\r
self.stomachkick_delay = time + cvar("g_balance_vore_kick_delay");\r
}\r
-\r
- // start the predator's digestion\r
- if(self.BUTTON_ATCK2)\r
- {\r
- centerprint(self.eater, strcat(self.netname, " has triggered your digestion"));\r
- self.eater.digesting = TRUE;\r
- }\r
}\r
\r
.float gurglesound_finished, gurglesound_oldstomachload;\r
// attempt to swallow our new prey if there's any in range\r
if(self.BUTTON_ATCK && !self.BUTTON_REGURGITATE && self.swallow_delay < time)\r
if(Swallow_condition_check(prey))\r
- {\r
- prey.eater = self;\r
Vore_Swallow(prey);\r
- self.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
-\r
- if(self.team == prey.team && teamplay)\r
- centerprint(self, "You have swallowed a team mate, use caution!");\r
-\r
- // block firing for a small amount of time when voring, or we'll be firing the next frame after we swallow\r
- self.weapon_delay = time + 0.25;\r
- }\r
\r
// start / stop digestion on command, if the player has someone in their stomach\r
if(self.BUTTON_DIGEST)\r
if(self.eater.deadflag || self.deadflag)\r
Vore_Regurgitate(self);\r
else if(self.eater.eater.classname == "player") // don't allow a player inside a player inside another player :)\r
+ {\r
+ entity targeteater, oldself;\r
+ targeteater = self.eater.eater;\r
+\r
Vore_Regurgitate(self);\r
+ if(random() < cvar("g_vore_stealprey"))\r
+ if(Swallow_condition_check(self))\r
+ {\r
+ oldself = self;\r
+ self = targeteater;\r
+ Vore_Swallow(oldself);\r
+ self = oldself;\r
+ }\r
+ }\r
else if(vlen(self.eater.velocity) > cvar("g_balance_vore_regurgitate_velocitylimit"))\r
Vore_Regurgitate(self);\r
\r
if(teams_matter && self.team == self.eater.team)\r
Vore_Teamheal();\r
\r
- Vore_StomachKick();\r
+ if(self.BUTTON_ATCK)\r
+ Vore_StomachKick();\r
\r
Vore_CameraEffect_Apply();\r
}
\ No newline at end of file
projects / voretournament / voretournament.git / blobdiff