Leeroy Menu and Internal Animation Changes

RogueMaster · Nov 10, 2023 · 8d2bf08 · 8d2bf08
1 parent e0df5ed
commit 8d2bf08
Show file tree

Hide file tree

Showing 27 changed files with 22 additions and 22 deletions.
diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c
@@ -15,7 +15,7 @@
 
 #define TAG "AnimationManager"
 
-#define HARDCODED_ANIMATION_NAME "wrenchathome_F0Pattern_128x64"
+#define HARDCODED_ANIMATION_NAME "RM_W33dRain_128x64"
 #define NO_SD_ANIMATION_NAME "L1_NoSd_128x49"
 #define BAD_BATTERY_ANIMATION_NAME "L1_BadBattery_128x47"
 

diff --git a/applications/services/desktop/animations/animation_storage.c b/applications/services/desktop/animations/animation_storage.c
@@ -35,7 +35,7 @@ const char* const anim_style_filenames[AnimStyleCount] = {
     "%s/manifest_SAO.txt",        "%s/manifest_Science.txt",
     "%s/manifest_SJUMP.txt",      "%s/manifest_Squatch.txt",
     "%s/manifest_Stock.txt",      "%s/manifest_Virus.txt",
-    "%s/manifest_WatchDogs.txt",
+    "%s/manifest_WatchDogs.txt",  "%s/manifest_Leeroy.txt",
 };
 
 static void animation_storage_free_bubbles(BubbleAnimation* animation);

diff --git a/applications/settings/cfw_app/scenes/cfw_app_scene_interface_desktop.c b/applications/settings/cfw_app/scenes/cfw_app_scene_interface_desktop.c
@@ -17,7 +17,7 @@ const char* const anim_style_names[AnimStyleCount] = {
     "Anime+420", "Anime+420+18", "BMO",     "Cherry 18+", "Corp Logos",    "Custom 1", "Custom 2",
     "DBZ",       "Digim0n",      "Dolphin", "Hackz",      "Mario",         "Marvel",   "NYAN",
     "One Piece", "P0kemon",      "RM 18+",  "RM Select",  "RM Select 18+", "SAO",      "Science",
-    "SJUMP",     "Squatch",      "Stock",   "Virus",      "WatchDogs",
+    "SJUMP",     "Squatch",      "Stock",   "Virus",      "WatchDogs",     "Leeroy",
 };
 
 #define BATTERY_VIEW_COUNT 7

diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_0.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_0.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_1.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_1.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_10.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_10.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_11.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_11.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_12.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_12.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_13.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_13.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_14.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_14.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_2.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_2.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_3.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_3.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_4.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_4.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_5.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_5.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_6.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_6.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_7.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_7.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_8.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_8.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/frame_9.png b/assets/dolphin/internal/RM_W33dRain_128x64/frame_9.png
diff --git a/assets/dolphin/internal/RM_W33dRain_128x64/meta.txt b/assets/dolphin/internal/RM_W33dRain_128x64/meta.txt
@@ -0,0 +1,14 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 14
+Active frames: 1
+Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
+Active cycles: 1
+Frame rate: 7
+Duration: 3600
+Active cooldown: 7
+
+Bubble slots: 0
diff --git a/assets/dolphin/internal/manifest.txt b/assets/dolphin/internal/manifest.txt
@@ -2,26 +2,25 @@ Filetype: Flipper Animation Manifest
 Version: 1
 
 # Animation 1
-Name: wrenchathome_F0Pattern_128x64
+Name: RM_W33dRain_128x64
 Min butthurt: 0
 Max butthurt: 14
 Min level: 1
 Max level: 30
-Weight: 1
+Weight: 7
 
 # Animation 2
 Name: L1_BadBattery_128x47
 Min butthurt: 0
 Max butthurt: 14
 Min level: 1
 Max level: 30
-Weight: 1
+Weight: 3
 
 # Animation 3
 Name: L1_NoSd_128x49
 Min butthurt: 0
 Max butthurt: 14
 Min level: 1
 Max level: 30
-Weight: 1
-
+Weight: 6
diff --git a/assets/dolphin/internal/wrenchathome_F0Pattern_128x64/frame_0.png b/assets/dolphin/internal/wrenchathome_F0Pattern_128x64/frame_0.png
diff --git a/assets/dolphin/internal/wrenchathome_F0Pattern_128x64/frame_1.png b/assets/dolphin/internal/wrenchathome_F0Pattern_128x64/frame_1.png
diff --git a/assets/dolphin/internal/wrenchathome_F0Pattern_128x64/frame_2.png b/assets/dolphin/internal/wrenchathome_F0Pattern_128x64/frame_2.png
diff --git a/assets/dolphin/internal/wrenchathome_F0Pattern_128x64/frame_3.png b/assets/dolphin/internal/wrenchathome_F0Pattern_128x64/frame_3.png
diff --git a/assets/dolphin/internal/wrenchathome_F0Pattern_128x64/frame_4.png b/assets/dolphin/internal/wrenchathome_F0Pattern_128x64/frame_4.png
diff --git a/assets/dolphin/internal/wrenchathome_F0Pattern_128x64/meta.txt b/assets/dolphin/internal/wrenchathome_F0Pattern_128x64/meta.txt
diff --git a/lib/cfw/cfw.h b/lib/cfw/cfw.h
@@ -64,6 +64,7 @@ typedef enum {
     AnimStyleStock,
     AnimStyleVirus,
     AnimStyleWatchDogs,
+    AnimStyleLeeroy,
     AnimStyleCount,
 } AnimStyle;