Merge pull request #6 from leedave/feature/colorguess_final

Feature/colorguess final

Author: leedave

Games/color_guess/README.md

@@ -1,5 +1,8 @@
 # Flipper Zero Color Guessing Game
- <div style="text-align:center"><img src="assets/flipper_logo_orange.png"/></div>
+ <div style="text-align:center">
+ <img src="assets/flipper_logo_orange.png"/>
+ <img src="assets/preview.jpg" />
+ </div>
 
 ## What this is?
 As a web developer I enjoy guessing colours by HEX Code. This game is targeted at other Devs and graphic designers<br>
@@ -8,7 +11,7 @@ that also enjoy this.
 
 ### Mode 1
 The LED will display a color and you must try and guess it by adjusting the HEX values on the screen. A timer will show<br>
-how fast you were. 
+how fast you were. Three levels of difficulty are available. Vibro hints given to help you find the solution. 
 
 ### Mode 2
 You can define a color using the HEX code on-screen and the LED will display this color

Games/color_guess/application.fam

@@ -12,4 +12,6 @@ App(
     fap_icon="color_guess_10px.png",
     fap_icon_assets="icons",
     fap_category="Leed\Games",
+    fap_author="Leed",
+    fap_weburl="https://github.com/leedave/Leeds-Flipper-Zero-Applications",
 )

Games/color_guess/assets/preview.jpg

