X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_lms.qc;h=d7edf0442d7ff0efcd575804ac3b1345ad884849;hp=9fa7f4739715b39269c9b4e600ee8ce6705a0d69;hb=2acb480d08d206ebefcf39704919e7c5b72c94e1;hpb=e9f30b97435c6afe3d6911f21e1f4fd1b97e93da

diff --git a/qcsrc/server/mutators/mutator/gamemode_lms.qc b/qcsrc/server/mutators/mutator/gamemode_lms.qc
index 9fa7f4739..d7edf0442 100644
--- a/qcsrc/server/mutators/mutator/gamemode_lms.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_lms.qc
@@ -1,51 +1,8 @@
-#ifndef GAMEMODE_LMS_H
-#define GAMEMODE_LMS_H
+#include "gamemode_lms.qh"
 
-#define autocvar_g_lms_lives_override cvar("g_lms_lives_override")
-void lms_Initialize();
-
-REGISTER_MUTATOR(lms, false)
-{
-	MUTATOR_ONADD
-	{
-		if (time > 1) // game loads at time 1
-			error("This is a game type and it cannot be added at runtime.");
-		lms_Initialize();
-
-		SetLimits(((!autocvar_g_lms_lives_override) ? -1 : autocvar_g_lms_lives_override), 0, -1, -1);
-	}
-
-	MUTATOR_ONROLLBACK_OR_REMOVE
-	{
-		// we actually cannot roll back lms_Initialize here
-		// BUT: we don't need to! If this gets called, adding always
-		// succeeds.
-	}
-
-	MUTATOR_ONREMOVE
-	{
-		LOG_INFO("This is a game type and it cannot be removed at runtime.");
-		return -1;
-	}
-
-	return 0;
-}
-
-// scoreboard stuff
-const float SP_LMS_LIVES = 4;
-const float SP_LMS_RANK = 5;
-
-// lives related defs
-float lms_lowest_lives;
-float lms_next_place;
-float LMS_NewPlayerLives();
-
-#endif
-
-#ifdef IMPLEMENTATION
-
-#include "../../campaign.qh"
-#include "../../command/cmd.qh"
+#include <common/mutators/mutator/instagib/items.qc>
+#include <server/campaign.qh>
+#include <server/command/_mod.qh>
 
 int autocvar_g_lms_extra_lives;
 bool autocvar_g_lms_join_anytime;
@@ -71,24 +28,23 @@ float LMS_NewPlayerLives()
 	return bound(1, lms_lowest_lives, fl);
 }
 
+void ClearWinners();
+
 // LMS winning condition: game terminates if and only if there's at most one
 // one player who's living lives. Top two scores being equal cancels the time
 // limit.
-float WinningCondition_LMS()
+int WinningCondition_LMS()
 {
 	entity head, head2;
-	float have_player;
-	float have_players;
-	float l;
+	bool have_player = false;
+	bool have_players = false;
 
-	have_player = false;
-	have_players = false;
-	l = LMS_NewPlayerLives();
+	int l = LMS_NewPlayerLives();
 
-	head = find(world, classname, "player");
+	head = find(NULL, classname, STR_PLAYER);
 	if(head)
 		have_player = true;
-	head2 = find(head, classname, "player");
+	head2 = find(head, classname, STR_PLAYER);
 	if(head2)
 		have_players = true;
 
@@ -131,14 +87,14 @@ float WinningCondition_LMS()
 		{
 			// SNAFU (maybe a draw game?)
 			ClearWinners();
-			LOG_TRACE("No players, ending game.\n");
+			LOG_TRACE("No players, ending game.");
 			return WINNING_YES;
 		}
 	}
 
 	// When we get here, we have at least two players who are actually LIVING,
 	// now check if the top two players have equal score.
-	WinningConditionHelper();
+	WinningConditionHelper(NULL);
 
 	ClearWinners();
 	if(WinningConditionHelper_winner)
