From 053992de987e43b2db110d5b7ddb0f402617b6fa Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sat, 22 Oct 2022 09:04:36 +0200 Subject: [PATCH] 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};