X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_freezetag.qc;h=f8d45f0424265f2823912edd65576f76a1f11373;hb=34399058fe7f06d982afd3bb0ca34768a35351cc;hp=2f6864ffd9626ec27f2e236be0acab51c4f292b9;hpb=f32d78f6626585d6fabaa2b1033b9bf09e92947f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 2f6864ffd..f8d45f042 100644
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -2,6 +2,7 @@ void freezetag_Initialize()
 {
 	precache_model("models/ice/ice.md3");
 	warmup = time + autocvar_g_start_delay + autocvar_g_freezetag_warmup;
+	ScoreRules_freezetag();
 }
 
 void freezetag_CheckWinner()
@@ -22,6 +23,7 @@ void freezetag_CheckWinner()
 
 	entity e, winner;
 	string teamname;
+	winner = world;
 
 	FOR_EACH_PLAYER(e)
 	{
@@ -34,7 +36,6 @@ void freezetag_CheckWinner()
 
 	if(winner != world) // just in case a winner wasn't found
 	{
-		TeamScore_AddToTeam(winner.team, ST_SCORE, +1);
 		if(winner.team == COLOR_TEAM1)
 			teamname = "^1Red Team";
 		else if(winner.team == COLOR_TEAM2)
@@ -47,6 +48,7 @@ void freezetag_CheckWinner()
 			centerprint(e, strcat(teamname, "^5 wins the round, all other teams were frozen.\n"));
 		}
 		bprint(teamname, "^5 wins the round since all the other teams were frozen.\n");
+		TeamScore_AddToTeam(winner.team, ST_SCORE, +1);
 	}
 
 	next_round = time + 5;
@@ -61,7 +63,7 @@ void freezetag_Ice_Think()
 	self.nextthink = time;
 }
 
-void freezetag_Freeze()
+void freezetag_Freeze(entity attacker)
 {
 	self.freezetag_frozen = 1;
 
@@ -75,7 +77,7 @@ void freezetag_Freeze()
 	setmodel(ice, "models/ice/ice.md3");
 
 	entity oldself;
-	olfself = self;
+	oldself = self;
 	self = ice;
 	freezetag_Ice_Think();
 	self = oldself;
@@ -86,9 +88,27 @@ void freezetag_Freeze()
 	{
 		WaypointSprite_UpdateTeamRadar(self.waypointsprite_attached, RADARICON_WAYPOINT, '0.25 0.90 1');
 	}
+
+	if(attacker == self)
+	{
+		// you froze your own dumb self
+		// counted as "suicide" already
+		PlayerScore_Add(self, SP_SCORE, -1);
+	}
+	else if(attacker.classname == "player")
+	{
+		// got frozen by an enemy
+		// counted as "kill" and "death" already
+		PlayerScore_Add(self, SP_SCORE, -1);
+		PlayerScore_Add(attacker, SP_SCORE, +1);
+	}
+	else
+	{
+		// nothing - got frozen by the game type rules themselves
+	}
 }
 
-void freezetag_Unfreeze()
+void freezetag_Unfreeze(entity attacker)
 {
 	self.freezetag_frozen = 0;
 
@@ -123,7 +143,7 @@ MUTATOR_HOOKFUNCTION(freezetag_RemovePlayer)
 	if(totalspawned > 2) // only check for winners if we had more than two players (one of them left, don't let the other player win just because of that)
 		freezetag_CheckWinner();
 
-	freezetag_Unfreeze();
+	freezetag_Unfreeze(world);
 
 	return 1;
 }
@@ -142,7 +162,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDies)
 			--pinkalive;
 		--totalalive;
 
-        freezetag_Freeze();
+        freezetag_Freeze(frag_attacker);
 	}
 
     if(frag_attacker.classname == STR_PLAYER)
@@ -170,7 +190,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDies)
 
 MUTATOR_HOOKFUNCTION(freezetag_PlayerSpawn)
 {
-    freezetag_Unfreeze(); // start by making sure that all ice blocks are removed
+    freezetag_Unfreeze(world); // start by making sure that all ice blocks are removed
 
 	if(totalspawned == 1 && time > game_starttime) // only one player active on server, start a new match immediately
 	if(!next_round && warmup && (time < warmup - autocvar_g_freezetag_warmup || time > warmup)) // not awaiting next round
@@ -181,7 +201,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerSpawn)
 	if(warmup && time > warmup) // spawn too late, freeze player
 	{
 		centerprint(self, "^1You spawned after the round started, you'll spawn as frozen.\n");
-		freezetag_Freeze();
+		freezetag_Freeze(world);
 	}
 
 	return 1;
@@ -224,11 +244,33 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink)
             self.freezetag_revive_progress = (time - self.freezetag_beginrevive_time) / autocvar_g_freezetag_revive_time;
             if(time - self.freezetag_beginrevive_time >= autocvar_g_freezetag_revive_time)
             {
-                freezetag_Unfreeze();
+                freezetag_Unfreeze(self);
+		
+		// EVERY team mate nearby gets a point (even if multiple!)
+		float n;
+		FOR_EACH_PLAYER(other) if(self != other)
+		{
+			if(other.freezetag_frozen == 0)
+			{
+				if(other.team == self.team)
+				{
+					teammate_nearby = boxesoverlap(self.absmin - revive_extra_size, self.absmax + revive_extra_size, other.absmin, other.absmax);
+					if(teammate_nearby)
+					{
+						PlayerScore_Add(other, SP_FREEZETAG_REVIVALS, +1);
+						PlayerScore_Add(other, SP_SCORE, +1);
+						++n;
+					}
+				}
+			}
+		}
 
-                centerprint(self, strcat("^5You were revived by ^7", other.netname, ".\n"));
-                centerprint(other, strcat("^5You revived ^7", self.netname, ".\n"));
-                bprint("^7", other.netname, "^5 revived ^7", self.netname, ".\n");
+		if(n > 1)
+			centerprint(self, strcat("^5You were revived by ^7", other.netname, "^5 et al.\n"));
+		else
+			centerprint(self, strcat("^5You were revived by ^7", other.netname, "^5.\n"));
+                centerprint(other, strcat("^5You revived ^7", self.netname, "^5.\n"));
+                bprint("^7", other.netname, "^5 revived ^7", self.netname, "^5.\n");
 
                 self.freezetag_beginrevive_time = -9999;
                 self.freezetag_revive_progress = 0;