X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayerstats.qc;h=87220328fb8a58ba5aa435bbc274cdb6d62002aa;hb=ab98249064b3356bdb47ef81e8334351a2174a7f;hp=7f20b92454db5084718d1ca79df4a4cef219fb76;hpb=f15ff9f0d34d7f4aff3de7542b923ef53694a0e5;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc index 7f20b9245..87220328f 100644 --- a/qcsrc/server/playerstats.qc +++ b/qcsrc/server/playerstats.qc @@ -3,7 +3,6 @@ string teamstats_last; string playerstats_last; string events_last; .float playerstats_addedglobalinfo; -float playerstats_requested; .string playerstats_id; void PlayerStats_Init() @@ -17,7 +16,9 @@ void PlayerStats_Init() playerstats_db = db_create(); if(playerstats_db >= 0) playerstats_waitforme = FALSE; // must wait for it at match end - + + serverflags |= SERVERFLAG_PLAYERSTATS; + PlayerStats_AddEvent(PLAYERSTATS_ALIVETIME); PlayerStats_AddEvent(PLAYERSTATS_WINS); PlayerStats_AddEvent(PLAYERSTATS_MATCHES); @@ -55,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); @@ -154,12 +166,6 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn db_put(playerstats_db, key, ftos(val)); } -void PlayerStats_Sent_URI_Get_Callback(float id, float status, string data) -{ - if(playerstats_requested) - playerstats_waitforme = TRUE; -} - /* format spec: @@ -173,13 +179,17 @@ void PlayerStats_Sent_URI_Get_Callback(float id, float status, string data) 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 - W: winning team ID + 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 + 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 @@ -189,23 +199,113 @@ void PlayerStats_Sent_URI_Get_Callback(float id, float status, string data) 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 - 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 + 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! */ -//#NO AUTOCVARS START -void PlayerStats_Shutdown() +void PlayerStats_ready(entity fh, entity pass, float status) { string p, pn; string e, en; string nn, tt; - float b; - float i; + string s; + + switch(status) + { + case URL_READY_CANWRITE: + url_fputs(fh, "V 1\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)); + nn = db_get(playerstats_db, sprintf("%s:_playerid", p)); + if(nn != "") + url_fputs(fh, sprintf("i %s\n", nn)); + nn = db_get(playerstats_db, sprintf("%s:_netname", p)); + if(nn != "") + url_fputs(fh, sprintf("n %s\n", nn)); + if(teamplay) + { + tt = db_get(playerstats_db, sprintf("%s:_team", p)); + url_fputs(fh, sprintf("t %s\n", tt)); + } + for(e = events_last; (en = db_get(playerstats_db, sprintf("*:%s", e))) != ""; e = en) + { + float v; + v = stof(db_get(playerstats_db, sprintf("%s:%s", p, e))); + if(v != 0) + url_fputs(fh, sprintf("e %s %g\n", e, v)); + } + } + url_fputs(fh, "\n"); + url_fclose(fh); + break; + case URL_READY_CANREAD: + // url_fclose is processing, we got a response for writing the data + // this must come from HTTP + print("Got response from player stats server:\n"); + while((s = url_fgets(fh))) + print(" ", s, "\n"); + print("End of response.\n"); + url_fclose(fh); + break; + case URL_READY_CLOSED: + // url_fclose has finished + print("Player stats written\n"); + playerstats_waitforme = TRUE; + db_close(playerstats_db); + playerstats_db = -1; + break; + case URL_READY_ERROR: + default: + print("Player stats writing failed: ", ftos(status), "\n"); + playerstats_waitforme = TRUE; + if(playerstats_db >= 0) + { + db_close(playerstats_db); + playerstats_db = -1; + } + break; + } +} + +//#NO AUTOCVARS START +void PlayerStats_Shutdown() +{ string uri; if(playerstats_db < 0) @@ -214,65 +314,37 @@ void PlayerStats_Shutdown() uri = autocvar_g_playerstats_uri; if(uri != "") { - b = buf_create(); - i = 0; + playerstats_waitforme = FALSE; + url_multi_fopen(uri, FILE_APPEND, PlayerStats_ready, world); + } + else + { + playerstats_waitforme = TRUE; + db_close(playerstats_db); + playerstats_db = -1; + } +} +//#NO AUTOCVARS END - db_dump(playerstats_db, "foo.db"); +void PlayerStats_Accuracy(entity p) +{ + entity a, w; + a = p.accuracy; + float i; - bufstr_set(b, i++, "V 1"); -#ifdef WATERMARK - bufstr_set(b, i++, sprintf("R %s", WATERMARK())); -#endif - bufstr_set(b, i++, sprintf("T %s.%06d", strftime(FALSE, "%s"), floor(random() * 1000000))); - bufstr_set(b, i++, sprintf("G %s", GetGametype())); - bufstr_set(b, i++, sprintf("M %s", GetMapname())); - bufstr_set(b, i++, sprintf("I %s", matchid)); - bufstr_set(b, i++, sprintf("S %s", cvar_string("hostname"))); - bufstr_set(b, i++, sprintf("C %d", cvar_purechanges_count)); - for(p = playerstats_last; (pn = db_get(playerstats_db, sprintf("%s:*", p))) != ""; p = pn) - { - bufstr_set(b, i++, sprintf("P %s", p)); - nn = db_get(playerstats_db, sprintf("%s:_playerid", p)); - if(nn != "") - bufstr_set(b, i++, sprintf("i %s", nn)); - nn = db_get(playerstats_db, sprintf("%s:_netname", p)); - if(nn != "") - bufstr_set(b, i++, sprintf("n %s", nn)); - if(teamplay) - { - tt = db_get(playerstats_db, sprintf("%s:_team", p)); - bufstr_set(b, i++, sprintf("t %s", tt)); - } - for(e = events_last; (en = db_get(playerstats_db, sprintf("*:%s", e))) != ""; e = en) - { - float v; - v = stof(db_get(playerstats_db, sprintf("%s:%s", p, e))); - if(v != 0) - bufstr_set(b, i++, sprintf("e %s %g", e, v)); - } - } - bufstr_set(b, i++, ""); - - if(autocvar_g_playerstats_debug) - { - for(i = 0; i < buf_getsize(b); ++i) - print(bufstr_get(b, i), "\n"); - } + for(i = WEP_FIRST; i <= WEP_LAST; ++i) + { + w = get_weaponinfo(i); - if(crypto_uri_postbuf(uri, URI_GET_PLAYERSTATS_SENT, "text/plain", "\n", b, 0)) - playerstats_requested = TRUE; - else - playerstats_waitforme = TRUE; // if posting fails, we must continue anyway + PlayerStats_Event(p, strcat("acc-", w.netname, "-hit"), a.(accuracy_hit[i-1])); + PlayerStats_Event(p, strcat("acc-", w.netname, "-fired"), a.(accuracy_fired[i-1])); - buf_del(b); - } - else - playerstats_waitforme = TRUE; + PlayerStats_Event(p, strcat("acc-", w.netname, "-cnt-hit"), a.(accuracy_cnt_hit[i-1])); + PlayerStats_Event(p, strcat("acc-", w.netname, "-cnt-fired"), a.(accuracy_cnt_fired[i-1])); - db_close(playerstats_db); - playerstats_db = -1; + PlayerStats_Event(p, strcat("acc-", w.netname, "-frags"), a.(accuracy_frags[i-1])); + } } -//#NO AUTOCVARS END void PlayerStats_AddGlobalInfo(entity p) { @@ -289,7 +361,7 @@ void PlayerStats_AddGlobalInfo(entity p) p.alivetime = 0; } - db_put(playerstats_db, sprintf("%s:_netname", p.playerstats_id), ftos(p.playerid)); + db_put(playerstats_db, sprintf("%s:_playerid", p.playerstats_id), ftos(p.playerid)); if(p.cvar_cl_allow_uid2name == 1 || clienttype(p) == CLIENTTYPE_BOT) db_put(playerstats_db, sprintf("%s:_netname", p.playerstats_id), p.netname); @@ -300,38 +372,30 @@ void PlayerStats_AddGlobalInfo(entity p) if(stof(db_get(playerstats_db, sprintf("%d:%s", p.playerstats_id, PLAYERSTATS_ALIVETIME))) > 0) PlayerStats_Event(p, PLAYERSTATS_JOINS, 1); + PlayerStats_Accuracy(p); + strunzone(p.playerstats_id); p.playerstats_id = string_null; } -void PlayerStats_Accuracy(entity p) -{ - entity a, w; - a = p.accuracy; - float i; - - for(i = WEP_FIRST; i <= WEP_LAST; ++i) - { - w = get_weaponinfo(i); - - PlayerStats_Event(p, strcat("acc-", w.netname, "-hit"), a.accuracy_hit[i-1]); - PlayerStats_Event(p, strcat("acc-", w.netname, "-fired"), a.accuracy_fired[i-1]); - - PlayerStats_Event(p, strcat("acc-", w.netname, "-cnt-hit"), a.accuracy_cnt_hit[i-1]); - PlayerStats_Event(p, strcat("acc-", w.netname, "-cnt-fired"), a.accuracy_cnt_fired[i-1]); - - PlayerStats_Event(p, strcat("acc-", w.netname, "-frags"), a.accuracy_frags[i-1]); - } -} - 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) {