X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=56cac627f5c7e7be76a72e57567f663fc005b7b3;hb=0ded465b923f9e51db5bf62c271488e64e2a3f2c;hp=e779ff45357bce54c3907b5aced103c70b308738;hpb=64d58e3d7b97cf1c2e27628107dd3876f82f9992;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index e779ff453..56cac627f 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -120,10 +120,6 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 
 	PlayerScore_Add(targ, SP_DEATHS, 1);
 
-	if(g_arena || g_ca)
-		if(autocvar_g_arena_roundbased)
-			return;
-
 	if(targ != attacker) // not for suicides
 	if(g_weaponarena_random)
 	{
@@ -186,28 +182,6 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 	else
 	{
 		self = oldself;
-		if(g_runematch)
-		{
-			f = RunematchHandleFrags(attacker, targ, f);
-		}
-		else if(g_lms)
-		{
-			// remove a life
-			float tl;
-			tl = PlayerScore_Add(targ, SP_LMS_LIVES, -1);
-			if(tl < lms_lowest_lives)
-				lms_lowest_lives = tl;
-			if(tl <= 0)
-			{
-				if(!lms_next_place)
-					lms_next_place = player_count;
-				else
-					lms_next_place = min(lms_next_place, player_count);
-				PlayerScore_Add(targ, SP_LMS_RANK, lms_next_place); // won't ever spawn again
-				--lms_next_place;
-			}
-			f = 0;
-		}
 	}
 
 	attacker.totalfrags += f;
@@ -216,44 +190,6 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 		UpdateFrags(attacker, f);
 }
 
-string Obituary_ExtraFragInfo(entity player) // Extra fragmessage information
-{
-	string health_output = string_null;
-	string ping_output = string_null;
-	string handicap_output = string_null;
-	string output = string_null;
-
-	if(autocvar_sv_fraginfo && ((autocvar_sv_fraginfo == 2) || inWarmupStage))
-	{
-		// health/armor of attacker (person who killed you)
-		if(autocvar_sv_fraginfo_stats && (player.health >= 1))
-			health_output = strcat("^7(Health ^1", ftos(rint(player.health)), "^7 / Armor ^2", ftos(rint(player.armorvalue)), "^7)");
-		
-		// ping display
-		if(autocvar_sv_fraginfo_ping)
-			ping_output = ((clienttype(player) == CLIENTTYPE_BOT) ? "^2Bot" : strcat("Ping ", ((player.ping >= 150) ? "^1" : "^2"), ftos(rint(player.ping)), "ms"));
-			
-		// handicap display 
-		if(autocvar_sv_fraginfo_handicap) 
-		{
-			if(autocvar_sv_fraginfo_handicap == 2)	
-				handicap_output = strcat(output, strcat("Handicap ^2", ((player.cvar_cl_handicap <= 1) ? "Off" : ftos(rint(player.cvar_cl_handicap)))));
-			else if(player.cvar_cl_handicap) // with _handicap 1, only show this if there actually is a handicap enabled.	
-				handicap_output = strcat("Handicap ^2", ftos(rint(player.cvar_cl_handicap)));
-		}
-		
-		// format the string
-		output = strcat(health_output, (health_output ? ((ping_output || handicap_output) ? " ^7(" : "") : ((ping_output || handicap_output) ? "^7(" : "")), 
-			ping_output, (handicap_output ? "^7 / " : ""), 
-			handicap_output, ((ping_output || handicap_output) ? "^7)" : ""));
-		
-		// add new line to the beginning if there is a message
-		if(output) { output = strcat("\n", output); }
-	}
-	
-	return output;
-}
-
 string AppendItemcodes(string s, entity player)
 {
 	float w;
@@ -273,8 +209,6 @@ string AppendItemcodes(string s, entity player)
 		s = strcat(s, "T");
 	if(player.kh_next)
 		s = strcat(s, "K");
-	if(player.runes)
-		s = strcat(s, "|", ftos(player.runes));
 	return s;
 }
 
@@ -286,7 +220,7 @@ void LogDeath(string mode, float deathtype, entity killer, entity killed)
 	s = strcat(":kill:", mode);
 	s = strcat(s, ":", ftos(killer.playerid));
 	s = strcat(s, ":", ftos(killed.playerid));
-	s = strcat(s, ":type=", ftos(deathtype));
+	s = strcat(s, ":type=", Deathtype_Name(deathtype));
 	s = strcat(s, ":items=");
 	s = AppendItemcodes(s, killer);
 	if(killed != killer)
@@ -297,224 +231,379 @@ void LogDeath(string mode, float deathtype, entity killer, entity killed)
 	GameLogEcho(s);
 }
 
