From 6f7b0d85933e11ac8cb86ad36b8ae0169e9764a5 Mon Sep 17 00:00:00 2001 From: fruitiex Date: Wed, 24 Feb 2010 15:59:02 +0000 Subject: [PATCH] new cvar: allow grenade speed_up to only affect z-axis speed git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8664 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/balance.cfg | 1 + data/balance25.cfg | 1 + data/balanceHavoc.cfg | 1 + data/balanceNexrun.cfg | 5 +++-- data/balanceSamual.cfg | 1 + data/qcsrc/server/w_grenadelauncher.qc | 5 ++++- 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/data/balance.cfg b/data/balance.cfg index ec63c5b80..3e8dc0773 100644 --- a/data/balance.cfg +++ b/data/balance.cfg @@ -300,6 +300,7 @@ set g_balance_grenadelauncher_secondary_force 400 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 diff --git a/data/balance25.cfg b/data/balance25.cfg index 93fed08dd..850b4ef8a 100644 --- a/data/balance25.cfg +++ b/data/balance25.cfg @@ -299,6 +299,7 @@ set g_balance_grenadelauncher_secondary_force 400 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 diff --git a/data/balanceHavoc.cfg b/data/balanceHavoc.cfg index f769a8f4d..695d42a82 100644 --- a/data/balanceHavoc.cfg +++ b/data/balanceHavoc.cfg @@ -299,6 +299,7 @@ set g_balance_grenadelauncher_secondary_force 400 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 diff --git a/data/balanceNexrun.cfg b/data/balanceNexrun.cfg index 4285e3638..84101fc97 100644 --- a/data/balanceNexrun.cfg +++ b/data/balanceNexrun.cfg @@ -299,9 +299,10 @@ set g_balance_grenadelauncher_secondary_edgedamage 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 diff --git a/data/balanceSamual.cfg b/data/balanceSamual.cfg index 18a9ea956..68c608dba 100644 --- a/data/balanceSamual.cfg +++ b/data/balanceSamual.cfg @@ -300,6 +300,7 @@ set g_balance_grenadelauncher_secondary_force 400 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 diff --git a/data/qcsrc/server/w_grenadelauncher.qc b/data/qcsrc/server/w_grenadelauncher.qc index 80b702013..05f11d2b3 100644 --- a/data/qcsrc/server/w_grenadelauncher.qc +++ b/data/qcsrc/server/w_grenadelauncher.qc @@ -140,7 +140,10 @@ void W_Grenade_Attack2 (void) 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; -- 2.39.2