entity e;
total_players = redalive = bluealive = yellowalive = pinkalive = 0;
FOR_EACH_PLAYER(e) {
- if(e.team == COLOR_TEAM1 && e.health >= 1)
+ if(e.team == NUM_TEAM_1 && e.health >= 1)
{
++total_players;
if (!e.freezetag_frozen) ++redalive;
}
- else if(e.team == COLOR_TEAM2 && e.health >= 1)
+ else if(e.team == NUM_TEAM_2 && e.health >= 1)
{
++total_players;
if (!e.freezetag_frozen) ++bluealive;
}
- else if(e.team == COLOR_TEAM3 && e.health >= 1)
+ else if(e.team == NUM_TEAM_3 && e.health >= 1)
{
++total_players;
if (!e.freezetag_frozen) ++yellowalive;
}
- else if(e.team == COLOR_TEAM4 && e.health >= 1)
+ else if(e.team == NUM_TEAM_4 && e.health >= 1)
{
++total_players;
if (!e.freezetag_frozen) ++pinkalive;
float prev_total_players;
float freezetag_CheckTeams()
{
- entity e;
if(FREEZETAG_ALIVE_TEAMS_OK())
{
- if(prev_total_players != -1)
- {
- FOR_EACH_REALCLIENT(e)
- Send_CSQC_Centerprint_Generic_Expire(e, CPID_WAITING_PLAYERS);
- }
+ if(prev_total_players > 0)
+ Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_MISSING_TEAMS);
prev_total_players = -1;
return 1;
}
if(prev_total_players != total_players)
{
- string teams_missing = "";
- if(!redalive) teams_missing = strcat(teams_missing, ColoredTeamName(COLOR_TEAM1), ", ");
- if(!bluealive) teams_missing = strcat(teams_missing, ColoredTeamName(COLOR_TEAM2), ", ");
+ float p1 = 0, p2 = 0, p3 = 0, p4 = 0;
+ if(!redalive) p1 = NUM_TEAM_1;
+ if(!bluealive) p2 = NUM_TEAM_2;
if(freezetag_teams >= 3)
- if(!yellowalive) teams_missing = strcat(teams_missing, ColoredTeamName(COLOR_TEAM3), ", ");
- if(freezetag_teams == 4)
- if(!pinkalive) teams_missing = strcat(teams_missing, ColoredTeamName(COLOR_TEAM4), ", ");
- teams_missing = substring(teams_missing, 0, strlen(teams_missing)-2);
-
- FOR_EACH_REALCLIENT(e)
- Send_CSQC_Centerprint_Generic(e, CPID_WAITING_PLAYERS, strcat("Waiting for players to join...\n\nNeed active players for: ", teams_missing), -1, 0);
+ if(!yellowalive) p3 = NUM_TEAM_3;
+ if(freezetag_teams >= 4)
+ if(!pinkalive) p4 = NUM_TEAM_4;
+ Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_MISSING_TEAMS, p1, p2, p3, p4);
prev_total_players = total_players;
}
return 0;
{
float winner_team = 0;
if(redalive >= 1)
- winner_team = COLOR_TEAM1;
+ winner_team = NUM_TEAM_1;
if(bluealive >= 1)
{
if(winner_team) return 0;
- winner_team = COLOR_TEAM2;
+ winner_team = NUM_TEAM_2;
}
if(yellowalive >= 1)
{
if(winner_team) return 0;
- winner_team = COLOR_TEAM3;
+ winner_team = NUM_TEAM_3;
}
if(pinkalive >= 1)
{
if(winner_team) return 0;
- winner_team = COLOR_TEAM4;
+ winner_team = NUM_TEAM_4;
}
if(winner_team)
return winner_team;
float freezetag_CheckWinner()
{
entity e;
- if(round_handler_GetTimeLeft() <= 0)
+ if(round_handler_GetEndTime() > 0 && round_handler_GetEndTime() - time <= 0)
{
- FOR_EACH_REALCLIENT(e)
- centerprint(e, "Round over, there's no winner");
- bprint("Round over, there's no winner.\n");
+ Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_OVER);
+ Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_OVER);
FOR_EACH_PLAYER(e)
e.freezetag_frozen_timeout = 0;
round_handler_Init(5, autocvar_g_freezetag_warmup, autocvar_g_freezetag_round_timelimit);
return 0;
float winner_team;
- string teamname;
winner_team = freezetag_getWinnerTeam();
if(winner_team > 0)
{
- Send_Notification(NOTIF_ALL, world, MSG_CENTER, APP_TEAM_NUM_4(winner.team, CENTER_FREEZETAG_ROUND_WIN_));
- Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(winner.team, INFO_FREEZETAG_ROUND_WIN_));
+ Send_Notification(NOTIF_ALL, world, MSG_CENTER, APP_TEAM_NUM_4(winner_team, CENTER_ROUND_TEAM_WIN_));
+ Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(winner_team, INFO_ROUND_TEAM_WIN_));
TeamScore_AddToTeam(winner_team, ST_SCORE, +1);
}
else if(winner_team == -1)
{
- FOR_EACH_REALCLIENT(e)
- centerprint(e, "^5Round tied! All teams were frozen.");
- bprint("^5Round tied! All teams were frozen.\n");
+ Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_TIED);
+ Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_TIED);
}
FOR_EACH_PLAYER(e)
// counted as "suicide" already
PlayerScore_Add(self, SP_SCORE, -1);
}
- else if(attacker.classname == "player")
+ else if(IS_PLAYER(attacker))
{
// got frozen by an enemy
// counted as "kill" and "death" already
ice.nextthink = time;
ice.frame = floor(random() * 21); // ice model has 20 different looking frames
ice.alpha = ICE_MAX_ALPHA;
- ice.colormod = TeamColor(self.team);
+ ice.colormod = Team_ColorRGB(self.team);
ice.glowmod = ice.colormod;
setmodel(ice, "models/ice/ice.md3");
if(frag_attacker == frag_target || frag_attacker == world)
{
- if(frag_target.classname == STR_PLAYER)
+ if(IS_PLAYER(frag_target))
Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_SELF);
Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_SELF, frag_target.netname);
}
else
{
- if(frag_target.classname == STR_PLAYER)
+ if(IS_PLAYER(frag_target))
Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_FROZEN, frag_attacker.netname);
- if(frag_attacker.classname == STR_PLAYER)
+ if(IS_PLAYER(frag_attacker))
Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_FREEZETAG_FREEZE, frag_target.netname);
Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_FREEZE, frag_target.netname, frag_attacker.netname);
}
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.freezetag_revive_progress = bound(0, self.freezetag_revive_progress + frametime * max(1/60, 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)
if(n == -1)
{
- string s = ftos(autocvar_g_freezetag_frozen_maxtime);
- centerprint(self, strcat("^5You were automatically revived after ", s, " seconds^5.\n"));
- bprint("^7", self.netname, "^5 were automatically revived after ", s, " seconds^5.\n");
+ Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_FREEZETAG_AUTO_REVIVED, autocvar_g_freezetag_frozen_maxtime);
+ Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_AUTO_REVIVED, self.netname, autocvar_g_freezetag_frozen_maxtime);
return 1;
}
Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_FREEZETAG_REVIVED, o.netname);
Send_Notification(NOTIF_ONE, o, MSG_CENTER, CENTER_FREEZETAG_REVIVE, self.netname);
- Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_REVIVE, self.netname, o.netname);
+ Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_REVIVED, self.netname, o.netname);
}
FOR_EACH_PLAYER(other)
{
if(self.freezetag_frozen)
{
- self.movement = '0 0 0';
+ if(autocvar_sv_dodging_frozen)
+ {
+ self.movement_x = bound(-5, self.movement_x, 5);
+ self.movement_y = bound(-5, self.movement_y, 5);
+ self.movement_z = bound(-5, self.movement_z, 5);
+ }
+ else
+ self.movement = '0 0 0';
+
self.disableclientprediction = 1;
}
return 1;
return 1;
}
+MUTATOR_HOOKFUNCTION(freezetag_PlayerJump)
+{
+ if(self.freezetag_frozen)
+ return TRUE; // no jumping in freezetag when frozen
+
+ return FALSE;
+}
+
MUTATOR_HOOKFUNCTION(freezetag_ForbidThrowCurrentWeapon)
{
if (self.freezetag_frozen)
return 0;
}
+MUTATOR_HOOKFUNCTION(freezetag_ItemTouch)
+{
+ if (other.freezetag_frozen)
+ return MUT_ITEMTOUCH_RETURN;
+ return MUT_ITEMTOUCH_CONTINUE;
+}
+
MUTATOR_HOOKFUNCTION(freezetag_BotRoles)
{
if not(self.deadflag)
return 0;
}
+MUTATOR_HOOKFUNCTION(freezetag_VehicleTouch)
+{
+ if(other.freezetag_frozen)
+ return TRUE;
+
+ return FALSE;
+}
+
void freezetag_Initialize()
{
precache_model("models/ice/ice.md3");
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(PlayerJump, freezetag_PlayerJump, CBC_ORDER_ANY);
MUTATOR_HOOK(ForbidThrowCurrentWeapon, freezetag_ForbidThrowCurrentWeapon, CBC_ORDER_ANY);
+ MUTATOR_HOOK(ItemTouch, freezetag_ItemTouch, CBC_ORDER_ANY);
MUTATOR_HOOK(HavocBot_ChooseRule, freezetag_BotRoles, CBC_ORDER_ANY);
MUTATOR_HOOK(SpectateCopy, freezetag_SpectateCopy, CBC_ORDER_ANY);
MUTATOR_HOOK(GetTeamCount, freezetag_GetTeamCount, CBC_ORDER_EXCLUSIVE);
+ MUTATOR_HOOK(VehicleTouch, freezetag_VehicleTouch, CBC_ORDER_ANY);
MUTATOR_ONADD
{
projects / xonotic / xonotic-data.pk3dir.git / blobdiff