Merge remote-tracking branch 'OFW/doom/3972-add-doom-animation' into dev

2025-12-12 12:42:30 +04:00 · 2025-03-28 14:39:47 +03:00
parent 2828ffb0f4 0563697eab
commit dd009e38df
41 changed files with 21 additions and 0 deletions
--- a/assets/dolphin/external/L1_Doom_128x64/frame_0.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_0.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_1.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_1.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_10.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_10.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_11.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_11.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_12.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_12.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_13.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_13.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_14.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_14.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_15.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_15.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_16.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_16.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_17.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_17.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_18.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_18.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_19.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_19.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_2.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_2.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_20.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_20.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_21.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_21.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_22.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_22.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_23.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_23.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_24.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_24.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_25.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_25.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_26.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_26.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_27.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_27.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_28.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_28.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_29.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_29.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_3.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_3.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_30.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_30.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_31.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_31.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_32.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_32.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_33.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_33.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_34.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_34.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_35.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_35.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_36.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_36.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_37.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_37.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_38.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_38.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_4.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_4.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_5.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_5.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_6.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_6.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_7.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_7.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_8.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_8.png
--- a/assets/dolphin/external/L1_Doom_128x64/frame_9.png
+++ b/assets/dolphin/external/L1_Doom_128x64/frame_9.png
--- a/assets/dolphin/external/L1_Doom_128x64/meta.txt
+++ b/assets/dolphin/external/L1_Doom_128x64/meta.txt
@@ -0,0 +1,14 @@
 Filetype: Flipper Animation
 Version: 1
 Width: 128
 Height: 64
 Passive frames: 15
 Active frames: 24
 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
 Active cycles: 1
 Frame rate: 2
 Duration: 3600
 Active cooldown: 7
 Bubble slots: 0
--- a/assets/dolphin/external/manifest.txt
+++ b/assets/dolphin/external/manifest.txt
@@ -238,3 +238,10 @@ Max butthurt: 10
 Min level: 3
 Max level: 3
 Weight: 2
 Name: L1_Doom_128x64
 Min butthurt: 0
 Max butthurt: 13
 Min level: 1
 Max level: 3
 Weight: 4