-void Send_KillNotification (string s1, string s2, string s3, float msg, float type)
+void Obituary_SpecialDeath(
+	entity notif_target,
+	float murder,
+	float deathtype,
+	string s1, string s2, string s3,
+	float f1, float f2, float f3)
 {
-	WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);
-	WriteByte(MSG_BROADCAST, TE_CSQC_KILLNOTIFY);
-	WriteString(MSG_BROADCAST, s1);
-	WriteString(MSG_BROADCAST, s2);
-	WriteString(MSG_BROADCAST, s3);
-	WriteShort(MSG_BROADCAST, msg);
-	WriteByte(MSG_BROADCAST, type);
+	if(DEATH_ISSPECIAL(deathtype))
+	{
+		entity deathent = deathtypes[(deathtype - DT_FIRST)];
+		if not(deathent) { backtrace("Obituary_SpecialDeath: Could not find deathtype entity!\n"); return; }
+
+		if(murder)
+		{
+			if(deathent.death_msgmurder)
+			{
+				Send_Notification_WOVA(
+					NOTIF_ONE,
+					notif_target,
+					MSG_MULTI,
+					deathent.death_msgmurder.nent_id,
+					s1, s2, s3, "",
+					f1, f2, f3, 0
+				);
+				Send_Notification_WOVA(
+					NOTIF_ALL_EXCEPT,
+					notif_target,
+					MSG_INFO,
+					deathent.death_msgmurder.nent_msginfo.nent_id,
+					s1, s2, s3, "",
+					f1, f2, f3, 0
+				);
+			}
+		}
+		else
+		{
+			if(deathent.death_msgself)
+			{
+				Send_Notification_WOVA(
+					NOTIF_ONE,
+					notif_target,
+					MSG_MULTI,
+					deathent.death_msgself.nent_id,
+					s1, s2, s3, "",
+					f1, f2, f3, 0
+				);
+				Send_Notification_WOVA(
+					NOTIF_ALL_EXCEPT,
+					notif_target,
+					MSG_INFO,
+					deathent.death_msgself.nent_msginfo.nent_id,
+					s1, s2, s3, "",
+					f1, f2, f3, 0
+				);
+			}
+		}
+	}
+	else { backtrace("Obituary_SpecialDeath called without a special deathtype?\n"); return; }
 }
 
-// Function is used to send a generic centerprint whose content CSQC gets to decide (gentle version or not in the below cases)
-void Send_CSQC_KillCenterprint(entity e, string s1, string s2, float msg, float type)
+float w_deathtype;
+float Obituary_WeaponDeath(
+	entity notif_target,
+	float murder,
+	float deathtype,
+	string s1, string s2, string s3,
+	float f1, float f2)
 {
-	if (clienttype(e) == CLIENTTYPE_REAL)
+	float death_weapon = DEATH_WEAPONOF(deathtype);
+	if(death_weapon)
 	{
-		msg_entity = e;
-		WRITESPECTATABLE_MSG_ONE({
-			WriteByte(MSG_ONE, SVC_TEMPENTITY);
-			WriteByte(MSG_ONE, TE_CSQC_KILLCENTERPRINT);
-			WriteString(MSG_ONE, s1);
-			WriteString(MSG_ONE, s2);
-			WriteShort(MSG_ONE, msg);
-			WriteByte(MSG_ONE, type);
-		});
+		w_deathtype = deathtype;
+		float death_message = weapon_action(death_weapon, ((murder) ? WR_KILLMESSAGE : WR_SUICIDEMESSAGE));
+		w_deathtype = FALSE;
+
+		if(death_message)
+		{
+			Send_Notification_WOVA(
+				NOTIF_ONE,
+				notif_target,
+				MSG_MULTI,
+				death_message,
+				s1, s2, s3, "",
+				f1, f2, 0, 0
+			);
+			Send_Notification_WOVA(
+				NOTIF_ALL_EXCEPT,
+				notif_target,
+				MSG_INFO,
+				msg_multi_notifs[death_message - 1].nent_msginfo.nent_id,
+				s1, s2, s3, "",
+				f1, f2, 0, 0
+			);
+		}
+		else
+		{
+			dprint(sprintf(
+				"Obituary_WeaponDeath(): ^1Deathtype ^7(%d)^1 has no notification for weapon %d!\n",
+				deathtype,
+				death_weapon
+			));
+		}
+
+		return TRUE;
 	}
+	return FALSE;
 }
 
