From ee8d4d8726675a7f3d5a3f2bb5152a2b084a45e5 Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Wed, 2 Apr 2008 12:13:47 +0000 Subject: [PATCH] redesigned crylink primary, may need additional balancing crylink primary now bounces once, and has a splash radius of 80 on each bounce, it does not bounce if it hits a soft target, this means that bouncing shots off the floor directly infront of a player can do about 50% more damage, and if you hit the floor to the side of a player you can still do a little (about 50%) damage git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3570 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/effectinfo.txt | 49 ++++++++++++++++++++++++++++++++++ data/qcsrc/server/w_crylink.qc | 6 ++++- data/weapons.cfg | 14 +++++----- pro/weaponsPro.cfg | 2 ++ 4 files changed, 64 insertions(+), 7 deletions(-) diff --git a/data/effectinfo.txt b/data/effectinfo.txt index 8cd8bc019..2f33de27a 100644 --- a/data/effectinfo.txt +++ b/data/effectinfo.txt @@ -1591,6 +1591,55 @@ velocityjitter 32 32 32 +// bigger crylink impact effect +// decal +effect crylink_impactbig +countabsolute 1 +type decal +tex 47 47 +size 24 24 +alpha 256 256 0 +originjitter 12 12 12 +//lightradius 200 +//lightradiusfade 800 +//lightcolor 3.2 0.4 4 +// purple flare effect +effect crylink_impactbig +countabsolute 1 +type static +tex 39 39 +color 0x504060 0x504060 +size 24 24 +alpha 256 256 512 +// purple sparks +effect crylink_impactbig +count 80 +type spark +tex 41 41 +color 0xA040C0 0xA040C0 +bounce 2 +size 6 6 +alpha 256 256 1024 +velocityjitter 512 512 512 +// purple splash +effect crylink_impactbig +count 3 +type static +color 0xE070FF 0xE070FF +size 16 16 +alpha 256 256 512 +velocityjitter 32 32 32 +// purple splash +effect crylink_impactbig +count 6 +type static +color 0xE070FF 0xE070FF +size 16 16 +alpha 256 256 1024 +velocityjitter 256 256 256 + + + effect nex_muzzleflash count 10 type smoke diff --git a/data/qcsrc/server/w_crylink.qc b/data/qcsrc/server/w_crylink.qc index 976297bb2..013db0e4f 100644 --- a/data/qcsrc/server/w_crylink.qc +++ b/data/qcsrc/server/w_crylink.qc @@ -19,7 +19,7 @@ void W_Crylink_Touch (void) remove(self); return; } - pointparticles(particleeffectnum("crylink_impact"), self.origin, '0 0 0', 1); + 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) { @@ -30,6 +30,7 @@ void W_Crylink_Touch (void) self.angles = vectoangles(self.velocity); self.nextthink = time; self.owner = world; + //self.scale = 1 + self.cnt; } void W_Crylink_Touch2 (void) @@ -50,6 +51,7 @@ void W_Crylink_Touch2 (void) self.angles = vectoangles(self.velocity); self.nextthink = time; self.owner = world; +// self.scale = 1 + 1 * self.cnt; } void W_Crylink_Attack (void) @@ -101,6 +103,7 @@ void W_Crylink_Attack (void) proj.think = W_Crylink_Think; proj.nextthink = proj.count; proj.cnt = cvar("g_balance_crylink_primary_bounces"); + proj.scale = 1 + 1 * proj.cnt; proj.angles = vectoangles (proj.velocity); @@ -148,6 +151,7 @@ void W_Crylink_Attack2 (void) proj.think = W_Crylink_Think; proj.nextthink = proj.count; proj.cnt = cvar("g_balance_crylink_secondary_bounces"); + proj.scale = 1 + 1 * proj.cnt; proj.angles = vectoangles (proj.velocity); diff --git a/data/weapons.cfg b/data/weapons.cfg index 5c4916a8c..07953556e 100644 --- a/data/weapons.cfg +++ b/data/weapons.cfg @@ -124,15 +124,16 @@ set g_balance_electro_combo_edgedamage 0 set g_balance_electro_combo_force 200 set g_balance_electro_combo_radius 250 -set g_balance_crylink_primary_damage 15 +set g_balance_crylink_primary_damage 20 set g_balance_crylink_primary_edgedamage 0 set g_balance_crylink_primary_force -55 -set g_balance_crylink_primary_radius 3 +set g_balance_crylink_primary_radius 80 set g_balance_crylink_primary_speed 7000 -set g_balance_crylink_primary_spread 0.06 +set g_balance_crylink_primary_spread 0.03 set g_balance_crylink_primary_shots 4 set g_balance_crylink_primary_lifetime 30 -set g_balance_crylink_primary_refire 0.25 +set g_balance_crylink_primary_bounces 1 +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_secondary_damage 20 @@ -143,9 +144,10 @@ set g_balance_crylink_secondary_speed 7000 set g_balance_crylink_secondary_spread 0.08 set g_balance_crylink_secondary_shots 7 set g_balance_crylink_secondary_lifetime 30 +set g_balance_crylink_secondary_bounces 0 set g_balance_crylink_secondary_refire 0.5 set g_balance_crylink_secondary_animtime 0.3 -set g_balance_crylink_secondary_ammo 3 +set g_balance_crylink_secondary_ammo 2 set g_balance_nex_damage 140 set g_balance_nex_force 600 @@ -186,7 +188,7 @@ set g_balance_rocketlauncher_lifetime 30 set g_balance_rocketlauncher_refire 1 set g_balance_rocketlauncher_animtime 0.3 set g_balance_rocketlauncher_ammo 3 -set g_balance_rocketlauncher_detonatedelay 0.2 // positive: timer till detonation is allowed; negative: "security device" that prevents ANY remote detonation if it could hurt its owner; zero: detonatable at any time +set g_balance_rocketlauncher_detonatedelay 0.2 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time set g_balance_rocketlauncher_laserguided_speed 1000 //650 set g_balance_rocketlauncher_laserguided_speedaccel 0 set g_balance_rocketlauncher_laserguided_speedstart 1000 diff --git a/pro/weaponsPro.cfg b/pro/weaponsPro.cfg index d060bf18b..7ce3b4869 100644 --- a/pro/weaponsPro.cfg +++ b/pro/weaponsPro.cfg @@ -132,6 +132,7 @@ set g_balance_crylink_primary_speed 7000 set g_balance_crylink_primary_spread 0 set g_balance_crylink_primary_shots 1 set g_balance_crylink_primary_lifetime 30 +set g_balance_crylink_primary_bounces 0 set g_balance_crylink_primary_refire 0.1 set g_balance_crylink_primary_animtime 0.1 set g_balance_crylink_primary_ammo 1 @@ -143,6 +144,7 @@ set g_balance_crylink_secondary_speed 7000 set g_balance_crylink_secondary_spread 0.08 set g_balance_crylink_secondary_shots 5 set g_balance_crylink_secondary_lifetime 30 +set g_balance_crylink_secondary_bounces 0 set g_balance_crylink_secondary_refire 0.6 set g_balance_crylink_secondary_animtime 0.3 set g_balance_crylink_secondary_ammo 5 -- 2.39.2