From fab73fc3631c88932cd3a63ac3420bf090bb6876 Mon Sep 17 00:00:00 2001 From: StackZ <47382115+SuperSaiyajinStackZ@users.noreply.github.com> Date: Thu, 2 Jan 2020 10:00:36 +0100 Subject: [PATCH] Do Credits extern from Settings. --- assets/gfx/sprites.t3s | 2 +- assets/gfx/sprites/credits/stackZ.png | Bin 0 -> 22574 bytes assets/gfx/sprites/credits/voltZ.png | Bin 18611 -> 0 bytes include/screens/credits.hpp | 51 +++++++++++++ include/screens/settings.hpp | 3 - source/screens/credits.cpp | 102 ++++++++++++++++++++++++++ source/screens/settings.cpp | 75 +------------------ 7 files changed, 158 insertions(+), 75 deletions(-) create mode 100644 assets/gfx/sprites/credits/stackZ.png delete mode 100644 assets/gfx/sprites/credits/voltZ.png create mode 100644 include/screens/credits.hpp create mode 100644 source/screens/credits.cpp diff --git a/assets/gfx/sprites.t3s b/assets/gfx/sprites.t3s index 70c818c..66e901f 100644 --- a/assets/gfx/sprites.t3s +++ b/assets/gfx/sprites.t3s @@ -14,4 +14,4 @@ sprites/update.png sprites/view.png sprites/credits/discord.png -sprites/credits/voltZ.png \ No newline at end of file +sprites/credits/stackZ.png \ No newline at end of file diff --git a/assets/gfx/sprites/credits/stackZ.png b/assets/gfx/sprites/credits/stackZ.png new file mode 100644 index 0000000000000000000000000000000000000000..d84b16540d92694a936ea264321017cd8ba7652d GIT binary patch literal 22574 zcmV)EK)}C=P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3;cl3Y1+h2OCXEdkyv2MH6Q9ccOb4ywr^IUMsV z#GYwW=9)CeBv9`B&wpR{U;Jyeb(c%)b=2zlmq#9P@=N!hf1jVh=lA{nYu}y=KR@oi zKM{E-@iTq?tmo_XlgG;s2g+ZM+s}`?w!V(jzYg^E#J2+`ojLN$*X#P%fl~ZD9=`r| z`@1kKK#Vk5?4_IP*_WoF10{@!yZJ zySv|eK6f{BB~sOW-PE^RdB5>O!kN>1Tji_qf8qD`z6M{NTU=yplTG7mxiCT`+Bf8| z!wff^_j85CCFXcy<7bR3ruSG+EsnTeGP1tHjg4e%mpXY`WG(S<{C+Lrop-$RtifstKe~%T{6;(A{hBBw`yo!W``xVpj;`_eb4|U^z zNNgg5<%PL(gVWpR5LUt;wUu6;6R#^iJO62o(Dv5>2odKlTuex0z}JvUsKK`wTL{Fl zlb^|z$CRUyflx}^!Ci8bQYAS(>fF4ih4F*%$jPhrPkW2Flx5cax1`AYrTy&d+NEDUVH1kk3L5n2?#5rj^;)mW6a4( zCx@QAd-94oEn2c{#i}*yHf%1+XXRB^U2XL>*4%NYP5bYa?l=FOG-ALT9nRpy*h z_y3VOr__CA?$3GqP1g2&jFMi0)P;(vPZwb01*gy0r#R_f|7Un>-#@Pc+_ zkes`t&1gVc&aFQd^7n8n#}2QsIfzJ2*=(#`49eyT!#F$@eY^hbV|VV&%m5;wk}DVZu9bFj{m#G{0E|k#S#1c4Fq%N#U+b3yp4#@>iOSpk6u!q9 zfo?zPq7Ao_j&)sGr`qI@EtkD!n7OQYl{h=Mw3NBUk<%CzcF2dOxV>4a)CPqW>h3`5 z8Qq0Extl|zOkfYBApN`ea+Ei>?0nA39^qXQy z`-XAzoY{m_L}1jCH>JsaQhXf$&caoJr6=1pa&GrCX|b=Mec5TO&zl}=V_O|(#@&S<@m3yl`T`%MDqU;T7H zJy7adbFICMsI6T6O@|=$nfE5ZD%n)g%i4l18Df~}sf zs^Fech($faZ_sF5Gw#{b5;v@7yAlJyV%LuJ3!`$EW75)_H=(n#vRAKvA)xvPWW5{R zsbbHQ+Buva5oVR*$n-O@aKSpoi$o~FIKpZp0kNafY$n|pSMJ7{XhA@dr<$Z=L;L^bwF z3FbpF=a^f9I1>Sx-f~32>i;n0A-9c{yl6~xwiP0K+ahdlR(Jrr2!P-kC&qDE9n=Map zX4jTipePQl1ihc!Cg9n`iT7qV1|X6yiWy)fg=f%QhaB(N<`_HECFna7G;;7X*6(4{ z{SBT@>fzA1g-e3PIzXE4AsLsNrTm@fSVLt_Jj{dvkia>C?8_X;{-YC4t>5^~WoA#U(_~vq!Iys># z7m%HF*bP$Cx#m*s$lOM=0*#xyN(BK;jdisL;6&YJ1WoZTO7bEi+gT`z_Y`i(FNBs_ zmh5s#B5Z*j(d9|xS*pNL?8oxX!_yod$Pje`TqHWy(E|+Ksh!*0Tx}Pwt`FoPL-6lCR1O`m zn}o-b`Z;7OO92uW56<2ODV^p5zv#l%U}m!!qH`kOE0kTOL#n}R=!B9Eq!iZT%xX}M zm7)HA+KZl3tX>%Z`sec$BO+tMCL|u>tQ$?+S}FS=kN}h8sIfp#ES^%w9oo6ovgRBo zjdMpR8+c2eSk`;!%SApe;$=bq2X@VLC((4Zpu|?Y1Qn<(1e*}VT4^TG<6==$0x5$E zVvlYr+eLg~B#;HC6CXTv2gsaW4)N*8)0GZM&mPOu6VW_L*t!pD2y2Rw?q~!^j?|)* z5JW+>ngMl(3Rz(N;)Xk^M+7KuM$;l&Xjbr*exM{EywYGHAecm;454aX2}yA8sW^b+ zdQ#cwe6X+~Hf-DLDNaTcokAaSpI3CgD6qE1A>f|+1;2SI*L5YdHX_eg^<|aZ0nqPi z?`$`eOkA-crt?xly59nI8rOC9H^+gKqnC zf-F0=)wJcHr;)petg-#DOsWjzR@&yKPY)14Bz1iJY=)=?#Lpdb7Ni1a$#_~!E_U^x zEhtMaiFCjOh^T_xq$`e~Vd4YoL9x}>W@TC9OoI7JavCbyk*9#dq|ixh!|dNgIdQ(Y zaNHZ-p1?ezzys#+ZhQA|`zxS9DWFs$Oy@GfT`&*r=`JaN=u7yZ)Ia=`R_d*8Zlgm- zB&h|D<_KLn$3l}u&Ikq1-6Ek#N5Q4VOEIe!gDi9 z0^|0ZU>zK5bSJb%*98!9nun|qBVZud1Cyf58~t7!mrzI963v(zqFE~C!sQ*Rkqec$ z9;H5313LUH@KtzF9rV{K`tv|X&@a6{=m`Cfu7}c4ap(@BNLQo~ab^>CIR`+XKZ6Do z{pt3kSS_r?Mb(}j_aql4vbcbZ>ce6&N~DG&L=pmq_40krAu!~all`ZFrK-@|m0nF&@QRLC051m9264hvM$PL=wNR>G@6$|C3H zE}XGo;fhnnF(ec;cZmwyhjbp`4hM=wxp19PdG!Et5+@sf6nZ4u2-;0LV5Rbo%kjuk1a5{+R|f;%I! z=^qXI_{o11FXAcm@dP@*kc-wh(18`X$^r&Ig@)ZX4Omxg58P;#jZhhIk1a!5b}ukR zXanzOA(YUd!zD}+00Mv`(GA@fh;c2}-$6*9Y#_)Bc1@I5fh7=-fHoaJI9Chk_`D8Q zl$$|3x47S>q5)U^SN;R&PT0gu$){YMlv*$R3j)6@kf6qlS7GU>nAwNy=rk!UOv*-c zLTGSitw;;l0A$B{xp+2D7ZfML5P6TA1OySC962C;qBC$}AZdy~f5xj1y=QQ1#yuS5lw3WUB%o=%X8&72hvr$u;_3iM z3>QL}2N<|KO}gP#u>Kh8usZH*oDGq|gJ8$NLuL^)juS@pUzD zRip;~p~iU3p;QsjTa7KF_F_=6)04!>Q645^(E)u^79-^p5fr=?5#ArJ}Ynr>@%kjlj zqLp`}Q6n-!6xznFqFQ^~v;4Z7qTuMWCR=4Rg zYv%{#8Qigq*6|@~hEOJU5o{g~fo9g&6z~hQ+;U~p zhyy)&YEy%!4vU>k*Qeazpf7zZyjK-0V^5@KbOgsB|zimO?o82j{5&Y z2T&M#6Ly~2M@_!~QzsbJx(a=tVvb@#pv1g4aBrSAQ-FJ zB~cd~Pmc3N(vkw|6aBcqgWUwXD^dqFEop(@G+?bm(77%!2M-mi!^_Nqq*}hNs;o9d zKDKu8dcVm*p`kj*y_F7z$H}(PGDomwc8U~g54F3l(I%xVxl`$Y1>_8rM| zbyI}+@$`btgH+}rf{;5R;Bp9eCmq7^0i`^!{BMYK)pD!(##PAqHbgpVa%RLicN?!CHDe5O&x(6P zr`XbH4-tswq9D0KWGB)YOsJjK7Z1zHAb8qAgd^w@LTivI&fen_Oh{7L6c*hd0 zO2(s;k=>O;ucSr+&;Y!ECZm2ZJa`&9iWIgkg8+CQ3i3q>(MG>@i3d7DQ$$R9ZpUlw z5;rZ4)6{>sU0#aC!{uBA(|8yfrvrB@b%Mf3;NA@~1W_y9?LJ}k@CRMJaHT;{UoEU) zr!^jW`1N_x-TVd@sEUCz_!{ZWnEz&kS9;N+44?~>8i>KMhZ}_7kc|hIjUL7W%bpeT zOcHQkN^ygBCmI1+LOUGF52-Q1Uw#2CtTkU8HXKfYM$v|4G~_oVK+fLsit*neG9BM_ zlw4UT1mXr{Ad#H2CS*~o)3|Ji0;L9_75bZ3bIE(-BPjO_3>iIs5z)({rW+`MQ?*2e zv_s#+8Ce6Z>_8RjfFd{Sy;K^;6eZw6_f5zF7u5CW2^1Klhs7@Qhjoz4IVO zmdBHdFPJp~l~a)|AG=9($AUhtn^$}%79@D4IH0R22$wvus zUd_kBSn!l`m1UtHmeXwK%#8eAbjJzk0dy61^rcpP_vRf~i!c#(lFYC|^$VFkz9lwB z2$IZVcyZO1^Y+MY$PkkRe=Jx$Y4NmcnvNwFh*oJVF0o3oXgQHmrk9Tcvb6X@P6~)T z$S^c=v^KNyXU>1*;EzHEejRx2y(jZ2UnKoBk zsZy*XdK5}Ny`k`A0>DCQNV36Jl{3?W_605HF5YOw%U9}s17>5QckK9MV zuy6t_#^U0@rg8yD4nwqwVvP`>#7W@6rio^~PIE9?5Dc_L32HqJ)lW6z8q()`AOwB3 z8468_q~F+blON$U*LIN!ERO4QdE*H728M5Q z(&kMdY7CApl5NQNUD!ts9R&D%$BKT9=htivx3?ju`w^|fXint+q`=qPfFh5Mh(c(? zz6a$@Cw8s2gz zB0WN{(<oFhE~-UBF|E~VkdD&e42LF|QLQE=qgIk3* z6}L#)h05sO=(29cPwr zax4DlTRlEMZ6Y@dz1--X>Vhy{KDOd?_+$5sG6u0kM{lE^2J&mm<7op7EHDH9d&ChF zLVO3VpGJNg;(Y5gYt6LXTY<&=g@t-JLux(X?Q5YyZ%qZJXsC=;>%mV#oJaGWW!=e2 zjJM~7=;29FEru{G^4+|uqkXUiV6;rCnh2e=iBi;(m6Rw6L@1$Z-;R*}wu7}dYNIVE z1uQH#(ZFhi3m6I%bg3VTuQgOjUIPJ;GVDp~`G`EG#%S_fx`Y%R0LMxdG+Z{0;L;WC zYAqkBcZ&x0lzul~v_mRtwNtAJKrMCL@uIX2;uH;mDoOX{Mp| z;;loRe#k}J2RL&R7~9fKnt~8Dg#kLNcEB40$w$lRXf5z8jS$hH2Szcvc&pI3TUZBK zvu}h?qh=rBw1HK+{Q^3;Y|ND=&Tt4!1i$+QuA@gVz>7M?ogphs+fzVAho{30M`X?c zU(YHukd|9EBDrc?V28*67^K$FRHJ`p&pH3H+~WMdU6=X(6Bz(vO%4rzg||&|-0UJy z;TuqVBE}3pCv&)AgGw`CL;;qBypV7LTj=j+>4m`BWI%^tO4RT!YIOp-uUeEst&>@d zB1jrFD+eWZ%^4*_xHK4m6qZD1fXMlxcZfPxCSf5esG^}GP}{Qy?q}2P1Pwnf0+)6@Pwa`Y=D3RJA{mA=%wH0j@JD^rTjQOkKeVu?6PSvvXD4>&ZV1R$gQfaLmEy~f+ z0mO2I5R~GI3TV#hv`(oR58VgVZvD%+5~9>#a&FBhZ9?J{1uR)nVc3Mh#U=ZEuxgWY zg1+>M_NJh9wSi*=AKos8k12u6Tg^O`tJYIAd%@&N?a0#-^_De;B&h>nxB$#VC{%Ez z6VlcdXZ-s(Z)KweKtAyjL;()fkbI~Sw2l-Drn0XB(e11OSx#1QVO3>^n2AL0tnLp>(IxTBib0i0XF?P^gQ*Q zq~5dExVmN|wBOaNLZYL3-kZO+O#vH8+apan5s_kDHF=&=@M%cPXY>G9M;8wV&&?jR zyiKNgT|z;kA2eQ+64AI$yDu`pQMAuW*jb{i>qnZZF0gOe<*CDSp;}y!rM

