From df6a8e5da7f8ed2e09c092b9ab1515b4c891cc5e Mon Sep 17 00:00:00 2001 From: FruitieX Date: Sun, 20 Jun 2010 15:55:21 +0300 Subject: [PATCH] better effects for gauntlet laser --- balanceFruit.cfg | 4 +- effectinfo.txt | 81 ++++++++++++++++++++++++++++++++++++----- qcsrc/server/w_laser.qc | 6 ++- 3 files changed, 78 insertions(+), 13 deletions(-) diff --git a/balanceFruit.cfg b/balanceFruit.cfg index 3231f2d74..e19a65a44 100644 --- a/balanceFruit.cfg +++ b/balanceFruit.cfg @@ -206,10 +206,10 @@ set g_balance_grapplehook_health 130 // {{{ weapon properties // {{{ laser -set g_balance_laser_primary_damage 22 +set g_balance_laser_primary_damage 10 set g_balance_laser_primary_edgedamage 0 set g_balance_laser_primary_force 200 -set g_balance_laser_primary_radius 60 +set g_balance_laser_primary_radius 10 set g_balance_laser_primary_speed 0 set g_balance_laser_primary_spread 0 set g_balance_laser_primary_refire 0.1 diff --git a/effectinfo.txt b/effectinfo.txt index 53926a7a0..1d9cd3a05 100644 --- a/effectinfo.txt +++ b/effectinfo.txt @@ -4743,19 +4743,82 @@ alpha 100 100 500 // based off morphed's cl_gentle // used in qcsrc/server/w_laser.qc effect laser_gauntlet +count 3 +type spark +color 0xb44215 0x880000 tex 43 43 -count 1.5 +size 7 10 +alpha 128 512 6280 +airfriction 10 +originjitter 2 2 2 +velocityjitter 150 150 150 +velocitymultiplier 0.2 +sizeincrease -100 +stretchfactor 2.3 +rotate -180 180 4000 -4000 + +effect laser_gauntlet +count 6 type spark -color 0xff00ff 0xff0000 -size 4 8 -sizeincrease 34 -alpha 128 128 292 -gravity 0 -airfriction 5 -liquidfriction 10 -velocityjitter 50 50 50 +color 0xff4200 0xff0000 +tex 8 15 +size 7 9 +alpha 256 512 6280 +airfriction 12 +originjitter 2 2 2 +velocityjitter 100 100 100 +velocitymultiplier 0.2 +sizeincrease -100 +stretchfactor 2 + + +// muzzle flash +effect laser_gauntletmuzzleflash +// glow and light +countabsolute 1 +type smoke +color 0x220000 0x880000 +tex 65 65 +size 10 15 +alpha 256 512 6280 +airfriction 10 +sizeincrease -100 +stretchfactor 2 +lightradius 150 +lightradiusfade 500 +lightcolor 3 0.1 0.1 +// electricity +effect laser_gauntletmuzzleflash +count 3 +type spark +color 0xb44215 0x880000 +tex 43 43 +size 7 10 +alpha 128 512 6280 +airfriction 10 +originjitter 2 2 2 +velocityjitter 150 150 150 +velocitymultiplier 0.2 +sizeincrease -100 +stretchfactor 2.3 +rotate -180 180 4000 -4000 +// fire +effect laser_gauntletmuzzleflash +count 6 +type spark +color 0xff4200 0xff0000 +tex 8 15 +size 7 9 +alpha 256 512 6280 +airfriction 12 +originjitter 2 2 2 +velocityjitter 100 100 100 +velocitymultiplier 0.2 +sizeincrease -100 +stretchfactor 2 + //torch flame, spawn it as fast as you can 20 times per second or more, supports direction but not required //fast fire // used nowhere in code, meant for maps diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc index cdfdaa537..00e0fff74 100644 --- a/qcsrc/server/w_laser.qc +++ b/qcsrc/server/w_laser.qc @@ -105,9 +105,11 @@ void W_Laser_Attack2 (void) // gauntlet { W_SetupShot (self, TRUE, 0, "weapons/gauntlet_fire.wav", cvar("g_balance_laser_primary_damage")); - WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_laser_primary_radius"), FALSE, self, ANTILAG_LATENCY(self)); + WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * (cvar("g_balance_laser_primary_radius") + vlen(eX * self.velocity_x + eY * self.velocity_y)/5), FALSE, self, ANTILAG_LATENCY(self)); - pointparticles(particleeffectnum("laser_gauntlet"), w_shotorg + w_shotdir * cvar("g_balance_laser_primary_radius"), '0 0 0', 1); + pointparticles(particleeffectnum("laser_gauntletmuzzleflash"), w_shotorg, w_shotdir * 1000, 1); + pointparticles(particleeffectnum("laser_gauntlet"), w_shotorg + w_shotdir * (cvar("g_balance_laser_primary_radius") + vlen(eX * self.velocity_x + eY * self.velocity_y)/5), w_shotdir * 1000, 1); + pointparticles(particleeffectnum("laser_gauntlet"), w_shotorg + w_shotdir * (cvar("g_balance_laser_primary_radius") + vlen(eX * self.velocity_x + eY * self.velocity_y)/5) * 0.5, w_shotdir * 1000, 1); if (trace_fraction < 1) Damage(trace_ent, self, self, cvar("g_balance_laser_primary_damage"), WEP_LASER | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_laser_primary_force") * w_shotdir); -- 2.39.2