mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Perfect Round + SIGL Duel support
This commit is contained in:
parent
3d39ab5225
commit
1b308d0278
2 changed files with 8 additions and 2 deletions
|
|
@ -1858,7 +1858,10 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
|
||||||
&& (gamespeed != KARTSPEED_EASY)
|
&& (gamespeed != KARTSPEED_EASY)
|
||||||
&& (player->tally.active == true)
|
&& (player->tally.active == true)
|
||||||
&& (player->tally.totalExp > 0) // Only true if not Time Attack
|
&& (player->tally.totalExp > 0) // Only true if not Time Attack
|
||||||
&& (player->tally.exp >= player->tally.totalExp));
|
&& (
|
||||||
|
(player->tally.exp >= player->tally.totalExp)
|
||||||
|
|| (K_InRaceDuel() && player->duelscore == DUELWINNINGSCORE)
|
||||||
|
);
|
||||||
case UCRP_FINISHALLPRISONS:
|
case UCRP_FINISHALLPRISONS:
|
||||||
return (battleprisons
|
return (battleprisons
|
||||||
&& !(player->pflags & PF_NOCONTEST)
|
&& !(player->pflags & PF_NOCONTEST)
|
||||||
|
|
|
||||||
|
|
@ -9110,7 +9110,10 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
||||||
&& (gamespeed != KARTSPEED_EASY)
|
&& (gamespeed != KARTSPEED_EASY)
|
||||||
&& (newplayer->tally.active == true)
|
&& (newplayer->tally.active == true)
|
||||||
&& (newplayer->tally.totalExp > 0) // Only true if not Time Attack
|
&& (newplayer->tally.totalExp > 0) // Only true if not Time Attack
|
||||||
&& (newplayer->tally.exp >= newplayer->tally.totalExp)
|
&& (
|
||||||
|
(newplayer->tally.exp >= newplayer->tally.totalExp) ||
|
||||||
|
(K_InRaceDuel() && newplayer->duelscore = DUELWINNINGSCORE)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
UINT8 pnum = (newplayer-players);
|
UINT8 pnum = (newplayer-players);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue