diff --git a/applications/settings/dolphin_passport/passport.c b/applications/settings/dolphin_passport/passport.c index 718c835e2..5c69fccde 100644 --- a/applications/settings/dolphin_passport/passport.c +++ b/applications/settings/dolphin_passport/passport.c @@ -43,18 +43,19 @@ static void render_callback(Canvas* canvas, void* ctx) { DolphinStats* stats = ctx; char level_str[20]; + char xp_str[12]; char mood_str[32]; uint8_t mood = 0; if(stats->butthurt <= 4) { mood = 0; - snprintf(mood_str, 20, "Mood: Wet"); + snprintf(mood_str, 20, "Status: Wet"); } else if(stats->butthurt <= 9) { mood = 1; - snprintf(mood_str, 20, "Mood: Horny"); + snprintf(mood_str, 20, "Status: Horny"); } else { mood = 2; - snprintf(mood_str, 20, "Mood: Desperate"); + snprintf(mood_str, 20, "Status: Desperate"); } uint32_t xp_progress = 0; @@ -89,6 +90,7 @@ static void render_callback(Canvas* canvas, void* ctx) { canvas_draw_str(canvas, 58, 10, my_name ? my_name : "Unknown"); canvas_draw_str(canvas, 58, 22, mood_str); canvas_set_color(canvas, ColorBlack); + canvas_draw_str(canvas, 58, 34, level_str); canvas_set_font(canvas, FontBatteryPercent); canvas_draw_str(canvas, 58, 42, xp_str); diff --git a/assets/dolphin/external/lvl_18/frame_0.png b/assets/dolphin/external/lvl_18/frame_0.png index 2f92a39f5..61ca4e506 100644 Binary files a/assets/dolphin/external/lvl_18/frame_0.png and b/assets/dolphin/external/lvl_18/frame_0.png differ diff --git a/assets/dolphin/external/lvl_18/frame_1.png b/assets/dolphin/external/lvl_18/frame_1.png index bb5e58adc..0ee0b9003 100644 Binary files a/assets/dolphin/external/lvl_18/frame_1.png and b/assets/dolphin/external/lvl_18/frame_1.png differ diff --git a/assets/dolphin/external/lvl_18/frame_10.png b/assets/dolphin/external/lvl_18/frame_10.png index a7974e235..f3abff62e 100644 Binary files a/assets/dolphin/external/lvl_18/frame_10.png and b/assets/dolphin/external/lvl_18/frame_10.png differ diff --git a/assets/dolphin/external/lvl_18/frame_11.png b/assets/dolphin/external/lvl_18/frame_11.png index a1ceb8546..452b2a2c5 100644 Binary files a/assets/dolphin/external/lvl_18/frame_11.png and b/assets/dolphin/external/lvl_18/frame_11.png differ diff --git a/assets/dolphin/external/lvl_18/frame_12.png b/assets/dolphin/external/lvl_18/frame_12.png index c186886e9..b765d2676 100644 Binary files a/assets/dolphin/external/lvl_18/frame_12.png and b/assets/dolphin/external/lvl_18/frame_12.png differ diff --git a/assets/dolphin/external/lvl_18/frame_13.png b/assets/dolphin/external/lvl_18/frame_13.png index b057fd660..823167d61 100644 Binary files a/assets/dolphin/external/lvl_18/frame_13.png and b/assets/dolphin/external/lvl_18/frame_13.png differ diff --git a/assets/dolphin/external/lvl_18/frame_14.png b/assets/dolphin/external/lvl_18/frame_14.png index 3d30d9164..ac66111cb 100644 Binary files a/assets/dolphin/external/lvl_18/frame_14.png and b/assets/dolphin/external/lvl_18/frame_14.png differ diff --git a/assets/dolphin/external/lvl_18/frame_15.png b/assets/dolphin/external/lvl_18/frame_15.png index dcab300d3..722340258 100644 Binary files a/assets/dolphin/external/lvl_18/frame_15.png and b/assets/dolphin/external/lvl_18/frame_15.png differ diff --git a/assets/dolphin/external/lvl_18/frame_16.png b/assets/dolphin/external/lvl_18/frame_16.png index 9dc2eb75e..291a4d63f 100644 Binary files a/assets/dolphin/external/lvl_18/frame_16.png and b/assets/dolphin/external/lvl_18/frame_16.png differ diff --git a/assets/dolphin/external/lvl_18/frame_17.png b/assets/dolphin/external/lvl_18/frame_17.png index 2ebf08ecb..223e40fb2 100644 Binary files a/assets/dolphin/external/lvl_18/frame_17.png and b/assets/dolphin/external/lvl_18/frame_17.png differ diff --git a/assets/dolphin/external/lvl_18/frame_18.png b/assets/dolphin/external/lvl_18/frame_18.png index a0550e40d..df2c058f7 100644 Binary files a/assets/dolphin/external/lvl_18/frame_18.png and b/assets/dolphin/external/lvl_18/frame_18.png differ diff --git a/assets/dolphin/external/lvl_18/frame_19.png b/assets/dolphin/external/lvl_18/frame_19.png index bf1ad6f8a..9cb41b4fb 100644 Binary files a/assets/dolphin/external/lvl_18/frame_19.png and b/assets/dolphin/external/lvl_18/frame_19.png differ diff --git a/assets/dolphin/external/lvl_18/frame_2.png b/assets/dolphin/external/lvl_18/frame_2.png index e30809db0..cc07e2035 100644 Binary files a/assets/dolphin/external/lvl_18/frame_2.png and b/assets/dolphin/external/lvl_18/frame_2.png differ diff --git a/assets/dolphin/external/lvl_18/frame_20.png b/assets/dolphin/external/lvl_18/frame_20.png index af1ac97f8..7c19f2986 100644 Binary files a/assets/dolphin/external/lvl_18/frame_20.png and b/assets/dolphin/external/lvl_18/frame_20.png differ diff --git a/assets/dolphin/external/lvl_18/frame_21.png b/assets/dolphin/external/lvl_18/frame_21.png index 09b704683..93501460f 100644 Binary files a/assets/dolphin/external/lvl_18/frame_21.png and b/assets/dolphin/external/lvl_18/frame_21.png differ diff --git a/assets/dolphin/external/lvl_18/frame_22.png b/assets/dolphin/external/lvl_18/frame_22.png index a7848e33e..558038977 100644 Binary files a/assets/dolphin/external/lvl_18/frame_22.png and b/assets/dolphin/external/lvl_18/frame_22.png differ diff --git a/assets/dolphin/external/lvl_18/frame_3.png b/assets/dolphin/external/lvl_18/frame_3.png index 9f8e82939..c02ea49b8 100644 Binary files a/assets/dolphin/external/lvl_18/frame_3.png and b/assets/dolphin/external/lvl_18/frame_3.png differ diff --git a/assets/dolphin/external/lvl_18/frame_4.png b/assets/dolphin/external/lvl_18/frame_4.png index 395494c5d..29cd05fc1 100644 Binary files a/assets/dolphin/external/lvl_18/frame_4.png and b/assets/dolphin/external/lvl_18/frame_4.png differ diff --git a/assets/dolphin/external/lvl_18/frame_5.png b/assets/dolphin/external/lvl_18/frame_5.png index 282630e62..d3988cc9f 100644 Binary files a/assets/dolphin/external/lvl_18/frame_5.png and b/assets/dolphin/external/lvl_18/frame_5.png differ diff --git a/assets/dolphin/external/lvl_18/frame_6.png b/assets/dolphin/external/lvl_18/frame_6.png index 3d1f8bc8e..0df749b32 100644 Binary files a/assets/dolphin/external/lvl_18/frame_6.png and b/assets/dolphin/external/lvl_18/frame_6.png differ diff --git a/assets/dolphin/external/lvl_18/frame_7.png b/assets/dolphin/external/lvl_18/frame_7.png index 719c400d8..af6616d6a 100644 Binary files a/assets/dolphin/external/lvl_18/frame_7.png and b/assets/dolphin/external/lvl_18/frame_7.png differ diff --git a/assets/dolphin/external/lvl_18/frame_8.png b/assets/dolphin/external/lvl_18/frame_8.png index d6d849fb7..53dadfe9d 100644 Binary files a/assets/dolphin/external/lvl_18/frame_8.png and b/assets/dolphin/external/lvl_18/frame_8.png differ diff --git a/assets/dolphin/external/lvl_18/frame_9.png b/assets/dolphin/external/lvl_18/frame_9.png index ebc710c59..3f84f340b 100644 Binary files a/assets/dolphin/external/lvl_18/frame_9.png and b/assets/dolphin/external/lvl_18/frame_9.png differ diff --git a/assets/icons/BLE/BLE_Pairing_128x64.png b/assets/icons/BLE/BLE_Pairing_128x64.png index 34068c300..f60598005 100644 Binary files a/assets/icons/BLE/BLE_Pairing_128x64.png and b/assets/icons/BLE/BLE_Pairing_128x64.png differ diff --git a/assets/icons/Infrared/DolphinReadingSuccess_59x63.png b/assets/icons/Infrared/DolphinReadingSuccess_59x63.png index 46f559f65..93a7ad79c 100644 Binary files a/assets/icons/Infrared/DolphinReadingSuccess_59x63.png and b/assets/icons/Infrared/DolphinReadingSuccess_59x63.png differ diff --git a/assets/icons/Interface/WarningDolphin_45x42.png b/assets/icons/Interface/WarningDolphin_45x42.png index d766ffbb4..db225de36 100644 Binary files a/assets/icons/Interface/WarningDolphin_45x42.png and b/assets/icons/Interface/WarningDolphin_45x42.png differ diff --git a/assets/icons/iButton/DolphinNice_96x59.png b/assets/icons/iButton/DolphinNice_96x59.png index b111196c7..43cc58bd9 100644 Binary files a/assets/icons/iButton/DolphinNice_96x59.png and b/assets/icons/iButton/DolphinNice_96x59.png differ diff --git a/assets/icons/iButton/DolphinWait_61x59.png b/assets/icons/iButton/DolphinWait_61x59.png index bb0c38400..4beec55ef 100644 Binary files a/assets/icons/iButton/DolphinWait_61x59.png and b/assets/icons/iButton/DolphinWait_61x59.png differ diff --git a/assets/icons/iButton/iButtonDolphinVerySuccess_108x52.png b/assets/icons/iButton/iButtonDolphinVerySuccess_108x52.png index 2b4bec7c6..90b589ff8 100644 Binary files a/assets/icons/iButton/iButtonDolphinVerySuccess_108x52.png and b/assets/icons/iButton/iButtonDolphinVerySuccess_108x52.png differ diff --git a/assets/resources/dolphin/lvl_18/frame_0.bm b/assets/resources/dolphin/lvl_18/frame_0.bm index 90a0c83fc..da436e764 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_0.bm and b/assets/resources/dolphin/lvl_18/frame_0.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_1.bm b/assets/resources/dolphin/lvl_18/frame_1.bm index 32d65ac9c..d01a8c865 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_1.bm and b/assets/resources/dolphin/lvl_18/frame_1.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_10.bm b/assets/resources/dolphin/lvl_18/frame_10.bm index b4f6e09c7..f44d5d5cf 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_10.bm and b/assets/resources/dolphin/lvl_18/frame_10.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_11.bm b/assets/resources/dolphin/lvl_18/frame_11.bm index 6739b8b00..42ddad578 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_11.bm and b/assets/resources/dolphin/lvl_18/frame_11.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_12.bm b/assets/resources/dolphin/lvl_18/frame_12.bm index 269511b93..068568ecf 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_12.bm and b/assets/resources/dolphin/lvl_18/frame_12.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_13.bm b/assets/resources/dolphin/lvl_18/frame_13.bm index 963a0f0bb..61cb6f179 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_13.bm and b/assets/resources/dolphin/lvl_18/frame_13.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_14.bm b/assets/resources/dolphin/lvl_18/frame_14.bm new file mode 100644 index 000000000..f35bea493 Binary files /dev/null and b/assets/resources/dolphin/lvl_18/frame_14.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_15.bm b/assets/resources/dolphin/lvl_18/frame_15.bm new file mode 100644 index 000000000..b28b49b1e Binary files /dev/null and b/assets/resources/dolphin/lvl_18/frame_15.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_16.bm b/assets/resources/dolphin/lvl_18/frame_16.bm new file mode 100644 index 000000000..41e0ca952 Binary files /dev/null and b/assets/resources/dolphin/lvl_18/frame_16.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_17.bm b/assets/resources/dolphin/lvl_18/frame_17.bm new file mode 100644 index 000000000..bcc7cb4f8 Binary files /dev/null and b/assets/resources/dolphin/lvl_18/frame_17.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_18.bm b/assets/resources/dolphin/lvl_18/frame_18.bm new file mode 100644 index 000000000..d9c18f6f9 Binary files /dev/null and b/assets/resources/dolphin/lvl_18/frame_18.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_19.bm b/assets/resources/dolphin/lvl_18/frame_19.bm new file mode 100644 index 000000000..e16387166 Binary files /dev/null and b/assets/resources/dolphin/lvl_18/frame_19.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_2.bm b/assets/resources/dolphin/lvl_18/frame_2.bm index 3d40185b0..91cadbb2e 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_2.bm and b/assets/resources/dolphin/lvl_18/frame_2.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_20.bm b/assets/resources/dolphin/lvl_18/frame_20.bm new file mode 100644 index 000000000..b81ae2e3b Binary files /dev/null and b/assets/resources/dolphin/lvl_18/frame_20.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_21.bm b/assets/resources/dolphin/lvl_18/frame_21.bm new file mode 100644 index 000000000..b2f727741 Binary files /dev/null and b/assets/resources/dolphin/lvl_18/frame_21.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_22.bm b/assets/resources/dolphin/lvl_18/frame_22.bm new file mode 100644 index 000000000..4bf3d1b03 Binary files /dev/null and b/assets/resources/dolphin/lvl_18/frame_22.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_3.bm b/assets/resources/dolphin/lvl_18/frame_3.bm index 94f5ba977..06d350b13 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_3.bm and b/assets/resources/dolphin/lvl_18/frame_3.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_4.bm b/assets/resources/dolphin/lvl_18/frame_4.bm index 291eea87f..2777746a5 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_4.bm and b/assets/resources/dolphin/lvl_18/frame_4.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_5.bm b/assets/resources/dolphin/lvl_18/frame_5.bm index 614a908ee..4a3acc77b 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_5.bm and b/assets/resources/dolphin/lvl_18/frame_5.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_6.bm b/assets/resources/dolphin/lvl_18/frame_6.bm index 6df50f8e3..cda9776ee 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_6.bm and b/assets/resources/dolphin/lvl_18/frame_6.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_7.bm b/assets/resources/dolphin/lvl_18/frame_7.bm index d227812e9..ea6a65fbd 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_7.bm and b/assets/resources/dolphin/lvl_18/frame_7.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_8.bm b/assets/resources/dolphin/lvl_18/frame_8.bm index 17021f00b..1aca68ca0 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_8.bm and b/assets/resources/dolphin/lvl_18/frame_8.bm differ diff --git a/assets/resources/dolphin/lvl_18/frame_9.bm b/assets/resources/dolphin/lvl_18/frame_9.bm index aeca3a6fb..79c46075e 100644 Binary files a/assets/resources/dolphin/lvl_18/frame_9.bm and b/assets/resources/dolphin/lvl_18/frame_9.bm differ diff --git a/assets/resources/dolphin/lvl_18/meta.txt b/assets/resources/dolphin/lvl_18/meta.txt index 6f051aa7b..22801094f 100644 --- a/assets/resources/dolphin/lvl_18/meta.txt +++ b/assets/resources/dolphin/lvl_18/meta.txt @@ -3,9 +3,9 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 14 +Passive frames: 23 Active frames: 0 -Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 +Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 Active cycles: 0 Frame rate: 6 Duration: 3600 diff --git a/assets/resources/dolphin/lvl_19/frame_0.bm b/assets/resources/dolphin/lvl_19/frame_0.bm index ecec4cd1b..e2cd387e7 100644 Binary files a/assets/resources/dolphin/lvl_19/frame_0.bm and b/assets/resources/dolphin/lvl_19/frame_0.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_1.bm b/assets/resources/dolphin/lvl_19/frame_1.bm index 0003fb4fc..ca4fae060 100644 Binary files a/assets/resources/dolphin/lvl_19/frame_1.bm and b/assets/resources/dolphin/lvl_19/frame_1.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_10.bm b/assets/resources/dolphin/lvl_19/frame_10.bm new file mode 100644 index 000000000..57997cf46 Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_10.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_11.bm b/assets/resources/dolphin/lvl_19/frame_11.bm new file mode 100644 index 000000000..e83fd0f17 Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_11.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_12.bm b/assets/resources/dolphin/lvl_19/frame_12.bm new file mode 100644 index 000000000..71f550ac1 Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_12.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_13.bm b/assets/resources/dolphin/lvl_19/frame_13.bm new file mode 100644 index 000000000..7571319ec Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_13.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_14.bm b/assets/resources/dolphin/lvl_19/frame_14.bm new file mode 100644 index 000000000..08a11ff3a Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_14.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_15.bm b/assets/resources/dolphin/lvl_19/frame_15.bm new file mode 100644 index 000000000..e8ea8497a Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_15.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_16.bm b/assets/resources/dolphin/lvl_19/frame_16.bm new file mode 100644 index 000000000..9d41e53d7 Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_16.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_17.bm b/assets/resources/dolphin/lvl_19/frame_17.bm new file mode 100644 index 000000000..bedd5d5f0 Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_17.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_18.bm b/assets/resources/dolphin/lvl_19/frame_18.bm new file mode 100644 index 000000000..1842a9a2d Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_18.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_19.bm b/assets/resources/dolphin/lvl_19/frame_19.bm new file mode 100644 index 000000000..8e0efbc79 Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_19.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_2.bm b/assets/resources/dolphin/lvl_19/frame_2.bm index 09f6598f9..b3d7ccd71 100644 Binary files a/assets/resources/dolphin/lvl_19/frame_2.bm and b/assets/resources/dolphin/lvl_19/frame_2.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_20.bm b/assets/resources/dolphin/lvl_19/frame_20.bm new file mode 100644 index 000000000..4570e17e7 Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_20.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_21.bm b/assets/resources/dolphin/lvl_19/frame_21.bm new file mode 100644 index 000000000..c1e56f0d4 Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_21.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_3.bm b/assets/resources/dolphin/lvl_19/frame_3.bm index 6fcc546bc..d2b19b320 100644 Binary files a/assets/resources/dolphin/lvl_19/frame_3.bm and b/assets/resources/dolphin/lvl_19/frame_3.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_4.bm b/assets/resources/dolphin/lvl_19/frame_4.bm index d93025037..15e403371 100644 Binary files a/assets/resources/dolphin/lvl_19/frame_4.bm and b/assets/resources/dolphin/lvl_19/frame_4.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_5.bm b/assets/resources/dolphin/lvl_19/frame_5.bm index c7f270ac2..7cb596161 100644 Binary files a/assets/resources/dolphin/lvl_19/frame_5.bm and b/assets/resources/dolphin/lvl_19/frame_5.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_6.bm b/assets/resources/dolphin/lvl_19/frame_6.bm new file mode 100644 index 000000000..130e81ee1 Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_6.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_7.bm b/assets/resources/dolphin/lvl_19/frame_7.bm new file mode 100644 index 000000000..7c32b8531 Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_7.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_8.bm b/assets/resources/dolphin/lvl_19/frame_8.bm new file mode 100644 index 000000000..8310e2364 Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_8.bm differ diff --git a/assets/resources/dolphin/lvl_19/frame_9.bm b/assets/resources/dolphin/lvl_19/frame_9.bm new file mode 100644 index 000000000..65a11c2d2 Binary files /dev/null and b/assets/resources/dolphin/lvl_19/frame_9.bm differ diff --git a/assets/resources/dolphin/lvl_19/meta.txt b/assets/resources/dolphin/lvl_19/meta.txt index d9d683102..246dfa2b1 100644 --- a/assets/resources/dolphin/lvl_19/meta.txt +++ b/assets/resources/dolphin/lvl_19/meta.txt @@ -3,9 +3,9 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 6 +Passive frames: 22 Active frames: 0 -Frames order: 0 1 2 3 4 5 +Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 Active cycles: 0 Frame rate: 6 Duration: 3600 diff --git a/assets/resources/dolphin/lvl_26/frame_0.bm b/assets/resources/dolphin/lvl_26/frame_0.bm index acfba17cc..a23e91870 100644 Binary files a/assets/resources/dolphin/lvl_26/frame_0.bm and b/assets/resources/dolphin/lvl_26/frame_0.bm differ diff --git a/assets/resources/dolphin/lvl_26/frame_1.bm b/assets/resources/dolphin/lvl_26/frame_1.bm index ea1e4a96f..ee2cae7be 100644 Binary files a/assets/resources/dolphin/lvl_26/frame_1.bm and b/assets/resources/dolphin/lvl_26/frame_1.bm differ diff --git a/assets/resources/dolphin/lvl_26/frame_10.bm b/assets/resources/dolphin/lvl_26/frame_10.bm new file mode 100644 index 000000000..88db1f495 Binary files /dev/null and b/assets/resources/dolphin/lvl_26/frame_10.bm differ diff --git a/assets/resources/dolphin/lvl_26/frame_11.bm b/assets/resources/dolphin/lvl_26/frame_11.bm new file mode 100644 index 000000000..3b4742fd2 Binary files /dev/null and b/assets/resources/dolphin/lvl_26/frame_11.bm differ diff --git a/assets/resources/dolphin/lvl_26/frame_2.bm b/assets/resources/dolphin/lvl_26/frame_2.bm index f1232bee4..b3204f2e9 100644 Binary files a/assets/resources/dolphin/lvl_26/frame_2.bm and b/assets/resources/dolphin/lvl_26/frame_2.bm differ diff --git a/assets/resources/dolphin/lvl_26/frame_3.bm b/assets/resources/dolphin/lvl_26/frame_3.bm index 897fc29b5..9db151ab9 100644 Binary files a/assets/resources/dolphin/lvl_26/frame_3.bm and b/assets/resources/dolphin/lvl_26/frame_3.bm differ diff --git a/assets/resources/dolphin/lvl_26/frame_4.bm b/assets/resources/dolphin/lvl_26/frame_4.bm index a97914922..2d0ce5afc 100644 Binary files a/assets/resources/dolphin/lvl_26/frame_4.bm and b/assets/resources/dolphin/lvl_26/frame_4.bm differ diff --git a/assets/resources/dolphin/lvl_26/frame_5.bm b/assets/resources/dolphin/lvl_26/frame_5.bm index d40c2b1ea..7ab2ed4cc 100644 Binary files a/assets/resources/dolphin/lvl_26/frame_5.bm and b/assets/resources/dolphin/lvl_26/frame_5.bm differ diff --git a/assets/resources/dolphin/lvl_26/frame_6.bm b/assets/resources/dolphin/lvl_26/frame_6.bm new file mode 100644 index 000000000..cb5a3b13f Binary files /dev/null and b/assets/resources/dolphin/lvl_26/frame_6.bm differ diff --git a/assets/resources/dolphin/lvl_26/frame_7.bm b/assets/resources/dolphin/lvl_26/frame_7.bm new file mode 100644 index 000000000..ae79e608a Binary files /dev/null and b/assets/resources/dolphin/lvl_26/frame_7.bm differ diff --git a/assets/resources/dolphin/lvl_26/frame_8.bm b/assets/resources/dolphin/lvl_26/frame_8.bm new file mode 100644 index 000000000..ab70403af Binary files /dev/null and b/assets/resources/dolphin/lvl_26/frame_8.bm differ diff --git a/assets/resources/dolphin/lvl_26/frame_9.bm b/assets/resources/dolphin/lvl_26/frame_9.bm new file mode 100644 index 000000000..1462a4a4e Binary files /dev/null and b/assets/resources/dolphin/lvl_26/frame_9.bm differ diff --git a/assets/resources/dolphin/lvl_26/meta.txt b/assets/resources/dolphin/lvl_26/meta.txt index d9d683102..4660b7b7a 100644 --- a/assets/resources/dolphin/lvl_26/meta.txt +++ b/assets/resources/dolphin/lvl_26/meta.txt @@ -3,9 +3,9 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 6 +Passive frames: 12 Active frames: 0 -Frames order: 0 1 2 3 4 5 +Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 Active cycles: 0 Frame rate: 6 Duration: 3600 diff --git a/assets/resources/dolphin/lvl_27/frame_0.bm b/assets/resources/dolphin/lvl_27/frame_0.bm index be9d73f2f..5af232206 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_0.bm and b/assets/resources/dolphin/lvl_27/frame_0.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_1.bm b/assets/resources/dolphin/lvl_27/frame_1.bm index e91e1a06f..cb7f3e080 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_1.bm and b/assets/resources/dolphin/lvl_27/frame_1.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_10.bm b/assets/resources/dolphin/lvl_27/frame_10.bm index c2968e6e5..1c49b277b 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_10.bm and b/assets/resources/dolphin/lvl_27/frame_10.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_11.bm b/assets/resources/dolphin/lvl_27/frame_11.bm index 613920514..c0fe14243 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_11.bm and b/assets/resources/dolphin/lvl_27/frame_11.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_12.bm b/assets/resources/dolphin/lvl_27/frame_12.bm index 3ca4c1e03..b95ffee9b 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_12.bm and b/assets/resources/dolphin/lvl_27/frame_12.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_13.bm b/assets/resources/dolphin/lvl_27/frame_13.bm index 9228ea661..845cec029 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_13.bm and b/assets/resources/dolphin/lvl_27/frame_13.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_14.bm b/assets/resources/dolphin/lvl_27/frame_14.bm index 7bd21c37b..a41b9be45 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_14.bm and b/assets/resources/dolphin/lvl_27/frame_14.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_15.bm b/assets/resources/dolphin/lvl_27/frame_15.bm index 4fd0fc5ae..27a319a94 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_15.bm and b/assets/resources/dolphin/lvl_27/frame_15.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_16.bm b/assets/resources/dolphin/lvl_27/frame_16.bm index b1bea83d5..b79c62204 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_16.bm and b/assets/resources/dolphin/lvl_27/frame_16.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_17.bm b/assets/resources/dolphin/lvl_27/frame_17.bm index 7bd21c37b..74970d537 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_17.bm and b/assets/resources/dolphin/lvl_27/frame_17.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_18.bm b/assets/resources/dolphin/lvl_27/frame_18.bm index 9228ea661..0ef5d1374 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_18.bm and b/assets/resources/dolphin/lvl_27/frame_18.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_19.bm b/assets/resources/dolphin/lvl_27/frame_19.bm index 3ca4c1e03..1cf2a31b2 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_19.bm and b/assets/resources/dolphin/lvl_27/frame_19.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_2.bm b/assets/resources/dolphin/lvl_27/frame_2.bm index 15853c597..cdde1b49d 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_2.bm and b/assets/resources/dolphin/lvl_27/frame_2.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_20.bm b/assets/resources/dolphin/lvl_27/frame_20.bm index 613920514..f2a6069e5 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_20.bm and b/assets/resources/dolphin/lvl_27/frame_20.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_21.bm b/assets/resources/dolphin/lvl_27/frame_21.bm index c2968e6e5..e62a5f863 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_21.bm and b/assets/resources/dolphin/lvl_27/frame_21.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_3.bm b/assets/resources/dolphin/lvl_27/frame_3.bm index 9ee0fb052..e92c159d7 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_3.bm and b/assets/resources/dolphin/lvl_27/frame_3.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_4.bm b/assets/resources/dolphin/lvl_27/frame_4.bm index 527f8128b..288bc8de0 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_4.bm and b/assets/resources/dolphin/lvl_27/frame_4.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_5.bm b/assets/resources/dolphin/lvl_27/frame_5.bm index ff8754c59..fd6ae7a9b 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_5.bm and b/assets/resources/dolphin/lvl_27/frame_5.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_6.bm b/assets/resources/dolphin/lvl_27/frame_6.bm index 09ef56feb..9989aee9e 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_6.bm and b/assets/resources/dolphin/lvl_27/frame_6.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_7.bm b/assets/resources/dolphin/lvl_27/frame_7.bm index 7853397a7..c5dc8b545 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_7.bm and b/assets/resources/dolphin/lvl_27/frame_7.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_8.bm b/assets/resources/dolphin/lvl_27/frame_8.bm index 7b8845d86..83d04e6a2 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_8.bm and b/assets/resources/dolphin/lvl_27/frame_8.bm differ diff --git a/assets/resources/dolphin/lvl_27/frame_9.bm b/assets/resources/dolphin/lvl_27/frame_9.bm index 5a43344a5..3e861d000 100644 Binary files a/assets/resources/dolphin/lvl_27/frame_9.bm and b/assets/resources/dolphin/lvl_27/frame_9.bm differ diff --git a/assets/resources/dolphin/lvl_27/meta.txt b/assets/resources/dolphin/lvl_27/meta.txt index ce2a47854..246dfa2b1 100644 --- a/assets/resources/dolphin/lvl_27/meta.txt +++ b/assets/resources/dolphin/lvl_27/meta.txt @@ -3,9 +3,9 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 31 +Passive frames: 22 Active frames: 0 -Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 +Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 Active cycles: 0 Frame rate: 6 Duration: 3600 diff --git a/assets/resources/dolphin/lvl_30/frame_0.bm b/assets/resources/dolphin/lvl_30/frame_0.bm new file mode 100644 index 000000000..3109d43de Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_0.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_1.bm b/assets/resources/dolphin/lvl_30/frame_1.bm new file mode 100644 index 000000000..1e3a44aab Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_1.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_10.bm b/assets/resources/dolphin/lvl_30/frame_10.bm new file mode 100644 index 000000000..03fd1a144 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_10.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_11.bm b/assets/resources/dolphin/lvl_30/frame_11.bm new file mode 100644 index 000000000..0a59c130e Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_11.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_12.bm b/assets/resources/dolphin/lvl_30/frame_12.bm new file mode 100644 index 000000000..caf494918 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_12.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_13.bm b/assets/resources/dolphin/lvl_30/frame_13.bm new file mode 100644 index 000000000..8a4f56e5a Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_13.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_14.bm b/assets/resources/dolphin/lvl_30/frame_14.bm new file mode 100644 index 000000000..f0cd22ab6 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_14.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_15.bm b/assets/resources/dolphin/lvl_30/frame_15.bm new file mode 100644 index 000000000..fc314e0f9 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_15.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_16.bm b/assets/resources/dolphin/lvl_30/frame_16.bm new file mode 100644 index 000000000..4359f2252 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_16.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_17.bm b/assets/resources/dolphin/lvl_30/frame_17.bm new file mode 100644 index 000000000..1143d1abe Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_17.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_18.bm b/assets/resources/dolphin/lvl_30/frame_18.bm new file mode 100644 index 000000000..978d7f51a Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_18.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_19.bm b/assets/resources/dolphin/lvl_30/frame_19.bm new file mode 100644 index 000000000..872db664e Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_19.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_2.bm b/assets/resources/dolphin/lvl_30/frame_2.bm new file mode 100644 index 000000000..b0072d676 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_2.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_20.bm b/assets/resources/dolphin/lvl_30/frame_20.bm new file mode 100644 index 000000000..4a5b4f405 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_20.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_21.bm b/assets/resources/dolphin/lvl_30/frame_21.bm new file mode 100644 index 000000000..36273a703 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_21.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_22.bm b/assets/resources/dolphin/lvl_30/frame_22.bm new file mode 100644 index 000000000..1601e7038 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_22.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_23.bm b/assets/resources/dolphin/lvl_30/frame_23.bm new file mode 100644 index 000000000..7ed81472c Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_23.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_24.bm b/assets/resources/dolphin/lvl_30/frame_24.bm new file mode 100644 index 000000000..773968f18 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_24.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_25.bm b/assets/resources/dolphin/lvl_30/frame_25.bm new file mode 100644 index 000000000..f64968d6b Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_25.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_3.bm b/assets/resources/dolphin/lvl_30/frame_3.bm new file mode 100644 index 000000000..8f520b689 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_3.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_4.bm b/assets/resources/dolphin/lvl_30/frame_4.bm new file mode 100644 index 000000000..3263d334c Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_4.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_5.bm b/assets/resources/dolphin/lvl_30/frame_5.bm new file mode 100644 index 000000000..2bd383402 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_5.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_6.bm b/assets/resources/dolphin/lvl_30/frame_6.bm new file mode 100644 index 000000000..fc4636f2c Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_6.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_7.bm b/assets/resources/dolphin/lvl_30/frame_7.bm new file mode 100644 index 000000000..e5306118d Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_7.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_8.bm b/assets/resources/dolphin/lvl_30/frame_8.bm new file mode 100644 index 000000000..17ffedff0 Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_8.bm differ diff --git a/assets/resources/dolphin/lvl_30/frame_9.bm b/assets/resources/dolphin/lvl_30/frame_9.bm new file mode 100644 index 000000000..e4565a33e Binary files /dev/null and b/assets/resources/dolphin/lvl_30/frame_9.bm differ diff --git a/assets/resources/dolphin/lvl_30/meta.txt b/assets/resources/dolphin/lvl_30/meta.txt new file mode 100644 index 000000000..ffe29c9ca --- /dev/null +++ b/assets/resources/dolphin/lvl_30/meta.txt @@ -0,0 +1,14 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 26 +Active frames: 0 +Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 +Active cycles: 0 +Frame rate: 6 +Duration: 3600 +Active cooldown: 0 + +Bubble slots: 0 diff --git a/assets/resources/dolphin/manifest.txt b/assets/resources/dolphin/manifest.txt index 423ca105e..81f653338 100644 --- a/assets/resources/dolphin/manifest.txt +++ b/assets/resources/dolphin/manifest.txt @@ -57,7 +57,14 @@ Min level: 1 Max level: 30 Weight: 7 -Name: lvl_14 +Name: lvl_18 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_19 Min butthurt: 0 Max butthurt: 14 Min level: 1 @@ -105,3 +112,24 @@ Max butthurt: 14 Min level: 1 Max level: 30 Weight: 7 + +Name: lvl_26 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_27 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_30 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 7