X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Farena.qc;h=c89c2b2efada451a84b1990255d437641088195b;hp=c95396332f45106f404c68c2c549dc56b71f6a44;hb=9c40c25078426ed90e985c402c648fea3e3a8832;hpb=e7b12effc56b759e64fff06e252d1953096a9d9f diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc index c95396332f..c89c2b2efa 100644 --- a/qcsrc/server/arena.qc +++ b/qcsrc/server/arena.qc @@ -8,10 +8,8 @@ float arena_roundbased; entity spawnqueue_first; entity spawnqueue_last; entity champion; -string champion_name; float warmup; -float ca_players; -float required_ca_players; +float ca_teams_ok; .float caplayer; void PutObserverInServer(); @@ -29,8 +27,8 @@ float stopalivecheck; float redalive, bluealive, yellowalive, pinkalive; float totalalive; .float redalive_stat, bluealive_stat, yellowalive_stat, pinkalive_stat; -float redspawned, bluespawned, yellowspawned, pinkspawned; -float totalspawned; +float red_players, blue_players, yellow_players, pink_players; +float total_players; /** * Resets the state of all clients, items, flags, runes, keys, weapons, waypoints, ... of the map. @@ -134,7 +132,7 @@ void reset_map(float dorespawn) } if(g_keyhunt) - kh_Controller_SetThink(autocvar_g_balance_keyhunt_delay_round+(game_starttime - time), "", kh_StartRound); + kh_Controller_SetThink_NoMsg(autocvar_g_balance_keyhunt_delay_round+(game_starttime - time), kh_StartRound); if(g_arena) if(champion && champion.classname == "player" && player_count > 1) @@ -204,35 +202,31 @@ float roundStartTime_prev; // prevent networkspam void Arena_Warmup() { float f; - string msg; entity e; if((!g_arena && !g_ca && !g_freezetag) || (g_arena && !arena_roundbased) || (time < game_starttime)) return; f = ceil(warmup - time); - if(f > 0) - champion = world; // this is done because a if(champion) will not execute if champion = world allowed_to_spawn = 0; if(inWarmupStage) allowed_to_spawn = 1; - if(ca_players < required_ca_players) + if(g_ca && !ca_teams_ok) allowed_to_spawn = 1; - msg = NEWLINES; if(time < warmup && !inWarmupStage) { if (g_ca) allowed_to_spawn = 1; if(champion && g_arena) - msg = strcat("The Champion is ", champion_name, "^7\n"); - //centerprint(self, strcat(msg, "The Champion is ", champion.netname, "^7\n")); + { + FOR_EACH_PLAYER(e) + centerprint(e, strcat("The Champion is ", champion.netname)); + } if(f != roundStartTime_prev) { - msg = strcat(msg, "Round will start in ", ftos(f),"\n"); - //centerprint(self, strcat("Round will start in ", ftos(f),"\n")); roundStartTime_prev = f; if(f == 5) Announce("prepareforbattle"); @@ -243,8 +237,8 @@ void Arena_Warmup() else if(f == 1) Announce("1"); - FOR_EACH_PLAYER(e) - centerprint(e, msg); + FOR_EACH_PLAYER(e) + Send_CSQC_Centerprint_Generic(e, CPID_ROUND_STARTING, "Round will start in %d", 1, f); } if (g_arena) { @@ -256,53 +250,60 @@ void Arena_Warmup() self.movement = '0 0 0'; } } - else if(f > -1 && f != roundStartTime_prev) { roundStartTime_prev = f; Announce("begin"); - centerprint(self, "^1Begin!\n"); + FOR_EACH_PLAYER(e) + Send_CSQC_Centerprint_Generic(e, CPID_ROUND_STARTING, "^1Begin!", 1, 0); if(g_ca) { - ca_players = 0; + float start_red_ca_players, start_blue_ca_players; - FOR_EACH_PLAYER(e) - ca_players += 1; + FOR_EACH_PLAYER(e) { + if (e.team == COLOR_TEAM1) + start_red_ca_players += 1; + else if (e.team == COLOR_TEAM2) + start_blue_ca_players += 1; + } + // teams are ok if there's at least 1 player in each team + ca_teams_ok = (start_red_ca_players && start_blue_ca_players); } if(self.classname == "player" && self.health > 0 && self.movetype == MOVETYPE_NONE) self.movetype = MOVETYPE_WALK; + } + + // clear champion to avoid centerprinting again the champion msg + if (champion) + champion = world; } -void count_spawned_players() +void count_players() { - // TODO fix "*spawned" name, it should rather be "*players" or so - // not doing this now to prevent merge hell with Tag - // fix after merging with Tag - // count amount of players in each team - totalspawned = redspawned = bluespawned = yellowspawned = pinkspawned = 0; + total_players = red_players = blue_players = yellow_players = pink_players = 0; FOR_EACH_PLAYER(self) { if (self.team == COLOR_TEAM1) { - redspawned += 1; - totalspawned += 1; + red_players += 1; + total_players += 1; } else if (self.team == COLOR_TEAM2) { - bluespawned += 1; - totalspawned += 1; + blue_players += 1; + total_players += 1; } else if (self.team == COLOR_TEAM3) { - yellowspawned += 1; - totalspawned += 1; + yellow_players += 1; + total_players += 1; } else if (self.team == COLOR_TEAM4) { - pinkspawned += 1; - totalspawned += 1; + pink_players += 1; + total_players += 1; } } } @@ -371,9 +372,10 @@ void count_alive_players() * * Gets called in StartFrame() */ +float warntime; void Spawnqueue_Check() { - count_spawned_players(); + count_players(); if(g_ca || g_freezetag) // we want to perform this before the return block below (CA)... { count_alive_players(); @@ -382,26 +384,24 @@ void Spawnqueue_Check() return; if(g_ca) { - required_ca_players = max(2, fabs(autocvar_bot_vs_human + 1)); - - if(ca_players < required_ca_players && (redspawned && bluespawned)) { + if(!ca_teams_ok && (red_players && blue_players)) { reset_map(TRUE); } - else if(ca_players < required_ca_players) { - FOR_EACH_PLAYER(self) - centerprint(self, strcat("^1Need at least 1 player in each team to play CA", "^7\n")); + else if(!ca_teams_ok) { + if (time > warntime) + { + FOR_EACH_PLAYER(self) + Send_CSQC_Centerprint_Generic(self, CPID_ROUND_STARTING, "^1Need at least 1 player in each team to play CA", 2, 0); + warntime = time + 1; + } return; } else if(!next_round) { - if((redspawned && !bluespawned) || (bluespawned && !redspawned)) { + if((red_players && !blue_players) || (blue_players && !red_players)) { next_round = time + 5; - champion = find(world, classname, "player"); - if(champion_name) - strunzone(champion_name); - champion_name = strzone(champion.netname); } - else if((!redspawned && !bluespawned) || time - warmup > autocvar_g_ca_round_timelimit) { - FOR_EACH_CLIENT(self) centerprint(self, strcat("^7Round tied.", "^7\n")); + else if((!red_players && !blue_players) || time - warmup > autocvar_g_ca_round_timelimit) { + FOR_EACH_CLIENT(self) centerprint(self, "^7Round tied"); next_round = time + 5; } @@ -411,14 +411,14 @@ void Spawnqueue_Check() if(redalive && !bluealive) { play2all("ctf/red_capture.wav"); - FOR_EACH_CLIENT(self) centerprint(self, "^1 RED ^7team wins the round.\n"); + FOR_EACH_CLIENT(self) centerprint(self, "^1RED ^7team wins the round"); TeamScore_AddToTeam(COLOR_TEAM1, ST_SCORE, +1); stopalivecheck = TRUE; } else if(bluealive && !redalive) { play2all("ctf/blue_capture.wav"); - FOR_EACH_CLIENT(self) centerprint(self, "^4 BLUE ^7team wins the round.\n"); + FOR_EACH_CLIENT(self) centerprint(self, "^4BLUE ^7team wins the round"); TeamScore_AddToTeam(COLOR_TEAM2, ST_SCORE, +1); stopalivecheck = TRUE; }