X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_ca.qc;h=a0f238358455a271a80a45d996ecf9c07fe16f36;hb=754e6b0083895315729a0d0ba42a2e798f61d365;hp=0c5e01a6acbb20dff70de980a39e7884cd27dc8d;hpb=a3a5f609bbdd785df2b90410289c03ecde6c999f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc index 0c5e01a6a..a0f238358 100644 --- a/qcsrc/server/mutators/gamemode_ca.qc +++ b/qcsrc/server/mutators/gamemode_ca.qc @@ -4,6 +4,14 @@ float redalive, bluealive, yellowalive, pinkalive; float ca_teams; float allowed_to_spawn; +const float ST_CA_ROUNDS = 1; +void ca_ScoreRules(float teams) +{ + ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, 0, true); + ScoreInfo_SetLabel_TeamScore(ST_CA_ROUNDS, "rounds", SFL_SORT_PRIO_PRIMARY); + ScoreRules_basics_end(); +} + void CA_count_alive_players() { entity e; @@ -72,7 +80,7 @@ float CA_CheckWinner() { Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_OVER); Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_OVER); - allowed_to_spawn = FALSE; + allowed_to_spawn = false; round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit); FOR_EACH_PLAYER(e) nades_Clear(e); @@ -96,7 +104,7 @@ float CA_CheckWinner() Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_TIED); } - allowed_to_spawn = FALSE; + allowed_to_spawn = false; round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit); FOR_EACH_PLAYER(e) @@ -108,47 +116,62 @@ float CA_CheckWinner() void CA_RoundStart() { if(warmup_stage) - allowed_to_spawn = TRUE; + allowed_to_spawn = true; else - allowed_to_spawn = FALSE; + allowed_to_spawn = false; } -float prev_total_players; float CA_CheckTeams() { - allowed_to_spawn = TRUE; + static float prev_missing_teams_mask; + allowed_to_spawn = true; CA_count_alive_players(); if(CA_ALIVE_TEAMS_OK()) { - if(prev_total_players > 0) + if(prev_missing_teams_mask > 0) Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_MISSING_TEAMS); - prev_total_players = -1; + prev_missing_teams_mask = -1; return 1; } - if(prev_total_players != total_players) + if(total_players == 0) + { + if(prev_missing_teams_mask > 0) + Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_MISSING_TEAMS); + prev_missing_teams_mask = -1; + return 0; + } + float missing_teams_mask = (!redalive) + (!bluealive) * 2; + if(ca_teams >= 3) missing_teams_mask += (!yellowalive) * 4; + if(ca_teams >= 4) missing_teams_mask += (!pinkalive) * 8; + if(prev_missing_teams_mask != missing_teams_mask) { - float p1 = 0, p2 = 0, p3 = 0, p4 = 0; - if(!redalive) p1 = NUM_TEAM_1; - if(!bluealive) p2 = NUM_TEAM_2; - if(ca_teams >= 3) - if(!yellowalive) p3 = NUM_TEAM_3; - if(ca_teams >= 4) - if(!pinkalive) p4 = NUM_TEAM_4; - Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_MISSING_TEAMS, p1, p2, p3, p4); - prev_total_players = total_players; + Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_MISSING_TEAMS, missing_teams_mask); + prev_missing_teams_mask = missing_teams_mask; } return 0; } +float ca_isEliminated(entity e) +{ + if(e.caplayer == 1 && (e.deadflag != DEAD_NO || e.frags == FRAGS_LMS_LOSER)) + return true; + if(e.caplayer == 0.5) + return true; + return false; +} + MUTATOR_HOOKFUNCTION(ca_PlayerSpawn) { self.caplayer = 1; + if(!warmup_stage) + eliminatedPlayers.SendFlags |= 1; return 1; } MUTATOR_HOOKFUNCTION(ca_PutClientInServer) { if(!allowed_to_spawn) + if(IS_PLAYER(self)) // this is true even when player is trying to join { self.classname = "observer"; if(self.jointime != time) //not when connecting @@ -156,7 +179,7 @@ MUTATOR_HOOKFUNCTION(ca_PutClientInServer) { self.caplayer = 0.5; if(IS_REAL_CLIENT(self)) - sprint(self, "You will join the game in the next round.\n"); + Send_Notification(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_CA_JOIN_LATE); } } return 1; @@ -167,6 +190,11 @@ MUTATOR_HOOKFUNCTION(ca_reset_map_players) FOR_EACH_CLIENT(self) { self.killcount = 0; + if(!self.caplayer && IS_BOT_CLIENT(self)) + { + self.team = -1; + self.caplayer = 1; + } if(self.caplayer) { self.classname = "player"; @@ -185,7 +213,7 @@ MUTATOR_HOOKFUNCTION(ca_ClientConnect) MUTATOR_HOOKFUNCTION(ca_reset_map_global) { - allowed_to_spawn = TRUE; + allowed_to_spawn = true; return 1; } @@ -195,10 +223,47 @@ MUTATOR_HOOKFUNCTION(ca_GetTeamCount) return 0; } +entity ca_LastPlayerForTeam() +{ + entity pl, last_pl = world; + FOR_EACH_PLAYER(pl) + { + if(pl.health >= 1) + if(pl != self) + if(pl.team == self.team) + if(!last_pl) + last_pl = pl; + else + return world; + } + return last_pl; +} + +void ca_LastPlayerForTeam_Notify() +{ + if(round_handler_IsActive()) + if(round_handler_IsRoundStarted()) + { + entity pl = ca_LastPlayerForTeam(); + if(pl) + Send_Notification(NOTIF_ONE, pl, MSG_CENTER, CENTER_ALONE); + } +} + MUTATOR_HOOKFUNCTION(ca_PlayerDies) { + ca_LastPlayerForTeam_Notify(); if(!allowed_to_spawn) self.respawn_flags = RESPAWN_SILENT; + if(!warmup_stage) + eliminatedPlayers.SendFlags |= 1; + return 1; +} + +MUTATOR_HOOKFUNCTION(ca_ClientDisconnect) +{ + if(self.caplayer == 1) + ca_LastPlayerForTeam_Notify(); return 1; } @@ -209,10 +274,14 @@ MUTATOR_HOOKFUNCTION(ca_ForbidPlayerScore_Clear) MUTATOR_HOOKFUNCTION(ca_MakePlayerObserver) { + if(self.caplayer == 1) + ca_LastPlayerForTeam_Notify(); if(self.killindicator_teamchange == -2) self.caplayer = 0; if(self.caplayer) self.frags = FRAGS_LMS_LOSER; + if(!warmup_stage) + eliminatedPlayers.SendFlags |= 1; return 1; } @@ -251,19 +320,19 @@ MUTATOR_HOOKFUNCTION(ca_PlayerDamage) frag_mirrordamage = 0; - return FALSE; + return false; } MUTATOR_HOOKFUNCTION(ca_FilterItem) { if(autocvar_g_powerups <= 0) if(self.flags & FL_POWERUP) - return TRUE; + return true; if(autocvar_g_pickup_items <= 0) - return TRUE; + return true; - return FALSE; + return false; } MUTATOR_HOOKFUNCTION(ca_PlayerDamage_SplitHealthArmor) @@ -273,25 +342,25 @@ MUTATOR_HOOKFUNCTION(ca_PlayerDamage_SplitHealthArmor) 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); - return FALSE; + return false; } MUTATOR_HOOKFUNCTION(ca_PlayerRegen) { // no regeneration in CA - return TRUE; + return true; } void ca_Initialize() { - allowed_to_spawn = TRUE; + 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); ret_float = ca_teams; - ScoreRules_ca(ca_teams); + ca_ScoreRules(ca_teams); round_handler_Spawn(CA_CheckTeams, CA_CheckWinner, CA_RoundStart); round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit); @@ -300,6 +369,8 @@ void ca_Initialize() addstat(STAT_BLUEALIVE, AS_INT, bluealive_stat); addstat(STAT_YELLOWALIVE, AS_INT, yellowalive_stat); addstat(STAT_PINKALIVE, AS_INT, pinkalive_stat); + + EliminatedPlayers_Init(ca_isEliminated); } MUTATOR_DEFINITION(gamemode_ca) @@ -312,6 +383,7 @@ MUTATOR_DEFINITION(gamemode_ca) MUTATOR_HOOK(reset_map_players, ca_reset_map_players, CBC_ORDER_ANY); MUTATOR_HOOK(GetTeamCount, ca_GetTeamCount, CBC_ORDER_EXCLUSIVE); MUTATOR_HOOK(PlayerDies, ca_PlayerDies, CBC_ORDER_ANY); + MUTATOR_HOOK(ClientDisconnect, ca_ClientDisconnect, CBC_ORDER_ANY); MUTATOR_HOOK(ForbidPlayerScore_Clear, ca_ForbidPlayerScore_Clear, CBC_ORDER_ANY); MUTATOR_HOOK(ForbidThrowCurrentWeapon, ca_ForbidThrowCurrentWeapon, CBC_ORDER_ANY); MUTATOR_HOOK(GiveFragsForKill, ca_GiveFragsForKill, CBC_ORDER_FIRST);