Change tracks for waves and chill phases
This commit is contained in:
parent
7b6d55102c
commit
f3036c639d
BIN
Data/Audio/relax.wav
(Stored with Git LFS)
Normal file
BIN
Data/Audio/relax.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Data/Audio/stress.wav
(Stored with Git LFS)
Normal file
BIN
Data/Audio/stress.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -459,6 +459,8 @@ void TELY_OS_DLLInit(TELY_OS *os)
|
||||
game->audio[FP_GameAudio_Ambience2] = TELY_Asset_LoadAudio(assets, os, DQN_STR8("Ambience two"), DQN_STR8("Data/Audio/ambience_2.ogg"));
|
||||
game->audio[FP_GameAudio_Music1] = TELY_Asset_LoadAudio(assets, os, DQN_STR8("Music one"), DQN_STR8("Data/Audio/music_1.ogg"));
|
||||
game->audio[FP_GameAudio_Music2] = TELY_Asset_LoadAudio(assets, os, DQN_STR8("Music two"), DQN_STR8("Data/Audio/music_2.ogg"));
|
||||
game->audio[FP_GameAudio_RelaxMusic] = TELY_Asset_LoadAudio(assets, os, DQN_STR8("Relax Music"), DQN_STR8("Data/Audio/relax.wav"));
|
||||
game->audio[FP_GameAudio_StressMusic] = TELY_Asset_LoadAudio(assets, os, DQN_STR8("Stress Music"), DQN_STR8("Data/Audio/stress.wav"));
|
||||
|
||||
// NOTE: Load sprite sheets ====================================================================
|
||||
os->user_data = game;
|
||||
@ -2020,7 +2022,7 @@ static void FP_Update(TELY_OS *os, FP_Game *game, TELY_Input *input, TELY_Audio
|
||||
if (game->play.wave_cooldown_timestamp_ms == 0) {
|
||||
game->play.wave_cooldown_timestamp_ms = game->play.clock_ms + FP_COOLDOWN_WAVE_TIME_MS;
|
||||
TELY_Audio_Fade(audio, game->bg_music1, TELY_AudioEffectFade_Out, 2000 /*fade_duration_ms*/);
|
||||
game->bg_music2 = TELY_Audio_Play(audio, game->audio[FP_GameAudio_Music2], 1.f);
|
||||
game->bg_music2 = TELY_Audio_Play(audio, game->audio[FP_GameAudio_RelaxMusic], 1.f);
|
||||
TELY_Audio_Fade(audio, game->bg_music2, TELY_AudioEffectFade_In, 2000 /*fade_duration_ms*/);
|
||||
} else {
|
||||
// NOTE: Check if cooldown has elapsed, the next wave can start if so
|
||||
@ -2029,7 +2031,7 @@ static void FP_Update(TELY_OS *os, FP_Game *game, TELY_Input *input, TELY_Audio
|
||||
game->play.enemies_spawned_this_wave = 0; // Important! Reset the spawn count
|
||||
game->play.wave_cooldown_timestamp_ms = 0; // Important! We reset the timestamp for the next wave
|
||||
TELY_Audio_Fade(audio, game->bg_music2, TELY_AudioEffectFade_Out, 2000 /*fade_duration_ms*/);
|
||||
game->bg_music1 = TELY_Audio_Play(audio, game->audio[FP_GameAudio_Music1], 1.f);
|
||||
game->bg_music1 = TELY_Audio_Play(audio, game->audio[FP_GameAudio_StressMusic], 1.f, true);
|
||||
TELY_Audio_Fade(audio, game->bg_music1, TELY_AudioEffectFade_In, 2000 /*fade_duration_ms*/);
|
||||
|
||||
if (monkey_spawn && game->play.current_wave != 0) {
|
||||
|
@ -340,6 +340,8 @@ enum FP_GameAudio
|
||||
FP_GameAudio_Ambience2,
|
||||
FP_GameAudio_Music1,
|
||||
FP_GameAudio_Music2,
|
||||
FP_GameAudio_RelaxMusic,
|
||||
FP_GameAudio_StressMusic,
|
||||
FP_GameAudio_Count,
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user