-void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
+void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 {
-	string	s, a, msg;
-	float type;
-
-	if (targ.classname == "player")
+	// Sanity check
+	if not(IS_PLAYER(targ)) { backtrace("Obituary called on non-player?!\n"); return; }
+
+	// Declarations
+	float notif_firstblood = FALSE;
+	float kill_count_to_attacker, kill_count_to_target;
+
+	// Set final information for the death
+	targ.death_origin = targ.origin;
+	if(targ != attacker) { targ.killer_origin = attacker.origin; }
+	string deathlocation = (autocvar_notification_server_allows_location ? NearestLocation(targ.death_origin) : "");
+
+	#ifdef NOTIFICATIONS_DEBUG
+	Debug_Notification(
+		sprintf(
+			"Obituary(%s, %s, %s, %s = %d);\n",
+			attacker.netname,
+			inflictor.netname,
+			targ.netname,
+			Deathtype_Name(deathtype),
+			deathtype
+		)
+	);
+	#endif
+	
+	// =======
+	// SUICIDE
+	// =======
+	if(targ == attacker)
 	{
-		s = targ.netname;
-		a = attacker.netname;
-
-		if (targ == attacker) // suicides
+		if(DEATH_ISSPECIAL(deathtype))
 		{
-			if (deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE)
-				msg = ColoredTeamName(targ.team); // TODO: check if needed?
-			else
-				msg = "";
-            if(!g_cts) // no "killed your own dumb self" message in CTS
-                Send_CSQC_KillCenterprint(targ, msg, "", deathtype, MSG_SUICIDE);
-
-			if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
+			if(deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE)
 			{
-				LogDeath("suicide", deathtype, targ, targ);
-				GiveFrags(attacker, targ, -1, deathtype);
+				Obituary_SpecialDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.team, 0, 0);
 			}
-
-			if (targ.killcount > 2)
-				msg = ftos(targ.killcount);
 			else
-				msg = "";
-			if(teamplay && deathtype == DEATH_MIRRORDAMAGE)
 			{
-				if(attacker.team == COLOR_TEAM1)
-					deathtype = KILL_TEAM_RED;
-				else
-					deathtype = KILL_TEAM_BLUE;
+				switch(deathtype)
+				{
+					case DEATH_MIRRORDAMAGE:
+					{
+						Obituary_SpecialDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0);
+						break;
+					}
+					
+					default:
+					{
+						Obituary_SpecialDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0);
+						break;
+					}
+				}
 			}
-
-			Send_KillNotification(s, msg, "", deathtype, MSG_SUICIDE);
 		}
-		else if (attacker.classname == "player")
+		else if not(Obituary_WeaponDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0))
 		{
-			if(!IsDifferentTeam(attacker, targ))
-			{
-				if(attacker.team == COLOR_TEAM1)
-					type = KILL_TEAM_RED;
-				else
-					type = KILL_TEAM_BLUE;
-
-				GiveFrags(attacker, targ, -1, deathtype);
+			backtrace("SUICIDE: what the hell happened here?\n");
+			return;
+		}
+		LogDeath("suicide", deathtype, targ, targ);
+		GiveFrags(attacker, targ, -1, deathtype);
+	}
 
-				Send_CSQC_KillCenterprint(attacker, s, "", type, MSG_KILL);
+	// ======
+	// MURDER
+	// ======
+	else if(IS_PLAYER(attacker))
+	{
+		if(!IsDifferentTeam(attacker, targ))
+		{
+			LogDeath("tk", deathtype, attacker, targ);
+			GiveFrags(attacker, targ, -1, deathtype);
 
-				if (targ.killcount > 2)
-					msg = ftos(targ.killcount);
-				else
-					msg = "";
+			attacker.killcount = 0;
+			
+			Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAG, targ.netname);
+			Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAGGED, attacker.netname);
+			Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(targ.team, INFO_DEATH_TEAMKILL_), targ.netname, attacker.netname, deathlocation, targ.killcount);
 
-				if (attacker.killcount > 2) {
-					msg = ftos(attacker.killcount);
-					type = KILL_TEAM_SPREE;
+			// In this case, the death message will ALWAYS be "foo was betrayed by bar"
+			// No need for specific death/weapon messages...
+		}
+		else
+		{
+			LogDeath("frag", deathtype, attacker, targ);
+			GiveFrags(attacker, targ, 1, deathtype);
+
+			attacker.taunt_soundtime = time + 1;
+			attacker.killcount = attacker.killcount + 1;
+
+			#define SPREE_ITEM(counta,countb,center,normal,gentle) \
+				case counta: \
+				{ \
+					Send_Notification(NOTIF_ONE, attacker, MSG_ANNCE, ANNCE_KILLSTREAK_##countb); \
+					PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_##counta, 1); \
+					break; \
 				}
-				Send_KillNotification(a, s, msg, type, MSG_KILL);
-
-				attacker.killcount = 0;
+			switch(attacker.killcount)
+			{
+				KILL_SPREE_LIST
+				default: break;
+			}
+			#undef SPREE_ITEM
 
-				LogDeath("tk", deathtype, attacker, targ);
+			if(!checkrules_firstblood)
+			{
+				checkrules_firstblood = TRUE;
+				notif_firstblood = TRUE; // modify the current messages so that they too show firstblood information
+				PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD, 1);
+				PlayerStats_Event(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1);
+
+				// tell spree_inf and spree_cen that this is a first-blood and first-victim event
+				kill_count_to_attacker = -1;
+				kill_count_to_target = -2;
 			}
 			else
 			{
-				if (!checkrules_firstblood)
-				{
-					checkrules_firstblood = TRUE;
-					Send_KillNotification(a, "", "", KILL_FIRST_BLOOD, MSG_KILL);
-					// TODO: make these print a newline if they dont
-					Send_CSQC_KillCenterprint(attacker, "", "", KILL_FIRST_BLOOD, MSG_KILL);
-					Send_CSQC_KillCenterprint(targ, "", "", KILL_FIRST_VICTIM, MSG_KILL);
-					PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD, 1);
-					PlayerStats_Event(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1);
-				}
-
-				if(targ.istypefrag) {
-					Send_CSQC_KillCenterprint(attacker, s, Obituary_ExtraFragInfo(targ), KILL_TYPEFRAG, MSG_KILL);
-					Send_CSQC_KillCenterprint(targ, a, Obituary_ExtraFragInfo(attacker), KILL_TYPEFRAGGED, MSG_KILL);
-				} else {
-					Send_CSQC_KillCenterprint(attacker, s, Obituary_ExtraFragInfo(targ), KILL_FRAG, MSG_KILL);
-					Send_CSQC_KillCenterprint(targ, a, Obituary_ExtraFragInfo(attacker), KILL_FRAGGED, MSG_KILL);
-				}
-
-				attacker.taunt_soundtime = time + 1;
+				kill_count_to_attacker = attacker.killcount;
+				kill_count_to_target = 0;
+			}
 
