From dc7c41d7f6ab09d2dd8a628f2209051e85626153 Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 30 Sep 2019 22:01:15 +0200 Subject: [PATCH] Freezetag: if auto-revival is in progress, manual revive speed is reduced so that it always takes the same amount of time --- qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc | 5 +++-- qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc index bf336caf9..8e9f06a09 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc +++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc @@ -528,6 +528,7 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST) if (STAT(FROZEN, player) == FROZEN_NORMAL && autocvar_g_freezetag_revive_auto && autocvar_g_freezetag_frozen_maxtime > 0 && autocvar_g_freezetag_revive_auto_progress) { + // NOTE if auto-revival is in progress, manual revive speed is reduced so that it always takes the same amount of time base_progress = bound(0, (1 - (player.freezetag_frozen_timeout - time) / autocvar_g_freezetag_frozen_maxtime), 1); } @@ -535,7 +536,7 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST) { if (STAT(FROZEN, player) == FROZEN_NORMAL) { - STAT(REVIVE_PROGRESS, player) = bound(base_progress, 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 - base_progress), 1); SetResourceExplicit(player, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, player) * ((warmup_stage) ? warmup_start_health : start_health))); } else if (!STAT(FROZEN, player)) @@ -543,7 +544,7 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST) } else if (STAT(FROZEN, player) == FROZEN_NORMAL) // OK, there is at least one teammate reviving us { - STAT(REVIVE_PROGRESS, player) = bound(base_progress, 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 - base_progress)), 1); SetResourceExplicit(player, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, player) * ((warmup_stage) ? warmup_start_health : start_health))); if(STAT(REVIVE_PROGRESS, player) >= 1) diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh index e749d1ab6..b187b3802 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh +++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh @@ -31,8 +31,8 @@ const float ICE_MAX_ALPHA = 1; const float ICE_MIN_ALPHA = 0.1; float freezetag_teams; -bool autocvar_g_freezetag_revive_auto; -int autocvar_g_freezetag_revive_auto_progress; +bool autocvar_g_freezetag_revive_auto = 1; +int autocvar_g_freezetag_revive_auto_progress = 1; int autocvar_g_freezetag_revive_auto_reducible; float autocvar_g_freezetag_revive_auto_reducible_forcefactor; float autocvar_g_freezetag_revive_extra_size; -- 2.39.2