X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=16a6a04afa6d22fa659a1eda9ff030fcd42a8787;hb=026dde2924af9bca060bc1bea3e194c47e98b4be;hp=e86b148bcb0b170851e4ac934ba1917d6a3353c3;hpb=05963b2ef10b016eec19561282175c3c39579426;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index e86b148bc..16a6a04af 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,11 +182,7 @@ 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)
+		if(g_lms)
 		{
 			// remove a life
 			float tl;
@@ -235,8 +227,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;
 }
 
@@ -382,7 +372,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 	string deathlocation = (autocvar_notification_server_allows_location ? NearestLocation(targ.death_origin) : "");
 
 	#ifdef NOTIFICATIONS_DEBUG
-	dprint(
+	Debug_Notification(
 		sprintf(
 			"Obituary(%s, %s, %s, %s = %d);\n",
 			attacker.netname,
@@ -446,7 +436,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 			
 			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, targ.killcount);
+			Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(targ.team, INFO_DEATH_TEAMKILL_), targ.netname, attacker.netname, deathlocation, targ.killcount);
 
 			// In this case, the death message will ALWAYS be "foo was betrayed by bar"
 			// No need for specific death/weapon messages...
@@ -462,7 +452,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 			#define SPREE_ITEM(counta,countb,center,normal,gentle) \
 				case counta: \
 				{ \
-					AnnounceTo(attacker, strcat(#countb, "kills")); \
+					Send_Notification(NOTIF_ONE, attacker, MSG_ANNCE, ANNCE_KILLSTREAK_##countb); \
 					PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_##counta, 1); \
 					break; \
 				}
@@ -563,7 +553,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 
 		if(PlayerScore_Add(targ, SP_SCORE, 0) == -5)
 		{
-			AnnounceTo(targ, "botlike");
+			Send_Notification(NOTIF_ONE, targ, MSG_ANNCE, ANNCE_ACHIEVEMENT_BOTLIKE);
 			PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_BOTLIKE, 1);
 		}
 	}
@@ -797,40 +787,6 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 				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)
@@ -922,42 +878,6 @@ 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)
 	{