From 22c2c4096fa3d176c4b0842f7fa667889d8a12b9 Mon Sep 17 00:00:00 2001 From: Joshalosh Date: Mon, 9 Oct 2023 22:35:30 +1100 Subject: [PATCH] fp: Add monkey sound, Add portal destroy sound --- Data/Audio/monkey.ogg | 4 ++-- Data/Audio/portal_destroy.ogg | 4 ++-- feely_pona.cpp | 5 +++++ feely_pona_game.h | 2 ++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Data/Audio/monkey.ogg b/Data/Audio/monkey.ogg index 63c07e0..2d9f372 100644 --- a/Data/Audio/monkey.ogg +++ b/Data/Audio/monkey.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8126f4c30486670714336094f344c80e2c8da8fcc95495739ae6707ba368de72 -size 28224 +oid sha256:e2bdcbdf804363a49d73f4996af4be347b8a759ecce7f1e53060f01cf97bd502 +size 22148 diff --git a/Data/Audio/portal_destroy.ogg b/Data/Audio/portal_destroy.ogg index 26baa8a..81eccb1 100644 --- a/Data/Audio/portal_destroy.ogg +++ b/Data/Audio/portal_destroy.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca433cd1a5d123a9deb1f2c5e88497aa36f155a86ffe64518b3152072cec9259 -size 104541 +oid sha256:09c25ca6a839d9a6529072ac2e89468c9903979d714236ffa87a21720b3b8edb +size 85563 diff --git a/feely_pona.cpp b/feely_pona.cpp index e8a7d57..992909d 100644 --- a/feely_pona.cpp +++ b/feely_pona.cpp @@ -516,6 +516,8 @@ void TELY_DLL_Init(void *user_data) game->audio[FP_GameAudio_MerchantGym] = platform->func_load_audio(assets, DQN_STRING8("Gym"), DQN_STRING8("Data/Audio/merchant_gym.ogg")); game->audio[FP_GameAudio_MerchantPhone] = platform->func_load_audio(assets, DQN_STRING8("Phone"), DQN_STRING8("Data/Audio/merchant_tech.ogg")); game->audio[FP_GameAudio_Message] = platform->func_load_audio(assets, DQN_STRING8("Message"), DQN_STRING8("Data/Audio/message.ogg")); + game->audio[FP_GameAudio_Monkey] = platform->func_load_audio(assets, DQN_STRING8("Monkey"), DQN_STRING8("Data/Audio/monkey.ogg")); + game->audio[FP_GameAudio_PortalDestroy] = platform->func_load_audio(assets, DQN_STRING8("Portal Destroy"), DQN_STRING8("Data/Audio/portal_destroy.ogg")); platform->user_data = game; { @@ -634,6 +636,7 @@ void FP_EntityActionStateMachine(FP_Game *game, TELY_Audio *audio, TELY_Platform if (TELY_Platform_InputScanCodeIsPressed(input, TELY_PlatformInputScanCode_J)) { entity->carried_monkey = closest_monkey.entity; picked_up_monkey_this_frame = true; + TELY_Audio_Play(audio, game->audio[FP_GameAudio_Monkey], 1.f); } } } @@ -700,6 +703,7 @@ void FP_EntityActionStateMachine(FP_Game *game, TELY_Audio *audio, TELY_Platform if (TELY_Platform_InputScanCodeIsPressed(input, TELY_PlatformInputScanCode_J)) { entity->carried_monkey = closest_monkey.entity; picked_up_monkey_this_frame = true; + TELY_Audio_Play(audio, game->audio[FP_GameAudio_Monkey], 1.f); } } } @@ -1295,6 +1299,7 @@ void FP_EntityActionStateMachine(FP_Game *game, TELY_Audio *audio, TELY_Platform uint64_t duration_ms = FP_GAME_ENTITY_ACTION_INFINITE_TIMER; FP_Game_EntityActionReset(game, entity->handle, duration_ms, render_data.sprite); entity->action.sprite_play_once = true; + TELY_Audio_Play(audio, game->audio[FP_GameAudio_PortalDestroy], 1.f); FP_Game_DeleteEntity(game, entity->carried_monkey); } } break; diff --git a/feely_pona_game.h b/feely_pona_game.h index 2493f19..fd03cd2 100644 --- a/feely_pona_game.h +++ b/feely_pona_game.h @@ -276,6 +276,8 @@ enum FP_GameAudio FP_GameAudio_MerchantGym, FP_GameAudio_MerchantPhone, FP_GameAudio_Message, + FP_GameAudio_Monkey, + FP_GameAudio_PortalDestroy, FP_GameAudio_Count, };