X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_ca.qc;h=79ad7213071eb707f47bfa7607b3f02d1034e738;hb=971eb36c4ccfde80cd46767b0c20e2d97350821e;hp=f55c46e00ad5e34468bdfaae2e614227e7702aba;hpb=265b681e0fb49239df1bfc431a903f66244a3172;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc
index f55c46e00..79ad72130 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;
@@ -67,12 +75,15 @@ float CA_GetWinnerTeam()
 #define CA_ALIVE_TEAMS_OK() (CA_ALIVE_TEAMS() == ca_teams)
 float CA_CheckWinner()
 {
+	entity e;
 	if(round_handler_GetEndTime() > 0 && round_handler_GetEndTime() - time <= 0)
 	{
 		Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_OVER);
 		Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_OVER);
 		allowed_to_spawn = FALSE;
 		round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
+		FOR_EACH_PLAYER(e)
+			nades_Clear(e);
 		return 1;
 	}
 
@@ -95,6 +106,10 @@ float CA_CheckWinner()
 
 	allowed_to_spawn = FALSE;
 	round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
+
+	FOR_EACH_PLAYER(e)
+		nades_Clear(e);
+
 	return 1;
 }
 
@@ -106,49 +121,65 @@ void CA_RoundStart()
 		allowed_to_spawn = FALSE;
 }
 
-float prev_total_players;
+float prev_missing_teams_mask;
 float CA_CheckTeams()
 {
 	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)
 	{
-		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;
+		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)
+	{
+		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
 		if(!self.caplayer)
 		{
 			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;
@@ -158,6 +189,12 @@ 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";
@@ -182,18 +219,51 @@ MUTATOR_HOOKFUNCTION(ca_reset_map_global)
 
 MUTATOR_HOOKFUNCTION(ca_GetTeamCount)
 {
-	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;
-	return 1;
+	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;
 }
 
@@ -204,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;
 }
 
@@ -224,16 +298,15 @@ MUTATOR_HOOKFUNCTION(ca_GiveFragsForKill)
 
 MUTATOR_HOOKFUNCTION(ca_SetStartItems)
 {
-	start_health = cvar("g_lms_start_health");
-	start_armorvalue = cvar("g_lms_start_armor");
-
-	start_ammo_shells = cvar("g_lms_start_ammo_shells");
-	start_ammo_nails = cvar("g_lms_start_ammo_nails");
-	start_ammo_rockets = cvar("g_lms_start_ammo_rockets");
-	start_ammo_cells = cvar("g_lms_start_ammo_cells");
-	start_ammo_fuel = cvar("g_lms_start_ammo_fuel");
-	
 	start_items &= ~IT_UNLIMITED_AMMO;
+	start_health       = warmup_start_health       = cvar("g_lms_start_health");
+	start_armorvalue   = warmup_start_armorvalue   = cvar("g_lms_start_armor");
+	start_ammo_shells  = warmup_start_ammo_shells  = cvar("g_lms_start_ammo_shells");
+	start_ammo_nails   = warmup_start_ammo_nails   = cvar("g_lms_start_ammo_nails");
+	start_ammo_rockets = warmup_start_ammo_rockets = cvar("g_lms_start_ammo_rockets");
+	start_ammo_cells   = warmup_start_ammo_cells   = cvar("g_lms_start_ammo_cells");
+	start_ammo_plasma  = warmup_start_ammo_plasma  = cvar("g_lms_start_ammo_plasma");
+	start_ammo_fuel    = warmup_start_ammo_fuel    = cvar("g_lms_start_ammo_fuel");
 
 	return 0;
 }
@@ -244,9 +317,9 @@ MUTATOR_HOOKFUNCTION(ca_PlayerDamage)
 	if(frag_target.deadflag == DEAD_NO)
 	if(frag_target == frag_attacker || SAME_TEAM(frag_target, frag_attacker) || frag_deathtype == DEATH_FALL)
 		frag_damage = 0;
-		
+
 	frag_mirrordamage = 0;
-		
+
 	return FALSE;
 }
 
@@ -255,40 +328,40 @@ MUTATOR_HOOKFUNCTION(ca_FilterItem)
 	if(autocvar_g_powerups <= 0)
 	if(self.flags & FL_POWERUP)
 		return TRUE;
-		
+
 	if(autocvar_g_pickup_items <= 0)
 		return TRUE;
-		
+
 	return FALSE;
 }
 
 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);
-		
-	return FALSE;
-}
 
-// scoreboard setup
-void ca_ScoreRules()
-{
-	ScoreRules_basics(2, SFL_SORT_PRIO_PRIMARY, 0, TRUE);
-	ScoreInfo_SetLabel_TeamScore  (ST_CA_ROUNDS,    "rounds",    SFL_SORT_PRIO_PRIMARY);
-	ScoreRules_basics_end();
+	return FALSE;
 }
 
-void ca_DelayedInit() // Do this check with a delay so we can wait for teams to be set up.
+MUTATOR_HOOKFUNCTION(ca_PlayerRegen)
 {
-	ca_ScoreRules();
+	// no regeneration in CA
+	return TRUE;
 }
 
 void ca_Initialize()
 {
 	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;
+	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);
 
@@ -297,7 +370,7 @@ void ca_Initialize()
 	addstat(STAT_YELLOWALIVE, AS_INT, yellowalive_stat);
 	addstat(STAT_PINKALIVE, AS_INT, pinkalive_stat);
 
-	InitializeEntity(world, ca_DelayedInit, INITPRIO_GAMETYPE);
+	EliminatedPlayers_Init(ca_isEliminated);
 }
 
 MUTATOR_DEFINITION(gamemode_ca)
@@ -310,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);
@@ -317,6 +391,7 @@ MUTATOR_DEFINITION(gamemode_ca)
 	MUTATOR_HOOK(PlayerDamage_Calculate, ca_PlayerDamage, CBC_ORDER_ANY);
 	MUTATOR_HOOK(FilterItem, ca_FilterItem, CBC_ORDER_ANY);
 	MUTATOR_HOOK(PlayerDamage_SplitHealthArmor, ca_PlayerDamage_SplitHealthArmor, CBC_ORDER_ANY);
+	MUTATOR_HOOK(PlayerRegen, ca_PlayerRegen, CBC_ORDER_ANY);
 
 	MUTATOR_ONADD
 	{