X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=fe4df352fb5a2fc1c6cfd565d8985f72d05bf6d8;hb=3b318c458364dbf74c3c814d2dbef8655b0d4810;hp=d7d2287ed6b093a23b63092caccfb496258af825;hpb=e8caa84ccb333234aeb013902a0f1badf8f94b06;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index d7d2287ed..fe4df352f 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -221,6 +221,42 @@ 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 ping_output;
+	string handicap_output;
+	string output;
+
+	// health/armor of attacker (person who killed you)
+	if(autocvar_sv_fraginfo_stats && (player.health >= 1))
+		if((autocvar_sv_fraginfo_stats == 2) || !inWarmupStage)
+			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(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(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(player.cvar_cl_handicap));
+	}
+	
+	// format the string
+	output = strcat(health_output, (health_output ? " ^7(" : ((ping_output || handicap_output) ? "^7(" : "")), 
+		ping_output, ((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;
@@ -367,12 +403,12 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 					PlayerStats_Event(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1);
 				}
 
-				if((autocvar_sv_fragmessage_information_typefrag) && (targ.BUTTON_CHAT)) {
-					Send_CSQC_KillCenterprint(attacker, s, GetAdvancedDeathReports(targ), KILL_TYPEFRAG, MSG_KILL);
-					Send_CSQC_KillCenterprint(targ, a, GetAdvancedDeathReports(attacker), KILL_TYPEFRAGGED, MSG_KILL);
+				if((autocvar_sv_fraginfo_typefrag) && (targ.BUTTON_CHAT)) {
+					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, GetAdvancedDeathReports(targ), KILL_FRAG, MSG_KILL);
-					Send_CSQC_KillCenterprint(targ, a, GetAdvancedDeathReports(attacker), KILL_FRAGGED, MSG_KILL);
+					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;