From bbabfb7f9e3387983be83195027866cec982b5aa Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 18 Nov 2010 22:05:12 +0100 Subject: [PATCH] crylink: joinspeed -> joinspread (easier to tune in balance config) --- balance25.cfg | 4 ++-- balanceLeeStricklin.cfg | 4 ++-- balanceNexSVN.cfg | 4 ++-- balanceSamual.cfg | 4 ++-- balanceTest.cfg | 4 ++-- balanceXonotic.cfg | 4 ++-- balancetZork.cfg | 4 ++-- qcsrc/server/w_crylink.qc | 8 ++++---- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/balance25.cfg b/balance25.cfg index 9ca2492535..a5d3b68f10 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -406,7 +406,7 @@ set g_balance_crylink_primary_refire 0.4 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_joinspread 0 set g_balance_crylink_primary_jointime 0 set g_balance_crylink_primary_joinexplode 0 set g_balance_crylink_primary_joinexplode_damage 0 @@ -433,7 +433,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_crylink_secondary_joinspeed 0 +set g_balance_crylink_secondary_joinspread 0 set g_balance_crylink_secondary_jointime 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index 97fd210cc8..ade867648f 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -417,7 +417,7 @@ set g_balance_crylink_primary_refire 0.4 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_joinspread 0 set g_balance_crylink_primary_jointime 0 set g_balance_crylink_primary_joinexplode 0 set g_balance_crylink_primary_joinexplode_damage 0 @@ -444,7 +444,7 @@ 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_bouncedamagefactor 0.5 -set g_balance_crylink_secondary_joinspeed 0 +set g_balance_crylink_secondary_joinspread 0 set g_balance_crylink_secondary_jointime 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg index 5108942388..23ab694498 100644 --- a/balanceNexSVN.cfg +++ b/balanceNexSVN.cfg @@ -405,7 +405,7 @@ set g_balance_crylink_primary_refire 0.4 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_joinspread 0 set g_balance_crylink_primary_jointime 0 set g_balance_crylink_primary_joinexplode 0 set g_balance_crylink_primary_joinexplode_damage 0 @@ -432,7 +432,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_crylink_secondary_joinspeed 0 +set g_balance_crylink_secondary_joinspread 0 set g_balance_crylink_secondary_jointime 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 diff --git a/balanceSamual.cfg b/balanceSamual.cfg index 76b46fd652..2935a2cca0 100644 --- a/balanceSamual.cfg +++ b/balanceSamual.cfg @@ -406,7 +406,7 @@ set g_balance_crylink_primary_refire 0.4 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_joinspread 0 set g_balance_crylink_primary_jointime 0 set g_balance_crylink_primary_joinexplode 0 set g_balance_crylink_primary_joinexplode_damage 0 @@ -433,7 +433,7 @@ set g_balance_crylink_secondary_refire 0.2 set g_balance_crylink_secondary_animtime 0.2 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_joinspread 0 set g_balance_crylink_secondary_jointime 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 diff --git a/balanceTest.cfg b/balanceTest.cfg index 91cfe1f3c1..fa4f521cf4 100644 --- a/balanceTest.cfg +++ b/balanceTest.cfg @@ -406,7 +406,7 @@ 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 300 +set g_balance_crylink_primary_joinspread 0.2 set g_balance_crylink_primary_jointime 0 set g_balance_crylink_primary_joinexplode 1 //if != 0 do a extra damage pass when projectiles join set g_balance_crylink_primary_joinexplode_damage 100 //Max demage (Determined by % of _primary_shots that joins) @@ -433,7 +433,7 @@ 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 0 +set g_balance_crylink_secondary_joinspread 0 set g_balance_crylink_secondary_jointime 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index 0d79340641..0a4238ea66 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -406,7 +406,7 @@ set g_balance_crylink_primary_refire 0.8 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_joinspread 0.2 set g_balance_crylink_primary_jointime 0 set g_balance_crylink_primary_joinexplode 0 set g_balance_crylink_primary_joinexplode_damage 0 @@ -433,7 +433,7 @@ 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 0 +set g_balance_crylink_secondary_joinspread 0 set g_balance_crylink_secondary_jointime 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 diff --git a/balancetZork.cfg b/balancetZork.cfg index c4a766a359..58b3e3c276 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -428,7 +428,7 @@ 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_joinspread 0.1 set g_balance_crylink_primary_jointime 0 set g_balance_crylink_primary_joinexplode 1 //if != 0 do a extra damage pass when projectiles join set g_balance_crylink_primary_joinexplode_damage 100 //Max demage (Determined by % of _primary_shots that joins) @@ -454,7 +454,7 @@ 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 0 +set g_balance_crylink_secondary_joinspread 0 set g_balance_crylink_secondary_jointime 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index 4891bc2b9c..07100c7784 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -485,7 +485,7 @@ float w_crylink(float req) { W_Crylink_Attack(); weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_crylink_primary_animtime"), w_ready); - if(cvar("g_balance_crylink_primary_joinspeed") != 0 || cvar("g_balance_crylink_primary_jointime") != 0) + if(cvar("g_balance_crylink_primary_joinspread") != 0 || cvar("g_balance_crylink_primary_jointime") != 0) self.crylink_waitrelease = 1; } } @@ -496,7 +496,7 @@ float w_crylink(float req) { W_Crylink_Attack2(); weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_crylink_secondary_animtime"), w_ready); - if(cvar("g_balance_crylink_secondary_joinspeed") != 0 || cvar("g_balance_crylink_secondary_jointime") != 0) + if(cvar("g_balance_crylink_secondary_joinspread") != 0 || cvar("g_balance_crylink_secondary_jointime") != 0) self.crylink_waitrelease = 2; } } @@ -513,12 +513,12 @@ float w_crylink(float req) if(self.crylink_waitrelease == 1) { - pos = W_Crylink_LinkJoin(self.crylink_lastgroup, cvar("g_balance_crylink_primary_joinspeed"), cvar("g_balance_crylink_primary_jointime")); + pos = W_Crylink_LinkJoin(self.crylink_lastgroup, cvar("g_balance_crylink_primary_joinspread") * cvar("g_balance_crylink_primary_speed"), cvar("g_balance_crylink_primary_jointime")); } else { - pos = W_Crylink_LinkJoin(self.crylink_lastgroup, cvar("g_balance_crylink_secondary_joinspeed"), cvar("g_balance_crylink_secondary_jointime")); + pos = W_Crylink_LinkJoin(self.crylink_lastgroup, cvar("g_balance_crylink_secondary_joinspread") * cvar("g_balance_crylink_secondary_speed"), cvar("g_balance_crylink_secondary_jointime")); } linkjoineffect = spawn(); -- 2.39.2