diff --git a/data/room/03.room b/data/room/03.room index a809c47..a0288b7 100644 --- a/data/room/03.room +++ b/data/room/03.room @@ -1,5 +1,5 @@ name=the edge -bgColor=light_black +bgColor=bright_black border=black tileset=standard.png roomUp=0 @@ -40,7 +40,7 @@ x1=10 y1=2 x2=10 y2=13 -color=light_blue +color=bright_blue [/enemy] [enemy] diff --git a/data/room/04.room b/data/room/04.room index fc8a58e..94391c7 100644 --- a/data/room/04.room +++ b/data/room/04.room @@ -40,7 +40,7 @@ x1=10 y1=7 x2=30 y2=7 -color=light_white +color=bright_white [/enemy] [enemy] @@ -56,7 +56,7 @@ x1=15 y1=12 x2=30 y2=12 -color=light_magenta +color=bright_magenta [/enemy] [item] diff --git a/data/room/05.room b/data/room/05.room index 3efc44e..77af046 100644 --- a/data/room/05.room +++ b/data/room/05.room @@ -56,7 +56,7 @@ x1=10 y1=10 x2=10 y2=13 -color=light_red +color=bright_red [/enemy] [enemy] @@ -72,7 +72,7 @@ x1=23 y1=10 x2=23 y2=13 -color=light_red +color=bright_red [/enemy] [item] diff --git a/media/tilesets/standard.png b/media/tilesets/standard.png index 7b40a74..88076d3 100644 Binary files a/media/tilesets/standard.png and b/media/tilesets/standard.png differ diff --git a/media/title/loading_screen2.png b/media/title/loading_screen2.png index 5435dde..9fd617d 100644 Binary files a/media/title/loading_screen2.png and b/media/title/loading_screen2.png differ diff --git a/source/game.cpp b/source/game.cpp index d818a11..a16dff6 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -246,7 +246,7 @@ void Game::renderRoomName() { // Texto en el centro de la pantalla SDL_Rect rect = {0, 16 * BLOCK, PLAY_AREA_WIDTH, BLOCK}; - color_t color = stringToColor("light_black"); + color_t color = stringToColor("bright_black"); SDL_SetRenderDrawColor(renderer, color.r, color.g, color.b, 0xFF); SDL_RenderFillRect(renderer, &rect); diff --git a/source/logo.cpp b/source/logo.cpp index a683c73..9052c55 100644 --- a/source/logo.cpp +++ b/source/logo.cpp @@ -61,7 +61,7 @@ Logo::Logo(SDL_Renderer *renderer, Screen *screen, Asset *asset) c = stringToColor("yellow"); color.push_back(c); - c = stringToColor("light_white"); + c = stringToColor("bright_white"); color.push_back(c); // Cambia el color del borde diff --git a/source/scoreboard.cpp b/source/scoreboard.cpp index d11f21f..b098d82 100644 --- a/source/scoreboard.cpp +++ b/source/scoreboard.cpp @@ -44,25 +44,25 @@ ScoreBoard::ScoreBoard(SDL_Renderer *renderer, Asset *asset, int *lives, int *it c = stringToColor("white"); color.push_back(c); - c = stringToColor("light_blue"); + c = stringToColor("bright_blue"); color.push_back(c); - c = stringToColor("light_red"); + c = stringToColor("bright_red"); color.push_back(c); - c = stringToColor("light_magenta"); + c = stringToColor("bright_magenta"); color.push_back(c); - c = stringToColor("light_green"); + c = stringToColor("bright_green"); color.push_back(c); - c = stringToColor("light_cyan"); + c = stringToColor("bright_cyan"); color.push_back(c); - c = stringToColor("light_yellow"); + c = stringToColor("bright_yellow"); color.push_back(c); - c = stringToColor("light_white"); + c = stringToColor("bright_white"); color.push_back(c); } diff --git a/source/title.cpp b/source/title.cpp index 4d37f5f..d1a73ae 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -33,7 +33,7 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Asset *asset) letters[0].enabled = true; // Cambia el color del borde - screen->setBorderColor(stringToColor("magenta")); + screen->setBorderColor(stringToColor("bright_blue")); } // Destructor diff --git a/source/utils.cpp b/source/utils.cpp index 6dcf506..8c36bb9 100644 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -152,77 +152,77 @@ color_t stringToColor(std::string str) return {0x00, 0x00, 0x00}; } - else if (str == "light_black") + else if (str == "bright_black") { return {0x00, 0x00, 0x00}; } else if (str == "blue") { - return {0x00, 0x00, 0xFF}; + return {0x00, 0x00, 0xd8}; } - else if (str == "light_blue") + else if (str == "bright_blue") { - return {0x00, 0x00, 0xEE}; + return {0x00, 0x00, 0xFF}; } else if (str == "red") { - return {0xFF, 0x00, 0x00}; + return {0xd8, 0x00, 0x00}; } - else if (str == "light_red") + else if (str == "bright_red") { - return {0xEE, 0x00, 0x00}; + return {0xFF, 0x00, 0x00}; } else if (str == "magenta") { - return {0xFF, 0x00, 0xFF}; + return {0xd8, 0x00, 0xd8}; } - else if (str == "light_magenta") + else if (str == "bright_magenta") { - return {0xEE, 0x00, 0xEE}; + return {0xFF, 0x00, 0xFF}; } else if (str == "green") { - return {0x00, 0xFF, 0x00}; + return {0x00, 0xd8, 0x00}; } - else if (str == "light_green") + else if (str == "bright_green") { - return {0x00, 0xEE, 0x00}; + return {0x00, 0xFF, 0x00}; } else if (str == "cyan") { - return {0x00, 0xFF, 0xFF}; + return {0x00, 0xd8, 0xd8}; } - else if (str == "light_cyan") + else if (str == "bright_cyan") { - return {0x00, 0xEE, 0xEE}; + return {0x00, 0xFF, 0xFF}; } else if (str == "yellow") { - return {0xFF, 0xFF, 0x00}; + return {0xd8, 0xd8, 0x00}; } - else if (str == "light_yellow") + else if (str == "bright_yellow") { - return {0xEE, 0xEE, 0x00}; + return {0xFF, 0xFF, 0x00}; } else if (str == "white") { - return {0xEE, 0xEE, 0xEE}; + return {0xd8, 0xd8, 0xd8}; } - else if (str == "light_white") + else if (str == "bright_white") { return {0xFF, 0xFF, 0xFF}; } @@ -235,7 +235,7 @@ color_t stringToColor(std::string str) return {0x00, 0x00, 0x00}; } - else if (str == "light_black") + else if (str == "bright_black") { return {0x3C, 0x35, 0x1F}; } @@ -245,7 +245,7 @@ color_t stringToColor(std::string str) return {0x31, 0x33, 0x90}; } - else if (str == "light_blue") + else if (str == "bright_blue") { return {0x15, 0x59, 0xDB}; } @@ -255,7 +255,7 @@ color_t stringToColor(std::string str) return {0xA7, 0x32, 0x11}; } - else if (str == "light_red") + else if (str == "bright_red") { return {0xD8, 0x55, 0x25}; } @@ -265,7 +265,7 @@ color_t stringToColor(std::string str) return {0xA1, 0x55, 0x89}; } - else if (str == "light_magenta") + else if (str == "bright_magenta") { return {0xCD, 0x7A, 0x50}; } @@ -275,7 +275,7 @@ color_t stringToColor(std::string str) return {0x62, 0x9A, 0x31}; } - else if (str == "light_green") + else if (str == "bright_green") { return {0x9C, 0xD3, 0x3C}; } @@ -285,7 +285,7 @@ color_t stringToColor(std::string str) return {0x28, 0xA4, 0xCB}; } - else if (str == "light_cyan") + else if (str == "bright_cyan") { return {0x65, 0xDC, 0xD6}; } @@ -295,7 +295,7 @@ color_t stringToColor(std::string str) return {0xE8, 0xBC, 0x50}; } - else if (str == "light_yellow") + else if (str == "bright_yellow") { return {0xF1, 0xE7, 0x82}; } @@ -305,7 +305,7 @@ color_t stringToColor(std::string str) return {0xBF, 0xBF, 0xBD}; } - else if (str == "light_white") + else if (str == "bright_white") { return {0xF2, 0xF1, 0xED}; }