1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-24 01:00:25 +00:00

newlands:: more theming

This commit is contained in:
Zeno Rogue 2018-12-25 19:25:09 +01:00
parent bc27e10dc9
commit a1b22cbf9f
4 changed files with 12 additions and 5 deletions

View File

@ -782,7 +782,7 @@ monstertype minf[motypes] = {
{ 'B', 0xE07060, "Acid Bird", NODESCYET},
{ 'W', 0xA04060, "Mutant", NODESCYET},
{ 'W', 0xC04040, "Falling Dog", NODESCYET},
{ 'B', 0x40C040, "Western Hawk", NODESCYET},
{ 'B', 0xC0C040, "Western Hawk", NODESCYET},
// shmup specials
{ '@', 0xC0C0C0, "Rogue", "In the Shoot'em Up mode, you are armed with thrown Knives."},
@ -1634,7 +1634,7 @@ const landtype linf[landtypes] = {
" option was on."
},
{ 0x804000, "Brown Islands", NODESCYET},
{ 0xA04060, "Free Fall", NODESCYET},
{ 0x211F6F, "Free Fall", NODESCYET},
{ 0x30FF30, "Irradiated Field", NODESCYET}
};

View File

@ -21,6 +21,7 @@ escher_floorshape shStarFloor(1,2),
shTrollFloor(28, 29),
shButterflyFloor(325, 326, 1, 178),
shLavaFloor(359, 360, 1, 178),
shLavaSeabed(386, 387, 1, 178),
shSeabed(334, 335),
shCloudSeabed(336, 337),
shCaveSeabed(338, 339, 2, 54),

View File

@ -3000,7 +3000,7 @@ void setcolors(cell *c, color_t& wcol, color_t& fcol) {
break;
case laWestWall:
fcol = 0x10101 * (32 + (c->landparam&1) * 32) + 0x400000;
fcol = 0x10101 * ((c->landparam&1) * 32) + floorcolors[c->land];
break;
case laDungeon: {
@ -4249,6 +4249,7 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
break;
case laVolcano:
case laVariant:
set_floor(shLavaFloor);
break;
@ -4403,7 +4404,7 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
set_towerfloor(c);
break;
case laIvoryTower: case laDungeon:
case laIvoryTower: case laDungeon: case laWestWall:
set_towerfloor(c);
break;
@ -4411,7 +4412,7 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
if(among(c->wall, waSea, waBoat))
set_floor(shCloudFloor);
else
set_floor(shFloor);
set_floor(shTrollFloor);
break;
default:
@ -4430,6 +4431,8 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
if(qfi.fshape == &shCloudFloor)
set_floor(shCloudSeabed);
else if(qfi.fshape == &shLavaFloor)
set_floor(shLavaSeabed);
else if(qfi.fshape == &shFloor)
set_floor(shFullFloor);
else if(qfi.fshape == &shCaveFloor)

View File

@ -3606,6 +3606,9 @@ NEWSHAPE, 383, 1, 2, 0.164154,0.032677, 0.112722,0.126268, 0.093106,0.144972, 0.
NEWSHAPE, 384, 1, 2, 0.146470,0.021791, 0.134179,0.071381, 0.089857,0.116839, 0.039860,0.139410, -0.005910,0.150902, -0.047971,0.139775, -0.104973,0.100695, -0.147597,0.052809, -0.177722,0.017653, -0.186756,0.003107,
NEWSHAPE, 385, 7, 1, 0.354675,0,
NEWSHAPE, 386, 3, 1, 0.173768,0.275379, 0.340287,0.116342, 0.229291,-0.115277,
NEWSHAPE, 387, 7, 1, 0.315263,-0.310217, 0.085056,-0.287538,
NEWSHAPE
};