if(playerstats_db >= 0)
playerstats_waitforme = FALSE; // must wait for it at match end
- serverflags |= SERVERFLAG_PLAYERSTATS;
+ serverflags |= SERVERFLAG_PLAYERSTATS;
PlayerStats_AddEvent(PLAYERSTATS_ALIVETIME);
+ PlayerStats_AddEvent(PLAYERSTATS_AVGLATENCY);
PlayerStats_AddEvent(PLAYERSTATS_WINS);
PlayerStats_AddEvent(PLAYERSTATS_MATCHES);
PlayerStats_AddEvent(PLAYERSTATS_JOINS);
PlayerStats_AddEvent(PLAYERSTATS_SCOREBOARD_VALID);
+ PlayerStats_AddEvent(PLAYERSTATS_SCOREBOARD_POS);
PlayerStats_AddEvent(PLAYERSTATS_RANK);
// accuracy stats
s = string_null;
if(e.crypto_idfp != "" && e.cvar_cl_allow_uidtracking == 1)
s = e.crypto_idfp;
- else if(clienttype(e) == CLIENTTYPE_BOT)
+ else if(IS_BOT_CLIENT(e))
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((s == "") || find(world, playerstats_id, s)) // already have one of the ID - next one can't be tracked then!
{
- if(clienttype(e) == CLIENTTYPE_BOT)
+ if(IS_BOT_CLIENT(e))
s = sprintf("bot#%d", e.playerid);
else
s = sprintf("player#%d", e.playerid);
}
}
-void PlayerStats_AddTeam(float t) // TODO: doesn't this remain unused?
+void PlayerStats_AddTeam(float t)
{
if(playerstats_db < 0)
return;
{
if(playerstats_db < 0)
return;
-
+
string key;
key = sprintf("*:%s", event_id);
}
}
-void PlayerStats_Event(entity e, string event_id, float value)
+float PlayerStats_Event(entity e, string event_id, float value)
{
- if(!e.playerstats_id || playerstats_db < 0)
- return;
+ if((e.playerstats_id == "") || playerstats_db < 0)
+ return 0;
string key;
float val;
val = stof(db_get(playerstats_db, key));
val += value;
db_put(playerstats_db, key, ftos(val));
+ return val;
}
-void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn't this remain unused?
+float PlayerStats_TeamScore(float t, string event_id, float value)
{
+ if(playerstats_db < 0)
+ return 0;
+
string key;
float val;
key = sprintf("team#%d:%s", t, event_id);
val = stof(db_get(playerstats_db, key));
val += value;
db_put(playerstats_db, key, ftos(val));
+ return val;
}
/*
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!)
+ Q: team number of an existing team (format: team#NN); this also sets the owner for all following "e" lines (lower case!)
n: nickname of the player (optional)
t: team ID
i: player index
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)
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)
{
+ string t, tn;
string p, pn;
string e, en;
string nn, tt;
switch(status)
{
case URL_READY_CANWRITE:
- url_fputs(fh, "V 2\n");
+ url_fputs(fh, "V 7\n");
#ifdef WATERMARK
- url_fputs(fh, sprintf("R %s\n", WATERMARK()));
+ url_fputs(fh, sprintf("R %s\n", WATERMARK));
#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("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)));
+ if(teamplay)
+ {
+ for(t = teamstats_last; (tn = db_get(playerstats_db, sprintf("%d", stof(t)))) != ""; t = tn)
+ {
+ url_fputs(fh, sprintf("Q team#%s\n", t));
+ for(e = events_last; (en = db_get(playerstats_db, sprintf("*:%s", e))) != ""; e = en)
+ {
+ float v;
+ v = stof(db_get(playerstats_db, sprintf("team#%d:%s", stof(t), e)));
+ if(v != 0)
+ url_fputs(fh, sprintf("e %s %g\n", e, v));
+ }
+ }
+ }
for(p = playerstats_last; (pn = db_get(playerstats_db, sprintf("%s:*", p))) != ""; p = pn)
{
url_fputs(fh, sprintf("P %s\n", p));
{
if(playerstats_db < 0)
return;
- if(!p.playerstats_id || playerstats_db < 0)
+ if((p.playerstats_id == "") || playerstats_db < 0)
return;
p.playerstats_addedglobalinfo = TRUE;
}
db_put(playerstats_db, sprintf("%s:_playerid", p.playerstats_id), ftos(p.playerid));
-
- if(p.cvar_cl_allow_uid2name == 1 || clienttype(p) == CLIENTTYPE_BOT)
+
+ if(p.cvar_cl_allow_uid2name == 1 || IS_BOT_CLIENT(p))
db_put(playerstats_db, sprintf("%s:_netname", p.playerstats_id), p.netname);
- if(teamplay)
+ if(teamplay)
db_put(playerstats_db, sprintf("%s:_team", p.playerstats_id), ftos(p.team));
if(stof(db_get(playerstats_db, sprintf("%d:%s", p.playerstats_id, PLAYERSTATS_ALIVETIME))) > 0)
PlayerStats_Accuracy(p);
+ if(IS_REAL_CLIENT(p))
+ {
+ if(p.latency_cnt)
+ {
+ float latency = (p.latency_sum / p.latency_cnt);
+ if(latency) { PlayerStats_Event(p, PLAYERSTATS_AVGLATENCY, latency); }
+ }
+ }
+
strunzone(p.playerstats_id);
p.playerstats_id = string_null;
}
+.float scoreboard_pos;
void PlayerStats_EndMatch(float finished)
{
- entity p, winner;
- winner = PlayerScore_Sort(score_dummyfield);
- FOR_EACH_CLIENT(p) // spectators intentionally not included
+ entity p;
+ PlayerScore_Sort(score_dummyfield, 0, 0, 0);
+ PlayerScore_Sort(scoreboard_pos, 1, 1, 1);
+ if(teamplay)
+ PlayerScore_TeamStats();
+ FOR_EACH_CLIENT(p)
{
- //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; }
-
- PlayerScore_PlayerStats(p);
+ // add personal score rank
+ PlayerStats_Event(p, PLAYERSTATS_RANK, p.score_dummyfield);
+
+ if(!p.scoreboard_pos)
+ continue;
+
+ // scoreboard is valid!
PlayerStats_Event(p, PLAYERSTATS_SCOREBOARD_VALID, 1);
+
+ // add scoreboard position
+ PlayerStats_Event(p, PLAYERSTATS_SCOREBOARD_POS, p.scoreboard_pos);
+
+ // add scoreboard data
+ PlayerScore_PlayerStats(p);
+
+ // if the match ended normally, add winning info
if(finished)
{
PlayerStats_Event(p, PLAYERSTATS_WINS, p.winning);
PlayerStats_Event(p, PLAYERSTATS_MATCHES, 1);
- PlayerStats_Event(p, PLAYERSTATS_RANK, p.score_dummyfield);
}
}
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff