X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Ffreezetag%2Fsv_freezetag.qc;h=bf336caf98fddfc9c371728cedd1096eebcce0d0;hp=54f6268e36da53d537e2effef2c5c72c62afadbf;hb=565754a35f9e84a3b8e6eac08635ec27145b369a;hpb=55f166a94432b80e71f6f76702a1b15fde60c474

diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
index 54f6268e36..bf336caf98 100644
--- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
+++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
@@ -198,7 +198,8 @@ void freezetag_Freeze(entity targ, entity attacker)
 	if(STAT(FROZEN, targ))
 		return;
 
-	if(autocvar_g_freezetag_frozen_maxtime > 0)
+	targ.freezetag_frozen_time = time;
+	if (autocvar_g_freezetag_revive_auto && autocvar_g_freezetag_frozen_maxtime > 0)
 		targ.freezetag_frozen_timeout = time + autocvar_g_freezetag_frozen_maxtime;
 
 	Freeze(targ, 0, FROZEN_NORMAL, true);
@@ -454,6 +455,30 @@ MUTATOR_HOOKFUNCTION(ft, Unfreeze)
 	targ.freezetag_frozen_timeout = 0;
 }
 
+MUTATOR_HOOKFUNCTION(ft, Damage_Calculate)
+{
+	entity frag_attacker = M_ARGV(1, entity);
+	entity frag_target = M_ARGV(2, entity);
+	//float frag_deathtype = M_ARGV(3, float);
+	//float frag_damage = M_ARGV(4, float);
+	vector frag_force = M_ARGV(6, vector);
+
+	if (STAT(FROZEN, frag_target) == FROZEN_NORMAL && autocvar_g_freezetag_revive_auto_reducible
+		&& autocvar_g_freezetag_frozen_maxtime > 0 && autocvar_g_freezetag_revive_auto)
+	{
+		float t = 0;
+		if ((autocvar_g_freezetag_revive_auto_reducible > 0 || DIFF_TEAM(frag_attacker, frag_target))
+			&& frag_target.freezetag_frozen_timeout > time)
+		{
+			if (fabs(autocvar_g_freezetag_revive_auto_reducible) == 1)
+				t = vlen(frag_force) * autocvar_g_freezetag_revive_auto_reducible_forcefactor;
+			frag_target.freezetag_frozen_timeout -= t;
+			if (frag_target.freezetag_frozen_timeout < time)
+				frag_target.freezetag_frozen_timeout = time;
+		}
+	}
+}
+
 #ifdef IS_REVIVING
 	#undef IS_REVIVING
 #endif
@@ -499,30 +524,38 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST)
 			reviving_players_last.chain = NULL;
 	}
 
+	float base_progress = 0;
+	if  (STAT(FROZEN, player) == FROZEN_NORMAL && autocvar_g_freezetag_revive_auto
+		&& autocvar_g_freezetag_frozen_maxtime > 0 && autocvar_g_freezetag_revive_auto_progress)
+	{
+		base_progress = bound(0, (1 - (player.freezetag_frozen_timeout - time) / autocvar_g_freezetag_frozen_maxtime), 1);
+	}
+
 	if (!n) // no teammate nearby
 	{
 		if (STAT(FROZEN, player) == FROZEN_NORMAL)
 		{
-			STAT(REVIVE_PROGRESS, player) = bound(0, STAT(REVIVE_PROGRESS, player) - frametime * autocvar_g_freezetag_revive_clearspeed, 1);
+			STAT(REVIVE_PROGRESS, player) = bound(base_progress, STAT(REVIVE_PROGRESS, player) - frametime * autocvar_g_freezetag_revive_clearspeed, 1);
 			SetResourceExplicit(player, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, player) * ((warmup_stage) ? warmup_start_health : start_health)));
 		}
 		else if (!STAT(FROZEN, player))
-			STAT(REVIVE_PROGRESS, player) = 0; // thawing nobody
+			STAT(REVIVE_PROGRESS, player) = base_progress; // thawing nobody
 	}
 	else if (STAT(FROZEN, player) == FROZEN_NORMAL) // OK, there is at least one teammate reviving us
 	{
-		STAT(REVIVE_PROGRESS, player) = bound(0, STAT(REVIVE_PROGRESS, player) + frametime * max(1/60, autocvar_g_freezetag_revive_speed), 1);
+		STAT(REVIVE_PROGRESS, player) = bound(base_progress, STAT(REVIVE_PROGRESS, player) + frametime * max(1/60, autocvar_g_freezetag_revive_speed), 1);
 		SetResourceExplicit(player, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, player) * ((warmup_stage) ? warmup_start_health : start_health)));
 
 		if(STAT(REVIVE_PROGRESS, player) >= 1)
 		{
+			float frozen_time = time - player.freezetag_frozen_time;
 			Unfreeze(player, false);
 			freezetag_count_alive_players();
 
 			if(n == -1)
 			{
-				Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_FREEZETAG_AUTO_REVIVED, autocvar_g_freezetag_frozen_maxtime);
-				Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_FREEZETAG_AUTO_REVIVED, player.netname, autocvar_g_freezetag_frozen_maxtime);
+				Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_FREEZETAG_AUTO_REVIVED, frozen_time);
+				Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_FREEZETAG_AUTO_REVIVED, player.netname, frozen_time);
 				return true;
 			}