[nexuiz-commits] r6626 - in branches/nexuiz-2.0: . data data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Thu Apr 30 14:45:32 EDT 2009


Author: div0
Date: 2009-04-30 14:45:32 -0400 (Thu, 30 Apr 2009)
New Revision: 6626

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/Makefile
   branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc
Log:
r6602 | mand1nga | 2009-04-28 04:03:54 +0200 (Tue, 28 Apr 2009) | 1 line
Changed the probability of ctf roles assignations to 45% attacker, 30% defender, 25% middlefield.
r6625 | div0 | 2009-04-30 20:30:40 +0200 (Thu, 30 Apr 2009) | 2 lines
make makefile know again if code has changed


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-04-30 18:30:40 UTC (rev 6625)
+++ branches/nexuiz-2.0/.patchsets	2009-04-30 18:45:32 UTC (rev 6626)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6536,6541-6549,6552-6567,6572-6577,6580-6582,6585-6587,6592-6593,6598-6598,6601-6601,6603-6623
+revisions_applied = 1-6536,6541-6549,6552-6567,6572-6577,6580-6582,6585-6587,6592-6593,6598-6598,6601-6625

Modified: branches/nexuiz-2.0/data/Makefile
===================================================================
--- branches/nexuiz-2.0/data/Makefile	2009-04-30 18:30:40 UTC (rev 6625)
+++ branches/nexuiz-2.0/data/Makefile	2009-04-30 18:45:32 UTC (rev 6626)
@@ -25,8 +25,12 @@
 	[ "$(NEX_BUILDSYSTEM)" != "" ] || { DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh; }
 
 .PHONY: qc
-qc: menu.dat progs.dat csprogs.dat
+qc: update-cvarcount
+	$(MAKE) qc-recursive
 
+.PHONY: qc-recursive
+qc-recursive: menu.dat progs.dat csprogs.dat
+
 .PHONY: skin
 skin: gfx/menu/default/skinvalues.txt
 
@@ -51,13 +55,13 @@
 clean:
 	rm -f progs.dat menu.dat csprogs.dat
 
-csprogs.dat: qcsrc/client/*.* qcsrc/common/*.* update-cvarcount
+csprogs.dat: qcsrc/client/*.* qcsrc/common/*.*
 	cd qcsrc/client && $(FTEQCC) $(FTEQCCFLAGS) $(QCFLAGS_CSPROGS)
 
-progs.dat: qcsrc/server/*.* qcsrc/common/*.* update-cvarcount
+progs.dat: qcsrc/server/*.* qcsrc/common/*.*
 	cd qcsrc/server && $(FTEQCC) $(FTEQCCFLAGS) $(QCFLAGS_PROGS)
 
-menu.dat: qcsrc/menu/*.* qcsrc/menu/*/*.* qcsrc/common/*.* update-cvarcount
+menu.dat: qcsrc/menu/*.* qcsrc/menu/*/*.* qcsrc/common/*.*
 	cd qcsrc/menu && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_MENU)
 
 gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc

Modified: branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc	2009-04-30 18:30:40 UTC (rev 6625)
+++ branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc	2009-04-30 18:45:32 UTC (rev 6626)
@@ -705,10 +705,10 @@
 		self.havocbot_role = havocbot_role_ctf_rogue;
 	else
 	{
-		r = random() * 3;
-		if (r < 1)
+		r = random() * 100;
+		if (r < 45)
 			self.havocbot_role = havocbot_role_ctf_offense;
-		else if (r < 2)
+		else if (r > 75)
 			self.havocbot_role = havocbot_role_ctf_middle;
 		else
 			self.havocbot_role = havocbot_role_ctf_defense;



More information about the nexuiz-commits mailing list