From 089f0276c850b4549efa9ac9dfaa7e6a48f36252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= <jaildesigner@gmail.com>
Date: Mon, 10 Oct 2022 22:55:18 +0200
Subject: [PATCH] Corregido bug en los colores del texto del marcador

---
 data/room/55.room          |  40 ++++++++++++++++++++++++++-----------
 data/room/55.tmx           |  20 +++++++++----------
 data/tilesets/standard.png | Bin 5996 -> 6037 bytes
 source/game.cpp            |  17 ++++++++--------
 4 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/data/room/55.room b/data/room/55.room
index 925a696..932bfda 100644
--- a/data/room/55.room
+++ b/data/room/55.room
@@ -7,30 +7,46 @@ roomUp=0
 roomDown=0
 roomLeft=54.room
 roomRight=56.room
-itemColor1=yellow
+itemColor1=magenta
 itemColor2=red
 autoSurface=left
 
+[enemy]
+tileset=dimallas.png
+animation=dimallas.ani
+width=16
+height=16
+x=15
+y=13
+vx=0.6
+vy=0
+x1=9
+y1=13
+x2=25
+y2=13
+color=green
+[/enemy]
+
 [enemy]
 tileset=heavy.png
 animation=heavy.ani
 width=16
 height=16
-x=2
-y=2
+x=16
+y=4
 vx=0
-vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+vy=0.3
+x1=16
+y1=4
+x2=16
+y2=10
+color=red
 [/enemy]
 
 [item]
 tileset=items.png
-tile=33
-x=1
-y=1
+tile=25
+x=9
+y=4
 counter=1
 [/item]
\ No newline at end of file
diff --git a/data/room/55.tmx b/data/room/55.tmx
index fadc9a0..6551c9a 100644
--- a/data/room/55.tmx
+++ b/data/room/55.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
+<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
@@ -7,15 +7,15 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
-0,0,0,523,302,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
-0,0,523,0,0,0,0,0,302,0,0,0,0,302,0,0,0,0,302,0,0,0,0,302,0,0,0,0,0,0,0,134,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,433,0,0,0,134,
-0,0,0,0,0,0,0,0,326,0,0,0,0,326,0,0,0,0,326,0,0,0,0,326,0,0,0,0,0,0,0,134,
-16,16,16,16,538,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,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,0,0,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,0,0,0,0,0,0,0,0,0,16,
+0,0,0,0,0,0,0,0,0,302,0,0,0,0,302,0,0,0,0,0,0,0,0,0,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,302,0,0,0,0,302,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,0,0,0,0,0,0,0,0,0,16,
+0,0,0,0,0,0,0,0,0,0,0,0,0,302,0,0,0,0,0,0,0,0,0,0,0,0,0,477,0,0,0,16,
+0,0,0,0,0,0,0,0,326,0,0,0,0,0,0,0,0,0,326,0,0,0,0,326,0,0,0,0,0,0,0,16,
+16,16,16,16,538,0,0,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,16,16,16,16,538,0,0,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,16,16,16,16,538,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,349,349,349,349,349,349,349,349
diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png
index ec8cbcb961a0a848d29fb623392a1c7e062469b2..54a3161459231a381c7f16d262d3779a4b41cee6 100644
GIT binary patch
delta 5714
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
XNAF`r2gX<yz$zEcVN9!xon!t7y8|Y7

delta 5694
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

diff --git a/source/game.cpp b/source/game.cpp
index b2cd5cc..cfa46c0 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -24,10 +24,10 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
 	// currentRoom = "06.room";
 	// spawnPoint = {14 * 8, 9 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
 
-	 currentRoom = "55.room";
-	 const int x = 30;
-	 const int y = 13;
-	 spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
+	currentRoom = "55.room";
+	const int x = 30;
+	const int y = 13;
+	spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
 	//   ****
 
 	// Crea los objetos
@@ -48,7 +48,8 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
 	board.lives = 9;
 	board.items = 0;
 	board.rooms = 1;
-	board.color = room->getBorderColor();
+	const color_t c = room->getBorderColor();
+	board.color = (c.r + c.g + c.b == 0) ? stringToColor("white") : c; // Si el color es negro lo cambia a blanco
 	roomTracker->addRoom(currentRoom);
 	paused = false;
 	blackScreen = false;
@@ -316,8 +317,8 @@ bool Game::changeRoom(std::string file)
 			room = new Room(asset->get(file), renderer, screen, asset, itemTracker, &board.items, debug);
 
 			// Actualiza el marcador
-			const color_t c = room->getBorderColor();						   // Pon el color del marcador
-			board.color = (c.r + c.g + c.b == 0) ? stringToColor("white") : c; // Si el color es negrom cambialo a blanco
+			const color_t c = room->getBorderColor();						   // Pone el color del marcador
+			board.color = (c.r + c.g + c.b == 0) ? stringToColor("white") : c; // Si el color es negro lo cambia a blanco
 			if (roomTracker->addRoom(file))
 			{ // Incrementa el contador de habitaciones visitadas
 				board.rooms++;
@@ -390,7 +391,7 @@ void Game::killPlayer()
 		return;
 	}
 
-	//board.lives--;
+	// board.lives--;
 
 	// Destruye la habitacion y el jugador
 	delete room;