X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_ca.qc;h=159df8a7818edbf5348a6d9ab184fb1227dbaefe;hb=6b3f7d6fc917129765479348a8b3957c50af09d9;hp=6e302a177909ba45f86578aeaea202bc1267bef4;hpb=2300937585fd409c578a516ed5e051ba389646d4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator/gamemode_ca.qc b/qcsrc/server/mutators/mutator/gamemode_ca.qc
index 6e302a177..159df8a78 100644
--- a/qcsrc/server/mutators/mutator/gamemode_ca.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_ca.qc
@@ -1,78 +1,12 @@
 #include "gamemode_ca.qh"
-#ifndef GAMEMODE_CA_H
-#define GAMEMODE_CA_H
 
-int autocvar_g_ca_point_limit;
-int autocvar_g_ca_point_leadlimit;
-float autocvar_g_ca_round_timelimit;
-bool autocvar_g_ca_team_spawns;
-int autocvar_g_ca_teams;
-int autocvar_g_ca_teams_override;
-float autocvar_g_ca_warmup;
-
-
-int ca_teams;
-bool allowed_to_spawn;
-
-const int ST_CA_ROUNDS = 1;
-
-bool CA_CheckTeams();
-bool CA_CheckWinner();
-void CA_RoundStart();
-bool ca_isEliminated(entity e);
-
-void SetLimits(int fraglimit_override, int leadlimit_override, float timelimit_override, float qualifying_override);
-
-REGISTER_MUTATOR(ca, false)
-{
-	MUTATOR_ONADD
-	{
-		// game loads at time 1
-		if (time > 1) error("This is a game type and it cannot be added at runtime.");
-
-		allowed_to_spawn = true;
-
-		ca_teams = autocvar_g_ca_teams_override;
-		if (ca_teams < 2) ca_teams = autocvar_g_ca_teams;
-		ca_teams = bound(2, ca_teams, 4);
-
-        ScoreRules_basics(ca_teams, SFL_SORT_PRIO_PRIMARY, 0, true);
-        ScoreInfo_SetLabel_TeamScore(ST_CA_ROUNDS, "rounds", SFL_SORT_PRIO_PRIMARY);
-        ScoreRules_basics_end();
-
-		round_handler_Spawn(CA_CheckTeams, CA_CheckWinner, CA_RoundStart);
-		round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
-
-		EliminatedPlayers_Init(ca_isEliminated);
-
-		ActivateTeamplay();
-		SetLimits(autocvar_g_ca_point_limit, autocvar_g_ca_point_leadlimit, autocvar_timelimit_override, -1);
-
-		if (autocvar_g_ca_team_spawns)
-			have_team_spawns = -1; // request team spawns
-	}
-
-	MUTATOR_ONREMOVE
-	{
-		LOG_INFO("This is a game type and it cannot be removed at runtime.");
-		return -1;
-	}
-
-	return 0;
-}
-
-// should be removed in the future, as other code should not have to care
-.float caplayer; // 0.5 if scheduled to join the next round
-#endif
-
-#ifdef IMPLEMENTATION
 float autocvar_g_ca_damage2score_multiplier;
 bool autocvar_g_ca_spectate_enemies;
 
 void CA_count_alive_players()
 {
 	total_players = redalive = bluealive = yellowalive = pinkalive = 0;
-	FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
+	FOREACH_CLIENT(IS_PLAYER(it), {
 		switch(it.team)
 		{
 			case NUM_TEAM_1: ++total_players; if(!IS_DEAD(it)) ++redalive; break;
@@ -80,13 +14,13 @@ void CA_count_alive_players()
 			case NUM_TEAM_3: ++total_players; if(!IS_DEAD(it)) ++yellowalive; break;
 			case NUM_TEAM_4: ++total_players; if(!IS_DEAD(it)) ++pinkalive; break;
 		}
-	));
-	FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(
+	});
+	FOREACH_CLIENT(IS_REAL_CLIENT(it), {
 		it.redalive_stat = redalive;
 		it.bluealive_stat = bluealive;
 		it.yellowalive_stat = yellowalive;
 		it.pinkalive_stat = pinkalive;
-	));
+	});
 }
 
 float CA_GetWinnerTeam()
