X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minstanex.qc;h=403c7acd510acb51bdae894be8b979e6667faea7;hb=79ab84695f689fd7024d60c3429988f7c8774552;hp=ce97b02451210d7db63a342db4eb03254e98b2b8;hpb=a0f8261f12a1a8b073066e06622834cad1a06c65;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index ce97b0245..403c7acd5 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;
@@ -80,87 +80,88 @@ 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 - cvar("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);
 }
 
 
 .float minstagib_nextthink;
-void minstagib_ammocheck (void)
+.float minstagib_needammo;
+void minstagib_stop_countdown(void)
 {
-	if (time < self.minstagib_nextthink || self.deadflag || gameover)
+	if (self.minstagib_needammo)
+	{
+		self.health = 100;
+		Send_CSQC_Centerprint_Generic_Expire(self, CPID_MINSTA_FINDAMMO);
+	}
+	self.minstagib_needammo = FALSE;
+}
+void minstagib_ammocheck(void)
+{
+	if (time < self.minstagib_nextthink)
 		return;
 
-	if (self.ammo_cells <= 0)
+	if (self.deadflag || gameover || self.ammo_cells > 0 || (self.items & IT_UNLIMITED_WEAPON_AMMO))
+		minstagib_stop_countdown();
+	else
 	{
+		self.minstagib_needammo = TRUE;
 		if (self.health == 5)
 		{
-			centerprint(self, "you're dead now...\n");
 			Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0');
 			AnnounceTo(self, "terminated");
 		}
 		else if (self.health == 10)
 		{
-			centerprint(self, "^11^7 second left to find some ammo\n");
 			Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0');
 			AnnounceTo(self, "1");
 		}
 		else if (self.health == 20)
 		{
-			centerprint(self, "^12^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			AnnounceTo(self, "2");
 		}
 		else if (self.health == 30)
 		{
-			centerprint(self, "^13^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			AnnounceTo(self, "3");
 		}
 		else if (self.health == 40)
 		{
-			centerprint(self, "^14^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			AnnounceTo(self, "4");
 		}
 		else if (self.health == 50)
 		{
-			centerprint(self, "^15^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			AnnounceTo(self, "5");
 		}
 		else if (self.health == 60)
 		{
-			centerprint(self, "^36^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			AnnounceTo(self, "6");
 		}
 		else if (self.health == 70)
 		{
-			centerprint(self, "^37^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			AnnounceTo(self, "7");
 		}
 		else if (self.health == 80)
 		{
-			centerprint(self, "^38^7 seconds left to find some ammo\n");
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			AnnounceTo(self, "8");
 		}
 		else if (self.health == 90)
 		{
-			centerprint(self, "^39^7 seconds left to find some ammo\n");
+			Send_CSQC_Centerprint_Generic(self, CPID_MINSTA_FINDAMMO, "^1%d^7 second left to find some ammo", 1, 9);
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			AnnounceTo(self, "9");
 		}
 		else if (self.health == 100)
 		{
-			centerprint(self, "get some ammo or\nyou'll be dead in ^310^7 seconds...");
+			Send_CSQC_Centerprint_Generic(self, CPID_MINSTA_FINDAMMO, "get some ammo or\nyou'll be dead in ^3%d^7 seconds...", 1, 10);
 			Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
 			if not(self.flags & FL_GODMODE)
 				AnnounceTo(self, "10");
@@ -173,28 +174,46 @@ 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(cvar("g_balance_laser_primary_speed"), 0, cvar("g_balance_laser_primary_lifetime"), FALSE);
+			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, cvar("g_balance_minstanex_refire")))
+			if (weapon_prepareattack(0, autocvar_g_balance_minstanex_refire))
 			{
 				W_MinstaNex_Attack();
-				weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_minstanex_animtime"), w_ready);
+				weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_minstanex_animtime, w_ready);
 			}
 		}
 		else if (self.BUTTON_ATCK2)
 		{
 			if (self.jump_interval <= time)
 			{
-				self.jump_interval = time + cvar("g_balance_laser_primary_refire") * W_WeaponRateFactor();
+				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;
@@ -215,26 +234,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 >= cvar("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
@@ -254,9 +290,9 @@ float w_minstanex(float req)
 		precache_sound("weapons/neximpact.wav");
 	}
 	else if (req == WR_SUICIDEMESSAGE)
-		w_deathtypestring = "%s did the impossible";
+		w_deathtypestring = _("%s did the impossible");
 	else if (req == WR_KILLMESSAGE)
-		w_deathtypestring = "%s has been vaporized by %s";
+		w_deathtypestring = _("%s has been vaporized by %s");
 	return TRUE;
 }
 #endif