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

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2010-03-04 05:51:37 -0500 (Thu, 04 Mar 2010)
New Revision: 8738

Modified:
   trunk/data/balance.cfg
   trunk/data/balance25.cfg
   trunk/data/balanceHavoc.cfg
   trunk/data/balanceNexrun.cfg
   trunk/data/balanceSamual.cfg
   trunk/data/qcsrc/server/w_electro.qc
   trunk/data/qcsrc/server/w_hagar.qc
Log:
had forgotten to commit disabling of hagar secondary to nexrun, also fix precache issue with electro lightning gun mode

Modified: trunk/data/balance.cfg
===================================================================
--- trunk/data/balance.cfg	2010-03-03 06:53:03 UTC (rev 8737)
+++ trunk/data/balance.cfg	2010-03-04 10:51:37 UTC (rev 8738)
@@ -413,6 +413,7 @@
 set g_balance_hagar_primary_lifetime 30
 set g_balance_hagar_primary_refire 0.15
 set g_balance_hagar_primary_ammo 1
+set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_damage 20
 set g_balance_hagar_secondary_edgedamage 10
 set g_balance_hagar_secondary_force 50

Modified: trunk/data/balance25.cfg
===================================================================
--- trunk/data/balance25.cfg	2010-03-03 06:53:03 UTC (rev 8737)
+++ trunk/data/balance25.cfg	2010-03-04 10:51:37 UTC (rev 8738)
@@ -412,6 +412,7 @@
 set g_balance_hagar_primary_lifetime 30
 set g_balance_hagar_primary_refire 0.15
 set g_balance_hagar_primary_ammo 1
+set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_damage 37
 set g_balance_hagar_secondary_edgedamage 15
 set g_balance_hagar_secondary_force 100

Modified: trunk/data/balanceHavoc.cfg
===================================================================
--- trunk/data/balanceHavoc.cfg	2010-03-03 06:53:03 UTC (rev 8737)
+++ trunk/data/balanceHavoc.cfg	2010-03-04 10:51:37 UTC (rev 8738)
@@ -412,6 +412,7 @@
 set g_balance_hagar_primary_lifetime 30
 set g_balance_hagar_primary_refire 0.1
 set g_balance_hagar_primary_ammo 1
+set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_damage 30
 set g_balance_hagar_secondary_edgedamage 0
 set g_balance_hagar_secondary_force 50

Modified: trunk/data/balanceNexrun.cfg
===================================================================
--- trunk/data/balanceNexrun.cfg	2010-03-03 06:53:03 UTC (rev 8737)
+++ trunk/data/balanceNexrun.cfg	2010-03-04 10:51:37 UTC (rev 8738)
@@ -413,6 +413,7 @@
 set g_balance_hagar_primary_lifetime 5
 set g_balance_hagar_primary_refire 0.1
 set g_balance_hagar_primary_ammo 1
+set g_balance_hagar_secondary 0
 set g_balance_hagar_secondary_damage 11
 set g_balance_hagar_secondary_edgedamage 4
 set g_balance_hagar_secondary_force 60

Modified: trunk/data/balanceSamual.cfg
===================================================================
--- trunk/data/balanceSamual.cfg	2010-03-03 06:53:03 UTC (rev 8737)
+++ trunk/data/balanceSamual.cfg	2010-03-04 10:51:37 UTC (rev 8738)
@@ -413,6 +413,7 @@
 set g_balance_hagar_primary_lifetime 30
 set g_balance_hagar_primary_refire 0.15
 set g_balance_hagar_primary_ammo 1
+set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_damage 20
 set g_balance_hagar_secondary_edgedamage 10
 set g_balance_hagar_secondary_force 50

Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc	2010-03-03 06:53:03 UTC (rev 8737)
+++ trunk/data/qcsrc/server/w_electro.qc	2010-03-04 10:51:37 UTC (rev 8738)
@@ -276,6 +276,8 @@
 		precache_sound ("weapons/electro_fire2.wav");
 		precache_sound ("weapons/electro_impact.wav");
 		precache_sound ("weapons/electro_impact_combo.wav");
+		if(cvar("g_balance_electro_lightning"))
+			precache_sound ("weapons/crylink_fire2.wav");
 	}
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_ELECTRO);

Modified: trunk/data/qcsrc/server/w_hagar.qc
===================================================================
--- trunk/data/qcsrc/server/w_hagar.qc	2010-03-03 06:53:03 UTC (rev 8737)
+++ trunk/data/qcsrc/server/w_hagar.qc	2010-03-04 10:51:37 UTC (rev 8738)
@@ -130,7 +130,7 @@
 			W_Hagar_Attack();
 			weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hagar_primary_refire"), w_ready);
 		}
-		if (self.BUTTON_ATCK2)
+		if (self.BUTTON_ATCK2 && cvar("g_balance_hagar_secondary"))
 		if (weapon_prepareattack(1, cvar("g_balance_hagar_secondary_refire")))
 		{
 			W_Hagar_Attack2();