diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_0.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_0.png new file mode 100644 index 000000000..7c2add0e9 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_0.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_1.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_1.png new file mode 100644 index 000000000..27664d203 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_1.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_10.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_10.png new file mode 100644 index 000000000..da62ce4cf Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_10.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_11.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_11.png new file mode 100644 index 000000000..7a850b001 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_11.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_12.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_12.png new file mode 100644 index 000000000..b980807c7 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_12.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_13.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_13.png new file mode 100644 index 000000000..bf8a62d42 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_13.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_14.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_14.png new file mode 100644 index 000000000..bd3c0165a Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_14.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_15.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_15.png new file mode 100644 index 000000000..3a04944b1 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_15.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_16.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_16.png new file mode 100644 index 000000000..b08d48e7f Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_16.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_17.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_17.png new file mode 100644 index 000000000..5bdd77c12 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_17.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_18.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_18.png new file mode 100644 index 000000000..94b25dd6b Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_18.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_19.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_19.png new file mode 100644 index 000000000..6531182ba Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_19.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_2.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_2.png new file mode 100644 index 000000000..16de2f5a8 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_2.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_20.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_20.png new file mode 100644 index 000000000..e0bbf11e9 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_20.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_21.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_21.png new file mode 100644 index 000000000..6cd4277bb Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_21.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_22.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_22.png new file mode 100644 index 000000000..c1ace764f Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_22.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_23.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_23.png new file mode 100644 index 000000000..0ad019728 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_23.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_24.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_24.png new file mode 100644 index 000000000..0cc109ea1 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_24.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_25.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_25.png new file mode 100644 index 000000000..6fd18ac98 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_25.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_26.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_26.png new file mode 100644 index 000000000..8e4d322a1 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_26.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_27.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_27.png new file mode 100644 index 000000000..1d6214994 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_27.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_3.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_3.png new file mode 100644 index 000000000..1ee0b55a4 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_3.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_4.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_4.png new file mode 100644 index 000000000..759d3242d Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_4.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_5.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_5.png new file mode 100644 index 000000000..63d2324f2 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_5.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_6.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_6.png new file mode 100644 index 000000000..fbea5c447 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_6.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_7.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_7.png new file mode 100644 index 000000000..b1f48bf49 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_7.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_8.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_8.png new file mode 100644 index 000000000..38b730fd1 Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_8.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_9.png b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_9.png new file mode 100644 index 000000000..e610e30ce Binary files /dev/null and b/assets/dolphin/external/PaxGod_TikTok_Marketing/frame_9.png differ diff --git a/assets/dolphin/external/PaxGod_TikTok_Marketing/meta.txt b/assets/dolphin/external/PaxGod_TikTok_Marketing/meta.txt new file mode 100644 index 000000000..f0fa77e2e --- /dev/null +++ b/assets/dolphin/external/PaxGod_TikTok_Marketing/meta.txt @@ -0,0 +1,13 @@ +Filetype: Flipper Animation +Version: 1 +Width: 128 +Height: 64 +Passive frames: 21 +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 +Active cycles: 1 +Frame rate: 5 +Duration: 3600 +Active cooldown: 7 + +Bubble slots: 0 \ No newline at end of file diff --git a/assets/dolphin/external/manifest.txt b/assets/dolphin/external/manifest.txt index 80a6de314..166f85246 100644 --- a/assets/dolphin/external/manifest.txt +++ b/assets/dolphin/external/manifest.txt @@ -106,6 +106,13 @@ Min level: 15 Max level: 30 Weight: 7 +Name: PaxGod_TikTok_Marketing +Min butthurt: 0 +Max butthurt: 14 +Min level: 11 +Max level: 30 +Weight: 3 + Name: lvl_16 Min butthurt: 0 Max butthurt: 14 diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_0.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_0.bm new file mode 100644 index 000000000..5401e21b2 Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_0.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_1.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_1.bm new file mode 100644 index 000000000..49d9e5135 Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_1.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_10.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_10.bm new file mode 100644 index 000000000..9f8e4fb7e Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_10.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_11.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_11.bm new file mode 100644 index 000000000..38c7944ac Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_11.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_12.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_12.bm new file mode 100644 index 000000000..ea234b0df Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_12.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_13.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_13.bm new file mode 100644 index 000000000..a209cd8ff Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_13.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_14.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_14.bm new file mode 100644 index 000000000..2829185a3 Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_14.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_15.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_15.bm new file mode 100644 index 000000000..bff1cf3e6 Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_15.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_16.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_16.bm new file mode 100644 index 000000000..d234a954f Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_16.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_17.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_17.bm new file mode 100644 index 000000000..30fdc120a Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_17.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_18.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_18.bm new file mode 100644 index 000000000..094707228 Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_18.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_19.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_19.bm new file mode 100644 index 000000000..01492a1b4 Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_19.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_2.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_2.bm new file mode 100644 index 000000000..100611d9e Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_2.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_20.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_20.bm new file mode 100644 index 000000000..fadf12f27 Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_20.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_21.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_21.bm new file mode 100644 index 000000000..ea71be67e Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_21.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_3.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_3.bm new file mode 100644 index 000000000..30b2bf584 Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_3.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_4.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_4.bm new file mode 100644 index 000000000..4bcbb83bb Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_4.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_5.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_5.bm new file mode 100644 index 000000000..cebdd493c Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_5.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_6.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_6.bm new file mode 100644 index 000000000..c3b27b3b3 Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_6.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_7.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_7.bm new file mode 100644 index 000000000..70fe5f7df Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_7.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_8.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_8.bm new file mode 100644 index 000000000..4ab53bb30 Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_8.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_9.bm b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_9.bm new file mode 100644 index 000000000..aeadd2f0f Binary files /dev/null and b/assets/resources/dolphin/PaxGod_TikTok_Marketing/frame_9.bm differ diff --git a/assets/resources/dolphin/PaxGod_TikTok_Marketing/meta.txt b/assets/resources/dolphin/PaxGod_TikTok_Marketing/meta.txt new file mode 100644 index 000000000..83bee1ed9 --- /dev/null +++ b/assets/resources/dolphin/PaxGod_TikTok_Marketing/meta.txt @@ -0,0 +1,14 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 21 +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 +Active cycles: 1 +Frame rate: 5 +Duration: 3600 +Active cooldown: 7 + +Bubble slots: 0 diff --git a/assets/resources/dolphin/manifest.txt b/assets/resources/dolphin/manifest.txt index 41cfe0899..80265a8b8 100644 --- a/assets/resources/dolphin/manifest.txt +++ b/assets/resources/dolphin/manifest.txt @@ -106,6 +106,13 @@ Min level: 15 Max level: 30 Weight: 7 +Name: PaxGod_TikTok_Marketing +Min butthurt: 0 +Max butthurt: 14 +Min level: 11 +Max level: 30 +Weight: 3 + Name: lvl_16 Min butthurt: 0 Max butthurt: 14 diff --git a/scripts/version.py b/scripts/version.py index 8eb38526f..f003cc256 100644 --- a/scripts/version.py +++ b/scripts/version.py @@ -14,7 +14,7 @@ class GitVersion: self.gitlist = [("commit", "rev-parse --short HEAD"), ("branch", "rev-parse --abbrev-ref") , ("branch_num", "rev-list -count HEAD")] def get_version_info(self): - commit = branch = branch_num = "XFW-0036_12282022" + commit = branch = branch_num = "XFW-0036" # We dont use an `or` in commands that we expect to fail. It will serve no function. # We also dont try;exept an entire block of code. This is bad practise. We only try the single part that we expect to fail!