From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 9 Nov 2010 19:42:14 +0000 (+0100)
Subject: crylink counter works different for some time now, the _star_lifetime cvars are obsol... 
X-Git-Tag: xonotic-v0.1.0preview~174
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b308e9ceaffe757bfa0c6bde9bdb52d85cac3e83;p=xonotic%2Fxonotic-data.pk3dir.git

crylink counter works different for some time now, the _star_lifetime cvars are obsolete now
---

diff --git a/balance25.cfg b/balance25.cfg
index 69c508a94..2754c1666 100644
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -398,8 +398,6 @@ set g_balance_crylink_primary_joinspeed 0
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_star_lifetime 0.1 // range: 700 full, fades to 2450
-set g_balance_crylink_primary_star_fadetime 0.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
 
diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index d917309b3..613a8ebda 100644
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -409,8 +409,6 @@ set g_balance_crylink_primary_joinspeed 0
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_star_lifetime 2 // range: 800 full, fades to 1300
-set g_balance_crylink_primary_star_fadetime 0.25
 set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300
 set g_balance_crylink_primary_other_fadetime 0.25
 
diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg
index b5e16e3ee..c8134dc71 100644
--- a/balanceNexSVN.cfg
+++ b/balanceNexSVN.cfg
@@ -397,8 +397,6 @@ set g_balance_crylink_primary_joinspeed 0
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_star_lifetime 0.1 // range: 700 full, fades to 2450
-set g_balance_crylink_primary_star_fadetime 0.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
 
diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index d21269478..8b7c0c26d 100644
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -398,8 +398,6 @@ set g_balance_crylink_primary_joinspeed 0
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_star_lifetime 0.1 // range: 700 full, fades to 2450
-set g_balance_crylink_primary_star_fadetime 0.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
 
diff --git a/balanceTest.cfg b/balanceTest.cfg
index 3a37cf393..97c99888a 100644
--- a/balanceTest.cfg
+++ b/balanceTest.cfg
@@ -398,8 +398,6 @@ set g_balance_crylink_primary_joinspeed 150
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_star_lifetime 2 // range: 800 full, fades to 1300
-set g_balance_crylink_primary_star_fadetime 0.25
 set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300
 set g_balance_crylink_primary_other_fadetime 0.25
 
diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 582ad0e0b..416a2cdca 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -398,8 +398,6 @@ set g_balance_crylink_primary_joinspeed 150
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_star_lifetime 2 // range: 800 full, fades to 1300
-set g_balance_crylink_primary_star_fadetime 0.25
 set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300
 set g_balance_crylink_primary_other_fadetime 0.25
 
diff --git a/balancetZork.cfg b/balancetZork.cfg
index c868904a2..918523021 100644
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -399,8 +399,6 @@ set g_balance_crylink_primary_joinspeed 0
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_star_lifetime 2 // range: 800 full, fades to 1300
-set g_balance_crylink_primary_star_fadetime 0.25
 set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300
 set g_balance_crylink_primary_other_fadetime 0.25
 
diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index ce68dbeba..2e10d0eea 100644
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -312,12 +312,6 @@ void W_Crylink_Attack (void)
 			self.fade_rate = 1 / cvar("g_balance_crylink_primary_middle_fadetime");
 			proj.nextthink = time + cvar("g_balance_crylink_primary_middle_lifetime") + cvar("g_balance_crylink_primary_middle_fadetime");
 		}
-		else if(counter <= 3)
-		{
-			proj.fade_time = time + cvar("g_balance_crylink_primary_star_lifetime");
-			self.fade_rate = 1 / cvar("g_balance_crylink_primary_star_fadetime");
-			proj.nextthink = time + cvar("g_balance_crylink_primary_star_lifetime") + cvar("g_balance_crylink_primary_star_fadetime");
-		}
 		else
 		{
 			proj.fade_time = time + cvar("g_balance_crylink_primary_other_lifetime");