X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayerstats.qc;h=5ddad200fe752499c8dffb78ef2db4b549407202;hb=1bcc2b0ab546b103392c9fd838f634a4f6c0e44e;hp=a3b8571737702e12f837040de5e6812491884067;hpb=e4314bf532727c96210bf8afa641dcc8b557222f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc index a3b857173..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); @@ -56,17 +57,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); @@ -163,34 +175,42 @@ 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!) - I: match ID (see "matchid" in g_world.qc 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) 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): see https://gist.github.com/4284222 */ void PlayerStats_ready(entity fh, entity pass, float status) @@ -203,16 +223,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 5\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)); @@ -308,6 +331,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) @@ -348,17 +372,14 @@ void PlayerStats_EndMatch(float finished) winner = PlayerScore_Sort(score_dummyfield); FOR_EACH_CLIENT(p) // spectators intentionally not included { - PlayerStats_Accuracy(p); - if(g_arena || g_lms || g_ca) - { - if(p.alivetime <= 0) - continue; - } - else - { - if(p.classname != "player") - continue; - } + //PlayerStats_Accuracy(p); // stats are already written with PlayerStats_AddGlobalInfo(entity), don't double them up. + + 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)