thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'eid-battle-team-elim' into 'master'

Browse source 
Allow team victory by opposing team elimination in battle overtime

Closes ring-racers#204

See merge request kart-krew-dev/ring-racers-internal!2895
This commit is contained in:
Eidolon 2025-09-25 17:04:06 -05:00
commit b746b1a0e4
1 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/k_battle.c
View file

@ -133,8 +133,12 @@ void K_CheckBumpers(void)
{ {
UINT8 i; UINT8 i;
UINT8 numingame = 0; UINT8 numingame = 0;
UINT8 rednumingame = 0;
UINT8 bluenumingame = 0;
UINT8 nobumpers = 0; UINT8 nobumpers = 0;
UINT8 eliminated = 0; UINT8 eliminated = 0;
UINT8 redeliminated = 0;
UINT8 blueeliminated = 0;
SINT8 kingofthehill = -1; SINT8 kingofthehill = -1;
if (!(gametyperules & GTR_BUMPERS)) if (!(gametyperules & GTR_BUMPERS))
@ -143,6 +147,8 @@ void K_CheckBumpers(void)
if (gameaction == ga_completed) if (gameaction == ga_completed)
return; return;
boolean team = G_GametypeHasTeams();
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (!playeringame[i] || players[i].spectator) // not even in-game if (!playeringame[i] || players[i].spectator) // not even in-game
@ -152,6 +158,11 @@ void K_CheckBumpers(void)
return; return;
numingame++; numingame++;
if (team)
{
if (players[i].team == 1) rednumingame++;
if (players[i].team == 2) bluenumingame++;
}
if (!P_MobjWasRemoved(players[i].mo) && players[i].mo->health <= 0) // if you don't have any bumpers, you're probably not a winner if (!P_MobjWasRemoved(players[i].mo) && players[i].mo->health <= 0) // if you don't have any bumpers, you're probably not a winner
{ {
@ -161,6 +172,11 @@ void K_CheckBumpers(void)
if (players[i].pflags & PF_ELIMINATED) if (players[i].pflags & PF_ELIMINATED)
{ {
eliminated++; eliminated++;
if (team)
{
if (players[i].team == 1) redeliminated++;
else if (players[i].team == 2) blueeliminated++;
}
} }
else else
{ {
@ -168,6 +184,12 @@ void K_CheckBumpers(void)
} }
} }
boolean teamwin = false;
if (team && (rednumingame - redeliminated == 0 || bluenumingame - blueeliminated == 0))
{
teamwin = true;
}
if (numingame - eliminated == 2 && battleovertime.enabled && battleovertime.radius <= BARRIER_MIN_RADIUS) if (numingame - eliminated == 2 && battleovertime.enabled && battleovertime.radius <= BARRIER_MIN_RADIUS)
{ {
Music_Stop("battle_overtime"); Music_Stop("battle_overtime");
@ -186,9 +208,28 @@ void K_CheckBumpers(void)
{ {
// If every other player is eliminated, the // If every other player is eliminated, the
// last player standing wins by default. // last player standing wins by default.
if (eliminated >= numingame - 1) // Or, if an entire team is eliminated.
if (eliminated >= numingame - 1 || teamwin)
{ {
K_EndBattleRound(kingofthehill != -1 ? &players[kingofthehill] : NULL); if (teamwin)
{
// Find the player with the highest individual score
UINT32 highestscore = 0;
UINT32 highestplayer = 0;
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && players[i].score > highestscore)
{
highestplayer = i;
highestscore = players[i].score;
}
}
K_EndBattleRound(&players[highestplayer]);
}
else
{
K_EndBattleRound(kingofthehill != -1 ? &players[kingofthehill] : NULL);
}
return; return;
} }
} }