#include "command/vote.qh"
-#include "mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
#include "../common/deathtypes/all.qh"
-#include "../common/gamemodes/_mod.qh"
+#include <common/gamemodes/_mod.qh>
#include "../common/teams.qh"
/// \brief Describes a state of team balance entity.
.int m_num_bots; ///< Number of bots in a team.
.int m_num_players_alive; ///< Number of alive players in a team.
.int m_num_control_points; ///< Number of control points owned by a team.
-.entity m_lowest_human; ///< Human with the lowest score in a team.
-.entity m_lowest_bot; ///< Bot with the lowest score in a team.
entity g_team_entities[NUM_TEAMS]; ///< Holds global team entities.
int new_team = Team_IndexToTeam(index);
if (player.team == new_team)
{
- // This is important when players join the game and one of their color
- // matches the team color while other doesn't. For example [BOT]Lion.
- SetPlayerColors(player, new_team - 1);
+ if (new_team != -1)
+ {
+ // This is important when players join the game and one of their
+ // color matches the team color while other doesn't. For example
+ // [BOT]Lion.
+ SetPlayerColors(player, new_team - 1);
+ }
return true;
}
int old_index = Team_TeamToIndex(player.team);
// Mutator has blocked team change.
return false;
}
- SetPlayerColors(player, new_team - 1);
+ if (new_team == -1)
+ {
+ player.team = -1;
+ }
+ else
+ {
+ SetPlayerColors(player, new_team - 1);
+ }
MUTATOR_CALLHOOK(Player_ChangedTeam, player, old_index, index);
return true;
}
-bool SetPlayerTeam(entity player, int destination_team_index,
- int source_team_index, bool no_print)
+bool SetPlayerTeam(entity player, int team_index, int type)
{
- if (!Player_SetTeamIndex(player, destination_team_index))
+ int old_team_index = Entity_GetTeamIndex(player);
+ if (!Player_SetTeamIndex(player, team_index))
{
return false;
}
- LogTeamchange(player.playerid, player.team, TEAM_CHANGE_MANUAL);
- if (no_print)
+ LogTeamchange(player.playerid, player.team, type);
+ if (team_index != old_team_index)
{
- return true;
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(player.team,
+ INFO_JOIN_PLAY_TEAM), player.netname);
+ KillPlayerForTeamChange(player);
}
- bprint(playername(player, false), "^7 has changed from ",
- Team_IndexToColoredFullName(source_team_index), "^7 to ",
- Team_IndexToColoredFullName(destination_team_index), "\n");
return true;
}
bool MoveToTeam(entity client, int team_index, int type)
{
+ //PrintToChatAll(sprintf("MoveToTeam: %s, %f", client.netname, team_index));
int lockteams_backup = lockteams; // backup any team lock
lockteams = 0; // disable locked teams
PlayerScore_Clear(client);
- if (!Player_SetTeamIndex(client, team_index))
+ if (!SetPlayerTeam(client, team_index, type))
{
lockteams = lockteams_backup; // restore the team lock
return false;
}
- KillPlayerForTeamChange(client);
lockteams = lockteams_backup; // restore the team lock
- LogTeamchange(client.playerid, client.team, type);
return true;
}
team_ent.m_team_score = g_team_entities[i].m_team_score;
team_ent.m_num_players = TEAM_NOT_ALLOWED;
team_ent.m_num_bots = 0;
- team_ent.m_lowest_human = NULL;
- team_ent.m_lowest_bot = NULL;
}
+ setthink(balance, TeamBalance_Destroy);
int teams_mask = 0;
string teament_name = string_null;
entity team_ent = TeamBalance_GetTeamFromIndex(balance, i);
if (TeamBalanceTeam_IsAllowed(team_ent))
{
- MUTATOR_CALLHOOK(TeamBalance_GetTeamCount, i, ignore,
- team_ent.m_num_players, team_ent.m_num_bots,
- team_ent.m_lowest_human, team_ent.m_lowest_bot);
+ MUTATOR_CALLHOOK(TeamBalance_GetTeamCount, i, ignore);
team_ent.m_num_players = M_ARGV(2, float);
team_ent.m_num_bots = M_ARGV(3, float);
- team_ent.m_lowest_human = M_ARGV(4, entity);
- team_ent.m_lowest_bot = M_ARGV(5, entity);
}
}
}
{
++team_ent.m_num_bots;
}
- float temp_score = PlayerScore_Get(it, SP_SCORE);
- if (!IS_BOT_CLIENT(it))
- {
- if (team_ent.m_lowest_human == NULL)
- {
- team_ent.m_lowest_human = it;
- continue;
- }
- if (temp_score < PlayerScore_Get(team_ent.m_lowest_human,
- SP_SCORE))
- {
- team_ent.m_lowest_human = it;
- }
- continue;
- }
- if (team_ent.m_lowest_bot == NULL)
- {
- team_ent.m_lowest_bot = it;
- continue;
- }
- if (temp_score < PlayerScore_Get(team_ent.m_lowest_bot, SP_SCORE))
- {
- team_ent.m_lowest_bot = it;
- }
});
}
void TeamBalance_JoinBestTeam(entity this, bool force_best_team)
{
+ //PrintToChatAll(sprintf("JoinBestTeam: %s, %f", this.netname, force_best_team));
// don't join a team if we're not playing a team game
if (!teamplay)
{
if (Team_IsValidIndex(selected_team_index))
{
- Player_SetTeamIndex(this, selected_team_index);
- LogTeamchange(this.playerid, this.team, TEAM_CHANGE_AUTO_RELAXED);
+ SetPlayerTeam(this, selected_team_index, TEAM_CHANGE_AUTO_RELAXED);
TeamBalance_Destroy(balance);
return;
}
}
int best_team_index = TeamBalance_FindBestTeam(balance, this, true);
int old_team_index = Team_TeamToIndex(this.team);
+ TeamBalance_Destroy(balance);
PlayerScore_Clear(this);
- Player_SetTeamIndex(this, best_team_index);
- LogTeamchange(this.playerid, this.team, TEAM_CHANGE_AUTO);
+ if (!SetPlayerTeam(this, best_team_index, TEAM_CHANGE_AUTO))
+ {
+ return;
+ }
if ((old_team_index != -1) && !IS_BOT_CLIENT(this))
{
- TeamBalance_AutoBalanceBots(balance, old_team_index, best_team_index);
+ TeamBalance_AutoBalanceBots(best_team_index, old_team_index);
}
- KillPlayerForTeamChange(this);
- TeamBalance_Destroy(balance);
}
int TeamBalance_CompareTeams(entity balance, int team_index_a, int team_index_b,
return TeamBalance_CompareTeamsInternal(team_a, team_b, player, use_score);
}
-void TeamBalance_AutoBalanceBots(entity balance, int source_team_index,
+void TeamBalance_AutoBalanceBots(int source_team_index,
int destination_team_index)
{
- if (balance == NULL)
- {
- LOG_FATAL("TeamBalance_AutoBalanceBots: Team balance entity is NULL.");
- }
- if (balance.m_team_balance_state != TEAM_BALANCE_TEAM_COUNTS_FILLED)
- {
- LOG_FATAL("TeamBalance_AutoBalanceBots: "
- "TeamBalance_GetTeamCounts has not been called.");
- }
if (!Team_IsValidIndex(source_team_index))
{
- LOG_WARNF("AutoBalanceBots: Source team index is invalid: %f",
- source_team_index);
+ LOG_WARNF("TeamBalance_AutoBalanceBots: "
+ "Source team index is invalid: %f", source_team_index);
return;
}
if (!Team_IsValidIndex(destination_team_index))
{
- LOG_WARNF("AutoBalanceBots: Destination team index is invalid: %f",
- destination_team_index);
+ LOG_WARNF("TeamBalance_AutoBalanceBots: "
+ "Destination team index is invalid: %f", destination_team_index);
return;
}
if (!autocvar_g_balance_teams ||
{
return;
}
+ entity balance = TeamBalance_CheckAllowedTeams(NULL);
+ TeamBalance_GetTeamCounts(balance, NULL);
entity source_team = TeamBalance_GetTeamFromIndex(balance,
source_team_index);
- if (!TeamBalanceTeam_IsAllowed(source_team))
+ entity destination_team = TeamBalance_GetTeamFromIndex(balance,
+ destination_team_index);
+ if ((source_team.m_num_bots == 0) || (source_team.m_num_players <=
+ destination_team.m_num_players))
{
+ TeamBalance_Destroy(balance);
return;
}
- entity destination_team = TeamBalance_GetTeamFromIndex(balance,
- destination_team_index);
- if ((destination_team.m_num_players <= source_team.m_num_players) ||
- (destination_team.m_lowest_bot == NULL))
+ TeamBalance_Destroy(balance);
+ entity lowest_bot = NULL;
+ if (MUTATOR_CALLHOOK(TeamBalance_GetPlayerForTeamSwitch, source_team_index,
+ destination_team_index, true))
+ {
+ lowest_bot = M_ARGV(3, entity);
+ }
+ else
+ {
+ float lowest_score = FLOAT_MAX;
+ FOREACH_CLIENT(IS_BOT_CLIENT(it) && (Entity_GetTeamIndex(it) ==
+ source_team_index),
+ {
+ float temp_score = PlayerScore_Get(it, SP_SCORE);
+ if (temp_score >= lowest_score)
+ {
+ continue;
+ }
+ balance = TeamBalance_CheckAllowedTeams(it);
+ if (TeamBalance_IsTeamAllowed(balance, destination_team_index))
+ {
+ lowest_bot = it;
+ lowest_score = temp_score;
+ }
+ TeamBalance_Destroy(balance);
+ });
+ }
+ if (lowest_bot == NULL)
+ {
+ return;
+ }
+ if (!Player_SetTeamIndex(lowest_bot, destination_team_index))
{
return;
}
- Player_SetTeamIndex(destination_team.m_lowest_bot, source_team_index);
- KillPlayerForTeamChange(destination_team.m_lowest_bot);
+ KillPlayerForTeamChange(lowest_bot);
}
bool TeamBalance_IsTeamAllowedInternal(entity balance, int index)
return team_ent.m_num_bots;
}
-entity TeamBalanceTeam_GetLowestHuman(entity team_ent)
-{
- return team_ent.m_lowest_human;
-}
-
-entity TeamBalanceTeam_GetLowestBot(entity team_ent)
-{
- return team_ent.m_lowest_bot;
-}
-
int TeamBalance_CompareTeamsInternal(entity team_a, entity team_b,
entity player, bool use_score)
{
return TEAMS_COMPARE_EQUAL;
}
+// Called when the player connects or when they change their color with "color"
+// command.
void SV_ChangeTeam(entity this, float _color)
{
- int source_color, destination_color;
- int source_team_index, destination_team_index;
+ //PrintToChatAll(sprintf("SV_ChangeTeam: %s, %f", this.netname, _color));
// in normal deathmatch we can just apply the color and we're done
if(!teamplay)
if(!teamplay)
return;
+ int source_color, destination_color;
+ int source_team_index, destination_team_index;
+
source_color = this.clientcolors & 0x0F;
destination_color = _color & 0x0F;
// not changing teams
if (source_color == destination_color)
{
- SetPlayerTeam(this, destination_team_index, source_team_index, true);
+ SetPlayerTeam(this, destination_team_index, TEAM_CHANGE_MANUAL);
TeamBalance_Destroy(balance);
return;
}
return;
}
}
+ TeamBalance_Destroy(balance);
if (IS_PLAYER(this) && source_team_index != destination_team_index)
{
// reduce frags during a team change
PlayerScore_Clear(this);
}
- if (!SetPlayerTeam(this, destination_team_index, source_team_index,
- !IS_CLIENT(this)))
+ if (!SetPlayerTeam(this, destination_team_index, TEAM_CHANGE_MANUAL))
{
- TeamBalance_Destroy(balance);
return;
}
- TeamBalance_AutoBalanceBots(balance, source_team_index,
- destination_team_index);
- if (!IS_PLAYER(this) || (source_team_index == destination_team_index))
- {
- TeamBalance_Destroy(balance);
- return;
- }
- KillPlayerForTeamChange(this);
- TeamBalance_Destroy(balance);
+ TeamBalance_AutoBalanceBots(destination_team_index, source_team_index);
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff