From: Mario <mario.mario@y7mail.com>
Date: Sat, 26 Nov 2022 14:10:20 +0000 (+1000)
Subject: Merge branch 'master' into Mario/team_keepaway
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=717c92a472808e6d79542d978184dc1d5b37fc2f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/team_keepaway
---

717c92a472808e6d79542d978184dc1d5b37fc2f
diff --cc qcsrc/common/mutators/mutator/waypoints/all.inc
index 617194fbf,aa0ca250f..98b1f4d3c
--- a/qcsrc/common/mutators/mutator/waypoints/all.inc
+++ b/qcsrc/common/mutators/mutator/waypoints/all.inc
@@@ -47,11 -47,9 +47,13 @@@ REGISTER_WAYPOINT(KeyCarrierPink, _("Ke
  
  REGISTER_WAYPOINT(KaBall, _("Ball"), "notify_ballpickedup", '0 1 1', 1);
  REGISTER_WAYPOINT(KaBallCarrier, _("Ball carrier"), "keepawayball_carrying", '1 0 0', 1);
 +REGISTER_WAYPOINT(TkaBallCarrierRed, _("Ball carrier"), "tka_taken_red", '0 1 1', 1);
 +REGISTER_WAYPOINT(TkaBallCarrierBlue, _("Ball carrier"), "tka_taken_blue", '0 1 1', 1);
 +REGISTER_WAYPOINT(TkaBallCarrierYellow, _("Ball carrier"), "tka_taken_yellow", '0 1 1', 1);
 +REGISTER_WAYPOINT(TkaBallCarrierPink, _("Ball carrier"), "tka_taken_pink", '0 1 1', 1);
  
+ REGISTER_WAYPOINT(LmsLeader, _("Leader"), "", '0 1 1', 1);
+ 
  REGISTER_WAYPOINT(NbBall, _("Ball"), "", '0.91 0.85 0.62', 1);
  REGISTER_WAYPOINT(NbGoal, _("Goal"), "", '1 0.5 0', 1);
  
diff --cc qcsrc/common/scores.qh
index f5889cfb3,3449f2b53..241d29bc3
--- a/qcsrc/common/scores.qh
+++ b/qcsrc/common/scores.qh
@@@ -85,12 -57,31 +57,35 @@@ REGISTER_SP(LMS_LIVES)
  REGISTER_SP(NEXBALL_GOALS);
  REGISTER_SP(NEXBALL_FAULTS);
  
- REGISTER_SP(ONS_TAKES);
  REGISTER_SP(ONS_CAPS);
+ REGISTER_SP(ONS_TAKES);
  
 +REGISTER_SP(TKA_PICKUPS);
 +REGISTER_SP(TKA_BCTIME);
 +REGISTER_SP(TKA_CARRIERKILLS);
++
+ REGISTER_SP(SCORE);
+ REGISTER_SP(KILLS);
+ REGISTER_SP(DEATHS);
+ REGISTER_SP(TEAMKILLS);
+ REGISTER_SP(SUICIDES);
+ REGISTER_SP(DMG);
+ REGISTER_SP(DMGTAKEN);
+ 
+ REGISTER_SP(ELO); // not sortable
+ REGISTER_SP(FPS); // not sortable
+ 
+ // fields not networked via the score system
+ REGISTER_SP(END);
+ 
+ REGISTER_SP(PING);
+ REGISTER_SP(PL);
+ REGISTER_SP(NAME);
+ REGISTER_SP(SEPARATOR);
+ 
+ REGISTER_SP(KDRATIO); // kills / deaths
+ REGISTER_SP(SUM); // kills - deaths
+ REGISTER_SP(FRAGS); // kills - suicides
  #endif
  
  
diff --cc qcsrc/common/stats.qh
index 366780501,53f78cc5a..fa780ee80
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -132,13 -130,8 +130,9 @@@ REGISTER_STAT(FROZEN, int
  REGISTER_STAT(REVIVE_PROGRESS, float)
  REGISTER_STAT(ROUNDLOST, int)
  REGISTER_STAT(CAPTURE_PROGRESS, float)
- REGISTER_STAT(ENTRAP_ORB, float)
- REGISTER_STAT(ENTRAP_ORB_ALPHA, float)
  REGISTER_STAT(ITEMSTIME, int, autocvar_sv_itemstime)
  REGISTER_STAT(KILL_TIME, float)
- REGISTER_STAT(VEIL_ORB, float)
- REGISTER_STAT(VEIL_ORB_ALPHA, float)
 +REGISTER_STAT(TKA_BALLSTATUS, int)
  
  #ifdef SVQC
  float autocvar_sv_showfps = 0;