.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, "^1Furfag! You made a meal out of a team mate!"));\r
bprint ("^1", a, "^1 took action against a team mate\n");\r
} else {\r
- centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Furfag! You vored ", s, ", a team mate!"));\r
+ centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Furfag! You ate ", s, ", a team mate!"));\r
bprint ("^1", a, "^1 mows down a team mate\n");\r
}\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 typevored ^7", s, GetAdvancedDeathReports(targ)));\r
- centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typevored 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 vored ^7", s, GetAdvancedDeathReports(targ)));\r
- centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were vored by ^7", a, GetAdvancedDeathReports(attacker)));\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
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
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
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
+ {\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
+\r
// nullify damage if teamplay is on\r
if(deathtype != DEATH_TELEFRAG)\r
if(attacker.classname == "player")\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
// Savage: vampire mode\r
if (g_vampire)\r
if (time >= self.spawnshieldtime)\r
+ if (deathtype != DEATH_DIGESTION) // a different vampire system is used for this\r
{\r
attacker.health += damage;\r
}\r
projects / voretournament / voretournament.git / blobdiff