STAT(DOM_TOTAL_PPS, e) = total_pps;
STAT(DOM_PPS_RED, e) = pps_red;
STAT(DOM_PPS_BLUE, e) = pps_blue;
- if(domination_teams >= 3)
+ if(domination_teams & BIT(2))
STAT(DOM_PPS_YELLOW, e) = pps_yellow;
- if(domination_teams >= 4)
+ if(domination_teams & BIT(3))
STAT(DOM_PPS_PINK, e) = pps_pink;
}
TeamScore_AddToTeam(this.goalentity.team, ST_SCORE, fragamt);
TeamScore_AddToTeam(this.goalentity.team, ST_DOM_TICKS, fragamt);
- // give credit to the individual player, if he is still there
+ // give credit to the individual player, if they are still there
if (this.enemy.playerid == this.enemy_playerid)
{
GameRules_scoring_add(this.enemy, SCORE, fragamt);
if(!this.flags & FL_ITEM)
IL_PUSH(g_items, this);
this.flags = FL_ITEM;
- setsize(this, '-32 -32 -32', '32 32 32');
+ setsize(this, '-48 -48 -32', '48 48 32'); // 0.8.6 used '-32 -32 -32', '32 32 32' with sv_legacy_bbox_expand 1 and FL_ITEM
setorigin(this, this.origin + '0 0 20');
- droptofloor(this);
+ DropToFloor_QC_DelayedInit(this);
waypoint_spawnforitem(this);
WaypointSprite_SpawnFixed(WP_DomNeut, this.origin + '0 0 32', this, sprite, RADARICON_DOMPOINT);
total_control_points = 0;
for (int i = 1; i <= NUM_TEAMS; ++i)
{
- Team_SetNumberOfControlPoints(Team_GetTeamFromIndex(i), 0);
+ Team_SetNumberOfOwnedItems(Team_GetTeamFromIndex(i), 0);
}
IL_EACH(g_dompoints, true,
{
continue;
}
entity team_ = Entity_GetTeam(it.goalentity);
- int num_control_points = Team_GetNumberOfControlPoints(team_);
+ int num_control_points = Team_GetNumberOfOwnedItems(team_);
++num_control_points;
- Team_SetNumberOfControlPoints(team_, num_control_points);
+ Team_SetNumberOfOwnedItems(team_, num_control_points);
});
}
-int Domination_GetWinnerTeam()
-{
- int winner_team = 0;
- if (Team_GetNumberOfControlPoints(Team_GetTeamFromIndex(1)) ==
- total_control_points)
- {
- winner_team = NUM_TEAM_1;
- }
- for (int i = 2; i <= NUM_TEAMS; ++i)
- {
- if (Team_GetNumberOfControlPoints(Team_GetTeamFromIndex(i)) ==
- total_control_points)
- {
- if (winner_team != 0)
- {
- return 0;
- }
- winner_team = Team_IndexToTeam(i);
- }
- }
- if (winner_team)
- {
- return winner_team;
- }
- return -1; // no control points left?
-}
-
bool Domination_CheckWinner()
{
if(round_handler_GetEndTime() > 0 && round_handler_GetEndTime() - time <= 0)
}
Domination_count_controlpoints();
-
- float winner_team = Domination_GetWinnerTeam();
-
- if(winner_team == -1)
- return false;
+ int winner_team = Team_GetWinnerTeam_WithOwnedItems(total_control_points);
+ if (winner_team == -1)
+ return 0;
if(winner_team > 0)
{
Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(winner_team, INFO_ROUND_TEAM_WIN));
TeamScore_AddToTeam(winner_team, ST_DOM_CAPS, +1);
}
- else if(winner_team == -1)
- {
- Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ROUND_TIED);
- Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_TIED);
- }
game_stopped = true;
round_handler_Init(5, autocvar_g_domination_warmup, autocvar_g_domination_round_timelimit);
MUTATOR_HOOKFUNCTION(dom, reset_map_players)
{
total_pps = 0, pps_red = 0, pps_blue = 0, pps_yellow = 0, pps_pink = 0;
- FOREACH_CLIENT(IS_PLAYER(it), {
- PutClientInServer(it);
- if(domination_roundbased)
- it.player_blocked = 1;
+ FOREACH_CLIENT(true, {
+ if (IS_PLAYER(it))
+ {
+ PutClientInServer(it);
+ if(domination_roundbased)
+ it.player_blocked = 1;
+ }
if(IS_REAL_CLIENT(it))
set_dom_state(it);
});
IL_PUSH(g_dompoints, this);
}
+ // Quake Live CP
+/*QUAKED team_dom_point (0 .2 1) (-16 -16 0) (16 16 88)
+Domination capture point.
+-------- KEYS --------
+identifier : Set to 1, 2, or 3 to match to point 'A', 'B', or 'C'.
+count : Adjust the range of the capture point (in units, eg: 64, 128... etc).
+target : Target name for multiple info_player_deathmatch entities (to allow spawning near that particular dom point).
+-------- NOTES --------
+Do not assign a 'gametype' key to this item. It is used in all four team game types. The game will call for it as needed.
+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/powerups/domination/dompoint.md3"
+*/
+spawnfunc(team_dom_point)
+{
+ spawnfunc_dom_controlpoint(this);
+}
+
/*QUAKED spawnfunc_dom_team (0 .5 .8) (-32 -32 -24) (32 32 32)
Team declaration for Domination gameplay, this allows you to decide what team
names and control point models are used in your map.
TC(int, teams);
dom_spawnteam(Team_ColoredFullName(NUM_TEAM_1), NUM_TEAM_1-1, "models/domination/dom_red.md3", 0, SND_DOM_CLAIM, "", "Red team has captured a control point");
dom_spawnteam(Team_ColoredFullName(NUM_TEAM_2), NUM_TEAM_2-1, "models/domination/dom_blue.md3", 0, SND_DOM_CLAIM, "", "Blue team has captured a control point");
- if(teams >= 3)
+ if(teams & BIT(2))
dom_spawnteam(Team_ColoredFullName(NUM_TEAM_3), NUM_TEAM_3-1, "models/domination/dom_yellow.md3", 0, SND_DOM_CLAIM, "", "Yellow team has captured a control point");
- if(teams >= 4)
+ if(teams & BIT(3))
dom_spawnteam(Team_ColoredFullName(NUM_TEAM_4), NUM_TEAM_4-1, "models/domination/dom_pink.md3", 0, SND_DOM_CLAIM, "", "Pink team has captured a control point");
dom_spawnteam("", 0, "models/domination/dom_unclaimed.md3", 0, SND_Null, "", "");
}
domination_teams = autocvar_g_domination_teams_override;
if (domination_teams < 2)
domination_teams = autocvar_g_domination_default_teams;
- domination_teams = bound(2, domination_teams, 4);
+ domination_teams = BITS(bound(2, domination_teams, 4));
dom_spawnteams(domination_teams);
}
-
- entity balance = TeamBalance_CheckAllowedTeams(NULL);
- int teams = TeamBalance_GetAllowedTeams(balance);
- TeamBalance_Destroy(balance);
- domination_teams = teams;
+ else
+ {
+ entity balance = TeamBalance_CheckAllowedTeams(NULL);
+ domination_teams = TeamBalance_GetAllowedTeams(balance);
+ TeamBalance_Destroy(balance);
+ }
domination_roundbased = autocvar_g_domination_roundbased;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff