diff --git a/applications/desktop/scenes/desktop_scene_main.c b/applications/desktop/scenes/desktop_scene_main.c index 8131d0c32..f37ac6c65 100644 --- a/applications/desktop/scenes/desktop_scene_main.c +++ b/applications/desktop/scenes/desktop_scene_main.c @@ -87,6 +87,12 @@ void desktop_scene_main_on_enter(void* context) { Loader* loader = furi_record_open("loader"); desktop->app_start_stop_subscription = furi_pubsub_subscribe( loader_get_pubsub(loader), desktop_scene_main_app_started_callback, desktop); + + // Special case: application is already running (autostart application) + if(loader_is_locked(loader)) { + animation_manager_unload_and_stall_animation(desktop->animation_manager); + } + furi_record_close("loader"); desktop_main_set_callback(main_view, desktop_scene_main_callback, desktop); diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_0.png b/assets/dolphin/external/L1_Boxing_128x64/frame_0.png new file mode 100644 index 000000000..b6b2c75b8 Binary files /dev/null and b/assets/dolphin/external/L1_Boxing_128x64/frame_0.png differ diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_1.png b/assets/dolphin/external/L1_Boxing_128x64/frame_1.png new file mode 100644 index 000000000..347d71cc2 Binary files /dev/null and b/assets/dolphin/external/L1_Boxing_128x64/frame_1.png differ diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_2.png b/assets/dolphin/external/L1_Boxing_128x64/frame_2.png new file mode 100644 index 000000000..51a7fd236 Binary files /dev/null and b/assets/dolphin/external/L1_Boxing_128x64/frame_2.png differ diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_3.png b/assets/dolphin/external/L1_Boxing_128x64/frame_3.png new file mode 100644 index 000000000..7004e10c3 Binary files /dev/null and b/assets/dolphin/external/L1_Boxing_128x64/frame_3.png differ diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_4.png b/assets/dolphin/external/L1_Boxing_128x64/frame_4.png new file mode 100644 index 000000000..556cb8948 Binary files /dev/null and b/assets/dolphin/external/L1_Boxing_128x64/frame_4.png differ diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_5.png b/assets/dolphin/external/L1_Boxing_128x64/frame_5.png new file mode 100644 index 000000000..fd6170340 Binary files /dev/null and b/assets/dolphin/external/L1_Boxing_128x64/frame_5.png differ diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_6.png b/assets/dolphin/external/L1_Boxing_128x64/frame_6.png new file mode 100644 index 000000000..34839517c Binary files /dev/null and b/assets/dolphin/external/L1_Boxing_128x64/frame_6.png differ diff --git a/assets/dolphin/external/L1_Boxing_128x64/meta.txt b/assets/dolphin/external/L1_Boxing_128x64/meta.txt new file mode 100644 index 000000000..c66998e7d --- /dev/null +++ b/assets/dolphin/external/L1_Boxing_128x64/meta.txt @@ -0,0 +1,32 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 9 +Active frames: 7 +Frames order: 0 1 2 1 3 1 2 3 1 4 5 6 5 6 5 4 +Active cycles: 1 +Frame rate: 2 +Duration: 3600 +Active cooldown: 7 + +Bubble slots: 2 + +Slot: 0 +X: 78 +Y: 16 +Text: F*&K!!! +AlignH: Left +AlignV: Bottom +StartFrame: 2 +EndFrame: 4 + +Slot: 1 +X: 78 +Y: 16 +Text: What ya\nlookin at?! +AlignH: Left +AlignV: Center +StartFrame: 10 +EndFrame: 15 diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_0.png b/assets/dolphin/external/L1_Cry_128x64/frame_0.png new file mode 100644 index 000000000..b2636f005 Binary files /dev/null and b/assets/dolphin/external/L1_Cry_128x64/frame_0.png differ diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_1.png b/assets/dolphin/external/L1_Cry_128x64/frame_1.png new file mode 100644 index 000000000..e73499e94 Binary files /dev/null and b/assets/dolphin/external/L1_Cry_128x64/frame_1.png differ diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_2.png b/assets/dolphin/external/L1_Cry_128x64/frame_2.png new file mode 100644 index 000000000..16005a990 Binary files /dev/null and b/assets/dolphin/external/L1_Cry_128x64/frame_2.png differ diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_3.png b/assets/dolphin/external/L1_Cry_128x64/frame_3.png new file mode 100644 index 000000000..02e833dec Binary files /dev/null and b/assets/dolphin/external/L1_Cry_128x64/frame_3.png differ diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_4.png b/assets/dolphin/external/L1_Cry_128x64/frame_4.png new file mode 100644 index 000000000..3f7dff4db Binary files /dev/null and b/assets/dolphin/external/L1_Cry_128x64/frame_4.png differ diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_5.png b/assets/dolphin/external/L1_Cry_128x64/frame_5.png new file mode 100644 index 000000000..385106787 Binary files /dev/null and b/assets/dolphin/external/L1_Cry_128x64/frame_5.png differ diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_6.png b/assets/dolphin/external/L1_Cry_128x64/frame_6.png new file mode 100644 index 000000000..7871674db Binary files /dev/null and b/assets/dolphin/external/L1_Cry_128x64/frame_6.png differ diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_7.png b/assets/dolphin/external/L1_Cry_128x64/frame_7.png new file mode 100644 index 000000000..5865e91e1 Binary files /dev/null and b/assets/dolphin/external/L1_Cry_128x64/frame_7.png differ diff --git a/assets/dolphin/external/L1_Cry_128x64/meta.txt b/assets/dolphin/external/L1_Cry_128x64/meta.txt new file mode 100644 index 000000000..e96c8d7c6 --- /dev/null +++ b/assets/dolphin/external/L1_Cry_128x64/meta.txt @@ -0,0 +1,41 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 8 +Active frames: 4 +Frames order: 0 1 2 3 4 2 3 4 5 6 7 6 +Active cycles: 2 +Frame rate: 2 +Duration: 3600 +Active cooldown: 7 + +Bubble slots: 2 + +Slot: 0 +X: 22 +Y: 40 +Text: I miss you +AlignH: Right +AlignV: Bottom +StartFrame: 9 +EndFrame: 11 + +Slot: 0 +X: 17 +Y: 40 +Text: my friend... +AlignH: Right +AlignV: Bottom +StartFrame: 12 +EndFrame: 15 + +Slot: 1 +X: 2 +Y: 29 +Text: Why are you\nalways away? +AlignH: Right +AlignV: Bottom +StartFrame: 9 +EndFrame: 15 \ No newline at end of file diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_0.png b/assets/dolphin/external/L1_Read_books_128x64/frame_0.png new file mode 100644 index 000000000..fbf265286 Binary files /dev/null and b/assets/dolphin/external/L1_Read_books_128x64/frame_0.png differ diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_1.png b/assets/dolphin/external/L1_Read_books_128x64/frame_1.png new file mode 100644 index 000000000..be9c5dc15 Binary files /dev/null and b/assets/dolphin/external/L1_Read_books_128x64/frame_1.png differ diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_2.png b/assets/dolphin/external/L1_Read_books_128x64/frame_2.png new file mode 100644 index 000000000..eb8075ecb Binary files /dev/null and b/assets/dolphin/external/L1_Read_books_128x64/frame_2.png differ diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_3.png b/assets/dolphin/external/L1_Read_books_128x64/frame_3.png new file mode 100644 index 000000000..0f1fd5c52 Binary files /dev/null and b/assets/dolphin/external/L1_Read_books_128x64/frame_3.png differ diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_4.png b/assets/dolphin/external/L1_Read_books_128x64/frame_4.png new file mode 100644 index 000000000..dd2d918af Binary files /dev/null and b/assets/dolphin/external/L1_Read_books_128x64/frame_4.png differ diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_5.png b/assets/dolphin/external/L1_Read_books_128x64/frame_5.png new file mode 100644 index 000000000..bfcc7bcd2 Binary files /dev/null and b/assets/dolphin/external/L1_Read_books_128x64/frame_5.png differ diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_6.png b/assets/dolphin/external/L1_Read_books_128x64/frame_6.png new file mode 100644 index 000000000..eabe9def3 Binary files /dev/null and b/assets/dolphin/external/L1_Read_books_128x64/frame_6.png differ diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_7.png b/assets/dolphin/external/L1_Read_books_128x64/frame_7.png new file mode 100644 index 000000000..3ff0aee0c Binary files /dev/null and b/assets/dolphin/external/L1_Read_books_128x64/frame_7.png differ diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_8.png b/assets/dolphin/external/L1_Read_books_128x64/frame_8.png new file mode 100644 index 000000000..ce663f75f Binary files /dev/null and b/assets/dolphin/external/L1_Read_books_128x64/frame_8.png differ diff --git a/assets/dolphin/external/L1_Read_books_128x64/meta.txt b/assets/dolphin/external/L1_Read_books_128x64/meta.txt new file mode 100644 index 000000000..7432507ce --- /dev/null +++ b/assets/dolphin/external/L1_Read_books_128x64/meta.txt @@ -0,0 +1,23 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 13 +Active frames: 2 +Frames order: 0 1 0 2 3 3 4 0 1 5 6 1 1 7 8 +Active cycles: 2 +Frame rate: 2 +Duration: 3600 +Active cooldown: 5 + +Bubble slots: 1 + +Slot: 0 +X: 5 +Y: 28 +Text: Predictable twist +AlignH: Right +AlignV: Bottom +StartFrame: 14 +EndFrame: 16 diff --git a/assets/dolphin/external/L2_Hacking_pc_128x64/frame_0.png b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_0.png new file mode 100644 index 000000000..d303aef08 Binary files /dev/null and b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_0.png differ diff --git a/assets/dolphin/external/L2_Hacking_pc_128x64/frame_1.png b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_1.png new file mode 100644 index 000000000..45aeb57b5 Binary files /dev/null and b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_1.png differ diff --git a/assets/dolphin/external/L2_Hacking_pc_128x64/frame_2.png b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_2.png new file mode 100644 index 000000000..a4508f14b Binary files /dev/null and b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_2.png differ diff --git a/assets/dolphin/external/L2_Hacking_pc_128x64/frame_3.png b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_3.png new file mode 100644 index 000000000..350002167 Binary files /dev/null and b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_3.png differ diff --git a/assets/dolphin/external/L2_Hacking_pc_128x64/frame_4.png b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_4.png new file mode 100644 index 000000000..7addbf932 Binary files /dev/null and b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_4.png differ diff --git a/assets/dolphin/external/L2_Hacking_pc_128x64/meta.txt b/assets/dolphin/external/L2_Hacking_pc_128x64/meta.txt new file mode 100644 index 000000000..8ad8d42a3 --- /dev/null +++ b/assets/dolphin/external/L2_Hacking_pc_128x64/meta.txt @@ -0,0 +1,32 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 3 +Active frames: 2 +Frames order: 0 1 2 3 4 +Active cycles: 4 +Frame rate: 2 +Duration: 3600 +Active cooldown: 7 + +Bubble slots: 1 + +Slot: 0 +X: 22 +Y: 25 +Text: Mess with\nthe best, +AlignH: Right +AlignV: Center +StartFrame: 4 +EndFrame: 7 + +Slot: 0 +X: 31 +Y: 25 +Text: die like\nthe rest. +AlignH: Right +AlignV: Center +StartFrame: 8 +EndFrame: 10 diff --git a/assets/dolphin/external/manifest.txt b/assets/dolphin/external/manifest.txt index d5a8e2a19..d6e16dd13 100644 --- a/assets/dolphin/external/manifest.txt +++ b/assets/dolphin/external/manifest.txt @@ -1,7 +1,6 @@ Filetype: Flipper Animation Manifest Version: 1 -# Animation 1 Name: L1_Waves_128x50 Min butthurt: 0 Max butthurt: 5 @@ -9,7 +8,6 @@ Min level: 1 Max level: 3 Weight: 3 -# Animation 2 Name: L1_Laptop_128x51 Min butthurt: 0 Max butthurt: 9 @@ -17,7 +15,6 @@ Min level: 1 Max level: 3 Weight: 3 -# Animation 3 Name: L1_Sleep_128x64 Min butthurt: 0 Max butthurt: 10 @@ -25,7 +22,6 @@ Min level: 1 Max level: 3 Weight: 3 -# Animation 4 Name: L1_Recording_128x51 Min butthurt: 0 Max butthurt: 8 @@ -33,7 +29,6 @@ Min level: 1 Max level: 1 Weight: 3 -# Animation 5 Name: L1_Furippa1_128x64 Min butthurt: 0 Max butthurt: 6 @@ -41,7 +36,6 @@ Min level: 1 Max level: 1 Weight: 3 -# Animation 6 Name: L2_Furippa2_128x64 Min butthurt: 0 Max butthurt: 6 @@ -49,10 +43,37 @@ Min level: 2 Max level: 2 Weight: 3 -# Animation 7 Name: L3_Furippa3_128x64 Min butthurt: 0 Max butthurt: 6 Min level: 3 Max level: 3 Weight: 3 + +Name: L1_Read_books_128x64 +Min butthurt: 0 +Max butthurt: 8 +Min level: 1 +Max level: 1 +Weight: 3 + +Name: L2_Hacking_pc_128x64 +Min butthurt: 0 +Max butthurt: 8 +Min level: 2 +Max level: 2 +Weight: 3 + +Name: L1_Cry_128x64 +Min butthurt: 8 +Max butthurt: 13 +Min level: 1 +Max level: 3 +Weight: 3 + +Name: L1_Boxing_128x64 +Min butthurt: 10 +Max butthurt: 13 +Min level: 1 +Max level: 3 +Weight: 3 diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_0.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_0.bm new file mode 100644 index 000000000..46079c372 Binary files /dev/null and b/assets/resources/dolphin/L1_Boxing_128x64/frame_0.bm differ diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_1.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_1.bm new file mode 100644 index 000000000..e12d70796 Binary files /dev/null and b/assets/resources/dolphin/L1_Boxing_128x64/frame_1.bm differ diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_2.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_2.bm new file mode 100644 index 000000000..b416740f2 Binary files /dev/null and b/assets/resources/dolphin/L1_Boxing_128x64/frame_2.bm differ diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_3.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_3.bm new file mode 100644 index 000000000..b7e15ddee Binary files /dev/null and b/assets/resources/dolphin/L1_Boxing_128x64/frame_3.bm differ diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_4.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_4.bm new file mode 100644 index 000000000..202ad6e37 Binary files /dev/null and b/assets/resources/dolphin/L1_Boxing_128x64/frame_4.bm differ diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_5.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_5.bm new file mode 100644 index 000000000..cdc0a2a34 Binary files /dev/null and b/assets/resources/dolphin/L1_Boxing_128x64/frame_5.bm differ diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_6.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_6.bm new file mode 100644 index 000000000..e8ea3aa68 Binary files /dev/null and b/assets/resources/dolphin/L1_Boxing_128x64/frame_6.bm differ diff --git a/assets/resources/dolphin/L1_Boxing_128x64/meta.txt b/assets/resources/dolphin/L1_Boxing_128x64/meta.txt new file mode 100644 index 000000000..c66998e7d --- /dev/null +++ b/assets/resources/dolphin/L1_Boxing_128x64/meta.txt @@ -0,0 +1,32 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 9 +Active frames: 7 +Frames order: 0 1 2 1 3 1 2 3 1 4 5 6 5 6 5 4 +Active cycles: 1 +Frame rate: 2 +Duration: 3600 +Active cooldown: 7 + +Bubble slots: 2 + +Slot: 0 +X: 78 +Y: 16 +Text: F*&K!!! +AlignH: Left +AlignV: Bottom +StartFrame: 2 +EndFrame: 4 + +Slot: 1 +X: 78 +Y: 16 +Text: What ya\nlookin at?! +AlignH: Left +AlignV: Center +StartFrame: 10 +EndFrame: 15 diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_0.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_0.bm new file mode 100644 index 000000000..9147714c1 Binary files /dev/null and b/assets/resources/dolphin/L1_Cry_128x64/frame_0.bm differ diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_1.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_1.bm new file mode 100644 index 000000000..789273d9d Binary files /dev/null and b/assets/resources/dolphin/L1_Cry_128x64/frame_1.bm differ diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_2.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_2.bm new file mode 100644 index 000000000..a3c87e0a6 Binary files /dev/null and b/assets/resources/dolphin/L1_Cry_128x64/frame_2.bm differ diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_3.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_3.bm new file mode 100644 index 000000000..ba3012b7e Binary files /dev/null and b/assets/resources/dolphin/L1_Cry_128x64/frame_3.bm differ diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_4.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_4.bm new file mode 100644 index 000000000..1ce28c7ad Binary files /dev/null and b/assets/resources/dolphin/L1_Cry_128x64/frame_4.bm differ diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_5.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_5.bm new file mode 100644 index 000000000..4cbc49689 Binary files /dev/null and b/assets/resources/dolphin/L1_Cry_128x64/frame_5.bm differ diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_6.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_6.bm new file mode 100644 index 000000000..cba81ef35 Binary files /dev/null and b/assets/resources/dolphin/L1_Cry_128x64/frame_6.bm differ diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_7.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_7.bm new file mode 100644 index 000000000..da28419fd Binary files /dev/null and b/assets/resources/dolphin/L1_Cry_128x64/frame_7.bm differ diff --git a/assets/resources/dolphin/L1_Cry_128x64/meta.txt b/assets/resources/dolphin/L1_Cry_128x64/meta.txt new file mode 100644 index 000000000..1b7d13dd8 --- /dev/null +++ b/assets/resources/dolphin/L1_Cry_128x64/meta.txt @@ -0,0 +1,41 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 8 +Active frames: 4 +Frames order: 0 1 2 3 4 2 3 4 5 6 7 6 +Active cycles: 2 +Frame rate: 2 +Duration: 3600 +Active cooldown: 7 + +Bubble slots: 2 + +Slot: 0 +X: 22 +Y: 40 +Text: I miss you +AlignH: Right +AlignV: Bottom +StartFrame: 9 +EndFrame: 11 + +Slot: 0 +X: 17 +Y: 40 +Text: my friend... +AlignH: Right +AlignV: Bottom +StartFrame: 12 +EndFrame: 15 + +Slot: 1 +X: 2 +Y: 29 +Text: Why are you\nalways away? +AlignH: Right +AlignV: Bottom +StartFrame: 9 +EndFrame: 15 diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_0.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_0.bm new file mode 100644 index 000000000..1169e42d6 Binary files /dev/null and b/assets/resources/dolphin/L1_Read_books_128x64/frame_0.bm differ diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_1.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_1.bm new file mode 100644 index 000000000..80e2f39bb Binary files /dev/null and b/assets/resources/dolphin/L1_Read_books_128x64/frame_1.bm differ diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_2.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_2.bm new file mode 100644 index 000000000..959b02556 Binary files /dev/null and b/assets/resources/dolphin/L1_Read_books_128x64/frame_2.bm differ diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_3.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_3.bm new file mode 100644 index 000000000..8c106d906 Binary files /dev/null and b/assets/resources/dolphin/L1_Read_books_128x64/frame_3.bm differ diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_4.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_4.bm new file mode 100644 index 000000000..389d2a8ef Binary files /dev/null and b/assets/resources/dolphin/L1_Read_books_128x64/frame_4.bm differ diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_5.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_5.bm new file mode 100644 index 000000000..4b65b6d9b Binary files /dev/null and b/assets/resources/dolphin/L1_Read_books_128x64/frame_5.bm differ diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_6.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_6.bm new file mode 100644 index 000000000..451c80a26 Binary files /dev/null and b/assets/resources/dolphin/L1_Read_books_128x64/frame_6.bm differ diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_7.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_7.bm new file mode 100644 index 000000000..417809078 Binary files /dev/null and b/assets/resources/dolphin/L1_Read_books_128x64/frame_7.bm differ diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_8.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_8.bm new file mode 100644 index 000000000..4370393dc Binary files /dev/null and b/assets/resources/dolphin/L1_Read_books_128x64/frame_8.bm differ diff --git a/assets/resources/dolphin/L1_Read_books_128x64/meta.txt b/assets/resources/dolphin/L1_Read_books_128x64/meta.txt new file mode 100644 index 000000000..7432507ce --- /dev/null +++ b/assets/resources/dolphin/L1_Read_books_128x64/meta.txt @@ -0,0 +1,23 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 13 +Active frames: 2 +Frames order: 0 1 0 2 3 3 4 0 1 5 6 1 1 7 8 +Active cycles: 2 +Frame rate: 2 +Duration: 3600 +Active cooldown: 5 + +Bubble slots: 1 + +Slot: 0 +X: 5 +Y: 28 +Text: Predictable twist +AlignH: Right +AlignV: Bottom +StartFrame: 14 +EndFrame: 16 diff --git a/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_0.bm b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_0.bm new file mode 100644 index 000000000..3ff70a916 Binary files /dev/null and b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_0.bm differ diff --git a/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_1.bm b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_1.bm new file mode 100644 index 000000000..ed11583f8 Binary files /dev/null and b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_1.bm differ diff --git a/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_2.bm b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_2.bm new file mode 100644 index 000000000..41850505b Binary files /dev/null and b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_2.bm differ diff --git a/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_3.bm b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_3.bm new file mode 100644 index 000000000..d4b47960a Binary files /dev/null and b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_3.bm differ diff --git a/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_4.bm b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_4.bm new file mode 100644 index 000000000..ee3a5f188 Binary files /dev/null and b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_4.bm differ diff --git a/assets/resources/dolphin/L2_Hacking_pc_128x64/meta.txt b/assets/resources/dolphin/L2_Hacking_pc_128x64/meta.txt new file mode 100644 index 000000000..8ad8d42a3 --- /dev/null +++ b/assets/resources/dolphin/L2_Hacking_pc_128x64/meta.txt @@ -0,0 +1,32 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 3 +Active frames: 2 +Frames order: 0 1 2 3 4 +Active cycles: 4 +Frame rate: 2 +Duration: 3600 +Active cooldown: 7 + +Bubble slots: 1 + +Slot: 0 +X: 22 +Y: 25 +Text: Mess with\nthe best, +AlignH: Right +AlignV: Center +StartFrame: 4 +EndFrame: 7 + +Slot: 0 +X: 31 +Y: 25 +Text: die like\nthe rest. +AlignH: Right +AlignV: Center +StartFrame: 8 +EndFrame: 10 diff --git a/assets/resources/dolphin/manifest.txt b/assets/resources/dolphin/manifest.txt index 8be65c11e..d6e16dd13 100644 --- a/assets/resources/dolphin/manifest.txt +++ b/assets/resources/dolphin/manifest.txt @@ -49,3 +49,31 @@ Max butthurt: 6 Min level: 3 Max level: 3 Weight: 3 + +Name: L1_Read_books_128x64 +Min butthurt: 0 +Max butthurt: 8 +Min level: 1 +Max level: 1 +Weight: 3 + +Name: L2_Hacking_pc_128x64 +Min butthurt: 0 +Max butthurt: 8 +Min level: 2 +Max level: 2 +Weight: 3 + +Name: L1_Cry_128x64 +Min butthurt: 8 +Max butthurt: 13 +Min level: 1 +Max level: 3 +Weight: 3 + +Name: L1_Boxing_128x64 +Min butthurt: 10 +Max butthurt: 13 +Min level: 1 +Max level: 3 +Weight: 3