Merge pull request #6 from jaylikesbunda/dev

new features added by @jaylikesbunda

- added persistent counter for darts smoked with InputKeyUp
- added progress to cancer counter
- saves data in ext/apps_data/cigarette/stats.txt
- red notif led on 'light up'
- switch style
- skinny cigarette
- able to puff extra time once cig runs out which triggers a 'cough' vibration and led

Thanks a ton <3

Author: fuckmaz

flipper_cigarette.c

@@ -13,6 +13,10 @@
 #include <assets_icons.h>
 #include <gui/elements.h>
 
+#include <storage/storage.h>
+#include <toolbox/stream/stream.h>
+#include <toolbox/stream/file_stream.h>
+#include <flipper_format/flipper_format.h>
 
 /* Magic happens here -- this file is generated by fbt.
  * Just set fap_icon_assets in application.fam and #include {APPID}_icons.h */
@@ -29,7 +33,11 @@ static ImagePosition smoke_position = {.x = 0, .y = 0};
 typedef struct {
     int32_t counter, maxdrags;
     bool lit, done;
+    uint8_t style; // 0 = regular, 1 = skinny
     IconAnimation* icon;
+    NotificationApp* notification;
+    uint32_t smoke_end; // Tracks when to stop smoke
+    bool cough_used; // NEW - tracks if cough was used
 } Cigarette;
 
 static Cigarette cigarette = {.counter = 0, .maxdrags = 13, .lit = false, .done = false};
@@ -39,112 +47,153 @@ const NotificationMessage message_delay_15 = {
     .data.delay.length = 15,
 };
 
