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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-05-29 16:28:22 -0400 (Fri, 29 May 2009)
New Revision: 6789

Modified:
   trunk/data/qcsrc/server/w_rocketlauncher.qc
   trunk/data/weapons.cfg
   trunk/data/weaponsHavoc.cfg
Log:
prevent guiding for the first 0.15s after firing rocket to allow exact rocket aim again


Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc	2009-05-29 20:20:51 UTC (rev 6788)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc	2009-05-29 20:28:22 UTC (rev 6789)
@@ -189,19 +189,22 @@
 		{
 			if(!self.rl_release && !self.owner.rl_release && cvar("g_balance_rocketlauncher_guiderate"))
 			{
-				velspeed = vlen(self.velocity);
+				if(time > self.pushltime)
+				{
+					velspeed = vlen(self.velocity);
 
-				makevectors(self.owner.v_angle);
-				desireddir = v_forward;
-				desiredorigin = self.owner.origin + self.owner.view_ofs;
-				olddir = normalize(self.velocity);
+					makevectors(self.owner.v_angle);
+					desireddir = v_forward;
+					desiredorigin = self.owner.origin + self.owner.view_ofs;
+					olddir = normalize(self.velocity);
 
-				// now it gets tricky... we want to move like some curve to approximate the target direction
-				// but we are limiting the rate at which we can turn!
-				goal = desiredorigin + ((self.origin - desiredorigin) * desireddir + cvar("g_balance_rocketlauncher_guidegoal")) * desireddir;
-				newdir = rocket_steerto(olddir, normalize(goal - self.origin), cos(cvar("g_balance_rocketlauncher_guiderate") * frametime * PI / 180));
+					// now it gets tricky... we want to move like some curve to approximate the target direction
+					// but we are limiting the rate at which we can turn!
+					goal = desiredorigin + ((self.origin - desiredorigin) * desireddir + cvar("g_balance_rocketlauncher_guidegoal")) * desireddir;
+					newdir = rocket_steerto(olddir, normalize(goal - self.origin), cos(cvar("g_balance_rocketlauncher_guiderate") * frametime * PI / 180));
 
-				self.velocity = newdir * velspeed;
+					self.velocity = newdir * velspeed;
+				}
 			}
 			else
 				self.rl_release = 1;
@@ -249,6 +252,7 @@
 		missile.spawnshieldtime = time + cvar("g_balance_rocketlauncher_detonatedelay");
 	else
 		missile.spawnshieldtime = -1;
+	missile.pushltime = time + cvar("g_balance_rocketlauncher_guidedelay");
 	missile.classname = "rocket";
 	missile.bot_dodge = TRUE;
 	missile.bot_dodgerating = cvar("g_balance_rocketlauncher_primary_damage") * 2; // * 2 because it can be detonated inflight which makes it even more dangerous

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2009-05-29 20:20:51 UTC (rev 6788)
+++ trunk/data/weapons.cfg	2009-05-29 20:28:22 UTC (rev 6789)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit weaponsHavoc.cfg too.
 
-set cvar_check_weapons c902f188773bf165513eb5ac2642c028
+set cvar_check_weapons 2f93eb8481f44bb2ff744af86a75eccf
 
 // NOTE: this only replaces weapons on the map
 // use g_start_weapon_* to also replace the on-startup weapons!
@@ -267,6 +267,7 @@
 set g_balance_rocketlauncher_detonatedelay 0.2 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
 set g_balance_rocketlauncher_guiderate 120 // max degrees per second
 set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
+set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
 set g_balance_rocketlauncher_laserguided_speed 1000  //650
 set g_balance_rocketlauncher_laserguided_speedaccel 0
 set g_balance_rocketlauncher_laserguided_speedstart 1000

Modified: trunk/data/weaponsHavoc.cfg
===================================================================
--- trunk/data/weaponsHavoc.cfg	2009-05-29 20:20:51 UTC (rev 6788)
+++ trunk/data/weaponsHavoc.cfg	2009-05-29 20:28:22 UTC (rev 6789)
@@ -1,4 +1,4 @@
-set cvar_check_weapons c902f188773bf165513eb5ac2642c028
+set cvar_check_weapons 2f93eb8481f44bb2ff744af86a75eccf
 
 // NOTE: this only replaces weapons on the map
 // use g_start_weapon_* to also replace the on-startup weapons!
@@ -262,6 +262,7 @@
 set g_balance_rocketlauncher_detonatedelay 0.2 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
 set g_balance_rocketlauncher_guiderate 0 // max degrees per second
 set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
+set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
 set g_balance_rocketlauncher_laserguided_speed 1000  //650
 set g_balance_rocketlauncher_laserguided_speedaccel 0
 set g_balance_rocketlauncher_laserguided_speedstart 1000