r3686 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-06-04 12:37:45 -0400 (Wed, 04 Jun 2008)
New Revision: 3686

Modified:
   trunk/data/qcsrc/server/w_crylink.qc
   trunk/data/weapons.cfg
   trunk/data/weaponsPro.cfg
Log:
halve the damage on crylink bounces - only apply full damage & force on direct hits


Modified: trunk/data/qcsrc/server/w_crylink.qc
===================================================================
--- trunk/data/qcsrc/server/w_crylink.qc	2008-06-03 05:50:48 UTC (rev 3685)
+++ trunk/data/qcsrc/server/w_crylink.qc	2008-06-04 16:37:45 UTC (rev 3686)
@@ -14,14 +14,21 @@
 
 void W_Crylink_Touch (void)
 {
+	float finalhit;
+	float f;
 	if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
 	{
 		remove(self);
 		return;
 	}
 	pointparticles(particleeffectnum("crylink_impactbig"), self.origin, '0 0 0', 1);
-	RadiusDamage (self, self.realowner, cvar("g_balance_crylink_primary_damage"), cvar("g_balance_crylink_primary_edgedamage"), cvar("g_balance_crylink_primary_radius"), world, cvar("g_balance_crylink_primary_force"), IT_CRYLINK);
-	if (self.cnt <= 0 || other.takedamage != DAMAGE_NO)
+	finalhit = ((self.cnt <= 0) || (other.takedamage != DAMAGE_NO));
+	if(finalhit)
+		f = 1;
+	else
+		f = cvar("g_balance_crylink_primary_bouncedamagefactor");
+	RadiusDamage (self, self.realowner, cvar("g_balance_crylink_primary_damage") * f, cvar("g_balance_crylink_primary_edgedamage") * f, cvar("g_balance_crylink_primary_radius"), world, cvar("g_balance_crylink_primary_force") * f, IT_CRYLINK);
+	if (finalhit)
 	{
 		remove (self);
 		return;
@@ -35,14 +42,21 @@
 
 void W_Crylink_Touch2 (void)
 {
+	float finalhit;
+	float f;
 	if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
 	{
 		remove(self);
 		return;
 	}
 	pointparticles(particleeffectnum("crylink_impact"), self.origin, '0 0 0', 1);
-	RadiusDamage (self, self.realowner, cvar("g_balance_crylink_secondary_damage"), cvar("g_balance_crylink_secondary_edgedamage"), cvar("g_balance_crylink_secondary_radius"), world, cvar("g_balance_crylink_secondary_force"), IT_CRYLINK);
-	if (self.cnt <= 0 || other.takedamage != DAMAGE_NO)
+	finalhit = ((self.cnt <= 0) || (other.takedamage != DAMAGE_NO));
+	if(finalhit)
+		f = 1;
+	else
+		f = cvar("g_balance_crylink_primary_bouncedamagefactor");
+	RadiusDamage (self, self.realowner, cvar("g_balance_crylink_secondary_damage") * f, cvar("g_balance_crylink_secondary_edgedamage") * f, cvar("g_balance_crylink_secondary_radius"), world, cvar("g_balance_crylink_secondary_force") * f, IT_CRYLINK);
+	if (finalhit)
 	{
 		remove (self);
 		return;

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2008-06-03 05:50:48 UTC (rev 3685)
+++ trunk/data/weapons.cfg	2008-06-04 16:37:45 UTC (rev 3686)
@@ -136,6 +136,7 @@
 set g_balance_crylink_primary_refire 0.4
 set g_balance_crylink_primary_animtime 0.3
 set g_balance_crylink_primary_ammo 1
+set g_balance_crylink_primary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_damage 20
 set g_balance_crylink_secondary_edgedamage 0
 set g_balance_crylink_secondary_force -55
@@ -148,6 +149,7 @@
 set g_balance_crylink_secondary_refire 0.5
 set g_balance_crylink_secondary_animtime 0.3
 set g_balance_crylink_secondary_ammo 2
+set g_balance_crylink_secondary_bouncedamagefactor 0.5
 
 set g_balance_nex_damage 140
 set g_balance_nex_force 600

Modified: trunk/data/weaponsPro.cfg
===================================================================
--- trunk/data/weaponsPro.cfg	2008-06-03 05:50:48 UTC (rev 3685)
+++ trunk/data/weaponsPro.cfg	2008-06-04 16:37:45 UTC (rev 3686)
@@ -136,6 +136,7 @@
 set g_balance_crylink_primary_refire 0.1
 set g_balance_crylink_primary_animtime 0.1
 set g_balance_crylink_primary_ammo 1
+set g_balance_crylink_primary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_damage 15
 set g_balance_crylink_secondary_edgedamage 0
 set g_balance_crylink_secondary_force 100
@@ -148,6 +149,7 @@
 set g_balance_crylink_secondary_refire 0.6
 set g_balance_crylink_secondary_animtime 0.3
 set g_balance_crylink_secondary_ammo 5
+set g_balance_crylink_secondary_bouncedamagefactor 0.5
 
 set g_balance_nex_damage 70
 set g_balance_nex_force 0