1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-05-19 07:34:08 +00:00

some decorative tiles

This commit is contained in:
Zeno Rogue 2025-05-02 21:50:46 +02:00
parent eb08ec4ab9
commit 4634a5cc97
4 changed files with 19 additions and 14 deletions

View File

@ -51,7 +51,7 @@ struct room {
string roomname; string roomname;
renderbuffer *rbuf; renderbuffer *rbuf;
cell *where; cell *where;
char block_at[room_y][room_x]; short block_at[room_y][room_x];
bool fov[room_y][room_x]; bool fov[room_y][room_x];
bool which_map_rendered; bool which_map_rendered;
bool infile, need_rerender; bool infile, need_rerender;

View File

@ -52,7 +52,7 @@ struct ruwall {
flagtype flags; flagtype flags;
}; };
enum eWall { wAir, wWall, wBouncy, wSpike, wWater, wFrozen, wDoor, wSmashedDoor, wFountain0, wFountain1, wBluePortal, wOrangePortal, wPlatform }; enum eWall { wAir, wWall, wBouncy, wSpike, wWater, wFrozen, wDoor, wSmashedDoor, wLockedDoor, wFountain0, wFountain1, wBluePortal, wOrangePortal, wPlatform, wStaircase, wColumn, wForge, wGUARD };
flagtype W_BLOCK = 1; flagtype W_BLOCK = 1;
flagtype W_TRANS = 2; flagtype W_TRANS = 2;
@ -62,7 +62,7 @@ flagtype W_PAIN = 16;
flagtype W_BOUNCY = 32; flagtype W_BOUNCY = 32;
flagtype W_FROZEN = 64; flagtype W_FROZEN = 64;
constexpr int qwall = 14; constexpr int qwall = int(wGUARD);
ruwall walls[qwall] = { ruwall walls[qwall] = {
{"air", ".", 0x40404080, W_TRANS}, {"air", ".", 0x40404080, W_TRANS},
@ -73,12 +73,15 @@ ruwall walls[qwall] = {
{"frozen water", "#", 0xC0C0FFFF, W_BLOCK | W_FROZEN}, {"frozen water", "#", 0xC0C0FFFF, W_BLOCK | W_FROZEN},
{"door", "+", 0xC06000FF, W_BLOCK}, {"door", "+", 0xC06000FF, W_BLOCK},
{"smashed door", "'", 0xC06000FF, W_TRANS}, {"smashed door", "'", 0xC06000FF, W_TRANS},
{"locked door", "+", 0xA05000FF, W_BLOCK},
{"magic fountain", "!", 0x8080C0FF, W_TRANS}, {"magic fountain", "!", 0x8080C0FF, W_TRANS},
{"magic fountain (active)", "!", 0xA0A0FFFF, W_TRANS}, {"magic fountain (active)", "!", 0xA0A0FFFF, W_TRANS},
{"blue portal", "=", 0x4040C0FF, W_TRANS}, {"blue portal", "=", 0x4040C0FF, W_TRANS},
{"orange portal", "=", 0xC08040FF, W_TRANS}, {"orange portal", "=", 0xC08040FF, W_TRANS},
{"platform", "-", 0xFFFFFFFF, W_PLATFORM | W_TRANS }, {"platform", "-", 0xFFFFFFFF, W_PLATFORM | W_TRANS },
{"staircase", "-", 0xFFFF80FF, W_PLATFORM | W_TRANS | W_STAIRCASE }, {"staircase", "-", 0xFFFF80FF, W_PLATFORM | W_TRANS | W_STAIRCASE },
{"column", "|", 0x40404080, W_TRANS},
{"forge", "&", 0xB0202080, W_TRANS | W_PAIN},
}; };
int sel = 1; int sel = 1;

View File

@ -4,6 +4,7 @@ ROOM Red Rooster Inn
- platform - platform
A staircase A staircase
. air . air
L locked door
MAP MAP
...................##.............................+-....+..---...##............. ...................##.............................+-....+..---...##.............
..................##################################----############............ ..................##################################----############............
@ -12,8 +13,8 @@ MAP
...............##.......................#............A........#......##......... ...............##.......................#............A........#......##.........
..............##........................#...........A.........#.......##........ ..............##........................#...........A.........#.......##........
.............##.........................#..........A..........#........##....... .............##.........................#..........A..........#........##.......
............##..........................+.........A...........+.........##...... ............##..........................L.........A...........L.........##......
...........##...........................+........A............+..........##..... ...........##...........................L........A............L..........##.....
..........############################################------################.... ..........############################################------################....
.........###........................................##.A..................##.... .........###........................................##.A..................##....
--........#b........................................#b..A.................#b.... --........#b........................................#b..A.................#b....
@ -66,6 +67,7 @@ ROOM Red Rooster Inn, guest rooms
+ door + door
- platform - platform
. air . air
L locked door
MAP MAP
................................................................................ ................................................................................
................................................................................ ................................................................................
@ -91,20 +93,20 @@ MAP
................#b..........#b......#b#b#....................................... ................#b..........#b......#b#b#.......................................
................##..........##.......#####...................................... ................##..........##.......#####......................................
................#b..........#b........#b#b#..................................... ................#b..........#b........#b#b#.....................................
................++..........++.........#####.................................... ................LL..........LL.........#####....................................
................+b..........+b..........#b#b#................................... ................Lb..........Lb..........#b#b#...................................
................++..........++...........#####.................................. ................LL..........LL...........#####..................................
................+b..........+b............#b#b#................................. ................Lb..........Lb............#b#b#.................................
########################--######################................................ ########################--######################................................
......................#b-b........#b........#b#b#............................... ......................#b-b........#b........#b#b#...............................
......................##--........##.........#####.............................. ......................##--........##.........#####..............................
......................#b-b........#b..........#b#b#............................. ......................#b-b........#b..........#b#b#.............................
......................##--........##...........#####............................ ......................##--........##...........#####............................
......................#b-b........#b............#b#b#........................... ......................#b-b........#b............#b#b#...........................
......................++--........++.............#####.......................... ......................LL--........++.............#####..........................
......................+b-b........+b..............#b#b#......................... ......................Lb-b........+b..............#b#b#.........................
......................++--........++....------......####........................ ......................LL--........++....------......####........................
......................+b-b........+b....-b-b-b......#b#b........................ ......................Lb-b........+b....-b-b-b......#b#b........................
##########################--------########################...................... ##########################--------########################......................
#b#b#b#b#b#b#b#b#b#b#b#b#b-b-b-b-b#b#b#b#b#b#b#b#b#b#b#b#b...................... #b#b#b#b#b#b#b#b#b#b#b#b#b-b-b-b-b#b#b#b#b#b#b#b#b#b#b#b#b......................
START 344 274 START 344 274

View File

@ -139,7 +139,7 @@ void render_room_walls(room *r) {
for(int y=0; y<room_y; y++) for(int y=0; y<room_y; y++)
for(int x=0; x<room_x; x++) { for(int x=0; x<room_x; x++) {
if(af && !r->fov[y][x]) continue; if(af && !r->fov[y][x]) continue;
char c = r->block_at[y][x]; int c = r->block_at[y][x];
// ld sx = 1.5; // ld sx = 1.5;
// ld sy = 1.3; // ld sy = 1.3;