X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_seeker.qc;h=61d72708c2f9b8935c4e7c172ac53ce04fbb3111;hb=ec74997f484755f09e1f4b2d8dc0ba3dd5c0343d;hp=13c010f2a13010937f6d7a2a37fa8e2f426ba107;hpb=19ab1a2ba6824a03f8d263d27cc84dc7d54958ac;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index 13c010f2a..61d72708c 100644
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -1,5 +1,15 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(SEEKER, w_seeker, IT_ROCKETS, 8, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "seeker", "seeker", _("T.A.G. Seeker"))
+REGISTER_WEAPON(
+/* WEP_##id  */ SEEKER,
+/* function  */ w_seeker,
+/* ammotype  */ IT_ROCKETS,
+/* impulse   */ 8,
+/* flags     */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH,
+/* rating    */ BOT_PICKUP_RATING_MID,
+/* model     */ "seeker",
+/* shortname */ "seeker",
+/* fullname  */ _("T.A.G. Seeker")
+);
 #else
 #ifdef SVQC
 //.float proxytime; = autoswitch
@@ -427,7 +437,7 @@ void Seeker_Tag_Touch()
 	te_knightspike(org2);
 
 	self.event_damage = func_null;
-	Damage_DamageInfo(self.origin, 0, 0, 0, self.velocity, WEP_SEEKER | HITTYPE_HEADSHOT, other.species, self);
+	Damage_DamageInfo(self.origin, 0, 0, 0, self.velocity, WEP_SEEKER | HITTYPE_BOUNCE | HITTYPE_SECONDARY, other.species, self);
 
 	if (other.takedamage == DAMAGE_AIM && other.deadflag == DEAD_NO)
 	{
@@ -598,14 +608,32 @@ float w_seeker(float req)
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
-		ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_missile_ammo;
-		ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_missile_ammo;
+		if (autocvar_g_balance_seeker_type == 1) 
+		{
+			ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_missile_ammo;
+			ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_missile_ammo;
+		}
+		else
+		{
+			ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_tag_ammo;
+			ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_tag_ammo;
+		}
+		
 		return ammo_amount;
 	}
 	else if (req == WR_CHECKAMMO2)
 	{
-		ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_tag_ammo;
-		ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_tag_ammo;
+		if (autocvar_g_balance_seeker_type == 1) 
+		{
+			ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_tag_ammo;
+			ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_tag_ammo;
+		}
+		else
+		{
+			ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_flac_ammo;
+			ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_flac_ammo;
+		}
+		
 		return ammo_amount;
 	}
 	else if (req == WR_RELOAD)
@@ -635,21 +663,24 @@ float w_seeker(float req)
 		org2 = w_org + w_backoff * 6;
 		if(w_deathtype & HITTYPE_BOUNCE)
 		{
-			pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1);
-			if(!w_issilent)
+			if(w_deathtype & HITTYPE_SECONDARY)
 			{
-				if (w_random<0.15)
-					sound(self, CH_SHOTS, "weapons/tagexp1.wav", 1, ATTN_NORM);
-				else if (w_random<0.7)
-					sound(self, CH_SHOTS, "weapons/tagexp2.wav", 1, ATTN_NORM);
-				else
-					sound(self, CH_SHOTS, "weapons/tagexp3.wav", 1, ATTN_NORM);
+				if(!w_issilent)
+					sound(self, CH_SHOTS, "weapons/tag_impact.wav", 1, ATTN_NORM);
+			}
+			else
+			{
+				pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1);
+				if(!w_issilent)
+				{
+					if (w_random<0.15)
+						sound(self, CH_SHOTS, "weapons/tagexp1.wav", 1, ATTN_NORM);
+					else if (w_random<0.7)
+						sound(self, CH_SHOTS, "weapons/tagexp2.wav", 1, ATTN_NORM);
+					else
+						sound(self, CH_SHOTS, "weapons/tagexp3.wav", 1, ATTN_NORM);
+				}
 			}
-		}
-		else if(w_deathtype & HITTYPE_HEADSHOT)
-		{
-			if(!w_issilent)
-				sound(self, CH_SHOTS, "weapons/tag_impact.wav", 1, ATTN_NORM);
 		}
 		else
 		{