r4535 - in trunk/data: . qcsrc/client qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-28 05:06:55 -0400 (Sun, 28 Sep 2008)
New Revision: 4535

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/client/sbar.qc
   trunk/data/qcsrc/server/ctf.qc
   trunk/data/qcsrc/server/scores_rules.qc
Log:
ctf: count drops too


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-09-27 21:26:08 UTC (rev 4534)
+++ trunk/data/defaultNexuiz.cfg	2008-09-28 09:06:55 UTC (rev 4535)
@@ -394,6 +394,7 @@
 set g_ctf_flagscore_pickup		1
 set g_ctf_flagscore_return		5
 set g_ctf_flagscore_return_rogue	10
+set g_ctf_flagpenalty_drop	0
 set g_ctf_flagscore_kill	1
 set g_ctf_flagcarrier_selfdamage 1
 set g_ctf_flagcarrier_selfforce 0.7

Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2008-09-27 21:26:08 UTC (rev 4534)
+++ trunk/data/qcsrc/client/sbar.qc	2008-09-28 09:06:55 UTC (rev 4535)
@@ -346,7 +346,7 @@
 
 string Sbar_DefaultColumnLayout()
 {
-	return "ping pl name | -ctf,kh/kills -ctf,kh/deaths +kh/caps +kh/pushes +kh/destroyed +ctf/caps +ctf/pickups +ctf/fckills +ctf/returns -lms/score";
+	return "ping pl name | -ctf,kh/kills -ctf,kh/deaths +kh/caps +kh/pushes +kh/destroyed +ctf/caps +ctf/pickups +ctf/drops +ctf/fckills +ctf/returns -lms/score";
 }
 
 void Cmd_Sbar_SetFields(float argc)

Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2008-09-27 21:26:08 UTC (rev 4534)
+++ trunk/data/qcsrc/server/ctf.qc	2008-09-28 09:06:55 UTC (rev 4535)
@@ -138,6 +138,7 @@
 
 	if(cvar("g_ctf_flagpenalty_drop"))
 		UpdateFrags(p, -cvar("g_ctf_flagpenalty_drop"));
+	PlayerScore_Add(p, SP_CTF_DROPS, +1);
 	
 	//if(e.enemy && e.enemy != e)
 	//UpdateFrags(e.enemy, cvar("g_ctf_flagscore_kill"));

Modified: trunk/data/qcsrc/server/scores_rules.qc
===================================================================
--- trunk/data/qcsrc/server/scores_rules.qc	2008-09-27 21:26:08 UTC (rev 4534)
+++ trunk/data/qcsrc/server/scores_rules.qc	2008-09-28 09:06:55 UTC (rev 4535)
@@ -49,8 +49,9 @@
 #define ST_CTF_CAPS 1
 #define SP_CTF_CAPS 4
 #define SP_CTF_PICKUPS 5
-#define SP_CTF_FCKILLS 6
-#define SP_CTF_RETURNS 7
+#define SP_CTF_DROPS 6
+#define SP_CTF_FCKILLS 7
+#define SP_CTF_RETURNS 8
 void ScoreRules_ctf()
 {
 	float sp_score, sp_caps;
@@ -65,6 +66,7 @@
 			sp_score = SFL_SORT_PRIO_SECONDARY;
 			break;
 		case 2: // score only
+		case 3: // score only, no frags
 		default:
 			sp_score = SFL_SORT_PRIO_PRIMARY;
 			sp_caps = SFL_SORT_PRIO_SECONDARY; // looks better ;)
@@ -78,6 +80,7 @@
 	ScoreInfo_SetLabel_PlayerScore(SP_CTF_PICKUPS,  "pickups",   0);
 	ScoreInfo_SetLabel_PlayerScore(SP_CTF_FCKILLS,  "fckills",   0);
 	ScoreInfo_SetLabel_PlayerScore(SP_CTF_RETURNS,  "returns",   0);
+	ScoreInfo_SetLabel_PlayerScore(SP_CTF_DROPS,    "drops",     SFL_LOWER_IS_BETTER);
 	ScoreRules_basics_end();
 }