]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/teamplay.qc
Improved LogTeamchange.
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / teamplay.qc
index e2b16cab9a2babf7aa10e8bdece8cf4a3b93a002..4cc9ff960ee37a0f074585d916ff9781bee338a7 100644 (file)
@@ -34,6 +34,8 @@ const int TEAM_NOT_ALLOWED = -1;
 .float m_team_score; ///< The score of the team.
 .int m_num_players; ///< Number of players (both humans and bots) in a team.
 .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.
 
@@ -75,145 +77,50 @@ void Team_SetTeamScore(entity team_, float score)
        team_.m_team_score = score;
 }
 
-void TeamchangeFrags(entity e)
+int Team_GetNumberOfAlivePlayers(entity team_)
 {
-       PlayerScore_Clear(e);
+       return team_.m_num_players_alive;
 }
 
-void LogTeamchange(float player_id, float team_number, float type)
+void Team_SetNumberOfAlivePlayers(entity team_, int number)
 {
-       if(!autocvar_sv_eventlog)
-               return;
-
-       if(player_id < 1)
-               return;
-
-       GameLogEcho(strcat(":team:", ftos(player_id), ":", ftos(team_number), ":", ftos(type)));
+       team_.m_num_players_alive = number;
 }
 
-void default_delayedinit(entity this)
+int Team_GetNumberOfAliveTeams()
 {
-       if(!scores_initialized)
-               ScoreRules_generic();
+       int result = 0;
+       for (int i = 0; i < NUM_TEAMS; ++i)
+       {
+               if (g_team_entities[i].m_num_players_alive > 0)
+               {
+                       ++result;
+               }
+       }
+       return result;
 }
 
-void InitGameplayMode()
+int Team_GetNumberOfControlPoints(entity team_)
 {
-       VoteReset();
-
-       // find out good world mins/maxs bounds, either the static bounds found by looking for solid, or the mapinfo specified bounds
-       get_mi_min_max(1);
-       // assign reflectively to avoid "assignment to world" warning
-       int done = 0; for (int i = 0, n = numentityfields(); i < n; ++i) {
-           string k = entityfieldname(i); vector v = (k == "mins") ? mi_min : (k == "maxs") ? mi_max : '0 0 0';
-           if (v) {
-            putentityfieldstring(i, world, sprintf("%v", v));
-            if (++done == 2) break;
-        }
-       }
-       // currently, NetRadiant's limit is 131072 qu for each side
-       // distance from one corner of a 131072qu cube to the opposite corner is approx. 227023 qu
-       // set the distance according to map size but don't go over the limit to avoid issues with float precision
-       // in case somebody makes extremely large maps
-       max_shot_distance = min(230000, vlen(world.maxs - world.mins));
-
-       MapInfo_LoadMapSettings(mapname);
-       GameRules_teams(false);
-
-       if (!cvar_value_issafe(world.fog))
-       {
-               LOG_INFO("The current map contains a potentially harmful fog setting, ignored");
-               world.fog = string_null;
-       }
-       if(MapInfo_Map_fog != "")
-               if(MapInfo_Map_fog == "none")
-                       world.fog = string_null;
-               else
-                       world.fog = strzone(MapInfo_Map_fog);
-       clientstuff = strzone(MapInfo_Map_clientstuff);
-
-       MapInfo_ClearTemps();
-
-       gamemode_name = MapInfo_Type_ToText(MapInfo_LoadedGametype);
-
-       cache_mutatormsg = strzone("");
-       cache_lastmutatormsg = strzone("");
-
-       InitializeEntity(NULL, default_delayedinit, INITPRIO_GAMETYPE_FALLBACK);
+       return team_.m_num_control_points;
 }
 
-string GetClientVersionMessage(entity this)
+void Team_SetNumberOfControlPoints(entity team_, int number)
 {
-       if (CS(this).version_mismatch) {
-               if(CS(this).version < autocvar_gameversion) {
-                       return strcat("This is Xonotic ", autocvar_g_xonoticversion,
-                               "\n^3Your client version is outdated.\n\n\n### YOU WON'T BE ABLE TO PLAY ON THIS SERVER ###\n\n\nPlease update!!!^8");
-               } else {
-                       return strcat("This is Xonotic ", autocvar_g_xonoticversion,
-                               "\n^3This server is using an outdated Xonotic version.\n\n\n ### THIS SERVER IS INCOMPATIBLE AND THUS YOU CANNOT JOIN ###.^8");
-               }
-       } else {
-               return strcat("Welcome to Xonotic ", autocvar_g_xonoticversion);
-       }
+       team_.m_num_control_points = number;
 }
 
