Merge remote branch 'origin/master' into samual/flyingspectators

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / playerstats.qc

diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index a8efa82c8ebfb1808cfb2d8e4302fb9028ae4359..b3ed92210408a1597e2c0ad62a1154fd72aef337 100644 (file)
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -20,14 +20,29 @@ void PlayerStats_Init()
        PlayerStats_AddEvent(PLAYERSTATS_ALIVETIME);
        PlayerStats_AddEvent(PLAYERSTATS_WINS);
        PlayerStats_AddEvent(PLAYERSTATS_MATCHES);
+       PlayerStats_AddEvent(PLAYERSTATS_JOINS);
+       PlayerStats_AddEvent(PLAYERSTATS_SCOREBOARD_VALID);
+
+       PlayerStats_AddEvent(PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_3);
+       PlayerStats_AddEvent(PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_5);
+       PlayerStats_AddEvent(PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_10);
+       PlayerStats_AddEvent(PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_15);
+       PlayerStats_AddEvent(PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_20);
+       PlayerStats_AddEvent(PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_25);
+       PlayerStats_AddEvent(PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_30);
+       PlayerStats_AddEvent(PLAYERSTATS_ACHIEVEMENT_BOTLIKE);
+       PlayerStats_AddEvent(PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD);
+       PlayerStats_AddEvent(PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM);
 }
 
 void PlayerStats_AddPlayer(entity e)
 {
        if(playerstats_db < 0)
                return;
+       if(e.playerstats_id)
+               return;
 
-       if(e.crypto_idfp != "")
+       if(e.crypto_idfp != "" && e.cvar_cl_allow_uidtracking == 1)
                e.playerstats_id = strzone(e.crypto_idfp);
        else if(clienttype(e) == CLIENTTYPE_BOT)
                e.playerstats_id = strzone(sprintf("bot#%d", e.playerid));
@@ -52,6 +67,29 @@ void PlayerStats_AddPlayer(entity e)
        }
 }
 
+void PlayerStats_AddTeam(float t)
+{
+       if(playerstats_db < 0)
+               return;
+
+       string key;
+       key = sprintf("team#%d:*", t);
+       
+       string p;
+       p = db_get(playerstats_db, key);
+       if(p == "")
+       {
+               if(playerstats_last)
+               {
+                       db_put(playerstats_db, key, playerstats_last);
+                       strunzone(playerstats_last);
+               }
+               else
+                       db_put(playerstats_db, key, "#");
+               playerstats_last = strzone(sprintf("team%d", t));
+       }
+}
+
 void PlayerStats_AddEvent(string event_id)
 {
        if(playerstats_db < 0)
@@ -88,12 +126,52 @@ 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)
+{
+       string key;
+       float val;
+       key = sprintf("team#%d:%s", t, event_id);
+       val = stof(db_get(playerstats_db, key));
+       val += 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:
+
+       A collection of lines of the format <key> SPACE <value> NEWLINE, where
+       <key> is always a single character.
+
+       The following keys are defined:
+
+       V: format version (always 1) - this MUST be the first line!
+       #: comment (MUST be ignored by any parser)
+       R: release information on the server
+       T: time at which the game ended
+       G: game type
+       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!)
+       n: nickname of the player (optional)
+       e: followed by an event name, a space, and the event count/score
+               event names can be:
+                       alivetime: total playing time of the player
+                       wins: number of games won (can only be set if matches is set)
+                       matches: number of matches played to the end (not aborted by map switch)
+                       joins: number of matches joined (always 1 unless player never played during the match)
+                       scoreboardvalid: set to 1 if the player was there at the end of the match
+                       total-<scoreboardname>: total score of that scoreboard item
+                       scoreboard-<scoreboardname>: end-of-game score of that scoreboard item (can differ in non-team games)
+                       achievement-<achievementname>: achievement counters
+*/
+
 //#NO AUTOCVARS START
 void PlayerStats_Shutdown()
 {
@@ -116,6 +194,9 @@ void PlayerStats_Shutdown()
                db_dump(playerstats_db, "foo.db");
 
                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()));
@@ -131,7 +212,8 @@ void PlayerStats_Shutdown()
                        {
                                float v;
                                v = stof(db_get(playerstats_db, sprintf("%s:%s", p, e)));
-                               bufstr_set(b, i++, sprintf("e %s %f", e, v));
+                               if(v != 0)
+                                       bufstr_set(b, i++, sprintf("e %s %g", e, v));
                        }
                }
                bufstr_set(b, i++, "");
@@ -175,17 +257,24 @@ void PlayerStats_AddGlobalInfo(entity p)
        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)
+               PlayerStats_Event(p, PLAYERSTATS_JOINS, 1);
+
        strunzone(p.playerstats_id);
        p.playerstats_id = string_null;
 }
 
-void PlayerStats_EndMatch()
+void PlayerStats_EndMatch(float finished)
 {
        entity p;
        FOR_EACH_PLAYER(p)
        {
                PlayerScore_PlayerStats(p);
-               PlayerStats_Event(p, PLAYERSTATS_WINS, p.winning);
-               PlayerStats_Event(p, PLAYERSTATS_MATCHES, 1);
+               PlayerStats_Event(p, PLAYERSTATS_SCOREBOARD_VALID, 1);
+               if(finished)
+               {
+                       PlayerStats_Event(p, PLAYERSTATS_WINS, p.winning);
+                       PlayerStats_Event(p, PLAYERSTATS_MATCHES, 1);
+               }
        }
 }