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

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Thu Sep 24 07:20:00 EDT 2009


Author: div0
Date: 2009-09-24 07:19:59 -0400 (Thu, 24 Sep 2009)
New Revision: 7891

Modified:
   trunk/data/balance.cfg
   trunk/data/balance25.cfg
   trunk/data/balanceHavoc.cfg
   trunk/data/qcsrc/server/g_triggers.qc
   trunk/data/qcsrc/server/w_common.qc
   trunk/data/qcsrc/server/w_minstanex.qc
   trunk/data/qcsrc/server/w_nex.qc
Log:
forcehalflife for the nex too


Modified: trunk/data/balance.cfg
===================================================================
--- trunk/data/balance.cfg	2009-09-24 11:12:42 UTC (rev 7890)
+++ trunk/data/balance.cfg	2009-09-24 11:19:59 UTC (rev 7891)
@@ -366,6 +366,7 @@
 set g_balance_nex_damagefalloff_mindist 0
 set g_balance_nex_damagefalloff_maxdist 0
 set g_balance_nex_damagefalloff_halflife 0
+set g_balance_nex_damagefalloff_forcehalflife 0
 //   }}}
 //   {{{ minstanex
 set g_balance_minstanex_refire 1

Modified: trunk/data/balance25.cfg
===================================================================
--- trunk/data/balance25.cfg	2009-09-24 11:12:42 UTC (rev 7890)
+++ trunk/data/balance25.cfg	2009-09-24 11:19:59 UTC (rev 7891)
@@ -366,6 +366,7 @@
 set g_balance_nex_damagefalloff_mindist 0
 set g_balance_nex_damagefalloff_maxdist 0
 set g_balance_nex_damagefalloff_halflife 0
+set g_balance_nex_damagefalloff_forcehalflife 0
 //   }}}
 //   {{{ minstanex
 set g_balance_minstanex_refire 1

Modified: trunk/data/balanceHavoc.cfg
===================================================================
--- trunk/data/balanceHavoc.cfg	2009-09-24 11:12:42 UTC (rev 7890)
+++ trunk/data/balanceHavoc.cfg	2009-09-24 11:19:59 UTC (rev 7891)
@@ -366,6 +366,7 @@
 set g_balance_nex_damagefalloff_mindist 0
 set g_balance_nex_damagefalloff_maxdist 0
 set g_balance_nex_damagefalloff_halflife 0
+set g_balance_nex_damagefalloff_forcehalflife 0
 //   }}}
 //   {{{ minstanex
 set g_balance_minstanex_refire 1

Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2009-09-24 11:12:42 UTC (rev 7890)
+++ trunk/data/qcsrc/server/g_triggers.qc	2009-09-24 11:19:59 UTC (rev 7891)
@@ -838,7 +838,7 @@
 };
 
 
-void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, float mindist, float maxdist, float halflifedist, float deathtype);
+void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, float mindist, float maxdist, float halflifedist, float forcehalflifedist, float deathtype);
 
 .float modelscale;
 void misc_laser_aim()
@@ -914,9 +914,9 @@
 	if(self.dmg)
 	{
 		if(self.dmg < 0)
-			FireRailgunBullet(self.origin, o, 100000, 0, 0, 0, 0, DEATH_HURTTRIGGER);
+			FireRailgunBullet(self.origin, o, 100000, 0, 0, 0, 0, 0, DEATH_HURTTRIGGER);
 		else
-			FireRailgunBullet(self.origin, o, self.dmg * frametime, 0, 0, 0, 0, DEATH_HURTTRIGGER);
+			FireRailgunBullet(self.origin, o, self.dmg * frametime, 0, 0, 0, 0, 0, DEATH_HURTTRIGGER);
 	}
 
 	if(self.enemy.target != "") // DETECTOR laser

Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc	2009-09-24 11:12:42 UTC (rev 7890)
+++ trunk/data/qcsrc/server/w_common.qc	2009-09-24 11:19:59 UTC (rev 7891)
@@ -27,7 +27,7 @@
 	self = oldself;
 }
 
-void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, float mindist, float maxdist, float halflifedist, float deathtype)
+void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, float mindist, float maxdist, float halflifedist, float forcehalflifedist, float deathtype)
 {
 	local vector hitloc, force, endpoint, dir;
 	local entity ent, endent;
@@ -38,7 +38,7 @@
 	vector beampos;
 	string snd;
 	entity pseudoprojectile;
-	float f;
+	float f, ffs;
 
 	did_hit = 0;
 
@@ -138,10 +138,11 @@
 			did_hit = 0;
 
 		f = ExponentialFalloff(mindist, maxdist, halflifedist, (msg_entity.origin - start) * dir);
+		ffs = ExponentialFalloff(mindist, maxdist, forcehalflifedist, (msg_entity.origin - start) * dir);
 
 		// apply the damage
 		if (ent.takedamage)
-			Damage (ent, self, self, bdamage * f, deathtype, hitloc, force * f);
+			Damage (ent, self, self, bdamage * f, deathtype, hitloc, force * ffs);
 
 		// create a small explosion to throw gibs around (if applicable)
 		//setorigin (explosion, hitloc);

Modified: trunk/data/qcsrc/server/w_minstanex.qc
===================================================================
--- trunk/data/qcsrc/server/w_minstanex.qc	2009-09-24 11:12:42 UTC (rev 7890)
+++ trunk/data/qcsrc/server/w_minstanex.qc	2009-09-24 11:19:59 UTC (rev 7891)
@@ -10,7 +10,7 @@
 	yoda = 0;
 	damage_goodhits = 0;
 	headshot = 0;
-	FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, 10000, 800, 0, 0, 0, WEP_MINSTANEX);
+	FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, 10000, 800, 0, 0, 0, 0, WEP_MINSTANEX);
 
 	if(g_minstagib)
 	{

Modified: trunk/data/qcsrc/server/w_nex.qc
===================================================================
--- trunk/data/qcsrc/server/w_nex.qc	2009-09-24 11:12:42 UTC (rev 7890)
+++ trunk/data/qcsrc/server/w_nex.qc	2009-09-24 11:19:59 UTC (rev 7891)
@@ -18,7 +18,7 @@
 	W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", cvar("g_balance_nex_damage"));
 
 	yoda = 0;
-	FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, cvar("g_balance_nex_damage"), cvar("g_balance_nex_force"), cvar("g_balance_nex_damagefalloff_mindist"), cvar("g_balance_nex_damagefalloff_maxdist"), cvar("g_balance_nex_damagefalloff_halflife"), WEP_NEX);
+	FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, cvar("g_balance_nex_damage"), cvar("g_balance_nex_force"), cvar("g_balance_nex_damagefalloff_mindist"), cvar("g_balance_nex_damagefalloff_maxdist"), cvar("g_balance_nex_damagefalloff_halflife"), cvar("g_balance_nex_damagefalloff_forcehalflife"), WEP_NEX);
 
 	if(yoda && flying)
 		announce(self, "announcer/male/yoda.wav");



More information about the nexuiz-commits mailing list