]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/playerstats.qc
Merge remote branch 'origin/master' into fruitiex/animations
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / playerstats.qc
index 0256c037b02667a2c4348641318e726b9939d486..7f20b92454db5084718d1ca79df4a4cef219fb76 100644 (file)
@@ -57,6 +57,8 @@ void PlayerStats_AddPlayer(entity e)
 {
        if(playerstats_db < 0)
                return;
+       if(e.playerstats_id)
+               return;
 
        if(e.crypto_idfp != "" && e.cvar_cl_allow_uidtracking == 1)
                e.playerstats_id = strzone(e.crypto_idfp);
@@ -65,9 +67,6 @@ void PlayerStats_AddPlayer(entity e)
        else
                e.playerstats_id = strzone(sprintf("player#%d", e.playerid));
 
-    if(teams_matter)
-
-       
        string key;
        key = sprintf("%s:*", e.playerstats_id);
        
@@ -86,7 +85,7 @@ 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;
@@ -145,7 +144,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;
@@ -178,9 +177,9 @@ void PlayerStats_Sent_URI_Get_Callback(float id, float status, string data)
        S: "hostname" of the server
        C: number of "unpure" cvar changes
     W: winning team ID
-       t: team ID; all following "P" lines will be players on this team
-       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
@@ -192,12 +191,16 @@ void PlayerStats_Sent_URI_Get_Callback(float id, float status, string data)
                        scoreboard-<scoreboardname>: end-of-game score of that scoreboard item (can differ in non-team games)
                        achievement-<achievementname>: achievement counters
             rank <number>: rank of player
+            acc-<weapon netname>-hit: total damage dealt
+            acc-<weapon netname>-fired: total damage that all fired projectiles *could* have dealt
+            acc-<weapon netname>-cnt-hit: amount of shots that actually hit
+            acc-<weapon netname>-cnt-fired: amount of fired shots
+            acc-<weapon netname>-frags: amount of frags dealt by weapon
 */
 
 //#NO AUTOCVARS START
 void PlayerStats_Shutdown()
 {
-    string t, tn;
        string p, pn;
        string e, en;
        string nn, tt;
@@ -223,54 +226,32 @@ void PlayerStats_Shutdown()
                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));
-        if(teams_matter)
+        for(p = playerstats_last; (pn = db_get(playerstats_db, sprintf("%s:*", p))) != ""; p = pn)
         {
-            entity winner;
-            winner = PlayerScore_Sort(score_dummyfield);
-            bufstr_set(b, i++, sprintf("W %d", winner.team));
-            for(t = teamstats_last; (tn = db_get(playerstats_db, sprintf("%s", t))) != ""; t = tn)
+            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)
             {
-                bufstr_set(b, i++, strcat("t ", t));
-                for(p = playerstats_last; (pn = db_get(playerstats_db, sprintf("%s:*", p))) != ""; p = pn)
-                {
-                    tt = db_get(playerstats_db, sprintf("%s:_team", p));
-                    if(t != tt)
-                        continue;
-
-                    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)
-                    {
-                        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++, "");
+                tt = db_get(playerstats_db, sprintf("%s:_team", p));
+                bufstr_set(b, i++, sprintf("t %s", tt));
             }
-        }
-        else {
-            for(p = playerstats_last; (pn = db_get(playerstats_db, sprintf("%s:*", p))) != ""; p = pn)
+            for(e = events_last; (en = db_get(playerstats_db, sprintf("*:%s", e))) != ""; e = en)
             {
-                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)
-                {
-                    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));
-                }
+                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++, "");
         }
+        bufstr_set(b, i++, "");
 
                if(autocvar_g_playerstats_debug)
                {
@@ -303,18 +284,20 @@ 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:_netname", 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(teams_matter)
+    if(teamplay)
                db_put(playerstats_db, sprintf("%s:_team", p.playerstats_id), ftos(p.team));
 
-       if(p.alivetime > 0)
+       if(stof(db_get(playerstats_db, sprintf("%d:%s", p.playerstats_id, PLAYERSTATS_ALIVETIME))) > 0)
                PlayerStats_Event(p, PLAYERSTATS_JOINS, 1);
 
        strunzone(p.playerstats_id);
@@ -331,13 +314,13 @@ void PlayerStats_Accuracy(entity p)
     {
         w = get_weaponinfo(i);
 
-        PlayerStats_Event(p, strcat("acc-", w.netname, "-hit"), a.accuracy_hit[i]);
-        PlayerStats_Event(p, strcat("acc-", w.netname, "-fired"), a.accuracy_fired[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]);
-        PlayerStats_Event(p, strcat("acc-", w.netname, "-cnt-fired"), a.accuracy_cnt_fired[i]);
+        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]);
+        PlayerStats_Event(p, strcat("acc-", w.netname, "-frags"), a.accuracy_frags[i-1]);
     }
 }
 
@@ -345,7 +328,7 @@ void PlayerStats_EndMatch(float finished)
 {
        entity p, winner;
     winner = PlayerScore_Sort(score_dummyfield);
-       FOR_EACH_PLAYER(p)
+       FOR_EACH_PLAYER(p) // spectators intentionally not included
        {
                PlayerScore_PlayerStats(p);
                PlayerStats_Accuracy(p);