const float system_delay_time = 0.1;\r
const float complain_delay_time = 1;\r
const float button_delay_time = 0.5;\r
-const float steptime = 0.1;\r
\r
entity Swallow_player_check()\r
{\r
.float gurgle_oldstomachload;\r
void Vore_GurgleSound()\r
{\r
- if(time > self.gurglesound_finished || self.gurgle_oldstomachload != self.stomach_load)\r
+ if(time > self.gurglesound_finished || (self.gurgle_oldstomachload != self.stomach_load && !self.digesting))\r
{\r
GlobalSound(self.playersound_gurgle, CHAN_TRIGGER, VOICETYPE_GURGLE);\r
\r
self.stomach_maxload = cvar("g_balance_vore_load_pred_capacity");\r
if(cvar("g_healthsize"))\r
self.stomach_maxload *= self.scale;\r
- self.stomach_maxload = floor(self.stomach_maxload);\r
+ self.stomach_maxload = ceil(self.stomach_maxload);\r
\r
self.stomach_load = 0; // start from zero\r
FOR_EACH_PLAYER(e)\r
prey_mass = cvar("g_balance_vore_load_prey_mass");\r
if(cvar("g_healthsize"))\r
prey_mass *= e.scale;\r
- self.stomach_load += floor(prey_mass);\r
+ self.stomach_load += ceil(prey_mass);\r
}\r
}\r
for(e = world; (e = find(e, classname, "consumable")); )\r
{\r
if(e.predator == self)\r
- self.stomach_load += floor(e.dmg);\r
+ self.stomach_load += ceil(e.dmg);\r
}\r
\r
// apply weight\r
if(head.predator == self)\r
Vore_Regurgitate(head);\r
}\r
- Vore_GurgleSound(); // stop the gurgling sound\r
\r
self.stomach_load = self.gravity = 0; // prevents a bug\r
+ Vore_GurgleSound(); // stop the gurgling sound\r
}\r
\r
.float digestion_step;\r
\r
damage_offset = 1;\r
if(cvar("g_balance_vore_digestion_distribute")) // apply distributed digestion damage\r
- damage_offset *= self.predator.stomach_load / self.predator.stomach_maxload;\r
+ damage_offset /= self.predator.stomach_load / self.predator.stomach_maxload;\r
if(cvar("g_healthsize") && cvar("g_balance_vore_digestion_scalediff")) // apply player scale to digestion damage\r
damage_offset *= pow(self.scale / self.predator.scale, cvar("g_balance_vore_digestion_scalediff"));\r
- damage_offset = ceil(damage_offset);\r
\r
- damage = cvar("g_balance_vore_digestion_damage") / damage_offset;\r
+ damage = ceil(cvar("g_balance_vore_digestion_damage") / damage_offset);\r
if(cvar("g_balance_vore_digestion_damage_death") && self.deadflag != DEAD_NO) // amplify digestion damage for dead prey\r
damage *= cvar("g_balance_vore_digestion_damage_death");\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 += damage * cvar("g_balance_vore_digestion_vampire");\r
-\r
- if (self.predator.digestsound_finished < time)\r
{\r
- PlayerSound (self.predator, playersound_digest, CHAN_PLAYER, VOICETYPE_PLAYERSOUND);\r
- self.predator.digestsound_finished = time + 0.5;\r
+ self.predator.health += damage * cvar("g_balance_vore_digestion_vampire");\r
+ self.predator.pauserothealth_finished = max(self.predator.pauserothealth_finished, time + cvar("g_balance_pause_health_rot"));\r
}\r
- self.digestion_step = time + steptime;\r
+\r
+ self.digestion_step = time + vore_steptime;\r
}\r
\r
if(stov(cvar_string("g_vore_regurgitatecolor_color_digest")))\r
if(time > self.teamheal_step)\r
{\r
self.health += cvar("g_balance_vore_teamheal");\r
- self.teamheal_step = time + steptime;\r
+ self.teamheal_step = time + vore_steptime;\r
\r
// play beep sound when a team mate was healed to the maximum amount, to both the prey and the predator\r
if(self.health >= cvar("g_balance_vore_teamheal_stable"))\r
// prevent this by checking if such has happened, and taking the proper measures\r
// this code has a high priority and must not be stopped by any delay, so run it here\r
if(self.predator.stat_eaten)\r
- {\r
- entity target_predator, target_predator_predator, oldself;\r
- target_predator = self.predator;\r
- target_predator_predator = self.predator.predator;\r
-\r
Vore_Regurgitate(self);\r
\r
- // now steal our prey's prey if this probability applies\r
- if(random() < cvar("g_balance_vore_swallow_stealprey"))\r
- {\r
- oldself = self;\r
- self = target_predator_predator;\r
- if(Swallow_condition_check(oldself))\r
- if not(teams_matter && self.team == target_predator.team) // don't steal a team mate's prey\r
- if not(teams_matter && self.team == oldself.team) // if the prey we would be stealing is a team mate, don't do it\r
- Vore_Swallow(oldself);\r
- self = oldself;\r
- }\r
- }\r
-\r
// the swallow progress of prey and preds idly decrease by this amount\r
if(cvar("g_balance_vore_swallow_speed_decrease"))\r
{\r
self.regurgitate_prepare = -1;\r
return;\r
}\r
- if(cvar("g_balance_vore_load_pred_speedcap") && self.stomach_load && vlen(self.velocity) >= cvar("g_balance_vore_load_pred_speedcap") / (self.stomach_load / self.stomach_maxload)) // predator's going too fast, gets sick and throws up\r
+ if(cvar("g_balance_vore_load_pred_speedcap") && self.stomach_load)\r
+ if(vlen(self.velocity) >= cvar("g_balance_vore_load_pred_speedcap") / (self.stomach_load / self.stomach_maxload)) // predator's going too fast, gets sick and throws up\r
{\r
self.regurgitate_prepare = -1;\r
return;\r
}\r
\r
+ if (self.digesting && self.digestsound_finished < time)\r
+ {\r
+ PlayerSound (self, playersound_digest, CHAN_PLAYER, VOICETYPE_PLAYERSOUND);\r
+ self.digestsound_finished = time + 0.5;\r
+ }\r
if(cvar("g_vore_gurglesound"))\r
Vore_GurgleSound();\r
\r
projects / voretournament / voretournament.git / blobdiff