h6cx; 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 VW0LvRFWmqD002ovPDHLkV1l2qO@IIZ literal 0 HcmV?d00001 diff --git a/assets/gfx/sprites/credits/voltZ.png b/assets/gfx/sprites/credits/voltZ.png deleted file mode 100644 index 26cfc2246690210a0a934a96103a8040c08932f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18611 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 KMNUMnLSTZu71?h9 diff --git a/include/screens/credits.hpp b/include/screens/credits.hpp new file mode 100644 index 0000000..8d1512a --- /dev/null +++ b/include/screens/credits.hpp @@ -0,0 +1,51 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019 DeadPhoenix8091, Epicpkmn11, Flame, RocketRobz, StackZ, TotallyNotGuy +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#ifndef CREDITS_HPP +#define CREDITS_HPP + +#include "screens/screen.hpp" +#include "screens/screenCommon.hpp" + +#include "utils/structs.hpp" + +#include + +class Credits : public screen +{ +public: + void Draw(void) const override; + void Logic(u32 hDown, u32 hHeld, touchPosition touch) override; +private: + int creditsPage = 1; + + std::vector arrowPos = { + {0, 215, 25, 25, -1}, // Back Arrow. + {295, 215, 25, 25, -1}, // Next Page. + }; +}; + +#endif \ No newline at end of file diff --git a/include/screens/settings.hpp b/include/screens/settings.hpp index 30d4911..5d68631 100644 --- a/include/screens/settings.hpp +++ b/include/screens/settings.hpp @@ -45,19 +45,16 @@ private: int colorMode = 0; int mode = 0; int Selection = 0; - int creditsPage = 1; // Draws. void DrawSubMenu(void) const; void DrawLanguageSelection(void) const; void DrawColorChanging(void) const; - void DrawCreditsScreen(void) const; void DrawMiscSettings(void) const; // Logic's. void SubMenuLogic(u32 hDown, u32 hHeld, touchPosition touch); void LanguageSelection(u32 hDown, touchPosition touch); void colorChanging(u32 hDown, touchPosition touch); - void CreditsLogic(u32 hDown, touchPosition touch); void MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch); std::vector mainButtons = { diff --git a/source/screens/credits.cpp b/source/screens/credits.cpp new file mode 100644 index 0000000..eb9d29f --- /dev/null +++ b/source/screens/credits.cpp @@ -0,0 +1,102 @@ +/* +* This file is part of Universal-Updater +* Copyright (C) 2019 DeadPhoenix8091, Epicpkmn11, Flame, RocketRobz, StackZ, TotallyNotGuy +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* Additional Terms 7.b and 7.c of GPLv3 apply to this file: +* * Requiring preservation of specified reasonable legal notices or +* author attributions in that material or in the Appropriate Legal +* Notices displayed by works containing it. +* * Prohibiting misrepresentation of the origin of that material, +* or requiring that modified versions of such material be marked in +* reasonable ways as different from the original version. +*/ + +#include "screens/credits.hpp" + +#include "utils/config.hpp" + +extern bool touching(touchPosition touch, Structs::ButtonPos button); + +void Credits::Draw(void) const { + std::string title = "Universal-Updater - "; + title += Lang::get("CREDITS"); + Gui::DrawTop(); + if (creditsPage != 4) { + if (Config::UseBars == true) { + Gui::DrawStringCentered(0, 0, 0.7f, Config::TxtColor, title, 400); + } else { + Gui::DrawStringCentered(0, 2, 0.7f, Config::TxtColor, title, 400); + } + Gui::DrawStringCentered(0, 40, 0.8f, Config::TxtColor, Lang::get("DEVELOPED_BY"), 400); + Gui::DrawStringCentered(0, 70, 0.8f, Config::TxtColor, Lang::get("MAIN_DEV"), 400); + Gui::sprite(sprites_stackZ_idx, 150, 95); + std::string currentVersion = Lang::get("CURRENT_VERSION"); + currentVersion += V_STRING; + Gui::DrawString(395-Gui::GetStringWidth(0.70f, currentVersion), 219, 0.70f, Config::TxtColor, currentVersion, 400); + } else { + Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(0, 0, 0, 190)); + Gui::sprite(sprites_discord_idx, 115, 35); + } + + Gui::DrawBottom(); + + if (creditsPage != 4) { + Gui::DrawArrow(0, 218, 0, 1); + Gui::DrawArrow(318, 240, 180.0, 1); + } + + if (creditsPage == 1) { + Gui::DrawStringCentered(0, -2, 0.7f, Config::TxtColor, Lang::get("TRANSLATORS"), 320); + Gui::DrawString(5, 30, 0.6f, Config::TxtColor, "- _mapple²\n- antoine62\n- Chips\n- David Pires\n- Flame\n- lemonnade0\n- Pk11\n- Roby Spia\n- StackZ\n- YoSoy"); + Gui::DrawString(180, 30, 0.6f, Config::TxtColor, "Русский\nFrançais\nPortuguês\nPortuguês\nBruh\nLietuvių\n日本語\nItaliano\nDeutsch, English\nEspañol"); + } else if (creditsPage == 2) { + Gui::DrawStringCentered(0, -2, 0.7f, Config::TxtColor, "Universal-Team", 320); + Gui::DrawStringCentered(-65, 35, 0.7f, Config::TxtColor, "DeadPhoenix"); + Gui::DrawStringCentered(-40, 65, 0.7f, Config::TxtColor, "Flame"); + Gui::DrawStringCentered(-38, 95, 0.7f, Config::TxtColor, "Pk11"); + Gui::DrawStringCentered(-60, 125, 0.7f, Config::TxtColor, "RocketRobz"); + Gui::DrawStringCentered(-42, 155, 0.7f, Config::TxtColor, "StackZ"); + Gui::DrawStringCentered(-65, 185, 0.7f, Config::TxtColor, "TotallyNotGuy"); + } else if (creditsPage == 3) { + Gui::DrawStringCentered(0, -2, 0.7f, Config::TxtColor, Lang::get("SCRIPTCREATORS"), 320); + Gui::DrawString(5, 27, 0.55f, Config::TxtColor, "- DualBladedKirito\n\n- Glazed_Belmont\n\n- Pk11\n\n- StackZ\n\n- The Conceptionist\n\n- YoSoy"); + Gui::DrawString(180, 27, 0.55f, Config::TxtColor, "1\n\n1\n\n1\n\n5\n\n10\n\n1/2"); + } else if (creditsPage == 4) { + Gui::Draw_Rect(0, 0, 320, 240, C2D_Color32(0, 0, 0, 190)); + Gui::DrawStringCentered(0, -2, 0.55f, Config::TxtColor, Lang::get("LINK"), 320); + Gui::DrawArrow(0, 218, 0, 1); + } +} + +void Credits::Logic(u32 hDown, u32 hHeld, touchPosition touch) { + if ((hDown & KEY_LEFT || hDown & KEY_L) || (hDown & KEY_TOUCH && touching(touch, arrowPos[0]))) { + if (creditsPage == 1) { + Screen::back(); + return; + } else if (creditsPage > 1) { + creditsPage--; + } + } + + if ((hDown & KEY_R || hDown & KEY_RIGHT) || (hDown & KEY_TOUCH && touching(touch, arrowPos[1]))) { + if (creditsPage < 4) creditsPage++; + } + + if (hDown & KEY_B) { + Screen::back(); + return; + } +} \ No newline at end of file diff --git a/source/screens/settings.cpp b/source/screens/settings.cpp index 684d1cb..da64f07 100644 --- a/source/screens/settings.cpp +++ b/source/screens/settings.cpp @@ -26,6 +26,7 @@ #include "keyboard.hpp" +#include "screens/credits.hpp" #include "screens/settings.hpp" #include "utils/config.hpp" @@ -45,8 +46,6 @@ void Settings::Draw(void) const { DrawLanguageSelection(); } else if (mode == 2) { DrawColorChanging(); - } else if (mode == 3) { - DrawCreditsScreen(); } else if (mode == 4) { DrawMiscSettings(); } @@ -189,57 +188,6 @@ void Settings::DrawColorChanging(void) const { } } -void Settings::DrawCreditsScreen(void) const { - std::string title = "Universal-Updater - "; - title += Lang::get("CREDITS"); - Gui::DrawTop(); - if (creditsPage != 4) { - if (Config::UseBars == true) { - Gui::DrawStringCentered(0, 0, 0.7f, Config::TxtColor, title, 400); - } else { - Gui::DrawStringCentered(0, 2, 0.7f, Config::TxtColor, title, 400); - } - Gui::DrawStringCentered(0, 40, 0.8f, Config::TxtColor, Lang::get("DEVELOPED_BY"), 400); - Gui::DrawStringCentered(0, 70, 0.8f, Config::TxtColor, Lang::get("MAIN_DEV"), 400); - Gui::sprite(sprites_voltZ_idx, 150, 115); - std::string currentVersion = Lang::get("CURRENT_VERSION"); - currentVersion += V_STRING; - Gui::DrawString(395-Gui::GetStringWidth(0.70f, currentVersion), 219, 0.70f, Config::TxtColor, currentVersion, 400); - } else { - Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(0, 0, 0, 190)); - Gui::sprite(sprites_discord_idx, 115, 35); - } - - Gui::DrawBottom(); - - if (creditsPage != 4) { - Gui::DrawArrow(0, 218, 0, 1); - Gui::DrawArrow(318, 240, 180.0, 1); - } - - if (creditsPage == 1) { - Gui::DrawStringCentered(0, -2, 0.7f, Config::TxtColor, Lang::get("TRANSLATORS"), 320); - Gui::DrawString(5, 30, 0.6f, Config::TxtColor, "- _mapple²\n- antoine62\n- Chips\n- David Pires\n- Flame\n- lemonnade0\n- Pk11\n- Roby Spia\n- StackZ\n- YoSoy"); - Gui::DrawString(180, 30, 0.6f, Config::TxtColor, "Русский\nFrançais\nPortuguês\nPortuguês\nBruh\nLietuvių\n日本語\nItaliano\nDeutsch, English\nEspañol"); - } else if (creditsPage == 2) { - Gui::DrawStringCentered(0, -2, 0.7f, Config::TxtColor, "Universal-Team", 320); - Gui::DrawStringCentered(-65, 35, 0.7f, Config::TxtColor, "DeadPhoenix"); - Gui::DrawStringCentered(-40, 65, 0.7f, Config::TxtColor, "Flame"); - Gui::DrawStringCentered(-38, 95, 0.7f, Config::TxtColor, "Pk11"); - Gui::DrawStringCentered(-60, 125, 0.7f, Config::TxtColor, "RocketRobz"); - Gui::DrawStringCentered(-42, 155, 0.7f, Config::TxtColor, "StackZ"); - Gui::DrawStringCentered(-65, 185, 0.7f, Config::TxtColor, "TotallyNotGuy"); - } else if (creditsPage == 3) { - Gui::DrawStringCentered(0, -2, 0.7f, Config::TxtColor, Lang::get("SCRIPTCREATORS"), 320); - Gui::DrawString(5, 27, 0.55f, Config::TxtColor, "- DualBladedKirito\n\n- Glazed_Belmont\n\n- Pk11\n\n- StackZ\n\n- The Conceptionist\n\n- YoSoy"); - Gui::DrawString(180, 27, 0.55f, Config::TxtColor, "1\n\n1\n\n1\n\n5\n\n10\n\n1/2"); - } else if (creditsPage == 4) { - Gui::Draw_Rect(0, 0, 320, 240, C2D_Color32(0, 0, 0, 190)); - Gui::DrawStringCentered(0, -2, 0.55f, Config::TxtColor, Lang::get("LINK"), 320); - Gui::DrawArrow(0, 218, 0, 1); - } -} - void Settings::DrawMiscSettings(void) const { Gui::DrawTop(); if (Config::UseBars == true) { @@ -312,7 +260,8 @@ void Settings::SubMenuLogic(u32 hDown, u32 hHeld, touchPosition touch) { } if (hDown & KEY_A) { - mode = Selection+1; + if (Selection + 1 == 3) Screen::set(std::make_unique()); + else mode = Selection+1; } if (hDown & KEY_TOUCH) { @@ -321,7 +270,7 @@ void Settings::SubMenuLogic(u32 hDown, u32 hHeld, touchPosition touch) { } else if (touching(touch, mainButtons[1])) { mode = 2; } else if (touching(touch, mainButtons[2])) { - mode = 3; + Screen::set(std::make_unique()); } } @@ -479,20 +428,6 @@ void Settings::colorChanging(u32 hDown, touchPosition touch) { } } -void Settings::CreditsLogic(u32 hDown, touchPosition touch) { - if ((hDown & KEY_LEFT || hDown & KEY_L) || (hDown & KEY_TOUCH && touching(touch, arrowPos[2]))) { - if (creditsPage == 1) mode = 0; - else if (creditsPage > 1) creditsPage--; - - } else if ((hDown & KEY_R || hDown & KEY_RIGHT) || (hDown & KEY_TOUCH && touching(touch, arrowPos[4]))) { - if (creditsPage < 4) creditsPage++; - } - - if (hDown & KEY_B) { - mode = 0; - } -} - void Settings::Logic(u32 hDown, u32 hHeld, touchPosition touch) { if (mode == 0) { SubMenuLogic(hDown, hHeld, touch); @@ -500,8 +435,6 @@ void Settings::Logic(u32 hDown, u32 hHeld, touchPosition touch) { LanguageSelection(hDown, touch); } else if (mode == 2) { colorChanging(hDown, touch); - } else if (mode == 3) { - CreditsLogic(hDown, touch); } else if (mode == 4) { MiscSettingsLogic(hDown, hHeld, touch); }