X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minelayer.qc;h=40c60e827e3adc024457f462577d6a2b68b32ac0;hp=1b4f7c6cd06aa232811c06b67617006ba6f031d2;hb=d0db4b5db11800d291fbdba93a67e8487fa033e2;hpb=8a390ed02bde47c98a5e6bd47c7eb9b1cb3cd1dc

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 1b4f7c6cd..40c60e827 100644
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -5,6 +5,7 @@ REGISTER_WEAPON(MINE_LAYER, w_minelayer, IT_ROCKETS, 4, WEP_FLAG_MUTATORBLOCKED
 void W_Mine_Think (void);
 .float minelayer_detonate, mine_explodeanyway;
 .float mine_time;
+.vector mine_orientation;
 
 void spawnfunc_weapon_minelayer (void)
 {
@@ -31,7 +32,7 @@ void W_Mine_Stick (entity to)
 	setmodel(newmine, "models/mine.md3");
 	newmine.angles = vectoangles(-trace_plane_normal); // face against the surface
 
-	newmine.oldvelocity = self.velocity;
+	newmine.mine_orientation = -trace_plane_normal;
 
 	newmine.takedamage = self.takedamage;
 	newmine.damageforcescale = self.damageforcescale;
@@ -65,7 +66,7 @@ void W_Mine_Explode ()
 			if(IsDifferentTeam(self.realowner, other))
 				if(other.deadflag == DEAD_NO)
 					if(IsFlying(other))
-						AnnounceTo(self.realowner, "airshot");
+						Send_Notification(NOTIF_ONE, self.realowner, MSG_ANNCE, ANNCE_ACHIEVEMENT_AIRSHOT);
 
 	self.event_damage = func_null;
 	self.takedamage = DAMAGE_NO;
@@ -95,7 +96,7 @@ void W_Mine_DoRemoteExplode ()
 	self.takedamage = DAMAGE_NO;
 
 	if(self.movetype == MOVETYPE_NONE || self.movetype == MOVETYPE_FOLLOW)
-		self.velocity = self.oldvelocity;
+		self.velocity = self.mine_orientation; // particle fx and decals need .velocity
 
 	RadiusDamage (self, self.realowner, autocvar_g_balance_minelayer_remote_damage, autocvar_g_balance_minelayer_remote_edgedamage, autocvar_g_balance_minelayer_remote_radius, world, autocvar_g_balance_minelayer_remote_force, self.projectiledeathtype | HITTYPE_BOUNCE, world);
 
@@ -153,7 +154,7 @@ float W_Mine_Count(entity e)
 	entity mine;
 	for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.realowner == e)
 		minecount += 1;
-		
+
 	return minecount;
 }
 
@@ -225,7 +226,12 @@ void W_Mine_Touch (void)
 	if(self.movetype == MOVETYPE_NONE || self.movetype == MOVETYPE_FOLLOW)
 		return; // we're already a stuck mine, why do we get called? TODO does this even happen?
 
-	PROJECTILE_TOUCH;
+	if(WarpZone_Projectile_Touch())
+	{
+		if(wasfreed(self))
+			self.realowner.minelayer_mines -= 1;
+		return;
+	}
 
 	if(other && other.classname == "player" && other.deadflag == DEAD_NO)
 	{
@@ -263,8 +269,7 @@ void W_Mine_Attack (void)
 	// scan how many mines we placed, and return if we reached our limit
 	if(autocvar_g_balance_minelayer_limit)
 	{
-	
-		if(W_Mine_Count(self) >= autocvar_g_balance_minelayer_limit)
+		if(self.minelayer_mines >= autocvar_g_balance_minelayer_limit)
 		{
 			// the refire delay keeps this message from being spammed
 			sprint(self, strcat("minelayer: You cannot place more than ^2", ftos(autocvar_g_balance_minelayer_limit), " ^7mines at a time\n") );
@@ -355,7 +360,10 @@ float w_minelayer(float req)
 	if (req == WR_AIM)
 	{
 		// aim and decide to fire if appropriate
-		self.BUTTON_ATCK = bot_aim(autocvar_g_balance_minelayer_speed, 0, autocvar_g_balance_minelayer_lifetime, FALSE);
+		if(self.minelayer_mines >= autocvar_g_balance_minelayer_limit)
+			self.BUTTON_ATCK = FALSE;
+		else
+			self.BUTTON_ATCK = bot_aim(autocvar_g_balance_minelayer_speed, 0, autocvar_g_balance_minelayer_lifetime, FALSE);
 		if(skill >= 2) // skill 0 and 1 bots won't detonate mines!
 		{
 			// decide whether to detonate mines
@@ -505,10 +513,22 @@ float w_minelayer(float req)
 		else
 			return FALSE;
 	}
+	else if (req == WR_RESETPLAYER)
+	{
+		self.minelayer_mines = 0;
+	}
 	else if (req == WR_RELOAD)
 	{
 		W_Reload(autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo, autocvar_g_balance_minelayer_reload_time, "weapons/reload.wav");
 	}
+	else if (req == WR_SUICIDEMESSAGE)
+	{
+		return WEAPON_MINELAYER_SUICIDE;
+	}
+	else if (req == WR_KILLMESSAGE)
+	{
+		return WEAPON_MINELAYER_MURDER;
+	}
 	return TRUE;
 }
 #endif
@@ -527,20 +547,6 @@ float w_minelayer(float req)
 	{
 		precache_sound("weapons/mine_exp.wav");
 	}
-	else if (req == WR_SUICIDEMESSAGE)
-		if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)
-			w_deathtypestring = _("%s blew themself up with their minelayer");
-		else
-			w_deathtypestring = _("%s forgot about their mine");
-	else if (req == WR_KILLMESSAGE)
-	{
-		if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)
-			w_deathtypestring = _("%s got too close to %s's mine");
-		else if(w_deathtype & HITTYPE_SPLASH)
-			w_deathtypestring = _("%s almost dodged %s's mine");
-		else
-			w_deathtypestring = _("%s stepped on %s's mine");
-	}
 	return TRUE;
 }
 #endif