-static const NotificationSequence vibr1 = {
-    &message_note_ds4,
-    &message_delay_15,
-    &message_sound_off,
-    
-    &message_note_a5,
-    &message_delay_15,
-    &message_sound_off,
-
+static const NotificationSequence sequence_puff = {
     &message_vibro_on,
-    &message_delay_25,
+    &message_delay_50,
     &message_vibro_off,
-    
     NULL,
 };
 
-// Light up
-static const NotificationSequence vibr2 = {
-    &message_note_ds2,
-    &message_delay_25,
-    &message_sound_off,
-
+static const NotificationSequence sequence_light_up = {
+    &message_red_255,
+    &message_vibro_on,
+    &message_delay_100,
+    &message_vibro_off,
+    &message_red_0,
+    NULL,
+};
+static const NotificationSequence sequence_cough = {
+    &message_red_255,
     &message_vibro_on,
-    &message_delay_15,
+    &message_delay_100,
     &message_vibro_off,
+    &message_red_0,
+    &message_delay_50,
+    &message_delay_50,
+    &message_delay_50,
+    &message_delay_50,
+    &message_vibro_on,
+    &message_delay_50,
+    &message_vibro_off,
+    &message_delay_50,
+    &message_delay_50,
+    &message_red_255,
+    &message_delay_25,
+    &message_red_0,
 
     NULL,
 };
 
+typedef struct {
+    uint32_t total_smokes;
+    bool visible;
+    Storage* storage;
+} StatsView;
+
+static StatsView stats_view = {.total_smokes = 0, .visible = false};
+
 static void app_draw_callback(Canvas* canvas, void* ctx) {
     UNUSED(ctx);
-
     canvas_clear(canvas);
 
+    if(stats_view.visible) {
+        char buffer[64];
+        // 1 cig in app = 15 IRL cigs (one pack)
+        // 14.7% cancer risk after 20 years of 15/day
+        float cancer_pct = (stats_view.total_smokes * 15.0f) / (15 * 365 * 20) * 14.7f;
+        if(cancer_pct > 100.0f) 
+            cancer_pct = 100.0f;
+        
+        snprintf(buffer, sizeof(buffer), "darts smoked: %lu", stats_view.total_smokes);
+        canvas_draw_str_aligned(canvas, 64, 27, AlignCenter, AlignCenter, buffer);
+        
+        if(cancer_pct >= 100.0f) {
+            canvas_draw_str_aligned(canvas, 64, 34, AlignCenter, AlignCenter, "YOU DIED OF CANCER");
+            canvas_draw_str_aligned(canvas, 64, 44, AlignCenter, AlignCenter, "RIP BOZO");
+        } else {
+            snprintf(buffer, sizeof(buffer), "progress to cancer: %.1f%%", (double)cancer_pct);
+            canvas_draw_str_aligned(canvas, 64, 40, AlignCenter, AlignCenter, buffer);
+            
+            if(cancer_pct >= 50.0f && cancer_pct < 100.0f) {
+                canvas_draw_str_aligned(canvas, 64, 44, AlignCenter, AlignCenter, "SEEK HELP IMMEDIATELY");
+            }
+        }
+        
+        elements_button_down(canvas, "back");
+        return;
+    }    
 
-    if (cigarette.lit == true && cigarette.done == false){
+    // Draw smoke only when smoke_end is active
+    if (cigarette.smoke_end) {
+        canvas_draw_icon_animation(canvas, smoke_position.x, smoke_position.y, cigarette.icon);
+    } else if (cigarette.lit && !cigarette.done) {
         elements_button_right(canvas, "puff");
         canvas_draw_icon_animation(canvas, smoke_position.x, smoke_position.y, cigarette.icon);
     }
 
-    if (cigarette.lit == false && cigarette.done == false)
+    if (cigarette.lit == false && cigarette.done == false) {
         elements_button_center(canvas, "light up");
+        canvas_draw_str_aligned(canvas, 64, 15, AlignCenter, AlignCenter, "< switch style >");
+    }
 
-    if (cigarette.done == true){
-            elements_button_left(canvas, "another one");
-
+    if (cigarette.done == true) {
+        elements_button_left(canvas, "another one");
     }
 
     // TODO: open about-view
     //elements_button_down(canvas, "about");
 
-
-
-    // Cigarette
+    // Cigarette icon selection based on style
+    const Icon* current_icon = NULL;
     switch(cigarette.counter) {
         case 0:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette0_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette0_115x25 : &I_skinny0_112x20;
             break;
         case 1:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette1_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette1_115x25 : &I_skinny1_112x20;
             break;
         case 2:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette2_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette2_115x25 : &I_skinny2_112x20;
             break;
         case 3:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette3_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette3_115x25 : &I_skinny3_112x20;
             break;
         case 4:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette4_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette4_115x25 : &I_skinny4_112x20;
             break;
         case 5:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette5_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette5_115x25 : &I_skinny5_112x20;
             break;
         case 6:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette6_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette6_115x25 : &I_skinny6_112x20;
             break;
         case 7:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette7_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette7_115x25 : &I_skinny7_112x20;
             break;
         case 8:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette8_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette8_115x25 : &I_skinny8_112x20;
             break;
         case 9:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette9_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette9_115x25 : &I_skinny9_112x20;
             break;
         case 10:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette10_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette10_115x25 : &I_skinny10_112x20;
             break;
         case 11:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette11_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette11_115x25 : &I_skinny11_112x20;
             break;
         case 12:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette12_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette12_115x25 : &I_skinny12_112x20;
             break;
         case 13:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette13_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette13_115x25 : &I_skinny13_112x20;
             cigarette.done = true;
             break;
         default:
-            canvas_draw_icon(canvas, image_position.x, image_position.y, &I_cigarette0_115x25);
+            current_icon = (cigarette.style == 0) ? &I_cigarette13_115x25 : &I_skinny13_112x20;
             break;
-                
     }
-    
-
-  
+    canvas_draw_icon(canvas, image_position.x, image_position.y, current_icon);
 }
 
 static void app_input_callback(InputEvent* input_event, void* ctx) {
@@ -169,49 +218,96 @@ int32_t cigarette_main(void* p) {
     Gui* gui = furi_record_open(RECORD_GUI);
     gui_add_view_port(gui, view_port, GuiLayerFullscreen);
 
-    NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
+    cigarette.notification = furi_record_open(RECORD_NOTIFICATION);
+
+    stats_view.storage = furi_record_open(RECORD_STORAGE);
+
+    // Load stats
+    FlipperFormat* ff_load = flipper_format_file_alloc(stats_view.storage);
+    storage_common_mkdir(stats_view.storage, "/ext/apps_data/cigarette");
+    if(flipper_format_file_open_existing(ff_load, "/ext/apps_data/cigarette/stats.txt")) {
+        flipper_format_read_uint32(ff_load, "total", &stats_view.total_smokes, 1);
+    }
+    flipper_format_free(ff_load);
 
     InputEvent event;
 
     bool running = true;
     while(running) {
+        // Check if smoke needs to stop
+        if(cigarette.smoke_end && furi_get_tick() >= cigarette.smoke_end) {
+            icon_animation_stop(cigarette.icon);
+            cigarette.smoke_end = 0;
+        }
+        
         if(furi_message_queue_get(event_queue, &event, 100) == FuriStatusOk) {
             if((event.type == InputTypePress) || (event.type == InputTypeRepeat)) {
                 switch(event.key) {
                 case InputKeyLeft:
-                    cigarette.counter = 0;
-                    cigarette.lit = 0;
-                    cigarette.done = false;
-                    smoke_position.x = 0;
-                    image_position.x = 12;
-                    icon_animation_stop(cigarette.icon);
+                    if(!stats_view.visible && !cigarette.lit && !cigarette.done) {
+                        // Cycle through styles
+                        cigarette.style = (cigarette.style - 1 + 2) % 2;
+                    } else if(cigarette.done) {
+                        // Reset positions when getting new cig
+                        stats_view.total_smokes++;
+                        cigarette.counter = 0;
+                        cigarette.lit = false;
+                        cigarette.done = false;
+                        cigarette.cough_used = false; // RESET FLAG
+                        smoke_position.x = 0;  // Reset smoke position
+                        image_position.x = 12; // Reset cig position
+                        icon_animation_stop(cigarette.icon);
+                    }
                     break;
                 case InputKeyRight:
-                    if (cigarette.counter < cigarette.maxdrags && cigarette.lit == true){
-                        cigarette.counter += 1;
-                        smoke_position.x += 5;
-                        image_position.x += 5;
-                        notification_message(notification, &vibr2);
+                    if(!stats_view.visible && !cigarette.lit && !cigarette.done) {
+                        cigarette.style = (cigarette.style + 1) % 2;
+                    } else if (cigarette.lit) {
+                        if(!cigarette.done) {
+                            cigarette.counter++;
+                            if(cigarette.counter > cigarette.maxdrags) {
+                                // Secret cough with 1s smoke
+                                icon_animation_start(cigarette.icon);
+                                cigarette.smoke_end = furi_get_tick() + 1000;
+                                notification_message(cigarette.notification, &sequence_cough);
+                                cigarette.counter = cigarette.maxdrags;
+                            } else {
+                                if(cigarette.counter == cigarette.maxdrags) {
+                                    cigarette.done = true;
+                                }
+                                notification_message(cigarette.notification, &sequence_puff);
+                                smoke_position.x += 5;
+                                image_position.x += 5;
+                            }
+                        } else {
+                            if(!cigarette.cough_used) { // CHECK FLAG
+                                // Cough puff with reset smoke position
+                                smoke_position.x = image_position.x -3; // Start from cig tip
+                                icon_animation_start(cigarette.icon);
+                                cigarette.smoke_end = furi_get_tick() + 1000;
+                                notification_message(cigarette.notification, &sequence_cough);
+                                cigarette.cough_used = true; // SET FLAG
+                            }
+                        }
                     }
                     break;
                 case InputKeyUp:
-                //    image_position.y -= 2;
+                    if(event.type == InputTypePress) {
+                        stats_view.visible = !stats_view.visible;
+                    }
                     break;
                 case InputKeyDown:
-                //    image_position.y += 2;
+                    if(stats_view.visible) {
+                        stats_view.visible = false;
+                    }
                     break;
                 case InputKeyOk:
-                    // Light Cigarette - play lighter animation
-                    if (cigarette.counter == 0){
-                        if (cigarette.lit == false){
-                            cigarette.lit = true;
-                            notification_message(notification, &vibr1);
-
-                        }
+                    if (cigarette.counter == 0 && !cigarette.lit) {
+                        cigarette.lit = true;
+                        notification_message(cigarette.notification, &sequence_light_up);
                         icon_animation_start(cigarette.icon);
+                        notification_message(cigarette.notification, &sequence_blink_red_10);
                     }
-
-                    
                     break;
                 default:
                     running = false;
@@ -223,6 +319,16 @@ int32_t cigarette_main(void* p) {
     }
 
     view_port_enabled_set(view_port, false);
+    
+    // Save stats before exit
+    FlipperFormat* ff_save = flipper_format_file_alloc(stats_view.storage);
+    if(flipper_format_file_open_always(ff_save, "/ext/apps_data/cigarette/stats.txt")) {
+        flipper_format_write_header_cstr(ff_save, "CigaretteStats", 1);
+        flipper_format_write_uint32(ff_save, "total", &stats_view.total_smokes, 1);
+    }
+    flipper_format_free(ff_save);
+    furi_record_close(RECORD_STORAGE);
+    
     gui_remove_view_port(gui, view_port);
     view_port_free(view_port);
     furi_message_queue_free(event_queue);