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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-23 00:54:41 -0400 (Wed, 23 Sep 2009)
New Revision: 7865

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/w_common.qc
   trunk/data/weapons.cfg
Log:
turn off ballistics for the mg and sg


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-09-22 15:18:10 UTC (rev 7864)
+++ trunk/data/defaultNexuiz.cfg	2009-09-23 04:54:41 UTC (rev 7865)
@@ -1539,6 +1539,7 @@
 //   Quake-Pascal: 1 qPa = 1 qN / 1 qu^2
 
 set g_ballistics_materialconstant 1414213562
+set g_ballistics_mindistance 16
 // unit: qJ / qu^3 (energy needed per volume unit of solid to push/burn away
 // parameter: bullet constant: mass / area in g/qu^2
 // = mass / (pi/4 * caliber^2)

Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc	2009-09-22 15:18:10 UTC (rev 7864)
+++ trunk/data/qcsrc/server/w_common.qc	2009-09-23 04:54:41 UTC (rev 7865)
@@ -288,7 +288,7 @@
 	// maxdist = 0.5 * v0 * v0 / constant
 	// dprint("max dist = ", ftos(maxdist), "\n");
 
-	if(maxdist <= 0.5)
+	if(maxdist <= cvar("g_ballistics_mindistance"))
 		return 0;
 
 	traceline_inverted (self.origin, self.origin + normalize(vel) * maxdist, MOVE_NORMAL, self);

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2009-09-22 15:18:10 UTC (rev 7864)
+++ trunk/data/weapons.cfg	2009-09-23 04:54:41 UTC (rev 7865)
@@ -229,7 +229,7 @@
 set g_balance_crylink_secondary_line_lifetime 0.1 // range: 700 full, fades to 2450
 set g_balance_crylink_secondary_line_fadetime 0.25
 
-set g_balance_nex_damage 80
+set g_balance_nex_damage 70
 set g_balance_nex_force 0
 set g_balance_nex_refire 1
 set g_balance_nex_animtime 0.3