Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/server/playerstats.qh b/qcsrc/server/playerstats.qh
index bd1900f8e87b92aab3b2532a70b837213bd813b2..b95037747b459c8bf055a6a2d3f46e6e57d87199 100644 (file)
--- a/qcsrc/server/playerstats.qh
+++ b/qcsrc/server/playerstats.qh
@@ -1,102 +1,26 @@
 // time the player was alive and kicking
-string PLAYERSTATS_ALIVETIME  = "alivetime";
-string PLAYERSTATS_WINS = "wins";
-string PLAYERSTATS_MATCHES = "matches";
-string PLAYERSTATS_JOINS = "joins";
-string PLAYERSTATS_SCOREBOARD_VALID = "scoreboardvalid";
-string PLAYERSTATS_RANK = "rank";
-
-string PLAYERSTATS_ACC_LASER_HIT = "acc-laser-hit";
-string PLAYERSTATS_ACC_LASER_FIRED = "acc-laser-fired";
-string PLAYERSTATS_ACC_SHOTGUN_HIT = "acc-sg-hit";
-string PLAYERSTATS_ACC_SHOTGUN_FIRED = "acc-sg-fired";
-string PLAYERSTATS_ACC_UZI_HIT = "acc-uzi-hit";
-string PLAYERSTATS_ACC_UZI_FIRED = "acc-uzi-fired";
-string PLAYERSTATS_ACC_GRENADE_LAUNCHER_HIT = "acc-gl-hit";
-string PLAYERSTATS_ACC_GRENADE_LAUNCHER_FIRED = "acc-gl-fired";
-string PLAYERSTATS_ACC_ELECTRO_HIT = "acc-electro-hit";
-string PLAYERSTATS_ACC_ELECTRO_FIRED = "acc-electro-fired";
-string PLAYERSTATS_ACC_CRYLINK_HIT = "acc-crylink-hit";
-string PLAYERSTATS_ACC_CRYLINK_FIRED = "acc-crylink-fired";
-string PLAYERSTATS_ACC_NEX_HIT = "acc-nex-hit";
-string PLAYERSTATS_ACC_NEX_FIRED = "acc-nex-fired";
-string PLAYERSTATS_ACC_HAGAR_HIT = "acc-hagar-hit";
-string PLAYERSTATS_ACC_HAGAR_FIRED = "acc-hagar-fired";
-string PLAYERSTATS_ACC_ROCKET_LAUNCHER_HIT = "acc-rl-hit";
-string PLAYERSTATS_ACC_ROCKET_LAUNCHER_FIRED = "acc-rl-fired";
-string PLAYERSTATS_ACC_MINSTANEX_HIT = "acc-minstanex-hit";
-string PLAYERSTATS_ACC_MINSTANEX_FIRED = "acc-minstanex-fired";
-string PLAYERSTATS_ACC_SNIPERRIFLE_HIT = "acc-rifle-hit";
-string PLAYERSTATS_ACC_SNIPERRIFLE_FIRED = "acc-rifle-fired";
-string PLAYERSTATS_ACC_FIREBALL_HIT = "acc-fireball-hit";
-string PLAYERSTATS_ACC_FIREBALL_FIRED = "acc-fireball-fired";
-string PLAYERSTATS_ACC_MINE_LAYER_HIT = "acc-minelayer-hit";
-string PLAYERSTATS_ACC_MINE_LAYER_FIRED = "acc-minelayer-fired";
-string PLAYERSTATS_ACC_SEEKER_HIT = "acc-seeker-hit";
-string PLAYERSTATS_ACC_SEEKER_FIRED = "acc-seeker-fired";
-string PLAYERSTATS_ACC_TUBA_HIT = "acc-tuba-hit";
-string PLAYERSTATS_ACC_TUBA_FIRED = "acc-tuba-fired";
-
-string PLAYERSTATS_ACC_LASER_CNT_HIT = "acc-laser-cnt-hit";
-string PLAYERSTATS_ACC_LASER_CNT_FIRED = "acc-laser-cnt-fired";
-string PLAYERSTATS_ACC_SHOTGUN_CNT_HIT = "acc-sg-cnt-hit";
-string PLAYERSTATS_ACC_SHOTGUN_CNT_FIRED = "acc-sg-cnt-fired";
-string PLAYERSTATS_ACC_UZI_CNT_HIT = "acc-uzi-cnt-hit";
-string PLAYERSTATS_ACC_UZI_CNT_FIRED = "acc-uzi-cnt-fired";
-string PLAYERSTATS_ACC_GRENADE_LAUNCHER_CNT_HIT = "acc-gl-cnt-hit";
-string PLAYERSTATS_ACC_GRENADE_LAUNCHER_CNT_FIRED = "acc-gl-cnt-fired";
-string PLAYERSTATS_ACC_ELECTRO_CNT_HIT = "acc-electro-cnt-hit";
-string PLAYERSTATS_ACC_ELECTRO_CNT_FIRED = "acc-electro-cnt-fired";
-string PLAYERSTATS_ACC_CRYLINK_CNT_HIT = "acc-crylink-cnt-hit";
-string PLAYERSTATS_ACC_CRYLINK_CNT_FIRED = "acc-crylink-cnt-fired";
-string PLAYERSTATS_ACC_NEX_CNT_HIT = "acc-nex-cnt-hit";
-string PLAYERSTATS_ACC_NEX_CNT_FIRED = "acc-nex-cnt-fired";
-string PLAYERSTATS_ACC_HAGAR_CNT_HIT = "acc-hagar-cnt-hit";
-string PLAYERSTATS_ACC_HAGAR_CNT_FIRED = "acc-hagar-cnt-fired";
-string PLAYERSTATS_ACC_ROCKET_LAUNCHER_CNT_HIT = "acc-rl-cnt-hit";
-string PLAYERSTATS_ACC_ROCKET_LAUNCHER_CNT_FIRED = "acc-rl-cnt-fired";
-string PLAYERSTATS_ACC_MINSTANEX_CNT_HIT = "acc-minstanex-cnt-hit";
-string PLAYERSTATS_ACC_MINSTANEX_CNT_FIRED = "acc-minstanex-cnt-fired";
-string PLAYERSTATS_ACC_SNIPERRIFLE_CNT_HIT = "acc-rifle-cnt-hit";
-string PLAYERSTATS_ACC_SNIPERRIFLE_CNT_FIRED = "acc-rifle-cnt-fired";
-string PLAYERSTATS_ACC_FIREBALL_CNT_HIT = "acc-fireball-cnt-hit";
-string PLAYERSTATS_ACC_FIREBALL_CNT_FIRED = "acc-fireball-cnt-fired";
-string PLAYERSTATS_ACC_MINE_LAYER_CNT_HIT = "acc-minelayer-cnt-hit";
-string PLAYERSTATS_ACC_MINE_LAYER_CNT_FIRED = "acc-minelayer-cnt-fired";
-string PLAYERSTATS_ACC_SEEKER_CNT_HIT = "acc-seeker-cnt-hit";
-string PLAYERSTATS_ACC_SEEKER_CNT_FIRED = "acc-seeker-cnt-fired";
-string PLAYERSTATS_ACC_TUBA_CNT_HIT = "acc-tuba-cnt-hit";
-string PLAYERSTATS_ACC_TUBA_CNT_FIRED = "acc-tuba-cnt-fired";
-
-string PLAYERSTATS_ACC_LASER_FRAGS = "acc-laser-frags";
-string PLAYERSTATS_ACC_SHOTGUN_FRAGS = "acc-sg-frags";
-string PLAYERSTATS_ACC_UZI_FRAGS = "acc-uzi-frags";
-string PLAYERSTATS_ACC_GRENADE_LAUNCHER_FRAGS = "acc-gl-frags";
-string PLAYERSTATS_ACC_ELECTRO_FRAGS = "acc-electro-frags";
-string PLAYERSTATS_ACC_CRYLINK_FRAGS = "acc-crylink-frags";
-string PLAYERSTATS_ACC_NEX_FRAGS = "acc-nex-frags";
-string PLAYERSTATS_ACC_HAGAR_FRAGS = "acc-hagar-frags";
-string PLAYERSTATS_ACC_ROCKET_LAUNCHER_FRAGS = "acc-rl-frags";
-string PLAYERSTATS_ACC_MINSTANEX_FRAGS = "acc-minstanex-frags";
-string PLAYERSTATS_ACC_SNIPERRIFLE_FRAGS = "acc-rifle-frags";
-string PLAYERSTATS_ACC_FIREBALL_FRAGS = "acc-fireball-frags";
-string PLAYERSTATS_ACC_MINE_LAYER_FRAGS = "acc-minelayer-frags";
-string PLAYERSTATS_ACC_SEEKER_FRAGS = "acc-seeker-frags";
-string PLAYERSTATS_ACC_TUBA_FRAGS = "acc-tuba-frags";
-
-string PLAYERSTATS_TOTAL = "total-";
-string PLAYERSTATS_SCOREBOARD = "scoreboard-";
-
-string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_3 = "achievement-kill-spree-3";
-string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_5 = "achievement-kill-spree-5";
-string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_10 = "achievement-kill-spree-10";
-string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_15 = "achievement-kill-spree-15";
-string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_20 = "achievement-kill-spree-20";
-string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_25 = "achievement-kill-spree-25";
-string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_30 = "achievement-kill-spree-30";
-string PLAYERSTATS_ACHIEVEMENT_BOTLIKE = "achievement-botlike";
-string PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD = "achievement-firstblood";
-string PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM = "achievement-firstvictim";
+const string PLAYERSTATS_ALIVETIME  = "alivetime";
+const string PLAYERSTATS_AVGLATENCY = "avglatency";
+const string PLAYERSTATS_WINS = "wins";
+const string PLAYERSTATS_MATCHES = "matches";
+const string PLAYERSTATS_JOINS = "joins";
+const string PLAYERSTATS_SCOREBOARD_VALID = "scoreboardvalid";
+const string PLAYERSTATS_RANK = "rank";
+const string PLAYERSTATS_SCOREBOARD_POS = "scoreboardpos";
+
+const string PLAYERSTATS_TOTAL = "total-";
+const string PLAYERSTATS_SCOREBOARD = "scoreboard-";
+
+const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_3 = "achievement-kill-spree-3";
+const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_5 = "achievement-kill-spree-5";
+const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_10 = "achievement-kill-spree-10";
+const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_15 = "achievement-kill-spree-15";
+const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_20 = "achievement-kill-spree-20";
+const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_25 = "achievement-kill-spree-25";
+const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_30 = "achievement-kill-spree-30";
+const string PLAYERSTATS_ACHIEVEMENT_BOTLIKE = "achievement-botlike";
+const string PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD = "achievement-firstblood";
+const string PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM = "achievement-firstvictim";
 
 // delay map switch until this is set
 float playerstats_waitforme;
@@ -114,17 +38,14 @@ void PlayerStats_AddTeam(float t);
 void PlayerStats_AddEvent(string event_id);
 
 // call on each event to track, or at player disconnect OR match end for "global stuff"
-void PlayerStats_Event(entity e, string event_id, float value);
+float PlayerStats_Event(entity e, string event_id, float value);
 
 // add a team score
-void PlayerStats_TeamScore(float t, string event_id, float value);
+float PlayerStats_TeamScore(float t, string event_id, float value);
 
 // call at game over
 void PlayerStats_Shutdown(); // send stats to the server
 
-// URI GET callback
-void PlayerStats_Sent_URI_Get_Callback(float id, float status, string data);
-
 // call this whenever a player leaves
 void PlayerStats_AddGlobalInfo(entity p);