r4528 - in trunk/data: . qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Sep 27 12:18:17 EDT 2008


Author: div0
Date: 2008-09-27 12:18:00 -0400 (Sat, 27 Sep 2008)
New Revision: 4528

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/g_damage.qc
Log:
g_ctf_win_mode: frags do not count


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-09-27 14:05:37 UTC (rev 4527)
+++ trunk/data/defaultNexuiz.cfg	2008-09-27 16:18:00 UTC (rev 4528)
@@ -335,7 +335,7 @@
 seta g_keyhunt_point_limit -1
 seta g_race_laps_limit -1
 
-seta g_ctf_win_mode 2 // 0: captures only, 1: captures, then points, 2: points only
+seta g_ctf_win_mode 2 // 0: captures only, 1: captures, then points, 2: points only, 3: points only, but no frags included
 
 // 50% of the spawns shall be far away from any players
 set g_spawn_furthest 0.5
@@ -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_flagscore_kill	1
 set g_ctf_flagcarrier_selfdamage 1
 set g_ctf_flagcarrier_selfforce 0.7
 

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2008-09-27 14:05:37 UTC (rev 4527)
+++ trunk/data/qcsrc/server/g_damage.qc	2008-09-27 16:18:00 UTC (rev 4528)
@@ -90,6 +90,12 @@
 		}
 		f = 0;
 	}
+	else if(g_ctf)
+	{
+		if(g_ctf_win_mode == 3)
+		if(!targ.flagcarried || self == targ)
+			f = 0;
+	}
 
 	attacker.totalfrags += f;
 




More information about the nexuiz-commits mailing list