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

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index d7d2287ed..bd4426c3a 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -221,6 +221,44 @@ 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;
+
+	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;
@@ -367,12 +405,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(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;
@@ -593,6 +631,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 +643,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
@@ -963,7 +1003,7 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e
 
 	stat_damagedone = 0;
 
-	targ = WarpZone_FindRadius (blastorigin, rad, FALSE);
+	targ = WarpZone_FindRadius (blastorigin, rad + MAX_DAMAGEEXTRARADIUS, FALSE);
 	while (targ)
 	{
 		next = targ.chain;
@@ -976,7 +1016,7 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e
 				diff = targ.WarpZone_findradius_dist;
 				// round up a little on the damage to ensure full damage on impacts
 				// and turn the distance into a fraction of the radius
-				power = 1 - ((vlen (diff) - 2) / rad);
+				power = 1 - ((vlen (diff) - bound(MIN_DAMAGEEXTRARADIUS, targ.damageextraradius, MAX_DAMAGEEXTRARADIUS)) / rad);
 				//bprint(" ");
 				//bprint(ftos(power));
 				//if (targ == attacker)