@@ -154,91 +110,132 @@ float WinningCondition_LMS()
 MUTATOR_HOOKFUNCTION(lms, reset_map_global)
 {
 	lms_lowest_lives = 999;
-	lms_next_place = player_count;
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(lms, reset_map_players)
-{SELFPARAM();
-	entity e;
+{
 	if(restart_mapalreadyrestarted || (time < game_starttime))
-	FOR_EACH_CLIENT(e)
-	if(IS_PLAYER(e))
-	{
-		WITH(entity, self, e, PlayerScore_Add(e, SP_LMS_LIVES, LMS_NewPlayerLives()));
-	}
-
-	return false;
+	FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(PlayerScore_Add(it, SP_LMS_LIVES, LMS_NewPlayerLives())));
 }
 
 MUTATOR_HOOKFUNCTION(lms, PutClientInServer)
-{SELFPARAM();
-	// player is dead and becomes observer
-	// FIXME fix LMS scoring for new system
-	if(PlayerScore_Add(self, SP_LMS_RANK, 0) > 0)
+{
+	entity player = M_ARGV(0, entity);
+
+	if(player.frags == FRAGS_SPECTATOR)
+		TRANSMUTE(Observer, player);
+	else
 	{
-		self.classname = STR_OBSERVER;
-		Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_LMS_NOLIVES);
+		float tl = PlayerScore_Add(player, SP_LMS_LIVES, 0);
+		if(tl < lms_lowest_lives)
+			lms_lowest_lives = tl;
+		if(tl <= 0)
+			TRANSMUTE(Observer, player);
 	}
+}
 
+MUTATOR_HOOKFUNCTION(lms, ForbidSpawn)
+{
+	entity player = M_ARGV(0, entity);
+
+	if(player.frags == FRAGS_SPECTATOR)
+		return true;
+	if(PlayerScore_Add(player, SP_LMS_LIVES, 0) <= 0)
+	{
+		Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_LMS_NOLIVES);
+		return true;
+	}
 	return false;
 }
 
 MUTATOR_HOOKFUNCTION(lms, PlayerDies)
-{SELFPARAM();
-	self.respawn_flags |= RESPAWN_FORCE;
+{
+	entity frag_target = M_ARGV(2, entity);
 
-	return false;
+	frag_target.respawn_flags |= RESPAWN_FORCE;
 }
 
 void lms_RemovePlayer(entity player)
 {
-	// Only if the player cannot play at all
-	if(PlayerScore_Add(player, SP_LMS_RANK, 0) == 666)
-		player.frags = FRAGS_SPECTATOR;
-	else
-		player.frags = FRAGS_LMS_LOSER;
+	float player_rank = PlayerScore_Add(player, SP_LMS_RANK, 0);
+	if (!player_rank)
+	{
+		int pl_cnt = 0;
+		FOREACH_CLIENT(IS_PLAYER(it), { pl_cnt++; });
+		if (player.lms_spectate_warning != 2)
+		{
+			player.frags = FRAGS_LMS_LOSER;
+			PlayerScore_Add(player, SP_LMS_RANK, pl_cnt + 1);
+		}
+		else
+		{
+			lms_lowest_lives = 999;
+			FOREACH_CLIENT(true, {
+				if (it.frags == FRAGS_LMS_LOSER)
+				{
+					float it_rank = PlayerScore_Add(it, SP_LMS_RANK, 0);
+					if (it_rank > player_rank && it_rank < 665)
+						PlayerScore_Add(it, SP_LMS_RANK, -1);
+					lms_lowest_lives = 0;
+				}
+				else if (it.frags != FRAGS_SPECTATOR)
+				{
+					float tl = PlayerScore_Add(it, SP_LMS_LIVES, 0);
+					if(tl < lms_lowest_lives)
+						lms_lowest_lives = tl;
+				}
+			});
+			PlayerScore_Add(player, SP_LMS_LIVES, -PlayerScore_Add(player, SP_LMS_LIVES, 0));
+			PlayerScore_Add(player, SP_LMS_RANK, 665); // different from 666
+			player.frags = FRAGS_LMS_LOSER;
+			TRANSMUTE(Observer, player);
+		}
+		if (pl_cnt == 2) // a player is forfeiting leaving only one player
+			lms_lowest_lives = 0; // end the game now!
+	}
 
 	if(player.killcount != FRAGS_SPECTATOR)
 		if(PlayerScore_Add(player, SP_LMS_RANK, 0) > 0 && player.lms_spectate_warning != 2)
-			Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_LMS_NOLIVES, player.netname);
+			Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_LMS_NOLIVES, player.netname);
 		else
-			Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_LMS_FORFEIT, player.netname);
+			Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_LMS_FORFEIT, player.netname);
 }
 
 MUTATOR_HOOKFUNCTION(lms, ClientDisconnect)
