X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayerstats.qc;h=87220328fb8a58ba5aa435bbc274cdb6d62002aa;hp=9f40a453ead2bfdad1a40fc0a4829e6051e8165b;hb=6018d119b3c9f4e54d6d21f6339948708c83d83f;hpb=6f4349956b11b36ba20e65e34d39b5029a5eb3ac diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc index 9f40a453e..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,13 +199,31 @@ 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! */ void PlayerStats_ready(entity fh, entity pass, float status) @@ -214,10 +242,13 @@ void PlayerStats_ready(entity fh, entity pass, float status) #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)); @@ -241,9 +272,7 @@ void PlayerStats_ready(entity fh, entity pass, float status) } } url_fputs(fh, "\n"); - db_close(playerstats_db); - playerstats_db = -1; - url_fclose(fh, PlayerStats_ready, world); + url_fclose(fh); break; case URL_READY_CANREAD: // url_fclose is processing, we got a response for writing the data @@ -252,12 +281,14 @@ void PlayerStats_ready(entity fh, entity pass, float status) while((s = url_fgets(fh))) print(" ", s, "\n"); print("End of response.\n"); - url_fclose(fh, PlayerStats_ready, world); + 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: @@ -283,8 +314,8 @@ void PlayerStats_Shutdown() uri = autocvar_g_playerstats_uri; if(uri != "") { - url_fopen(uri, FILE_APPEND, PlayerStats_ready, world); playerstats_waitforme = FALSE; + url_multi_fopen(uri, FILE_APPEND, PlayerStats_ready, world); } else { @@ -295,6 +326,26 @@ void PlayerStats_Shutdown() } //#NO AUTOCVARS END +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_AddGlobalInfo(entity p) { if(playerstats_db < 0) @@ -321,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) {