}\r
\r
.float gurgle_oldstomachload;\r
-void Vore_Gurglesound()\r
+void Vore_GurgleSound()\r
{\r
if(time > self.gurglesound_finished || self.gurgle_oldstomachload != self.stomach_load)\r
{\r
}\r
}\r
\r
-void Vore_Weight_apply(entity e)\r
+void Vore_WeightApply(entity e)\r
{\r
// apply stomach weight that makes you heavier the more you eat\r
// slowing the player is done in cl_physics.qc\r
e.vore_oldstomachload = e.stomach_load;\r
}\r
\r
+void Vore_AutoDigest(entity e)\r
+{\r
+ // if the predator has the autodigest preference enabled, begin digesting new prey automatically\r
+\r
+ if(!cvar("g_vore_digestion") || e.digesting)\r
+ return;\r
+ if(!e.cvar_cl_vore_autodigest || clienttype(e) != CLIENTTYPE_REAL)\r
+ return; // this feature is only for players, not bots\r
+ if(e.stomach_load > 1)\r
+ return; // don't start digestion if we already ate someone, as that means we manually disabled it after the first prey and want it off\r
+\r
+ entity head;\r
+ if(teams_matter)\r
+ {\r
+ FOR_EACH_PLAYER(head)\r
+ {\r
+ // never begin automatic digestion if we've swallowed a team mate\r
+ if(head.predator == e && head.team == e.team)\r
+ return;\r
+ }\r
+ }\r
+\r
+ e.digesting = TRUE;\r
+}\r
+\r
.entity pusher;\r
.float pushltime;\r
void Vore_Swallow(entity e)\r
e.predator.stomach_load += 1;\r
e.predator.regurgitate_prepare = 0;\r
e.predator.spawnshieldtime = 0; // lose spawn shield when we vore\r
- Vore_Weight_apply(e.predator);\r
+ Vore_WeightApply(e.predator);\r
+ Vore_AutoDigest(e.predator);\r
\r
// block firing for a small amount of time, or we'll be firing the next frame after we swallow\r
e.predator.weapon_delay = time + button_delay_time;\r
e.predator.stomach_load -= 1;\r
e.predator.regurgitate_prepare = 0;\r
e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
- Vore_Weight_apply(e.predator);\r
+ Vore_WeightApply(e.predator);\r
\r
// block firing for a small amount of time, or we'll be firing the next frame\r
e.weapon_delay = time + button_delay_time;\r
\r
void Vore_DeadPrey_Configure(entity e)\r
{\r
- // ran when the fulldigest feature is enabled and prey stays inside the stomach after dying\r
+ // ran when the keepdeadprey feature is enabled and prey stays inside the stomach after dying\r
\r
- if(e.fakepredator.classname == "player" || e.predator.classname != "player") // already configured\r
+ if(e.fakeprey || e.predator.classname != "player") // already configured\r
return;\r
\r
// this entity is like e.predator but for dead prey, to avoid conflicts\r
e.fakepredator = e.predator;\r
+ e.fakeprey = TRUE;\r
\r
// first release the prey from the predator, as dead prey needs to be attached differently\r
// the predator's stomach load is also decreased, as dead prey doesn't count any more\r
e.predator.stomach_load -= 1;\r
- Vore_Weight_apply(e.predator);\r
+ Vore_WeightApply(e.predator);\r
e.predator = world;\r
\r
// now put our dead prey inside the predator's stomach, but only as an effect\r
\r
// completely remove the dead body\r
e.alpha = -1;\r
- setmodel(e, "");\r
}\r
\r
void Vore_DeadPrey_Detach(entity e)\r
// ran when dead prey must be detached from the stomach (eg: they are respawning)\r
// should only execute after Vore_DeadPrey_Configure has ran first\r
\r
- if not(cvar("g_vore_fulldigest"))\r
+ if not(cvar("g_vore_keepdeadprey"))\r
return;\r
\r
e.fakepredator = world;\r
e.aiment = world;\r
+\r
+ if(!e.deadflag)\r
+ e.fakeprey = FALSE;\r
}\r
\r
void Vore_PreyRelease(entity e)\r
{\r
- // if the fulldigest feature is on, don't spit a dead prey's carcass out\r
- if(e.health <= 0 && cvar("g_vore_fulldigest"))\r
+ // if the keepdeadprey feature is on, don't spit a dead prey's carcass out\r
+ if(e.health <= 0 && cvar("g_vore_keepdeadprey"))\r
{\r
Vore_DeadPrey_Configure(e);\r
\r
- // if fulldigest is enabled and the predator is dead or disconnected, detach the dead prey from him\r
- if(self.fakepredator.classname != "player" || self.fakepredator.deadflag != DEAD_NO)\r
- Vore_DeadPrey_Detach(self);\r
+ // if keepdeadprey is enabled and the predator disconnected, detach the dead prey\r
+ if(e.fakepredator.classname != "player")\r
+ Vore_DeadPrey_Detach(e);\r
}\r
else\r
Vore_Regurgitate(e);\r
if(head.predator == self)\r
Vore_PreyRelease(head);\r
}\r
- Vore_Gurglesound(); // stop the gurgling sound\r
+ Vore_GurgleSound(); // stop the gurgling sound\r
}\r
\r
self.stomach_load = self.gravity = 0; // prevents a bug\r
}\r
\r
if(cvar("g_vore_gurglesound"))\r
- Vore_Gurglesound();\r
+ Vore_GurgleSound();\r
\r
// --------------------------------\r
// Code that addresses the prey:\r
// --------------------------------\r
\r
+ // keepdeadprey - detach dead prey if their predator died or got swallowed\r
+ if(self.fakepredator.classname == "player")\r
+ if(self.fakepredator.deadflag != DEAD_NO || self.fakepredator.predator.classname == "player")\r
+ Vore_DeadPrey_Detach(self);\r
+\r
+ if(self.predator.classname != "player")\r
+ return;\r
+\r
if(self.deadflag)\r
{\r
Vore_PreyRelease(self);\r
return;\r
}\r
\r
- if(self.predator.classname != "player")\r
- return;\r
-\r
if(self.predator.deadflag)\r
Vore_Regurgitate(self);\r
else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))\r