X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_nex.qc;h=ad5e2034284cc2b4f27d893ac628e414a11d88ba;hb=7b47ada93e96abb9b49a97c0f528b18d5af8ac3f;hp=6c550831fd554cd9aaab606d8a461bdb21a74137;hpb=0b0999563ba9ed031559b4756b3b27c2ac89da7e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 6c550831f..ad5e20342 100644
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -1,5 +1,15 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(NEX, w_nex, IT_CELLS, 7, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "nex", "nex", _("Nex"))
+REGISTER_WEAPON(
+/* WEP_##id  */ NEX,
+/* function  */ w_nex,
+/* ammotype  */ IT_CELLS,
+/* impulse   */ 7,
+/* flags     */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN,
+/* rating    */ BOT_PICKUP_RATING_HIGH,
+/* model     */ "nex",
+/* shortname */ "nex",
+/* fullname  */ _("Nex")
+);
 #else
 #ifdef SVQC
 
@@ -66,7 +76,7 @@ void W_Nex_Attack (float issecondary)
 	FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, WEP_NEX);
 
 	if(yoda && flying)
-		AnnounceTo(self, "yoda");
+		Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_ACHIEVEMENT_YODA); 
 
 	//beam and muzzle flash done on client
 	SendCSQCNexBeamParticle(charge);
@@ -208,6 +218,8 @@ float w_nex(float req)
 	{
 		weapon_setup(WEP_NEX);
 		self.current_ammo = ammo_cells;
+		self.weaponentity.switchdelay_drop = autocvar_g_balance_nex_switchdelay_drop;
+		self.weaponentity.switchdelay_raise = autocvar_g_balance_nex_switchdelay_raise;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
@@ -217,16 +229,30 @@ float w_nex(float req)
 	}
 	else if (req == WR_CHECKAMMO2)
 	{
-		// don't allow charging if we don't have enough ammo
-		ammo_amount = self.ammo_cells >= autocvar_g_balance_nex_secondary_ammo;
-		ammo_amount += self.(weapon_load[WEP_NEX]) >= autocvar_g_balance_nex_secondary_ammo;
-		return ammo_amount;
+		if(autocvar_g_balance_nex_secondary)
+		{
+			// don't allow charging if we don't have enough ammo
+			ammo_amount = self.ammo_cells >= autocvar_g_balance_nex_secondary_ammo;
+			ammo_amount += self.(weapon_load[WEP_NEX]) >= autocvar_g_balance_nex_secondary_ammo;	
+			return ammo_amount;
+		}
+		else
+		{
+			return FALSE; // zoom is not a fire mode
+		}
 	}
 	else if (req == WR_RELOAD)
 	{
 		W_Reload(min(autocvar_g_balance_nex_primary_ammo, autocvar_g_balance_nex_secondary_ammo), autocvar_g_balance_nex_reload_ammo, autocvar_g_balance_nex_reload_time, "weapons/reload.wav");
 	}
-
+	else if (req == WR_SUICIDEMESSAGE)
+	{
+		return WEAPON_THINKING_WITH_PORTALS;
+	}
+	else if (req == WR_KILLMESSAGE)
+	{
+		return WEAPON_NEX_MURDER;
+	}
 	return TRUE;
 }
 #endif
@@ -245,10 +271,6 @@ float w_nex(float req)
 	{
 		precache_sound("weapons/neximpact.wav");
 	}
-	else if (req == WR_SUICIDEMESSAGE)
-		w_deathtypestring = _("%s is now thinking with portals");
-	else if (req == WR_KILLMESSAGE)
-		w_deathtypestring = _("%s has been vaporized by %s's nex");
 	return TRUE;
 }
 #endif