X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_ca.qc;h=f4c4f6826d34be248dc7e9b49df280161d6e7980;hb=c4d826fdcd84e247ef467865acabf63ada4581c1;hp=f8efe47a881bfaedd6d324deecee2d17232e4e83;hpb=d53311537bb618a7aedc564823817586583c22c5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc
index f8efe47a8..f4c4f6826 100644
--- a/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@ -1,9 +1,19 @@
-float total_players;
-float redalive, bluealive, yellowalive, pinkalive;
-.float redalive_stat, bluealive_stat, yellowalive_stat, pinkalive_stat;
+#include "gamemode_ca.qh"
+#include "../_all.qh"
+
+#include "gamemode.qh"
+
 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 +82,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 +106,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,15 +118,15 @@ 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_missing_teams_mask;
 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())
 	{
@@ -143,35 +153,15 @@ float CA_CheckTeams()
 	return 0;
 }
 
-float EliminatedPlayers_SendEntity(entity to, float sendflags)
+float ca_isEliminated(entity e)
 {
-	float i, f, b;
-	entity e;
-	WriteByte(MSG_ENTITY, ENT_CLIENT_ELIMINATEDPLAYERS);
-	WriteByte(MSG_ENTITY, sendflags);
-
-	if(sendflags & 1)
-	{
-		for(i = 1; i <= maxclients; i += 8)
-		{
-			for(f = 0, e = edict_num(i), b = 1; b < 256; b *= 2, e = nextent(e))
-			{
-				if(e.caplayer == 0.5 || (e.caplayer == 1 && (e.deadflag != DEAD_NO || e.frags == FRAGS_LMS_LOSER)))
-					f |= b;
-			}
-			WriteByte(MSG_ENTITY, f);
-		}
-	}
-
-	return TRUE;
-}
-
-void EliminatedPlayers_Init()
-{
-	Net_LinkEntity(eliminatedPlayers = spawn(), FALSE, 0, EliminatedPlayers_SendEntity);
+	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;
@@ -225,7 +215,7 @@ MUTATOR_HOOKFUNCTION(ca_ClientConnect)
 
 MUTATOR_HOOKFUNCTION(ca_reset_map_global)
 {
-	allowed_to_spawn = TRUE;
+	allowed_to_spawn = true;
 	return 1;
 }
 
@@ -317,6 +307,7 @@ MUTATOR_HOOKFUNCTION(ca_SetStartItems)
 	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;
@@ -331,19 +322,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)
@@ -353,25 +344,31 @@ 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;
+}
+
+MUTATOR_HOOKFUNCTION(ca_CountFrags)
+{
+	// announce remaining frags
+	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);
@@ -381,7 +378,7 @@ void ca_Initialize()
 	addstat(STAT_YELLOWALIVE, AS_INT, yellowalive_stat);
 	addstat(STAT_PINKALIVE, AS_INT, pinkalive_stat);
 
-	EliminatedPlayers_Init();
+	EliminatedPlayers_Init(ca_isEliminated);
 }
 
 MUTATOR_DEFINITION(gamemode_ca)
@@ -403,6 +400,7 @@ MUTATOR_DEFINITION(gamemode_ca)
 	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_HOOK(Scores_CountFragsRemaining, ca_CountFrags, CBC_ORDER_ANY);
 
 	MUTATOR_ONADD
 	{
@@ -413,7 +411,7 @@ MUTATOR_DEFINITION(gamemode_ca)
 
 	MUTATOR_ONREMOVE
 	{
-		print("This is a game type and it cannot be removed at runtime.");
+		LOG_INFO("This is a game type and it cannot be removed at runtime.");
 		return -1;
 	}