X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minstanex.qc;h=54dd5a6ce8281c2c852f04dd52a7aa91d204142d;hb=6d6a01255c7a5c146bbeb3daae6f527dd40f98d4;hp=89f209937a83f0cd58f6d335489761e89bdb41f2;hpb=9025619c550b721820b0fd231f662a68cc398478;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 89f209937..54dd5a6ce 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -1,5 +1,5 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", _("MinstaNex"))
+REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", _("MinstaNex"))
 #else
 #ifdef SVQC
 .float minstanex_lasthit;
@@ -9,7 +9,7 @@ void W_MinstaNex_Attack (void)
 	float flying;
 	flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
 
-	W_SetupShot (self, TRUE, 0, "weapons/minstanexfire.wav", CHAN_WEAPON, 10000);
+	W_SetupShot (self, TRUE, 0, "weapons/minstanexfire.wav", CH_WEAPON_A, 10000);
 
 	yoda = 0;
 	damage_goodhits = 0;
@@ -43,7 +43,7 @@ void W_MinstaNex_Attack (void)
 	// teamcolor / hit beam effect
 	vector v;
 	v = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
-	if(teams_matter)
+	if(teamplay)
 	{
 	    switch(self.team)
 	    {
@@ -80,13 +80,10 @@ void W_MinstaNex_Attack (void)
 	if (trace_ent.solid == SOLID_BSP && !(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT))
 		Damage_DamageInfo(trace_endpos, 10000, 0, 0, 800 * w_shotdir, WEP_MINSTANEX, self);
 
-	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-	{
-		if (g_minstagib)
-			self.ammo_cells = self.ammo_cells - 1;
-		else
-			self.ammo_cells = self.ammo_cells - autocvar_g_balance_minstanex_ammo;
-	}
+	if (g_minstagib)
+		W_DecreaseAmmo(ammo_cells, 1, autocvar_g_balance_minstanex_reload_ammo);
+	else
+		W_DecreaseAmmo(ammo_cells, autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_reload_ammo);
 }
 
 
@@ -97,6 +94,7 @@ void minstagib_ammocheck (void)
 		return;
 
 	if (self.ammo_cells <= 0)
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 	{
 		if (self.health == 5)
 		{
@@ -173,16 +171,30 @@ void spawnfunc_weapon_minstanex (void); // defined in t_items.qc
 
 float w_minstanex(float req)
 {
+	float ammo_amount;
+	float minstanex_ammo;
+
+	// now multiple WR_s use this
+	if(g_minstagib)
+		minstanex_ammo = 1;
+	else
+		minstanex_ammo = autocvar_g_balance_minstanex_ammo;
+
 	if (req == WR_AIM)
 	{
-		if(self.ammo_cells>0)
+		if(self.ammo_cells > 0)
 			self.BUTTON_ATCK = bot_aim(1000000, 0, 1, FALSE);
 		else
 			self.BUTTON_ATCK2 = bot_aim(autocvar_g_balance_laser_primary_speed, 0, autocvar_g_balance_laser_primary_lifetime, FALSE);
 	}
 	else if (req == WR_THINK)
 	{
-		if (self.BUTTON_ATCK)
+		// if the laser uses load, we also consider its ammo for reloading
+		if(autocvar_g_balance_minstanex_reload_ammo && autocvar_g_balance_minstanex_laser_ammo && self.clip_load < min(minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo)) // forced reload
+			weapon_action(self.weapon, WR_RELOAD);
+		else if(autocvar_g_balance_minstanex_reload_ammo && self.clip_load < minstanex_ammo) // forced reload
+			weapon_action(self.weapon, WR_RELOAD);
+		else if (self.BUTTON_ATCK)
 		{
 			if (weapon_prepareattack(0, autocvar_g_balance_minstanex_refire))
 			{
@@ -196,6 +208,10 @@ float w_minstanex(float req)
 			{
 				self.jump_interval = time + autocvar_g_balance_laser_primary_refire * W_WeaponRateFactor();
 
+				// decrease ammo for the laser?
+				if(autocvar_g_balance_minstanex_laser_ammo)
+					W_DecreaseAmmo(ammo_cells, autocvar_g_balance_minstanex_laser_ammo, autocvar_g_balance_minstanex_reload_ammo);
+
 				// ugly minstagib hack to reuse the fire mode of the laser
 				float w;
 				w = self.weapon;
@@ -215,26 +231,43 @@ float w_minstanex(float req)
 		precache_sound ("weapons/nexwhoosh1.wav");
 		precache_sound ("weapons/nexwhoosh2.wav");
 		precache_sound ("weapons/nexwhoosh3.wav");
+		//precache_sound ("weapons/reload.wav"); // until weapons have individual reload sounds, precache the reload sound somewhere else
 		w_laser(WR_PRECACHE);
 	}
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_MINSTANEX);
+		self.current_ammo = ammo_cells;
 		self.minstanex_lasthit = 0;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
-		if (g_minstagib)
-			return self.ammo_cells >= 1;
-		else
-			return self.ammo_cells >= autocvar_g_balance_minstanex_ammo;
+		ammo_amount = self.ammo_cells >= minstanex_ammo;
+		ammo_amount += self.weapon_load[WEP_MINSTANEX] >= minstanex_ammo;
+		return ammo_amount;
 	}
 	else if (req == WR_CHECKAMMO2)
-		return TRUE;
+	{
+		if(!autocvar_g_balance_minstanex_laser_ammo)
+			return TRUE;
+		ammo_amount = self.ammo_cells >= autocvar_g_balance_minstanex_laser_ammo;
+		ammo_amount += self.weapon_load[WEP_MINSTANEX] >= autocvar_g_balance_minstanex_laser_ammo;
+		return ammo_amount;
+	}
 	else if (req == WR_RESETPLAYER)
 	{
 		self.minstanex_lasthit = 0;
 	}
+	else if (req == WR_RELOAD)
+	{
+		float used_ammo;
+		if(autocvar_g_balance_minstanex_laser_ammo)
+			used_ammo = min(minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo);
+		else
+			used_ammo = minstanex_ammo;
+
+		W_Reload(used_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav");
+	}
 	return TRUE;
 };
 #endif
@@ -247,14 +280,14 @@ float w_minstanex(float req)
 		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);
+			sound(self, CH_SHOTS, "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");
+		w_deathtypestring = _("%s is now thinking with portals");
 	else if (req == WR_KILLMESSAGE)
 		w_deathtypestring = _("%s has been vaporized by %s");
 	return TRUE;