jailers/jaildoctors_dilemma
5
0
Fork 0
forked from jaildesigner-jailgames/jaildoctors_dilemma
Code Pull Requests Activity

Corregida la paleta de color zxspectrum

Browse Source
This commit is contained in:
Sergio
2022-09-05 17:02:17 +02:00
parent e50aa77514
commit 65eac860b1
10 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/room/03.room
View File

@@ -1,5 +1,5 @@
name=the edge name=the edge
bgColor=light_black bgColor=bright_black
border=black border=black
tileset=standard.png tileset=standard.png
roomUp=0 roomUp=0
@@ -40,7 +40,7 @@ x1=10
y1=2 y1=2
x2=10 x2=10
y2=13 y2=13
color=light_blue color=bright_blue
[/enemy] [/enemy]
[enemy] [enemy]

4
data/room/04.room
View File

@@ -40,7 +40,7 @@ x1=10
y1=7 y1=7
x2=30 x2=30
y2=7 y2=7
color=light_white color=bright_white
[/enemy] [/enemy]
[enemy] [enemy]
@@ -56,7 +56,7 @@ x1=15
y1=12 y1=12
x2=30 x2=30
y2=12 y2=12
color=light_magenta color=bright_magenta
[/enemy] [/enemy]
[item] [item]

4
data/room/05.room
View File

@@ -56,7 +56,7 @@ x1=10
y1=10 y1=10
x2=10 x2=10
y2=13 y2=13
color=light_red color=bright_red
[/enemy] [/enemy]
[enemy] [enemy]
@@ -72,7 +72,7 @@ x1=23
y1=10 y1=10
x2=23 x2=23
y2=13 y2=13
color=light_red color=bright_red
[/enemy] [/enemy]
[item] [item]

BIN
media/tilesets/standard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
media/title/loading_screen2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

2
source/game.cpp
View File

@@ -246,7 +246,7 @@ void Game::renderRoomName()
{ {
// Texto en el centro de la pantalla // Texto en el centro de la pantalla
SDL_Rect rect = {0, 16 * BLOCK, PLAY_AREA_WIDTH, BLOCK}; 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_SetRenderDrawColor(renderer, color.r, color.g, color.b, 0xFF);
SDL_RenderFillRect(renderer, &rect); SDL_RenderFillRect(renderer, &rect);

2
source/logo.cpp
View File

@@ -61,7 +61,7 @@ Logo::Logo(SDL_Renderer *renderer, Screen *screen, Asset *asset)
c = stringToColor("yellow"); c = stringToColor("yellow");
color.push_back(c); color.push_back(c);
c = stringToColor("light_white"); c = stringToColor("bright_white");
color.push_back(c); color.push_back(c);
// Cambia el color del borde // Cambia el color del borde

14
source/scoreboard.cpp
View File

@@ -44,25 +44,25 @@ ScoreBoard::ScoreBoard(SDL_Renderer *renderer, Asset *asset, int *lives, int *it
c = stringToColor("white"); c = stringToColor("white");
color.push_back(c); color.push_back(c);
c = stringToColor("light_blue"); c = stringToColor("bright_blue");
color.push_back(c); color.push_back(c);
c = stringToColor("light_red"); c = stringToColor("bright_red");
color.push_back(c); color.push_back(c);
c = stringToColor("light_magenta"); c = stringToColor("bright_magenta");
color.push_back(c); color.push_back(c);
c = stringToColor("light_green"); c = stringToColor("bright_green");
color.push_back(c); color.push_back(c);
c = stringToColor("light_cyan"); c = stringToColor("bright_cyan");
color.push_back(c); color.push_back(c);
c = stringToColor("light_yellow"); c = stringToColor("bright_yellow");
color.push_back(c); color.push_back(c);
c = stringToColor("light_white"); c = stringToColor("bright_white");
color.push_back(c); color.push_back(c);
} }

2
source/title.cpp
View File

@@ -33,7 +33,7 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Asset *asset)
letters[0].enabled = true; letters[0].enabled = true;
// Cambia el color del borde // Cambia el color del borde
screen->setBorderColor(stringToColor("magenta")); screen->setBorderColor(stringToColor("bright_blue"));
} }
// Destructor // Destructor

58
source/utils.cpp
View File

@@ -152,77 +152,77 @@ color_t stringToColor(std::string str)
return {0x00, 0x00, 0x00}; return {0x00, 0x00, 0x00};
} }
else if (str == "light_black") else if (str == "bright_black")
{ {
return {0x00, 0x00, 0x00}; return {0x00, 0x00, 0x00};
} }
else if (str == "blue") 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") 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") 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") 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") 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") 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") 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}; return {0xFF, 0xFF, 0xFF};
} }
@@ -235,7 +235,7 @@ color_t stringToColor(std::string str)
return {0x00, 0x00, 0x00}; return {0x00, 0x00, 0x00};
} }
else if (str == "light_black") else if (str == "bright_black")
{ {
return {0x3C, 0x35, 0x1F}; return {0x3C, 0x35, 0x1F};
} }
@@ -245,7 +245,7 @@ color_t stringToColor(std::string str)
return {0x31, 0x33, 0x90}; return {0x31, 0x33, 0x90};
} }
else if (str == "light_blue") else if (str == "bright_blue")
{ {
return {0x15, 0x59, 0xDB}; return {0x15, 0x59, 0xDB};
} }
@@ -255,7 +255,7 @@ color_t stringToColor(std::string str)
return {0xA7, 0x32, 0x11}; return {0xA7, 0x32, 0x11};
} }
else if (str == "light_red") else if (str == "bright_red")
{ {
return {0xD8, 0x55, 0x25}; return {0xD8, 0x55, 0x25};
} }
@@ -265,7 +265,7 @@ color_t stringToColor(std::string str)
return {0xA1, 0x55, 0x89}; return {0xA1, 0x55, 0x89};
} }
else if (str == "light_magenta") else if (str == "bright_magenta")
{ {
return {0xCD, 0x7A, 0x50}; return {0xCD, 0x7A, 0x50};
} }
@@ -275,7 +275,7 @@ color_t stringToColor(std::string str)
return {0x62, 0x9A, 0x31}; return {0x62, 0x9A, 0x31};
} }
else if (str == "light_green") else if (str == "bright_green")
{ {
return {0x9C, 0xD3, 0x3C}; return {0x9C, 0xD3, 0x3C};
} }
@@ -285,7 +285,7 @@ color_t stringToColor(std::string str)
return {0x28, 0xA4, 0xCB}; return {0x28, 0xA4, 0xCB};
} }
else if (str == "light_cyan") else if (str == "bright_cyan")
{ {
return {0x65, 0xDC, 0xD6}; return {0x65, 0xDC, 0xD6};
} }
@@ -295,7 +295,7 @@ color_t stringToColor(std::string str)
return {0xE8, 0xBC, 0x50}; return {0xE8, 0xBC, 0x50};
} }
else if (str == "light_yellow") else if (str == "bright_yellow")
{ {
return {0xF1, 0xE7, 0x82}; return {0xF1, 0xE7, 0x82};
} }
@@ -305,7 +305,7 @@ color_t stringToColor(std::string str)
return {0xBF, 0xBF, 0xBD}; return {0xBF, 0xBF, 0xBD};
} }
else if (str == "light_white") else if (str == "bright_white")
{ {
return {0xF2, 0xF1, 0xED}; return {0xF2, 0xF1, 0xED};
} }