[nexuiz-commits] r7873 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-23 05:33:53 -0400 (Wed, 23 Sep 2009)
New Revision: 7873

Modified:
   trunk/data/qcsrc/server/cl_weaponsystem.qc
   trunk/data/qcsrc/server/w_electro.qc
   trunk/data/weapons.cfg
   trunk/data/weapons25.cfg
   trunk/data/weaponsHavoc.cfg
Log:
electro: add a cvar to bring back three-shot electro
(set refire to 1, and count to 3)


Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2009-09-23 07:24:19 UTC (rev 7872)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2009-09-23 09:33:53 UTC (rev 7873)
@@ -1022,13 +1022,15 @@
 	if(self.switchweapon != self.weapon)
 		return FALSE;
 
-	// don't fire if previous attack is not finished
 	if(attacktime >= 0)
+	{
+		// don't fire if previous attack is not finished
 		if (ATTACK_FINISHED(self) > time + frametime * 0.5)
 			return FALSE;
-	// don't fire while changing weapon
-	if (self.weaponentity.state != WS_READY)
-		return FALSE;
+		// don't fire while changing weapon
+		if (self.weaponentity.state != WS_READY)
+			return FALSE;
+	}
 	self.weaponentity.state = WS_INUSE;
 
 	self.spawnshieldtime = min(self.spawnshieldtime, time); // kill spawn shield when you fire

Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc	2009-09-23 07:24:19 UTC (rev 7872)
+++ trunk/data/qcsrc/server/w_electro.qc	2009-09-23 09:33:53 UTC (rev 7873)
@@ -1,3 +1,4 @@
+.float electro_count;
 
 void W_Plasma_Explode (void)
 {
@@ -158,6 +159,21 @@
 	weapon_defaultspawnfunc(WEP_ELECTRO);
 }
 
+void w_electro_checkattack()
+{
+	if(self.electro_count > 1)
+	if(self.BUTTON_ATCK2)
+	if(weapon_prepareattack(1, -1))
+	{
+		W_Electro_Attack2();
+		self.electro_count -= 1;
+		weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_electro_secondary_animtime"), w_electro_checkattack);
+		return;
+	}
+
+	w_ready();
+}
+
 .float bot_secondary_electromooth;
 float w_electro(float req)
 {
@@ -196,7 +212,8 @@
 		if (weapon_prepareattack(1, cvar("g_balance_electro_secondary_refire")))
 		{
 			W_Electro_Attack2();
-			weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_electro_secondary_animtime"), w_ready);
+			self.electro_count = cvar("g_balance_electro_secondary_count");
+			weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_electro_secondary_animtime"), w_electro_checkattack);
 		}
 	}
 	else if (req == WR_PRECACHE)

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2009-09-23 07:24:19 UTC (rev 7872)
+++ trunk/data/weapons.cfg	2009-09-23 09:33:53 UTC (rev 7873)
@@ -185,6 +185,7 @@
 set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_damageforcescale 4
+set g_balance_electro_secondary_count 1
 set g_balance_electro_combo_damage 80
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 200

Modified: trunk/data/weapons25.cfg
===================================================================
--- trunk/data/weapons25.cfg	2009-09-23 07:24:19 UTC (rev 7872)
+++ trunk/data/weapons25.cfg	2009-09-23 09:33:53 UTC (rev 7873)
@@ -185,6 +185,7 @@
 set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_damageforcescale 4
+set g_balance_electro_secondary_count 1
 set g_balance_electro_combo_damage 80
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 200

Modified: trunk/data/weaponsHavoc.cfg
===================================================================
--- trunk/data/weaponsHavoc.cfg	2009-09-23 07:24:19 UTC (rev 7872)
+++ trunk/data/weaponsHavoc.cfg	2009-09-23 09:33:53 UTC (rev 7873)
@@ -180,6 +180,7 @@
 set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_damageforcescale 4
+set g_balance_electro_secondary_count 1
 set g_balance_electro_combo_damage 80
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 200