-{SELFPARAM();
-	lms_RemovePlayer(self);
-	return false;
+{
+	entity player = M_ARGV(0, entity);
+
+	lms_RemovePlayer(player);
 }
 
 MUTATOR_HOOKFUNCTION(lms, MakePlayerObserver)
-{SELFPARAM();
-	lms_RemovePlayer(self);
-	return false;
+{
+    entity player = M_ARGV(0, entity);
+
+	lms_RemovePlayer(player);
+	return true;  // prevent team reset
 }
 
 MUTATOR_HOOKFUNCTION(lms, ClientConnect)
-{SELFPARAM();
-	self.classname = STR_PLAYER;
-	campaign_bots_may_start = 1;
+{
+	entity player = M_ARGV(0, entity);
+
+	TRANSMUTE(Player, player);
+	campaign_bots_may_start = true;
 
-	if(PlayerScore_Add(self, SP_LMS_LIVES, LMS_NewPlayerLives()) <= 0)
+	if(PlayerScore_Add(player, SP_LMS_LIVES, LMS_NewPlayerLives()) <= 0)
 	{
-		PlayerScore_Add(self, SP_LMS_RANK, 666);
-		self.frags = FRAGS_SPECTATOR;
+		PlayerScore_Add(player, SP_LMS_RANK, 666); // mark as forced spectator for the hud code
+		player.frags = FRAGS_SPECTATOR;
 	}
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(lms, PlayerPreThink)
-{SELFPARAM();
-	if(self.deadflag == DEAD_DYING)
-		self.deadflag = DEAD_RESPAWNING;
+{
+	entity player = M_ARGV(0, entity);
 
-	return false;
+	if(player.deadflag == DEAD_DYING)
+		player.deadflag = DEAD_RESPAWNING;
 }
 
 MUTATOR_HOOKFUNCTION(lms, PlayerRegen)
@@ -256,6 +253,8 @@ MUTATOR_HOOKFUNCTION(lms, ForbidThrowCurrentWeapon)
 
 MUTATOR_HOOKFUNCTION(lms, GiveFragsForKill)
 {
+	entity frag_target = M_ARGV(1, entity);
+
 	// remove a life
 	float tl;
 	tl = PlayerScore_Add(frag_target, SP_LMS_LIVES, -1);
@@ -263,14 +262,12 @@ MUTATOR_HOOKFUNCTION(lms, GiveFragsForKill)
 		lms_lowest_lives = tl;
 	if(tl <= 0)
 	{
-		if(!lms_next_place)
-			lms_next_place = player_count;
-		else
-			lms_next_place = min(lms_next_place, player_count);
-		PlayerScore_Add(frag_target, SP_LMS_RANK, lms_next_place); // won't ever spawn again
-		--lms_next_place;
+		int pl_cnt = 0;
+		FOREACH_CLIENT(IS_PLAYER(it), { pl_cnt++; });
+		frag_target.frags = FRAGS_LMS_LOSER;
+		PlayerScore_Add(frag_target, SP_LMS_RANK, pl_cnt);
 	}
-	frag_score = 0;
+	M_ARGV(2, float) = 0; // frag score
 
 	return true;
 }
@@ -286,8 +283,6 @@ MUTATOR_HOOKFUNCTION(lms, SetStartItems)
 	start_ammo_cells   = warmup_start_ammo_cells   = cvar("g_lms_start_ammo_cells");
 	start_ammo_plasma  = warmup_start_ammo_plasma  = cvar("g_lms_start_ammo_plasma");
 	start_ammo_fuel    = warmup_start_ammo_fuel    = cvar("g_lms_start_ammo_fuel");
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(lms, ForbidPlayerScore_Clear)
@@ -297,24 +292,52 @@ MUTATOR_HOOKFUNCTION(lms, ForbidPlayerScore_Clear)
 }
 
 MUTATOR_HOOKFUNCTION(lms, FilterItem)
-{SELFPARAM();
+{
+	entity item = M_ARGV(0, entity);
+
 	if(autocvar_g_lms_extra_lives)
-	if(self.itemdef == ITEM_HealthMega)
-	{
-		self.max_health = 1;
+	if(item.itemdef == ITEM_ExtraLife)
 		return false;
-	}
+
+	return true;
+}
+
+void lms_extralife(entity this)
+{
+	StartItem(this, ITEM_ExtraLife);
+}
+
+MUTATOR_HOOKFUNCTION(lms, OnEntityPreSpawn)
+{
+	if (!autocvar_g_powerups) return false;
+	if (!autocvar_g_lms_extra_lives) return false;
+
+	entity ent = M_ARGV(0, entity);
+
+	// Can't use .itemdef here
+	if (ent.classname != "item_health_mega") return false;
+
+	entity e = spawn();
+	setthink(e, lms_extralife);
+
+	e.nextthink = time + 0.1;
+	e.spawnflags = ent.spawnflags;
+	e.noalign = ent.noalign;
+	setorigin(e, ent.origin);
 
 	return true;
 }
 
 MUTATOR_HOOKFUNCTION(lms, ItemTouch)
-{SELFPARAM();
-	// give extra lives for mega health
-	if (self.items & ITEM_HealthMega.m_itemid)
+{
+	entity item = M_ARGV(0, entity);
+	entity toucher = M_ARGV(1, entity);
+
+	if(item.itemdef == ITEM_ExtraLife)
 	{
-		Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_EXTRALIVES);
-		PlayerScore_Add(other, SP_LMS_LIVES, autocvar_g_lms_extra_lives);
+		Send_Notification(NOTIF_ONE, toucher, MSG_CENTER, CENTER_EXTRALIVES);
+		PlayerScore_Add(toucher, SP_LMS_LIVES, autocvar_g_lms_extra_lives);
+		return MUT_ITEMTOUCH_PICKUP;
 	}
 
 	return MUT_ITEMTOUCH_CONTINUE;
@@ -322,29 +345,30 @@ MUTATOR_HOOKFUNCTION(lms, ItemTouch)
 
 MUTATOR_HOOKFUNCTION(lms, Bot_FixCount, CBC_ORDER_EXCLUSIVE)
 {
-	entity head;
-	FOR_EACH_REALCLIENT(head)
-	{
-		++bot_activerealplayers;
-		++bot_realplayers;
-	}
+	FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(
+		++M_ARGV(0, int); // activerealplayers
+		++M_ARGV(1, int); // realplayers
+	));
 
 	return true;
 }
 
 MUTATOR_HOOKFUNCTION(lms, ClientCommand_Spectate)
 {
-	if(self.lms_spectate_warning)
+    entity player = M_ARGV(0, entity);
+
+	if(player.lms_spectate_warning)
 	{
 		// for the forfeit message...
-		self.lms_spectate_warning = 2;
-		// mark player as spectator
-		PlayerScore_Add(self, SP_LMS_RANK, 666 - PlayerScore_Add(self, SP_LMS_RANK, 0));
+		player.lms_spectate_warning = 2;
 	}
 	else
 	{
-		self.lms_spectate_warning = 1;
-		sprint(self, "WARNING: you won't be able to enter the game again after spectating in LMS. Use the same command again to spectate anyway.\n");
+		if(player.frags != FRAGS_SPECTATOR && player.frags != FRAGS_LMS_LOSER)
+		{
+			player.lms_spectate_warning = 1;
+			sprint(player, "WARNING: you won't be able to enter the game again after spectating in LMS. Use the same command again to spectate anyway.\n");
+		}
 		return MUT_SPECCMD_RETURN;
 	}
 	return MUT_SPECCMD_CONTINUE;
@@ -352,14 +376,13 @@ MUTATOR_HOOKFUNCTION(lms, ClientCommand_Spectate)
 
 MUTATOR_HOOKFUNCTION(lms, CheckRules_World)
 {
-	ret_float = WinningCondition_LMS();
+	M_ARGV(0, float) = WinningCondition_LMS();
 	return true;
 }
 
 MUTATOR_HOOKFUNCTION(lms, WantWeapon)
 {
-	want_allguns = true;
-	return false;
+	M_ARGV(2, bool) = true; // all weapons
 }
 
 MUTATOR_HOOKFUNCTION(lms, GetPlayerStatus)
@@ -370,9 +393,8 @@ MUTATOR_HOOKFUNCTION(lms, GetPlayerStatus)
 MUTATOR_HOOKFUNCTION(lms, AddPlayerScore)
 {
 	if(gameover)
-	if(score_field == SP_LMS_RANK)
+	if(M_ARGV(0, entity) == SP_LMS_RANK) // score field
 		return true; // allow writing to this field in intermission as it is needed for newly joining players
-	return false;
 }
 
 // scoreboard stuff
@@ -387,10 +409,6 @@ void lms_ScoreRules()
 void lms_Initialize()
 {
 	lms_lowest_lives = 9999;
-	lms_next_place = 0;
 
 	lms_ScoreRules();
 }
-
-
-#endif