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=ba25fa71617792de6e542092543f13ac5de86383;hp=b1feaa9917c2cb913ce91f9465f795d6f40305ab;hb=6c4bdd5eeea06db69a457997de24bef84b4eaf93;hpb=014563bb18d2fca287bd53fbde65b057e4ec6eef diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc index b1feaa9917..ba25fa7161 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; @@ -130,7 +131,7 @@ bool freezetag_CheckWinner() { Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, APP_TEAM_NUM(winner_team, CENTER_ROUND_TEAM_WIN)); Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(winner_team, INFO_ROUND_TEAM_WIN)); - TeamScore_AddToTeam(winner_team, ST_SCORE, +1); + TeamScore_AddToTeam(winner_team, ST_FT_ROUNDS, +1); } else if(winner_team == -1) { @@ -198,7 +199,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); @@ -366,6 +368,9 @@ MUTATOR_HOOKFUNCTION(ft, PlayerDies) return true; } + frag_target.respawn_time = time + 1; + frag_target.respawn_flags |= RESPAWN_FORCE; + // Cases DEATH_TEAMCHANGE and DEATH_AUTOTEAMCHANGE are needed to fix a bug whe // you succeed changing team through the menu: you both really die (gibbing) and get frozen if(ITEM_DAMAGE_NEEDKILL(frag_deathtype) @@ -454,6 +459,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 @@ -472,57 +501,65 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST) if(!round_handler_IsRoundStarted()) return true; - int n; entity player = M_ARGV(0, entity); //if (STAT(FROZEN, player) == FROZEN_NORMAL) //if(player.freezetag_frozen_timeout > 0 && time < player.freezetag_frozen_timeout) //player.iceblock.alpha = ICE_MIN_ALPHA + (ICE_MAX_ALPHA - ICE_MIN_ALPHA) * (player.freezetag_frozen_timeout - time) / (player.freezetag_frozen_timeout - player.freezetag_frozen_time); + if (!(frametime && IS_PLAYER(player))) + return true; + entity reviving_players_last = NULL; entity reviving_players_first = NULL; - if(player.freezetag_frozen_timeout > 0 && time >= player.freezetag_frozen_timeout) + 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), { + if (reviving_players_last) + reviving_players_last.chain = it; + reviving_players_last = it; + if (!reviving_players_first) + reviving_players_first = it; + ++n; + }); + if (reviving_players_last) + reviving_players_last.chain = NULL; + + // allow normal revival during automatic revival + // (not allowing it IS_REVIVING should check freezetag_frozen_timeout too) + if (!n && player.freezetag_frozen_timeout > 0 && time >= player.freezetag_frozen_timeout) n = -1; - else + + 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) { - 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), { - if (reviving_players_last) - reviving_players_last.chain = it; - reviving_players_last = it; - if (!reviving_players_first) - reviving_players_first = it; - ++n; - }); - if (reviving_players_last) - reviving_players_last.chain = NULL; + // 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 { 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))); - } + STAT(REVIVE_PROGRESS, player) = bound(base_progress, STAT(REVIVE_PROGRESS, player) - frametime * autocvar_g_freezetag_revive_clearspeed * (1 - base_progress), 1); 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); - 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); + 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; } @@ -544,12 +581,30 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST) 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; } MUTATOR_HOOKFUNCTION(ft, SetStartItems) { - start_items &= ~IT_UNLIMITED_AMMO; + start_items &= ~(IT_UNLIMITED_AMMO | IT_UNLIMITED_SUPERWEAPONS); //start_health = warmup_start_health = cvar("g_lms_start_health"); //start_armorvalue = warmup_start_armorvalue = cvar("g_lms_start_armor"); start_ammo_shells = warmup_start_ammo_shells = cvar("g_lms_start_ammo_shells"); @@ -617,6 +672,12 @@ MUTATOR_HOOKFUNCTION(ft, SV_ParseServerCommand) return false; } +MUTATOR_HOOKFUNCTION(ft, Scores_CountFragsRemaining) +{ + // announce remaining frags + return true; +} + void freezetag_Initialize() { freezetag_teams = autocvar_g_freezetag_teams_override; @@ -625,6 +686,7 @@ void freezetag_Initialize() freezetag_teams = BITS(bound(2, freezetag_teams, 4)); GameRules_scoring(freezetag_teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, { + field_team(ST_FT_ROUNDS, "rounds", SFL_SORT_PRIO_PRIMARY); field(SP_FREEZETAG_REVIVALS, "revivals", 0); });