diff options
author | Albert Kharisov <albkharisov@gmail.com> | 2022-02-10 22:06:45 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-10 22:06:45 +0300 |
commit | 2c616983cf05f6739092f098ddb78e0cde09c40c (patch) | |
tree | 358f5cce0cbc379d036f72e9019c5324fbb11057 | |
parent | 21ac37a6f696da8ec26407d2f025c24825fcfec8 (diff) |
Add animations: box, cry, read, hack (#990)
* Add animations: box, cry, read, hack
* Desktop: unload animation if application is already started
Co-authored-by: あく <alleteam@gmail.com>
69 files changed, 318 insertions, 7 deletions
diff --git a/applications/desktop/scenes/desktop_scene_main.c b/applications/desktop/scenes/desktop_scene_main.c index 8131d0c3..f37ac6c6 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 Binary files differnew file mode 100644 index 00000000..b6b2c75b --- /dev/null +++ b/assets/dolphin/external/L1_Boxing_128x64/frame_0.png diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_1.png b/assets/dolphin/external/L1_Boxing_128x64/frame_1.png Binary files differnew file mode 100644 index 00000000..347d71cc --- /dev/null +++ b/assets/dolphin/external/L1_Boxing_128x64/frame_1.png diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_2.png b/assets/dolphin/external/L1_Boxing_128x64/frame_2.png Binary files differnew file mode 100644 index 00000000..51a7fd23 --- /dev/null +++ b/assets/dolphin/external/L1_Boxing_128x64/frame_2.png diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_3.png b/assets/dolphin/external/L1_Boxing_128x64/frame_3.png Binary files differnew file mode 100644 index 00000000..7004e10c --- /dev/null +++ b/assets/dolphin/external/L1_Boxing_128x64/frame_3.png diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_4.png b/assets/dolphin/external/L1_Boxing_128x64/frame_4.png Binary files differnew file mode 100644 index 00000000..556cb894 --- /dev/null +++ b/assets/dolphin/external/L1_Boxing_128x64/frame_4.png diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_5.png b/assets/dolphin/external/L1_Boxing_128x64/frame_5.png Binary files differnew file mode 100644 index 00000000..fd617034 --- /dev/null +++ b/assets/dolphin/external/L1_Boxing_128x64/frame_5.png diff --git a/assets/dolphin/external/L1_Boxing_128x64/frame_6.png b/assets/dolphin/external/L1_Boxing_128x64/frame_6.png Binary files differnew file mode 100644 index 00000000..34839517 --- /dev/null +++ b/assets/dolphin/external/L1_Boxing_128x64/frame_6.png 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 00000000..c66998e7 --- /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 Binary files differnew file mode 100644 index 00000000..b2636f00 --- /dev/null +++ b/assets/dolphin/external/L1_Cry_128x64/frame_0.png diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_1.png b/assets/dolphin/external/L1_Cry_128x64/frame_1.png Binary files differnew file mode 100644 index 00000000..e73499e9 --- /dev/null +++ b/assets/dolphin/external/L1_Cry_128x64/frame_1.png diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_2.png b/assets/dolphin/external/L1_Cry_128x64/frame_2.png Binary files differnew file mode 100644 index 00000000..16005a99 --- /dev/null +++ b/assets/dolphin/external/L1_Cry_128x64/frame_2.png diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_3.png b/assets/dolphin/external/L1_Cry_128x64/frame_3.png Binary files differnew file mode 100644 index 00000000..02e833de --- /dev/null +++ b/assets/dolphin/external/L1_Cry_128x64/frame_3.png diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_4.png b/assets/dolphin/external/L1_Cry_128x64/frame_4.png Binary files differnew file mode 100644 index 00000000..3f7dff4d --- /dev/null +++ b/assets/dolphin/external/L1_Cry_128x64/frame_4.png diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_5.png b/assets/dolphin/external/L1_Cry_128x64/frame_5.png Binary files differnew file mode 100644 index 00000000..38510678 --- /dev/null +++ b/assets/dolphin/external/L1_Cry_128x64/frame_5.png diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_6.png b/assets/dolphin/external/L1_Cry_128x64/frame_6.png Binary files differnew file mode 100644 index 00000000..7871674d --- /dev/null +++ b/assets/dolphin/external/L1_Cry_128x64/frame_6.png diff --git a/assets/dolphin/external/L1_Cry_128x64/frame_7.png b/assets/dolphin/external/L1_Cry_128x64/frame_7.png Binary files differnew file mode 100644 index 00000000..5865e91e --- /dev/null +++ b/assets/dolphin/external/L1_Cry_128x64/frame_7.png 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 00000000..e96c8d7c --- /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 Binary files differnew file mode 100644 index 00000000..fbf26528 --- /dev/null +++ b/assets/dolphin/external/L1_Read_books_128x64/frame_0.png diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_1.png b/assets/dolphin/external/L1_Read_books_128x64/frame_1.png Binary files differnew file mode 100644 index 00000000..be9c5dc1 --- /dev/null +++ b/assets/dolphin/external/L1_Read_books_128x64/frame_1.png diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_2.png b/assets/dolphin/external/L1_Read_books_128x64/frame_2.png Binary files differnew file mode 100644 index 00000000..eb8075ec --- /dev/null +++ b/assets/dolphin/external/L1_Read_books_128x64/frame_2.png diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_3.png b/assets/dolphin/external/L1_Read_books_128x64/frame_3.png Binary files differnew file mode 100644 index 00000000..0f1fd5c5 --- /dev/null +++ b/assets/dolphin/external/L1_Read_books_128x64/frame_3.png diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_4.png b/assets/dolphin/external/L1_Read_books_128x64/frame_4.png Binary files differnew file mode 100644 index 00000000..dd2d918a --- /dev/null +++ b/assets/dolphin/external/L1_Read_books_128x64/frame_4.png diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_5.png b/assets/dolphin/external/L1_Read_books_128x64/frame_5.png Binary files differnew file mode 100644 index 00000000..bfcc7bcd --- /dev/null +++ b/assets/dolphin/external/L1_Read_books_128x64/frame_5.png diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_6.png b/assets/dolphin/external/L1_Read_books_128x64/frame_6.png Binary files differnew file mode 100644 index 00000000..eabe9def --- /dev/null +++ b/assets/dolphin/external/L1_Read_books_128x64/frame_6.png diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_7.png b/assets/dolphin/external/L1_Read_books_128x64/frame_7.png Binary files differnew file mode 100644 index 00000000..3ff0aee0 --- /dev/null +++ b/assets/dolphin/external/L1_Read_books_128x64/frame_7.png diff --git a/assets/dolphin/external/L1_Read_books_128x64/frame_8.png b/assets/dolphin/external/L1_Read_books_128x64/frame_8.png Binary files differnew file mode 100644 index 00000000..ce663f75 --- /dev/null +++ b/assets/dolphin/external/L1_Read_books_128x64/frame_8.png 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 00000000..7432507c --- /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 Binary files differnew file mode 100644 index 00000000..d303aef0 --- /dev/null +++ b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_0.png diff --git a/assets/dolphin/external/L2_Hacking_pc_128x64/frame_1.png b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_1.png Binary files differnew file mode 100644 index 00000000..45aeb57b --- /dev/null +++ b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_1.png diff --git a/assets/dolphin/external/L2_Hacking_pc_128x64/frame_2.png b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_2.png Binary files differnew file mode 100644 index 00000000..a4508f14 --- /dev/null +++ b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_2.png diff --git a/assets/dolphin/external/L2_Hacking_pc_128x64/frame_3.png b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_3.png Binary files differnew file mode 100644 index 00000000..35000216 --- /dev/null +++ b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_3.png diff --git a/assets/dolphin/external/L2_Hacking_pc_128x64/frame_4.png b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_4.png Binary files differnew file mode 100644 index 00000000..7addbf93 --- /dev/null +++ b/assets/dolphin/external/L2_Hacking_pc_128x64/frame_4.png 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 00000000..8ad8d42a --- /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 d5a8e2a1..d6e16dd1 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 Binary files differnew file mode 100644 index 00000000..46079c37 --- /dev/null +++ b/assets/resources/dolphin/L1_Boxing_128x64/frame_0.bm diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_1.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_1.bm Binary files differnew file mode 100644 index 00000000..e12d7079 --- /dev/null +++ b/assets/resources/dolphin/L1_Boxing_128x64/frame_1.bm diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_2.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_2.bm Binary files differnew file mode 100644 index 00000000..b416740f --- /dev/null +++ b/assets/resources/dolphin/L1_Boxing_128x64/frame_2.bm diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_3.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_3.bm Binary files differnew file mode 100644 index 00000000..b7e15dde --- /dev/null +++ b/assets/resources/dolphin/L1_Boxing_128x64/frame_3.bm diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_4.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_4.bm Binary files differnew file mode 100644 index 00000000..202ad6e3 --- /dev/null +++ b/assets/resources/dolphin/L1_Boxing_128x64/frame_4.bm diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_5.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_5.bm Binary files differnew file mode 100644 index 00000000..cdc0a2a3 --- /dev/null +++ b/assets/resources/dolphin/L1_Boxing_128x64/frame_5.bm diff --git a/assets/resources/dolphin/L1_Boxing_128x64/frame_6.bm b/assets/resources/dolphin/L1_Boxing_128x64/frame_6.bm Binary files differnew file mode 100644 index 00000000..e8ea3aa6 --- /dev/null +++ b/assets/resources/dolphin/L1_Boxing_128x64/frame_6.bm 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 00000000..c66998e7 --- /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 Binary files differnew file mode 100644 index 00000000..9147714c --- /dev/null +++ b/assets/resources/dolphin/L1_Cry_128x64/frame_0.bm diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_1.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_1.bm Binary files differnew file mode 100644 index 00000000..789273d9 --- /dev/null +++ b/assets/resources/dolphin/L1_Cry_128x64/frame_1.bm diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_2.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_2.bm Binary files differnew file mode 100644 index 00000000..a3c87e0a --- /dev/null +++ b/assets/resources/dolphin/L1_Cry_128x64/frame_2.bm diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_3.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_3.bm Binary files differnew file mode 100644 index 00000000..ba3012b7 --- /dev/null +++ b/assets/resources/dolphin/L1_Cry_128x64/frame_3.bm diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_4.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_4.bm Binary files differnew file mode 100644 index 00000000..1ce28c7a --- /dev/null +++ b/assets/resources/dolphin/L1_Cry_128x64/frame_4.bm diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_5.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_5.bm Binary files differnew file mode 100644 index 00000000..4cbc4968 --- /dev/null +++ b/assets/resources/dolphin/L1_Cry_128x64/frame_5.bm diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_6.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_6.bm Binary files differnew file mode 100644 index 00000000..cba81ef3 --- /dev/null +++ b/assets/resources/dolphin/L1_Cry_128x64/frame_6.bm diff --git a/assets/resources/dolphin/L1_Cry_128x64/frame_7.bm b/assets/resources/dolphin/L1_Cry_128x64/frame_7.bm Binary files differnew file mode 100644 index 00000000..da28419f --- /dev/null +++ b/assets/resources/dolphin/L1_Cry_128x64/frame_7.bm 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 00000000..1b7d13dd --- /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 Binary files differnew file mode 100644 index 00000000..1169e42d --- /dev/null +++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_0.bm diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_1.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_1.bm Binary files differnew file mode 100644 index 00000000..80e2f39b --- /dev/null +++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_1.bm diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_2.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_2.bm Binary files differnew file mode 100644 index 00000000..959b0255 --- /dev/null +++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_2.bm diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_3.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_3.bm Binary files differnew file mode 100644 index 00000000..8c106d90 --- /dev/null +++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_3.bm diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_4.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_4.bm Binary files differnew file mode 100644 index 00000000..389d2a8e --- /dev/null +++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_4.bm diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_5.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_5.bm Binary files differnew file mode 100644 index 00000000..4b65b6d9 --- /dev/null +++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_5.bm diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_6.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_6.bm Binary files differnew file mode 100644 index 00000000..451c80a2 --- /dev/null +++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_6.bm diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_7.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_7.bm Binary files differnew file mode 100644 index 00000000..41780907 --- /dev/null +++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_7.bm diff --git a/assets/resources/dolphin/L1_Read_books_128x64/frame_8.bm b/assets/resources/dolphin/L1_Read_books_128x64/frame_8.bm Binary files differnew file mode 100644 index 00000000..4370393d --- /dev/null +++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_8.bm 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 00000000..7432507c --- /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 Binary files differnew file mode 100644 index 00000000..3ff70a91 --- /dev/null +++ b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_0.bm diff --git a/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_1.bm b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_1.bm Binary files differnew file mode 100644 index 00000000..ed11583f --- /dev/null +++ b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_1.bm diff --git a/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_2.bm b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_2.bm Binary files differnew file mode 100644 index 00000000..41850505 --- /dev/null +++ b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_2.bm diff --git a/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_3.bm b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_3.bm Binary files differnew file mode 100644 index 00000000..d4b47960 --- /dev/null +++ b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_3.bm diff --git a/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_4.bm b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_4.bm Binary files differnew file mode 100644 index 00000000..ee3a5f18 --- /dev/null +++ b/assets/resources/dolphin/L2_Hacking_pc_128x64/frame_4.bm 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 00000000..8ad8d42a --- /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 8be65c11..d6e16dd1 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 |