Merge branch 'tally-ff-challenges' into 'master'

Allow UCRP_FINISHGRADE to fire when skipping tally

Closes #1230

See merge request KartKrew/Kart!2199
This commit is contained in:
Oni 2024-04-01 00:49:35 +00:00
commit b2328d27be

View file

@ -1805,7 +1805,7 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
&& M_NotFreePlay()
&& (player->tally.active == true)
&& (player->tally.state >= TALLY_ST_GRADE_APPEAR)
&& (player->tally.state < TALLY_ST_DONE)
&& (player->tally.state <= TALLY_ST_DONE)
&& (player->tally.rank >= cn->requirement));
case UCRP_FINISHTIME:
return (player->exiting