X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minstanex.qc;h=0d815ee6728d356ebeb29d5f95cb8c43d16a2399;hb=217e21a7eeff80a31374205fc2bc04112f1eebb0;hp=837d73dca55c5c885b073daa6a29601a872f7b2d;hpb=079c02f9a7c398d6c433f8ead73a244a6833b77b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 837d73dca..0d815ee67 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -195,7 +195,7 @@ float w_minstanex(float req)
 		{
 			if (self.jump_interval <= time)
 			{
-				self.jump_interval = time + 0.9 * W_WeaponRateFactor();
+				self.jump_interval = time + cvar("g_balance_laser_primary_refire") * W_WeaponRateFactor();
 
 				// ugly minstagib hack to reuse the fire mode of the laser
 				float w;
@@ -232,10 +232,6 @@ float w_minstanex(float req)
 	}
 	else if (req == WR_CHECKAMMO2)
 		return TRUE;
-	else if (req == WR_SUICIDEMESSAGE)
-		w_deathtypestring = "did the impossible";
-	else if (req == WR_KILLMESSAGE)
-		w_deathtypestring = "has been vaporized by";
 	else if (req == WR_RESETPLAYER)
 	{
 		self.minstanex_lasthit = 0;
@@ -246,6 +242,22 @@ float w_minstanex(float req)
 #ifdef CSQC
 float w_minstanex(float req)
 {
+	if(req == WR_IMPACTEFFECT)
+	{
+		vector org2;
+		org2 = w_org + w_backoff * 6;
+		pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1);
+		if(!w_issilent)
+			sound(self, CHAN_PROJECTILE, "weapons/neximpact.wav", VOL_BASE, ATTN_NORM);
+	}
+	else if(req == WR_PRECACHE)
+	{
+		precache_sound("weapons/neximpact.wav");
+	}
+	else if (req == WR_SUICIDEMESSAGE)
+		w_deathtypestring = "%s did the impossible";
+	else if (req == WR_KILLMESSAGE)
+		w_deathtypestring = "%s has been vaporized by %s";
 	return TRUE;
 }
 #endif