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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-12 06:39:09 -0400 (Sat, 12 Sep 2009)
New Revision: 7746

Modified:
   trunk/data/qcsrc/server/w_rocketlauncher.qc
   trunk/data/weapons.cfg
   trunk/data/weapons25.cfg
   trunk/data/weaponsHavoc.cfg
Log:
RL guide rate delay - smoothly enable guiding


Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc	2009-09-12 10:24:04 UTC (rev 7745)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc	2009-09-12 10:39:09 UTC (rev 7746)
@@ -129,7 +129,7 @@
 {
 	entity e;
 	vector desireddir, olddir, newdir, desiredorigin, goal;
-	float turnrate, velspeed;
+	float turnrate, velspeed, f;
 	self.nextthink = time;
 	if (time > self.cnt)
 	{
@@ -205,6 +205,7 @@
 			if(time > self.pushltime)
 			if(self.owner.deadflag == DEAD_NO)
 			{
+				f = min(1, (time - self.pushltime) / cvar("g_balance_rocketlauncher_guideratetime"));
 				velspeed = vlen(self.velocity);
 
 				makevectors(self.owner.v_angle);
@@ -215,7 +216,7 @@
 				// 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));
+				newdir = rocket_steerto(olddir, normalize(goal - self.origin), cos(cvar("g_balance_rocketlauncher_guiderate") * f * frametime * PI / 180));
 
 				self.velocity = newdir * velspeed;
 			}

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2009-09-12 10:24:04 UTC (rev 7745)
+++ trunk/data/weapons.cfg	2009-09-12 10:39:09 UTC (rev 7746)
@@ -273,8 +273,9 @@
 set g_balance_rocketlauncher_damageforcescale 0
 set g_balance_rocketlauncher_detonatedelay 0.05 // 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 360 // max degrees per second
+set g_balance_rocketlauncher_guideratedelay 0.1 // immediate
 set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
-set g_balance_rocketlauncher_guidedelay 0.1 // delay before guiding kicks in
+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/weapons25.cfg
===================================================================
--- trunk/data/weapons25.cfg	2009-09-12 10:24:04 UTC (rev 7745)
+++ trunk/data/weapons25.cfg	2009-09-12 10:39:09 UTC (rev 7746)
@@ -273,6 +273,7 @@
 set g_balance_rocketlauncher_damageforcescale 4
 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 90 // max degrees per second
+set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
 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

Modified: trunk/data/weaponsHavoc.cfg
===================================================================
--- trunk/data/weaponsHavoc.cfg	2009-09-12 10:24:04 UTC (rev 7745)
+++ trunk/data/weaponsHavoc.cfg	2009-09-12 10:39:09 UTC (rev 7746)
@@ -268,8 +268,9 @@
 set g_balance_rocketlauncher_damageforcescale 0
 set g_balance_rocketlauncher_detonatedelay 0.05 // 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 360 // max degrees per second
+set g_balance_rocketlauncher_guideratedelay 0.1 // immediate
 set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
-set g_balance_rocketlauncher_guidedelay 0.1 // delay before guiding kicks in
+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