.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
centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, a,"^1 made you their meal ^7", GetAdvancedDeathReports(attacker)));\r
} else {\r
if((cvar("sv_fragmessage_information_typefrag")) && (targ.BUTTON_CHAT)) {\r
- centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^1You typeate ^7", s, GetAdvancedDeathReports(targ)));\r
- centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typeeaten by ^7", a, GetAdvancedDeathReports(attacker)));\r
+ centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^1You type-ate ^7", s, GetAdvancedDeathReports(targ)));\r
+ centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were type-eaten by ^7", a, GetAdvancedDeathReports(attacker)));\r
} else {\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
}\r
}\r
else\r
centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, a,"^1 scored against you ^7", GetAdvancedDeathReports(attacker)));\r
} else {\r
if((cvar("sv_fragmessage_information_typefrag")) && (targ.BUTTON_CHAT)) {\r
- centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^1You typefragged ^7", s, GetAdvancedDeathReports(targ)));\r
- centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typefragged by ^7", a, GetAdvancedDeathReports(attacker)));\r
+ centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^1You type-ate ^7", s, GetAdvancedDeathReports(targ)));\r
+ centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were type-eaten by ^7", a, GetAdvancedDeathReports(attacker)));\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
}\r
}\r
\r
GiveFrags(attacker, targ, 0); // for logging\r
}\r
else\r
- GiveFrags(attacker, targ, 1);\r
+ {\r
+ if(cvar("g_vore_reversescoring") && deathtype == DEATH_DIGESTION) // reversed vore scoring\r
+ GiveFrags(targ, attacker, 1);\r
+ else\r
+ GiveFrags(attacker, targ, 1);\r
+ }\r
\r
if (targ.killcount > 2) {\r
if(sv_gentle)\r
{\r
if(deathtype != DEATH_FIRE)\r
attacker.typehitsound += 1;\r
- if(mirrordamage > 0)\r
- if(time > attacker.teamkill_complain)\r
- {\r
- attacker.teamkill_complain = time + 5;\r
- attacker.teamkill_soundtime = time + 0.4;\r
- attacker.teamkill_soundsource = targ;\r
- }\r
+ if(time > attacker.teamkill_complain)\r
+ {\r
+ attacker.teamkill_complain = time + 5;\r
+ attacker.teamkill_soundtime = time + 0.4;\r
+ attacker.teamkill_soundsource = targ;\r
+ }\r
}\r
}\r
}\r