From 6a0ee4f811d81a15cfc4846703cd2432db7fa45f Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Wed, 26 Jun 2024 22:05:36 +0200 Subject: [PATCH] =?UTF-8?q?Actualizados=20los=20gr=C3=A1ficos=20del=20t?= =?UTF-8?q?=C3=ADtulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/config/param.txt | 5 ++++- data/gfx/title_bg_tile.png | Bin 899 -> 1317 bytes data/gfx/title_coffee.png | Bin 1060 -> 2166 bytes data/gfx/title_crisis.png | Bin 1143 -> 1950 bytes source/common/utils.h | 2 ++ source/game_logo.cpp | 16 ++++++++-------- source/load_param.cpp | 10 +++++++++- source/title.cpp | 2 +- 8 files changed, 24 insertions(+), 11 deletions(-) diff --git a/data/config/param.txt b/data/config/param.txt index cbb5da5..40fed28 100644 --- a/data/config/param.txt +++ b/data/config/param.txt @@ -13,4 +13,7 @@ fadePostDuration 50 scoreboard.x 10 scoreboard.y 208 scoreboard.w 300 -scoreboard.h 32 \ No newline at end of file +scoreboard.h 32 + +#TITLE +pressStart 160 \ No newline at end of file diff --git a/data/gfx/title_bg_tile.png b/data/gfx/title_bg_tile.png index 6f0ea2985458245a77660b3692707e57e3a538d7..701763e8df5108c43976dc8c709c6727ddc65a8a 100644 GIT binary patch delta 1299 zcmV+u1?>8R2c-&-BYy#YX+uL$b5ch_AXIW;ZgXa3av*nUbZ8(%X>)LFVR;}>GayG{ zZFO`202q~HU|@Wclbl=3!oa|gn^#g4H6qPVA zFzNu=%H<^mAa($dEm8z@6p)<)Vy8pc6(DvJgxv#H6B6VMWG?`+6_PU&fod5K0NFZ8 zNaE>8?A)BvWT+cJuIGWWMSxg_!G$4{p_rk7A%`K6p^`y?A%MZSB(H$S8$o=) zq%IIa2#J?{U1PqinY8mM+)VD~^>Wn3q*Cz&K&`lPB#Cvjr? z#Yyaro}YjHg^YN7T;`k}##v`C0C#VI%503sH+xi7#dZ!w+qM7zaJ^o8%c$$4^ZRl+ zSIHYj(|-ZrQ=Imb8iF+ddJ35ktKA2j;x>kw^GFR*bPS-%S5@WQp4@jIb69DyJ>Q23 z=EAixiOyHoM=KMGWI!L~XS3PI4>#7v1ZNBwsx5^^dD?E8=0k>S{^A%QjrIttyzB35 zKy?Y9&vj?24acKSDS)_l5f=-JVu05BG3H>+On*K9@bH5b_V)Hi^d03%nV|80(=;sI zF$S12ITjSffWDy0(zXk#jrQ{L8vp>Fo__ZFJ|r|soA@sn5CWC~xL0$Y0;%xL0JDMb zbj%ANFq*Gct4>?`oyzy2ZQJNMi7#;v&?Ylt%;7XM-MiE26aWAwlL_1Zd_DsJ!0B}A zy?;PNOcs2px4@7r;AD&50{i{G(?(BIATy9T7!&%Q0x?+Ndx;ju0D!KiLegpGSR1oM zF#tV@OzLdjnLt>+`R#b=LXso&k4n0QE5# z`xx?JyL`0`n(P3`OD?fYn=4-_{4zJ_4(Yex;RyRo&xtidVg@c z-KyrIF~k>BIt<8BpU;h8H;2~eDKP7V9@}g-s`cPFltWJedOEPDfHrW2)aP@<`d?z& z7!X@&$^`8=DWWhyg4pt6!N~y1guay;Q=S%Dk80s$fVt=#%BKKp0LlQ)7_`6bcge~F z5ChPfoXrT_wvhHOEl=R&v{X6C?|)pt*P-oR@M#N}9*V7eY2F7&z<}KFCeLjWq`1)HeZv`9eJwTgDa^?iNg=>$Px&JxN4CRCt{2n$2qCFc8NlOE3vp3c*=Q zNUlpCqz};NFTEy&(wIP5lVAe7hcc}_)yIr2Y1DOp(1T)2vNV5DNNsrMNvfQtZ5nm0JvVSz1yg&lk<65E`LSsP5rOrfp6gSJ?=yp zCjc#lN(fc%gK6M4g|_?QPDIu|fDXPW3g_}PJ@+ZcsDRLx@1unFhf94D?XRj%RwZPq zfIfp?EEey7rn)vIIDJ5@G8f6!c5Z{qrEE{NaXQHc z1rYWu;!;6Y3V)DVKSUo!1yIZ1-25~)_WJsV^&H#dDnVlXx~`3KM<38`)1-o|6wnts zSXy==Ito8NJ^=v0-QDkA&toDPbesP|0Yfk<0N1MKE|7|E1+)tor{lco+hJB;Nli$T}o zIbxa!*MECloD(p_a`DY2~Ho7B0sN4@6#01@XnAQog7vt&$0r4(&d+OORewOL{5%EMK3Z_M+ll(3KE&r!IttLp z&uioSFEI{7^YawEbwZ16w_EnNwCiCzbQhqzLy%ZtNPb?MU{_+H2TheAt;gj%8r1#( zA5x1-8NC9G6EGwlWg|wLA?QqiMt)u!s}D$(pN|bjhqiOUrzMa&Kd+5*7f6wxkB#p> z!Di?LQ|9Nju__={ex8ES-)gl20QosUdXwZl2c*c)YvVl$#?H@ECX)#O0344;0QgV> z7wH`$`zRbMKd+5A7DzQfssw30E~AeHvX2I(7M1c36Wj3rb+w6J00000NkvXXu0mjf D6~>-u diff --git a/data/gfx/title_coffee.png b/data/gfx/title_coffee.png index 1dc74c0afd03b9b84543b5615fd1d532d636257a..1cc98602e678cd9ac1f01686f6a39a3c68014116 100644 GIT binary patch literal 2166 zcmV-+2#NQJP))LFVR;}>GayG{ZFO`202q~HU|@Wclbl=3!oa|gn^#g4 z8058zdJLl`t?c>Hyiw*6s2f18=Yg_CfLMmXg&~un zn4y3nhar)nl0ktXfWf#VwW0*1z&XF5vM4h>qeQ{6pdcqz!80#ePe;MXz|fq50Tgx+ zV?GChO=T22gAi-J&%j{2|NsC0yAfhu`xzKE0(EljM2KlvFfa&mGccUkS&&$i2o_=n zVy3h-28K_|85npY85o2w0QE!{rx_bTe8A(xz`%O%|NqZw3=Hg(85sUf`2YX+qW}N@ zE(U78!@zJL4*<77WY93V1Umo#2D3>-K~#90?VUZ3<2De6hkFSi7=aPP+qtnvJfZ$8+EWV=V zogry`C>ThQJO6h%bbkP#^dGWyV;dp+ceZ7=XSIpd)*zOL6>Mi4N(rK&iUO#{3IMBXd;0ZcXzAu?rv4;g3@ZBR8@xq+u264t>BGLw!TBS(Hch(hO#`YO6MYiOsWOJ zk6Hz~cJs(EPUu6$K-xT~AB(QeJc7`dS_R7107Wk55dI)7!IB3Ao(ZqQU6f2YaxY&fc z@?caT3}RJ!(SgTywoy?lP#@Pz1$u`|)|Cp>%yxFVYr4pxEOID+gO8}6`o<&QZK#g6 zwnFuXeBWb(mJRJZQ0wTiHELj@qqYG=oCEnd{_Ns62J2{QDQ(g+1RZ%uN z0BTQVqF5oW^+yxvb0C1u#R8=_fcj&Cu*bHk=RiF_OEa4#Y}cv7MQR-YeEOrQPby#! z7dnP%PEn!5g;>Kvtl>k)u%a>~z#O(*nhrxxl;Lbhf3zA1v+=&>2|Zb^HZeLsbPm+F zzo>(Tiw>jjNlok%w@E9IkAbjE8`}A%fl>qumhMZ}(Ga|3CN_1DRv>MX77bTlfvAIq ziw;NdlA5@)0K`0adq~h_Anbz;HD&CR*A}>xK})5>bv`+mxYIx+&Xo$(8n{d{E_v{B zFmbX9)Q~~E4TOELp{9&|^4bEIGH9g&5mq3(6Z#kk`(Q)$rw$gWKu#UxCQe>~h8hU_ zU_(tA`{cC+ZpvWcqQlleRe>6Gq^&?k5W?TzXVF&S%=TPcNGDR9tb$MGPkJq!D`+v3 z7=n&;706|xMga&FD5CD9LCY-jqa?Mafb`uk&u5?xXZ)%ne}58B4DR!%^PitzGIcvG zn*M229eudZpK5nx_WgbrEf>HlK9l9Sw7KLMX==Vcz5e{jWqmB^FtMw^$JiI=troXE^){3$Mgl2s%T0*lORt4gq zBSeE?9@4%rP3*eGq4roS%8aj{2+E-nX{a*YSTnzQJ4@SUe~*g}o7xL@FFE^j&@eRH zJ-j}u#r&xMlPv4nH#uVH2mvb=LUru+6SbHh>vN!NT`f&qGC#GRq3yfy$#nL~iBW-k zGcLA{kel1gQ3<7v#r#xra%N3PhoUdPERAJ}Z+X4l8oh*(S7oE}5T; z4h*Pc!qx%sK4-11!tM4G$kuPa4e2kX{B()Fr1r6p3RL~%qDS-V%@5^nKY`jZ9rdal zb+(ZTgsTGs>X@)~m^j~&s@d%)%68tE;c}vc%b{i<}UF*4?36XMZoAU&MBoffd$Pn7wC)|k*kHyOSOed(+~+C+=_5w^39vaeOc#GIt1 zGOKH1CddqE`u1S%KTgCJ(QV>aXwK zDqRY*>Nbu0a)R5$&^)GnjERTWM}^iQt|yj+lzcOgtv8kh@7u+v51-EuJTZqkdbm1d ssH%@)=&%Vx13>cwF;eRo6Z+i#4~Q$u0~vGVL;wH)07*qoM6N<$f;`*mg#Z8m literal 1060 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 JPDHLkV1hJr9=8Ah diff --git a/source/common/utils.h b/source/common/utils.h index a990e19..851aec1 100644 --- a/source/common/utils.h +++ b/source/common/utils.h @@ -168,6 +168,8 @@ struct param_t int fadeRandomSquaresDelay; // Duración entre cada pintado de cuadrados int fadeRandomSquaresMult; // Cantidad de cuadrados que se pintaran cada vez int fadePostDuration; // Duración final del fade + + int pressStart; // Posición del texto para empezar a jugar }; // Calcula el cuadrado de la distancia entre dos puntos diff --git a/source/game_logo.cpp b/source/game_logo.cpp index c68f16d..7ff79cc 100644 --- a/source/game_logo.cpp +++ b/source/game_logo.cpp @@ -65,30 +65,30 @@ void GameLogo::init() // Inicializa el bitmap de 'Coffee' coffeeBitmap->init(); coffeeBitmap->setPosX(xp); - coffeeBitmap->setPosY(y - coffeeBitmap->getHeight() - desp); - coffeeBitmap->setWidth(167); - coffeeBitmap->setHeight(46); + coffeeBitmap->setPosY(y - coffeeTexture->getHeight() - desp); + coffeeBitmap->setWidth(coffeeTexture->getWidth()); + coffeeBitmap->setHeight(coffeeTexture->getHeight()); coffeeBitmap->setVelX(0.0f); coffeeBitmap->setVelY(2.5f); coffeeBitmap->setAccelX(0.0f); coffeeBitmap->setAccelY(0.1f); - coffeeBitmap->setSpriteClip(0, 0, 167, 46); + coffeeBitmap->setSpriteClip(0, 0, coffeeTexture->getWidth(), coffeeTexture->getHeight()); coffeeBitmap->setEnabled(true); coffeeBitmap->setEnabledCounter(0); coffeeBitmap->setDestX(xp); - coffeeBitmap->setDestY(y - coffeeBitmap->getHeight()); + coffeeBitmap->setDestY(y - coffeeTexture->getHeight()); // Inicializa el bitmap de 'Crisis' crisisBitmap->init(); crisisBitmap->setPosX(xp + 15); crisisBitmap->setPosY(y + desp); - crisisBitmap->setWidth(137); - crisisBitmap->setHeight(46); + crisisBitmap->setWidth(crisisTexture->getWidth()); + crisisBitmap->setHeight(crisisTexture->getHeight()); crisisBitmap->setVelX(0.0f); crisisBitmap->setVelY(-2.5f); crisisBitmap->setAccelX(0.0f); crisisBitmap->setAccelY(-0.1f); - crisisBitmap->setSpriteClip(0, 0, 137, 46); + crisisBitmap->setSpriteClip(0, 0, crisisTexture->getWidth(), crisisTexture->getHeight()); crisisBitmap->setEnabled(true); crisisBitmap->setEnabledCounter(0); crisisBitmap->setDestX(xp + 15); diff --git a/source/load_param.cpp b/source/load_param.cpp index 073e5f4..b43456d 100644 --- a/source/load_param.cpp +++ b/source/load_param.cpp @@ -21,6 +21,9 @@ void initParam(param_t *param) param->fadeRandomSquaresDelay = 1; param->fadeRandomSquaresMult = 8; param->fadePostDuration = 20; + + // Posició del texto para empezar a jugar + param->pressStart = 180; } // Establece valores para los parametros a partir de un fichero de texto @@ -73,7 +76,7 @@ void loadParam(param_t *param, std::string filePath) { // Se queda con la primera palabra param1 = line.substr(0, pos); - + // Y recorta la linea line = line.substr(pos, std::string::npos); @@ -172,6 +175,11 @@ bool setOptions(param_t *param, std::string var, std::string value) param->scoreboard.h = std::stoi(value); } + else if (var == "pressStart") + { + param->pressStart = std::stoi(value); + } + else { success = false; diff --git a/source/title.cpp b/source/title.cpp index 09165da..f55ecb5 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -252,7 +252,7 @@ void Title::render() // 'PULSA 1P o 2P PARA JUGAR' if (counter % 50 > 14) { - text1->writeDX(TXT_CENTER | TXT_SHADOW, GAMECANVAS_CENTER_X, param->gameHeight / 5 * 3, lang->getText(23), 1, noColor, 1, shdwTxtColor); + text1->writeDX(TXT_CENTER | TXT_SHADOW, GAMECANVAS_CENTER_X, param->pressStart, lang->getText(23), 1, noColor, 1, shdwTxtColor); } // Mini logo