X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayerstats.qc;h=c01a25bbdc8228807ab8602cbd83b8aeaa2dfbb8;hb=f00dd29e71e236ddd2d79f44256ff589cbeac350;hp=4608b56df10f1330011e64e358e7c155035a42ef;hpb=64b6c7420b3e1c307f408a9f17d9c765a268621a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc index 4608b56df..c01a25bbd 100644 --- a/qcsrc/server/playerstats.qc +++ b/qcsrc/server/playerstats.qc @@ -25,6 +25,7 @@ void PlayerStats_Init() // initiated before InitGameplayMode so that scores are PlayerStats_AddEvent(PLAYERSTATS_MATCHES); PlayerStats_AddEvent(PLAYERSTATS_JOINS); PlayerStats_AddEvent(PLAYERSTATS_SCOREBOARD_VALID); + PlayerStats_AddEvent(PLAYERSTATS_SCOREBOARD_POS); PlayerStats_AddEvent(PLAYERSTATS_RANK); // accuracy stats @@ -70,7 +71,7 @@ void PlayerStats_AddPlayer(entity e) else if(clienttype(e) == CLIENTTYPE_BOT) 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) s = sprintf("bot#%d", e.playerid); @@ -144,10 +145,10 @@ void PlayerStats_AddEvent(string 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; @@ -155,6 +156,7 @@ void PlayerStats_Event(entity e, string event_id, float value) 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? @@ -210,22 +212,7 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn 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! + Response format (not used yet): see https://gist.github.com/4284222 */ void PlayerStats_ready(entity fh, entity pass, float status) @@ -238,9 +225,9 @@ void PlayerStats_ready(entity fh, entity pass, float status) switch(status) { case URL_READY_CANWRITE: - url_fputs(fh, "V 5\n"); + url_fputs(fh, "V 6\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())); @@ -353,7 +340,7 @@ void PlayerStats_AddGlobalInfo(entity 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; @@ -365,11 +352,11 @@ void PlayerStats_AddGlobalInfo(entity p) } 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); - 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) @@ -377,31 +364,47 @@ void PlayerStats_AddGlobalInfo(entity p) PlayerStats_Accuracy(p); + if(clienttype(p) == CLIENTTYPE_REAL) + { + 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); + 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) && (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); + // 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); } } }