X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayerstats.qc;h=3533b4882e4b94264cb3dcf4a4c6b3fa1337f9e8;hp=d74cb0f38bb14edda35a797cc094d041524fc7d8;hb=e52c92b8ba22924be19d8458fb1dd0cb7cfe11c7;hpb=c7b7780a48b5ed5d6bd62099b4d43296c285dacb

diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index d74cb0f38..3533b4882 100644
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -56,17 +56,28 @@ void PlayerStats_Init()
 
 void PlayerStats_AddPlayer(entity e)
 {
+	string s;
+
 	if(playerstats_db < 0)
 		return;
 	if(e.playerstats_id)
 		return;
 
+	s = string_null;
 	if(e.crypto_idfp != "" && e.cvar_cl_allow_uidtracking == 1)
-		e.playerstats_id = strzone(e.crypto_idfp);
+		s = e.crypto_idfp;
 	else if(clienttype(e) == CLIENTTYPE_BOT)
-		e.playerstats_id = strzone(sprintf("bot#%d", e.playerid));
-	else
-		e.playerstats_id = strzone(sprintf("player#%d", e.playerid));
+		s = sprintf("bot#%g#%s", skill, e.cleanname);
+
+	if(!s || find(world, playerstats_id, s)) // already have one of the ID - next one can't be tracked then!
+	{
+		if(clienttype(e) == CLIENTTYPE_BOT)
+			s = sprintf("bot#%d", e.playerid);
+		else
+			s = sprintf("player#%d", e.playerid);
+	}
+
+	e.playerstats_id = strzone(s);
 
 	string key;
 	key = sprintf("%s:*", e.playerstats_id);
@@ -168,12 +179,16 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn
 	R: release information on the server
 	T: time at which the game ended
 	G: game type
+	O: mod name (icon request) as in server browser
 	M: map name
+	I: match ID (see "matchid" in g_world.qc
 	S: "hostname" of the server
 	C: number of "unpure" cvar changes
+	U: UDP port number of the server
+	D: duration of the match
 	P: player ID of an existing player; this also sets the owner for all following "n", "e" and "t" lines (lower case!)
 	n: nickname of the player (optional)
-    t: team ID
+	t: team ID
 	e: followed by an event name, a space, and the event count/score
 		event names can be:
 			alivetime: total playing time of the player
@@ -208,10 +223,13 @@ void PlayerStats_ready(entity fh, entity pass, float status)
 #endif
 			url_fputs(fh, sprintf("T %s.%06d\n", strftime(FALSE, "%s"), floor(random() * 1000000)));
 			url_fputs(fh, sprintf("G %s\n", GetGametype()));
+			url_fputs(fh, sprintf("O %s\n", modname));
 			url_fputs(fh, sprintf("M %s\n", GetMapname()));
 			url_fputs(fh, sprintf("I %s\n", matchid));
 			url_fputs(fh, sprintf("S %s\n", cvar_string("hostname")));
 			url_fputs(fh, sprintf("C %d\n", cvar_purechanges_count));
+			url_fputs(fh, sprintf("U %d\n", cvar("port")));
+			url_fputs(fh, sprintf("D %f\n", max(0, time - game_starttime)));
 			for(p = playerstats_last; (pn = db_get(playerstats_db, sprintf("%s:*", p))) != ""; p = pn)
 			{
 				url_fputs(fh, sprintf("P %s\n", p));