From 65eac860b13422d730ef23abfa4cb2124b9b09ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Mon, 5 Sep 2022 17:02:17 +0200 Subject: [PATCH] Corregida la paleta de color zxspectrum --- data/room/03.room | 4 +-- data/room/04.room | 4 +-- data/room/05.room | 4 +-- media/tilesets/standard.png | Bin 2286 -> 2253 bytes media/title/loading_screen2.png | Bin 5751 -> 5608 bytes source/game.cpp | 2 +- source/logo.cpp | 2 +- source/scoreboard.cpp | 14 ++++---- source/title.cpp | 2 +- source/utils.cpp | 58 ++++++++++++++++---------------- 10 files changed, 45 insertions(+), 45 deletions(-) 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 7b40a74ac4fff4563458f006d288464e492a3c4a..88076d36a99d810eda85e2f783fcc19f390818a5 100644 GIT binary patch literal 2253 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 K?8vsir2h>|iCE+S diff --git a/media/title/loading_screen2.png b/media/title/loading_screen2.png index 5435dde12304218b25df6d9f2b095439735263df..9fd617d5e39b9833e4a92706b6a8f2652b1ddfa6 100644 GIT binary patch literal 5608 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 literal 5751 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 gsetBorderColor(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}; }