-string getwelcomemessage(entity this)
+int Team_GetNumberOfTeamsWithControlPoints()
 {
-       MUTATOR_CALLHOOK(BuildMutatorsPrettyString, "");
-       string modifications = M_ARGV(0, string);
-
-       if(g_weaponarena)
-       {
-               if(g_weaponarena_random)
-                       modifications = strcat(modifications, ", ", ftos(g_weaponarena_random), " of ", g_weaponarena_list, " Arena");
-               else
-                       modifications = strcat(modifications, ", ", g_weaponarena_list, " Arena");
-       }
-       else if(cvar("g_balance_blaster_weaponstartoverride") == 0)
-               modifications = strcat(modifications, ", No start weapons");
-       if(cvar("sv_gravity") < stof(cvar_defstring("sv_gravity")))
-               modifications = strcat(modifications, ", Low gravity");
-       if(g_weapon_stay && !g_cts)
-               modifications = strcat(modifications, ", Weapons stay");
-       if(g_jetpack)
-               modifications = strcat(modifications, ", Jet pack");
-       if(autocvar_g_powerups == 0)
-               modifications = strcat(modifications, ", No powerups");
-       if(autocvar_g_powerups > 0)
-               modifications = strcat(modifications, ", Powerups");
-       modifications = substring(modifications, 2, strlen(modifications) - 2);
-
-       string versionmessage = GetClientVersionMessage(this);
-       string s = strcat(versionmessage, "^8\n^8\nmatch type is ^1", gamemode_name, "^8\n");
-
-       if(modifications != "")
-               s = strcat(s, "^8\nactive modifications: ^3", modifications, "^8\n");
-
-       if(cache_lastmutatormsg != autocvar_g_mutatormsg)
+       int result = 0;
+       for (int i = 0; i < NUM_TEAMS; ++i)
        {
-               if(cache_lastmutatormsg)
-                       strunzone(cache_lastmutatormsg);
-               if(cache_mutatormsg)
-                       strunzone(cache_mutatormsg);
-               cache_lastmutatormsg = strzone(autocvar_g_mutatormsg);
-               cache_mutatormsg = strzone(cache_lastmutatormsg);
-       }
-
-       if (cache_mutatormsg != "") {
-               s = strcat(s, "\n\n^8special gameplay tips: ^7", cache_mutatormsg);
-       }
-
-       string mutator_msg = "";
-       MUTATOR_CALLHOOK(BuildGameplayTipsString, mutator_msg);
-       mutator_msg = M_ARGV(0, string);
-
-       s = strcat(s, mutator_msg); // trust that the mutator will do proper formatting
-
-       string motd = autocvar_sv_motd;
-       if (motd != "") {
-               s = strcat(s, "\n\n^8MOTD: ^7", strreplace("\\n", "\n", motd));
+               if (g_team_entities[i].m_num_control_points > 0)
+               {
+                       ++result;
+               }
        }
-       return s;
+       return result;
 }
 
 void setcolor(entity this, int clr)
@@ -226,11 +133,26 @@ void setcolor(entity this, int clr)
 #endif
 }
 
+bool Entity_HasValidTeam(entity this)
+{
+       return Team_IsValidTeam(this.team);
+}
+
 int Entity_GetTeamIndex(entity this)
 {
        return Team_TeamToIndex(this.team);
 }
 
+entity Entity_GetTeam(entity this)
+{
+       int index = Entity_GetTeamIndex(this);
+       if (!Team_IsValidIndex(index))
+       {
+               return NULL;
+       }
+       return Team_GetTeamFromIndex(index);
+}
+
 void SetPlayerColors(entity player, float _color)
 {
        float pants = _color & 0x0F;
@@ -273,7 +195,7 @@ bool SetPlayerTeam(entity player, int destination_team_index,
        {
                return false;
        }
-       LogTeamchange(player.playerid, player.team, 3);  // log manual team join
+       LogTeamchange(player.playerid, player.team, TEAM_CHANGE_MANUAL);
        if (no_print)
        {
                return true;
@@ -284,6 +206,22 @@ bool SetPlayerTeam(entity player, int destination_team_index,
        return true;
 }
 
+bool MoveToTeam(entity client, int team_index, int type)
+{
+       int lockteams_backup = lockteams;  // backup any team lock
+       lockteams = 0;  // disable locked teams
+       PlayerScore_Clear(client);
+       if (!Player_SetTeamIndex(client, team_index))
+       {
+               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;
+}
+
 void KillPlayerForTeamChange(entity player)
 {
        if (IS_DEAD(player))
@@ -298,6 +236,17 @@ void KillPlayerForTeamChange(entity player)
                player.origin, '0 0 0');
 }
 
+void LogTeamchange(float player_id, float team_number, int type)
+{
+       if(!autocvar_sv_eventlog)
+               return;
+
+       if(player_id < 1)
+               return;
+
+       GameLogEcho(strcat(":team:", ftos(player_id), ":", ftos(team_number), ":", ftos(type)));
+}
+
 entity TeamBalance_CheckAllowedTeams(entity for_whom)
 {
        entity balance = spawn();
@@ -733,7 +682,7 @@ void TeamBalance_JoinBestTeam(entity this, bool force_best_team)
                if (Team_IsValidIndex(selected_team_index))
                {
                        Player_SetTeamIndex(this, selected_team_index);
-                       LogTeamchange(this.playerid, this.team, 99);
+                       LogTeamchange(this.playerid, this.team, TEAM_CHANGE_AUTO_RELAXED);
                        TeamBalance_Destroy(balance);
                        return;
                }
@@ -746,9 +695,9 @@ void TeamBalance_JoinBestTeam(entity this, bool force_best_team)
        }
        int best_team_index = TeamBalance_FindBestTeam(balance, this, true);
        int old_team_index = Team_TeamToIndex(this.team);
-       TeamchangeFrags(this);
+       PlayerScore_Clear(this);
        Player_SetTeamIndex(this, best_team_index);
-       LogTeamchange(this.playerid, this.team, 2); // log auto join
+       LogTeamchange(this.playerid, this.team, TEAM_CHANGE_AUTO);
        if ((old_team_index != -1) && !IS_BOT_CLIENT(this))
        {
                TeamBalance_AutoBalanceBots(balance, old_team_index, best_team_index);
@@ -1013,7 +962,7 @@ void SV_ChangeTeam(entity this, float _color)
        if (IS_PLAYER(this) && source_team_index != destination_team_index)
        {
                // reduce frags during a team change
-               TeamchangeFrags(this);
+               PlayerScore_Clear(this);
        }
        if (!SetPlayerTeam(this, destination_team_index, source_team_index,
                !IS_CLIENT(this)))