diff --git a/applications/plugins/arkanoid/arkanoid_game.c b/applications/plugins/arkanoid/arkanoid_game.c index 0b9bb91e9..af9976c98 100644 --- a/applications/plugins/arkanoid/arkanoid_game.c +++ b/applications/plugins/arkanoid/arkanoid_game.c @@ -5,7 +5,6 @@ #include #include #include -#include #define TAG "Arkanoid" @@ -398,9 +397,6 @@ int32_t arkanoid_game_app(void* p) { Gui* gui = furi_record_open(RECORD_GUI); gui_add_view_port(gui, view_port, GuiLayerFullscreen); - // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); - GameEvent event; for(bool processing = true; processing;) { FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100); diff --git a/applications/plugins/blackjack/blackjack.c b/applications/plugins/blackjack/blackjack.c index 9314e21dd..384104378 100644 --- a/applications/plugins/blackjack/blackjack.c +++ b/applications/plugins/blackjack/blackjack.c @@ -1,7 +1,6 @@ #include #include -#include #include #include @@ -278,7 +277,6 @@ void dealer_tick(GameState* game_state) { if(dealer_score >= DEALER_MAX) { if(dealer_score > 21 || dealer_score < player_score) { - DOLPHIN_DEED(DolphinDeedPluginGameWin); enqueue( &(game_state->queue_state), game_state, @@ -572,9 +570,6 @@ int32_t blackjack_app(void* p) { AppEvent event; - // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); - for(bool processing = true; processing;) { FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100); GameState* localstate = (GameState*)acquire_mutex_block(&state_mutex); @@ -635,4 +630,4 @@ free_and_exit: furi_message_queue_free(event_queue); return return_code; -} \ No newline at end of file +} diff --git a/applications/plugins/doom/doom.c b/applications/plugins/doom/doom.c index 65b63c75b..78a06055c 100644 --- a/applications/plugins/doom/doom.c +++ b/applications/plugins/doom/doom.c @@ -13,7 +13,6 @@ #include "level.h" #include #include -#include #define SOUND @@ -996,9 +995,6 @@ int32_t doom_app() { music_player_worker_load_rtttl_from_string(plugin_state->music_instance->worker, dsintro); music_player_worker_start(plugin_state->music_instance->worker); #endif - // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); - for(bool processing = true; processing;) { FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100); PluginState* plugin_state = (PluginState*)acquire_mutex_block(&state_mutex); diff --git a/applications/plugins/flappy_bird/flappy_bird.c b/applications/plugins/flappy_bird/flappy_bird.c index 2a885f985..2eeaf7816 100644 --- a/applications/plugins/flappy_bird/flappy_bird.c +++ b/applications/plugins/flappy_bird/flappy_bird.c @@ -1,12 +1,10 @@ #include -#include #include #include #include #include #include -#include #define TAG "Flappy" #define DEBUG false @@ -257,10 +255,6 @@ static void flappy_game_render_callback(Canvas* const canvas, void* ctx) { canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 37, 31, "Game Over"); - if(game_state->points != 0 && game_state->points % 5 == 0) { - DOLPHIN_DEED(getRandomDeed()); - } - canvas_set_font(canvas, FontSecondary); char buffer[12]; snprintf(buffer, sizeof(buffer), "Score: %u", game_state->points); @@ -313,9 +307,6 @@ int32_t flappy_game_app(void* p) { Gui* gui = furi_record_open(RECORD_GUI); gui_add_view_port(gui, view_port, GuiLayerFullscreen); - // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); - GameEvent event; for(bool processing = true; processing;) { FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100); diff --git a/applications/plugins/game15/game15.c b/applications/plugins/game15/game15.c index 43d2e12f4..8faea4380 100644 --- a/applications/plugins/game15/game15.c +++ b/applications/plugins/game15/game15.c @@ -3,7 +3,6 @@ #include #include #include -#include #include "sandbox.h" @@ -463,9 +462,6 @@ int32_t game15_app() { sandbox_init( FPS, (SandboxRenderCallback)render_callback, (SandboxEventHandler)game_event_handler); - // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); - sandbox_loop(); sandbox_free(); game_free(); diff --git a/applications/plugins/game_2048/game_2048.c b/applications/plugins/game_2048/game_2048.c index 1a2f4a4d3..097f0d3d5 100644 --- a/applications/plugins/game_2048/game_2048.c +++ b/applications/plugins/game_2048/game_2048.c @@ -13,7 +13,6 @@ #include #include #include -#include #include "digits.h" #include "array_utils.h" @@ -398,9 +397,6 @@ int32_t game_2048_app() { Gui* gui = furi_record_open(RECORD_GUI); gui_add_view_port(gui, view_port, GuiLayerFullscreen); - // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); - bool is_finished = false; while(!is_finished) { FuriStatus event_status = furi_message_queue_get(event_queue, &input, FuriWaitForever); diff --git a/applications/plugins/heap_defence_game/heap_defence.c b/applications/plugins/heap_defence_game/heap_defence.c index e40a97803..a22a8db22 100644 --- a/applications/plugins/heap_defence_game/heap_defence.c +++ b/applications/plugins/heap_defence_game/heap_defence.c @@ -15,7 +15,6 @@ #include #include #include -#include #define Y_FIELD_SIZE 6 #define Y_LAST (Y_FIELD_SIZE - 1) @@ -531,9 +530,6 @@ int32_t heap_defence_app(void* p) { game->game_status = 0; game->animation = AnimationPause; - // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); - GameEvent event = {0}; while(event.input.key != InputKeyBack) { if(furi_message_queue_get(event_queue, &event, 100) != FuriStatusOk) { diff --git a/applications/plugins/minesweeper/minesweeper.c b/applications/plugins/minesweeper/minesweeper.c index cbc1329bc..cbfeb2aa1 100644 --- a/applications/plugins/minesweeper/minesweeper.c +++ b/applications/plugins/minesweeper/minesweeper.c @@ -8,7 +8,6 @@ #include #include -#include #include "assets.h" @@ -253,9 +252,6 @@ static bool game_won(Minesweeper* minesweeper_state) { dialog_message_set_buttons(message, NULL, "Play again", NULL); dialog_message_set_icon(message, NULL, 72, 17); - // Call dolphin deed when we win the game - DOLPHIN_DEED(DolphinDeedPluginGameWin); - DialogMessageButton choice = dialog_message_show(dialogs, message); dialog_message_free(message); furi_string_free(tempStr); @@ -410,9 +406,6 @@ int32_t minesweeper_app(void* p) { Gui* gui = furi_record_open("gui"); gui_add_view_port(gui, view_port, GuiLayerFullscreen); - // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); - PluginEvent event; for(bool processing = true; processing;) { FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100); diff --git a/applications/plugins/pomodoro/flipp_pomodoro_app.c b/applications/plugins/pomodoro/flipp_pomodoro_app.c index ed5b8282b..2ddf8cf68 100644 --- a/applications/plugins/pomodoro/flipp_pomodoro_app.c +++ b/applications/plugins/pomodoro/flipp_pomodoro_app.c @@ -29,11 +29,6 @@ static bool flipp_pomodoro_app_custom_event_callback(void* ctx, uint32_t event) app->view_dispatcher, FlippPomodoroAppCustomEventStateUpdated); return CustomEventConsumed; case FlippPomodoroAppCustomEventStageComplete: - if(flipp_pomodoro__get_stage(app->state) == FlippPomodoroStageFocus) { - // REGISTER a deed on work stage complete to get an acheivement - DOLPHIN_DEED(DolphinDeedPluginGameWin); - }; - flipp_pomodoro__toggle_stage(app->state); notification_message( app->notification_app, @@ -98,4 +93,4 @@ int32_t flipp_pomodoro_app(void* p) { flipp_pomodoro_app_free(app); return 0; -}; \ No newline at end of file +}; diff --git a/applications/plugins/snake_game/snake_game.c b/applications/plugins/snake_game/snake_game.c index 2815e2f37..d2eb22f13 100644 --- a/applications/plugins/snake_game/snake_game.c +++ b/applications/plugins/snake_game/snake_game.c @@ -2,7 +2,6 @@ #include #include #include -#include #include #include @@ -346,8 +345,6 @@ int32_t snake_game_app(void* p) { notification_message_block(notification, &sequence_display_backlight_enforce_on); - DOLPHIN_DEED(DolphinDeedPluginGameStart); - SnakeEvent event; for(bool processing = true; processing;) { FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100); diff --git a/applications/plugins/solitaire/solitaire.c b/applications/plugins/solitaire/solitaire.c index bfb533d82..78205ad69 100644 --- a/applications/plugins/solitaire/solitaire.c +++ b/applications/plugins/solitaire/solitaire.c @@ -1,5 +1,4 @@ #include -#include #include #include #include "defines.h" @@ -277,7 +276,6 @@ void tick(GameState* game_state, NotificationApp* notification) { if(game_state->state == GameStatePlay) { if(game_state->top_cards[0].character == 11 && game_state->top_cards[1].character == 11 && game_state->top_cards[2].character == 11 && game_state->top_cards[3].character == 11) { - DOLPHIN_DEED(DolphinDeedPluginGameWin); game_state->state = GameStateAnimate; return; } @@ -492,9 +490,6 @@ int32_t solitaire_app(void* p) { AppEvent event; - // Call Dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); - for(bool processing = true; processing;) { FuriStatus event_status = furi_message_queue_get(event_queue, &event, 150); GameState* localstate = (GameState*)acquire_mutex_block(&state_mutex); diff --git a/applications/plugins/tetris_game/tetris_game.c b/applications/plugins/tetris_game/tetris_game.c index 366f405f3..1e8e85afa 100644 --- a/applications/plugins/tetris_game/tetris_game.c +++ b/applications/plugins/tetris_game/tetris_game.c @@ -6,7 +6,6 @@ #include #include #include -#include #define BORDER_OFFSET 1 #define MARGIN_OFFSET 3 @@ -154,10 +153,6 @@ static void tetris_game_render_callback(Canvas* const canvas, void* ctx) { canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 4, 63, "Game Over"); - if(tetris_state->numLines % 8 == 0 && tetris_state->numLines != 0) { - DOLPHIN_DEED(getRandomDeed()); - } - char buffer[13]; snprintf(buffer, sizeof(buffer), "Lines: %u", tetris_state->numLines); canvas_set_font(canvas, FontSecondary); @@ -395,9 +390,6 @@ int32_t tetris_game_app() { Piece* newPiece = malloc(sizeof(Piece)); uint8_t downRepeatCounter = 0; - // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); - for(bool processing = true; processing;) { // This 10U implicitly sets the game loop speed. downRepeatCounter relies on this value FuriStatus event_status = furi_message_queue_get(event_queue, &event, 10U); @@ -484,4 +476,4 @@ int32_t tetris_game_app() { free(tetris_state); return 0; -} \ No newline at end of file +} diff --git a/applications/plugins/tictactoe_game/tictactoe_game.c b/applications/plugins/tictactoe_game/tictactoe_game.c index ec82192a8..93536c61a 100644 --- a/applications/plugins/tictactoe_game/tictactoe_game.c +++ b/applications/plugins/tictactoe_game/tictactoe_game.c @@ -3,7 +3,6 @@ #include #include #include -#include #define TAG "TicTacToe" @@ -331,9 +330,6 @@ int32_t tictactoe_game_app(void* p) { Gui* gui = furi_record_open(RECORD_GUI); gui_add_view_port(gui, view_port, GuiLayerFullscreen); - // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); - GameEvent event; for(bool processing = true; processing;) { FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100); @@ -383,4 +379,4 @@ int32_t tictactoe_game_app(void* p) { free(tictactoe_state); return 0; -} \ No newline at end of file +} diff --git a/applications/plugins/zombiez/zombiez.c b/applications/plugins/zombiez/zombiez.c index 2677d13e0..af873ef20 100644 --- a/applications/plugins/zombiez/zombiez.c +++ b/applications/plugins/zombiez/zombiez.c @@ -2,7 +2,6 @@ #include #include #include -#include //ORIGINAL REPO: https://github.com/Dooskington/flipperzero-zombiez //AUTHORS: https://github.com/Dooskington | https://github.com/DevMilanIan @@ -314,9 +313,6 @@ int32_t zombiez_game_app(void* p) { Gui* gui = furi_record_open(RECORD_GUI); gui_add_view_port(gui, view_port, GuiLayerFullscreen); - // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); - PluginEvent event; bool isRunning = true; while(isRunning) { @@ -401,4 +397,4 @@ free_and_exit: furi_message_queue_free(event_queue); return return_code; -} \ No newline at end of file +} diff --git a/applications/services/dolphin/helpers/dolphin_deed.c b/applications/services/dolphin/helpers/dolphin_deed.c index 4b9f11599..2cbaf84a6 100644 --- a/applications/services/dolphin/helpers/dolphin_deed.c +++ b/applications/services/dolphin/helpers/dolphin_deed.c @@ -40,8 +40,6 @@ static const DolphinDeedWeight dolphin_deed_weights[] = { {1, DolphinAppPlugin}, // DolphinDeedGpioUartBridge {1, DolphinAppPlugin}, // DolphinDeedPluginStart - {1, DolphinAppPlugin}, // DolphinDeedPluginGameStart - {10, DolphinAppPlugin}, // DolphinDeedPluginGameWin }; static uint8_t dolphin_deed_limits[] = { diff --git a/applications/services/dolphin/helpers/dolphin_deed.h b/applications/services/dolphin/helpers/dolphin_deed.h index 51adf6b20..d81166417 100644 --- a/applications/services/dolphin/helpers/dolphin_deed.h +++ b/applications/services/dolphin/helpers/dolphin_deed.h @@ -56,8 +56,6 @@ typedef enum { DolphinDeedGpioUartBridge, DolphinDeedPluginStart, - DolphinDeedPluginGameStart, - DolphinDeedPluginGameWin, DolphinDeedMAX,