update nu pogodi

apps_source_code/nupogodi_game/nupogodi.c

@@ -9,8 +9,14 @@
 #include <power/power_service/power.h>
 #include <nupogodi_icons.h>
 #include "notifications.h"
+#include <dolphin/dolphin.h>
 
-#define TAG "NuPogodi"
+#define WIN_SCORES 100
+#define EGGS_2_SCORES 10
+#define EGGS_3_SCORES 20
+#define EGGS_4_SCORES 50
+
+typedef struct NuPogodiModel NuPogodiModel;
 
 typedef struct {
     Gui* gui;
@@ -19,6 +25,7 @@ typedef struct {
     View* view;
     FuriThread* worker_thread;
     FuriTimer* timer;
+    NuPogodiModel* model;
 } NuPogodiApp;
 
 typedef enum {
@@ -30,7 +37,7 @@ typedef enum {
     Over,
 } NuPogodiMode;
 
-typedef struct {
+struct NuPogodiModel {
     bool sound;
     NuPogodiMode mode;
     uint8_t tick;
@@ -39,7 +46,7 @@ typedef struct {
     uint8_t missed;
     uint16_t scores;
     uint8_t eggs[4];
-} NuPogodiModel;
+};
 
 typedef enum {
     WorkerEventReserved = (1 << 0),
@@ -138,11 +145,14 @@ static void nupogodi_view_draw_scores(Canvas* canvas, NuPogodiModel* model) {
             canvas_draw_icon(canvas, 106, 0, &I_Chick);
         }
 
-        canvas_draw_icon(canvas, 30, 0, &I_Egg3);
+        canvas_draw_icon(canvas, 22, 0, &I_Egg3);
 
-        FuriString* scores_str = furi_string_alloc_printf("%1d", model->scores);
+        FuriString* scores_str =
+            model->scores < WIN_SCORES ?
+                furi_string_alloc_printf("%1d/%1d", model->scores, WIN_SCORES) :
+                furi_string_alloc_printf("%1d", model->scores);
         canvas_set_font(canvas, FontSecondary);
-        canvas_draw_str(canvas, 46, 10, furi_string_get_cstr(scores_str));
+        canvas_draw_str(canvas, 38, 10, furi_string_get_cstr(scores_str));
         furi_string_free(scores_str);
     }
 }
@@ -195,7 +205,7 @@ static void nupogodi_view_draw_over(Canvas* canvas, NuPogodiModel* model) {
     canvas_draw_str(canvas, 46, 10, furi_string_get_cstr(scores_str));
     furi_string_free(scores_str);
 
-    if(model->scores >= 10) {
+    if(model->scores >= WIN_SCORES) {
         canvas_draw_icon(canvas, 22, 12, &I_OverWin);
     } else {
         canvas_draw_icon(canvas, 22, 12, &I_OverLose);
@@ -237,59 +247,51 @@ static bool nupogodi_view_input_callback(InputEvent* event, void* context) {
     furi_assert(app);
     bool consumed = false;
 
-    FURI_LOG_D(TAG, "Input %u %u", event->type, event->key);
-
-    with_view_model(
-        app->view,
-        NuPogodiModel * model,
-        {
-            if(model->mode == Fail) {
-                return false;
-            }
+    if(app->model->mode == Fail) {
+        return false;
+    }
 
-            if(event->type == InputTypeShort) {
-                switch(event->key) {
-                case InputKeyUp:
-                    consumed = true;
-                    model->top = true;
-                    break;
-                case InputKeyDown:
-                    consumed = true;
-                    model->top = false;
-                    break;
-                case InputKeyLeft:
-                    consumed = true;
-                    model->left = true;
-                    break;
-                case InputKeyRight:
-                    consumed = true;
-                    model->left = false;
-                    break;
-                case InputKeyOk:
-                    consumed = true;
-                    if(model->mode == Play) {
-                        model->mode = Pause;
-                    } else if(model->mode == Pause) {
-                        model->mode = Play;
-                    } else if(model->mode == Over) {
-                        model->mode = Ready;
-                    }
-                    break;
-                default:
-                    break;
-                }
-            } else if(event->type == InputTypeLong) {
-                switch(event->key) {
-                case InputKeyOk:
-                    consumed = true;
-                    model->sound = !model->sound;
-                    break;
-                default:
-                    break;
-                }
+    if(event->type == InputTypeShort) {
+        switch(event->key) {
+        case InputKeyUp:
+            consumed = true;
+            app->model->top = true;
+            break;
+        case InputKeyDown:
+            consumed = true;
+            app->model->top = false;
+            break;
+        case InputKeyLeft:
+            consumed = true;
+            app->model->left = true;
+            break;
+        case InputKeyRight:
+            consumed = true;
+            app->model->left = false;
+            break;
+        case InputKeyOk:
+            consumed = true;
+            if(app->model->mode == Play) {
+                app->model->mode = Pause;
+            } else if(app->model->mode == Pause) {
+                app->model->mode = Play;
+            } else if(app->model->mode == Over) {
+                app->model->mode = Ready;
             }
-        },
-        consumed);
+            break;
+        default:
+            break;
+        }
+    } else if(event->type == InputTypeLong) {
+        switch(event->key) {
+        case InputKeyOk:
+            consumed = true;
+            app->model->sound = !app->model->sound;
+            break;
+        default:
+            break;
+        }
+    }
 
     return consumed;
 }
@@ -311,8 +313,6 @@ static int32_t nupogodi_worker(void* context) {
             furi_thread_flags_wait(WORKER_EVENTS_MASK, FuriFlagWaitAny, FuriWaitForever);
         furi_check((events & FuriFlagError) == 0);
 
-        FURI_LOG_D(TAG, "Worker %lu", events);
-
         if(events & WorkerEventStop) break;
         if(events & WorkerEventTick) {
             with_view_model(
@@ -326,6 +326,7 @@ static int32_t nupogodi_worker(void* context) {
                             model->tick--;
                         } else {
                             model->mode = Play;
+                            dolphin_deed(DolphinDeedPluginGameStart);
                         }
                         break;
                     case Ready:
@@ -336,61 +337,79 @@ static int32_t nupogodi_worker(void* context) {
                         model->scores = 0;
                         model->missed = 0;
                         model->mode = Play;
+                        dolphin_deed(DolphinDeedPluginGameStart);
                         break;
                     case Play:
-                        if((model->eggs[0] == 0) && (model->eggs[1] == 0) &&
-                           (model->eggs[2] == 0) && (model->eggs[3] == 0)) {
-                            // Если ни одного яйца нет - создаем
+                        // Прокатываем все яйца на одно деление вперед
+                        for(uint8_t i = 0; i < 4; i++) {
+                            if(model->eggs[i] > 0) {
+                                model->eggs[i]++;
+                                if(model->eggs[i] < 6) {
+                                    notification_message(
+                                        app->notification, notification_eggs[i][sound]);
+                                }
+                            }
+                        }
+
+                        // Считаем текущее количество яиц
+                        uint8_t eggs_num = 0;
+                        for(uint8_t i = 0; i < 4; i++) {
+                            if(model->eggs[i] > 0) {
+                                eggs_num++;
+                            }
+                        }
+
+                        // В зависимости от количества собраных яиц добавляем новые
+                        if((eggs_num == 0) || (model->scores > EGGS_2_SCORES && eggs_num == 1) ||
+                           (model->scores > EGGS_3_SCORES && eggs_num == 2) ||
+                           (model->scores > EGGS_4_SCORES && eggs_num == 3)) {
                             uint32_t rnd = furi_hal_random_get() % 4;
-                            model->eggs[rnd] = 1;
-                            notification_message(app->notification, notification_eggs[rnd][sound]);
+                            if(model->eggs[rnd] == 0) {
+                                model->eggs[rnd] = 1;
+                                notification_message(
+                                    app->notification, notification_eggs[rnd][sound]);
+                            }
+                        }
+
+                        // Проверяем те яйца, которые должны попасть в корзину
+                        if((model->eggs[0] == 6) && (model->top) && (!model->left)) {
+                            model->eggs[0] = 0;
+                            model->scores++;
+                            notification_message(app->notification, notification_done[sound]);
+                        } else if((model->eggs[1] == 6) && (!model->top) && (!model->left)) {
+                            model->eggs[1] = 0;
+                            model->scores++;
+                            notification_message(app->notification, notification_done[sound]);
+                        } else if((model->eggs[2] == 6) && (model->top) && (model->left)) {
+                            model->eggs[2] = 0;
+                            model->scores++;
+                            notification_message(app->notification, notification_done[sound]);
+                        } else if((model->eggs[3] == 6) && (!model->top) && (model->left)) {
+                            model->eggs[3] = 0;
+                            model->scores++;
+                            notification_message(app->notification, notification_done[sound]);
                         } else {
-                            // Прокатываем все яйца на одно деление вперед
+                            // Если яйцо было не поймано - зануляем все, запускаем анимацию разбития
                             for(uint8_t i = 0; i < 4; i++) {
-                                if(model->eggs[i] > 0) {
-                                    model->eggs[i]++;
-                                    if(model->eggs[i] < 6) {
-                                        notification_message(
-                                            app->notification, notification_eggs[i][sound]);
-                                    }
-                                }
-                            }
-                            if((model->eggs[0] == 6) && (model->top) && (!model->left)) {
-                                model->eggs[0] = 0;
-                                model->scores++;
-                                notification_message(app->notification, notification_done[sound]);
-                            } else if((model->eggs[1] == 6) && (!model->top) && (!model->left)) {
-                                model->eggs[1] = 0;
-                                model->scores++;
-                                notification_message(app->notification, notification_done[sound]);
-                            } else if((model->eggs[2] == 6) && (model->top) && (model->left)) {
-                                model->eggs[2] = 0;
-                                model->scores++;
-                                notification_message(app->notification, notification_done[sound]);
-                            } else if((model->eggs[3] == 6) && (!model->top) && (model->left)) {
-                                model->eggs[3] = 0;
-                                model->scores++;
-                                notification_message(app->notification, notification_done[sound]);
-                            } else {
-                                // Если яйцо было не поймано - зануляем все, запускаем анимацию разбития
-                                for(uint8_t i = 0; i < 4; i++) {
-                                    if(model->eggs[i] == 6) {
-                                        model->eggs[0] = 0;
-                                        model->eggs[1] = 0;
-                                        model->eggs[2] = 0;
-                                        model->eggs[3] = 0;
-                                        model->left = i >= 2;
-                                        model->missed++;
-                                        if(model->missed < 4) {
-                                            model->mode = Fail;
-                                            model->tick = 3;
-                                        } else {
-                                            model->mode = Over;
+                                if(model->eggs[i] == 6) {
+                                    model->eggs[0] = 0;
+                                    model->eggs[1] = 0;
+                                    model->eggs[2] = 0;
+                                    model->eggs[3] = 0;
+                                    model->left = i >= 2;
+                                    model->missed++;
+                                    if(model->missed < 4) {
+                                        model->mode = Fail;
+                                        model->tick = 3;
+                                    } else {
+                                        model->mode = Over;
+                                        if(model->scores >= WIN_SCORES) {
+                                            dolphin_deed(DolphinDeedPluginGameWin);
                                         }
-
-                                        notification_message(
-                                            app->notification, notification_fail[sound]);
                                     }
+
+                                    notification_message(
+                                        app->notification, notification_fail[sound]);
                                 }
                             }
                         }
@@ -432,7 +451,6 @@ static NuPogodiApp* nupogodi_app_alloc() {
     // View dispatcher
     app->view_dispatcher = view_dispatcher_alloc();
     view_dispatcher_enable_queue(app->view_dispatcher);
-
     view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
 
     // Views
@@ -445,6 +463,7 @@ static NuPogodiApp* nupogodi_app_alloc() {
         app->view,
         NuPogodiModel * model,
         {
+            app->model = model;
             model->mode = Logo;
             model->tick = 1;
             model->top = false;