@@ -15,6 +15,16 @@ int colorsEasy[] = {
     0x500050,
     0x005050,
     0x505050,
+    0x0000c0,
+    0x010101,
+    0xcccccc,
+    0xcc00cc,
+    0x00cccc,
+    0xcccc00,
+    0xcc0000,
+    0x00cc00,
+    0x0000cc,
+    0x000000,
 };
 
 int colorsNormal[] = {
@@ -33,6 +43,21 @@ int colorsNormal[] = {
     0xbc00ff,
     0xff6a00,
     0xc5c5c5,
+    0xafafc0,
+    0xcece00,
+    0xcf6500,
+    0x2b2b00,
+    0x55ee11,
+    0xff33ff,
+    0x2266ff,
+    0x530053,
+    0x3399ff,
+    0xff0033,
+    0x99ff22,
+    0xab00ab,
+    0x55ff55,
+    0x9999ff,
+    0xe500e5,
 };
 
 int colorsHard[] = {
@@ -47,4 +72,26 @@ int colorsHard[] = {
     0x8b3785,
     0x8b4137,
     0xffbdb5,
+    0x3a3aa7,
+    0x37a6bd,
+    0xbd4737,
+    0x621308,
+    0x086238,
+    0x2d4137,
+    0x711761,
+    0xdc26bc,
+    0xdc266e,
+    0x26dc81,
+    0x8d4500,
+    0xb8c22b,
+    0x2bc2a0,
+    0x9064c1,
+    0x732bc2,
+    0x5610a3,
+    0xa31034,
+    0xe50c41,
+    0x6d001a,
+    0x159bbc,
+    0x32bc15,
+    0x53e60c,
 };

Games/color_guess/helpers/color_guess_colors.h

@@ -23,8 +23,10 @@ typedef struct {
     int color;
     int time_spent;
     int timestamp_start;
+    int prev_closeness;
     int closeness;
     int difficulty;
+    int success;
 } ColorGuessPlayModel;
 
 void color_guess_play_set_callback(
@@ -37,13 +39,36 @@ void color_guess_play_set_callback(
     instance->context = context;
 }
 
+void play_happy_bop(void* context, ColorGuessPlayModel* model) {
+    ColorGuess* app = context;
+    if (model->success == 1) {
+        for (int i = 0; i < 4; i++) {
+            notification_message(app->notification, &sequence_set_vibro_on);
+            furi_thread_flags_wait(0, FuriFlagWaitAny, 50);
+            notification_message(app->notification, &sequence_reset_vibro);
+            furi_thread_flags_wait(0, FuriFlagWaitAny, 100);
+        }
+    } else if (model->closeness > model->prev_closeness) {
+        notification_message(app->notification, &sequence_set_vibro_on);
+        furi_thread_flags_wait(0, FuriFlagWaitAny, 20);
+        notification_message(app->notification, &sequence_reset_vibro);
+    } else if (model->closeness < model->prev_closeness) {
+        notification_message(app->notification, &sequence_set_vibro_on);
+        furi_thread_flags_wait(0, FuriFlagWaitAny, 100);
+        notification_message(app->notification, &sequence_reset_vibro);
+    }
+}
+
 void color_guess_play_new_round(void* context, ColorGuessPlayModel* model) {
     furi_assert(context);
     ColorGuess* app = context;
     //Reset timer
     FuriHalRtcDateTime date_time;
     furi_hal_rtc_get_datetime(&date_time);
     model->timestamp_start = furi_hal_rtc_datetime_to_timestamp(&date_time);
+    model->success = 0;
+    model->closeness = 0;
+    model->prev_closeness = 0;
 
     //Set random color
     NotificationMessage notification_led_message_1;
@@ -65,8 +90,6 @@ void color_guess_play_new_round(void* context, ColorGuessPlayModel* model) {
     notification_led_message_2.data.led.value = ((model->color >> 8) & 0xFF);
     notification_led_message_3.data.led.value = ((model->color) & 0xFF);
 
-    //model->closeness = ((model->color >> 8) & 0xFF);
-
     const NotificationSequence notification_sequence = {
         &notification_led_message_1,
         &notification_led_message_2,
@@ -79,7 +102,9 @@ void color_guess_play_new_round(void* context, ColorGuessPlayModel* model) {
 }
 
 void color_guess_play_calculate_closeness(void* context, ColorGuessPlayModel* model) {
-    UNUSED(context);
+    furi_assert(context);
+    ColorGuess* app = context;
+    UNUSED(app);
     int userRed = (model->digit[0] * 16) + model->digit[1];
     int userGreen = (model->digit[2] * 16) + model->digit[3];
     int userBlue = (model->digit[4] * 16) + model->digit[5];
@@ -93,13 +118,15 @@ void color_guess_play_calculate_closeness(void* context, ColorGuessPlayModel* mo
     float percentageRed = 100 - ((distanceRed / 255.0) * 100); //make sure one number is float, otherwise C will calc wrong
     float percentageGreen = 100 - ((distanceGreen / 255.0) * 100);
     float percentageBlue = 100 - ((distanceBlue / 255.0) * 100);
+    if (percentageRed == 100 && percentageGreen == 100 && percentageBlue == 100) {
+        model->success = 1;
+    }
     float fullPercentage = (percentageRed + percentageGreen + percentageBlue) / 3;
+    model->prev_closeness = model->closeness;
     model->closeness = round(fullPercentage);
 }
 
 void parse_time_str(char* buffer, int32_t sec) {
-    //int seconds = sec % 60;
-    //int minutes = (sec % (60 * 60)) / 60;
     snprintf(
         buffer,
         TIMER_LENGHT,
@@ -128,17 +155,38 @@ void drawDifficulty(Canvas* canvas, ColorGuessPlayModel* model) {
 }
 
 void color_guess_play_draw(Canvas* canvas, ColorGuessPlayModel* model) {
+    char timer_string[TIMER_LENGHT];
+    if (model->success == 1) {
+        parse_time_str(timer_string, model->time_spent);
+        canvas_clear(canvas);
+        canvas_set_color(canvas, ColorBlack);
+        canvas_set_font(canvas, FontPrimary);
+        canvas_draw_str_aligned(canvas, 64, 2, AlignCenter, AlignTop, "You won!!"); 
+        canvas_set_font(canvas, FontSecondary);
+        elements_button_center(canvas, "New Round");
+        canvas_set_font(canvas, FontBigNumbers);
+        canvas_draw_str_aligned(canvas, 64, 16, AlignCenter, AlignTop, timer_string);
+
+        canvas_draw_icon(canvas, 18, 32, digits[16]);
+        canvas_draw_icon(canvas, 30, 32, digits[model->digit[0]]);
+        canvas_draw_icon(canvas, 42, 32, digits[model->digit[1]]);
+        canvas_draw_icon(canvas, 54, 32, digits[model->digit[2]]);
+        canvas_draw_icon(canvas, 66, 32, digits[model->digit[3]]);
+        canvas_draw_icon(canvas, 78, 32, digits[model->digit[4]]);
+        canvas_draw_icon(canvas, 90, 32, digits[model->digit[5]]); 
+        
+        return; 
+    }
     const int cursorOffset = 30;
     const int newCursorPos = (model->cursorpos * 12) + cursorOffset;
     FuriHalRtcDateTime date_time;
     furi_hal_rtc_get_datetime(&date_time);
     uint32_t timestamp = furi_hal_rtc_datetime_to_timestamp(&date_time);
     uint32_t time_elapsed = timestamp - model->timestamp_start;
-    
-    char timer_string[TIMER_LENGHT];
-    char closeness_string[4];
-    UNUSED(time_elapsed);
+    model->time_spent = time_elapsed;
 
+    char closeness_string[4];
+    
     //snprintf(timer_string, TIMER_LENGHT, TIMER_FORMAT, date_time.minute, date_time.second);
     parse_time_str(timer_string, time_elapsed);
     snprintf(closeness_string, CLOSENESS_LENGTH, CLOSENESS_FORMAT, model->closeness);
@@ -224,6 +272,7 @@ bool color_guess_play_input(InputEvent* event, void* context) {
                             model->digit[model->cursorpos] = 0;
                         }
                         color_guess_play_calculate_closeness(instance, model);
+                        play_happy_bop(instance->context, model);
                     },
                     true);
                 break;
@@ -237,6 +286,7 @@ bool color_guess_play_input(InputEvent* event, void* context) {
                             model->digit[model->cursorpos] = 15;
                         }
                         color_guess_play_calculate_closeness(instance, model);
+                        play_happy_bop(instance->context, model);
                     },
                     true);
                 break;
@@ -245,9 +295,13 @@ bool color_guess_play_input(InputEvent* event, void* context) {
                     instance->view,
                     ColorGuessPlayModel* model,
                     {
-                        model->difficulty++;
-                        if (model->difficulty > 2) {
-                            model->difficulty = 0;
+                        if (model->success == 1) {
+                            model->success = 0;
+                        } else {
+                            model->difficulty++;
+                            if (model->difficulty > 2) {
+                                model->difficulty = 0;
+                            }
                         }
                         color_guess_play_new_round(instance->context, model);
                     },

Games/color_guess/views/color_guess_play.c

@@ -6,7 +6,7 @@
 extern const Icon* digits[17];
 
 #define TIMER_FORMAT "%02ld:%02ld" //"%.2d:%.2d"
-#define TIMER_LENGHT 12
+#define TIMER_LENGHT 13
 #define CLOSENESS_LENGTH 7
 #define CLOSENESS_FORMAT "%d%%"
 #define ARR_SIZE(arr) ( sizeof((arr)) / sizeof((arr[0])) )