Commit ed99b61f authored by Samual's avatar Samual

Merge remote-tracking branch 'origin/debugger/tdm_netscore'

# By Debugger
# Via Debugger
* origin/debugger/tdm_netscore:
  rename net into sum
  removing an autocvar I forgot; branch is ready to be merged
  removed matchend sound (wrong commit in here)
  disable 'net' by default
  wrong calculation fixed
  simplified, parallel to SP_FRAGS now
  small bugfix
  new default scoreboard for tdm
  removed unnecessary 'num1' declaration
  replaced the <tab>'s by <space>'s
  added a 'net' column to the tdm scoreboard (enabled by default)
  added a sound when the match ends
parents 13ffcda7 f111e54b
......@@ -54,6 +54,7 @@ float gametype;
#define SP_CLRATIO -5
#define SP_PL -6
#define SP_FRAGS -7
#define SP_SUM -8
#define SP_SEPARATOR -100
......
......@@ -36,6 +36,7 @@ string TranslateScoresLabel(string l)
case "lives": return CTX(_("SCO^lives"));
case "losses": return CTX(_("SCO^losses"));
case "name": return CTX(_("SCO^name"));
case "sum": return CTX(_("SCO^sum"));
case "nick": return CTX(_("SCO^nick"));
case "objectives": return CTX(_("SCO^objectives"));
case "pickups": return CTX(_("SCO^pickups"));
......@@ -263,6 +264,7 @@ void Cmd_HUD_Help()
print(_("^3suicides^7 Number of suicides\n"));
print(_("^3frags^7 kills - suicides\n"));
print(_("^3kd^7 The kill-death ratio\n"));
print(_("^3sum^7 frags - deaths\n"));
print(_("^3caps^7 How often a flag (CTF) or a key (KeyHunt) was captured\n"));
print(_("^3pickups^7 How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up\n"));
print(_("^3captime^7 Time of fastest cap (CTF)\n"));
......@@ -304,6 +306,7 @@ string HUD_DefaultColumnLayout()
return strcat( // fteqcc sucks
"ping pl name | ",
"-teams,race,lms/kills +freezetag/kills -teams,lms/deaths +freezetag/deaths -teams,lms,race,ka/suicides +freezetag/suicides -race,dm,tdm,ka,freezetag/frags ", // tdm already has this in "score"
"+tdm/kills +tdm/deaths +tdm/suicides ",
"+ctf/caps +ctf/pickups +ctf/fckills +ctf/returns ",
"+lms/lives +lms/rank ",
"+kh/caps +kh/pushes +kh/destroyed ",
......@@ -387,6 +390,8 @@ void Cmd_HUD_SetFields(float argc)
hud_field[hud_num_fields] = SP_PL;
} else if(str == "kd" || str == "kdr" || str == "kdratio" || str == "k/d") {
hud_field[hud_num_fields] = SP_KDRATIO;
} else if(str == "sum" || str == "diff" || str == "f-d") {
hud_field[hud_num_fields] = SP_SUM;
} else if(str == "name" || str == "nick") {
hud_field[hud_num_fields] = SP_NAME;
have_name = 1;
......@@ -581,6 +586,19 @@ string HUD_GetField(entity pl, float field)
} else
str = sprintf("%.1f", num/denom);
return str;
case SP_SUM:
f = pl.(scores[SP_KILLS]);
f -= pl.(scores[SP_DEATHS]);
if(f > 0) {
hud_field_rgb = '0 1 0';
} else if(f == 0) {
hud_field_rgb = '1 1 1';
} else {
hud_field_rgb = '1 0 0';
}
return ftos(f);
default:
tmp = pl.(scores[field]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment