X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayerstats.qc;h=5ddad200fe752499c8dffb78ef2db4b549407202;hb=1095fa06ccb2d38b4387a9b07d12b299a3351e32;hp=b2b2750a7aa7eb78bae0ed13f1b09ce2fa86ff17;hpb=41d66239745785f967c412869fe587a6c9378da1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index b2b2750a7..5ddad200f 100644
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -5,7 +5,7 @@ string events_last;
 .float playerstats_addedglobalinfo;
 .string playerstats_id;
 
-void PlayerStats_Init()
+void PlayerStats_Init() // initiated before InitGameplayMode so that scores are added properly
 {
 	string uri;
 	playerstats_db = -1;
@@ -20,6 +20,7 @@ void PlayerStats_Init()
 	serverflags |= SERVERFLAG_PLAYERSTATS;	
 
 	PlayerStats_AddEvent(PLAYERSTATS_ALIVETIME);
+	PlayerStats_AddEvent(PLAYERSTATS_AVGLATENCY);
 	PlayerStats_AddEvent(PLAYERSTATS_WINS);
 	PlayerStats_AddEvent(PLAYERSTATS_MATCHES);
 	PlayerStats_AddEvent(PLAYERSTATS_JOINS);
@@ -174,7 +175,7 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn
 
 	The following keys are defined:
 
-	V: format version (always 1) - this MUST be the first line!
+	V: format version (always a fixed number) - this MUST be the first line!
 	#: comment (MUST be ignored by any parser)
 	R: release information on the server
 	T: time at which the game ended
@@ -193,6 +194,7 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn
 	e: followed by an event name, a space, and the event count/score
 		event names can be:
 			alivetime: total playing time of the player
+			avglatency: average network latency compounded throughout the match
 			wins: number of games won (can only be set if matches is set)
 			matches: number of matches played to the end (not aborted by map switch)
 			joins: number of matches joined (always 1 unless player never played during the match)
@@ -208,22 +210,7 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn
 			acc-<weapon netname>-cnt-fired: amount of fired shots
 			acc-<weapon netname>-frags: amount of frags dealt by weapon
 
-	Response format (not used yet):
-
-	V: format version (always 1) - this MUST be the first line!
-	#: comment (MUST be ignored by any parser)
-	R: release information on the XonStat server
-	T: current time
-	S: in case of a stats submit request, the human readable xonstat URL for the submitted match
-	P: player ID of an existing player; this also sets the owner for all following "n", "e" and "t" lines (lower case!)
-	e: followed by an event name, a space, and the event count/score, and - if this is a reply to a stats submit request - a space, and the delta of the event count/score caused by this match
-		event names can be the same as above (they then are either sums, or minimum/maximum values, depending on context), as well as:
-			elo: current Elo calculated by the stats server
-			rank <number>: global rank of player for this game type (for stats submit requests)
-			rank-<gametype> <number>: global rank of player for any game type (for non stats submit requests)
-		not all events need to be included, of course
-		if an event is counted additively from unprocessed submitted data, it should not be sent as part of stats submit response
-		achievement-<achievementname> events may be generated by the xonstat server and reported as part of stats submit responses!
+	Response format (not used yet): see https://gist.github.com/4284222
 */
 
 void PlayerStats_ready(entity fh, entity pass, float status)
@@ -236,7 +223,7 @@ void PlayerStats_ready(entity fh, entity pass, float status)
 	switch(status)
 	{
 		case URL_READY_CANWRITE:
-			url_fputs(fh, "V 1\n");
+			url_fputs(fh, "V 5\n");
 #ifdef WATERMARK
 			url_fputs(fh, sprintf("R %s\n", WATERMARK()));
 #endif
@@ -387,11 +374,12 @@ void PlayerStats_EndMatch(float finished)
 	{
 		//PlayerStats_Accuracy(p); // stats are already written with PlayerStats_AddGlobalInfo(entity), don't double them up.
 		
-		if(g_arena || g_lms || g_ca)
-			if(p.alivetime <= 0) { continue; }
-		else
-			if(p.classname != "player") { continue; }
-			
+		if((g_arena || g_lms || g_ca) && (p.alivetime <= 0)) { continue; }
+		else if(p.classname != "player") { continue; }
+
+		float latency = (p.latency_sum / p.latency_cnt);
+		if(latency) { PlayerStats_Event(p, PLAYERSTATS_AVGLATENCY, latency); }
+		
 		PlayerScore_PlayerStats(p);
 		PlayerStats_Event(p, PLAYERSTATS_SCOREBOARD_VALID, 1);
 		if(finished)