@@ -117,16 +51,18 @@ float CA_GetWinnerTeam()
 void nades_Clear(entity player);
 
 #define CA_ALIVE_TEAMS() ((redalive > 0) + (bluealive > 0) + (yellowalive > 0) + (pinkalive > 0))
-#define CA_ALIVE_TEAMS_OK() (CA_ALIVE_TEAMS() == ca_teams)
+#define CA_ALIVE_TEAMS_OK() (CA_ALIVE_TEAMS() == NumTeams(ca_teams))
 float CA_CheckWinner()
 {
 	if(round_handler_GetEndTime() > 0 && round_handler_GetEndTime() - time <= 0)
 	{
 		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ROUND_OVER);
 		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_OVER);
+		FOREACH_CLIENT(IS_PLAYER(it), { nades_Clear(it); });
+
 		allowed_to_spawn = false;
+		game_stopped = true;
 		round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
-		FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(nades_Clear(it)));
 		return 1;
 	}
 
@@ -148,9 +84,10 @@ float CA_CheckWinner()
 	}
 
 	allowed_to_spawn = false;
+	game_stopped = true;
 	round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
 
-	FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(nades_Clear(it)));
+	FOREACH_CLIENT(IS_PLAYER(it), { nades_Clear(it); });
 
 	return 1;
 }
@@ -179,9 +116,15 @@ bool CA_CheckTeams()
 		prev_missing_teams_mask = -1;
 		return false;
 	}
-	int missing_teams_mask = (!redalive) + (!bluealive) * 2;
-	if(ca_teams >= 3) missing_teams_mask += (!yellowalive) * 4;
-	if(ca_teams >= 4) missing_teams_mask += (!pinkalive) * 8;
+	int missing_teams_mask = 0;
+	if(ca_teams & BIT(0))
+		missing_teams_mask += (!redalive) * 1;
+	if(ca_teams & BIT(1))
+		missing_teams_mask += (!bluealive) * 2;
+	if(ca_teams & BIT(2))
+		missing_teams_mask += (!yellowalive) * 4;
+	if(ca_teams & BIT(3))
+		missing_teams_mask += (!pinkalive) * 8;
 	if(prev_missing_teams_mask != missing_teams_mask)
 	{
 		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_MISSING_TEAMS, missing_teams_mask);
@@ -226,6 +169,18 @@ MUTATOR_HOOKFUNCTION(ca, PlayerSpawn)
 		eliminatedPlayers.SendFlags |= 1;
 }
 
+MUTATOR_HOOKFUNCTION(ca, ForbidSpawn)
+{
+	entity player = M_ARGV(0, entity);
+
+	// spectators / observers that weren't playing can join; they are
+	// immediately forced to observe in the PutClientInServer hook
+	// this way they are put in a team and can play in the next round
+	if (!allowed_to_spawn && player.caplayer)
+		return true;
+	return false;
+}
+
 MUTATOR_HOOKFUNCTION(ca, PutClientInServer)
 {
 	entity player = M_ARGV(0, entity);
@@ -233,7 +188,7 @@ MUTATOR_HOOKFUNCTION(ca, PutClientInServer)
 	if (!allowed_to_spawn && IS_PLAYER(player)) // this is true even when player is trying to join
 	{
 		TRANSMUTE(Observer, player);
-		if (player.jointime != time && !player.caplayer) // not when connecting
+		if (CS(player).jointime != time && !player.caplayer) // not when connecting
 		{
 			player.caplayer = 0.5;
 			Send_Notification(NOTIF_ONE_ONLY, player, MSG_INFO, INFO_CA_JOIN_LATE);
@@ -244,7 +199,7 @@ MUTATOR_HOOKFUNCTION(ca, PutClientInServer)
 MUTATOR_HOOKFUNCTION(ca, reset_map_players)
 {
 	FOREACH_CLIENT(true, {
-		it.killcount = 0;
+		CS(it).killcount = 0;
 		if (!it.caplayer && IS_BOT_CLIENT(it))
 		{
 			it.team = -1;
@@ -257,6 +212,7 @@ MUTATOR_HOOKFUNCTION(ca, reset_map_players)
 			PutClientInServer(it);
 		}
 	});
+	bot_relinkplayerlist();
 	return true;
 }
 
@@ -274,7 +230,7 @@ MUTATOR_HOOKFUNCTION(ca, reset_map_global)
 	return true;
 }
 
-MUTATOR_HOOKFUNCTION(ca, GetTeamCount, CBC_ORDER_EXCLUSIVE)
+MUTATOR_HOOKFUNCTION(ca, CheckAllowedTeams, CBC_ORDER_EXCLUSIVE)
 {
 	M_ARGV(0, float) = ca_teams;
 }
@@ -313,6 +269,8 @@ MUTATOR_HOOKFUNCTION(ca, PlayerDies)
 		frag_target.respawn_flags =  RESPAWN_SILENT;
 	if (!warmup_stage)
 		eliminatedPlayers.SendFlags |= 1;
+	if(IS_BOT_CLIENT(frag_target))
+		bot_clear(frag_target);
 	return true;
 }
 
@@ -325,25 +283,20 @@ MUTATOR_HOOKFUNCTION(ca, ClientDisconnect)
 	return true;
 }
 