-				if (deathtype == DEATH_HURTTRIGGER && inflictor.message2 != "")
-					msg = inflictor.message2;
-				else if (deathtype == DEATH_CUSTOM)
-					msg = deathmessage;
+			float verbose_allowed = (autocvar_notification_server_allows_frag_verbose && ((autocvar_notification_server_allows_frag_verbose == 2) || inWarmupStage));
+			if(targ.istypefrag)
+			{
+				if(attacker.FRAG_VERBOSE && verbose_allowed)
+					Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAG_VERBOSE, targ.netname, kill_count_to_attacker, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
 				else
-					msg = "";
-
-				if(strstrofs(msg, "%", 0) < 0)
-					msg = strcat("%s ", msg, " by %s");
+					Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAG, targ.netname, kill_count_to_attacker);
 
-				Send_KillNotification(a, s, msg, deathtype, MSG_KILL);
+				if(targ.FRAG_VERBOSE && verbose_allowed)
+					Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAGGED_VERBOSE, attacker.netname, kill_count_to_target, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
+				else
+					Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAGGED, attacker.netname, kill_count_to_target);
+			}
+			else
+			{
+				if(attacker.FRAG_VERBOSE && verbose_allowed)
+					Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_FRAG_VERBOSE, targ.netname, kill_count_to_attacker, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
+				else
+					Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_FRAG, targ.netname, kill_count_to_attacker);
 
-				GiveFrags(attacker, targ, 1, deathtype);
+				if(targ.FRAG_VERBOSE && verbose_allowed)
+					Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_FRAGGED_VERBOSE, attacker.netname, kill_count_to_target, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
+				else
+					Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_FRAGGED, attacker.netname, kill_count_to_target);
+			}
 
-				if (targ.killcount > 2) {
-					Send_KillNotification(s, ftos(targ.killcount), a, KILL_END_SPREE, MSG_SPREE);
-				}
+			if not(Obituary_WeaponDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker))
+				Obituary_SpecialDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker, 0);
+		}
+	}
 
-				attacker.killcount = attacker.killcount + 1;
+	// =============
+	// ACCIDENT/TRAP
+	// =============
+	else
+	{
+		switch(deathtype)
+		{
+			// For now, we're just forcing HURTTRIGGER to behave as "DEATH_VOID" and giving it no special options...
+			// Later on you will only be able to make custom messages using DEATH_CUSTOM,
+			// and there will be a REAL DEATH_VOID implementation which mappers will use.
+			/*case DEATH_HURTTRIGGER:
+			{
+				s1 = targ.netname;
+				s2 = inflictor.message;
+				if(strstrofs(s2, "%", 0) < 0) { s2 = strcat("%s ", s2); }
+				break;
+			}*/
 
-				if (attacker.killcount == 3)
-				{
-					Send_KillNotification(a, "", "", KILL_SPREE_3, MSG_SPREE);
-					AnnounceTo(attacker, "03kills");
-					PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_3, 1);
-				}
-				else if (attacker.killcount == 5)
-				{
-					Send_KillNotification(a, "", "", KILL_SPREE_5, MSG_SPREE);
-					AnnounceTo(attacker, "05kills");
-					PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_5, 1);
-				}
-				else if (attacker.killcount == 10)
-				{
-					Send_KillNotification(a, "", "", KILL_SPREE_10, MSG_SPREE);
-					AnnounceTo(attacker, "10kills");
-					PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_10, 1);
-				}
-				else if (attacker.killcount == 15)
-				{
-					Send_KillNotification(a, "", "", KILL_SPREE_15, MSG_SPREE);
-					AnnounceTo(attacker, "15kills");
-					PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_15, 1);
-				}
-				else if (attacker.killcount == 20)
-				{
-					Send_KillNotification(a, "", "", KILL_SPREE_20, MSG_SPREE);
-					AnnounceTo(attacker, "20kills");
-					PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_20, 1);
-				}
-				else if (attacker.killcount == 25)
-				{
-					Send_KillNotification(a, "", "", KILL_SPREE_25, MSG_SPREE);
-					AnnounceTo(attacker, "25kills");
-					PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_25, 1);
-				}
-				else if (attacker.killcount == 30)
-				{
-					Send_KillNotification(a, "", "", KILL_SPREE_30, MSG_SPREE);
-					AnnounceTo(attacker, "30kills");
-					PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_30, 1);
-				}
-				else if (attacker.killcount > 2) {
-					Send_KillNotification(a, ftos(attacker.killcount), "", KILL_SPREE, MSG_SPREE);
-				}
-				LogDeath("frag", deathtype, attacker, targ);
+			case DEATH_CUSTOM:
+			{
+				Obituary_SpecialDeath(targ, FALSE, deathtype,
+					targ.netname,
+					((strstrofs(deathmessage, "%", 0) < 0) ? strcat("%s ", deathmessage) : deathmessage),
+					deathlocation,
+					targ.killcount,
+					0,
+					0);
+				break;
 			}
