From a57a19ca4a1c0a9ec64c1673143e0438b551ed52 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sun, 23 Oct 2022 19:01:52 +0200 Subject: [PATCH] Trabajando en la abadia --- data/enemies/bat.ani | 9 +++ data/enemies/bat.png | Bin 0 -> 134 bytes data/items/items.png | Bin 1122 -> 1150 bytes data/room/06.room | 37 ++++++----- data/room/06.tmx | 32 +++++----- data/room/14.tmx | 2 +- data/room/15.room | 127 +++++++++++++++++++++++++++++++++---- data/room/15.tmx | 32 +++++----- data/tilesets/standard.png | Bin 6933 -> 7351 bytes source/director.cpp | 2 + source/game.cpp | 2 +- 11 files changed, 178 insertions(+), 65 deletions(-) create mode 100644 data/enemies/bat.ani create mode 100644 data/enemies/bat.png diff --git a/data/enemies/bat.ani b/data/enemies/bat.ani new file mode 100644 index 0000000..22355c1 --- /dev/null +++ b/data/enemies/bat.ani @@ -0,0 +1,9 @@ +frameWidth=9 +frameHeight=7 + +[animation] +name=default +speed=3 +loop=0 +frames=0,1 +[/animation] \ No newline at end of file diff --git a/data/enemies/bat.png b/data/enemies/bat.png new file mode 100644 index 0000000000000000000000000000000000000000..a9f4d9820e141ec0e63c9b907fd31b484a2ea118 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^LO{&U!3HE*ugcZ~DaPU;cPEB*=VV?2IS!sKjv*3L zd;1Le7z{X=y8r(-o_kAT@d;fvrdO7nlg?~TKILL+W?Q+?E?|D>22q9x$rZ29O>)07 h=~CbK!gb{{xw|IXzm1Tb^c!dvgQu&X%Q~loCIBu9=F@HEoL_t(|ob6f5cI+?+o6O1o|FXNOQ=&=&JJUtaL7Pcz9s&bS z?>%1M7-NiAz;PT0TW2zv{&5@!+n;-ABd#e9PEWn>@Mk>O-X(yB)O(a20%%w5ulQ#? zl)kfv{FVKT-^qm2Obc0jR>3^<6W$&0^no!P?{j&uDsBcre~pb`)Xv5Itd*nGhba5K`i zEbglVRUOCdqko-Ct|C++=-xBi6}V()dTxJ(%TfZPU}bLX%*^V3)jvzHOSY?W)sdOa zUmu!kF2;5B%jB6oC9n3FUiQrVXM8LCPTZJaCsPT=RSRo@d77*O)E?u=F0Wgw6{;}4 zGrsYC?$f_SR-ux;GGCl*cHvaO4yfWQ<;{|(ZZJm3Rewmf?-HWc7#EbUCfnJIx{lu) zl~6De!5K35c5YSlp{h5I25haUGuKtZq7Ktz@-aTekN%CvP-y{n@|6m9YiL)kxe8P< zMPJqUaF2diR_BEZ$OY%t6v@h7RaeDS*=OC?AJy)=n#XSqpvwj>CLc<7w%Zb50ehii}Gn?z1&#KRcxC9SZ~P zF17G%A+`1ts)e%=!2HiO$1RQow6Det;;ghV5@7);2bDI((^bJL88yRJ50=I6#?lyL z+`jLk5?gbGQ4eLDKJ(3NJN?W?#=pWn?p-p~1b@2Vm=o$u1XQ)H{4pID2lH1+Fncb4 z=%P_~(X3oT&X>E0R@?Iy^n$KCpx5jBUt@5l;o2DD3Kz*`330cm^3P=1+Uh=&XS^#o zF&XFtf7x2qnIot!iRg>Tt3zBxb|4D$zcpQecxy)a>;xUDEC8jO%|OTZ6IlKZ+$r;D zM}H0IXpdE#(ybzniyi+8w*=19V$N9-SE1}rxFkj0YBjAM^3EZhl^NsaAO;lQ*<5vj zRRdOs%zPo-g|btHk3VCc4)3S-SE@{1QY(C=;b@4Ja^>B%zyLfZy@=`a)BffE$|2mX z$dbwAvuam9*?wkYXa2db0EOF!v>MLJxPLoICdb|#*=iuFHLFR;X1v373*!KdLKwKJ zB)nzkq2PKXiAlg`26c(-v}R1y&Ly(^9f*!rh_dGicYsy6F_G!8JD_6Ynt^D5Rb8wk zR#_QQ_8gG~uSNpO?6fblTe0&-MP&?Ill@l6I$3of*+F3yvGEY&*ll;}8yzsGY*j5A z{umr}4u_@opP({N-6i+bf1}Z8G#ZUYqtR$I8jVJy(P%UpjYgxq$zd) delta 1088 zcmV-G1i$`RwQ|mkaGd~#Z$$*N~I`S?7)T`(n`^*m| z@ARSnN`L0x$(Ykj3toIy!8<$d zBO0&FEoC@XQzdy@2K6wRY#nvDby_^x!~NMa1@yG&kiYDV_~4) zRtxVIQhTpLwQx29nEk!ye2XIi^{X+1I4doTj8fBAkD6iKgJto%v9#7& zm-o9U#P*!SD2F^wp4n!)oqVPv^S|PIq&<1634e6KF(cHN2&k%C*<&&;4rZ^CVD?;o z(M6^1qUl^h&X&7~y6t%hx*_Wh=<)daH3nxI?yV)RaFJY=5O<3z`;3?Eb?Jaur15u!V)^q{ltr_{V6Ld~x0VvsQ20DM=f%bdgoidMl z)PI1E`dGy&*(&0=xMN@8lE8gh%s5M87fSzzOH!1rR#W$o?;O%unK5n-VnA`t=Bf*< z8n8NKW((milsi@U@@vei!~0eJohnn8RL5VbI4WYLTv@voSb&$EZerVfw|)6nIfT0v zSuz=aR_)3rqh~tadDA*vUZmA<#(7t1FMr0z)-2gfhl6U(-$>%~7RCV@nJ{owNqEcd zL&5!c5k+41%%Coj|1lcc?}72NgDgSr0IP6g;-_%=_cr(J+7K&@p^~6%z{kpUbMx0L z5glS{#*fKm^h|FyM=SnjJ~KV -30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30 +32,32,32,32,0,0,0,0,32,32,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68, +32,32,0,0,0,0,0,0,0,0,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92, +93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93, +117,0,0,0,403,403,403,403,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, +117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, +117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, +141,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, +32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,403,403,403,403,403,550,0,0,0,117, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,426,0,0,0,0,0,427,550,0,0,117, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,426,0,0,0,0,0,0,0,0,403,403,117, +32,67,68,67,68,403,403,403,550,0,0,0,0,0,526,403,67,68,67,68,403,550,0,0,0,0,0,0,0,0,140,141, +32,91,92,91,92,0,0,0,427,550,0,0,0,526,426,0,91,92,91,92,0,427,550,0,0,0,0,0,0,0,0,32, +135,0,0,0,0,0,0,0,0,0,0,0,526,426,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +135,0,0,0,0,0,0,0,0,0,0,526,426,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90 diff --git a/data/room/14.tmx b/data/room/14.tmx index ca0e9a5..836c8d1 100644 --- a/data/room/14.tmx +++ b/data/room/14.tmx @@ -18,7 +18,7 @@ 27,27,27,27,27,0,27,27,27,27,27,27,27,27,27,317,317,0,0,0,0,306,0,0,0,0,0,0,0,0,0,30, 0,0,0,0,0,0,27,0,0,0,0,0,0,0,27,317,317,0,0,306,0,0,306,0,0,306,0,306,306,0,0,30, 0,0,0,0,0,0,27,0,0,0,0,0,0,0,27,317,317,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, -30,30,30,30,30,0,30,30,30,30,30,30,30,30,30,30,30,30,30,30,0,0,0,0,306,306,306,306,306,306,306,30 +30,30,30,30,30,0,30,30,30,30,30,30,30,30,30,30,30,30,30,30,306,0,0,306,306,30,30,30,30,30,30,30 diff --git a/data/room/15.room b/data/room/15.room index d7749b4..5d058d9 100644 --- a/data/room/15.room +++ b/data/room/15.room @@ -1,33 +1,132 @@ -name=no 15 +name=now this is the batcave! bgColor=black -border=red +border=black tilemap=15.tmx tileset=standard.png roomUp=14.room roomDown=06.room roomLeft=0 roomRight=0 +itemColor1=yellow +itemColor2=red [enemy] -tileset=diskette.png -animation=diskette.ani -width=16 +tileset=batman.png +animation=batman.ani +width=8 height=16 -x=2 -y=2 -vx=0 +x=17 +y=13 +vx=0.8 vy=0 -x1=2 +x1=7 +y1=13 +x2=29 +y2=13 +color=white +flip=true +[/enemy] + +[enemy] +tileset=bat.png +animation=bat.ani +width=9 +height=7 +x=14 +y=2 +vx=0.5 +vy=0 +x1=9 y1=2 -x2=2 +x2=30 y2=2 -color=magenta +color=bright_blue +[/enemy] + +[enemy] +tileset=bat.png +animation=bat.ani +width=9 +height=7 +x=10 +y=10 +vx=0.5 +vy=0 +x1=1 +y1=10 +x2=30 +y2=10 +color=cyan +[/enemy] + +[enemy] +tileset=bat.png +animation=bat.ani +width=9 +height=7 +x=15 +y=1 +vx=0 +vy=0.7 +x1=15 +y1=1 +x2=15 +y2=11 +color=red [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=0 +x=5 +y=2 counter=1 +[/item] + +[item] +tileset=items.png +tile=0 +x=13 +y=12 +counter=2 +[/item] + +[item] +tileset=items.png +tile=0 +x=14 +y=12 +counter=3 +[/item] + +[item] +tileset=items.png +tile=0 +x=15 +y=12 +counter=4 +[/item] + +[item] +tileset=items.png +tile=0 +x=16 +y=12 +counter=5 +[/item] + +[item] +tileset=items.png +tile=0 +x=10 +y=4 +counter=6 +[/item] + +[item] +tileset=items.png +tile=0 +x=17 +y=7 +counter=7 [/item] \ No newline at end of file diff --git a/data/room/15.tmx b/data/room/15.tmx index 1c2cb6d..77f8bd7 100644 --- a/data/room/15.tmx +++ b/data/room/15.tmx @@ -3,22 +3,22 @@ -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26 +16,16,16,16,16,0,16,16,16,16,16,16,16,16,16,16,16,16,16,0,0,0,0,0,0,16,16,16,16,16,16,16, +16,16,0,0,0,0,0,349,16,349,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,16, +16,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16, +16,0,0,0,0,349,0,0,16,0,0,0,0,0,0,0,0,0,0,423,423,423,423,423,423,0,0,0,0,0,0,16, +16,0,0,0,16,16,16,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16, +16,0,0,0,0,0,0,16,16,16,16,0,0,0,423,0,0,0,423,547,0,0,0,0,0,0,0,0,0,0,0,16, +16,0,0,0,0,0,0,0,16,16,0,0,0,0,0,0,0,0,0,0,547,0,0,0,0,424,422,424,422,0,0,16, +16,0,0,424,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,422,0,0,0,0,0,0,0,0,0,16, +16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,422,0,0,0,0,422,0,0,0,0,0,0,0,422,16, +16,422,547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16, +16,0,0,409,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,555,0,0,0,0,0,523,422,16, +16,0,0,0,0,0,0,555,0,0,0,0,0,0,0,0,0,0,0,0,0,0,422,423,422,422,423,361,409,0,0,16, +16,0,0,0,422,409,422,423,422,422,423,409,422,0,0,0,0,423,424,0,0,0,0,0,0,0,0,289,0,0,0,16, +16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,289,0,0,0,16, +16,16,0,0,0,0,0,0,0,0,0,555,0,0,0,0,0,0,0,0,555,0,0,0,0,0,0,289,0,0,16,16, +16,349,349,349,349,0,0,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,16 diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index d05039977b424ae52cb9fed6d4735c89eb21e0be..a1f9e20f12193612aa66e66aaf944a04302dbf8e 100644 GIT binary patch delta 7291 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 Y*OY}l-(lQ11e_J48#k|i)OC&hKc-7Y-~a#s diff --git a/source/director.cpp b/source/director.cpp index 7de7a9b..02d4ed0 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -570,6 +570,8 @@ bool Director::setFileList() asset->add("/../data/enemies/arounder_stop.ani", t_data); asset->add("/../data/enemies/arounder_fly.png", t_bitmap); asset->add("/../data/enemies/arounder_fly.ani", t_data); + asset->add("/../data/enemies/bat.png", t_bitmap); + asset->add("/../data/enemies/bat.ani", t_data); // Jugador asset->add("/../data/player/player.png", t_bitmap); diff --git a/source/game.cpp b/source/game.cpp index 531706e..ad04b06 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -17,7 +17,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D // **** // this->debug->setEnabled(true); - currentRoom = "53.room"; + currentRoom = "14.room"; const int x = 30; const int y = 13; spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};