r2359 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-04-20 06:54:53 -0400 (Fri, 20 Apr 2007)
New Revision: 2359

Modified:
   trunk/data/default.cfg
   trunk/data/empty.cfg
   trunk/data/nexuiz-credits.txt
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/w_laser.qc
   trunk/data/weapons.cfg
Log:
- removed empty line from default.cfg and credits
- put a comment in empty.cfg
- laser secondary mode now is optional (enabled when g_balance_laser_secondary is 1)
- fixed comment of MaplistMethod_Shuffle


Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg	2007-04-20 10:51:13 UTC (rev 2358)
+++ trunk/data/default.cfg	2007-04-20 10:54:53 UTC (rev 2359)
@@ -122,7 +122,6 @@
 net_messagetimeout 300
 net_connecttimeout 30
 sv_jumpstep 1 // step up stairs while jumping, makes it easier to reach ledges
-
 cl_movement 1
 seta cl_autoswitch 1
 cl_netinputpacketlosstolerance 0

Modified: trunk/data/empty.cfg
===================================================================
--- trunk/data/empty.cfg	2007-04-20 10:51:13 UTC (rev 2358)
+++ trunk/data/empty.cfg	2007-04-20 10:54:53 UTC (rev 2359)
@@ -0,0 +1 @@
+// not so empty now

Modified: trunk/data/nexuiz-credits.txt
===================================================================
--- trunk/data/nexuiz-credits.txt	2007-04-20 10:51:13 UTC (rev 2358)
+++ trunk/data/nexuiz-credits.txt	2007-04-20 10:54:53 UTC (rev 2359)
@@ -81,7 +81,6 @@
 
 Thanks:
 
-
 Gerd "Elysis" Raudenbusch
 
 Qantourisc

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2007-04-20 10:51:13 UTC (rev 2358)
+++ trunk/data/qcsrc/server/g_world.qc	2007-04-20 10:54:53 UTC (rev 2359)
@@ -627,7 +627,7 @@
 
 float(float exponent) MaplistMethod_Shuffle = // more clever shuffling
 // the exponent sets a bias on the map selection:
-// the higher the exponent, the
+// the higher the exponent, the less likely "shortly repeated" same maps are
 {
 	float i, j, imax, insertpos;
 

Modified: trunk/data/qcsrc/server/w_laser.qc
===================================================================
--- trunk/data/qcsrc/server/w_laser.qc	2007-04-20 10:51:13 UTC (rev 2358)
+++ trunk/data/qcsrc/server/w_laser.qc	2007-04-20 10:54:53 UTC (rev 2359)
@@ -79,30 +79,43 @@
 	local float r2;
 	if (req == WR_AIM)
 	{
-		r1 = cvar("g_balance_laser_primary_damage");
-		r2 = cvar("g_balance_laser_secondary_damage");
-		if (random() * (r2 + r1) > r1)
-			self.button3 = bot_aim(cvar("g_balance_laser_secondary_speed"), 0, cvar("g_balance_laser_secondary_lifetime"), FALSE);
+		if(cvar("g_balance_laser_secondary"))
+		{
+			r1 = cvar("g_balance_laser_primary_damage");
+			r2 = cvar("g_balance_laser_secondary_damage");
+			if (random() * (r2 + r1) > r1)
+				self.button3 = bot_aim(cvar("g_balance_laser_secondary_speed"), 0, cvar("g_balance_laser_secondary_lifetime"), FALSE);
+			else
+				self.button0 = bot_aim(cvar("g_balance_laser_primary_speed"), 0, cvar("g_balance_laser_primary_lifetime"), FALSE);
+		}
 		else
 			self.button0 = bot_aim(cvar("g_balance_laser_primary_speed"), 0, cvar("g_balance_laser_primary_lifetime"), FALSE);
 	}
 	else if (req == WR_THINK)
 	{
-		if (self.button3)
-		if (weapon_prepareattack(0, cvar("g_balance_laser_secondary_refire")))
-		{
-			W_Laser_Attack(TRUE);
-			weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_laser_secondary_animtime"), w_ready);
-		}
 		if (self.button0)
 		if (weapon_prepareattack(0, cvar("g_balance_laser_primary_refire")))
 		{
 			W_Laser_Attack(FALSE);
 			weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_laser_primary_animtime"), w_ready);
 		}
-		//if (self.button3)
-		//if (client_hasweapon(self, self.cnt, TRUE, FALSE))
-		//	W_SwitchWeapon (self.cnt);
+		if (self.button3)
+		{
+			if(cvar("g_balance_laser_secondary"))
+			{
+				if (weapon_prepareattack(0, cvar("g_balance_laser_secondary_refire")))
+				{
+					W_Laser_Attack(TRUE);
+					weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_laser_secondary_animtime"), w_ready);
+				}
+			}
+			else
+			{
+				if (self.button3)
+				if (client_hasweapon(self, self.cnt, TRUE, FALSE))
+					W_SwitchWeapon (self.cnt);
+			}
+		}
 	}
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_LASER, "laser", 0);

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2007-04-20 10:51:13 UTC (rev 2358)
+++ trunk/data/weapons.cfg	2007-04-20 10:54:53 UTC (rev 2359)
@@ -38,6 +38,7 @@
 set g_balance_laser_primary_refire 0.7
 set g_balance_laser_primary_animtime 0.3
 set g_balance_laser_primary_lifetime 30
+set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
 set g_balance_laser_secondary_damage 35
 set g_balance_laser_secondary_edgedamage 10
 set g_balance_laser_secondary_force 400