// Notification area (#4)
//
-void HUD_KillNotify(string s1, string s2, float deathtype)
+string Weapon_SuicideMessage(float id)
{
+ switch (id)
+ {
+ case 1:
+ return "lasered himself to hell";
+ case 2:
+ return "did the impossible";
+ case 3:
+ return "did the impossible";
+ case 4:
+ if(id & HITTYPE_SECONDARY)
+ return "tried out his own grenade";
+ return "detonated";
+ }
+ // TODO: was blasted by?
+ return strcat("[no kill message for weapon ", ftos(id), "!]");
+}
+string Weapon_KillMessage(float id)
+{
+ switch (id)
+ {
+ case 1:
+ return "was lasered to death by";
+ case 2:
+ return "was gunned by";
+ case 3:
+ if(id & HITTYPE_SECONDARY)
+ return "was sniped by";
+ return "was riddled full of holes by";
+ case 4:
+ if(id & HITTYPE_BOUNCE)
+ return "didn't see #'s grenade";
+ return "almost dodged #'s grenade";
+ }
+ return strcat("[no suicide message for weapon ", ftos(id), "!]");
+}
+void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
+{
+ if(msg == MSG_SUICIDE) {
+ float w;
+ string w_typestring;
+
+ w = DEATH_WEAPONOF(type);
+ // TODO: cl_gentle
+ // TODO: way of finding out secondary?
+ if(type == DEATH_WEAPON)
+ print("^1", s1, "^1 ", Weapon_SuicideMessage(stof(s3)), "\n");
+ else if (type == DEATH_KILL)
+ print ("^1",s1, "^1 couldn't take it anymore\n");
+ else if (type == DEATH_ROT)
+ print ("^1",s1, "^1 died\n");
+ else if (type == DEATH_NOAMMO)
+ print ("^7",s1, "^7 committed suicide. What's the point of living without ammo?\n");
+ else if (type == DEATH_CAMP)
+ print ("^1",s1, "^1 thought they found a nice camping ground\n");
+ else if (type == DEATH_MIRRORDAMAGE)
+ print ("^1",s1, "^1 didn't become friends with the Lord of Teamplay\n");
+ else if (type == DEATH_CHEAT)
+ print ("^1",s1, "^1 unfairly eliminated themself\n");
+ else if (type == DEATH_FIRE)
+ print ("^1",s1, "^1 burned to death\n");
+ else if (type != DEATH_TEAMCHANGE && type != DEATH_QUIET)
+ print ("^1",s1, "^1 couldn't resist the urge to self-destruct\n");
+ if (stof(s2) > 2) // killcount > 2
+ print ("^1",s1,"^1 ended it all after a ",s2," kill spree\n");
+ } else if(msg == MSG_KILL) {
+ if(type == KILL_TEAM || type == KILL_TEAM_SPREE) {
+ if(cvar("cl_gentle")) {
+ print ("^1", s1, "^1 took action against a team mate\n");
+ } else {
+ print ("^1", s1, "^1 mows down a team mate\n");
+ }
+ if (stof(s2) > 2 && type == KILL_TEAM_SPREE) {
+ if(cvar("cl_gentle"))
+ print ("^1",s1,"^1 ended a ",s2," scoring spree by going against a team mate\n");
+ else
+ print ("^1",s1,"^1 ended a ",s2," kill spree by killing a team mate\n");
+ }
+ else if (stof(s2) > 2) {
+ if(cvar("cl_gentle"))
+ print ("^1",s1,"'s ^1",s2," scoring spree was ended by a team mate!\n");
+ else
+ print ("^1",s1,"'s ^1",s2," kill spree was ended by a team mate!\n");
+ }
+ }
+ else if(type == KILL_FIRST_BLOOD)
+ print("^1",s1, "^1 drew first blood", "\n");
+ else if (type == DEATH_WEAPON)
+ print("^1", s1, "^1 ", Weapon_KillMessage(stof(s3)), "\n");
+ else if (type == DEATH_TELEFRAG)
+ print ("^1",s1, "^1 was telefragged by ", s2, "\n");
+ else if (type == DEATH_DROWN)
+ print ("^1",s1, "^1 was drowned by ", s2, "\n");
+ else if (type == DEATH_SLIME)
+ print ("^1",s1, "^1 was slimed by ", s2, "\n");
+ else if (type == DEATH_LAVA)
+ print ("^1",s1, "^1 was cooked by ", s2, "\n");
+ else if (type == DEATH_FALL)
+ print ("^1",s1, "^1 was grounded by ", s2, "\n");
+ else if (type == DEATH_SHOOTING_STAR)
+ print ("^1",s1, "^1 was shot into space by ", s2, "\n");
+ else if (type == DEATH_SWAMP)
+ print ("^1",s1, "^1 was conserved by ", s2, "\n");
+ // TODO
+ /*else if (type == DEATH_HURTTRIGGER && inflictor.msg2 != "")
+ {
+ print("^1", s1, "^1 ", s2, "^1", s3, "\n");
+ }*/
+ else if(type == DEATH_SBCRUSH)
+ print ("^1",s1, "^1 was crushed by ^1", s2, "\n");
+ else if(type == DEATH_SBMINIGUN)
+ print ("^1",s1, "^1 got shredded by ^1", s2, "\n");
+ else if(type == DEATH_SBROCKET)
+ print ("^1",s1, "^1 was blased to bits by ^1", s2, "\n");
+ else if(type == DEATH_SBBLOWUP)
+ print ("^1",s1, "^1 got cought in the destruction of ^1", s2, "'s vehicle\n");
+
+ else if(type == DEATH_WAKIGUN)
+ print ("^1",s1, "^1 was bolted down by ^1", s2, "\n");
+ else if(type == DEATH_WAKIROCKET)
+ print ("^1",s1, "^1 could find no shelter from ^1", s2, "'s rockets\n");
+ else if(type == DEATH_WAKIBLOWUP)
+ print ("^1",s1, "^1 dies when ^1", s2, "'s wakizashi dies.\n");
+
+ else if(type == DEATH_TURRET)
+ print ("^1",s1, "^1 was pushed into the line of fire by ^1", s2, "\n");
+ else if(type == DEATH_TOUCHEXPLODE)
+ print ("^1",s1, "^1 was pushed into an accident by ^1", s2, "\n");
+ else if(type == DEATH_CHEAT)
+ print ("^1",s1, "^1 was unfairly eliminated by ^1", s2, "\n");
+ else if (type == DEATH_FIRE)
+ print ("^1",s1, "^1 was burnt to death by ^1", s2, "\n");
+ else if (type == DEATH_CUSTOM)
+ print ("^1",s1, "^1 ", s2, "\n");
+ else
+ print ("^1",s1, "^1 was fragged by ", s2, "\n");
+ } else if(msg == MSG_SPREE) {
+ if(type == KILL_END_SPREE) {
+ if(cvar("cl_gentle"))
+ print ("^1",s1,"'s ^1", s2, " scoring spree was ended by ", s3, "\n");
+ else
+ print ("^1",s1,"'s ^1", s2, " kill spree was ended by ", s3, "\n");
+ } else if(type == KILL_SPREE) {
+ if(cvar("cl_gentle"))
+ print ("^1",s1,"^1 made ",s2," scores in a row\n");
+ else
+ print ("^1",s1,"^1 has ",s2," frags in a row\n");
+ } else if(type == KILL_SPREE_3) {
+ if(cvar("cl_gentle"))
+ print (s1,"^7 made a ^1TRIPLE SCORE\n");
+ else
+ print (s1,"^7 made a ^1TRIPLE FRAG\n");
+ } else if(type == KILL_SPREE_5) {
+ if(cvar("cl_gentle"))
+ print (s1,"^7 unleashes ^1SCORING RAGE\n");
+ else
+ print (s1,"^7 unleashes ^1RAGE\n");
+ } else if(type == KILL_SPREE_10) {
+ if(cvar("cl_gentle"))
+ print (s1,"^7 made ^1TEN SCORES IN A ROW!\n");
+ else
+ print (s1,"^7 starts the ^1MASSACRE!\n");
+ } else if(type == KILL_SPREE_15) {
+ if(cvar("cl_gentle"))
+ print (s1,"^7 made ^1FIFTEEN SCORES IN A ROW!\n");
+ else
+ print (s1,"^7 executes ^1MAYHEM!\n");
+ } else if(type == KILL_SPREE_20) {
+ if(cvar("cl_gentle"))
+ print (s1,"^7 made ^1TWENTY SCORES IN A ROW!\n");
+ else
+ print (s1,"^7 is a ^1BERSERKER!\n");
+ } else if(type == KILL_SPREE_25) {
+ if(cvar("cl_gentle"))
+ print (s1,"^7 made ^1TWENTY FIFE SCORES IN A ROW!\n");
+ else
+ print (s1,"^7 inflicts ^1CARNAGE!\n");
+ } else if(type == KILL_SPREE_30) {
+ if(cvar("cl_gentle"))
+ print (s1,"^7 made ^1THIRTY SCORES IN A ROW!\n");
+ else
+ print (s1,"^7 unleashes ^1ARMAGEDDON!\n");
+ }
+ } else if(msg == MSG_KILL_ACTION) { // wtf is this? isnt it basically the same as MSG_SUICIDE?
+ if (type == DEATH_DROWN) {
+ if(cvar("cl_gentle"))
+ print ("^1",s1, "^1 was in the water for too long\n");
+ else
+ print ("^1",s1, "^1 drowned\n");
+ }
+ else if (type == DEATH_SLIME)
+ print ("^1",s1, "^1 was slimed\n");
+ else if (type == DEATH_LAVA) {
+ if(cvar("cl_gentle"))
+ print ("^1",s1, "^1 found a hot place\n");
+ else
+ print ("^1",s1, "^1 turned into hot slag\n");
+ }
+ else if (type == DEATH_FALL) {
+ if(cvar("cl_gentle"))
+ print ("^1",s1, "^1 tested gravity (and it worked)\n");
+ else
+ print ("^1",s1, "^1 hit the ground with a crunch\n");
+ }
+ else if (type == DEATH_SHOOTING_STAR)
+ print ("^1",s1, "^1 became a shooting star\n");
+ else if (type == DEATH_SWAMP) {
+ if(cvar("cl_gentle"))
+ print ("^1",s1, "^1 discovered a swamp\n");
+ else
+ print ("^1",s1, "^1 is now conserved for centuries to come\n");
+ }
+ else if(type == DEATH_TURRET)
+ print ("^1",s1, "^1 was mowed down by a turret \n");
+ else if (type == DEATH_CUSTOM)
+ print ("^1",s1, "^1 ", s2, "\n");
+ else if(type == DEATH_TOUCHEXPLODE)
+ print ("^1",s1, "^1 died in an accident\n");
+ else if(type == DEATH_CHEAT)
+ print ("^1",s1, "^1 was unfairly eliminated\n");
+ else if(type == DEATH_FIRE) {
+ if(cvar("cl_gentle"))
+ print ("^1",s1, "^1 felt a little hot\n");
+ else
+ print ("^1",s1, "^1 burnt to death\n");
+ }
+ else {
+ if(cvar("cl_gentle"))
+ print ("^1",s1, "^1 needs a restart\n");
+ else
+ print ("^1",s1, "^1 died\n");
+ }
+ } else if(msg == MSG_KILL_ACTION_SPREE) {
+ if(cvar("cl_gentle"))
+ print ("^1",s1,"^1 needs a restart after a ",s2," scoring spree\n");
+ else
+ print ("^1",s1,"^1 died with a ",s2," kill spree\n");
+ }
}
#define DAMAGE_CENTERPRINT_SPACER NEWLINES
-void HUD_Centerprint(string s1, float deathtype)
+void HUD_Centerprint(string s1, float type)
{
- if (deathtype == DEATH_TEAMCHANGE) {
+ if (type == DEATH_TEAMCHANGE) {
centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You are now on: ", s1));
- } else if (deathtype == DEATH_AUTOTEAMCHANGE) {
+ } else if (type == DEATH_AUTOTEAMCHANGE) {
centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You have been moved into a different team to improve team balance\nYou are now on: ", s1));
- } else if (deathtype == DEATH_CAMP) {
+ } else if (type == DEATH_CAMP) {
if(cvar("cl_gentle"))
centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Reconsider your tactics, camper!"));
else
centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Die camper!"));
- } else if (deathtype == DEATH_NOAMMO) {
+ } else if (type == DEATH_NOAMMO) {
if(cvar("cl_gentle"))
centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You are reinserted into the game for running out of ammo..."));
else
centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were killed for running out of ammo..."));
- } else if (deathtype == DEATH_ROT) {
+ } else if (type == DEATH_ROT) {
if(cvar("cl_gentle"))
centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to preserve your health"));
else
centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You grew too old without taking your medicine"));
- } else if (deathtype == DEATH_MIRRORDAMAGE) {
+ } else if (type == DEATH_MIRRORDAMAGE) {
if(cvar("cl_gentle"))
centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't go against team mates!"));
else
centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't shoot your team mates!"));
- } else if (deathtype == DEATH_QUIET) {
+ } else if (type == DEATH_QUIET) {
// do nothing
- } else {
+ } else if (type == DEATH_KILL) {
if(cvar("cl_gentle"))
centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to be more careful!"));
else
centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You killed your own dumb self!"));
+ } else if (type == KILL_TEAM) {
+ if(cvar("cl_gentle")) {
+ centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against a team mate!"));
+ } else {
+ centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You fragged ", s1, ", a team mate!"));
+ }
}
}
GameLogEcho(s);
}
-void Send_KillNotification (string s1, string s2, float deathtype)
+void Send_KillNotification (string s1, string s2, string s3, float msg, float type)
{
WriteByte(MSG_ALL, SVC_TEMPENTITY);
WriteByte(MSG_ALL, TE_CSQC_NOTIFY);
WriteByte(MSG_ALL, CSQC_KILLNOTIFY);
WriteString(MSG_ALL, s1);
WriteString(MSG_ALL, s2);
- WriteByte(MSG_ALL, deathtype);
+ WriteString(MSG_ALL, s3);
+ WriteByte(MSG_ALL, msg);
+ WriteByte(MSG_ALL, type);
}
// TODO: writespectatable?
void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
{
string s, a, msg;
- float p, w;
+ float p, w, type;
if (targ.classname == "player" || targ.classname == "corpse")
{
if (targ.killcount > 2)
bprint ("^1",s,"^1 faded after a ",ftos(targ.killcount)," point spree\n");
} else {
- w = DEATH_WEAPONOF(deathtype);
- if(WEP_VALID(w))
- {
- w_deathtypestring = "couldn't resist the urge to self-destruct";
- w_deathtype = deathtype;
- weapon_action(w, WR_SUICIDEMESSAGE);
- bprint("^1", s, "^1 ", w_deathtypestring, "\n");
- }
else if (deathtype == DEATH_KILL)
bprint ("^1",s, "^1 couldn't take it anymore\n");
else if (deathtype == DEATH_ROT)
else if (deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
bprint ("^1",s, "^1 couldn't resist the urge to self-destruct\n");
- if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
- {
- LogDeath("suicide", deathtype, targ, targ);
- GiveFrags(attacker, targ, -1);
- }
- if (targ.killcount > 2)
bprint ("^1",s,"^1 ended it all after a ",ftos(targ.killcount)," kill spree\n");
}
*/
- Send_KillNotification(s, msg, deathtype);
+
+ w = DEATH_WEAPONOF(deathtype);
+ if(!(WEP_VALID(w)))
+ {
+ w = -1;
+ }
+
+ // TODO: wut is this?
+ // givefrags for logging apparently?
+ if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
+ {
+ LogDeath("suicide", deathtype, targ, targ);
+ GiveFrags(attacker, targ, -1);
+ }
+
+ if (targ.killcount > 2)
+ msg = ftos(targ.killcount);
+ Send_KillNotification(s, msg, ftos(w), deathtype, MSG_SUICIDE);
}
else if (attacker.classname == "player" || attacker.classname == "gib")
{
if(teams_matter && attacker.team == targ.team)
{
+ type = KILL_TEAM;
+ /*
if(sv_gentle) {
+ // TODO: the centerprint!
centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against a team mate!"));
bprint ("^1", a, "^1 took action against a team mate\n");
} else {
centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You fragged ", s, ", a team mate!"));
bprint ("^1", a, "^1 mows down a team mate\n");
}
+ */
GiveFrags(attacker, targ, -1);
+ /*
if (targ.killcount > 2) {
if(sv_gentle)
bprint ("^1",s,"'s ^1",ftos(targ.killcount)," scoring spree was ended by a team mate!\n");
else
bprint ("^1",a,"^1 ended a ",ftos(attacker.killcount)," kill spree by killing a team mate\n");
}
+ */
+
+ if (targ.killcount > 2) {
+ msg = ftos(targ.killcount);
+ a = s;
+ }
+ if (attacker.killcount > 2) {
+ msg = ftos(attacker.killcount);
+ type = KILL_TEAM_SPREE;
+ }
+
attacker.killcount = 0;
LogDeath("tk", deathtype, attacker, targ);
+ Send_CSQC_Centerprint(attacker, s, MSG_KILL);
+ Send_KillNotification(a, msg, "", type, MSG_KILL);
}
else
{
if (!checkrules_firstblood)
{
checkrules_firstblood = TRUE;
- if(sv_gentle)
- {
- bprint("^1",a, "^1 was the first to score", "\n");
- blood_message = "^1First point\n";
- //victim_message = "^1First victim\n"; // or First casualty
- }
- else
- {
- bprint("^1",a, "^1 drew first blood", "\n");
- blood_message = "^1First blood\n";
- victim_message = "^1First victim\n"; // or First casualty
- }
+ Send_KillNotification(a, "", "", KILL_FIRST_BLOOD, MSG_KILL);
+ //bprint("^1",a, "^1 drew first blood", "\n");
+ // TODO: make these print at newline if they dont
+ Send_CSQC_Centerprint(attacker, "", KILL_FIRST_BLOOD);
+ Send_CSQC_Centerprint(targ, "", KILL_FIRST_VICTIM);
+ //blood_message = "^1First blood\n";
+ //victim_message = "^1First victim\n"; // or First casualty
}
- if(sv_gentle > 0) {
- centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You scored against ^7", s, GetAdvancedDeathReports(targ)));
- centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, a,"^1 scored against you ^7", GetAdvancedDeathReports(attacker)));
+ //if(sv_gentle > 0) {
+ // centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You scored against ^7", s, GetAdvancedDeathReports(targ)));
+ // centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, a,"^1 scored against you ^7", GetAdvancedDeathReports(attacker)));
+
+ if((cvar("sv_fragmessage_information_typefrag")) && (targ.BUTTON_CHAT)) {
+ Send_CSQC_Centerprint(attacker, s, KILL_TYPEFRAG);
+ //centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^1You typefragged ^7", s, GetAdvancedDeathReports(targ)));
+ Send_CSQC_Centerprint(targ, a, KILL_TYPEFRAGGED);
+ //centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typefragged by ^7", a, GetAdvancedDeathReports(attacker)));
} else {
- if((cvar("sv_fragmessage_information_typefrag")) && (targ.BUTTON_CHAT)) {
- centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^1You typefragged ^7", s, GetAdvancedDeathReports(targ)));
- centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typefragged by ^7", a, GetAdvancedDeathReports(attacker)));
- } else {
- centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You fragged ^7", s, GetAdvancedDeathReports(targ)));
- centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were fragged by ^7", a, GetAdvancedDeathReports(attacker)));
- }
- attacker.taunt_soundtime = time + 1;
+ Send_CSQC_Centerprint(attacker, s, KILL_FRAG);
+ //centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You fragged ^7", s, GetAdvancedDeathReports(targ)));
+ Send_CSQC_Centerprint(targ, a, KILL_FRAGGED);
+ //centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were fragged by ^7", a, GetAdvancedDeathReports(attacker)));
}
+ attacker.taunt_soundtime = time + 1;
- if(sv_gentle) {
- bprint ("^1",s, "^1 needs a restart thanks to ", a, "\n");
- } else {
+ // TODO: more msg
+ //if(sv_gentle) {
+ // bprint ("^1",s, "^1 needs a restart thanks to ", a, "\n");
+ //} else {
+ /*
w = DEATH_WEAPONOF(deathtype);
if(WEP_VALID(w))
{
bprint ("^1",s, "^1 ", deathmessage, " by ^1", a, "\n");
else
bprint ("^1",s, "^1 was fragged by ", a, "\n");
- }
+ */
+
+ w = DEATH_WEAPONOF(deathtype);
+ if(!(WEP_VALID(w)))
+ {
+ w = -1;
+ }
+
+ msg = a;
+ if (deathtype == DEATH_CUSTOM)
+ msg = strcat(deathmessage, " by ^1", msg);
+ Send_KillNotification(s, msg, ftos(w), deathtype, MSG_KILL);
+ //}
if(g_ctf && targ.flagcarried)
{
GiveFrags(attacker, targ, 1);
if (targ.killcount > 2) {
+ /*
if(sv_gentle)
bprint ("^1",s,"'s ^1", ftos(targ.killcount), " scoring spree was ended by ", a, "\n");
else
bprint ("^1",s,"'s ^1", ftos(targ.killcount), " kill spree was ended by ", a, "\n");
+ */
+ Send_KillNotification(s, ftos(targ.killcount), a, KILL_END_SPREE, MSG_SPREE);
}
attacker.killcount = attacker.killcount + 1;
if (attacker.killcount > 2) {
+ /*
if(sv_gentle)
bprint ("^1",a,"^1 made ",ftos(attacker.killcount)," scores in a row\n");
else
bprint ("^1",a,"^1 has ",ftos(attacker.killcount)," frags in a row\n");
+ */
+ Send_KillNotification(a, ftos(attacker.killcount), "", KILL_SPREE, MSG_SPREE);
}
LogDeath("frag", deathtype, attacker, targ);
if (attacker.killcount == 3)
{
- if(sv_gentle) {
- bprint (a,"^7 made a ^1TRIPLE SCORE\n");
- } else {
- bprint (a,"^7 made a ^1TRIPLE FRAG\n");
- AnnounceTo(attacker, "03kills");
- }
+ //if(sv_gentle) {
+ // bprint (a,"^7 made a ^1TRIPLE SCORE\n");
+ //} else {
+ // bprint (a,"^7 made a ^1TRIPLE FRAG\n");
+ //
+ Send_KillNotification(a, "", "", KILL_SPREE_3, MSG_SPREE);
+ AnnounceTo(attacker, "03kills");
+
+ //}
}
else if (attacker.killcount == 5)
{
- if(sv_gentle) {
- bprint (a,"^7 unleashes ^1SCORING RAGE\n");
- } else {
- bprint (a,"^7 unleashes ^1RAGE\n");
- AnnounceTo(attacker, "05kills");
- }
+ //if(sv_gentle) {
+ // bprint (a,"^7 unleashes ^1SCORING RAGE\n");
+ //} else {
+ // bprint (a,"^7 unleashes ^1RAGE\n");
+ Send_KillNotification(a, "", "", KILL_SPREE_5, MSG_SPREE);
+ AnnounceTo(attacker, "05kills");
+ //}
}
else if (attacker.killcount == 10)
{
- if(sv_gentle) {
- bprint (a,"^7 made ^1TEN SCORES IN A ROW!\n");
- } else {
- bprint (a,"^7 starts the ^1MASSACRE!\n");
- AnnounceTo(attacker, "10kills");
- }
+ //if(sv_gentle) {
+ // bprint (a,"^7 made ^1TEN SCORES IN A ROW!\n");
+ //} else {
+ // bprint (a,"^7 starts the ^1MASSACRE!\n");
+ Send_KillNotification(a, "", "", KILL_SPREE_10, MSG_SPREE);
+ AnnounceTo(attacker, "10kills");
+ //}
}
else if (attacker.killcount == 15)
{
+ /*
if(sv_gentle) {
bprint (a,"^7 made ^1FIFTEEN SCORES IN A ROW!\n");
} else {
bprint (a,"^7 executes ^1MAYHEM!\n");
AnnounceTo(attacker, "15kills");
}
+ */
+ Send_KillNotification(a, "", "", KILL_SPREE_15, MSG_SPREE);
+ AnnounceTo(attacker, "15kills");
}
else if (attacker.killcount == 20)
{
+ /*
if(sv_gentle) {
bprint (a,"^7 made ^1TWENTY SCORES IN A ROW!\n");
} else {
bprint (a,"^7 is a ^1BERSERKER!\n");
AnnounceTo(attacker, "20kills");
}
+ */
+ Send_KillNotification(a, "", "", KILL_SPREE_20, MSG_SPREE);
+ AnnounceTo(attacker, "20kills");
}
else if (attacker.killcount == 25)
{
+ /*
if(sv_gentle) {
bprint (a,"^7 made ^1TWENTY FIFE SCORES IN A ROW!\n");
} else {
bprint (a,"^7 inflicts ^1CARNAGE!\n");
AnnounceTo(attacker, "25kills");
- }
+ }*/
+ Send_KillNotification(a, "", "", KILL_SPREE_25, MSG_SPREE);
+ AnnounceTo(attacker, "25kills");
}
else if (attacker.killcount == 30)
{
+ /*
if(sv_gentle) {
bprint (a,"^7 made ^1THIRTY SCORES IN A ROW!\n");
} else {
bprint (a,"^7 unleashes ^1ARMAGEDDON!\n");
AnnounceTo(attacker, "30kills");
}
+ */
+ Send_KillNotification(a, "", "", KILL_SPREE_30, MSG_SPREE);
+ AnnounceTo(attacker, "30kills");
}
}
}
else
{
- centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Watch your step!"));
+ //centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Watch your step!"));
+ Send_CSQC_Centerprint(targ, "", MSG_KILL_ACTION);
if (deathtype == DEATH_HURTTRIGGER && inflictor.message != "")
- bprint ("^1",s, "^1 ", inflictor.message, "\n");
- else if (deathtype == DEATH_DROWN)
+ msg = inflictor.message;
+ else if (deathtype == DEATH_CUSTOM)
+ msg = deathmessage;
+ //bprint ("^1",s, "^1 ", inflictor.message, "\n");
+ /*else if (deathtype == DEATH_DROWN)
if(sv_gentle)
bprint ("^1",s, "^1 was in the water for too long\n");
else
bprint ("^1",s, "^1 is now conserved for centuries to come\n");
else if(deathtype == DEATH_TURRET)
bprint ("^1",s, "^1 was mowed down by a turret \n");
- else if (deathtype == DEATH_CUSTOM)
- bprint ("^1",s, "^1 ", deathmessage, "\n");
+ else if (deathtype == DEATH_CUSTOM)
+ bprint ("^1",s, "^1 ", deathmessage, "\n");
else if(deathtype == DEATH_TOUCHEXPLODE)
bprint ("^1",s, "^1 died in an accident\n");
else if(deathtype == DEATH_CHEAT)
bprint ("^1",s, "^1 needs a restart\n");
else
bprint ("^1",s, "^1 died\n");
+ */
GiveFrags(targ, targ, -1);
if(PlayerScore_Add(targ, SP_SCORE, 0) == -5) {
AnnounceTo(targ, "botlike");
}
+ Send_KillNotification(s, msg, "", deathtype, MSG_KILL_ACTION);
if (targ.killcount > 2)
- if(sv_gentle)
- bprint ("^1",s,"^1 needs a restart after a ",ftos(targ.killcount)," scoring spree\n");
- else
- bprint ("^1",s,"^1 died with a ",ftos(targ.killcount)," kill spree\n");
+ Send_KillNotification(s, ftos(targ.killcount), "", 0, MSG_KILL_ACTION_SPREE);
+ //if(sv_gentle)
+ // bprint ("^1",s,"^1 needs a restart after a ",ftos(targ.killcount)," scoring spree\n");
+ //else
+ // bprint ("^1",s,"^1 died with a ",ftos(targ.killcount)," kill spree\n");
LogDeath("accident", deathtype, targ, targ);
}
projects / xonotic / xonotic-data.pk3dir.git / commitdiff