X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fplayerstats.qc;h=d74cb0f38bb14edda35a797cc094d041524fc7d8;hb=6a47ec4c0ee07b6eaa3f9adac8f1fef262b8f81c;hp=b3ed92210408a1597e2c0ad62a1154fd72aef337;hpb=1de3b82da199fe76d62d72b481e2fbc547c89e23;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc index b3ed92210..d74cb0f38 100644 --- a/qcsrc/server/playerstats.qc +++ b/qcsrc/server/playerstats.qc @@ -1,8 +1,8 @@ float playerstats_db; +string teamstats_last; string playerstats_last; string events_last; .float playerstats_addedglobalinfo; -float playerstats_requested; .string playerstats_id; void PlayerStats_Init() @@ -16,12 +16,31 @@ 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); PlayerStats_AddEvent(PLAYERSTATS_JOINS); PlayerStats_AddEvent(PLAYERSTATS_SCOREBOARD_VALID); + PlayerStats_AddEvent(PLAYERSTATS_RANK); + + // accuracy stats + entity w; + float i; + for(i = WEP_FIRST; i <= WEP_LAST; ++i) + { + w = get_weaponinfo(i); + + PlayerStats_AddEvent(strcat("acc-", w.netname, "-hit")); + PlayerStats_AddEvent(strcat("acc-", w.netname, "-fired")); + + PlayerStats_AddEvent(strcat("acc-", w.netname, "-cnt-hit")); + PlayerStats_AddEvent(strcat("acc-", w.netname, "-cnt-fired")); + + PlayerStats_AddEvent(strcat("acc-", w.netname, "-frags")); + } PlayerStats_AddEvent(PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_3); PlayerStats_AddEvent(PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_5); @@ -48,7 +67,7 @@ void PlayerStats_AddPlayer(entity e) e.playerstats_id = strzone(sprintf("bot#%d", e.playerid)); else e.playerstats_id = strzone(sprintf("player#%d", e.playerid)); - + string key; key = sprintf("%s:*", e.playerstats_id); @@ -67,26 +86,26 @@ void PlayerStats_AddPlayer(entity e) } } -void PlayerStats_AddTeam(float t) +void PlayerStats_AddTeam(float t) // TODO: doesn't this remain unused? { if(playerstats_db < 0) return; string key; - key = sprintf("team#%d:*", t); + key = sprintf("%d", t); string p; p = db_get(playerstats_db, key); if(p == "") { - if(playerstats_last) + if(teamstats_last) { - db_put(playerstats_db, key, playerstats_last); - strunzone(playerstats_last); + db_put(playerstats_db, key, teamstats_last); + strunzone(teamstats_last); } else db_put(playerstats_db, key, "#"); - playerstats_last = strzone(sprintf("team%d", t)); + teamstats_last = strzone(key); } } @@ -126,7 +145,7 @@ void PlayerStats_Event(entity e, string event_id, float value) db_put(playerstats_db, key, ftos(val)); } -void PlayerStats_TeamScore(float t, string event_id, float value) +void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn't this remain unused? { string key; float val; @@ -136,12 +155,6 @@ void PlayerStats_TeamScore(float t, string event_id, float value) 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: @@ -158,8 +171,9 @@ void PlayerStats_Sent_URI_Get_Callback(float id, float status, string data) M: map name S: "hostname" of the server C: number of "unpure" cvar changes - P: player ID of an existing player; this also sets the owner for all following "n" and "e" lines (lower case!) + 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 e: followed by an event name, a space, and the event count/score event names can be: alivetime: total playing time of the player @@ -170,75 +184,131 @@ void PlayerStats_Sent_URI_Get_Callback(float id, float status, string data) 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 */ -//#NO AUTOCVARS START -void PlayerStats_Shutdown() +void PlayerStats_ready(entity fh, entity pass, float status) { string p, pn; string e, en; - string nn; - float b; - float i; - string uri; - - if(playerstats_db < 0) - return; + string nn, tt; + string s; - uri = autocvar_g_playerstats_uri; - if(uri != "") + switch(status) { - b = buf_create(); - i = 0; - - db_dump(playerstats_db, "foo.db"); - - bufstr_set(b, i++, "V 1"); + case URL_READY_CANWRITE: + url_fputs(fh, "V 1\n"); #ifdef WATERMARK - bufstr_set(b, i++, sprintf("R %s", WATERMARK())); + url_fputs(fh, sprintf("R %s\n", 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("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:_netname", p)); - if(nn != "") - bufstr_set(b, i++, sprintf("n %s", nn)); - for(e = events_last; (en = db_get(playerstats_db, sprintf("*:%s", e))) != ""; e = en) + 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("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)); + for(p = playerstats_last; (pn = db_get(playerstats_db, sprintf("%s:*", p))) != ""; p = pn) { - 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)); + 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)); + } } - } - bufstr_set(b, i++, ""); + 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; + } +} - if(autocvar_g_playerstats_debug) - { - for(i = 0; i < buf_getsize(b); ++i) - print(bufstr_get(b, i), "\n"); - } +//#NO AUTOCVARS START +void PlayerStats_Shutdown() +{ + string uri; - 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 + if(playerstats_db < 0) + return; - buf_del(b); + uri = autocvar_g_playerstats_uri; + if(uri != "") + { + playerstats_waitforme = FALSE; + url_multi_fopen(uri, FILE_APPEND, PlayerStats_ready, world); } else + { playerstats_waitforme = TRUE; - - db_close(playerstats_db); - playerstats_db = -1; + db_close(playerstats_db); + playerstats_db = -1; + } } //#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) @@ -249,32 +319,52 @@ void PlayerStats_AddGlobalInfo(entity p) // add global info! if(p.alivetime) + { PlayerStats_Event(p, PLAYERSTATS_ALIVETIME, time - p.alivetime); + p.alivetime = 0; + } - if(p.alivetime) - PlayerStats_Event(p, PLAYERSTATS_ALIVETIME, time - p.alivetime); + 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(p.alivetime > 0) + 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) PlayerStats_Event(p, PLAYERSTATS_JOINS, 1); + PlayerStats_Accuracy(p); + strunzone(p.playerstats_id); p.playerstats_id = string_null; } void PlayerStats_EndMatch(float finished) { - entity p; - FOR_EACH_PLAYER(p) + entity p, winner; + 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; + } PlayerScore_PlayerStats(p); PlayerStats_Event(p, PLAYERSTATS_SCOREBOARD_VALID, 1); if(finished) { PlayerStats_Event(p, PLAYERSTATS_WINS, p.winning); PlayerStats_Event(p, PLAYERSTATS_MATCHES, 1); + PlayerStats_Event(p, PLAYERSTATS_RANK, p.score_dummyfield); } } }