From 67cc29d0a458d9f87036e6c91b773d3f5050746b Mon Sep 17 00:00:00 2001 From: VerstreuteSeele Date: Thu, 22 Dec 2022 08:07:34 +0100 Subject: [PATCH 1/3] Fix assets, added secret manifest, changed package name --- .../dolphin/external/no_lvl_up_manifest.txt | 212 ++++++++++++++++++ fbt_options.py | 2 +- 2 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 assets/dolphin/external/no_lvl_up_manifest.txt diff --git a/assets/dolphin/external/no_lvl_up_manifest.txt b/assets/dolphin/external/no_lvl_up_manifest.txt new file mode 100644 index 000000000..c9432e97a --- /dev/null +++ b/assets/dolphin/external/no_lvl_up_manifest.txt @@ -0,0 +1,212 @@ +Filetype: Flipper Animation Manifest +Version: 1 + +Name: lvl_1 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_2 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_3 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_4 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_5 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_6 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_7 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_8 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_9 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_10 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_11 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_12 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_13 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_14 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_15 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_16 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_17 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_18 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_19 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_20 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_21 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_22 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_23 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_24 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_25 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_26 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_27 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_28 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_29 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 + +Name: lvl_30 +Min butthurt: 0 +Max butthurt: 3 +Min level: 1 +Max level: 30 +Weight: 7 \ No newline at end of file diff --git a/fbt_options.py b/fbt_options.py index 7faf8622b..db2036a19 100644 --- a/fbt_options.py +++ b/fbt_options.py @@ -14,7 +14,7 @@ DEBUG = 0 # Suffix to add to files when building distribution # If OS environment has DIST_SUFFIX set, it will be used instead -DIST_SUFFIX = "CC_CL-0023_12222022" +DIST_SUFFIX = "XFW-0023_12222022" # Coprocessor firmware COPRO_OB_DATA = "scripts/ob.data" From 47bb992c1e40043b55a74a55737aa9ea624b32e1 Mon Sep 17 00:00:00 2001 From: VerstreuteSeele Date: Thu, 22 Dec 2022 09:16:11 +0100 Subject: [PATCH 2/3] Fixed this BS Rogue, you absolute moron... WHERE and WHY did you hardcode that sasquach path?!! --- .../dolphin/internal/Infomercial/frame_0.png | Bin 2730 -> 0 bytes .../Sasquach_D1g1talRa1n_128x64/frame_0.png | Bin 0 -> 2732 bytes .../Sasquach_D1g1talRa1n_128x64/frame_1.png | Bin 0 -> 2732 bytes .../meta.txt | 10 +- assets/dolphin/internal/manifest.txt | 6 +- assets/dolphin/manifest.txt | 107 ------------------ 6 files changed, 8 insertions(+), 115 deletions(-) delete mode 100644 assets/dolphin/internal/Infomercial/frame_0.png create mode 100644 assets/dolphin/internal/Sasquach_D1g1talRa1n_128x64/frame_0.png create mode 100644 assets/dolphin/internal/Sasquach_D1g1talRa1n_128x64/frame_1.png rename assets/dolphin/internal/{Infomercial => Sasquach_D1g1talRa1n_128x64}/meta.txt (59%) delete mode 100644 assets/dolphin/manifest.txt diff --git a/assets/dolphin/internal/Infomercial/frame_0.png b/assets/dolphin/internal/Infomercial/frame_0.png deleted file mode 100644 index 6ef0d27fb8e5d59b0578a2ba9fcae34840870b42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2730 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 diff --git a/assets/dolphin/internal/Sasquach_D1g1talRa1n_128x64/frame_0.png b/assets/dolphin/internal/Sasquach_D1g1talRa1n_128x64/frame_0.png new file mode 100644 index 0000000000000000000000000000000000000000..b674549c43879083f486507a42580986d870148e GIT binary patch literal 2732 zcmV;d3RCroP)pPUP(kjRCwC$Tx&>FTNL&RQ3UoRlbVWBG&9hkq=EudkR&6pcVphd zWGaj-g&d}ah{`0hV4%q&DvJW8=dWTadO)E>M)YHZ-WioaMh^lZ@0VY!d+t7G9**8S zr|wxl4*Tr0&f0sg$9{aX&cw!86jh3~RA3pvGJr+@2Lp6C&Z}H*XGKJ0CxO4705@Yu2!>FkcBS)ZL#vzt5-ekuwKY7Y=FYT z!o!CTKX~v!nQ-V_SFc_bFH28Pzj*N?f&)_rd8SXFt}TG3Oql{6)a2*q8@4rn{(Pma zZ{NN_CR;?zp(Z{)o)Xxc_K{vlaOSRm(u^51P&shmz<2N7nZ*Dum&@<>>+4feQg9tN zZk%{odwV+u?{GL$Q&U;<`t@t2aR2^&XeT2h1L}Zkwsw=YEk>9^2spGdWXKT29Be7t zfhgsXUPy3eM#+j5D^T9FY197w`=R}H>(<@9d)F)m@Or(}HT?x{E{>^iLd%@BMcqS( z4pn$KpU^!A3>ct1y>#i4ekF$xGz#bK=;+YaQ;7bNp^!k#pg+4QGc&Wcwzgltek)h5 zT(V@z$&)9|Vt|H*1}tbYqz@lHut4>RJpwI;iX~`EdLOK%tO0O9M25^)q~XJdx3sjN z8}MAMbxHb1hC%`{7Znv%R#u`9&CSiYMHv>FI(6!~bLY%rfNR&TVMyp1+#k**s zi_PrWvz5p&d}Jsj5c9EP$FOMMym^x=8CI`n&z=n%HmtL=(?r`)42iR+EN&=Y>n2vR zhVv#Lp@3}?%D94oHMqrku9c�ZLmUjc>t_vJFFl67-J@g#=>$LqoW=+wB)FT#zWY zPQw2wAqcQZtE#H9por)Yf?&*;F>l_yu?%2gK~^;M(JA`ZHb8X2xIV#=`o;j*s0kRy zja`pmxQKDID1vc)h2r&%0dR1?e*HS5k{i3;!*C`C&MfK7B(R+b!k^)MXW z4Z)G0pC1G`gRXHv)dF^=0^@Mrgz-?BmX?MS!-x?h%whnXl@I|AhXVtE8R%95!*MVu z7Z(>}kZ!kI51h5Pw?io|my4j70Cr{o<5E&m+S=N1I>P~e!-frvZ=8@@TU$-E2=i=t z{P^*fmKOMwGC|eV)xm?_zI}_^$&)AR0WUo)sz5qX1mhYT8*%i7dG_qtvtYr3>gwva zxVV~{8Z&M~sWki0iKxL$x3bc-y>5ced1hp`}S>Kr7}J~9>Q^U3zB6V4o`>( zAc$65Tbq`aMi_vJo_(cgqQ@pr`ovKgPB3rYJaGjmlvq|_VWA-)7$#4+Q&4MbD~^RO zmkUBU8xSbgra&vcCYW=2db$?lrC$(jjxoxZi!njcXGTUwj3()`p`jr!FYm;O6S$H; zH#fJuyc{|alR!Q(7-GO-^7LR0(Ap5rc<0U?h$g0nM*=b{nDf@HTU%OM0shY806C2{XKW`4YOrH7+iWLh9=3+S=M^NG1+%-@cvEhSxD< ztXtvmgf@Wu&_g$;G2x8x5%_pVM+bF{kwCP(CAZqNPH{%4MwktMNQw&1jD^i^w`XQ% z?%K60DJdy6HI+%9U%q_7i5K?6_4DV?T8qMvn4&qwj~+cbAt3?v6ielX!xO>)%o5~k z2H&9ppiqniw<#$p&^4YS*62PYuh)x_2nwyNqIfD9(Uc!`oEf^VtgPI(Z(nnB^ZWPj z&!0bEQ&YpFPoK}Xdi82vMFPf~n3yP2D6WWLxH+7C!h{Lo^Mp14e@cY*8yg$pQ>?Vv zY>X_w-;ZVx>Gk#Xu&N-sZnvAOg~Q>1k!S#Mb{Js!^5qB}5g2uxxvZ=VS4sNxcsz6G z&c$5O+1Z(slY=Eu)q4v%#bHa;FMUcC6wp+h}=5pjlj7@ia;vP1G%2KYPfu}JjvML4x~s)&HcGQdy5 z^4nKG^IBk>1;$y_8v~3VKRz}#wl^SUZ?H_fC9nau!b*x!ZV7H^4PVz~~UCmZ}beZw^2K;2e8;a9NX z;432BMRJoFF4D1|27u$AI&})Gac~$C3JTPQ0**$2Wx|9AZLGQ+YEDj0VqzjX>h*fj zX?OeKH*oeVMCp;AU&xq%mFM2DmR0000pPUP(kjRCwC$Tx&>FTNL&RQ3UoRlbVWBG&9hkq=EudkR&6pcVphd zWGaj-g&d}ah{`0hV4%q&DvJW8=dWTadO)E>M)YHZ-WioaMh^lZ@0VY!d+t7G9**8S zr|wxl4*Tr0&f0sg$9{aX&cw!86jh3~RA3pvGJr+@2Lp6C&Z}H*XGKJ0CxO4705@Yu2!>FkcBS)ZL#vzt5-ekuwKY7Y=FYT z!o!CTKX~v!nQ-V_SFc_bFH28Pzj*N?f&)_rd8SXFt}TG3Oql{6)a2*q8@4rn{(Pma zZ{NN_CR;?zp(Z{)o)Xxc_K{vlaOSRm(u^51P&shmz<2N7nZ*Dum&@<>>+4feQg9tN zZk%{odwV+u?{GL$Q&U;<`t@t2aR2^&XeT2h1L}Zkwsw=YEk>9^2spGdWXKT29Be7t zfhgsXUPy3eM#+j5D^T9FY197w`=R}H>(<@9d)F)m@Or(}HT?x{E{>^iLd%@BMcqS( z4pn$KpU^!A3>ct1y>#i4ekF$xGz#bK=;+YaQ;7bNp^!k#pg+4QGc&Wcwzgltek)h5 zT(V@z$&)9|Vt|H*1}tbYqz@lHut4>RJpwI;iX~`EdLOK%tO0O9M25^)q~XJdx3sjN z8}MAMbxHb1hC%`{7Znv%R#u`9&CSiYMHv>FI(6!~bLY%rfNR&TVMyp1+#k**s zi_PrWvz5p&d}Jsj5c9EP$FOMMym^x=8CI`n&z=n%HmtL=(?r`)42iR+EN&=Y>n2vR zhVv#Lp@3}?%D94oHMqrku9c�ZLmUjc>t_vJFFl67-J@g#=>$LqoW=+wB)FT#zWY zPQw2wAqcQZtE#H9por)Yf?&*;F>l_yu?%2gK~^;M(JA`ZHb8X2xIV#=`o;j*s0kRy zja`pmxQKDID1vc)h2r&%0dR1?e*HS5k{i3;!*C`C&MfK7B(R+b!k^)MXW z4Z)G0pC1G`gRXHv)dF^=0^@Mrgz-?BmX?MS!-x?h%whnXl@I|AhXVtE8R%95!*MVu z7Z(>}kZ!kI51h5Pw?io|my4j70Cr{o<5E&m+S=N1I>P~e!-frvZ=8@@TU$-E2=i=t z{P^*fmKOMwGC|eV)xm?_zI}_^$&)AR0WUo)sz5qX1mhYT8*%i7dG_qtvtYr3>gwva zxVV~{8Z&M~sWki0iKxL$x3bc-y>5ced1hp`}S>Kr7}J~9>Q^U3zB6V4o`>( zAc$65Tbq`aMi_vJo_(cgqQ@pr`ovKgPB3rYJaGjmlvq|_VWA-)7$#4+Q&4MbD~^RO zmkUBU8xSbgra&vcCYW=2db$?lrC$(jjxoxZi!njcXGTUwj3()`p`jr!FYm;O6S$H; zH#fJuyc{|alR!Q(7-GO-^7LR0(Ap5rc<0U?h$g0nM*=b{nDf@HTU%OM0shY806C2{XKW`4YOrH7+iWLh9=3+S=M^NG1+%-@cvEhSxD< ztXtvmgf@Wu&_g$;G2x8x5%_pVM+bF{kwCP(CAZqNPH{%4MwktMNQw&1jD^i^w`XQ% z?%K60DJdy6HI+%9U%q_7i5K?6_4DV?T8qMvn4&qwj~+cbAt3?v6ielX!xO>)%o5~k z2H&9ppiqniw<#$p&^4YS*62PYuh)x_2nwyNqIfD9(Uc!`oEf^VtgPI(Z(nnB^ZWPj z&!0bEQ&YpFPoK}Xdi82vMFPf~n3yP2D6WWLxH+7C!h{Lo^Mp14e@cY*8yg$pQ>?Vv zY>X_w-;ZVx>Gk#Xu&N-sZnvAOg~Q>1k!S#Mb{Js!^5qB}5g2uxxvZ=VS4sNxcsz6G z&c$5O+1Z(slY=Eu)q4v%#bHa;FMUcC6wp+h}=5pjlj7@ia;vP1G%2KYPfu}JjvML4x~s)&HcGQdy5 z^4nKG^IBk>1;$y_8v~3VKRz}#wl^SUZ?H_fC9nau!b*x!ZV7H^4PVz~~UCmZ}beZw^2K;2e8;a9NX z;432BMRJoFF4D1|27u$AI&})Gac~$C3JTPQ0**$2Wx|9AZLGQ+YEDj0VqzjX>h*fj zX?OeKH*oeVMCp;AU&xq%mFM2DmR0000 Date: Thu, 22 Dec 2022 09:18:55 +0100 Subject: [PATCH 3/3] Update manifest.txt --- assets/dolphin/internal/manifest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/dolphin/internal/manifest.txt b/assets/dolphin/internal/manifest.txt index 3618f6aaf..f67c494e5 100644 --- a/assets/dolphin/internal/manifest.txt +++ b/assets/dolphin/internal/manifest.txt @@ -7,7 +7,7 @@ Min butthurt: 0 Max butthurt: 14 Min level: 1 Max level: 30 -Weight: 7 +Weight: 1 # Animation 2 Name: L1_BadBattery_128x47