vector vore_w_shotorg, vore_w_shotdir;\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
+ if(cvar("g_healthsize")) // 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
\r
// properties that should update whenever possible, but when the predator is not available\r
- self.alpha = self.owner.cvar_cl_vore_stomachmodel;\r
+ self.alpha = self.owner.cvar_cl_vore_swallowmodel;\r
self.nextthink = time;\r
}\r
\r
// apply the properties of the prey\r
prey.swallow_model.viewmodelforclient = prey; // use the same system as the weapon model\r
//prey.swallow_model.effects |= EF_NOGUNBOB; // let it bob\r
+ prey.swallow_model.effects |= EF_NODEPTHTEST; // don't hide behind walls\r
prey.swallow_model.colormap = prey.colormap; // pants and shirt color\r
prey.swallow_model.glowmod = prey.glowmod; // glow color\r
\r
e.predator.stomach_load += 1;\r
e.predator.regurgitate_prepare = 0;\r
e.predator.spawnshieldtime = 0; // lose spawn shield when we vore\r
+ e.predator.hitsound += 1; // play this for team mates too, as we could be swallowing them to heal them\r
Vore_WeightApply(e.predator);\r
Vore_AutoDigest(e.predator);\r
\r
{\r
float fill;\r
fill = cvar("g_balance_vore_swallow_speed_fill") * frametime;\r
- if(cvar("g_balance_vore_swallow_speed_fill_scalediff")) // fill rate depends on predator size compared to prey size\r
- fill *= (self.scale / e.scale);\r
+ if(cvar("g_healthsize") && cvar("g_balance_vore_swallow_speed_fill_scalediff")) // fill rate depends on predator size compared to prey size\r
+ fill *= pow(self.scale / e.scale, cvar("g_balance_vore_swallow_speed_fill_scalediff"));\r
if(cvar("g_balance_vore_swallow_speed_fill_stomachload") && e.stomach_load) // fill rate is influenced by the prey's stomach load\r
fill /= e.stomach_load;\r
\r
Vore_SwallowModel_Update(e, e.predator);\r
}\r
\r
+ // apply regurgitation damage to the predator\r
+ if(cvar("g_balance_vore_regurgitate_damage"))\r
+ {\r
+ float regurgitate_dmg;\r
+ regurgitate_dmg = cvar("g_balance_vore_regurgitate_damage");\r
+ if(cvar("g_healthsize"))\r
+ regurgitate_dmg *= e.scale / e.predator.scale;\r
+ Damage(e.predator, e.predator, e.predator, regurgitate_dmg, DEATH_REGURGITATION, e.predator.origin, '0 0 0');\r
+ }\r
+\r
PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, 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
+ pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', 1);\r
e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle");\r
e.predator.stomach_load -= 1;\r
e.predator.regurgitate_prepare = 0;\r
damage = cvar("g_balance_vore_digestion_damage") / reduce;\r
\r
// apply player scale to digestion damage\r
- if(cvar("g_balance_vore_digestion_scalediff"))\r
- damage *= (self.predator.scale / self.scale);\r
+ if(cvar("g_healthsize") && cvar("g_balance_vore_digestion_scalediff"))\r
+ damage *= pow(self.predator.scale / self.scale, cvar("g_balance_vore_digestion_scalediff"));\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
}\r
}\r
\r
+.float kick_pressed;\r
void Vore_StomachKick()\r
{\r
// allows prey to kick the predator's stomach and do some damage or attempt to escape\r
\r
- if(time > self.stomachkick_delay)\r
+ if(time > self.stomachkick_delay && !self.kick_pressed)\r
{\r
- float damage;\r
+ float damage, vol;\r
vector force;\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 = v_forward * cvar("g_balance_vore_kick_force");\r
+ vol = VOL_BASE;\r
\r
// apply player scale to the damage / force of the kick\r
- if(cvar("g_balance_vore_kick_scalediff"))\r
+ if(cvar("g_healthsize") && cvar("g_balance_vore_kick_scalediff"))\r
{\r
- damage *= (self.scale / self.predator.scale);\r
- force *= (self.scale / self.predator.scale);\r
+ damage *= pow(self.scale / self.predator.scale, cvar("g_balance_vore_kick_scalediff"));\r
+ force *= pow(self.scale / self.predator.scale, cvar("g_balance_vore_kick_scalediff"));\r
+ vol *= pow(self.scale / self.predator.scale, cvar("g_balance_vore_kick_scalediff")); // kick sound volume based on the same scale\r
}\r
+ vol = bound(0, vol, 1);\r
\r
Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, force);\r
- sound(self.predator, CHAN_PROJECTILE, strcat("weapons/hit", ftos(floor(random() * 8)), ".wav"), VOL_BASE, ATTN_NORM);\r
+ sound(self.predator, CHAN_PROJECTILE, strcat("weapons/hit", ftos(floor(random() * 8)), ".wav"), vol, ATTN_NORM);\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
self.predator.regurgitate_prepare = 0;\r
\r
self.stomachkick_delay = time + cvar("g_balance_vore_kick_delay");\r
+ if(cvar("g_balance_vore_kick_repress"))\r
+ if not(clienttype(self) == CLIENTTYPE_BOT) // not for bots, to prevent an issue\r
+ self.kick_pressed = TRUE;\r
}\r
}\r
\r
{\r
// main vore code, this is where it all happens\r
\r
- if(!cvar("g_vore")) // the vore system is disabled\r
- {\r
- Vore_Disconnect();\r
- return;\r
- }\r
-\r
Vore_AutoTaunt();\r
\r
// wash the goo away from players once they leave the stomach\r
}\r
\r
// apply delays and skip the vore system under some circumstances\r
+ if(!cvar("g_vore")) // the vore system is disabled\r
+ {\r
+ Vore_Disconnect();\r
+ return;\r
+ }\r
if(time < game_starttime || (time < warmup && !inWarmupStage)) // don't allow vore before a round begins\r
{\r
Vore_Disconnect();\r
Vore_Teamheal();\r
\r
// execute prey commands\r
- if(self.BUTTON_ATCK && cvar("g_vore_kick"))\r
- Vore_StomachKick();\r
+ if(self.BUTTON_ATCK)\r
+ {\r
+ if(cvar("g_vore_kick"))\r
+ Vore_StomachKick();\r
+ }\r
+ else\r
+ self.kick_pressed = FALSE;\r
if(self.BUTTON_JUMP)\r
Vore_StomachLeave();\r
\r
projects / voretournament / voretournament.git / blobdiff