From 7b1c2a6005245e82871d516a89be8c70cd3db61d Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Mon, 4 Nov 2024 20:28:19 +0100 Subject: [PATCH] =?UTF-8?q?Nova=20font=20de=20text=20per=20al=20text=20gra?= =?UTF-8?q?n=20amb=20el=20doble=20de=20definici=C3=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/font/04b_25_2x.png | Bin 0 -> 8109 bytes data/font/04b_25_2x.txt | 194 ++++++++++++++++++++++++++++++++++++++++ source/director.cpp | 4 +- source/game.cpp | 4 +- source/resource.cpp | 6 +- 5 files changed, 203 insertions(+), 5 deletions(-) create mode 100644 data/font/04b_25_2x.png create mode 100644 data/font/04b_25_2x.txt diff --git a/data/font/04b_25_2x.png b/data/font/04b_25_2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d6297f719b39986981a90e95fd73f5c3d7c481da GIT binary patch literal 8109 zcmY+Jdpwi>|NoWVl~g*AB9@Xu5kd~z9CDgdhF01rg~%btvW(tIiZmJ~Vkx6-nRhvl z5rv{0#>ly1*wzS}!`S>Ty+5Dt?f1F<*tOSnU9ac$x~}c@c;26n*Q0YzHaoT{Y?F|X z*kNaT7A_&Np#b>)aqDK_v$Ml}5ZG-9huc_4P}>i(B_u$8c4y7qZa?Sc(r+k!R&23R zTQiH@#V8DW_A~n+qM%Cip5_PrM#uMBhZ(B5D*hJPn}&=W&ux=tY}NmPe59#mmGu3_ zL0dLwz|#7iNM;FfwzSe?=2v^$ys4gvF!ueSlJoPqGqqs76|yXF=k@I_i0|zu@q6}r z*Fxm*Lj9VlHCi88HyVC6k)+cvgfdM>G?+wzpf)JWa+Q zg&T=5^;nL(;b&-DSuD;}7#DEic}U}fyl!he+zZxXg)c>#SMHLrW#}y$fT=OI+-!c} z#;3{D5^Y58Ih2+XHG^0TB}J(Z%e?j80<+p~TljaF&I%$oH!qb%al{&fn9p8Nrsqs% zlg|V}8*IB51kj+{2n2%p_fh;V2l1xZtLC zGiugmd<75PT(#WY(Wj;Nqw{jQv6i@SEbW$2^I@WJ>^PJfHA5LKUwEsfT5YirYU@Ls zg2Cb`@Zpm!ZmC-JLxQ^p-lXa_O(5m0gzg3RTn3Fazw%6OWx%2Bxe@H=8{EPDg@ggs zM)^L{gxulb_=C2*9 z#p%M3g!d_KHGO4{PiV1DpBDoLdPF|;7IV*bKiIxeR_`3g{PmNt_}=)Z_Lc%E>pgXW z*Ny!;-Qq~&1aGr6g>LFpxh?^q@EVz{=< z$VC*{;lN{L$-8+g8vR@2ZnJhLXLP=yabrN4l19VUk4HVsXf)a$rilqSRQX!W z=D+7I7pM38;noIkO?!+=7%5@V!f(HO+o{>xWrlT;jlM=+3x)@j6)^lQ9myTchUOxq zYk>B_2J-7eA$N_pl{@G^+#q3{klhDmg#TDppao~)~L zS91vI@o8|L*rKf@$#FTfp?a?N)=VB;AF(@o)umi|TF7t{*{QI!fj3@T`}pX|du8?C z&>udBjxGAcD7>ZAhsB<0cR4rq6YIU}6MfAc;jI;mY0ae3D}RJL)vjLZ8?{{q-l=ct z#S{L!`FEFAO6uPPuJM;|j753HwCbHLb;QzQ6LDjTKE5x1QKTDe)eYlhPcxmbUvfy8 zbHC4&aviQy@z813`&@BieGtY_DE8>r)))1|nxI?y%Ykz<;rkoPP3vQzSDCNKqhZmp z!c}*0ZGC@L9Iiw*K8*s^a1iVr(1O1j0JWVHwndtD{~1v04(PE=M6Rr!9?rQtYSant zSYrH7D7QK`BsnPhJloF)>|td)jNPS3+Ka8| zP}9>t>;?9U;Ua!cOk{l%N(+t>aV9~|v`$emmvvm<)84{n+5de6=q9`VC`cLFNot3f6KA3{pzsqxfg|uD!21GkWK{zA`~RYpK1L3=3L} zw4O`C2U9M`twjfB6!Ivzpze95l;fy7)&m+zKZo)MdkrH+E&>^UdZZ=#`BQcFGV8f)2I$)q&$oIRY2W(Kv80*CvY{t9Oex|_(Q z9RCgNQ-FPF`^MpQv(F$uXsc9guXDgnc7dbeqy9oyaeKL0;CCmezUW(Q#r(+&Y=+e?9&#_J~{lLS(HH2XSOV)@4%~*25g6xSBD$JYsZsJL_Peg zE4)2!JX80A6|X?>bd+{+i@sLQO;p2*Fc_s`mmM5`XS2e}ZUHLmO1$7Ge&Ja>Hoe(r zFQhI-Qx(4z2@!LX*#|et4Y70hYIqr>})=Rb!H&PkS~w|U6? zdd^Gr(Dpsm`lwLuSWCf0kCGjn(0;$aKtF4?+Qx|leXT6?R_iO@wrikFn{RjmE&gWXw0+LS`-?4!*k+{hPYg8u#NziluY5_u)n8OUfZ&VWv6tdjNjx0N!NrTe8(kVuqZ?PvT_!_=J0f|dq)`|4&1Fj7Sb6|~8Bs0tIzcZK zFN%2-i?xN^8qU;|Esw|hi{0Pr`g-OP>oVVW?U~1kedQ)~rneC>g=ZZ67&?ER2b7z7 zz{+TU!o-IMpMU>T)PVzIW(Hz}Wo@^@b}Q zNfo6BkKE&9IGsX8d%c3F?8Sc8ERC@HKG4=h~Jl9KL;TGJDxh>l^CXOEsf4qMjT z$Y8O2csl{DoqhJsHH%-B#t?K#`JZO6mVMVQmP{|{A|M4K;t)jLcTjzW`_$9@-c;b3t+yKxD=sh~eFYOKwfP`{5r^1J@w^IM^)&r4xZo$Kl{iIY@Uk_WfWt@0{I z(>+F@uX^I}C&QOB7w`cq1;%{bODIQ(J4>tQii;311HplNZqfTTuvb@OSjpO>9Z4PO z4c9wIr`hw$1W24aAd0=yeFY#3<}rD=aRnO5ijG1vG@+$QZI$WuLxX-~@fl9Zwn>aR zLxj3|i6F}!+yig7GSe`8SoqP>?|K^rob)M}q0dfa6!z&WA;3?ZfB@boLY?h$8y!

iO#4VU>6Z`wp`-h-I_>6h#;X8OoiKm-6Ww%o>ch8~NzAh7l#1StLBl3EyTOZ2o%s+N-lxYT zIQ5m~+GDwqyMlyn>sN==>g>CJWw5_(v|6hH^MVl%)q~)LlT`VQ_`EWiy~jIphHiu4 z2cBHLk2-VAEKMe-9ioIydbYXc$gGjzJ2rDjAo0(YSM2>NEnj+%I>IpIi+abZzhw2g z%Si09o;_jGt<$&#TTxdQ(qEmoT`Z$d#s0p&f`$-E{XP|d&`U?J6DSQMXhAsPh7Ns%-5 zJb6n6al_gr5xY0;YCcJf-M(LV>MjrVc@ctTwUYhrY=IcUg>Nw&(}>84O%nguU=2~+ z8AZRMV{{-1dq%UoZ*0^%eOa`R3AJBLIUsEGh!hlx-@>dhfc0DHVz<;zaRg0U0eoyRip2UXbmm&++W1>qRn_ZZ_V*7h zYr574AFm4>^W}DH7)f!YjLKU$N3Y=J-(0>sLiWrE8-3A3vA~$y{+bIMY$vuf(K7rl z#r+1GdTlCbYik=&0_6RtUS#TZMoPZrBRi}nh_rOckDeNS4fVSvKT&K(!Na44{KUhD zzWSCbdI2<7zVv1HV+Yzn@00g7cTsv{lDKDGRFZZMNt zg4L*C*%6EEzJm0JL}oY-Ag#-|jeF)XMEQOEdl2H%y|iL#x~F0V>pNwP+vkoYLxLhL z1@J`#lel0rEE5<>5h_dzDV&$4q6h~XX)!US@cP$kUG(j^?yP++?lF$&psMtEtkXj; zKz4;?UBpiNeu5nymN*~KE6eRDuqP(Y@omUZejsS=gWwz90246W*`m}x(Sm5{E1@X6 zSHsE)J)#5-Y*F$ON<-8mlx%gi?sE_E@x$$3)caHrNz`yf?@H0HPUWnUgs&Km#cM9y zA_nMOo-XZn)Y1Rw)%{Lajn!?Z@rIw;C&Rh&t1h+AdadvlGUDq3WCT& z__e^{9NX^g?rgK_%dayh(%A#sebdnu?+HpI;SCFpV=E&h(22F93%Ra#uB3Xkdy-G# zl=uxq|JH~gUs)tXmH*v&1SC|4GxzVBWz z?&>M{Hciz|7u9z5^W3}(qi3ERO5eu}e_Z`svW%|ntnP_L`d>}h^zOxwj^NjB^Nr&V zoKHP9e&diIFZXnp(MbyT`$A=T=^$B032SUJ|5w?!GCAUsuW(4Dl5zQLF66xJA^%o{ zT=h=nDjBIaijEDooQLKQcb>Q1{TXB6{9|UYG9<-+qHb=}Y1^U7eKjYWw_CfhI5Vh$~@5PI7)rtrc-;RH4bzhy=NVFX|P-fKq`!@IbxOSM)kGKTtyq$d!BGowbFGu1ZZ-L>n3@ zCg0?Kq}KQFX}Wb&EBE-!EY|xMJzt~jt#DWlJ>15|CLkmPYvp_ce7g(-o(fsCh)lX$ zcHu<8t((Ka(g+%fTl~xN49>2}OAE~~uEzUKk0sxLsCFwkJt<+%`Mi0KmNm9A`=d?` zku@igfF1&6?+J2|PVqwvJd?E4MidY5tGn^kdSiOL49H4wd|qW3qHnx5gf0xDylm6r z9|#XZyR8SQt$j26Zx9+M^v6q^(8q>yan(J5L7*WhI^gsqxkENF10!0Vu%uyNM9|B< zdrlzv77Musq)No3d)F>rPj$AxudaY3Ee;ogDp8~epCC|Zlz^ZV;#tg@AI z_1whM&68J63w-(2eFXb#)Rf8Fh~tc>0XI+@2;e^TJGvUimi3PIZrdRt5!3J@U8nHH z{mYyFi(vn^e<96J*Bz}{|L?XfVp4So9T~Ct?uxQP1N1=%@gd6@hM>`_rY5Gba6<%G zUMU#-DD+G7%xIkQir2z$)Da)spOIy37w#a(WhMP^CR828UieAQsex(?BL&FFDnV6? z&UCDcX&Y4txh;xa_=81y+OwtHD8JlFGLJdW%c{Bgn0*moyAn7xi`T3J-`SO7tD#xj6>nw-IiFx^AH z`Q92k54IW_p9YvuhW*OBGF_;1dAKed;rAX*JbgfUVS2b`Qnd@7)9UNV{_GWP~q~0i*kegRFl4WlLa&XoY8!%?*<_$lD zcpP5_*;D%zlUK61VRP6rO~zz(Tc8|8FB}l81uawamx6a^fsKU z49kvUlZ#c{K%&7pGI^B65HF^92_Pp9JGl==0%;P><7z4^EBlV${M>)aE0e!Q~><~4<}8UtKFS?8u#OhGvNqY z__KWdd7{>f#PtEf)QMYuHeY<{|BvU1eVG@X6#Fi_2_1`e9)tDa*SQCRR>20@HG$-T zNi;eB2i*Xty7_KdEt+~koo;%&=uaVeYrVq!{o@t9wa)c?Hz0NYd<{Q#D#Kl_FU&q6 z0OJp;sIwH5?L^dEM9?*8o+QC(r2PGlS{*>;ibmRI6zLrDANd94p6u970tAo=7-!k9 zzkWwYNBie~*7`YCVsHL=982*e4odTXaufIoZmapwsxF1pOhkvACh^Dk1(BGm-OyOt zf8tC^`b9(>vMz`r;xB7H%X2g->ap(v9Sst{KITnYO6~_8PvgiGZ?Mw?gq**e29%xT z#6`pS`yCw}@v#JBE(hCo>k`eYjvz;{+$q^#5v~Dt3=qEtI+2!>nV{FH(=xpq{G;VA zyoGD{y-(~MEo!F;$L4}^g0J7a88qoOX$BYAB&0h9h`kpR&lRj#a=Ys&rnU9{NRPp5 zh3rKLoA@9Z>WGhltw{T8t0ev%7@^LGFZcoY@gs0ieF@i_jLMVcb=R0zf=!A~>QOs9 zxvigLQ)Wt8w4bg6UT+q>DT-t~t^V9_=WHY1ZPkw3q~+{|$#lAwbAZ&YEWK&iyq)m(4Zxwg-cR0L>JxtW(X=j8U!-q0$w2vPumS+8Z?;TvdyZpeHsueVIM`^9j6~`tO;rhF>rZz=fR&NO zM?5WhrF6tzfVTA1Bz`t9*D?{33;Z8VfU9pXjXjjE#+0k!-~Jj|AhF)fELx(|TyaV|>#fU?J0=A2qsa6PHVO9PDr^0W%Cd%Y@| zoX^nCtGivC4(9+$a-z{4oB}!Ml2;9wE_6B_ybs(5OuYPpmk8@h6({-y@#|XApM`_P zEgcB)Bqz?js`c$j(a=hK&r+klCpY{F+H@kAU}g5lq{^yD{P}eHW>`#drp!HJ@7P=} zEV`Lo55Spt5dZz-?Eo<_moLpuwY>|vGa0`vI2WjQrzx(N0K=8!Q2ocT*tGG0B)qXLJkP5;z*gva9ZcQ(|0;^(ZxK0E&nD=YA6)ifr6( zRiM+CQ@p|-laYa_1>X1;q z$LraT@v0>U9sfDOWR47b)=ES4r-mC)0s;W|#GI)YH$IJ0qKYjrMHlh_)97fo-twtP zawl$vv@}MB=0vEAmZuU^|3K3D-w>AkQyKPxKMrCgl3VwkYNNJvM|lCODtVA#F+f*> z-(od?p&C+@Aap8TUjX<6N%A0-hU5BiJp#WRt#T*=;{~VGtL3IfasH4}Fd>NT%JkZu z+A5WO|M&&ZlL%zFd2XE)A})U!R&Gk#Txy_1ZcB3%J4h;4La7S@Ia+5h zT8eVyI<^G~^97YZa1vIpq5)W35+}2byLCo{Cw6jaQvSM;5xu0 z_)p_DxNYa63J~_iL?(ReDd2*irC|xrxr&!V6O@3~f481hQ2k@DBu=_MaQ%>-mD5?O I#pQed50ti +16 +# 63 ? +16 +# 64 @ +22 +# 65 A +16 +# 66 B +16 +# 67 C +16 +# 68 D +16 +# 69 E +16 +# 70 F +16 +# 71 G +16 +# 72 H +16 +# 73 I +10 +# 74 J +16 +# 75 K +16 +# 76 L +16 +# 77 M +22 +# 78 N +16 +# 79 O +16 +# 80 P +16 +# 81 Q +16 +# 82 R +16 +# 83 S +16 +# 84 T +18 +# 85 U +16 +# 86 V +16 +# 87 W +22 +# 88 X +16 +# 89 Y +16 +# 90 Z +16 +# 91 [ +14 +# 92 \ +22 +# 93 ] +14 +# 94 ^ +12 +# 95 _ +14 +# 96 ` +12 +# 97 a +16 +# 98 b +16 +# 99 c +16 +# 100 d +16 +# 101 e +16 +# 102 f +16 +# 103 g +16 +# 104 h +16 +# 105 i +10 +# 106 j +16 +# 107 k +16 +# 108 l +16 +# 109 m +22 +# 110 n +16 +# 111 o +16 +# 112 p +16 +# 113 q +16 +# 114 r +16 +# 115 s +16 +# 116 t +18 +# 117 u +16 +# 118 v +16 +# 119 w +22 +# 120 x +16 +# 121 y +16 +# 122 z +16 +# 123 { +2 +# 124 | +2 +# 125 } +2 +# 126 ~ +2 \ No newline at end of file diff --git a/source/director.cpp b/source/director.cpp index 70a4d8c..f4a7892 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -495,6 +495,8 @@ void Director::setFileList() Asset::get()->add(prefix + "/data/font/smb2.txt", AssetType::FONT); Asset::get()->add(prefix + "/data/font/04b_25.png", AssetType::BITMAP); Asset::get()->add(prefix + "/data/font/04b_25.txt", AssetType::FONT); + Asset::get()->add(prefix + "/data/font/04b_25_2x.png", AssetType::BITMAP); + Asset::get()->add(prefix + "/data/font/04b_25_2x.txt", AssetType::FONT); // Textos Asset::get()->add(prefix + "/data/lang/es_ES.txt", AssetType::LANG); @@ -614,7 +616,7 @@ void Director::runGame() { const auto player_id = section::options == section::Options::GAME_PLAY_1P ? 1 : 2; #ifdef DEBUG - constexpr auto current_stage = 9; + constexpr auto current_stage = 0; #else constexpr auto current_stage = 0; #endif diff --git a/source/game.cpp b/source/game.cpp index fc75e77..76dcdd3 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -351,9 +351,9 @@ void Game::updateStage() createMessage(paths, Resource::get()->getTexture("last_stage")); else { - auto text = Resource::get()->getText("04b_25"); + auto text = Resource::get()->getText("04b_25_2x"); const std::string caption = std::to_string(10 - current_stage_) + lang::getText(38); - createMessage(paths, text->writeToTexture(caption, 2, -2)); + createMessage(paths, text->writeToTexture(caption, 1, -4)); } } } diff --git a/source/resource.cpp b/source/resource.cpp index 1c0b1aa..edd33e4 100644 --- a/source/resource.cpp +++ b/source/resource.cpp @@ -255,7 +255,6 @@ void Resource::createTextures() }; std::cout << "\n>> CREATING TEXTURES" << std::endl; - auto text = getText("04b_25"); // Tamaño normal std::vector strings = { @@ -267,6 +266,7 @@ void Resource::createTextures() NameAndText("game_text_stop", lang::getText(119)), NameAndText("1000000_points", lang::getText(76))}; + auto text = getText("04b_25"); for (const auto &s : strings) { textures_.emplace_back(ResourceTexture(s.name, text->writeToTexture(s.text, 1, -2))); @@ -280,9 +280,10 @@ void Resource::createTextures() NameAndText("congratulations", lang::getText(50)), NameAndText("game_over", "Game Over")}; + auto text2 = getText("04b_25_2x"); for (const auto &s : strings2X) { - textures_.emplace_back(ResourceTexture(s.name, text->writeToTexture(s.text, 2, -2))); + textures_.emplace_back(ResourceTexture(s.name, text2->writeToTexture(s.text, 1, -4))); printWithDots("Texture : ", s.name, "[ DONE ]"); } } @@ -294,6 +295,7 @@ void Resource::createText() std::vector> resources = { {"04b_25", "04b_25.png"}, + {"04b_25_2x", "04b_25_2x.png"}, {"8bithud", "8bithud.png"}, {"nokia", "nokia.png"}, {"smb2", "smb2.gif"}};