.float regurgitate_prepare;\r
-.float stomachkick_delay, system_delay, swallow_delay, digest_button_delay_time, regurgitate_button_delay_time;\r
+.float stomachkick_delay, system_delay, action_delay, digest_button_delay_time, regurgitate_button_delay_time;\r
.float complain_vore;\r
.float vore_oldmovetype, vore_oldsolid, vore_oldstomachload;\r
\r
if(prey != self)\r
if(prey.classname == "player" && !prey.stat_eaten && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach\r
if(self.classname == "player" && !self.stat_eaten && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves\r
- if(!self.BUTTON_REGURGITATE && self.swallow_delay < time)\r
+ if(!self.BUTTON_REGURGITATE && self.action_delay < time)\r
if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))\r
{\r
string swallow_complain;\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.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
+ e.predator.action_delay = time + cvar("g_balance_vore_action_delay");\r
e.system_delay = e.predator.system_delay = time + system_delay_time;\r
e.stomachkick_delay = time + cvar("g_balance_vore_kick_delay"); // don't kick immediately after being swallowed\r
}\r
e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle");\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
+ e.predator.action_delay = time + cvar("g_balance_vore_action_delay");\r
Vore_WeightApply(e.predator);\r
\r
// block firing for a small amount of time, or we'll be firing the next frame\r
\r
void Vore_SetSbarRings()\r
{\r
- float min_time;\r
- if(self.swallow_delay > time)\r
+ if(self.action_delay > time)\r
{\r
- self.stat_sbring1_type = 1; // ring shows vore system delay\r
- min_time = self.swallow_delay - cvar("g_balance_vore_swallow_delay");\r
- self.stat_sbring1_clip = bound(0, (time / self.swallow_delay - 1) / (min_time / self.swallow_delay - 1), 1);\r
+ self.stat_sbring1_type = 1; // ring shows vore action delay\r
+ self.stat_sbring1_clip = bound(0, (time / self.action_delay - 1) / ((self.action_delay - cvar("g_balance_vore_action_delay")) / self.action_delay - 1), 1);\r
}\r
else\r
{\r
\r
// apply delayed regurgitating if it was scheduled\r
if(self.predator.regurgitate_prepare && time > self.predator.regurgitate_prepare)\r
+ if(time > self.predator.action_delay)\r
{\r
self.predator.regurgitate_prepare = 0;\r
self.predator.complain_vore = time + complain_delay_time; // prevent complaining the next frame if this empties our stomach\r