r1955 - in branches/nexuiz-2.0/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-11-30 05:04:25 -0500 (Thu, 30 Nov 2006)
New Revision: 1955

Modified:
   branches/nexuiz-2.0/data/default.cfg
   branches/nexuiz-2.0/data/qcsrc/server/w_nex.qc
Log:
separate minstagib settings


Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg	2006-11-30 10:02:35 UTC (rev 1954)
+++ branches/nexuiz-2.0/data/default.cfg	2006-11-30 10:04:25 UTC (rev 1955)
@@ -477,6 +477,8 @@
 set g_balance_nex_damage 140
 set g_balance_nex_refire 1.5
 set g_balance_nex_animtime 0.3
+set g_balance_minstagib_nex_refire 1.5
+set g_balance_minstagib_nex_animtime 0.3
 set g_balance_nex_ammo 5
 set g_balance_nex_respawntime_modifier 1
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_nex.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_nex.qc	2006-11-30 10:02:35 UTC (rev 1954)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_nex.qc	2006-11-30 10:04:25 UTC (rev 1955)
@@ -142,10 +142,23 @@
 	else if (req == WR_THINK)
 	{
 		if (self.button0)
-		if (weapon_prepareattack(0, cvar("g_balance_nex_refire")))
 		{
-			W_Nex_Attack();
-			weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nex_animtime"), w_ready);
+			if(cvar("g_minstagib"))
+			{
+				if (weapon_prepareattack(0, cvar("g_balance_minstagib_nex_refire")))
+				{
+					W_Nex_Attack();
+					weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_minstagib_nex_animtime"), w_ready);
+				}
+			}
+			else
+			{
+				if (weapon_prepareattack(0, cvar("g_balance_nex_refire")))
+				{
+					W_Nex_Attack();
+					weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nex_animtime"), w_ready);
+				}
+			}
 		}
 	}
 	else if (req == WR_SETUP)