From d449ce801d759f68e4c96bf1cd1eb135bcb1b8b2 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Fri, 20 Apr 2007 10:54:53 +0000
Subject: [PATCH] - 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

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2359 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/default.cfg             |  1 -
 data/empty.cfg               |  1 +
 data/nexuiz-credits.txt      |  1 -
 data/qcsrc/server/g_world.qc |  2 +-
 data/qcsrc/server/w_laser.qc | 39 ++++++++++++++++++++++++------------
 data/weapons.cfg             |  1 +
 6 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/data/default.cfg b/data/default.cfg
index 3b8975c43..4d03e3900 100644
--- a/data/default.cfg
+++ b/data/default.cfg
@@ -122,7 +122,6 @@ set sv_autoscreenshot 0
 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
diff --git a/data/empty.cfg b/data/empty.cfg
index e69de29bb..80d65ffb5 100644
--- a/data/empty.cfg
+++ b/data/empty.cfg
@@ -0,0 +1 @@
+// not so empty now
diff --git a/data/nexuiz-credits.txt b/data/nexuiz-credits.txt
index ebf66a94b..5dadcb125 100644
--- a/data/nexuiz-credits.txt
+++ b/data/nexuiz-credits.txt
@@ -81,7 +81,6 @@ Level Designer
 
 Thanks:
 
-
 Gerd "Elysis" Raudenbusch
 
 Qantourisc
diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index fc01b54d7..17bbdd315 100644
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -627,7 +627,7 @@ float() MaplistMethod_Random = // random map selection
 
 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;
 
diff --git a/data/qcsrc/server/w_laser.qc b/data/qcsrc/server/w_laser.qc
index 1d9562752..e353490a7 100644
--- a/data/qcsrc/server/w_laser.qc
+++ b/data/qcsrc/server/w_laser.qc
@@ -79,30 +79,43 @@ float(float req) w_laser =
 	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);
diff --git a/data/weapons.cfg b/data/weapons.cfg
index 653f3d64f..261f2a120 100644
--- a/data/weapons.cfg
+++ b/data/weapons.cfg
@@ -38,6 +38,7 @@ set g_balance_laser_primary_speed 9000
 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
-- 
2.39.2