doylet/feely_pona
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: doylet:169170945ba86cfbe34d908ee4046d7cd406a314
Branches Tags
doylet:main
doylet:looping
doylet:more_music
doylet:ambience_music
doylet:entrance_sounds
doylet:wave_balancing
doylet:player_2
doylet:camera_shake
doylet:billboards
..
compare: doylet:8b155c90210e6e58f608b802f0f67c5ffbea80f6
Branches Tags
doylet:looping
doylet:main
doylet:more_music
doylet:ambience_music
doylet:entrance_sounds
doylet:wave_balancing
doylet:player_2
doylet:camera_shake
doylet:billboards

1 Commits
169170945b ... 8b155c9021

Author SHA1 Message Date
doyle
8b155c9021 fp: Add queueing x3 mobs at buildings 2023-10-10 00:06:59 +11:00
4 changed files with 4 additions and 11 deletions
Show Stats Expand all files Collapse all files

BIN
Data/Audio/monkey.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
Data/Audio/portal_destroy.ogg (Stored with Git LFS)
View File

Binary file not shown.

5
feely_pona.cpp
View File

@ -516,8 +516,6 @@ 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_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_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_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; platform->user_data = game;
{ {
@ -636,7 +634,6 @@ void FP_EntityActionStateMachine(FP_Game *game, TELY_Audio *audio, TELY_Platform
if (TELY_Platform_InputScanCodeIsPressed(input, TELY_PlatformInputScanCode_J)) { if (TELY_Platform_InputScanCodeIsPressed(input, TELY_PlatformInputScanCode_J)) {
entity->carried_monkey = closest_monkey.entity; entity->carried_monkey = closest_monkey.entity;
picked_up_monkey_this_frame = true; picked_up_monkey_this_frame = true;
TELY_Audio_Play(audio, game->audio[FP_GameAudio_Monkey], 1.f);
} }
} }
} }
@ -703,7 +700,6 @@ void FP_EntityActionStateMachine(FP_Game *game, TELY_Audio *audio, TELY_Platform
if (TELY_Platform_InputScanCodeIsPressed(input, TELY_PlatformInputScanCode_J)) { if (TELY_Platform_InputScanCodeIsPressed(input, TELY_PlatformInputScanCode_J)) {
entity->carried_monkey = closest_monkey.entity; entity->carried_monkey = closest_monkey.entity;
picked_up_monkey_this_frame = true; picked_up_monkey_this_frame = true;
TELY_Audio_Play(audio, game->audio[FP_GameAudio_Monkey], 1.f);
} }
} }
} }
@ -1299,7 +1295,6 @@ void FP_EntityActionStateMachine(FP_Game *game, TELY_Audio *audio, TELY_Platform
uint64_t duration_ms = FP_GAME_ENTITY_ACTION_INFINITE_TIMER; uint64_t duration_ms = FP_GAME_ENTITY_ACTION_INFINITE_TIMER;
FP_Game_EntityActionReset(game, entity->handle, duration_ms, render_data.sprite); FP_Game_EntityActionReset(game, entity->handle, duration_ms, render_data.sprite);
entity->action.sprite_play_once = true; entity->action.sprite_play_once = true;
TELY_Audio_Play(audio, game->audio[FP_GameAudio_PortalDestroy], 1.f);
FP_Game_DeleteEntity(game, entity->carried_monkey); FP_Game_DeleteEntity(game, entity->carried_monkey);
} }
} break; } break;

2
feely_pona_game.h
View File

@ -274,8 +274,6 @@ enum FP_GameAudio
FP_GameAudio_MerchantGym, FP_GameAudio_MerchantGym,
FP_GameAudio_MerchantPhone, FP_GameAudio_MerchantPhone,
FP_GameAudio_Message, FP_GameAudio_Message,
FP_GameAudio_Monkey,
FP_GameAudio_PortalDestroy,
FP_GameAudio_Count, FP_GameAudio_Count,
}; };