}\r
SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH);\r
}\r
+ portrait(attacker, targ);\r
}\r
else\r
{\r
}\r
SetAutoTaunt(attacker, time + 1, TAUNTTYPE_DEATH);\r
}\r
+ portrait(attacker, targ);\r
}\r
\r
if(sv_gentle) {\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
\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
- {\r
- entity e;\r
- FOR_EACH_PLAYER(e)\r
- {\r
- if(e.predator != world && e.predator == targ)\r
- if(random() < cvar("g_balance_vore_escapeprobability") * damage)\r
- Vore_Regurgitate(e);\r
- }\r
- }\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
{\r
teamdamage0 = max(attacker.dmg_team, cvar("g_teamdamage_threshold"));\r
attacker.dmg_team = attacker.dmg_team + damage;\r
- if(attacker.dmg_team > teamdamage0 && !g_ca)\r
+ if(attacker.dmg_team > teamdamage0 && !g_ca && deathtype != DEATH_REGURGITATION)\r
mirrordamage = cvar("g_mirrordamage") * (attacker.dmg_team - teamdamage0);\r
mirrorforce = cvar("g_mirrordamage") * vlen(force);\r
if(g_ca)\r
force = force * cvar("g_ctf_flagcarrier_selfforce");\r
}\r
\r
+ // skill-based damage offset for bots\r
+ if(skill && cvar("skill_offset"))\r
+ {\r
+ float ofs;\r
+ ofs = pow(skill / cvar("skill_offset_center"), cvar("skill_offset"));\r
+ if(clienttype(attacker) == CLIENTTYPE_BOT)\r
+ damage *= ofs;\r
+ if(clienttype(targ) == CLIENTTYPE_BOT)\r
+ damage /= ofs;\r
+ }\r
+\r
// count the damage\r
if(attacker)\r
if(!targ.deadflag)\r
}\r
}\r
}\r
- else\r
+ else if(deathtype != DEATH_REGURGITATION)\r
{\r
if(deathtype != DEATH_FIRE)\r
attacker.typehitsound += 1;\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