Merge remote-tracking branch 'ofw/dev' into mntm-dev

CHANGELOG.md

@@ -25,7 +25,9 @@
   - Added ADC (analog voltage) support to gpio library (by @jamisonderek)
   - Support `subghz` custom modulation, support `transmitFile(path, repeats)`, new `end()` function (by @Willy-JL)
 - FBT: New `SKIP_EXTERNAL` toggle and `EXTRA_EXT_APPS` config option (by @Willy-JL)
-- Desktop: Added TV animation from OFW which was missing (internal on OFW)
+- Desktop:
+  - Added TV animation from OFW which was missing (internal on OFW)
+  - OFW: New Intruder animation (by @Astrrra)
 - UL: BadKB: Add Finnish keyboard layout (by @nicou)
 - OFW: JS: New modules documentation added (by @rnadyrshin)
 - Updater:

assets/dolphin/external/L3_Intruder_alert_128x64/meta.txt

@@ -0,0 +1,14 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 14
+Active frames: 42
+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 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
+Active cycles: 1
+Frame rate: 2
+Duration: 360
+Active cooldown: 7
+
+Bubble slots: 0

assets/dolphin/external/manifest.txt

@@ -186,7 +186,7 @@ Weight: 3
 Name: L2_Secret_door_128x64
 Min butthurt: 0
 Max butthurt: 14
-Min level: 26
+Min level: 23
 Max level: 30
 Weight: 3
 
@@ -195,7 +195,21 @@ Min butthurt: 0
 Max butthurt: 14
 Min level: 29
 Max level: 30
-Weight: 5
+Weight: 4
+
+Name: L1_Akira_128x64
+Min butthurt: 0
+Max butthurt: 14
+Min level: 4
+Max level: 30
+Weight: 4
+
+Name: L3_Intruder_alert_128x64
+Min butthurt: 0
+Max butthurt: 14
+Min level: 26
+Max level: 30
+Weight: 6
 
 Name: L1_3d_printing_128x64
 Min butthurt: 0
@@ -210,10 +224,3 @@ Max butthurt: 14
 Min level: 11
 Max level: 30
 Weight: 6
-
-Name: L1_Akira_128x64
-Min butthurt: 0
-Max butthurt: 14
-Min level: 4
-Max level: 30
-Weight: 5