diff --git a/assets/resources/dolphin/README.md b/assets/resources/dolphin/README.md index 68180590e..6deeef23b 100644 --- a/assets/resources/dolphin/README.md +++ b/assets/resources/dolphin/README.md @@ -10,6 +10,8 @@ - Assets: Includes New Dolphin Animations: [BulmFlash, G0ku Pat Pat and Sail0rM00n (By RogueMaster)] (hidden) - Assets: Includes New Dolphin Animations: [ChiChi, G0ku Pew and R0shi (By RogueMaster)] - Assets: Includes New Dolphin Animations: [Narut0 (By Sasquach)] +- Assets: Includes New Dolphin Animations: [Blaster (By Sasquach)] +- Assets: Includes New Dolphin Animations: [Flipper City (By Svaarich)] ## REPOSITORIES FOR OTHER ANIMATION CREATORS: diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_0.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_0.bm new file mode 100644 index 000000000..26ceb2a03 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_0.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_1.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_1.bm new file mode 100644 index 000000000..40a3d0cc6 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_1.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_10.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_10.bm new file mode 100644 index 000000000..725745f2d Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_10.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_11.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_11.bm new file mode 100644 index 000000000..afb3371d1 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_11.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_12.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_12.bm new file mode 100644 index 000000000..f44a8eba3 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_12.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_13.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_13.bm new file mode 100644 index 000000000..56edda3ae Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_13.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_14.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_14.bm new file mode 100644 index 000000000..dda4a03db Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_14.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_15.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_15.bm new file mode 100644 index 000000000..4cae28ee2 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_15.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_16.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_16.bm new file mode 100644 index 000000000..ed734f97a Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_16.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_17.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_17.bm new file mode 100644 index 000000000..a1b104b61 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_17.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_18.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_18.bm new file mode 100644 index 000000000..c2b5ccfac Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_18.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_19.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_19.bm new file mode 100644 index 000000000..4dbe1f5b2 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_19.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_2.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_2.bm new file mode 100644 index 000000000..f648fa701 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_2.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_20.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_20.bm new file mode 100644 index 000000000..8af9496c6 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_20.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_21.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_21.bm new file mode 100644 index 000000000..d2daa0495 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_21.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_22.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_22.bm new file mode 100644 index 000000000..ce5b37e36 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_22.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_23.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_23.bm new file mode 100644 index 000000000..f5c3d7050 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_23.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_24.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_24.bm new file mode 100644 index 000000000..f63ce2f6f Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_24.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_25.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_25.bm new file mode 100644 index 000000000..943b552e6 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_25.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_26.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_26.bm new file mode 100644 index 000000000..9ec485d48 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_26.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_27.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_27.bm new file mode 100644 index 000000000..df5e2342b Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_27.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_28.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_28.bm new file mode 100644 index 000000000..984d2e10b Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_28.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_29.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_29.bm new file mode 100644 index 000000000..06a9fee75 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_29.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_3.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_3.bm new file mode 100644 index 000000000..1916ff3a6 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_3.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_30.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_30.bm new file mode 100644 index 000000000..8d16733aa Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_30.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_31.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_31.bm new file mode 100644 index 000000000..dba885d7c Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_31.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_32.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_32.bm new file mode 100644 index 000000000..e3d15b3dc Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_32.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_33.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_33.bm new file mode 100644 index 000000000..cd0336c4d Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_33.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_34.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_34.bm new file mode 100644 index 000000000..a87519097 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_34.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_35.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_35.bm new file mode 100644 index 000000000..47652cf77 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_35.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_36.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_36.bm new file mode 100644 index 000000000..532979664 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_36.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_37.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_37.bm new file mode 100644 index 000000000..4dc494c77 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_37.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_38.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_38.bm new file mode 100644 index 000000000..a6db87dd0 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_38.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_39.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_39.bm new file mode 100644 index 000000000..f6d79cec8 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_39.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_4.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_4.bm new file mode 100644 index 000000000..93274b2ae Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_4.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_40.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_40.bm new file mode 100644 index 000000000..74d91212c Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_40.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_41.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_41.bm new file mode 100644 index 000000000..97bb337be Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_41.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_42.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_42.bm new file mode 100644 index 000000000..5dcd33048 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_42.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_43.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_43.bm new file mode 100644 index 000000000..e54cacc12 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_43.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_44.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_44.bm new file mode 100644 index 000000000..b163792b1 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_44.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_45.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_45.bm new file mode 100644 index 000000000..03af60f59 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_45.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_46.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_46.bm new file mode 100644 index 000000000..9fc20edaf Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_46.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_47.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_47.bm new file mode 100644 index 000000000..ae965264e Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_47.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_48.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_48.bm new file mode 100644 index 000000000..e92578443 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_48.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_49.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_49.bm new file mode 100644 index 000000000..815a6b069 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_49.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_5.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_5.bm new file mode 100644 index 000000000..3d094a318 Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_5.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_6.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_6.bm new file mode 100644 index 000000000..5939bd84f Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_6.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_7.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_7.bm new file mode 100644 index 000000000..07b44007d Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_7.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_8.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_8.bm new file mode 100644 index 000000000..b0708dcbd Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_8.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_9.bm b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_9.bm new file mode 100644 index 000000000..7f6bea16a Binary files /dev/null and b/assets/resources/dolphin/Sasquach_Blaster_128x64/frame_9.bm differ diff --git a/assets/resources/dolphin/Sasquach_Blaster_128x64/meta.txt b/assets/resources/dolphin/Sasquach_Blaster_128x64/meta.txt new file mode 100644 index 000000000..708e0191f --- /dev/null +++ b/assets/resources/dolphin/Sasquach_Blaster_128x64/meta.txt @@ -0,0 +1,14 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 50 +Active frames: 1 +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 0 +Active cycles: 1 +Frame rate: 6 +Duration: 3600 +Active cooldown: 1 + +Bubble slots: 0 diff --git a/assets/resources/dolphin/manifest.txt b/assets/resources/dolphin/manifest.txt index ad599a6e4..82ad7bdee 100644 --- a/assets/resources/dolphin/manifest.txt +++ b/assets/resources/dolphin/manifest.txt @@ -64,6 +64,13 @@ Min level: 18 Max level: 30 Weight: 0 +Name: Sasquach_Blaster_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 7 + Name: Sasquach_Naruto_128x64 Min butthurt: 0 Max butthurt: 14 @@ -211,19 +218,40 @@ Min level: 2 Max level: 30 Weight: 7 +Name: L3_Fireplace_128x64 +Min butthurt: 0 +Max butthurt: 13 +Min level: 10 +Max level: 30 +Weight: 7 + +Name: L2_FlipperCity_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 2 +Max level: 30 +Weight: 7 + Name: L1_B0ws3r_128x64 Min butthurt: 0 Max butthurt: 14 Min level: 1 Max level: 30 -Weight: 5 +Weight: 7 Name: L1_Mario_128x64 Min butthurt: 0 Max butthurt: 14 Min level: 1 Max level: 30 -Weight: 5 +Weight: 7 + +Name: Haseo_80s_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 1 +Max level: 30 +Weight: 7 Name: FelixTwoTone_Veemon_128x64 Min butthurt: 0 @@ -239,13 +267,6 @@ Min level: 1 Max level: 30 Weight: 5 -Name: Haseo_80s_128x64 -Min butthurt: 0 -Max butthurt: 14 -Min level: 1 -Max level: 30 -Weight: 3 - Name: Sasquach_StickFight_128x64 Min butthurt: 0 Max butthurt: 14 @@ -260,13 +281,6 @@ Min level: 1 Max level: 30 Weight: 3 -Name: L3_Fireplace_128x64 -Min butthurt: 0 -Max butthurt: 13 -Min level: 10 -Max level: 30 -Weight: 5 - Name: STOPOXY_SCHOOL_DAYS_128x64 Min butthurt: 0 Max butthurt: 14 @@ -407,13 +421,6 @@ Min level: 3 Max level: 30 Weight: 4 -Name: L2_FlipperCity_128x64 -Min butthurt: 0 -Max butthurt: 14 -Min level: 2 -Max level: 30 -Weight: 3 - Name: L2_Soldering_128x64 Min butthurt: 0 Max butthurt: 14