diff options
| -rw-r--r-- | crawl-ref/source/luadgn.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-dngn.txt | 8 | ||||
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 16 |
4 files changed, 22 insertions, 8 deletions
diff --git a/crawl-ref/source/luadgn.cc b/crawl-ref/source/luadgn.cc index ebc9c082a7..daab16491d 100644 --- a/crawl-ref/source/luadgn.cc +++ b/crawl-ref/source/luadgn.cc @@ -1358,8 +1358,8 @@ const char *dngn_feature_names[] = "unseen", "closed_door", "detected_secret_door", "secret_door", "wax_wall", "metal_wall", "green_crystal_wall", "rock_wall", "stone_wall", "permarock_wall", - "clear_rock_wall", "clear_stone_wall", "clear_permarock_wall", "", "", - "orcish_idol", "", "", "", "", "", + "clear_rock_wall", "clear_stone_wall", "clear_permarock_wall", "open_sea", + "", "orcish_idol", "", "", "", "", "", "granite_statue", "statue_reserved_1", "statue_reserved_2", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt index b03ab03b63..e28e83fb74 100644 --- a/crawl-ref/source/rltiles/dc-dngn.txt +++ b/crawl-ref/source/rltiles/dc-dngn.txt @@ -387,16 +387,24 @@ floor/lava3 ## water dngn_open_sea DNGN_OPEN_SEA +dngn_open_sea +dngn_open_sea dngn_open_sea2 dngn_deep_water DNGN_DEEP_WATER +dngn_deep_water dngn_deep_water2 dngn_shallow_water DNGN_SHALLOW_WATER +dngn_shallow_water +dngn_shallow_water dngn_shallow_water2 dngn_shallow_water_disturbance DNGN_SHALLOW_WATER_DISTURBANCE dngn_shallow_water_disturbance2 dngn_deep_water_murky DNGN_DEEP_WATER_MURKY +dngn_deep_water_murky dngn_deep_water_murky2 dngn_shallow_water_murky DNGN_SHALLOW_WATER_MURKY +dngn_shallow_water_murky +dngn_shallow_water_murky dngn_shallow_water_murky2 dngn_shallow_water_murky_disturbance DNGN_SHALLOW_WATER_MURKY_DISTURBANCE dngn_shallow_water_murky_disturbance2 diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 7d84d9d956..f5e31512fd 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2388,7 +2388,7 @@ int tileidx_feature(int object, int gx, int gy) monsters *mon = &menv[mgrd[gx][gy]]; // Add disturbance to tile. if (mons_is_submerged(mon)) - t+=2; + t += tile_dngn_count(t); } return (t); } diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index c1351c525f..096d45bd54 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -271,7 +271,7 @@ void DungeonRegion::pack_background(unsigned int bg, int x, int y) { if (bg & TILE_FLAG_WAS_SECRET) m_buf_dngn.add(TILE_DNGN_DETECTED_SECRET_DOOR, x, y); - + if (bg & TILE_FLAG_BLOOD) { tile_flavour &flv = env.tile_flv[x + m_cx_to_gx][y + m_cy_to_gy]; @@ -860,12 +860,18 @@ void DungeonRegion::pack_foreground(unsigned int bg, unsigned int fg, int x, int { if (tile_dngn_equal(TILE_DNGN_LAVA, bg_idx)) m_buf_main.add(TILE_MASK_LAVA, x, y); - else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER, bg_idx) || - tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_DISTURBANCE, bg_idx)) + else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER, bg_idx) + || tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_DISTURBANCE, + bg_idx)) + { m_buf_main.add(TILE_MASK_SHALLOW_WATER, x, y); - else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_MURKY, bg_idx) || - tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_MURKY_DISTURBANCE, bg_idx)) + } + else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_MURKY, bg_idx) + || tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_MURKY_DISTURBANCE, + bg_idx)) + { m_buf_main.add(TILE_MASK_SHALLOW_WATER_MURKY, x, y); + } else if (tile_dngn_equal(TILE_DNGN_DEEP_WATER, bg_idx)) m_buf_main.add(TILE_MASK_DEEP_WATER, x, y); else if (tile_dngn_equal(TILE_DNGN_DEEP_WATER_MURKY, bg_idx)) |