[nexuiz-commits] r8735 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Mar 2 03:28:39 EST 2010
Author: div0
Date: 2010-03-02 03:28:32 -0500 (Tue, 02 Mar 2010)
New Revision: 8735
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/cl_weaponsystem.qc
trunk/data/qcsrc/server/g_hook.qc
trunk/data/qcsrc/server/w_common.qc
trunk/data/qcsrc/server/w_crylink.qc
trunk/data/qcsrc/server/w_grenadelauncher.qc
Log:
change speed_up_zonly to an extra speed_z variable
Modified: trunk/data/balance.cfg
===================================================================
--- trunk/data/balance.cfg 2010-03-01 20:17:32 UTC (rev 8734)
+++ trunk/data/balance.cfg 2010-03-02 08:28:32 UTC (rev 8735)
@@ -289,6 +289,7 @@
set g_balance_grenadelauncher_primary_radius 140
set g_balance_grenadelauncher_primary_speed 2200
set g_balance_grenadelauncher_primary_speed_up 220
+set g_balance_grenadelauncher_primary_speed_z 0
set g_balance_grenadelauncher_primary_spread 0
set g_balance_grenadelauncher_primary_lifetime 30
set g_balance_grenadelauncher_primary_refire 0.8
@@ -300,7 +301,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_speed_z 0
set g_balance_grenadelauncher_secondary_spread 0
set g_balance_grenadelauncher_secondary_lifetime 1
set g_balance_grenadelauncher_secondary_refire 0.7
@@ -329,6 +330,7 @@
set g_balance_electro_secondary_radius 150
set g_balance_electro_secondary_speed 900
set g_balance_electro_secondary_speed_up 200
+set g_balance_electro_secondary_speed_z 0
set g_balance_electro_secondary_spread 0
set g_balance_electro_secondary_lifetime 2.5
set g_balance_electro_secondary_refire 0.2
@@ -564,6 +566,7 @@
set g_balance_fireball_primary_refire 2
set g_balance_fireball_primary_speed 900
set g_balance_fireball_primary_speed_up 100
+set g_balance_fireball_primary_speed_z 0
set g_balance_fireball_primary_spread 0
set g_balance_fireball_secondary_ammo 25
set g_balance_fireball_secondary_animtime 0.15
Modified: trunk/data/balance25.cfg
===================================================================
--- trunk/data/balance25.cfg 2010-03-01 20:17:32 UTC (rev 8734)
+++ trunk/data/balance25.cfg 2010-03-02 08:28:32 UTC (rev 8735)
@@ -288,6 +288,7 @@
set g_balance_grenadelauncher_primary_radius 140
set g_balance_grenadelauncher_primary_speed 2000
set g_balance_grenadelauncher_primary_speed_up 200
+set g_balance_grenadelauncher_primary_speed_z 0
set g_balance_grenadelauncher_primary_spread 0
set g_balance_grenadelauncher_primary_lifetime 30
set g_balance_grenadelauncher_primary_refire 0.8
@@ -299,7 +300,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_speed_z 0
set g_balance_grenadelauncher_secondary_spread 0
set g_balance_grenadelauncher_secondary_lifetime 2.5
set g_balance_grenadelauncher_secondary_refire 0.7
@@ -328,6 +329,7 @@
set g_balance_electro_secondary_radius 150
set g_balance_electro_secondary_speed 900
set g_balance_electro_secondary_speed_up 200
+set g_balance_electro_secondary_speed_z 0
set g_balance_electro_secondary_spread 0
set g_balance_electro_secondary_lifetime 5
set g_balance_electro_secondary_refire 0.3
@@ -563,6 +565,7 @@
set g_balance_fireball_primary_refire 1.5
set g_balance_fireball_primary_speed 700
set g_balance_fireball_primary_speed_up 100
+set g_balance_fireball_primary_speed_z 0
set g_balance_fireball_primary_spread 0
set g_balance_fireball_secondary_ammo 15
set g_balance_fireball_secondary_animtime 0.15
Modified: trunk/data/balanceHavoc.cfg
===================================================================
--- trunk/data/balanceHavoc.cfg 2010-03-01 20:17:32 UTC (rev 8734)
+++ trunk/data/balanceHavoc.cfg 2010-03-02 08:28:32 UTC (rev 8735)
@@ -288,6 +288,7 @@
set g_balance_grenadelauncher_primary_radius 140
set g_balance_grenadelauncher_primary_speed 2000
set g_balance_grenadelauncher_primary_speed_up 200
+set g_balance_grenadelauncher_primary_speed_z 0
set g_balance_grenadelauncher_primary_spread 0
set g_balance_grenadelauncher_primary_lifetime 30
set g_balance_grenadelauncher_primary_refire 0.8
@@ -299,7 +300,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_speed_z 0
set g_balance_grenadelauncher_secondary_spread 0
set g_balance_grenadelauncher_secondary_lifetime 0.3
set g_balance_grenadelauncher_secondary_refire 1
@@ -328,6 +329,7 @@
set g_balance_electro_secondary_radius 90
set g_balance_electro_secondary_speed 900
set g_balance_electro_secondary_speed_up 200
+set g_balance_electro_secondary_speed_z 0
set g_balance_electro_secondary_spread 0
set g_balance_electro_secondary_lifetime 1
set g_balance_electro_secondary_refire 0.3
@@ -563,6 +565,7 @@
set g_balance_fireball_primary_refire 1.5
set g_balance_fireball_primary_speed 700
set g_balance_fireball_primary_speed_up 100
+set g_balance_fireball_primary_speed_z 0
set g_balance_fireball_primary_spread 0
set g_balance_fireball_secondary_ammo 15
set g_balance_fireball_secondary_animtime 0.15
Modified: trunk/data/balanceNexrun.cfg
===================================================================
--- trunk/data/balanceNexrun.cfg 2010-03-01 20:17:32 UTC (rev 8734)
+++ trunk/data/balanceNexrun.cfg 2010-03-02 08:28:32 UTC (rev 8735)
@@ -289,6 +289,7 @@
set g_balance_grenadelauncher_primary_radius 100
set g_balance_grenadelauncher_primary_speed 2000
set g_balance_grenadelauncher_primary_speed_up 200
+set g_balance_grenadelauncher_primary_speed_z 0
set g_balance_grenadelauncher_primary_spread 0
set g_balance_grenadelauncher_primary_lifetime 5
set g_balance_grenadelauncher_primary_refire 0.7
@@ -299,8 +300,8 @@
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 200
-set g_balance_grenadelauncher_secondary_speed_up_zonly 1
+set g_balance_grenadelauncher_secondary_speed_up 0
+set g_balance_grenadelauncher_secondary_speed_z 200
set g_balance_grenadelauncher_secondary_spread 0
set g_balance_grenadelauncher_secondary_lifetime 2
set g_balance_grenadelauncher_secondary_refire 0.8
@@ -329,6 +330,7 @@
set g_balance_electro_secondary_radius 150
set g_balance_electro_secondary_speed 900
set g_balance_electro_secondary_speed_up 200
+set g_balance_electro_secondary_speed_z 0
set g_balance_electro_secondary_spread 0.05
set g_balance_electro_secondary_lifetime 2.5
set g_balance_electro_secondary_refire 0.1
@@ -565,6 +567,7 @@
set g_balance_fireball_primary_speed 900
set g_balance_fireball_primary_spread 0
set g_balance_fireball_primary_speed_up 100
+set g_balance_fireball_primary_speed_z 0
set g_balance_fireball_secondary_ammo 25
set g_balance_fireball_secondary_animtime 0.15
set g_balance_fireball_secondary_bfgdamage 100
Modified: trunk/data/balanceSamual.cfg
===================================================================
--- trunk/data/balanceSamual.cfg 2010-03-01 20:17:32 UTC (rev 8734)
+++ trunk/data/balanceSamual.cfg 2010-03-02 08:28:32 UTC (rev 8735)
@@ -289,6 +289,7 @@
set g_balance_grenadelauncher_primary_radius 140
set g_balance_grenadelauncher_primary_speed 2200
set g_balance_grenadelauncher_primary_speed_up 220
+set g_balance_grenadelauncher_primary_speed_z 0
set g_balance_grenadelauncher_primary_spread 0
set g_balance_grenadelauncher_primary_lifetime 30
set g_balance_grenadelauncher_primary_refire 0.8
@@ -300,7 +301,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_speed_z 0
set g_balance_grenadelauncher_secondary_spread 0
set g_balance_grenadelauncher_secondary_lifetime 1
set g_balance_grenadelauncher_secondary_refire 0.7
@@ -329,6 +330,7 @@
set g_balance_electro_secondary_radius 150
set g_balance_electro_secondary_speed 900
set g_balance_electro_secondary_speed_up 200
+set g_balance_electro_secondary_speed_z 0
set g_balance_electro_secondary_spread 0
set g_balance_electro_secondary_lifetime 2.5
set g_balance_electro_secondary_refire 0.2
@@ -564,6 +566,7 @@
set g_balance_fireball_primary_refire 2
set g_balance_fireball_primary_speed 900
set g_balance_fireball_primary_speed_up 100
+set g_balance_fireball_primary_speed_z 0
set g_balance_fireball_primary_spread 0
set g_balance_fireball_secondary_ammo 25
set g_balance_fireball_secondary_animtime 0.15
Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc 2010-03-01 20:17:32 UTC (rev 8734)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc 2010-03-02 08:28:32 UTC (rev 8735)
@@ -1531,12 +1531,13 @@
float mspercallsstyle;
float mspercallcount;
#endif
-void W_SetupProjectileVelocityEx(entity missile, vector dir, vector upDir, float pSpeed, float pUpSpeed, float spread)
+void W_SetupProjectileVelocityEx(entity missile, vector dir, vector upDir, float pSpeed, float pUpSpeed, float pZSpeed, float spread)
{
if(missile.owner == world)
error("Unowned missile");
dir = dir + upDir * (pUpSpeed / pSpeed);
+ dir_z += pZSpeed / pSpeed;
pSpeed *= vlen(dir);
dir = normalize(dir);
@@ -1563,5 +1564,5 @@
W_SetupProjectileVelocityEx(missile, w_shotdir, v_up, pSpeed, 0, spread);
}
-#define W_SETUPPROJECTILEVELOCITY_UP(m,s) W_SetupProjectileVelocityEx(m, w_shotdir, v_up, cvar(#s "_speed"), cvar(#s "_speed_up"), cvar(#s "_spread"))
-#define W_SETUPPROJECTILEVELOCITY(m,s) W_SetupProjectileVelocityEx(m, w_shotdir, v_up, cvar(#s "_speed"), 0, cvar(#s "_spread"))
+#define W_SETUPPROJECTILEVELOCITY_UP(m,s) W_SetupProjectileVelocityEx(m, w_shotdir, v_up, cvar(#s "_speed"), cvar(#s "_speed_up"), cvar(#s "_speed_z"), cvar(#s "_spread"))
+#define W_SETUPPROJECTILEVELOCITY(m,s) W_SetupProjectileVelocityEx(m, w_shotdir, v_up, cvar(#s "_speed"), 0, 0, cvar(#s "_spread"))
Modified: trunk/data/qcsrc/server/g_hook.qc
===================================================================
--- trunk/data/qcsrc/server/g_hook.qc 2010-03-01 20:17:32 UTC (rev 8734)
+++ trunk/data/qcsrc/server/g_hook.qc 2010-03-02 08:28:32 UTC (rev 8735)
@@ -307,7 +307,7 @@
missile.state = 0; // not latched onto anything
- W_SetupProjectileVelocityEx(missile, v_forward, v_up, cvar("g_balance_grapplehook_speed_fly"), 0, 0);
+ W_SetupProjectileVelocityEx(missile, v_forward, v_up, cvar("g_balance_grapplehook_speed_fly"), 0, 0, 0);
missile.angles = vectoangles (missile.velocity);
//missile.glow_color = 250; // 244, 250
Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc 2010-03-01 20:17:32 UTC (rev 8734)
+++ trunk/data/qcsrc/server/w_common.qc 2010-03-02 08:28:32 UTC (rev 8735)
@@ -349,7 +349,7 @@
proj.movetype = MOVETYPE_FLY;
proj.think = SUB_Remove;
proj.nextthink = time + lifetime; // min(pLifetime, vlen(world.maxs - world.mins) / pSpeed);
- W_SetupProjectileVelocityEx(proj, dir, v_up, pSpeed, 0, spread);
+ W_SetupProjectileVelocityEx(proj, dir, v_up, pSpeed, 0, 0, spread);
proj.angles = vectoangles(proj.velocity);
proj.dmg_radius = cvar("g_ballistics_materialconstant") / bulletconstant;
// so: bulletconstant = bullet mass / area of bullet circle
Modified: trunk/data/qcsrc/server/w_crylink.qc
===================================================================
--- trunk/data/qcsrc/server/w_crylink.qc 2010-03-01 20:17:32 UTC (rev 8734)
+++ trunk/data/qcsrc/server/w_crylink.qc 2010-03-02 08:28:32 UTC (rev 8735)
@@ -104,7 +104,7 @@
s_z = v_forward_y;
}
s = s * cvar("g_balance_crylink_primary_spread") * g_weaponspreadfactor;
- W_SetupProjectileVelocityEx(proj, w_shotdir + right * s_y + up * s_z, v_up, cvar("g_balance_crylink_primary_speed"), 0, 0);
+ W_SetupProjectileVelocityEx(proj, w_shotdir + right * s_y + up * s_z, v_up, cvar("g_balance_crylink_primary_speed"), 0, 0, 0);
proj.touch = W_Crylink_Touch;
if(counter == 0)
SUB_SetFade(proj, time + cvar("g_balance_crylink_primary_middle_lifetime"), cvar("g_balance_crylink_primary_middle_fadetime"));
@@ -155,7 +155,7 @@
setorigin (proj, w_shotorg);
setsize(proj, '0 0 0', '0 0 0');
- W_SetupProjectileVelocityEx(proj, (w_shotdir + (((counter + 0.5) / shots) * 2 - 1) * v_right * cvar("g_balance_crylink_secondary_spread") * g_weaponspreadfactor), v_up, cvar("g_balance_crylink_secondary_speed"), 0, 0);
+ W_SetupProjectileVelocityEx(proj, (w_shotdir + (((counter + 0.5) / shots) * 2 - 1) * v_right * cvar("g_balance_crylink_secondary_spread") * g_weaponspreadfactor), v_up, cvar("g_balance_crylink_secondary_speed"), 0, 0, 0);
proj.touch = W_Crylink_Touch2;
if(counter == (shots - 1) / 2)
SUB_SetFade(proj, time + cvar("g_balance_crylink_secondary_middle_lifetime"), cvar("g_balance_crylink_secondary_middle_fadetime"));
Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc 2010-03-01 20:17:32 UTC (rev 8734)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc 2010-03-02 08:28:32 UTC (rev 8735)
@@ -140,10 +140,7 @@
gren.health = cvar("g_balance_grenadelauncher_secondary_health");
gren.damageforcescale = cvar("g_balance_grenadelauncher_secondary_damageforcescale");
gren.event_damage = W_Grenade_Damage;
- 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);
+ W_SETUPPROJECTILEVELOCITY_UP(gren, g_balance_grenadelauncher_secondary);
gren.angles = vectoangles (gren.velocity);
gren.flags = FL_PROJECTILE;
More information about the nexuiz-commits
mailing list