{\r
// check if we can swallow a player instead of firing our weapon\r
\r
+ float swallow_range;\r
vector vore_w_shotorg, vore_w_shotdir;\r
- vore_w_shotorg = self.origin + self.view_ofs;\r
+\r
+ swallow_range = cvar("g_balance_vore_swallow_range");\r
+ if(self.scale) // we can swallow from further or closer based on our size\r
+ swallow_range *= self.scale;\r
+ vore_w_shotorg = self.origin;\r
vore_w_shotdir = v_forward;\r
\r
- WarpZone_traceline_antilag(self, vore_w_shotorg, vore_w_shotorg + vore_w_shotdir * cvar("g_balance_vore_swallow_range"), FALSE, self, ANTILAG_LATENCY(self));\r
+ WarpZone_traceline_antilag(self, vore_w_shotorg, vore_w_shotorg + vore_w_shotdir * swallow_range, FALSE, self, ANTILAG_LATENCY(self));\r
if(trace_fraction < 1)\r
if(trace_ent.classname == "player")\r
return trace_ent;\r
return FALSE;\r
}\r
\r
+ if(!cvar("g_vore_spawnshield"))\r
+ if(prey.spawnshieldtime > time)\r
+ {\r
+ if(time > self.complain_vore && self.BUTTON_ATCK)\r
+ {\r
+ play2(self, "misc/forbidden.wav");\r
+ sprint(self, "You cannot swallow someone protected by the spawn shield\n");\r
+ self.complain_vore = time + complain_delay_time;\r
+ }\r
+ return FALSE;\r
+ }\r
+\r
return TRUE;\r
}\r
return FALSE;\r
}\r
void Vore_CameraEffect_Apply()\r
{\r
- if(self.predator.classname != "player")\r
+ if not(self.predator.classname == "player" || self.fakeprey)\r
return;\r
\r
if(self.cvar_cl_vore_cameraspeed)\r
else\r
self.cameraeffect_current = self.cameraeffect_target;\r
\r
- self.view_ofs_z = PL_VIEW_OFS_z / self.cameraeffect_current;\r
+ self.view_ofs_z = PL_PREY_VIEW_OFS_z / self.cameraeffect_current;\r
+ if(self.predator.scale)\r
+ self.view_ofs_z *= self.predator.scale;\r
+ else if(self.fakepredator.scale)\r
+ self.view_ofs_z *= self.fakepredator.scale;\r
}\r
\r
.float gurgle_oldstomachload;\r
\r
PlayerSound(e.predator, playersound_swallow, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
- e.predator.punchangle_x -= e.predator.cvar_cl_vore_punchangle;\r
+ e.predator.punchangle_x -= cvar("g_balance_vore_swallow_punchangle");\r
e.predator.stomach_load += 1;\r
e.predator.regurgitate_prepare = 0;\r
e.predator.spawnshieldtime = 0; // lose spawn shield when we vore\r
PlayerSound(e.predator, playersound_regurgitate, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1);\r
- e.predator.punchangle_x += e.predator.cvar_cl_vore_punchangle;\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
\r
void Vore_PreyRelease(entity e, float pred_disconnect)\r
{\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
+ if(pred_disconnect)\r
{\r
- // if keepdeadprey is enabled and the predator disconnected, detach the dead prey\r
- if(pred_disconnect)\r
- {\r
- if(e.fakeprey)\r
- Vore_DeadPrey_Detach(e);\r
- }\r
+ if(e.fakeprey)\r
+ Vore_DeadPrey_Detach(e);\r
else\r
- Vore_DeadPrey_Configure(e);\r
+ Vore_Regurgitate(e);\r
}\r
else\r
- Vore_Regurgitate(e);\r
+ {\r
+ // if the keepdeadprey feature is on, don't spit a dead prey's carcass out\r
+ if(e.deadflag != DEAD_NO && random() < cvar("g_vore_keepdeadprey"))\r
+ Vore_DeadPrey_Configure(e);\r
+ else\r
+ Vore_Regurgitate(e);\r
+ }\r
}\r
\r
void Vore_Disconnect()\r
self.predator.digestion_step = time + steptime;\r
}\r
\r
- if(self.health <= 0)\r
+ if(self.deadflag != DEAD_NO)\r
if(stov(cvar_string("g_vore_regurgitatecolor_digest")))\r
self.colormod = stov(cvar_string("g_vore_regurgitatecolor_digest"));\r
}\r
\r
if(time > self.stomachkick_delay)\r
{\r
- float damage, force, rekick;\r
- entity e;\r
-\r
+ float damage;\r
damage = ceil(random() * (cvar("g_balance_vore_kick_damage_max") - cvar("g_balance_vore_kick_damage_min")) + cvar("g_balance_vore_kick_damage_min"));\r
- force = cvar("g_balance_vore_kick_force");\r
- rekick = time + cvar("g_balance_vore_kick_delay");\r
\r
- // if we still have a weapon, we use that to kick for more damage\r
- // stomach kicking with a weapon does nothing more than boosting existing damage\r
- if(self.weapon)\r
- {\r
- e = get_weaponinfo(self.weapon);\r
- damage += cvar(strcat("g_balance_", e.netname, "_melee_damage"));\r
- force += cvar(strcat("g_balance_", e.netname, "_melee_force"));\r
- rekick += cvar(strcat("g_balance_", e.netname, "_melee_refire"));\r
- if (!g_norecoil)\r
- self.punchangle_x -= cvar(strcat("g_balance_", e.netname, "_melee_recoil"));\r
- sound (self, CHAN_WEAPON, "weapons/grabber_melee.wav", VOL_BASE, ATTN_NORM);\r
- weapon_thinkf(WFRAME_FIRE2, rekick, w_ready); // only intended to animate the gun, as damage is calculated above\r
- }\r
-\r
- Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, v_forward * force);\r
+ Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, v_forward * cvar("g_balance_vore_kick_force"));\r
sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.wav", VOL_BASE, ATTN_NORM);\r
- self.predator.punchangle_x -= self.predator.cvar_cl_vore_kick_punchangle;\r
+ self.predator.punchangle_x -= cvar("g_balance_vore_kick_predator_punchangle");\r
+ self.punchangle_x += cvar("g_balance_vore_kick_prey_punchangle");\r
\r
if(random() < cvar("g_balance_vore_kick_escapeprobability"))\r
Vore_Regurgitate(self);\r
\r
- self.stomachkick_delay = rekick;\r
+ self.stomachkick_delay = time + cvar("g_balance_vore_kick_delay");\r
}\r
}\r
\r
self.colormod_z = 1;\r
}\r
\r
- // set all vore related stats\r
- if(self.predator.classname == "player")\r
+ // set all vore stats\r
+ if(self.fakeprey)\r
+ self.stat_eaten = num_for_edict(self.fakepredator);\r
+ else if(self.predator.classname == "player")\r
{\r
self.stat_stomachload = self.predator.stomach_load; // necessary for the stomach board\r
self.stat_digesting = self.predator.digesting; // necessary for the stomach board\r
// Code that addresses the prey:\r
// --------------------------------\r
\r
+ Vore_CameraEffect_Apply();\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
if(self.predator.classname != "player")\r
return;\r
\r
- if(self.deadflag)\r
+ if(self.deadflag != DEAD_NO)\r
{\r
Vore_PreyRelease(self, FALSE);\r
return;\r
}\r
\r
- if(self.predator.deadflag)\r
+ if(self.predator.deadflag != DEAD_NO)\r
Vore_Regurgitate(self);\r
else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))\r
Vore_Regurgitate(self);\r
if(self.BUTTON_JUMP)\r
Vore_StomachLeave();\r
\r
- Vore_CameraEffect_Apply();\r
+ // Ugly workaround for a Keyhunt issue. Your team's key can still be given to you while in the stomach\r
+ // (at round start), which is pretty ugly and wrong. So attempt to drop keys each frame for prey\r
+ kh_Key_DropAll(self, FALSE);\r
}
\ No newline at end of file
projects / voretournament / voretournament.git / blobdiff