-		}
-		else
-		{
-			Send_CSQC_KillCenterprint(targ, "", "", deathtype, MSG_KILL_ACTION);
-			if (deathtype == DEATH_HURTTRIGGER && inflictor.message != "")
-				msg = inflictor.message;
-			else if (deathtype == DEATH_CUSTOM)
-				msg = deathmessage;
-			else
-				msg = "";
-			if(strstrofs(msg, "%", 0) < 0)
-				msg = strcat("%s ", msg);
-
-			GiveFrags(targ, targ, -1, deathtype);
-			if(PlayerScore_Add(targ, SP_SCORE, 0) == -5) {
-				AnnounceTo(targ, "botlike");
-				PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_BOTLIKE, 1);
+			
+			default:
+			{
+				Obituary_SpecialDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0);
+				break;
 			}
-			Send_KillNotification(s, msg, "", deathtype, MSG_KILL_ACTION);
+		}
 
-			if (targ.killcount > 2)
-				Send_KillNotification(s, ftos(targ.killcount), "", 0, MSG_KILL_ACTION_SPREE);
+		LogDeath("accident", deathtype, targ, targ);
+		GiveFrags(targ, targ, -1, deathtype);
 
-			LogDeath("accident", deathtype, targ, targ);
+		if(PlayerScore_Add(targ, SP_SCORE, 0) == -5)
+		{
+			Send_Notification(NOTIF_ONE, targ, MSG_ANNCE, ANNCE_ACHIEVEMENT_BOTLIKE);
+			PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_BOTLIKE, 1);
 		}
+	}
 
-		targ.death_origin = targ.origin;
-		if(targ != attacker)
-			targ.killer_origin = attacker.origin;
+	// reset target kill count
+	if(targ.killcount) { targ.killcount = 0; }
+}
 
-		// FIXME: this should go in PutClientInServer
-		if (targ.killcount)
-			targ.killcount = 0;
+void Ice_Think()
+{
+	setorigin(self, self.owner.origin - '0 0 16');
+	self.nextthink = time;
+}
+
+void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypoint)
+{
+	if(!IS_PLAYER(targ) && !(targ.flags & FL_MONSTER)) // only specified entities can be freezed
+		return;
+		
+	if(targ.frozen)
+		return;
+		
+	targ.frozen = frozen_type;
+	targ.revive_progress = 0;
+	targ.health = 1;
+	targ.revive_speed = freeze_time;
+
+	entity ice;
+	ice = spawn();
+	ice.owner = targ;
+	ice.classname = "ice";
+	ice.scale = targ.scale;
+	ice.think = Ice_Think;
+	ice.nextthink = time;
+	ice.frame = floor(random() * 21); // ice model has 20 different looking frames
+	setmodel(ice, "models/ice/ice.md3");
+	ice.alpha = 1;
+	ice.colormod = Team_ColorRGB(targ.team);
+	ice.glowmod = ice.colormod;
+	targ.iceblock = ice;
+
+	entity oldself;
+	oldself = self;
+	self = ice;
+	Ice_Think();
+	self = oldself;
+
+	RemoveGrapplingHook(targ);
+	
+	// add waypoint
+	if(show_waypoint)	
+		WaypointSprite_Spawn("frozen", 0, 0, targ, '0 0 64', world, targ.team, targ, waypointsprite_attached, TRUE, RADARICON_WAYPOINT, '0.25 0.90 1');
+}
+
+void Unfreeze (entity targ)
+{
+	if(targ.frozen) // only reset health if target was frozen
+		targ.health = ((IS_PLAYER(targ)) ? autocvar_g_balance_health_start : targ.max_health);
+	targ.frozen = 0;
+	targ.revive_progress = 0;
+	
+	WaypointSprite_Kill(targ.waypointsprite_attached);
+
+	// remove the ice block
+	if(targ.iceblock)
+	{
+		remove(targ.iceblock);
+		targ.iceblock = world;
 	}
 }
 