-MUTATOR_HOOKFUNCTION(ca, ForbidPlayerScore_Clear)
-{
-	return true;
-}
-
 MUTATOR_HOOKFUNCTION(ca, MakePlayerObserver)
 {
     entity player = M_ARGV(0, entity);
 
 	if (!IS_DEAD(player))
 		ca_LastPlayerForTeam_Notify(player);
-	if (player.killindicator_teamchange == -2)
+	if (CS(player).killindicator_teamchange == -2) // player wants to spectate
 		player.caplayer = 0;
 	if (player.caplayer)
 		player.frags = FRAGS_LMS_LOSER;
-    else
-        player.frags = FRAGS_SPECTATOR;
 	if (!warmup_stage)
 		eliminatedPlayers.SendFlags |= 1;
+	if (!player.caplayer)
+		return false;  // allow team reset
 	return true;  // prevent team reset
 }
 
@@ -371,7 +324,7 @@ MUTATOR_HOOKFUNCTION(ca, SetStartItems)
 	start_ammo_fuel    = warmup_start_ammo_fuel    = cvar("g_lms_start_ammo_fuel");
 }
 
-MUTATOR_HOOKFUNCTION(ca, PlayerDamage_Calculate)
+MUTATOR_HOOKFUNCTION(ca, Damage_Calculate)
 {
 	entity frag_attacker = M_ARGV(1, entity);
 	entity frag_target = M_ARGV(2, entity);
@@ -413,7 +366,7 @@ MUTATOR_HOOKFUNCTION(ca, PlayerDamage_SplitHealthArmor)
 	float excess = max(0, frag_damage - damage_take - damage_save);
 
 	if (frag_target != frag_attacker && IS_PLAYER(frag_attacker))
-		PlayerTeamScore_Add(frag_attacker, SP_SCORE, ST_SCORE, (frag_damage - excess) * autocvar_g_ca_damage2score_multiplier);
+		GameRules_scoring_add_team(frag_attacker, SCORE, (frag_damage - excess) * autocvar_g_ca_damage2score_multiplier);
 }
 
 MUTATOR_HOOKFUNCTION(ca, PlayerRegen)
@@ -505,6 +458,11 @@ MUTATOR_HOOKFUNCTION(ca, WantWeapon)
 	M_ARGV(2, bool) = true; // all weapons
 }
 
+MUTATOR_HOOKFUNCTION(ca, HideTeamNagger)
+{
+	return true; // doesn't work well with the whole spectator as player thing
+}
+
 MUTATOR_HOOKFUNCTION(ca, GetPlayerStatus)
 {
 	entity player = M_ARGV(0, entity);
@@ -517,5 +475,3 @@ MUTATOR_HOOKFUNCTION(ca, SetWeaponArena)
 	// most weapons arena
 	if (M_ARGV(0, string) == "0" || M_ARGV(0, string) == "") M_ARGV(0, string) = "most";
 }
-
-#endif