From 96aca58f4e8629747c30c42572bafa6f82bfa054 Mon Sep 17 00:00:00 2001 From: Joshalosh Date: Tue, 30 Jul 2024 08:01:45 +1000 Subject: [PATCH] Get latest audio tracks --- Data/Audio/relax_01.wav | 3 +++ Data/Audio/relax_02.wav | 3 +++ Data/Audio/stress_01.wav | 3 +++ Data/Audio/stress_02.wav | 3 +++ Data/Audio/stress_03.wav | 3 +++ feely_pona.cpp | 8 ++++++-- feely_pona_game.h | 4 ++++ 7 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 Data/Audio/relax_01.wav create mode 100644 Data/Audio/relax_02.wav create mode 100644 Data/Audio/stress_01.wav create mode 100644 Data/Audio/stress_02.wav create mode 100644 Data/Audio/stress_03.wav diff --git a/Data/Audio/relax_01.wav b/Data/Audio/relax_01.wav new file mode 100644 index 0000000..b5e5159 --- /dev/null +++ b/Data/Audio/relax_01.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:146e3c0ed7d481264d6dc2ab35c2fd0c5d0f45dfeaa51ad33349401d32842dc8 +size 5292080 diff --git a/Data/Audio/relax_02.wav b/Data/Audio/relax_02.wav new file mode 100644 index 0000000..481585c --- /dev/null +++ b/Data/Audio/relax_02.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:217bd253406886ee3417f88f2307d00310575e830785a87f77e5aca625d9a6fa +size 5997680 diff --git a/Data/Audio/stress_01.wav b/Data/Audio/stress_01.wav new file mode 100644 index 0000000..2412763 --- /dev/null +++ b/Data/Audio/stress_01.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:873b8db8bc353aa2bd75ceb27bfe2a43f5396dac9c3f46c778fe9c7106a6a0f6 +size 44452880 diff --git a/Data/Audio/stress_02.wav b/Data/Audio/stress_02.wav new file mode 100644 index 0000000..af116e3 --- /dev/null +++ b/Data/Audio/stress_02.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba002a95557f9bc206e645346c515fe9c50173ddfe7dab80c40349bff28300c9 +size 44452880 diff --git a/Data/Audio/stress_03.wav b/Data/Audio/stress_03.wav new file mode 100644 index 0000000..8711d76 --- /dev/null +++ b/Data/Audio/stress_03.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b110614464f81842ff29d7834f07e2bf690653b0f908b6124f83fcc660dfd60 +size 44452880 diff --git a/feely_pona.cpp b/feely_pona.cpp index 93cae9e..b450abe 100644 --- a/feely_pona.cpp +++ b/feely_pona.cpp @@ -461,6 +461,10 @@ void TELY_OS_DLLInit(TELY_OS *os) 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")); + game->audio[FP_GameAudio_Relax01Music] = TELY_Asset_LoadAudio(assets, os, DQN_STR8("Relax_01 Music"), DQN_STR8("Data/Audio/relax_01.wav")); + game->audio[FP_GameAudio_Stress01Music] = TELY_Asset_LoadAudio(assets, os, DQN_STR8("Stress_01 Music"), DQN_STR8("Data/Audio/stress_01.wav")); + game->audio[FP_GameAudio_Relax02Music] = TELY_Asset_LoadAudio(assets, os, DQN_STR8("Relax_02 Music"), DQN_STR8("Data/Audio/relax_02.wav")); + game->audio[FP_GameAudio_Stress03Music] = TELY_Asset_LoadAudio(assets, os, DQN_STR8("Stress_03 Music"), DQN_STR8("Data/Audio/stress_03.wav")); // NOTE: Load sprite sheets ==================================================================== os->user_data = game; @@ -2022,7 +2026,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_RelaxMusic], 1.f); + game->bg_music2 = TELY_Audio_Play(audio, game->audio[FP_GameAudio_Relax02Music], 1.f, false); 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 @@ -2031,7 +2035,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_StressMusic], 1.f, true); + game->bg_music1 = TELY_Audio_Play(audio, game->audio[FP_GameAudio_Stress03Music], 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) { diff --git a/feely_pona_game.h b/feely_pona_game.h index 296a702..c696c4d 100644 --- a/feely_pona_game.h +++ b/feely_pona_game.h @@ -342,6 +342,10 @@ enum FP_GameAudio FP_GameAudio_Music2, FP_GameAudio_RelaxMusic, FP_GameAudio_StressMusic, + FP_GameAudio_Relax01Music, + FP_GameAudio_Stress01Music, + FP_GameAudio_Relax02Music, + FP_GameAudio_Stress03Music, FP_GameAudio_Count, };