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

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2010-02-24 10:59:02 -0500 (Wed, 24 Feb 2010)
New Revision: 8664

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_grenadelauncher.qc
Log:
new cvar: allow grenade speed_up to only affect z-axis speed

Modified: trunk/data/balance.cfg
===================================================================
--- trunk/data/balance.cfg	2010-02-24 14:44:44 UTC (rev 8663)
+++ trunk/data/balance.cfg	2010-02-24 15:59:02 UTC (rev 8664)
@@ -300,6 +300,7 @@
 set g_balance_grenadelauncher_secondary_radius 140
 set g_balance_grenadelauncher_secondary_speed 1400
 set g_balance_grenadelauncher_secondary_speed_up 150
+set g_balance_grenadelauncher_secondary_speed_up_zonly 0
 set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 1
 set g_balance_grenadelauncher_secondary_refire 0.7

Modified: trunk/data/balance25.cfg
===================================================================
--- trunk/data/balance25.cfg	2010-02-24 14:44:44 UTC (rev 8663)
+++ trunk/data/balance25.cfg	2010-02-24 15:59:02 UTC (rev 8664)
@@ -299,6 +299,7 @@
 set g_balance_grenadelauncher_secondary_radius 140
 set g_balance_grenadelauncher_secondary_speed 1400
 set g_balance_grenadelauncher_secondary_speed_up 200
+set g_balance_grenadelauncher_secondary_speed_up_zonly 0
 set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 2.5
 set g_balance_grenadelauncher_secondary_refire 0.7

Modified: trunk/data/balanceHavoc.cfg
===================================================================
--- trunk/data/balanceHavoc.cfg	2010-02-24 14:44:44 UTC (rev 8663)
+++ trunk/data/balanceHavoc.cfg	2010-02-24 15:59:02 UTC (rev 8664)
@@ -299,6 +299,7 @@
 set g_balance_grenadelauncher_secondary_radius 140
 set g_balance_grenadelauncher_secondary_speed 1400
 set g_balance_grenadelauncher_secondary_speed_up 200
+set g_balance_grenadelauncher_secondary_speed_up_zonly 0
 set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 0.3
 set g_balance_grenadelauncher_secondary_refire 1

Modified: trunk/data/balanceNexrun.cfg
===================================================================
--- trunk/data/balanceNexrun.cfg	2010-02-24 14:44:44 UTC (rev 8663)
+++ trunk/data/balanceNexrun.cfg	2010-02-24 15:59:02 UTC (rev 8664)
@@ -299,9 +299,10 @@
 set g_balance_grenadelauncher_secondary_force 300
 set g_balance_grenadelauncher_secondary_radius 200
 set g_balance_grenadelauncher_secondary_speed 800
-set g_balance_grenadelauncher_secondary_speed_up 0
+set g_balance_grenadelauncher_secondary_speed_up 200
+set g_balance_grenadelauncher_secondary_speed_up_zonly 1
 set g_balance_grenadelauncher_secondary_spread 0
-set g_balance_grenadelauncher_secondary_lifetime 1.5
+set g_balance_grenadelauncher_secondary_lifetime 2
 set g_balance_grenadelauncher_secondary_refire 0.8
 set g_balance_grenadelauncher_secondary_animtime 0.5
 set g_balance_grenadelauncher_secondary_ammo 2

Modified: trunk/data/balanceSamual.cfg
===================================================================
--- trunk/data/balanceSamual.cfg	2010-02-24 14:44:44 UTC (rev 8663)
+++ trunk/data/balanceSamual.cfg	2010-02-24 15:59:02 UTC (rev 8664)
@@ -300,6 +300,7 @@
 set g_balance_grenadelauncher_secondary_radius 140
 set g_balance_grenadelauncher_secondary_speed 1400
 set g_balance_grenadelauncher_secondary_speed_up 150
+set g_balance_grenadelauncher_secondary_speed_up_zonly 0
 set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 1
 set g_balance_grenadelauncher_secondary_refire 0.7

Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc	2010-02-24 14:44:44 UTC (rev 8663)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc	2010-02-24 15:59:02 UTC (rev 8664)
@@ -140,7 +140,10 @@
 	gren.health = cvar("g_balance_grenadelauncher_secondary_health");
 	gren.damageforcescale = cvar("g_balance_grenadelauncher_secondary_damageforcescale");
 	gren.event_damage = W_Grenade_Damage;
-	W_SETUPPROJECTILEVELOCITY_UP(gren, g_balance_grenadelauncher_secondary);
+	if(cvar("g_balance_grenadelauncher_secondary_speed_up_zonly"))
+		W_SetupProjectileVelocityEx(gren, w_shotdir, '0 0 1', cvar("g_balance_grenadelauncher_secondary_speed"), cvar("g_balance_grenadelauncher_secondary_speed_up"), cvar("g_balance_grenadelauncher_secondary_spread"));
+	else
+		W_SETUPPROJECTILEVELOCITY_UP(gren, g_balance_grenadelauncher_secondary);
 
 	gren.angles = vectoangles (gren.velocity);
 	gren.flags = FL_PROJECTILE;