X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayerstats.qc;h=d1e851939012968e9e9b1407035bfc9b8e1e5686;hb=87ab991cfadbbf504c9659d92fbb94d9cac6ee3e;hp=2eeb5682a418b7ea2017326b57fb5e2c18cdb2af;hpb=88d0049741a2aef64338fd15324ecbabdf0e9bcc;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc index 2eeb5682a..d1e851939 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; @@ -17,7 +17,7 @@ void PlayerStats_Init() 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_WINS); @@ -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); @@ -113,7 +124,7 @@ void PlayerStats_AddEvent(string event_id) { if(playerstats_db < 0) return; - + string key; key = sprintf("*:%s", event_id); @@ -163,19 +174,22 @@ 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 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 + 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 @@ -185,13 +199,31 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn scoreboardvalid: set to 1 if the player was there at the end of the match total-: total score of that scoreboard item scoreboard-: end-of-game score of that scoreboard item (can differ in non-team games) - achievement-: achievement counters + achievement-: achievement counters (their "count" is usually 1 if nonzero at all) + kills-: number of kills against the indexed player rank : rank of player acc--hit: total damage dealt acc--fired: total damage that all fired projectiles *could* have dealt acc--cnt-hit: amount of shots that actually hit acc--cnt-fired: amount of fired shots acc--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 : global rank of player for this game type (for stats submit requests) + rank- : 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- events may be generated by the xonstat server and reported as part of stats submit responses! */ void PlayerStats_ready(entity fh, entity pass, float status) @@ -204,17 +236,19 @@ 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 3\n"); #ifdef 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("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)); @@ -310,6 +344,7 @@ void PlayerStats_Accuracy(entity p) PlayerStats_Event(p, strcat("acc-", w.netname, "-frags"), a.(accuracy_frags[i-1])); } + //backtrace(strcat("adding player stat accuracy for ", p.netname, ".\n")); } void PlayerStats_AddGlobalInfo(entity p) @@ -350,17 +385,13 @@ void PlayerStats_EndMatch(float finished) winner = PlayerScore_Sort(score_dummyfield); FOR_EACH_CLIENT(p) // spectators intentionally not included { - PlayerStats_Accuracy(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; - } + if(p.alivetime <= 0) { continue; } else - { - if(p.classname != "player") - continue; - } + if(p.classname != "player") { continue; } + PlayerScore_PlayerStats(p); PlayerStats_Event(p, PLAYERSTATS_SCOREBOARD_VALID, 1); if(finished)