Play only basic good animations (#872)

* New Basic Animations
* Keep only basic calm animations

Co-authored-by: あく <alleteam@gmail.com>

applications/desktop/helpers/desktop_animation.c

@@ -11,6 +11,8 @@
 #include <desktop/desktop.h>
 #include <dolphin/dolphin.h>
 
+#define KEEP_ONLY_CALM_BASIC_ANIMATIONS 1
+
 LIST_DEF(AnimationList, const PairedAnimation*, M_PTR_OPLIST)
 #define M_OPL_AnimationList_t() LIST_OPLIST(AnimationList)
 
@@ -81,14 +83,16 @@ void desktop_start_new_idle_animation(DesktopAnimation* animation) {
     furi_record_close("dolphin");
 
     furi_assert((stats.level >= 1) && (stats.level <= 3));
-    uint8_t level = stats.level;
 
     AnimationList_t animation_list;
     AnimationList_init(animation_list);
 
-    PUSH_BACK_ANIMATIONS(animation_list, mad_animation, stats.butthurt);
+#if KEEP_ONLY_CALM_BASIC_ANIMATIONS
+    PUSH_BACK_ANIMATIONS(animation_list, calm_animation, 0);
+#else
     PUSH_BACK_ANIMATIONS(animation_list, calm_animation, stats.butthurt);
-    switch(level) {
+    PUSH_BACK_ANIMATIONS(animation_list, mad_animation, stats.butthurt);
+    switch(stats.level) {
     case 1:
         PUSH_BACK_ANIMATIONS(animation_list, level_1_animation, stats.butthurt);
         break;
@@ -119,6 +123,7 @@ void desktop_start_new_idle_animation(DesktopAnimation* animation) {
         animation->sd_shown_error_card_bad = false;
         animation->sd_shown_error_db = false;
     }
+#endif
 
     uint32_t whole_weight = 0;
     for

applications/desktop/helpers/desktop_animation_i.h

@@ -6,9 +6,9 @@
 
 // Calm/Mad Basic Idle Animations
 
-#define COMMON_BASIC_DURATION (60 * 60)
-#define COMMON_ACTIVE_CYCLES 7
-#define COMMON_ACTIVE_COOLDOWN 30
+#define COMMON_BASIC_DURATION (2 * 60 * 60)
+#define COMMON_ACTIVE_CYCLES 1
+#define COMMON_ACTIVE_COOLDOWN 15
 #define COMMON_WEIGHT 3
 
 #define BUTTHURT_LEVEL(x) (1UL << (x))
@@ -18,7 +18,7 @@
 #define COMMON_ACTIVE_DURATION(x) ((x)*COMMON_ACTIVE_CYCLES / 2)
 
 static const BasicAnimation animation_TV = {
-    .icon = &A_TV_128x51,
+    .icon = &A_Tv_128x52,
     .duration = COMMON_BASIC_DURATION,
     .weight = COMMON_WEIGHT,
     .active_cooldown = COMMON_ACTIVE_COOLDOWN,
@@ -27,12 +27,12 @@ static const BasicAnimation animation_TV = {
                            BUTTHURT_LEVEL(6) | BUTTHURT_LEVEL(7)};
 
 static const ActiveAnimation animation_TV_active = {
-    .icon = &A_TVActive_128x51,
-    .duration = COMMON_ACTIVE_DURATION(2),
+    .icon = &A_TvActive_128x52,
+    .duration = COMMON_ACTIVE_DURATION(6),
 };
 
 static const BasicAnimation animation_sleep = {
-    .icon = &A_Sleep_128x51,
+    .icon = &A_Sleep_128x52,
     .black_status_bar = true,
     .duration = COMMON_BASIC_DURATION,
     .weight = COMMON_WEIGHT,
@@ -43,9 +43,9 @@ static const BasicAnimation animation_sleep = {
                            BUTTHURT_LEVEL(9) | BUTTHURT_LEVEL(10)};
 
 static const ActiveAnimation animation_sleep_active = {
-    .icon = &A_SleepActive_128x51,
+    .icon = &A_SleepActive_128x52,
     .black_status_bar = true,
-    .duration = COMMON_ACTIVE_DURATION(2),
+    .duration = COMMON_ACTIVE_DURATION(5),
 };
 
 static const BasicAnimation animation_leaving = {
@@ -62,7 +62,7 @@ static const ActiveAnimation animation_leaving_active = {
 };
 
 static const BasicAnimation animation_laptop = {
-    .icon = &A_Laptop_128x51,
+    .icon = &A_Laptop_128x52,
     .duration = COMMON_BASIC_DURATION,
     .weight = COMMON_WEIGHT,
     .active_cooldown = COMMON_ACTIVE_COOLDOWN,
@@ -70,8 +70,8 @@ static const BasicAnimation animation_laptop = {
                            BUTTHURT_LEVEL(3) | BUTTHURT_LEVEL(4) | BUTTHURT_LEVEL(5)};
 
 static const ActiveAnimation animation_laptop_active = {
-    .icon = &A_LaptopActive_128x51,
-    .duration = COMMON_ACTIVE_DURATION(2),
+    .icon = &A_LaptopActive_128x52,
+    .duration = COMMON_ACTIVE_DURATION(8),
 };
 
 static const BasicAnimation animation_knife = {
@@ -118,15 +118,15 @@ static const ActiveAnimation animation_box_active = {
 };
 
 static const BasicAnimation animation_waves = {
-    .icon = &A_Waves_128x51,
+    .icon = &A_Waves_128x52,
     .duration = COMMON_BASIC_DURATION,
     .weight = COMMON_WEIGHT,
     .active_cooldown = COMMON_ACTIVE_COOLDOWN,
     .butthurt_level_mask = BUTTHURT_LEVEL(0) | BUTTHURT_LEVEL(1) | BUTTHURT_LEVEL(2)};
 
 static const ActiveAnimation animation_waves_active = {
-    .icon = &A_WavesActive_128x51,
-    .duration = COMMON_ACTIVE_DURATION(2),
+    .icon = &A_WavesActive_128x52,
+    .duration = COMMON_ACTIVE_DURATION(7),
 };
 
 // Level Idle Animations

assets/compiled/assets_icons.h

@@ -14,8 +14,8 @@ extern const Icon A_CryActive_128x51;
 extern const Icon A_Cry_128x51;
 extern const Icon A_KnifeActive_128x51;
 extern const Icon A_Knife_128x51;
-extern const Icon A_LaptopActive_128x51;
-extern const Icon A_Laptop_128x51;
+extern const Icon A_LaptopActive_128x52;
+extern const Icon A_Laptop_128x52;
 extern const Icon A_LeavingActive_128x51;
 extern const Icon A_Leaving_128x51;
 extern const Icon A_Level1FurippaActive_128x51;
@@ -36,101 +36,101 @@ extern const Icon A_Level3HijackActive_128x51;
 extern const Icon A_Level3Hijack_128x51;
 extern const Icon A_Level3LabActive_128x51;
 extern const Icon A_Level3Lab_128x51;
+extern const Icon I_LevelUp2_04;
 extern const Icon I_LevelUp2_03;
-extern const Icon I_LevelUp2_02;
+extern const Icon I_LevelUp2_07;
 extern const Icon I_LevelUp2_05;
-extern const Icon I_LevelUp2_04;
-extern const Icon I_LevelUp2_01;
+extern const Icon I_LevelUp2_02;
 extern const Icon I_LevelUp2_06;
-extern const Icon I_LevelUp2_07;
-extern const Icon I_LevelUp3_05;
-extern const Icon I_LevelUp3_06;
-extern const Icon I_LevelUp3_02;
+extern const Icon I_LevelUp2_01;
 extern const Icon I_LevelUp3_07;
+extern const Icon I_LevelUp3_02;
 extern const Icon I_LevelUp3_04;
-extern const Icon I_LevelUp3_03;
+extern const Icon I_LevelUp3_05;
 extern const Icon I_LevelUp3_01;
+extern const Icon I_LevelUp3_03;
+extern const Icon I_LevelUp3_06;
 extern const Icon A_LevelUpPending_128x51;
 extern const Icon A_NoSdCard_128x51;
-extern const Icon A_SleepActive_128x51;
-extern const Icon A_Sleep_128x51;
-extern const Icon A_TVActive_128x51;
-extern const Icon A_TV_128x51;
-extern const Icon A_WavesActive_128x51;
-extern const Icon A_Waves_128x51;
-extern const Icon I_ble_10px;
-extern const Icon I_ibutt_10px;
-extern const Icon I_125_10px;
+extern const Icon A_SleepActive_128x52;
+extern const Icon A_Sleep_128x52;
+extern const Icon A_TvActive_128x52;
+extern const Icon A_Tv_128x52;
+extern const Icon A_WavesActive_128x52;
+extern const Icon A_Waves_128x52;
 extern const Icon I_sub1_10px;
-extern const Icon I_dir_10px;
 extern const Icon I_ir_10px;
-extern const Icon I_Nfc_10px;
 extern const Icon I_unknown_10px;
+extern const Icon I_ibutt_10px;
+extern const Icon I_Nfc_10px;
+extern const Icon I_ble_10px;
+extern const Icon I_125_10px;
+extern const Icon I_dir_10px;
 extern const Icon I_BLE_Pairing_128x64;
+extern const Icon I_EviWaiting1_18x21;
 extern const Icon I_EviSmile2_18x21;
+extern const Icon I_Error_18x18;
+extern const Icon I_Percent_10x14;
 extern const Icon I_EviSmile1_18x21;
-extern const Icon I_UsbTree_48x22;
-extern const Icon I_EviWaiting1_18x21;
 extern const Icon I_EviWaiting2_18x21;
-extern const Icon I_Percent_10x14;
+extern const Icon I_UsbTree_48x22;
 extern const Icon I_Smile_18x18;
-extern const Icon I_Error_18x18;
 extern const Icon I_Clock_18x18;
-extern const Icon I_ButtonRightSmall_3x5;
-extern const Icon I_ButtonLeftSmall_3x5;
-extern const Icon I_ButtonCenter_7x7;
 extern const Icon I_ButtonDown_7x4;
-extern const Icon I_ButtonRight_4x7;
-extern const Icon I_DFU_128x50;
+extern const Icon I_ButtonCenter_7x7;
+extern const Icon I_ButtonLeft_4x7;
 extern const Icon I_ButtonUp_7x4;
+extern const Icon I_DFU_128x50;
+extern const Icon I_ButtonLeftSmall_3x5;
+extern const Icon I_ButtonRightSmall_3x5;
+extern const Icon I_ButtonRight_4x7;
 extern const Icon I_Warning_30x23;
-extern const Icon I_ButtonLeft_4x7;
-extern const Icon I_DolphinFirstStart7_61x51;
-extern const Icon I_DolphinOkay_41x43;
+extern const Icon I_DolphinFirstStart2_59x51;
 extern const Icon I_DolphinFirstStart5_54x49;
+extern const Icon I_DolphinFirstStart6_58x54;
 extern const Icon I_Flipper_young_80x60;
-extern const Icon I_DolphinFirstStart2_59x51;
 extern const Icon I_DolphinFirstStart8_56x51;
+extern const Icon I_DolphinFirstStart1_59x53;
+extern const Icon I_DolphinOkay_41x43;
 extern const Icon I_DolphinFirstStart3_57x48;
+extern const Icon I_DolphinFirstStart7_61x51;
 extern const Icon I_DolphinFirstStart0_70x53;
 extern const Icon I_DolphinFirstStart4_67x53;
-extern const Icon I_DolphinFirstStart6_58x54;
-extern const Icon I_DolphinFirstStart1_59x53;
-extern const Icon I_ArrowDownFilled_14x15;
 extern const Icon I_ArrowUpEmpty_14x15;
 extern const Icon I_ArrowUpFilled_14x15;
+extern const Icon I_ArrowDownFilled_14x15;
 extern const Icon I_ArrowDownEmpty_14x15;
-extern const Icon I_DoorLocked_10x56;
 extern const Icon I_PassportBottom_128x17;
-extern const Icon I_PassportLeft_6x47;
 extern const Icon I_DoorLeft_70x55;
-extern const Icon I_LockPopup_100x49;
 extern const Icon I_DoorRight_70x55;
-extern const Icon I_IrdaArrowDown_4x8;
-extern const Icon I_Power_25x27;
-extern const Icon I_Mute_25x27;
+extern const Icon I_DoorLocked_10x56;
+extern const Icon I_PassportLeft_6x47;
+extern const Icon I_LockPopup_100x49;
 extern const Icon I_Down_hvr_25x27;
-extern const Icon I_Vol_up_25x27;
-extern const Icon I_IrdaLearnShort_128x31;
-extern const Icon I_Up_25x27;
 extern const Icon I_Vol_down_hvr_25x27;
-extern const Icon I_Vol_down_25x27;
-extern const Icon I_Vol_up_hvr_25x27;
+extern const Icon I_Down_25x27;
 extern const Icon I_Fill_marker_7x7;
+extern const Icon I_Vol_down_25x27;
+extern const Icon I_Vol_up_25x27;
 extern const Icon I_Up_hvr_25x27;
-extern const Icon I_IrdaArrowUp_4x8;
-extern const Icon I_Down_25x27;
+extern const Icon I_Vol_up_hvr_25x27;
+extern const Icon I_IrdaLearnShort_128x31;
+extern const Icon I_IrdaSend_128x64;
 extern const Icon I_DolphinReadingSuccess_59x63;
+extern const Icon I_Mute_hvr_25x27;
+extern const Icon I_Back_15x10;
+extern const Icon I_Up_25x27;
+extern const Icon I_IrdaArrowUp_4x8;
+extern const Icon I_Mute_25x27;
+extern const Icon I_Power_25x27;
 extern const Icon I_IrdaSendShort_128x34;
+extern const Icon I_IrdaArrowDown_4x8;
 extern const Icon I_IrdaLearn_128x64;
-extern const Icon I_Mute_hvr_25x27;
-extern const Icon I_IrdaSend_128x64;
 extern const Icon I_Power_hvr_25x27;
-extern const Icon I_Back_15x10;
 extern const Icon I_KeySaveSelected_24x11;
-extern const Icon I_KeySave_24x11;
-extern const Icon I_KeyBackspaceSelected_16x9;
 extern const Icon I_KeyBackspace_16x9;
+extern const Icon I_KeyBackspaceSelected_16x9;
+extern const Icon I_KeySave_24x11;
 extern const Icon A_125khz_14;
 extern const Icon A_BadUsb_14;
 extern const Icon A_Bluetooth_14;
@@ -148,45 +148,45 @@ extern const Icon A_Sub1ghz_14;
 extern const Icon A_Tamagotchi_14;
 extern const Icon A_U2F_14;
 extern const Icon A_iButton_14;
-extern const Icon I_Medium_chip_22x21;
 extern const Icon I_Detailed_chip_17x13;
-extern const Icon I_Health_16x16;
-extern const Icon I_Voltage_16x16;
+extern const Icon I_Medium_chip_22x21;
 extern const Icon I_BatteryBody_52x28;
-extern const Icon I_FaceNormal_29x14;
 extern const Icon I_FaceCharging_29x14;
+extern const Icon I_Health_16x16;
+extern const Icon I_Temperature_16x16;
 extern const Icon I_Battery_16x16;
 extern const Icon I_FaceConfused_29x14;
-extern const Icon I_Temperature_16x16;
+extern const Icon I_FaceNormal_29x14;
+extern const Icon I_Voltage_16x16;
 extern const Icon I_FaceNopower_29x14;
+extern const Icon I_RFIDDolphinSend_97x61;
 extern const Icon I_RFIDDolphinSuccess_108x57;
-extern const Icon I_RFIDBigChip_37x36;
 extern const Icon I_RFIDDolphinReceive_97x61;
-extern const Icon I_RFIDDolphinSend_97x61;
-extern const Icon I_SDError_43x35;
+extern const Icon I_RFIDBigChip_37x36;
 extern const Icon I_SDQuestion_35x43;
+extern const Icon I_SDError_43x35;
 extern const Icon I_Cry_dolph_55x52;
+extern const Icon I_Background_128x11;
+extern const Icon I_Lock_8x8;
+extern const Icon I_Battery_26x8;
 extern const Icon I_Battery_19x8;
+extern const Icon I_USBConnected_15x8;
+extern const Icon I_BadUsb_9x8;
+extern const Icon I_BT_Pair_9x8;
+extern const Icon I_PlaceholderL_11x13;
 extern const Icon I_SDcardFail_11x8;
 extern const Icon I_Bluetooth_5x8;
 extern const Icon I_PlaceholderR_30x13;
-extern const Icon I_Battery_26x8;
-extern const Icon I_Lock_8x8;
 extern const Icon I_SDcardMounted_11x8;
-extern const Icon I_BadUsb_9x8;
-extern const Icon I_BT_Pair_9x8;
-extern const Icon I_PlaceholderL_11x13;
-extern const Icon I_Background_128x11;
-extern const Icon I_USBConnected_15x8;
 extern const Icon I_Quest_7x8;
-extern const Icon I_MHz_25x11;
+extern const Icon I_Lock_7x8;
 extern const Icon I_Scanning_123x52;
+extern const Icon I_MHz_25x11;
 extern const Icon I_Unlock_7x8;
-extern const Icon I_Lock_7x8;
-extern const Icon I_DolphinNice_96x59;
-extern const Icon I_iButtonDolphinSuccess_109x60;
-extern const Icon I_DolphinExcited_64x63;
 extern const Icon I_iButtonKey_49x44;
-extern const Icon I_iButtonDolphinVerySuccess_108x52;
+extern const Icon I_DolphinExcited_64x63;
 extern const Icon I_DolphinWait_61x59;
+extern const Icon I_iButtonDolphinVerySuccess_108x52;
 extern const Icon I_DolphinMafia_115x62;
+extern const Icon I_DolphinNice_96x59;
+extern const Icon I_iButtonDolphinSuccess_109x60;