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

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index d7d2287ed..2e3296fba 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;
@@ -491,6 +527,10 @@ entity damage_attacker;
 
 void Damage (entity targ, entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
+	// if the target is a player or dead body, activate damage effects
+	if(targ.classname == "player" || targ.classname == "body")
+		Violence_DamageEffect(targ, damage, DEATH_WEAPONOF(deathtype));
+
 	float mirrordamage;
 	float mirrorforce;
 	float teamdamage0;
@@ -593,6 +633,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 							{
 								vector v;
 								v = healtharmor_applydamage(attacker.armorvalue, autocvar_g_balance_armor_blockpercent, mirrordamage);
+								v_z = 0; // fteqcc sucks
 								attacker.dmg_take += v_x;
 								attacker.dmg_save += v_y;
 								attacker.dmg_inflictor = inflictor;
@@ -604,12 +645,13 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 							{
 								vector v;
 								v = healtharmor_applydamage(targ.armorvalue, autocvar_g_balance_armor_blockpercent, damage);
+								v_z = 0; // fteqcc sucks
 								targ.dmg_take += v_x;
 								targ.dmg_save += v_y;
 								targ.dmg_inflictor = inflictor;
 								damage = 0;
-                                if(!autocvar_g_friendlyfire_virtual_force)
-                                    force = '0 0 0';
+								if(!autocvar_g_friendlyfire_virtual_force)
+									force = '0 0 0';
 							}
 						}
 						else