@@ -543,7 +632,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
         damage_attacker = attacker;
 		attacker_save = attacker;
 
-	if(targ.classname == "player")
+	if(IS_PLAYER(targ))
 		if(targ.hook)
 			if(targ.hook.aiment)
 				if(targ.hook.aiment == attacker)
@@ -552,7 +641,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 	// special rule: gravity bomb does not hit team mates (other than for disconnecting the hook)
 	if(DEATH_ISWEAPON(deathtype, WEP_HOOK) || DEATH_ISWEAPON(deathtype, WEP_TUBA))
 	{
-		if(targ.classname == "player")
+		if(IS_PLAYER(targ))
 			if not(IsDifferentTeam(targ, attacker))
 			{
 				self = oldself;
@@ -560,7 +649,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 			}
 	}
 
-	if(deathtype == DEATH_KILL || deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE || deathtype == DEATH_QUIET)
+	if(deathtype == DEATH_KILL || deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE)
 	{
 		// These are ALWAYS lethal
 		// No damage modification here
@@ -577,20 +666,11 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 	}
 	else
 	{
-		/*
-		skill based bot damage? gtfo. (tZork)
-		if (targ.classname == "player")
-		if (attacker.classname == "player")
-		if (!targ.isbot)
-		if (attacker.isbot)
-			damage = damage * bound(0.1, (skill + 5) * 0.1, 1);
-        */
-        
 		// nullify damage if teamplay is on
 		if(deathtype != DEATH_TELEFRAG)
-		if(attacker.classname == "player")
+		if(IS_PLAYER(attacker))
 		{
-			if(targ.classname == "player" && targ != attacker && (IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(targ)))
+			if(IS_PLAYER(targ) && targ != attacker && (IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(targ)))
 			{
 				damage = 0;
 				force = '0 0 0';
@@ -605,22 +685,14 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 						damage = 0;
 					else if(autocvar_teamplay_mode == 4)
 					{
-						if(targ.classname == "player" && targ.deadflag == DEAD_NO)
+						if(IS_PLAYER(targ) && targ.deadflag == DEAD_NO)
 						{
 							attacker.dmg_team = attacker.dmg_team + damage;
 							complainteamdamage = attacker.dmg_team - autocvar_g_teamdamage_threshold;
-							if(complainteamdamage > 0 && !g_ca) // FIXME why is g_ca ruled out here? Why not just g_mirrordamage 0 on CA servers?
+							if(complainteamdamage > 0)
 								mirrordamage = autocvar_g_mirrordamage * complainteamdamage;
 							mirrorforce = autocvar_g_mirrordamage * vlen(force);
-							if(g_minstagib)
-							{
-								if(autocvar_g_friendlyfire == 0)
-									damage = 0;
-							}
-							else if(g_ca)
-								damage = 0;
-							else
-								damage = autocvar_g_friendlyfire * damage;
+							damage = autocvar_g_friendlyfire * damage;
 							// mirrordamage will be used LATER
 
 							if(autocvar_g_mirrordamage_virtual)
@@ -651,52 +723,6 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 			}
 		}
 
-		if(targ.classname == "player")
-		if(attacker.classname == "player")
-		if(attacker != targ)
-		{
-			targ.lms_traveled_distance = autocvar_g_lms_campcheck_distance;
-			attacker.lms_traveled_distance = autocvar_g_lms_campcheck_distance;
-		}
-
-		if(targ.classname == "player")
-		if (g_minstagib)
-		{
-			if ((deathtype == DEATH_FALL)  ||
-				(deathtype == DEATH_DROWN) ||
-				(deathtype == DEATH_SLIME) ||
-				(deathtype == DEATH_LAVA)  ||
-				(!DEATH_ISWEAPON(deathtype, WEP_LASER) && damage > 0 && damage < 100))
-			{
-				self = oldself;
-				return;
-			}
-			if(damage > 0)
-			    damage = 10000;
-			if (targ.armorvalue && (deathtype == WEP_MINSTANEX) && damage)
-			{
-				targ.armorvalue -= 1;
-				centerprint(targ, strcat("^3Remaining extra lives: ",ftos(targ.armorvalue)));
-				damage = 0;
-				targ.hitsound += 1;
-				attacker.hitsound += 1; // TODO change this to a future specific hitsound for armor hit
-			}
-			if (DEATH_ISWEAPON(deathtype, WEP_LASER))
-			{
-				damage = 0;
-				mirrordamage = 0;
-				complainteamdamage = 0;
-				if (targ != attacker)
-				{
-					if ((targ.health >= 1) && (targ.classname == "player"))
-						centerprint(attacker, "Secondary fire inflicts no damage!");
-					force = '0 0 0';
-					// keep mirrorforce
-					attacker = targ;
-				}
-			}
-		}
-
 		if not(DEATH_ISSPECIAL(deathtype))
 		{
 			damage *= g_weapondamagefactor;
@@ -706,77 +732,54 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 			mirrorforce *= g_weaponforcefactor;
 		}
 		
+		if(((targ.frozen == 2 && attacker.monsterid != MON_SPIDER) || (targ.frozen == 1)) && deathtype != DEATH_HURTTRIGGER)
+		{
+			damage = 0;
+			force *= 0.2;
+		}
+		
 		// should this be changed at all? If so, in what way?
 		frag_attacker = attacker;
 		frag_target = targ;
 		frag_damage = damage;
 		frag_force = force;
         frag_deathtype = deathtype;
+		frag_mirrordamage = mirrordamage;
 		MUTATOR_CALLHOOK(PlayerDamage_Calculate);
 		damage = frag_damage;
+		mirrordamage = frag_mirrordamage;
 		force = frag_force;
 		
-		// apply strength multiplier
-		if ((attacker.items & IT_STRENGTH) && !g_minstagib)
+		if not(g_minstagib)
 		{
-			if(targ == attacker)
+			// apply strength multiplier
+			if (attacker.items & IT_STRENGTH)
 			{
-				damage = damage * autocvar_g_balance_powerup_strength_selfdamage;
-				force = force * autocvar_g_balance_powerup_strength_selfforce;
-			}
-			else
-			{
-				damage = damage * autocvar_g_balance_powerup_strength_damage;
-				force = force * autocvar_g_balance_powerup_strength_force;
+				if(targ == attacker)
+				{
+					damage = damage * autocvar_g_balance_powerup_strength_selfdamage;
+					force = force * autocvar_g_balance_powerup_strength_selfforce;
+				}
+				else
+				{
+					damage = damage * autocvar_g_balance_powerup_strength_damage;
+					force = force * autocvar_g_balance_powerup_strength_force;
+				}
 			}
-		}
 
-		// apply invincibility multiplier
-		if (targ.items & IT_INVINCIBLE && !g_minstagib)
-			damage = damage * autocvar_g_balance_powerup_invincible_takedamage;
+			// apply invincibility multiplier
+			if (targ.items & IT_INVINCIBLE)
+				damage = damage * autocvar_g_balance_powerup_invincible_takedamage;
+		}
 
 		if (targ == attacker)
 		{
-			if(g_ca || (g_cts && !autocvar_g_cts_selfdamage))
+			if(g_cts && !autocvar_g_cts_selfdamage)
 				damage = 0;
 			else
 				damage = damage * autocvar_g_balance_selfdamagepercent;	// Partial damage if the attacker hits himself
 		}
 
-		if(g_runematch)
-		{
-			// apply strength rune
-			if (attacker.runes & RUNE_STRENGTH)
-			{
-				if(attacker.runes & CURSE_WEAK) // have both curse & rune
-				{
-					damage = damage * autocvar_g_balance_rune_strength_combo_damage;
-					force = force * autocvar_g_balance_rune_strength_combo_force;
-				}
-				else
-				{
-					damage = damage * autocvar_g_balance_rune_strength_damage;
-					force = force * autocvar_g_balance_rune_strength_force;
-				}
-			}
-			else if (attacker.runes & CURSE_WEAK)
-			{
-				damage = damage * autocvar_g_balance_curse_weak_damage;
-				force = force * autocvar_g_balance_curse_weak_force;
-			}
-
-			// apply defense rune
-			if (targ.runes & RUNE_DEFENSE)
-			{
-				if (targ.runes & CURSE_VULNER) // have both curse & rune
-					damage = damage * autocvar_g_balance_rune_defense_combo_takedamage;
-				else
-					damage = damage * autocvar_g_balance_rune_defense_takedamage;
-			}
-			else if (targ.runes & CURSE_VULNER)
-				damage = damage * autocvar_g_balance_curse_vulner_takedamage;
-		}
-
 		// count the damage
 		if(attacker)
 		if(!targ.deadflag)
@@ -789,7 +792,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 			else
 				victim = targ;
 
-			if(victim.classname == "player" || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET)
+			if(IS_PLAYER(victim) || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET || victim.flags & FL_MONSTER)
 			{
 				if(IsDifferentTeam(victim, attacker))
 				{
@@ -808,14 +811,9 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
 						if not(DEATH_ISSPECIAL(deathtype))
 						{
-							if(targ.classname == "player") // don't do this for vehicles
-							if(!g_minstagib)
+							if(IS_PLAYER(targ)) // don't do this for vehicles
 							if(IsFlying(victim))
 								yoda = 1;
-
-							if(g_minstagib)
-							if(victim.items & IT_STRENGTH)
-								yoda = 1;
 						}
 					}
 				}
@@ -840,7 +838,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 	// apply push
 	if (self.damageforcescale)
 	if (vlen(force))
-	if (self.classname != "player" || time >= self.spawnshieldtime || g_midair)
+	if (!IS_PLAYER(self) || time >= self.spawnshieldtime)
 	{
 		vector farce = damage_explosion_calcpush(self.damageforcescale * force, self.velocity, autocvar_g_balance_damagepush_speedfactor);
 		if(self.movetype == MOVETYPE_PHYSICS)
@@ -868,58 +866,10 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 		self.event_damage (inflictor, attacker, damage, deathtype, hitloc, force);
 	self = oldself;
 
-	if(targ.classname == "player" && attacker.classname == "player" && attacker != targ && attacker.health > 2)
-	{
-		if(g_runematch)
-		{
-			if (attacker.runes & RUNE_VAMPIRE)
-			{
-			// apply vampire rune
-				if (attacker.runes & CURSE_EMPATHY) // have the curse too
-				{
-					//attacker.health = attacker.health + damage * autocvar_g_balance_rune_vampire_combo_absorb;
-					attacker.health = bound(
-						autocvar_g_balance_curse_empathy_minhealth, // LA: was 3, now 40
-						attacker.health + damage * autocvar_g_balance_rune_vampire_combo_absorb,
-						autocvar_g_balance_rune_vampire_maxhealth);	// LA: was 1000, now 500
-				}
-				else
-				{
-					//attacker.health = attacker.health + damage * autocvar_g_balance_rune_vampire_absorb;
-					attacker.health = bound(
-						attacker.health,	// LA: was 3, but changed so that you can't lose health
-											// empathy won't let you gain health in the same way...
-						attacker.health + damage * autocvar_g_balance_rune_vampire_absorb,
-						autocvar_g_balance_rune_vampire_maxhealth);	// LA: was 1000, now 500
-					}
-			}
-			// apply empathy curse
-			else if (attacker.runes & CURSE_EMPATHY)
-			{
-				attacker.health = bound(
-					autocvar_g_balance_curse_empathy_minhealth, // LA: was 3, now 20
-					attacker.health + damage * autocvar_g_balance_curse_empathy_takedamage,
-					attacker.health);
-			}
-		}
-	}
-
 	// apply mirror damage if any
 	if(mirrordamage > 0 || mirrorforce > 0)
 	{
 		attacker = attacker_save;
-		if(g_minstagib)
-		if(mirrordamage > 0)
-		{
-			// just lose extra LIVES, don't kill the player for mirror damage
-			if(attacker.armorvalue > 0)
-			{
-				attacker.armorvalue = attacker.armorvalue - 1;
-				centerprint(attacker, strcat("^3Remaining extra lives: ",ftos(attacker.armorvalue)));
-				attacker.hitsound += 1;
-			}
-			mirrordamage = 0;
-		}
 
 		force = normalize(attacker.origin + attacker.view_ofs - hitloc) * mirrorforce;
 		Damage(attacker, inflictor, attacker, mirrordamage, DEATH_MIRRORDAMAGE, attacker.origin, force);
@@ -1041,7 +991,7 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e
 							if(autocvar_g_throughfloor_debug)
 								print(sprintf(" steps=%f", total));
 
-							if (targ.classname == "player")
+							if (IS_PLAYER(targ))
 								total = ceil(bound(autocvar_g_throughfloor_min_steps_player, total, autocvar_g_throughfloor_max_steps_player));
 							else
 								total = ceil(bound(autocvar_g_throughfloor_min_steps_other, total, autocvar_g_throughfloor_max_steps_other));
@@ -1177,7 +1127,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt)
 	float dps;
 	float maxtime, mintime, maxdamage, mindamage, maxdps, mindps, totaldamage, totaltime;
 
-	if(e.classname == "player")
+	if(IS_PLAYER(e))
 	{
 		if(e.deadflag)
 			return -1;
@@ -1301,7 +1251,7 @@ void Fire_ApplyDamage(entity e)
 		return;
 
 	for(t = 0, o = e.owner; o.owner && t < 16; o = o.owner, ++t);
-	if(clienttype(o) == CLIENTTYPE_NOTACLIENT)
+	if(IS_NOT_A_CLIENT(o))
 		o = e.fire_owner;
 
 	// water and slime stop fire
@@ -1310,7 +1260,7 @@ void Fire_ApplyDamage(entity e)
 		e.fire_endtime = 0;
 
 	// ice stops fire
-	if(e.freezetag_frozen)
+	if(e.frozen)
 		e.fire_endtime = 0;
 
 	t = min(frametime, e.fire_endtime - time);
@@ -1329,7 +1279,7 @@ void Fire_ApplyDamage(entity e)
 	if not(IS_INDEPENDENT_PLAYER(e))
 	FOR_EACH_PLAYER(other) if(e != other)
 	{
-		if(other.classname == "player")
+		if(IS_PLAYER(other))
 		if(other.deadflag == DEAD_NO)
 		if not(IS_INDEPENDENT_PLAYER(other))
 		if(boxesoverlap(e.absmin, e.absmax, other.absmin, other.absmax))