X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayerstats.qc;h=672b031c119bccaedca248dbce5fd408b31f44ca;hb=0b0999563ba9ed031559b4756b3b27c2ac89da7e;hp=c611e819561e677c31b2d57250ccbcb8b8fbca6d;hpb=751927e803e8e50823c54c64f17171f74f66f85c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index c611e8195..672b031c1 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);
@@ -169,12 +180,13 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn
 	T: time at which the game ended
 	G: game type
 	M: map name
+	I: match ID (see "matchid" in g_world.qc
 	S: "hostname" of the server
 	C: number of "unpure" cvar changes
-    W: winning team ID
+	U: UDP port number of the server
 	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
@@ -185,12 +197,12 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn
 			total-<scoreboardname>: total score of that scoreboard item
 			scoreboard-<scoreboardname>: end-of-game score of that scoreboard item (can differ in non-team games)
 			achievement-<achievementname>: achievement counters
-            rank <number>: rank of player
-            acc-<weapon netname>-hit: total damage dealt
-            acc-<weapon netname>-fired: total damage that all fired projectiles *could* have dealt
-            acc-<weapon netname>-cnt-hit: amount of shots that actually hit
-            acc-<weapon netname>-cnt-fired: amount of fired shots
-            acc-<weapon netname>-frags: amount of frags dealt by weapon
+			rank <number>: rank of player
+			acc-<weapon netname>-hit: total damage dealt
+			acc-<weapon netname>-fired: total damage that all fired projectiles *could* have dealt
+			acc-<weapon netname>-cnt-hit: amount of shots that actually hit
+			acc-<weapon netname>-cnt-fired: amount of fired shots
+			acc-<weapon netname>-frags: amount of frags dealt by weapon
 */
 
 void PlayerStats_ready(entity fh, entity pass, float status)
@@ -213,6 +225,7 @@ void PlayerStats_ready(entity fh, entity pass, float status)
 			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")));
 			for(p = playerstats_last; (pn = db_get(playerstats_db, sprintf("%s:*", p))) != ""; p = pn)
 			{
 				url_fputs(fh, sprintf("P %s\n", p));
@@ -345,11 +358,21 @@ void PlayerStats_AddGlobalInfo(entity p)
 void PlayerStats_EndMatch(float finished)
 {
 	entity p, winner;
-    winner = PlayerScore_Sort(score_dummyfield);
-	FOR_EACH_PLAYER(p) // spectators intentionally not included
+	winner = PlayerScore_Sort(score_dummyfield);
+	FOR_EACH_CLIENT(p) // spectators intentionally not included
 	{
-		PlayerScore_PlayerStats(p);
 		PlayerStats_Accuracy(p);
+		if(g_arena || g_lms || g_ca)
+		{
+			if(p.alivetime <= 0)
+				continue;
+		}
+		else
+		{
+			if(p.classname != "player")
+				continue;
+		}
+		PlayerScore_PlayerStats(p);
 		PlayerStats_Event(p, PLAYERSTATS_SCOREBOARD_VALID, 1);
 		if(finished)
 		{