From c3a82b938fbd6340f5287134257b3dea38f4913b Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Wed, 2 Nov 2022 16:34:31 +0100 Subject: [PATCH] =?UTF-8?q?A=C3=B1adido=20el=20parametro=20--invincible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/room/05.tmx | 24 ++++++++++++------------ data/room/29.room | 14 +++++++------- data/room/29.tmx | 4 ++-- data/room/30.room | 6 +++--- data/room/30.tmx | 24 ++++++++++++------------ data/tilesets/standard.png | Bin 7667 -> 7685 bytes source/common/utils.h | 1 + source/director.cpp | 6 ++++++ source/game.cpp | 8 ++++---- 9 files changed, 47 insertions(+), 40 deletions(-) diff --git a/data/room/05.tmx b/data/room/05.tmx index dd77258..ef88d24 100644 --- a/data/room/05.tmx +++ b/data/room/05.tmx @@ -3,21 +3,21 @@ -28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28, -28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28, -28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28, -28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28, -28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28, -28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28, -28,0,0,0,0,0,0,0,0,0,0,267,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28, -28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,52,52,0,0,0,0,0,0,0,0,0,0,28, +28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,426,427,426,427, +28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,426,427,93, +28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,117, +28,0,0,0,0,0,0,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, +28,0,0,0,0,0,0,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, +28,0,0,0,0,0,0,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, +28,0,0,0,0,0,0,0,0,0,0,267,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141, +28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,52,52,0,0,0,0,0,0,0,0,0,0,32, 28,28,28,28,28,28,0,0,0,267,267,0,0,0,0,0,0,0,0,28,0,0,0,0,267,267,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,267,267,0,0,0,0,0,0,0,0,0,28,0,0,0,0,267,267,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,28,28,28, -0,0,0,0,0,0,0,267,267,267,267,267,267,0,0,0,0,0,0,28,0,0,0,0,267,267,0,0,0,0,0,28, -0,0,0,0,0,267,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,28, -28,28,532,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,52,52,52,52,52,52,52,52,52,52,52,28, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,28,28,32, +0,0,0,0,0,0,0,267,267,267,267,267,267,0,0,0,0,0,0,28,0,0,0,0,267,267,0,0,0,0,0,32, +0,0,0,0,0,267,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,89, +28,28,532,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,52,52,52,52,52,52,52,52,89,90,89,90, 28,28,28,28,28,28,28,28,28,28,28,28,28,28,267,0,0,267,28,28,28,28,28,28,28,28,28,28,28,28,28,28 diff --git a/data/room/29.room b/data/room/29.room index 9ef11eb..1cfb03f 100644 --- a/data/room/29.room +++ b/data/room/29.room @@ -1,6 +1,6 @@ name=QUO VOIDIS -bgColor=bright_black -border=black +bgColor=blue +border=bright_black tileMapFile=29.tmx tileSetFile=standard.png roomUp=27.room @@ -18,7 +18,7 @@ height=16 x=7 y=1 vx=0 -vy=0.7 +vy=0.8 x1=7 y1=1 x2=7 @@ -34,7 +34,7 @@ height=16 x=12 y=6 vx=0 -vy=0.7 +vy=0.6 x1=12 y1=1 x2=12 @@ -50,12 +50,12 @@ height=16 x=17 y=8 vx=0 -vy=0.7 +vy=0.9 x1=17 y1=1 x2=17 y2=13 -color=red +color=green [/enemy] [enemy] @@ -71,7 +71,7 @@ x1=22 y1=1 x2=22 y2=13 -color=yellow +color=magenta [/enemy] [item] diff --git a/data/room/29.tmx b/data/room/29.tmx index c68ccb8..8f27104 100644 --- a/data/room/29.tmx +++ b/data/room/29.tmx @@ -3,7 +3,7 @@ -133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,133, +133,133,133,133,133,133,133,131,131,133,133,133,132,132,133,133,133,132,132,133,133,133,131,131,133,133,0,0,0,0,505,133, 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,133, 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,133, 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,133, @@ -18,7 +18,7 @@ 133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,228,228,0,0,0,0,133, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, -133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133 +133,133,133,133,133,133,133,131,131,133,133,133,132,132,133,133,133,132,132,133,133,133,131,131,133,133,133,133,133,133,133,133 diff --git a/data/room/30.room b/data/room/30.room index 017a9e1..d6c6965 100644 --- a/data/room/30.room +++ b/data/room/30.room @@ -1,6 +1,6 @@ -name=no 30 -bgColor=black -border=red +name=QVOID IS A JAILGAME! +bgColor=bright_black +border=bright_black tileMapFile=30.tmx tileSetFile=standard.png roomUp=0 diff --git a/data/room/30.tmx b/data/room/30.tmx index d82f3bd..c04c806 100644 --- a/data/room/30.tmx +++ b/data/room/30.tmx @@ -3,22 +3,22 @@ -133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133, +133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,0,0,0,0,0,0,0,0,0,0,0,0,133, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, +133,228,228,0,0,228,228,0,0,228,228,0,0,228,228,0,0,228,228,0,0,0,0,0,0,0,0,0,0,0,0,133, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, +133,0,0,228,228,0,0,228,228,0,0,228,228,0,0,228,228,0,0,0,228,228,0,0,0,228,228,548,0,0,0,133, +133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,548,0,0,133, +133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,228,0,133, 133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, -133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, -133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, -133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, -133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, -133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, -133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, -133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, -133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, -133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133 +133,0,0,0,0,0,0,0,0,485,485,485,0,0,0,228,228,0,0,0,485,485,485,0,0,0,228,228,0,0,0,133, +133,0,0,0,228,228,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133, +133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,228,133, +133,228,228,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,133, +133,0,0,0,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, +133,0,0,0,0,548,0,0,0,0,0,555,0,0,0,0,0,0,0,0,0,555,0,0,0,0,0,0,0,0,0,0, +133,555,555,555,555,555,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,485,133,133,133 diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index b2add6b8a797825a143106c272e34708a0692187..594c7601076a07231342d5e46d86db2346edb432 100644 GIT binary patch delta 7527 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 i@aMB#dU}!s9xvYZOLrN+##I9sconsole = false; options->infiniteLives = false; + options->invincible = false; } // Comprueba los parametros del programa @@ -106,6 +107,11 @@ void Director::checkProgramArguments(int argc, char *argv[]) { options->infiniteLives = true; } + + else if (strcmp(argv[i], "--invincible") == 0) + { + options->invincible = true; + } } } diff --git a/source/game.cpp b/source/game.cpp index 11f2be3..247530a 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -20,9 +20,9 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *as // **** // this->debug->setEnabled(true); - currentRoom = "46.room"; - const int x = 0; - const int y = 6; + currentRoom = "27.room"; + const int x = 29; + const int y = 13; spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL}; // **** @@ -384,7 +384,7 @@ void Game::checkEndGame() // Mata al jugador void Game::killPlayer() { - if (this->player->getInvincible()) + if (this->player->getInvincible() || options->invincible) { return; }