X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_freezetag.qc;h=f74c9951fd4d49027e518057685823896b6a7def;hb=54db6e2ca49e7cb6b3a905299c6a17cb854e9521;hp=410a33673c9b8c0aff3f18343ddefdb93f666487;hpb=651eb599a896eb6785a2606c128db9e943d21248;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc index 410a33673..f74c9951f 100644 --- a/qcsrc/server/mutators/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/gamemode_freezetag.qc @@ -65,7 +65,11 @@ void freezetag_Ice_Think() void freezetag_Freeze(entity attacker) { + if(self.freezetag_frozen) + return; self.freezetag_frozen = 1; + self.freezetag_revive_progress = 0; + self.health = 1; entity ice; ice = spawn(); @@ -82,12 +86,10 @@ void freezetag_Freeze(entity attacker) freezetag_Ice_Think(); self = oldself; + RemoveGrapplingHook(self); + // add waypoint - WaypointSprite_Spawn("freezetag_frozen", 0, 0, self, '0 0 64', world, self.team, self, waypointsprite_attached, TRUE); - if(self.waypointsprite_attached) - { - WaypointSprite_UpdateTeamRadar(self.waypointsprite_attached, RADARICON_WAYPOINT, '0.25 0.90 1'); - } + WaypointSprite_Spawn("freezetag_frozen", 0, 0, self, '0 0 64', world, self.team, self, waypointsprite_attached, TRUE, RADARICON_WAYPOINT, '0.25 0.90 1'); if(attacker == self) { @@ -111,6 +113,8 @@ void freezetag_Freeze(entity attacker) void freezetag_Unfreeze(entity attacker) { self.freezetag_frozen = 0; + self.freezetag_revive_progress = 0; + self.health = autocvar_g_balance_health_start; // remove the ice block entity ice; @@ -181,7 +185,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDies) bprint("^7", frag_target.netname, "^1 was frozen by ^7", frag_attacker.netname, ".\n"); } - frag_target.health = autocvar_g_balance_health_start; // "respawn" the player :P + frag_target.health = 1; // "respawn" the player :P freezetag_CheckWinner(); @@ -215,88 +219,88 @@ MUTATOR_HOOKFUNCTION(freezetag_GiveFragsForKill) MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink) { - vector revive_extra_size; - revive_extra_size = '1 1 1' * autocvar_g_freezetag_revive_extra_size; + float n; + vector revive_extra_size; - float teammate_nearby; - 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) - break; - } - } - } + revive_extra_size = '1 1 1' * autocvar_g_freezetag_revive_extra_size; - if(teammate_nearby && self.freezetag_frozen == 1) // OK, there is at least one teammate reviving us - { - if(self.freezetag_beginrevive_time == -9999) // initialize values if this is the first frame of revival - { - self.freezetag_beginrevive_time = time; - self.freezetag_revive_progress = 0; - } - else - { - 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(self); - entity o; - o = other; - - // EVERY team mate nearby gets a point (even if multiple!) - float n; - FOR_EACH_PLAYER(other) if(self != other) + entity o; + o = world; + n = 0; + FOR_EACH_PLAYER(other) if(self != other) + { + if(other.freezetag_frozen == 0) { - if(other.freezetag_frozen == 0) + if(other.team == self.team) { - if(other.team == self.team) + if(boxesoverlap(self.absmin - revive_extra_size, self.absmax + revive_extra_size, other.absmin, other.absmax)) + { + if(!o) + o = other; + ++n; + } + } + } + } + + if(n && self.freezetag_frozen) // OK, there is at least one teammate reviving us + { + self.freezetag_revive_progress = bound(0, self.freezetag_revive_progress + frametime * autocvar_g_freezetag_revive_speed, 1); + self.health = max(1, self.freezetag_revive_progress * autocvar_g_balance_health_start); + + if(self.freezetag_revive_progress >= 1) + { + freezetag_Unfreeze(self); + + // EVERY team mate nearby gets a point (even if multiple!) + FOR_EACH_PLAYER(other) if(self != other) + { + if(other.freezetag_frozen == 0) { - teammate_nearby = boxesoverlap(self.absmin - revive_extra_size, self.absmax + revive_extra_size, other.absmin, other.absmax); - if(teammate_nearby) + if(other.team == self.team) { - PlayerScore_Add(other, SP_FREEZETAG_REVIVALS, +1); - PlayerScore_Add(other, SP_SCORE, +1); - ++n; + if(boxesoverlap(self.absmin - revive_extra_size, self.absmax + revive_extra_size, other.absmin, other.absmax)) + { + PlayerScore_Add(other, SP_FREEZETAG_REVIVALS, +1); + PlayerScore_Add(other, SP_SCORE, +1); + } } } } - } - if(n > 1) - centerprint(self, strcat("^5You were revived by ^7", o.netname, "^5 et al.\n")); - else - centerprint(self, strcat("^5You were revived by ^7", o.netname, "^5.\n")); - centerprint(o, strcat("^5You revived ^7", self.netname, "^5.\n")); - bprint("^7", o.netname, "^5 revived ^7", self.netname, "^5.\n"); + if(n > 1) + centerprint(self, strcat("^5You were revived by ^7", o.netname, "^5 et al.\n")); + else + centerprint(self, strcat("^5You were revived by ^7", o.netname, "^5.\n")); + centerprint(o, strcat("^5You revived ^7", self.netname, "^5.\n")); + if(n > 1) + bprint("^7", o.netname, "^5 et al revived ^7", self.netname, "^5.\n"); + else + bprint("^7", o.netname, "^5 revived ^7", self.netname, "^5.\n"); + } - self.freezetag_beginrevive_time = -9999; - self.freezetag_revive_progress = 0; - } - } - // now find EVERY teammate within reviving radius, set their revive_progress values correct - 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) - other.freezetag_revive_progress = self.freezetag_revive_progress; - } - } - } - } - else if(!teammate_nearby) // only if no teammate is nearby will we reset - { - self.freezetag_beginrevive_time = -9999; - self.freezetag_revive_progress = 0; - } + // now find EVERY teammate within reviving radius, set their revive_progress values correct + FOR_EACH_PLAYER(other) if(self != other) + { + if(other.freezetag_frozen == 0) + { + if(other.team == self.team) + { + if(boxesoverlap(self.absmin - revive_extra_size, self.absmax + revive_extra_size, other.absmin, other.absmax)) + other.freezetag_revive_progress = self.freezetag_revive_progress; + } + } + } + } + else if(!n && self.freezetag_frozen) // only if no teammate is nearby will we reset + { + self.freezetag_revive_progress = bound(0, self.freezetag_revive_progress - frametime * autocvar_g_freezetag_revive_clearspeed, 1); + self.health = max(1, self.freezetag_revive_progress * autocvar_g_balance_health_start); + } + else if(!n) + { + self.freezetag_revive_progress = 0; // thawing nobody + } return 1; } @@ -324,6 +328,13 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDamage_Calculate) return 1; } +MUTATOR_HOOKFUNCTION(freezetag_ForbidThrowCurrentWeapon) +{ + if (self.freezetag_frozen) + return 1; + return 0; +} + MUTATOR_DEFINITION(gamemode_freezetag) { MUTATOR_HOOK(MakePlayerObserver, freezetag_RemovePlayer, CBC_ORDER_ANY); @@ -334,6 +345,7 @@ MUTATOR_DEFINITION(gamemode_freezetag) MUTATOR_HOOK(PlayerPreThink, freezetag_PlayerPreThink, CBC_ORDER_FIRST); MUTATOR_HOOK(PlayerPhysics, freezetag_PlayerPhysics, CBC_ORDER_FIRST); MUTATOR_HOOK(PlayerDamage_Calculate, freezetag_PlayerDamage_Calculate, CBC_ORDER_ANY); + MUTATOR_HOOK(ForbidThrowCurrentWeapon, freezetag_ForbidThrowCurrentWeapon, CBC_ORDER_FIRST); //first, last or any? dunno. MUTATOR_ONADD {