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

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2009-11-18 13:56:38 -0500 (Wed, 18 Nov 2009)
New Revision: 8294

Modified:
   trunk/data/balance.cfg
   trunk/data/balance25.cfg
   trunk/data/balanceHavoc.cfg
   trunk/data/balanceNexrun.cfg
   trunk/data/balanceSamual.cfg
   trunk/data/qcsrc/server/w_crylink.qc
Log:
experimental lightningun, used in the nexrun balance


Modified: trunk/data/balance.cfg
===================================================================
--- trunk/data/balance.cfg	2009-11-17 20:50:03 UTC (rev 8293)
+++ trunk/data/balance.cfg	2009-11-18 18:56:38 UTC (rev 8294)
@@ -382,6 +382,8 @@
 set g_balance_crylink_secondary_middle_fadetime 5
 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_crylink_secondary_lightning 0
 //   }}}
 //   {{{ nex
 set g_balance_nex_damage 60

Modified: trunk/data/balance25.cfg
===================================================================
--- trunk/data/balance25.cfg	2009-11-17 20:50:03 UTC (rev 8293)
+++ trunk/data/balance25.cfg	2009-11-18 18:56:38 UTC (rev 8294)
@@ -382,6 +382,8 @@
 set g_balance_crylink_secondary_middle_fadetime 5
 set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 70000
 set g_balance_crylink_secondary_line_fadetime 2
+
+set g_balance_crylink_secondary_lightning 0
 //   }}}
 //   {{{ nex
 set g_balance_nex_damage 100

Modified: trunk/data/balanceHavoc.cfg
===================================================================
--- trunk/data/balanceHavoc.cfg	2009-11-17 20:50:03 UTC (rev 8293)
+++ trunk/data/balanceHavoc.cfg	2009-11-18 18:56:38 UTC (rev 8294)
@@ -382,6 +382,8 @@
 set g_balance_crylink_secondary_middle_fadetime 5
 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_crylink_secondary_lightning 0
 //   }}}
 //   {{{ nex
 set g_balance_nex_damage 60

Modified: trunk/data/balanceNexrun.cfg
===================================================================
--- trunk/data/balanceNexrun.cfg	2009-11-17 20:50:03 UTC (rev 8293)
+++ trunk/data/balanceNexrun.cfg	2009-11-18 18:56:38 UTC (rev 8294)
@@ -366,23 +366,25 @@
 set g_balance_crylink_primary_other_lifetime 0.1 // range: 700 full, fades to 2450
 set g_balance_crylink_primary_other_fadetime 0.25
 
-set g_balance_crylink_secondary_damage 5
+set g_balance_crylink_secondary_damage 8
 set g_balance_crylink_secondary_edgedamage 0
-set g_balance_crylink_secondary_force -40
-set g_balance_crylink_secondary_radius 50
+set g_balance_crylink_secondary_force 30
+set g_balance_crylink_secondary_radius 1200
 set g_balance_crylink_secondary_speed 3000
 set g_balance_crylink_secondary_spread 0.02
 set g_balance_crylink_secondary_shots 3
 set g_balance_crylink_secondary_bounces 0
-set g_balance_crylink_secondary_refire 0.1
-set g_balance_crylink_secondary_animtime 0.1
-set g_balance_crylink_secondary_ammo 1.5
+set g_balance_crylink_secondary_refire 0.050
+set g_balance_crylink_secondary_animtime 0.050
+set g_balance_crylink_secondary_ammo 0.66
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_secondary_middle_fadetime 5
 set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 70000
 set g_balance_crylink_secondary_line_fadetime 2
+
+set g_balance_crylink_secondary_lightning 1
 //   }}}
 //   {{{ nex
 set g_balance_nex_damage 100

Modified: trunk/data/balanceSamual.cfg
===================================================================
--- trunk/data/balanceSamual.cfg	2009-11-17 20:50:03 UTC (rev 8293)
+++ trunk/data/balanceSamual.cfg	2009-11-18 18:56:38 UTC (rev 8294)
@@ -383,6 +383,8 @@
 set g_balance_crylink_secondary_middle_fadetime 5
 set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 70000
 set g_balance_crylink_secondary_line_fadetime 2
+
+set g_balance_crylink_secondary_lightning 0
 //   }}}
 //   {{{ nex
 set g_balance_nex_damage 90

Modified: trunk/data/qcsrc/server/w_crylink.qc
===================================================================
--- trunk/data/qcsrc/server/w_crylink.qc	2009-11-17 20:50:03 UTC (rev 8293)
+++ trunk/data/qcsrc/server/w_crylink.qc	2009-11-18 18:56:38 UTC (rev 8294)
@@ -173,25 +173,20 @@
 	}
 }
 
-
-/*
 // experimental lightning gun
 void W_Crylink_Attack3 (void)
 {
 	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-		self.ammo_cells = self.ammo_cells - cvar("g_balance_crylink_primary_ammo");
-	W_SetupShot (self, TRUE, 0, "weapons/crylink_fire.wav");
+		self.ammo_cells = self.ammo_cells - cvar("g_balance_crylink_secondary_ammo");
+	W_SetupShot (self, TRUE, 0, "weapons/crylink_fire.wav", cvar("g_balance_crylink_secondary_damage"));
 
-	traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * 1000, FALSE, self, self.ping * 0.001);
+	traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_crylink_secondary_radius"), FALSE, self, self.ping * 0.001);
 
-	pointparticles(particleeffectnum("lightning_muzzleflash", w_shotorg, w_shotdir * 1000, 1);
-	pointparticles(particleeffectnum("lightning_impact", trace_endpos, trace_plane_normal * 1000, 1);
-	trailparticles(world, particleeffectnum("lightning_beam", w_shotorg, trace_endpos);
+	te_lightning1(self, w_shotorg, trace_endpos);
 
 	if (trace_fraction < 1)
-		Damage(trace_ent, self, self, cvar("g_balance_crylink_primary_damage"), WEP_CRYLINK | HITTYPE_SECONDARY, trace_endpos, '0 0 0');
+		Damage(trace_ent, self, self, cvar("g_balance_crylink_secondary_damage"), WEP_CRYLINK | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_crylink_secondary_force") * w_shotdir);
 }
-*/
 
 void spawnfunc_weapon_crylink (void)
 {
@@ -218,7 +213,10 @@
 		if (self.BUTTON_ATCK2)
 		if (weapon_prepareattack(1, cvar("g_balance_crylink_secondary_refire")))
 		{
-			W_Crylink_Attack2();
+			if(cvar("g_balance_crylink_secondary_lightning"))
+				W_Crylink_Attack3();
+			else
+				W_Crylink_Attack2();
 			weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_crylink_secondary_animtime"), w_ready);
 		}
 	}