r3963 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-28 06:11:03 -0400 (Mon, 28 Jul 2008)
New Revision: 3963

Modified:
   trunk/data/qcsrc/server/domination.qc
   trunk/data/qcsrc/server/scores_rules.qc
Log:
Domination: extra column for dom takes


Modified: trunk/data/qcsrc/server/domination.qc
===================================================================
--- trunk/data/qcsrc/server/domination.qc	2008-07-28 10:02:33 UTC (rev 3962)
+++ trunk/data/qcsrc/server/domination.qc	2008-07-28 10:11:03 UTC (rev 3963)
@@ -62,6 +62,10 @@
 	//bprint("\n");
 
 	bprint("^3", head.netname, "^3", self.message, "\n");
+	if(self.enemy.playerid == self.enemy_playerid)
+		PlayerScore_Add(self.enemy, SP_DOM_TAKES, 1);
+	else
+		self.enemy = world;
 
 	if (head.noise != "")
 		sound(self, CHAN_BODY, head.noise, 1, ATTN_NORM);
@@ -131,13 +135,13 @@
 		if(!fragamt)
 			fragamt = self.DOMPOINTFRAGS;
 		TeamScore_AddToTeam(self.goalentity.team, ST_SCORE, fragamt);
-		TeamScore_AddToTeam(self.goalentity.team, ST_DOM_DOMTICKS, fragamt);
+		TeamScore_AddToTeam(self.goalentity.team, ST_DOM_TICKS, fragamt);
 
 		// give credit to the individual player, if he is still there
 		if (self.enemy.playerid == self.enemy_playerid)
 		{
 			PlayerScore_Add(self.enemy, SP_SCORE, fragamt);
-			PlayerScore_Add(self.enemy, SP_DOM_DOMTICKS, fragamt);
+			PlayerScore_Add(self.enemy, SP_DOM_TICKS, fragamt);
 		}
 		else
 			self.enemy = world;

Modified: trunk/data/qcsrc/server/scores_rules.qc
===================================================================
--- trunk/data/qcsrc/server/scores_rules.qc	2008-07-28 10:02:33 UTC (rev 3962)
+++ trunk/data/qcsrc/server/scores_rules.qc	2008-07-28 10:11:03 UTC (rev 3963)
@@ -62,8 +62,9 @@
 }
 
 // g_domination
-#define ST_DOM_DOMTICKS 1
-#define SP_DOM_DOMTICKS 4
+#define ST_DOM_TICKS 1
+#define SP_DOM_TICKS 4
+#define SP_DOM_TAKES 5
 void ScoreRules_dom()
 {
 	float sp_domticks, sp_score;
@@ -74,8 +75,9 @@
 		sp_score = SFL_SORT_PRIO_PRIMARY;
 	CheckAllowedTeams(world);
 	ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), sp_score);
-	ScoreInfo_SetLabel_TeamScore  (ST_DOM_DOMTICKS, "domticks",  sp_domticks);
-	ScoreInfo_SetLabel_PlayerScore(SP_DOM_DOMTICKS, "domticks",  sp_domticks);
+	ScoreInfo_SetLabel_TeamScore  (ST_DOM_TICKS,    "ticks",     sp_domticks);
+	ScoreInfo_SetLabel_PlayerScore(SP_DOM_TICKS,    "ticks",     sp_domticks);
+	ScoreInfo_SetLabel_PlayerScore(SP_DOM_TAKES,    "takes",     0);
 }
 
 // LMS stuff