.float teamkill_soundtime;\r
.entity teamkill_soundsource;\r
.entity pusher;\r
+\r
.float taunt_soundtime;\r
+.float taunt_soundtype;\r
\r
+void SetAutoTaunt(entity e, float t_soundtime, float t_soundtype)\r
+{\r
+ e.taunt_soundtime = t_soundtime;\r
+ e.taunt_soundtype = t_soundtype;\r
+}\r
\r
float IsDifferentTeam(entity a, entity b)\r
{\r
bprint ("^1",s, "^1 burned to death\n");\r
else if (deathtype == DEATH_DIGESTION)\r
bprint ("^1",s, "^1 was digested\n");\r
+ else if (deathtype == DEATH_REGURGITATION)\r
+ bprint ("^1",s, "^1 regurgitated to death\n");\r
else if (deathtype == DEATH_STOMACHKICK)\r
bprint ("^1",s, "^1 was ripped apart from the inside\n");\r
else if (deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)\r
centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You ate ^7", s, GetAdvancedDeathReports(targ)));\r
centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were eaten by ^7", a, GetAdvancedDeathReports(attacker)));\r
}\r
- attacker.taunt_soundtime = time + 1;\r
+ SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH);\r
+ portrait(attacker, targ);\r
}\r
}\r
else\r
centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You killed ^7", s, GetAdvancedDeathReports(targ)));\r
centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were killed by ^7", a, GetAdvancedDeathReports(attacker)));\r
}\r
- attacker.taunt_soundtime = time + 1;\r
+ SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH);\r
+ portrait(attacker, targ);\r
}\r
}\r
\r
bprint ("^1",s, "^1 was burnt to death by ^1", a, "\n");\r
else if (deathtype == DEATH_DIGESTION)\r
bprint ("^1",s, "^1 was digested by ^1", a, "\n");\r
+ else if (deathtype == DEATH_REGURGITATION)\r
+ bprint ("^1",s, "^1 regurgitated to death due to ^1", a, "\n");\r
else if (deathtype == DEATH_STOMACHKICK)\r
bprint ("^1",s, "^1 was ripped apart from the inside by ^1", a, "\n");\r
else if (deathtype == DEATH_CUSTOM)\r
LogDeath("accident", deathtype, targ, targ);\r
}\r
\r
+ // we lose all armor when we die\r
+ targ.armorvalue = 0;\r
+\r
targ.death_origin = targ.origin;\r
if(targ != attacker)\r
targ.killer_origin = attacker.origin;\r
if (attacker.isbot)\r
damage = damage * bound(0.1, (skill + 5) * 0.1, 1);\r
\r
+ // if a predator is taking damage, check if he should regurgitate his prey, based on the damage he took\r
+ if(cvar("g_balance_vore_escapeprobability"))\r
+ if(targ.stomach_load && random() < cvar("g_balance_vore_escapeprobability") * damage)\r
+ targ.regurgitate_prepare = -1;\r
+\r
// nullify damage if teamplay is on\r
if(deathtype != DEATH_TELEFRAG)\r
if(attacker.classname == "player")\r
attacker.teamkill_complain = time + 5;\r
attacker.teamkill_soundtime = time + 0.4;\r
attacker.teamkill_soundsource = targ;\r
+ portrait(targ, attacker);\r
}\r
}\r
}\r
}\r
+\r
+ // lean the player based on the amount of damage taken\r
+ if(cvar("g_leanplayer_damage"))\r
+ if(targ.classname == "player" && WEP_VALID(DEATH_WEAPONOF(deathtype))) // only for damage caused by weapons\r
+ {\r
+ targ.leanangle_damage_loc = hitloc - targ.origin;\r
+ targ.leanangle_damage_force += force * cvar("g_leanplayer_damage"); // keep existing force if any\r
+\r
+ // bound angles to the specified limit\r
+ targ.leanangle_damage_force_x = bound(-cvar("g_leanplayer_damage_max"), targ.leanangle_damage_force_x, cvar("g_leanplayer_damage_max"));\r
+ targ.leanangle_damage_force_y = bound(-cvar("g_leanplayer_damage_max"), targ.leanangle_damage_force_y, cvar("g_leanplayer_damage_max"));\r
+ targ.leanangle_damage_force_z = bound(-cvar("g_leanplayer_damage_max"), targ.leanangle_damage_force_z, cvar("g_leanplayer_damage_max"));\r
+ }\r
}\r
\r
// apply push\r