From 585443418c2674c3e917eef4507ea15637e27b3f Mon Sep 17 00:00:00 2001 From: Sergio Date: Fri, 21 Oct 2022 17:02:47 +0200 Subject: [PATCH 1/6] Eliminar 'data/config/config.txt' --- data/config/config.txt | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 data/config/config.txt diff --git a/data/config/config.txt b/data/config/config.txt deleted file mode 100644 index 76d12ec..0000000 --- a/data/config/config.txt +++ /dev/null @@ -1,8 +0,0 @@ -fullScreenMode=0 -windowSize=3 -filter=FILTER_NEAREST -vSync=true -integerScale=true -keepAspect=true -borderEnabled=true -borderSize=0.100000 From 5be93dd27ffab0a7ba3b56b3b80706a2d8c0da60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Fri, 21 Oct 2022 17:09:09 +0200 Subject: [PATCH 2/6] Actualizado .gitignore --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5c56f06..99ab783 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .vscode bin -data/config.txt -data/score.bin +*config.txt dll docs icon From 053992de987e43b2db110d5b7ddb0f402617b6fa Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sat, 22 Oct 2022 09:04:36 +0200 Subject: [PATCH 3/6] Retocada la Jail --- Makefile | 3 ++ data/enemies/bry.ani | 9 ++++ data/enemies/bry.png | Bin 0 -> 253 bytes data/enemies/lamp.ani | 9 ++++ data/enemies/lamp.png | Bin 0 -> 160 bytes data/enemies/tv.ani | 9 ++++ data/enemies/tv.png | Bin 0 -> 300 bytes data/enemies/tv_panel.ani | 9 ++++ data/enemies/tv_panel.png | Bin 0 -> 413 bytes data/room/01.room | 82 ++++++++++++++++++++++++++++++++++++- data/room/01.tmx | 18 ++++---- data/tilesets/standard.png | Bin 6467 -> 6505 bytes source/director.cpp | 23 ++++++++++- source/game.cpp | 2 +- 14 files changed, 152 insertions(+), 12 deletions(-) create mode 100644 data/enemies/bry.ani create mode 100644 data/enemies/bry.png create mode 100644 data/enemies/lamp.ani create mode 100644 data/enemies/lamp.png create mode 100644 data/enemies/tv.ani create mode 100644 data/enemies/tv.png create mode 100644 data/enemies/tv_panel.ani create mode 100644 data/enemies/tv_panel.png diff --git a/Makefile b/Makefile index fc85bf8..cf12afb 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,15 @@ source = source/*.cpp source/common/*.cpp windows: @echo off if not exist bin\ (mkdir bin) + if not exist data\config (mkdir data\config) g++ $(source) -std=c++11 -Wall -O2 -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o bin/$(executable).exe strip -s -R .comment -R .gnu.version bin/$(executable).exe --strip-unneeded macos: mkdir -p bin + mkdir -p data/config g++ $(source) -std=c++11 -Wall -O2 -lSDL2 -ffunction-sections -fdata-sections -o bin/$(executable)_macos linux: mkdir -p bin + mkdir -p data/config g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o bin/$(executable)_linux strip -s -R .comment -R .gnu.version bin/$(executable)_linux --strip-unneeded \ No newline at end of file diff --git a/data/enemies/bry.ani b/data/enemies/bry.ani new file mode 100644 index 0000000..7d64c84 --- /dev/null +++ b/data/enemies/bry.ani @@ -0,0 +1,9 @@ +frameWidth=10 +frameHeight=16 + +[animation] +name=default +speed=6 +loop=0 +frames=0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,4,5,4,5,4,5,4,5,4,5,4,5,4,5,4,5,4,5,4,5,4,5,4,5 +[/animation] \ No newline at end of file diff --git a/data/enemies/bry.png b/data/enemies/bry.png new file mode 100644 index 0000000000000000000000000000000000000000..59f0d0e8fe8c9bd6173cd2050687589e836fbebf GIT binary patch literal 253 zcmVPx#w@E}nR7i>C*4q+*~9{BBbO_vKa@0MO6BI-B4Vu1S)an*!JdPdcxlz3z*>D!su)Tg5ZsG9-#; zWEN+A#fe^4SqC$@Y_La8bjOuS&EWO{M2A=AWPcf9-Pvr;M#?@! z^=Jm1?T=O5f6wrhadas->v}`7Q?HUp)s4Po_2%~hXNePVvj)fV00000NkvXXu0mjf DS_xM%DOde0wt!io=$ne&Y<*neRH(1lO@m=22WQ%mvv4F FO#m}zG^_vs literal 0 HcmV?d00001 diff --git a/data/enemies/tv.ani b/data/enemies/tv.ani new file mode 100644 index 0000000..1facc66 --- /dev/null +++ b/data/enemies/tv.ani @@ -0,0 +1,9 @@ +frameWidth=16 +frameHeight=16 + +[animation] +name=default +speed=6 +loop=0 +frames=0,1,2,3 +[/animation] \ No newline at end of file diff --git a/data/enemies/tv.png b/data/enemies/tv.png new file mode 100644 index 0000000000000000000000000000000000000000..2bb004e23f33a08e47dd96a60a7586c72ed47bbd GIT binary patch literal 300 zcmV+{0n`48P)Px#=1D|BR9J=OmD>))AP7Vy@&A9BzLYK!E~CwwnDSK7!w?Ee%`s+X&o4$qlMp zTl*J}##q+p+w@`UkJdB1x1aG*j8%Pa9o_-0{VIz7L7N=Xz8OEO8EIv)dR5)36(img z_nx7Ouky-xWE{#@z>2JPfqc(&!CQU!9zbS0ODf{C7zn>ZzgwrS5c1q)ytkg=cj%{= yAR?NXp2HP>hkjU{bY_4=PveI`(cFE3|D0X8Yiox|(G!;d00004%P)AHIP00001b5ch_0Itp) z=>Px$S4l)cR9J=WSWyl_F$jB0y#JNwk0cAWUD=ixlkuekO9zyvw&!EL_x>ET)><3i zUwnao8a!iOe2(9G?>)M4DpAI}_#FQghtY^JsY=LV<290SK3g>hpK(X``X&EYc8*DA z2`jNVxiekJ=jKsy$XDUdxXtpRCVn-5O#&-IwKx%zW2*&Y<|x5wy33`)4aM3DV2P@- zWC{ph##QkSpHq#^9GQyIeYO;kiK>V8jsj+9)fJcdjfz&!xt+CJeg8ZQ&w!P^KUyvj zDokL{h5?yVpq)E7%~R@LQUC(aHWpG{09~F<`AVTG{MA{7zlxc~ZYiMR3sX~$Vn*L; zgJ&EoDo_eg=PVahz!*IHwvbnex`4A6E0cxz&(z8=Pc+!&8739r0 -34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, -34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, -34,0,0,151,151,0,151,151,151,0,151,0,151,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, -34,0,0,0,151,0,151,0,151,0,151,0,151,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, -34,0,151,0,151,0,151,151,151,0,151,0,151,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, -34,0,151,151,151,0,151,0,151,0,151,0,151,151,151,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, -34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, +188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188, +188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, +188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, +43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, +43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, +43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, +43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, 34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, 34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, 34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, 34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, 34,34,34,34,34,34,34,34,34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, 34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, -34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +34,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,0,0,0,0,0, +34,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,0,0,0,0,0, 34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34 diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index 68bf5eea37841597ca5fe2dd1afad20d1abcca31..db30ecacbf4e13eb2eea48a3cfa7d8933976113e 100644 GIT binary patch delta 5412 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 delta 5368 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"/../data/font/smb2.png", t_font); asset->add("/../data/font/smb2.txt", t_font); asset->add("/../data/font/debug.png", t_font); asset->add("/../data/font/debug.txt", t_font); + // Configuración asset->add("/../data/input/gamecontrollerdb.txt", t_data); asset->add("/../data/config/config.txt", t_data, false); + // Habitaciones asset->add("/../data/room/01.room", t_room); asset->add("/../data/room/02.room", t_room); asset->add("/../data/room/03.room", t_room); @@ -422,6 +425,7 @@ bool Director::setFileList() asset->add("/../data/room/59.room", t_room); asset->add("/../data/room/60.room", t_room); + // Tilemaps asset->add("/../data/room/01.tmx", t_room); asset->add("/../data/room/02.tmx", t_room); asset->add("/../data/room/03.tmx", t_room); @@ -483,8 +487,11 @@ bool Director::setFileList() asset->add("/../data/room/59.tmx", t_room); asset->add("/../data/room/60.tmx", t_room); + // Tilesets asset->add("/../data/tilesets/standard.png", t_bitmap); + asset->add("/../data/tilesets/standard_zxarne.png", t_bitmap); + // Enemigos asset->add("/../data/enemies/paco.png", t_bitmap); asset->add("/../data/enemies/paco.ani", t_data); asset->add("/../data/enemies/chip.png", t_bitmap); @@ -545,18 +552,30 @@ bool Director::setFileList() asset->add("/../data/enemies/amstrad_character_set.ani", t_data); asset->add("/../data/enemies/breakout.png", t_bitmap); asset->add("/../data/enemies/breakout.ani", t_data); + asset->add("/../data/enemies/lamp.png", t_bitmap); + asset->add("/../data/enemies/lamp.ani", t_data); + asset->add("/../data/enemies/bry.png", t_bitmap); + asset->add("/../data/enemies/bry.ani", t_data); + asset->add("/../data/enemies/tv.png", t_bitmap); + asset->add("/../data/enemies/tv.ani", t_data); + asset->add("/../data/enemies/tv_panel.png", t_bitmap); + asset->add("/../data/enemies/tv_panel.ani", t_data); + // Jugador asset->add("/../data/player/player.png", t_bitmap); asset->add("/../data/player/player.ani", t_data); + // Items asset->add("/../data/items/items.png", t_bitmap); + // Musicas asset->add("/../data/music/title.ogg", t_music); asset->add("/../data/music/game.ogg", t_music); asset->add("/../data/music/loading_sound1.ogg", t_music); asset->add("/../data/music/loading_sound2.ogg", t_music); asset->add("/../data/music/loading_sound3.ogg", t_music); + // Efectos de sonido asset->add("/../data/sound/item.wav", t_sound); asset->add("/../data/sound/death.wav", t_sound); asset->add("/../data/sound/jump1.wav", t_sound); @@ -584,10 +603,12 @@ bool Director::setFileList() asset->add("/../data/sound/jump23.wav", t_sound); asset->add("/../data/sound/jump24.wav", t_sound); + // Logo asset->add("/../data/logo/jailgames.png", t_bitmap); asset->add("/../data/logo/since_1998.png", t_bitmap); asset->add("/../data/logo/seagull.png", t_bitmap); + // Intro asset->add("/../data/title/loading_screen1.png", t_bitmap); asset->add("/../data/title/loading_screen2.png", t_bitmap); diff --git a/source/game.cpp b/source/game.cpp index 2377f97..c26614a 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 = "51.room"; + currentRoom = "01.room"; const int x = 30; const int y = 13; spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL}; From 39c7fbc3b9feec3bedcea7956b595a730659f199 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sat, 22 Oct 2022 09:56:34 +0200 Subject: [PATCH 4/6] =?UTF-8?q?A=C3=B1adidas=20las=20pantallas=20de=20P.A.?= =?UTF-8?q?C.O.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/items/items.png | Bin 960 -> 1017 bytes data/room/42.room | 53 +++++++++++++++++++------- data/room/42.tmx | 32 ++++++++-------- data/room/53.room | 88 +++++++++++++++++++++++++++++++++++++------ data/room/53.tmx | 32 ++++++++-------- source/game.cpp | 2 +- 6 files changed, 150 insertions(+), 57 deletions(-) diff --git a/data/items/items.png b/data/items/items.png index 18764e4a09a08074b8ed0486e0ae54d68fa25d74..7b454bed44df189ec8950f02fc5c5eefbf91796a 100644 GIT binary patch delta 955 zcmV;s14R752l)q(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>*3zLxp7n6_! d4H$kB{s4Z0E>}5@RsH|~002ovPDHLkV1lu1$b>e-0_a!Ccj7Z1 z%HH`y{>p#H?_|ntrG+j&tK?lAxAXr3*Y&pxDxcaR$n&PBihor}f07hyU-awbH9;1? z^FOs``J;>#@?=g`uqSY~iyY3&Cvn^Xm~cRy=?Og1hy|UTK-R+etdj0dgMuoWvY&9- z#a9hJnOiDwJx!D1EgSU1Y`XXA!xgXo)^+9&Te!~k+l;Kr%7H3CCB#mo^TXx~c7U6a zu4PfKHdJ*S^M8+i-g*Ttl&g;H zeE#^*RCBSet6!$i{3(4UV|Lv$i{J5`@H_BfGqAtu{D? z^_}sp?@Lbq64`|+_Rf59y4{5{0o$NStd=(`p1Q#pA%Ay5I=L%|T4P*Le_Cwkui83( zUucAil?cv|C3|wKVhnY9>uA8%sy1s~6|CAYJEmXrQ~c=Pcnp&kU^_oK!EO!xsx@~4 zRZcb5G(VKl56kJiPzkx@+?paekxgw?P7^uH??($eVtD+S9+SHkU~yPmu@+{w_*^-# zXQj{h)_)Q4=GvV=MHuz#ufZ5S zpx><)UM-~7K80%GZUnISYt3=1BLV%ZF@rcKEsR81LMp(dO>uWsvPwtIu-%Pi`Ma@n zUDtK{zNwioO=#pbWXfTn`)VGSqY+N2J-lV|n zdHkV^PTfVba|yXv?jqW4&s)+Pwr+!7ukU}2!I_3@*CnoSQCwCKcZ;g{OqZ?g%9%dn zJ;8~^z##a`)~3N6L3K&gSWI7S;x4)kQK0{==@P_Sv+8#{=ty-5DBErZI=;Vw?eD-R z$5OodQ3JaAV<%48PEp6jllTg^0 -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, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,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 +36,36,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,62, +36,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,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,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,415,421,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,415,421,62, +36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,421,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,415,415,421,415,0,0,0,0,0,0,0,0,0,0,62, +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,0,0,0,0,0,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 diff --git a/data/room/53.room b/data/room/53.room index b2162bb..40b1d38 100644 --- a/data/room/53.room +++ b/data/room/53.room @@ -1,33 +1,99 @@ -name=no 53 +name=P.A.C.O workshop bgColor=black -border=red +border=yellow tilemap=53.tmx tileset=standard.png roomUp=0 roomDown=51.room roomLeft=0 roomRight=42.room +itemColor1=magenta +itemColor2=red [enemy] -tileset=diskette.png -animation=diskette.ani +tileset=paco.png +animation=paco.ani width=16 height=16 -x=2 +x=6 +y=6 +vx=0.3 +vy=0 +x1=6 +y1=6 +x2=13 +y2=6 +color=yellow +[/enemy] + +[enemy] +tileset=paco.png +animation=paco.ani +width=16 +height=16 +x=16 +y=2 +vx=0 +vy=0.8 +x1=16 +y1=2 +x2=16 +y2=13 +color=bright_red +[/enemy] + +[enemy] +tileset=wave.png +animation=wave.ani +width=8 +height=8 +x=1 +y=10 +vx=0.4 +vy=0 +x1=1 +y1=10 +x2=14 +y2=10 +color=bright_yellow +[/enemy] + +[enemy] +tileset=lamp.png +animation=lamp.ani +width=16 +height=16 +x=22 y=2 vx=0 vy=0 -x1=2 +x1=22 y1=2 -x2=2 +x2=22 y2=2 -color=magenta +color=bright_yellow [/enemy] [item] tileset=items.png -tile=1 +tile=40 x=1 -y=1 +y=6 counter=1 -[/item] \ No newline at end of file +[/item] + +[item] +tileset=items.png +tile=40 +x=1 +y=9 +counter=2 +[/item] + +[item] +tileset=items.png +tile=40 +x=30 +y=5 +counter=3 +[/item] diff --git a/data/room/53.tmx b/data/room/53.tmx index 686390e..34c7733 100644 --- a/data/room/53.tmx +++ b/data/room/53.tmx @@ -3,22 +3,22 @@ -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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,0,0,25,25,25,25,25,25 +36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36, +36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36, +36,36,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,36,36, +36,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,36, +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,36, +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,36, +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,36, +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,36, +36,411,0,0,0,0,411,411,411,411,411,411,411,411,411,0,0,0,0,453,453,453,453,453,453,453,453,0,0,0,0,36, +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,387,36, +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,36, +36,411,411,411,411,411,411,363,411,411,411,411,411,411,411,0,0,0,0,453,453,453,453,453,453,453,453,0,0,0,0,36, +36,0,0,0,0,0,0,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36, +36,0,0,0,0,0,0,315,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,0,0,0,0,0,0,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,0,0,36,36,36,36,36,36 diff --git a/source/game.cpp b/source/game.cpp index c26614a..531706e 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 = "01.room"; + currentRoom = "53.room"; const int x = 30; const int y = 13; spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL}; From 852e734cd16e130f799b380c322e4d9166eff37f Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sat, 22 Oct 2022 10:00:27 +0200 Subject: [PATCH 5/6] Actualizadas las habitaciones del modo demo --- source/demo.cpp | 16 ++++++++-------- todo.txt | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/demo.cpp b/source/demo.cpp index a69ad7c..9570a7f 100644 --- a/source/demo.cpp +++ b/source/demo.cpp @@ -5,12 +5,12 @@ Demo::Demo(SDL_Renderer *renderer, Screen *screen, Asset *asset, Debug *debug) { // Inicia algunas variables board.iniClock = SDL_GetTicks(); - rooms.push_back("04.room"); rooms.push_back("03.room"); - rooms.push_back("02.room"); - rooms.push_back("01.room"); - rooms.push_back("05.room"); - rooms.push_back("06.room"); + rooms.push_back("54.room"); + rooms.push_back("16.room"); + rooms.push_back("45.room"); + rooms.push_back("60.room"); + rooms.push_back("58.room"); roomIndex = 0; currentRoom = rooms.at(roomIndex); @@ -137,7 +137,7 @@ void Demo::update() // Actualiza los objetos room->update(); - scoreboard->update(); + //scoreboard->update(); screen->updateFX(); checkRoomChange(); } @@ -154,10 +154,10 @@ void Demo::render() room->renderEnemies(); room->renderItems(); renderRoomName(); - scoreboard->render(); + //scoreboard->render(); screen->renderFX(); - text->write(0, 0, std::to_string(counter)); + //text->write(0, 0, std::to_string(counter)); // Actualiza la pantalla screen->blit(); diff --git a/todo.txt b/todo.txt index 62903b4..4d55411 100644 --- a/todo.txt +++ b/todo.txt @@ -41,8 +41,8 @@ x (A) La pantalla de titulo no tiene menu, solo un PRESS ENTER TO PLAY (A) Crear la tipografia de corazon (A) Los Creditos se han de ir escribiendo letra a letra x (A) Arreglar la pantalla de carga para que cargue bit a bit -(A) La musica del titulo ha de seguir sonando en los creditos y el ¿logo? -(A) Ha de haber un modo demo en el que se muestran las habitaciones predefinidas +x (A) La musica del titulo ha de seguir sonando en los creditos y el ¿logo? +x (A) Ha de haber un modo demo en el que se muestran las habitaciones predefinidas (A) Menu de pausa/salir x (A) Poner el mapa/jugador en pausa x (A) El color del borde se pierde al morir por la pantalla negra @@ -66,12 +66,12 @@ x matatunos x sigmasua calculin doom leaper reaper -mini ascii +x mini ascii mappy -paco +x paco x chirping abad y batman -jail +x jail counter strike starcraft diablo From 2921952ea5dc59002fc68bf615644ec56e58cc0d Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sat, 22 Oct 2022 10:48:26 +0200 Subject: [PATCH 6/6] 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));