mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-09-01 02:07:57 +00:00
Merge branch 'master' of https://github.com/zenorogue/hyperrogue
This commit is contained in:
@@ -89,6 +89,7 @@ static constexpr int trapcol[4] = {0x904040, 0xA02020, 0xD00000, 0x303030};
|
||||
static constexpr int terracol[8] = {0xD000, 0xE25050, 0xD0D0D0, 0x606060, 0x303030, 0x181818, 0x0080, 0x8080};
|
||||
|
||||
EX colortable prairie_colors = { 0x402000, 0x503000 };
|
||||
EX colortable prairie_colors_high_cont = { 0x102030, 0x905010 };
|
||||
EX colortable mountain_colors = { 0x181008*2, 0x181008*4 };
|
||||
EX colortable tower_colors = { 0x202010, 0x404030 };
|
||||
EX colortable westwall_colors = { 0x211F6F, 0x413F8F };
|
||||
@@ -211,10 +212,12 @@ void celldrawer::setcolors() {
|
||||
for(int a=0; a<21; a++)
|
||||
if((b >> a) & 1)
|
||||
fcol += variant::features[a].color_change;
|
||||
if(c->wall == waAncientGrave)
|
||||
wcol = 0x080808;
|
||||
else if(c->wall == waFreshGrave)
|
||||
wcol = 0x202020;
|
||||
if(!higher_contrast) {
|
||||
if(c->wall == waAncientGrave)
|
||||
wcol = 0x080808;
|
||||
else if(c->wall == waFreshGrave)
|
||||
wcol = 0x202020;
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
@@ -402,7 +405,8 @@ void celldrawer::setcolors() {
|
||||
#if CAP_FIELD
|
||||
case laPrairie:
|
||||
if(prairie::isriver(c)) {
|
||||
fcol = get_color_auto3(prairie::get_val(c), prairie_colors);
|
||||
fcol = get_color_auto3(prairie::get_val(c),
|
||||
higher_contrast ? prairie_colors_high_cont : prairie_colors);
|
||||
}
|
||||
else {
|
||||
fcol = 0x004000 + 0x001000 * c->LHU.fi.walldist;
|
||||
@@ -512,8 +516,10 @@ void celldrawer::setcolors() {
|
||||
if(c->monst == moFriendlyGhost)
|
||||
fcol = gradient(fcol, fghostcolor(c), 0, .5, 1);
|
||||
|
||||
if(c->wall == waSmallTree) wcol = 0x004000;
|
||||
else if(c->wall == waBigTree) wcol = 0x008000;
|
||||
if (!higher_contrast) {
|
||||
if(c->wall == waSmallTree) wcol = 0x004000;
|
||||
else if(c->wall == waBigTree) wcol = 0x008000;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user