X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minstanex.qc;h=d8dc33ec662a32feae2245b8d407b7daf008157a;hb=3d25fdf470809fd60dbd0bc43bd532c7d94f29de;hp=600abd10ef786b2fb2390a86e899f88286009621;hpb=0b0999563ba9ed031559b4756b3b27c2ac89da7e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 600abd10e..d8dc33ec6 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -1,8 +1,9 @@
 #ifdef REGISTER_WEAPON
-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"))
+REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", _("MinstaNex"))
 #else
 #ifdef SVQC
 .float minstanex_lasthit;
+.float jump_interval;
 
 void W_MinstaNex_Attack (void)
 {
@@ -85,22 +86,25 @@ void W_MinstaNex_Attack (void)
 
 .float minstagib_nextthink;
 .float minstagib_needammo;
-void minstagib_stop_countdown(void)
+void minstagib_stop_countdown(entity e)
 {
-	if (self.minstagib_needammo)
-	{
-		self.health = 100;
-		Send_CSQC_Centerprint_Generic_Expire(self, CPID_MINSTA_FINDAMMO);
-	}
-	self.minstagib_needammo = FALSE;
+	if (!e.minstagib_needammo)
+		return;
+	Send_CSQC_Centerprint_Generic_Expire(e, CPID_MINSTA_FINDAMMO);
+	e.minstagib_needammo = FALSE;
 }
 void minstagib_ammocheck(void)
 {
 	if (time < self.minstagib_nextthink)
 		return;
 
-	if (self.deadflag || gameover || self.ammo_cells > 0 || (self.items & IT_UNLIMITED_WEAPON_AMMO))
-		minstagib_stop_countdown();
+	if (self.deadflag || gameover)
+		minstagib_stop_countdown(self);
+	else if (self.ammo_cells > 0 || (self.items & IT_UNLIMITED_WEAPON_AMMO))
+	{
+		minstagib_stop_countdown(self);
+		self.health = 100;
+	}
 	else
 	{
 		self.minstagib_needammo = TRUE;
@@ -204,9 +208,11 @@ float w_minstanex(float req)
 		else if (self.BUTTON_ATCK2)
 		{
 			if (self.jump_interval <= time)
+			if (weapon_prepareattack(1, -1))
 			{
-				self.jump_interval = time + autocvar_g_balance_laser_primary_refire * W_WeaponRateFactor();
-
+				// handle refire manually, so that primary and secondary can be fired without conflictions (important for minstagib)
+				self.jump_interval = time + autocvar_g_balance_minstanex_laser_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);
@@ -217,6 +223,9 @@ float w_minstanex(float req)
 				self.weapon = WEP_LASER;
 				W_Laser_Attack(2);
 				self.weapon = w;
+				
+				// now do normal refire
+				weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_minstanex_laser_animtime, w_ready);
 			}
 		}
 	}