From 2921952ea5dc59002fc68bf615644ec56e58cc0d Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sat, 22 Oct 2022 10:48:26 +0200 Subject: [PATCH] Nuevas pantallas --- data/items/items.png | Bin 1017 -> 1085 bytes data/room/03.room | 18 ++++++------- data/room/03.tmx | 8 +++--- data/room/42.tmx | 8 +++--- data/room/43.room | 52 +++++++++++++++++++++++++------------ data/room/43.tmx | 32 +++++++++++------------ data/room/44.room | 4 +-- data/room/44.tmx | 32 +++++++++++------------ data/tilesets/standard.png | Bin 6505 -> 6597 bytes source/demo.cpp | 4 +-- 10 files changed, 88 insertions(+), 70 deletions(-) diff --git a/data/items/items.png b/data/items/items.png index 7b454bed44df189ec8950f02fc5c5eefbf91796a..67066b3ca1581d0ff4d5315a62dc72372db52b3b 100644 GIT binary patch delta 1051 zcmV+$1myeq2fYZ8F@N_-L_t(|ob6iMlB+NbgAV`y%Q-I_)~J%~(4N_L#(DwbyJI`q z%f9_!j4`%=ecyMs&UiBUecyLRpET4F*OU)VPJQ3;pZURPCj%-{-;s9+pk75^vCsTa z@=hQ6uk>gB9gI26wBW^e6}+?KcK&~0jNdMZ{=^PJKQDYLS%1;#SAt^gi+UYB2FUDZ z`m6FRex$KP9!#k+b_Y&&I*0S}jvZG36(5kNT7d@&F{70VWG#&ED(I{l6jaibe8rbl zJfiW++){>PHC2)~Wl#^3$-biwm%R9l>r5ZEaGdLx85xCD z%OYKEsOmVTAAj|nd=;jOgYG-iU4ct>CgryT9bT7KD^y|p zX8y+SNvA)FtU@JwWxhDx?7*pjZBWHl>NiWCI>DGju75%@x=V;!W4<7NHQ7#Ily&|+ zPzV{LBRE4Q?arx+HdOV-(SWTLW#+m{Sd?LMj6cSw{G&hPF;rTB?R=$z-5TmuYpw!S zOwm>~KBUo$Wp!StfLw5HO*vViRb^F76*`OWsfC?mSpJNU(OnBLJFKl(3o}`Kk3O(> z#n1eWBY)!bHLF17F!IM?o3+ylEo;Gd!1*x0)p%Mu<(yIFRE5VS66tKs>CZMP`^LgR zy-O`TTS%?F3f02d2w?W-n)5A=1k|s_4C1J?Fgn5lQU)q*io2_VRXl2jt!^xf-;Jd) z#<<+?q7Yki4x=3MIC*B9>2~s&j?Djx?~!)$RDTobf@4OgF%eKzx3b4%TpY|^CBf{y ze9=Xv?x0yYgq$sR5UsZ7CFliNw?W(X^V=AlX}C6qIKoA8Swh??s_Zjfwzf)V{LJqP z4on6b!6#d*8gmY+Ln7K@{Av?dk!^?q{j;VE5Kqm>pY5P?Dhoi#W;4+F`wlGM1Mif1 z)PJJ}bkxTxPRUjg$Hg7{3YP@V-D1XB5?7)0Pq-vS*=jYdZt|T?Iw~{9%|Q$(ezUpi z0;>kBHksK%xC7-*6~26pd3AWds(+=*)FHLv?~{F|*qw&%`&26C%*F5<2l-#3oInS* zi!O=PcKe1Tmu~v%icxJZw?XX6!t8!3mVbskYtwA4qK_R)S#m!G%lE+eTtQ4~*7Bd8 zw1~^Ux4C!MhVhQ3P)X38d)Qy&v2D-Ez_s{{G<;^r5>(lUPebXq8Eh>Z{-*(RA zZ%byQ(P%UpjYgxAz)F@Lj3L_t(|ob6dlcH=M%i~D^4D{D4&hQR&?Gs8`W<>@z=< zywivNEB&2+Cu43iEqL)=1@G**lm8B^^|uSEKea>9&lf(GtbgkCJ3+DbMZJz*17!9) z{Zn}sKhjttPo`8Ey8|bCIfwJ|jvZG36CaRgT7f4DF{6_TWG#&ED(J2n6jaib{KS`C zd{pC;xup!(YMLbPl0iL8rdwAXE_wA?_nAIy;X2n}W@Ken3RD8BL#!g59yVXF1Kf;s zEsJz@psM4Tet*>SdOSY=8iO+p_tp|uxJWKbh`U9Vea6f7cIk|t z`8~mj$v`9cWP4L%&OvoaR9lQ+9pWy!15u#=)^q{lty%fI6Ld~>0VvsS20DMg0^8q# zcYn&f>QMu_>SGnBWT&X(;*NcVmjqs?#f-Bg?n3Fm;F45jr`5E3$afCuoXi+E2Qi?! zW^>gAHVs%EGP8wn7s{O~eET!z-QoSN{+%jQm(-5GQgKzpO1WGAR*Wu@$3y?AKlsD~ zAgz1X5yWX&L0bwh;A>*3xXgBf*=Tj zAP9mW2!bF8f*=TjAP9mW2!bF8f*=TjAP9mW2!0a&0DgilS2>PV{r~^~07*qoM6N<$ Ef~s2SIsgCw diff --git a/data/room/03.room b/data/room/03.room index 531f0dd..23d2114 100644 --- a/data/room/03.room +++ b/data/room/03.room @@ -12,25 +12,25 @@ itemColor1=bright_cyan itemColor2=yellow [enemy] -tileset=bin.png -animation=bin.ani +tileset=code.png +animation=code.ani width=16 -height=8 +height=16 x=3 -y=3 +y=2 vx=0.4 vy=0 x1=3 -y1=3 +y1=2 x2=27 -y2=3 -color=white +y2=2 +color=yellow [/enemy] [item] tileset=items.png -tile=8 -x=18 +tile=42 +x=21 y=13 counter=1 [/item] \ No newline at end of file diff --git a/data/room/03.tmx b/data/room/03.tmx index 60253ec..6f7ee30 100644 --- a/data/room/03.tmx +++ b/data/room/03.tmx @@ -7,17 +7,17 @@ 25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25, -25,25,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,0,0,505,253,253,253,253,253,253,25,25, +25,25,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,0,0,505,25,25,25,25,25,25,25,25, 25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,25,0,0,0,0,0,25,25, 25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,25,0,0,0,0,0,25,25, 25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,25,0,0,0,0,0,25,25, 25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,25,0,0,0,0,0,25,25, 25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,25,0,0,0,0,0,25,25, 25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,0,25,0,0,0,0,0,25,25, -25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,0,0,25,0,0,0,0,0,25,25, +25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,0,0,25,25,25,0,0,0,25,25, 25,25,0,0,0,0,0,0,0,253,253,253,253,253,253,253,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,441,441,441,441,0,0,0,0,0,0,0,0,25,25, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,25, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,441,441,441,441,0,0,0,0,0,0,0,0,135,25, 25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25 diff --git a/data/room/42.tmx b/data/room/42.tmx index ab109a5..bdf03be 100644 --- a/data/room/42.tmx +++ b/data/room/42.tmx @@ -14,11 +14,11 @@ 36,0,0,0,0,0,0,0,305,0,0,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62, 36,0,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,421,0,0,0,0,0,0,0,0,0,0,0,0,0,62, 36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62, -36,0,415,421,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,415,421,415,415,0,0,0,0,0,62, +36,0,415,421,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,0,0,421,415,0,0,0,0,0,62, 36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,415,421,548,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,548,0,0,0,0,0,0, -415,415,415,415,415,415,415,421,415,415,415,415,415,415,415,415,415,415,421,421,0,0,421,421,0,0,415,415,415,415,415,415 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,507,415,421,531,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,507,0,0,0,0,531,0,0,0,0,0,0, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,423,385,0,0,26,44,44,44,44,44 diff --git a/data/room/43.room b/data/room/43.room index edd84a3..12652c2 100644 --- a/data/room/43.room +++ b/data/room/43.room @@ -1,33 +1,51 @@ -name=no 43 +name=the tube bgColor=black -border=red +border=blue tilemap=43.tmx tileset=standard.png roomUp=42.room roomDown=44.room roomLeft=0 roomRight=0 +itemColor1=yellow +itemColor2=red [enemy] -tileset=diskette.png -animation=diskette.ani -width=16 -height=16 -x=2 -y=2 -vx=0 +tileset=spider.png +animation=spider.ani +width=8 +height=8 +x=20 +y=5 +vx=0.3 vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=magenta +x1=20 +y1=5 +x2=23 +y2=5 +color=cyan +[/enemy] + +[enemy] +tileset=spider.png +animation=spider.ani +width=8 +height=8 +x=22 +y=11 +vx=0.3 +vy=0 +x1=20 +y1=11 +x2=23 +y2=11 +color=green [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=8 +x=21 +y=10 counter=1 [/item] \ No newline at end of file diff --git a/data/room/43.tmx b/data/room/43.tmx index f194f33..04a139b 100644 --- a/data/room/43.tmx +++ b/data/room/43.tmx @@ -3,22 +3,22 @@ -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25 +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,0,0,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,0,0,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,424,385,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,385,385,423,423,0,0,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,0,0,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,425,385,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,385,424,385,385,0,0,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,0,0,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,385,385,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,385,385,424,385,0,0,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,0,0,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,423,385,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,385,423,385,385,0,0,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,0,0,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,385,385,26,44,44,44,44,44, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,423,385,423,385,0,0,26,44,44,44,44,44 diff --git a/data/room/44.room b/data/room/44.room index c3a2e26..357b274 100644 --- a/data/room/44.room +++ b/data/room/44.room @@ -1,6 +1,6 @@ -name=no 44 +name=the kitchen bgColor=black -border=red +border=cyan tilemap=44.tmx tileset=standard.png roomUp=43.room diff --git a/data/room/44.tmx b/data/room/44.tmx index f194f33..834f028 100644 --- a/data/room/44.tmx +++ b/data/room/44.tmx @@ -3,22 +3,22 @@ -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25 +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,0,0,26,44,44,44,44,44, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,0,0,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,0,0,0,0,0,0,0,0,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,0,0,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,0,0,0,0,0,0,0,0,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,0,0,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,0,0,37,37, +37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37, +38,38,38,38,38,38,38,38,38,38,38,38,38,38,417,0,0,417,38,38,38,38,38,38,38,38,38,38,38,38,38,38 diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index db30ecacbf4e13eb2eea48a3cfa7d8933976113e..290951c04a92bd8bfc381dbd70570dcbc2add7e9 100644 GIT binary patch literal 6597 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 Aq5uE@ literal 6505 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 - //scoreboard->update(); + scoreboard->update(); screen->updateFX(); checkRoomChange(); } @@ -154,7 +154,7 @@ void Demo::render() room->renderEnemies(); room->renderItems(); renderRoomName(); - //scoreboard->render(); + scoreboard->render(); screen->renderFX(); //text->write(0, 0, std::to_string(counter));