mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 20:41:46 +00:00
Evaluation changes
- Add music to Perfect evaluation
- Thank you darling Tyron 😭
- Different evaluation durations
- 18 seconds for Perfect evaluation
- Extended because the music is too good
- 14 seconds for all other evaluation types
- Extended so it's not almost half the length of the perfect one
- Timed so the Seal can glow 5 times (instead of 3)
This commit is contained in:
parent
9e816216a5
commit
1b03e7a75c
1 changed files with 28 additions and 9 deletions
|
|
@ -894,11 +894,17 @@ typedef enum
|
||||||
EVAL_MAX
|
EVAL_MAX
|
||||||
} evaluationtype_t;
|
} evaluationtype_t;
|
||||||
|
|
||||||
|
#define EVALLEN_PERFECT (18*TICRATE)
|
||||||
|
#define EVALLEN_NORMAL (14*TICRATE)
|
||||||
|
|
||||||
static evaluationtype_t evaluationtype;
|
static evaluationtype_t evaluationtype;
|
||||||
UINT16 finaleemeralds = 0;
|
UINT16 finaleemeralds = 0;
|
||||||
|
|
||||||
void F_StartGameEvaluation(void)
|
void F_StartGameEvaluation(void)
|
||||||
{
|
{
|
||||||
|
S_FadeMusic(0, MUSICRATE/4);
|
||||||
|
S_StopMusicCredit();
|
||||||
|
|
||||||
// Credits option in extras menu
|
// Credits option in extras menu
|
||||||
if (
|
if (
|
||||||
grandprixinfo.gp == false
|
grandprixinfo.gp == false
|
||||||
|
|
@ -907,14 +913,10 @@ void F_StartGameEvaluation(void)
|
||||||
#endif
|
#endif
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
S_FadeMusic(0, MUSICRATE/4);
|
|
||||||
F_StartGameEnd();
|
F_StartGameEnd();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
S_FadeOutStopMusic(5*MUSICRATE);
|
|
||||||
S_StopMusicCredit();
|
|
||||||
|
|
||||||
G_SetGamestate(GS_EVALUATION);
|
G_SetGamestate(GS_EVALUATION);
|
||||||
|
|
||||||
// Just in case they're open ... somehow
|
// Just in case they're open ... somehow
|
||||||
|
|
@ -1002,8 +1004,8 @@ void F_GameEvaluationDrawer(void)
|
||||||
else if (evaluationtype == EVAL_PERFECT)
|
else if (evaluationtype == EVAL_PERFECT)
|
||||||
{
|
{
|
||||||
// Symmetrical slow fade in and out.
|
// Symmetrical slow fade in and out.
|
||||||
if (finalecount > 5*TICRATE)
|
if (finalecount > EVALLEN_PERFECT/2)
|
||||||
crossfade = (10*TICRATE) - finalecount;
|
crossfade = EVALLEN_PERFECT - finalecount;
|
||||||
else
|
else
|
||||||
crossfade = finalecount;
|
crossfade = finalecount;
|
||||||
|
|
||||||
|
|
@ -1234,13 +1236,29 @@ void F_GameEvaluationDrawer(void)
|
||||||
|
|
||||||
void F_GameEvaluationTicker(void)
|
void F_GameEvaluationTicker(void)
|
||||||
{
|
{
|
||||||
if (++finalecount > 10*TICRATE)
|
INT32 evallen = EVALLEN_NORMAL;
|
||||||
|
|
||||||
|
if (evaluationtype == EVAL_PERFECT)
|
||||||
|
{
|
||||||
|
// tyron made something perfect and i would sooner
|
||||||
|
// smite everyone in this room starting with myself
|
||||||
|
// over the idea of cutting it ~toast 250623
|
||||||
|
evallen = EVALLEN_PERFECT;
|
||||||
|
|
||||||
|
if (finalecount == 1)
|
||||||
|
{
|
||||||
|
// Now start the music
|
||||||
|
S_ChangeMusicInternal("_SHORE", false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (++finalecount > evallen)
|
||||||
{
|
{
|
||||||
F_StartGameEnd();
|
F_StartGameEnd();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (finalecount == 5*TICRATE)
|
if (finalecount == evallen/2)
|
||||||
{
|
{
|
||||||
if (!usedCheats)
|
if (!usedCheats)
|
||||||
{
|
{
|
||||||
|
|
@ -1252,7 +1270,8 @@ void F_GameEvaluationTicker(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef SPARKLLOOPTIME
|
#undef EVALLEN_PERFECT
|
||||||
|
#undef EVALLEN_NORMAL
|
||||||
|
|
||||||
// ==========
|
// ==========
|
||||||
// GAME END
|
// GAME END
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue