X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_crylink.qc;h=151b508f4105b7bb336391678c137c2bbc9cfe9e;hb=fafdede133b68205760773e29f89b52e304034aa;hp=4495b720c54e02eecd3ab2ca62e772aa31771adb;hpb=2a9df1dc726597e8943be9ef956620c36693d219;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 4495b720c..151b508f4 100644
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -397,6 +397,7 @@ void W_Crylink_Attack (void)
 			proj.fade_rate = 1 / autocvar_g_balance_crylink_primary_other_fadetime;
 			proj.nextthink = time + autocvar_g_balance_crylink_primary_other_lifetime + autocvar_g_balance_crylink_primary_other_fadetime;
 		}
+		proj.teleport_time = time + autocvar_g_balance_crylink_primary_joindelay;
 		proj.cnt = autocvar_g_balance_crylink_primary_bounces;
 		//proj.scale = 1 + 1 * proj.cnt;
 
@@ -484,6 +485,7 @@ void W_Crylink_Attack2 (void)
 			proj.fade_rate = 1 / autocvar_g_balance_crylink_secondary_line_fadetime;
 			proj.nextthink = time + autocvar_g_balance_crylink_secondary_line_lifetime + autocvar_g_balance_crylink_secondary_line_fadetime;
 		}
+		proj.teleport_time = time + autocvar_g_balance_crylink_secondary_joindelay;
 		proj.cnt = autocvar_g_balance_crylink_secondary_bounces;
 		//proj.scale = 1 + 1 * proj.cnt;
 
@@ -542,7 +544,7 @@ float w_crylink(float req)
 		}
 		else
 		{
-			if (self.crylink_waitrelease)
+			if (self.crylink_waitrelease && (!self.crylink_lastgroup || time > self.crylink_lastgroup.teleport_time))
 			{
 				// fired and released now!
 				if(self.crylink_lastgroup)
@@ -550,7 +552,6 @@ float w_crylink(float req)
 					vector pos;
 					entity linkjoineffect;
 
-
 					if(self.crylink_waitrelease == 1)
 					{
 						pos = W_Crylink_LinkJoin(self.crylink_lastgroup, autocvar_g_balance_crylink_primary_joinspread * autocvar_g_balance_crylink_primary_speed, autocvar_g_balance_crylink_primary_jointime);
@@ -567,8 +568,6 @@ float w_crylink(float req)
 					linkjoineffect.nextthink = time + w_crylink_linkjoin_time;
 					linkjoineffect.owner = self;
 					setorigin(linkjoineffect, pos);
-
-
 				}
 				self.crylink_waitrelease = 0;
 				if(!w_crylink(WR_CHECKAMMO1) && !w_crylink(WR_CHECKAMMO2))