From 30f9432ad847c1ebbb08d6e9f9da22f6a6690b40 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 11 Nov 2010 22:40:33 +0100 Subject: [PATCH] make the linkexplode feature its own cvar, and turn it off for those crylink modes that have joinspeed --- balance25.cfg | 2 ++ balanceLeeStricklin.cfg | 2 ++ balanceNexSVN.cfg | 2 ++ balanceSamual.cfg | 2 ++ balanceTest.cfg | 6 ++++-- balanceXonotic.cfg | 2 ++ balancetZork.cfg | 2 ++ qcsrc/server/w_crylink.qc | 4 ++-- 8 files changed, 18 insertions(+), 4 deletions(-) diff --git a/balance25.cfg b/balance25.cfg index 116c9a1cea..4a32553efc 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -394,6 +394,7 @@ set g_balance_crylink_primary_animtime 0.3 set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.5 set g_balance_crylink_primary_joinspeed 0 +set g_balance_crylink_primary_linkexplode 1 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000 set g_balance_crylink_primary_middle_fadetime 5 @@ -414,6 +415,7 @@ 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_crylink_secondary_joinspeed 0 +set g_balance_crylink_secondary_linkexplode 1 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000 set g_balance_crylink_secondary_middle_fadetime 5 diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index 807a8af180..353286f5c9 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -405,6 +405,7 @@ set g_balance_crylink_primary_animtime 0.30008 set g_balance_crylink_primary_ammo 3 set g_balance_crylink_primary_bouncedamagefactor 0.2 set g_balance_crylink_primary_joinspeed 0 +set g_balance_crylink_primary_linkexplode 1 set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000 set g_balance_crylink_primary_middle_fadetime 5 @@ -425,6 +426,7 @@ set g_balance_crylink_secondary_animtime 0.3 set g_balance_crylink_secondary_ammo 3 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joinspeed 0 +set g_balance_crylink_secondary_linkexplode 1 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000 set g_balance_crylink_secondary_middle_fadetime 5 diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg index 145db5ddf1..3b30bd768c 100644 --- a/balanceNexSVN.cfg +++ b/balanceNexSVN.cfg @@ -393,6 +393,7 @@ set g_balance_crylink_primary_animtime 0.3 set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.5 set g_balance_crylink_primary_joinspeed 0 +set g_balance_crylink_primary_linkexplode 1 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000 set g_balance_crylink_primary_middle_fadetime 5 @@ -413,6 +414,7 @@ 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_crylink_secondary_joinspeed 0 +set g_balance_crylink_secondary_linkexplode 1 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000 set g_balance_crylink_secondary_middle_fadetime 5 diff --git a/balanceSamual.cfg b/balanceSamual.cfg index e33fb631ec..e33f740b20 100644 --- a/balanceSamual.cfg +++ b/balanceSamual.cfg @@ -394,6 +394,7 @@ set g_balance_crylink_primary_animtime 0.3 set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.5 set g_balance_crylink_primary_joinspeed 0 +set g_balance_crylink_primary_linkexplode 1 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000 set g_balance_crylink_primary_middle_fadetime 5 @@ -414,6 +415,7 @@ set g_balance_crylink_secondary_animtime 0.1 set g_balance_crylink_secondary_ammo 2 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joinspeed 0 +set g_balance_crylink_secondary_linkexplode 1 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000 set g_balance_crylink_secondary_middle_fadetime 5 diff --git a/balanceTest.cfg b/balanceTest.cfg index ba4630bbd5..c75500c445 100644 --- a/balanceTest.cfg +++ b/balanceTest.cfg @@ -393,7 +393,8 @@ set g_balance_crylink_primary_refire 1 set g_balance_crylink_primary_animtime 0.4 set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.2 -set g_balance_crylink_primary_joinspeed 150 +set g_balance_crylink_primary_joinspeed 250 +set g_balance_crylink_primary_linkexplode 0 set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000 set g_balance_crylink_primary_middle_fadetime 5 @@ -413,7 +414,8 @@ set g_balance_crylink_secondary_refire 0.15 set g_balance_crylink_secondary_animtime 0.15 set g_balance_crylink_secondary_ammo 1 set g_balance_crylink_secondary_bouncedamagefactor 0.5 -set g_balance_crylink_secondary_joinspeed 150 +set g_balance_crylink_secondary_joinspeed 250 +set g_balance_crylink_secondary_linkexplode 0 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000 set g_balance_crylink_secondary_middle_fadetime 5 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index 529657ddad..6205fb1fce 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -394,6 +394,7 @@ set g_balance_crylink_primary_animtime 0.4 set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.2 set g_balance_crylink_primary_joinspeed 250 +set g_balance_crylink_primary_linkexplode 0 set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000 set g_balance_crylink_primary_middle_fadetime 5 @@ -414,6 +415,7 @@ set g_balance_crylink_secondary_animtime 0.15 set g_balance_crylink_secondary_ammo 1 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joinspeed 0 +set g_balance_crylink_secondary_linkexplode 1 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000 set g_balance_crylink_secondary_middle_fadetime 5 diff --git a/balancetZork.cfg b/balancetZork.cfg index ab53f47533..e3fd4d5d15 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -395,6 +395,7 @@ set g_balance_crylink_primary_animtime 0.4 set g_balance_crylink_primary_ammo 2 set g_balance_crylink_primary_bouncedamagefactor 0.2 set g_balance_crylink_primary_joinspeed 0 +set g_balance_crylink_secondary_linkexplode 1 set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000 set g_balance_crylink_primary_middle_fadetime 5 @@ -415,6 +416,7 @@ set g_balance_crylink_secondary_animtime 0.15 set g_balance_crylink_secondary_ammo 1 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joinspeed 0 +set g_balance_crylink_primary_linkexplode 1 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000 set g_balance_crylink_secondary_middle_fadetime 5 diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index 624204c08d..bd0ae4e795 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -173,7 +173,7 @@ void W_Crylink_Touch (void) f = cvar("g_balance_crylink_primary_bouncedamagefactor"); if(a) f *= a; - if (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, self.projectiledeathtype, other)) + if (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, self.projectiledeathtype, other) && cvar("g_balance_crylink_primary_linkexplode")) { W_Crylink_LinkExplode(self.queuenext, self); remove (self); @@ -221,7 +221,7 @@ void W_Crylink_Touch2 (void) f = cvar("g_balance_crylink_secondary_bouncedamagefactor"); if(a) f *= a; - if (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, self.projectiledeathtype, other)) + if (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, self.projectiledeathtype, other) && cvar("g_balance_crylink_secondary_linkexplode")) { W_Crylink_LinkExplode(self.queuenext, self); remove (self); -- 2.39.2