X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Ffreezetag%2Fsv_freezetag.qc;h=249c343d31cca2f29ba981ba1aec9fec027afbee;hb=4032946855208e893e438e0371fc9a02b1e354cd;hp=360dc7a4ea8bb1f15ca4274c6ad2225a9625cf75;hpb=38f4a1731d66faca35562977b145f76e119f2887;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc index 360dc7a4e..249c343d3 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc +++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc @@ -1,5 +1,6 @@ #include "sv_freezetag.qh" +#include #include float autocvar_g_freezetag_frozen_maxtime; @@ -113,6 +114,7 @@ bool freezetag_CheckWinner() Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_OVER); FOREACH_CLIENT(IS_PLAYER(it), { it.freezetag_frozen_timeout = 0; + it.freezetag_revive_time = 0; nades_Clear(it); }); game_stopped = true; @@ -140,6 +142,7 @@ bool freezetag_CheckWinner() FOREACH_CLIENT(IS_PLAYER(it), { it.freezetag_frozen_timeout = 0; + it.freezetag_revive_time = 0; nades_Clear(it); }); @@ -178,7 +181,7 @@ void freezetag_Add_Score(entity targ, entity attacker) { if(attacker == targ) { - // you froze your own dumb targ + // you froze your own dumb self // counted as "suicide" already GameRules_scoring_add(targ, SCORE, -1); } @@ -198,7 +201,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); @@ -436,6 +440,7 @@ MUTATOR_HOOKFUNCTION(ft, reset_map_players) { FOREACH_CLIENT(IS_PLAYER(it), { CS(it).killcount = 0; + it.freezetag_revive_time = 0; it.freezetag_frozen_timeout = -1; PutClientInServer(it); it.freezetag_frozen_timeout = 0; @@ -457,13 +462,36 @@ MUTATOR_HOOKFUNCTION(ft, Unfreeze) targ.freezetag_frozen_timeout = 0; } -#ifdef IS_REVIVING - #undef IS_REVIVING +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 IN_REVIVING_RANGE + #undef IN_REVIVING_RANGE #endif -// returns true if player is reviving it -#define IS_REVIVING(player, it, revive_extra_size) \ - (it != player && !STAT(FROZEN, it) && !IS_DEAD(it) && SAME_TEAM(it, player) \ +#define IN_REVIVING_RANGE(player, it, revive_extra_size) \ + (it != player && !IS_DEAD(it) && SAME_TEAM(it, player) \ && boxesoverlap(player.absmin - revive_extra_size, player.absmax + revive_extra_size, it.absmin, it.absmax)) MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST) @@ -486,9 +514,36 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST) entity reviving_players_last = NULL; entity reviving_players_first = NULL; + bool player_is_reviving = false; int n = 0; vector revive_extra_size = '1 1 1' * autocvar_g_freezetag_revive_extra_size; - FOREACH_CLIENT(IS_PLAYER(it) && IS_REVIVING(player, it, revive_extra_size), { + FOREACH_CLIENT(IS_PLAYER(it), { + // check if player is reviving anyone + if (STAT(FROZEN, it) == FROZEN_NORMAL) + { + if ((STAT(FROZEN, player) == FROZEN_NORMAL)) + continue; + if (!IN_REVIVING_RANGE(player, it, revive_extra_size)) + continue; + player_is_reviving = true; + break; + } + + if (!(STAT(FROZEN, player) == FROZEN_NORMAL)) + continue; // both player and it are NOT frozen + if (!IN_REVIVING_RANGE(player, it, revive_extra_size)) + continue; + + // found a teammate that is reviving player + if (autocvar_g_freezetag_revive_time_to_score > 0 && STAT(FROZEN, player) == FROZEN_NORMAL) + { + it.freezetag_revive_time += frametime / autocvar_g_freezetag_revive_time_to_score; + while (it.freezetag_revive_time > 1) + { + GameRules_scoring_add(it, SCORE, +1); + it.freezetag_revive_time -= 1; + } + } if (reviving_players_last) reviving_players_last.chain = it; reviving_players_last = it; @@ -500,34 +555,46 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST) reviving_players_last.chain = NULL; // allow normal revival during automatic revival - // (not allowing it IS_REVIVING should check freezetag_frozen_timeout too) + // (if we wouldn't allow it then freezetag_frozen_timeout should be checked too in the previous loop) + //if (STAT(FROZEN, player) == FROZEN_NORMAL) // redundant check if (!n && player.freezetag_frozen_timeout > 0 && time >= player.freezetag_frozen_timeout) n = -1; + 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) + { + // 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); + } + if (!n) // no teammate nearby { + float clearspeed = autocvar_g_freezetag_revive_clearspeed; + if (autocvar_g_freezetag_revive_time_to_score > 0) + clearspeed = 0; // prevent stacking points by entering and exiting the revival zone many times if (STAT(FROZEN, player) == FROZEN_NORMAL) - { - STAT(REVIVE_PROGRESS, player) = bound(0, 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) = bound(base_progress, STAT(REVIVE_PROGRESS, player) - frametime * clearspeed * (1 - base_progress), 1); + else if (!STAT(FROZEN, player) && !player_is_reviving) + 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); - SetResourceExplicit(player, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, player) * ((warmup_stage) ? warmup_start_health : start_health))); + STAT(REVIVE_PROGRESS, player) = bound(base_progress, STAT(REVIVE_PROGRESS, player) + frametime * max(1/60, autocvar_g_freezetag_revive_speed * (1 - base_progress)), 1); if(STAT(REVIVE_PROGRESS, player) >= 1) { + float frozen_time = time - player.freezetag_frozen_time; Unfreeze(player, false); + SetResourceExplicit(player, RES_HEALTH, ((warmup_stage) ? warmup_start_health : start_health)); 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); + if(autocvar_sv_eventlog) + GameLogEcho(strcat(":ft:autorevival:", ftos(player.playerid))); + 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; } @@ -543,12 +610,38 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST) Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_FREEZETAG_REVIVED, first.netname); Send_Notification(NOTIF_ONE, first, MSG_CENTER, CENTER_FREEZETAG_REVIVE, player.netname); Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_FREEZETAG_REVIVED, player.netname, first.netname); + if(autocvar_sv_eventlog) + { + string revivers = ""; + for(entity it = reviving_players_first; it; it = it.chain) + revivers = strcat(revivers, ftos(it.playerid), ","); + revivers = substring(revivers, 0, strlen(revivers) - 1); + GameLogEcho(strcat(":ft:revival:", ftos(player.playerid), ":", revivers)); + } } for(entity it = reviving_players_first; it; it = it.chain) STAT(REVIVE_PROGRESS, it) = STAT(REVIVE_PROGRESS, player); } + if (STAT(FROZEN, player) == FROZEN_NORMAL) + { + entity player_wp = player.waypointsprite_attached; + if (n > 0 || (n == 0 && STAT(REVIVE_PROGRESS, player) > 0.95)) + { + WaypointSprite_UpdateSprites(player_wp, WP_Reviving, WP_Null, WP_Null); + WaypointSprite_UpdateTeamRadar(player_wp, RADARICON_WAYPOINT, WP_REVIVING_COLOR); + } + else + { + WaypointSprite_UpdateSprites(player_wp, WP_Frozen, WP_Null, WP_Null); + WaypointSprite_UpdateTeamRadar(player_wp, RADARICON_WAYPOINT, WP_FROZEN_COLOR); + } + + WaypointSprite_UpdateMaxHealth(player_wp, 1); + WaypointSprite_UpdateHealth(player_wp, STAT(REVIVE_PROGRESS, player)); + } + return true; } @@ -635,7 +728,7 @@ void freezetag_Initialize() freezetag_teams = cvar("g_freezetag_teams"); // read the cvar directly as it gets written earlier in the same frame freezetag_teams = BITS(bound(2, freezetag_teams, 4)); - GameRules_scoring(freezetag_teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, { + GameRules_scoring(freezetag_teams, SFL_SORT_PRIO_PRIMARY, 0, { field_team(ST_FT_ROUNDS, "rounds", SFL_SORT_PRIO_PRIMARY); field(SP_FREEZETAG_REVIVALS, "revivals", 0); });