Experimentally use Denzi and/or Mitsuhiro's water tiles for the Shoals.

It's possible that they make the water look too busy, but maybe I only
need to get used to it. Also add some more alternative tiles for the
plain dungeon floor and walls, and move around some spell tiles again.

Also fix 2844278: melding stacks stat bonuses for Merfolk.
Update change log for the starting stat and exclusion changes.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10688 c06c8d41-db1a-0410-9941-cceddc491573

80 files changed, 40 insertions, 4 deletions

diff --git a/crawl-ref/docs/changelog.txt b/crawl-ref/docs/changelog.txt
index fd1034a06f..7982244cc5 100644
--- a/crawl-ref/docs/changelog.txt
+++ b/crawl-ref/docs/changelog.txt
@@ -5,8 +5,11 @@ Stone Soup 0.6
 * Added scroll of silence.
 * Several new uniques.
 * Overhaul Wanderers.
+* Starting stats and equipment, and hp gain, are no longer assigned randomly.
 * Round all aptitudes to multiples of 10.
 * New memorisation interface.
+* Exclusions are displayed in the overview screen ('Ctrl-O' command).
+* Autoexclusions get removed again once the trigger monster is no longer there.
 * Armour acquirement is more likely to fill secondary slots.
 * Book acquirement doesn't give manuals to spellcasting specialists anymore.
 * Added wands as an acquirement option.
@@ -26,7 +29,7 @@ Stone Soup 0.6
 * Call Canine Familiar only calls friendly canines.
 * Add some tiles "animations" whenever the screen is redrawn.
 * Tiles: re-added doll editing screen ('-' command).
-* Tiles: clickable spells menu.
+* Tiles: added clickable spells display (toggle with '_' command).
 
 Stone Soup 0.5.1 (20090728)
 ---------------------------
diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
index 41b1768161..c7c96a6b86 100644
--- a/crawl-ref/source/dat/database/monspeak.txt
+++ b/crawl-ref/source/dat/database/monspeak.txt
@@ -1357,7 +1357,7 @@ VISUAL:@The_monster@ points a slender finger @at_foe@ and smirks.
 @The_monster@ says @to_foe@, "Stay away from my face!"
 
 @The_monster@ says @to_foe@, "Magic and the sword, together, will defeat you." @player_only@
- 
+
 %%%%
 _Dowan_rare_
 
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 66610c33dd..898dfd705c 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -261,7 +261,8 @@ bool move_player_to_grid( const coord_def& p, bool stepped, bool allow_shift,
                 need_doll_update = true;
 #endif
             }
-            else if (!grid_is_water(new_grid) && grid_is_water(old_grid))
+            else if (!grid_is_water(new_grid) && grid_is_water(old_grid)
+                     && !is_grid_dangerous(new_grid))
             {
                 unmeld_one_equip(EQ_BOOTS);
                 you.redraw_evasion = true;
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/arrow.png b/crawl-ref/source/rltiles/UNUSED/spells/components/arrow.png
index 41d8897c89..41d8897c89 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/arrow.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/arrow.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/bird.png b/crawl-ref/source/rltiles/UNUSED/spells/components/bird.png
index 2277207cdf..2277207cdf 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/bird.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/bird.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/bolt.png b/crawl-ref/source/rltiles/UNUSED/spells/components/bolt.png
index 9a7ab8182f..9a7ab8182f 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/bolt.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/bolt.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/bowl.png b/crawl-ref/source/rltiles/UNUSED/spells/components/bowl.png
index b63948bc14..b63948bc14 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/bowl.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/bowl.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/person3.png b/crawl-ref/source/rltiles/UNUSED/spells/components/corpse.png
index ea607addcc..ea607addcc 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/person3.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/corpse.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/dog1.png b/crawl-ref/source/rltiles/UNUSED/spells/components/dog1.png
index 193906be8f..193906be8f 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/dog1.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/dog1.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/dog2.png b/crawl-ref/source/rltiles/UNUSED/spells/components/dog2.png
index 77b805409d..77b805409d 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/dog2.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/dog2.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/dragon.png b/crawl-ref/source/rltiles/UNUSED/spells/components/dragon.png
index 8413edf1ac..8413edf1ac 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/dragon.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/dragon.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/eye.png b/crawl-ref/source/rltiles/UNUSED/spells/components/eye.png
index c837fde7c2..c837fde7c2 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/eye.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/eye.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/face.png b/crawl-ref/source/rltiles/UNUSED/spells/components/face.png
index 7894fc6bf1..7894fc6bf1 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/face.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/face.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/hand1.png b/crawl-ref/source/rltiles/UNUSED/spells/components/hand1.png
index 7419254329..7419254329 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/hand1.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/hand1.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/hand2.png b/crawl-ref/source/rltiles/UNUSED/spells/components/hand2.png
index 1eec6137e4..1eec6137e4 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/hand2.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/hand2.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/hand3.png b/crawl-ref/source/rltiles/UNUSED/spells/components/hand3.png
index 892d0748f5..892d0748f5 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/hand3.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/hand3.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/hand4.png b/crawl-ref/source/rltiles/UNUSED/spells/components/hand4.png
index c4152c99b2..c4152c99b2 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/hand4.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/hand4.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/hand5.png b/crawl-ref/source/rltiles/UNUSED/spells/components/hand5.png
index 51863dd45b..51863dd45b 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/hand5.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/hand5.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/horn.png b/crawl-ref/source/rltiles/UNUSED/spells/components/horn.png
index 1c8068e42e..1c8068e42e 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/horn.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/horn.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/ice.png b/crawl-ref/source/rltiles/UNUSED/spells/components/ice.png
index 0640a81e4a..0640a81e4a 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/ice.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/ice.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/ice_spear.png b/crawl-ref/source/rltiles/UNUSED/spells/components/ice_spear.png
index 1826f4b5aa..1826f4b5aa 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/ice_spear.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/ice_spear.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/pentagram_horizontal.png b/crawl-ref/source/rltiles/UNUSED/spells/components/pentagram_horizontal.png
index 079fc93a5f..079fc93a5f 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/pentagram_horizontal.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/pentagram_horizontal.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/pentagram_vertical.png b/crawl-ref/source/rltiles/UNUSED/spells/components/pentagram_vertical.png
index c1ac4d6b99..c1ac4d6b99 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/pentagram_vertical.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/pentagram_vertical.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/person1.png b/crawl-ref/source/rltiles/UNUSED/spells/components/person1.png
index b7ce402c1d..b7ce402c1d 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/person1.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/person1.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/person2.png b/crawl-ref/source/rltiles/UNUSED/spells/components/person2.png
index 0b10b392eb..0b10b392eb 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/person2.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/person2.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/person4.png b/crawl-ref/source/rltiles/UNUSED/spells/components/person3.png
index 34873d9c70..34873d9c70 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/person4.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/person3.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/person5.png b/crawl-ref/source/rltiles/UNUSED/spells/components/person4.png
index 61ac82e630..61ac82e630 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/person5.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/person4.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/rat.png b/crawl-ref/source/rltiles/UNUSED/spells/components/rat.png
index 3666e07fb5..3666e07fb5 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/rat.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/rat.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/running.png b/crawl-ref/source/rltiles/UNUSED/spells/components/running.png
index 195d3ce2b7..195d3ce2b7 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/running.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/running.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/scroll.png b/crawl-ref/source/rltiles/UNUSED/spells/components/scroll.png
index d9880d85db..d9880d85db 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/scroll.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/scroll.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/skull.png b/crawl-ref/source/rltiles/UNUSED/spells/components/skull.png
index 13056aec84..13056aec84 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/skull.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/skull.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/snowflake.png b/crawl-ref/source/rltiles/UNUSED/spells/components/snowflake.png
index 9f0620ff11..9f0620ff11 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/snowflake.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/snowflake.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/stone.png b/crawl-ref/source/rltiles/UNUSED/spells/components/stone.png
index 91042d87e6..91042d87e6 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/stone.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/stone.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/stone_cracked.png b/crawl-ref/source/rltiles/UNUSED/spells/components/stone_cracked.png
index 1c19645ae6..1c19645ae6 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/stone_cracked.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/stone_cracked.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/stones.png b/crawl-ref/source/rltiles/UNUSED/spells/components/stones.png
index 60a9c62ece..60a9c62ece 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/stones.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/stones.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/sword.png b/crawl-ref/source/rltiles/UNUSED/spells/components/sword.png
index 4b5e5c787e..4b5e5c787e 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/sword.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/sword.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/tornado.png b/crawl-ref/source/rltiles/UNUSED/spells/components/tornado.png
index bc9176ac63..bc9176ac63 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/tornado.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/components/tornado.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/mephitic_cloud2.png b/crawl-ref/source/rltiles/UNUSED/spells/mephitic_cloud.png
index 1bcb7e5f44..1bcb7e5f44 100644
--- a/crawl-ref/source/rltiles/UNUSED/spells/mephitic_cloud2.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/mephitic_cloud.png
diff --git a/crawl-ref/source/rltiles/UNUSED/spells/symbol_of_torment.png b/crawl-ref/source/rltiles/UNUSED/spells/symbol_of_torment.png
new file mode 100644
index 0000000000..d262aaec54
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/spells/symbol_of_torment.png
diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt
index c40a5cd821..5bbd90afe6 100644
--- a/crawl-ref/source/rltiles/dc-dngn.txt
+++ b/crawl-ref/source/rltiles/dc-dngn.txt
@@ -12,11 +12,19 @@ wall/brick_brown0 WALL_NORMAL
 wall/brick_brown1
 wall/brick_brown2
 wall/brick_brown3
+wall/brick_brown4
+wall/brick_brown5
+wall/brick_brown6
+wall/brick_brown7
 floor/pebble_gray0 FLOOR_NORMAL
 floor/pebble_gray1
 floor/pebble_gray2
 floor/pebble_gray3
 floor/pebble_gray4
+floor/pebble_gray5
+floor/pebble_gray6
+floor/pebble_gray7
+floor/pebble_gray8
 
 wall/relief0 WALL_HALL
 wall/relief1
@@ -387,6 +395,7 @@ floor/lava2
 floor/lava3
 
 ## water
+%sdir dc-dngn/water
 dngn_open_sea DNGN_OPEN_SEA
 dngn_open_sea
 dngn_open_sea
@@ -409,6 +418,17 @@ dngn_shallow_water_murky
 dngn_shallow_water_murky2
 dngn_shallow_water_murky_disturbance DNGN_SHALLOW_WATER_MURKY_DISTURBANCE
 dngn_shallow_water_murky_disturbance2
+dngn_shoals_deep_water1 SHOALS_DEEP_WATER
+dngn_shoals_deep_water2
+dngn_shoals_deep_water3
+dngn_shoals_deep_water4
+dngn_shoals_shallow_water1 SHOALS_SHALLOW_WATER
+dngn_shoals_shallow_water2
+dngn_shoals_shallow_water3
+dngn_shoals_shallow_water4
+dngn_shoals_shallow_water_disturbance1 SHOALS_SHALLOW_WATER_DISTURBANCE
+dngn_shoals_shallow_water_disturbance2
+dngn_shoals_shallow_water_disturbance3
 
 %sdir dc-dngn/gateways
 dngn_entrance DNGN_UNSEEN_ENTRANCE
diff --git a/crawl-ref/source/rltiles/dc-dngn/floor/pebble_gray5.png b/crawl-ref/source/rltiles/dc-dngn/floor/pebble_gray5.png
new file mode 100644
index 0000000000..024c193f48
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/floor/pebble_gray5.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/floor/pebble_gray6.png b/crawl-ref/source/rltiles/dc-dngn/floor/pebble_gray6.png
new file mode 100644
index 0000000000..74a9ecfc4a
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/floor/pebble_gray6.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/floor/pebble_gray7.png b/crawl-ref/source/rltiles/dc-dngn/floor/pebble_gray7.png
new file mode 100644
index 0000000000..ba61403cf8
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/floor/pebble_gray7.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/floor/pebble_gray8.png b/crawl-ref/source/rltiles/dc-dngn/floor/pebble_gray8.png
new file mode 100644
index 0000000000..12967b7c9d
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/floor/pebble_gray8.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/wall/brick_brown4.png b/crawl-ref/source/rltiles/dc-dngn/wall/brick_brown4.png
new file mode 100644
index 0000000000..86c86e94d2
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/wall/brick_brown4.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/wall/brick_brown5.png b/crawl-ref/source/rltiles/dc-dngn/wall/brick_brown5.png
new file mode 100644
index 0000000000..593b846cfe
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/wall/brick_brown5.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/wall/brick_brown6.png b/crawl-ref/source/rltiles/dc-dngn/wall/brick_brown6.png
new file mode 100644
index 0000000000..d5371ddae1
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/wall/brick_brown6.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/wall/brick_brown7.png b/crawl-ref/source/rltiles/dc-dngn/wall/brick_brown7.png
new file mode 100644
index 0000000000..f46a7f726e
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/wall/brick_brown7.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_deep_water.png
index bfbe6b1c79..bfbe6b1c79 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_deep_water.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water2.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_deep_water2.png
index 65011585ed..65011585ed 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water2.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_deep_water2.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water_murky.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_deep_water_murky.png
index 4e3432d5cf..4e3432d5cf 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water_murky.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_deep_water_murky.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water_murky2.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_deep_water_murky2.png
index 288bbe67de..288bbe67de 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water_murky2.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_deep_water_murky2.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_open_sea.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_open_sea.png
index 2a3893746f..2a3893746f 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_open_sea.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_open_sea.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_open_sea2.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_open_sea2.png
index 013d3f7eb9..013d3f7eb9 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_open_sea2.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_open_sea2.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water.png
index 50c49b02b4..50c49b02b4 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water2.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water2.png
index 4f0ce929ae..4f0ce929ae 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water2.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water2.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_disturbance.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water_disturbance.png
index ec667735a5..ec667735a5 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_disturbance.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water_disturbance.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_disturbance2.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water_disturbance2.png
index 9f8f13bbd3..9f8f13bbd3 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_disturbance2.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water_disturbance2.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water_murky.png
index 5ede780305..5ede780305 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water_murky.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky2.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water_murky2.png
index 6e2ad4300a..6e2ad4300a 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky2.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water_murky2.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky_disturbance.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water_murky_disturbance.png
index 254f1ecc61..254f1ecc61 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky_disturbance.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water_murky_disturbance.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky_disturbance2.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water_murky_disturbance2.png
index 3278b32091..3278b32091 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky_disturbance2.png
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shallow_water_murky_disturbance2.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_deep_water1.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_deep_water1.png
new file mode 100644
index 0000000000..6c47098e41
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_deep_water1.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_deep_water2.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_deep_water2.png
new file mode 100644
index 0000000000..b03e1b2456
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_deep_water2.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_deep_water3.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_deep_water3.png
new file mode 100644
index 0000000000..f23dfdc30e
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_deep_water3.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_deep_water4.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_deep_water4.png
new file mode 100644
index 0000000000..e801c70362
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_deep_water4.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water1.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water1.png
new file mode 100644
index 0000000000..116845783f
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water1.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water2.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water2.png
new file mode 100644
index 0000000000..c44fd453f6
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water2.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water3.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water3.png
new file mode 100644
index 0000000000..058ab93358
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water3.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water4.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water4.png
new file mode 100644
index 0000000000..679d9c0331
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water4.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water_disturbance1.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water_disturbance1.png
new file mode 100644
index 0000000000..d32f5e17c6
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water_disturbance1.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water_disturbance2.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water_disturbance2.png
new file mode 100644
index 0000000000..2167efac1d
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water_disturbance2.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water_disturbance3.png b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water_disturbance3.png
new file mode 100644
index 0000000000..22a1410279
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/water/dngn_shoals_shallow_water_disturbance3.png
diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt
index 6c91ac4052..209a1112ce 100644
--- a/crawl-ref/source/rltiles/dc-misc.txt
+++ b/crawl-ref/source/rltiles/dc-misc.txt
@@ -43,6 +43,8 @@ mask_deep_water MASK_DEEP_WATER
 mask_shallow_water MASK_SHALLOW_WATER
 mask_deep_water_murky MASK_DEEP_WATER_MURKY
 mask_shallow_water_murky MASK_SHALLOW_WATER_MURKY
+mask_deep_water_shoals MASK_DEEP_WATER_SHOALS
+mask_shallow_water_shoals MASK_SHALLOW_WATER_SHOALS
 mask_lava MASK_LAVA
 cursor CURSOR
 cursor_red CURSOR2
diff --git a/crawl-ref/source/rltiles/dc-misc/mask_deep_water_shoals.png b/crawl-ref/source/rltiles/dc-misc/mask_deep_water_shoals.png
new file mode 100644
index 0000000000..69e35f5e79
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-misc/mask_deep_water_shoals.png
diff --git a/crawl-ref/source/rltiles/dc-misc/mask_shallow_water_shoals.png b/crawl-ref/source/rltiles/dc-misc/mask_shallow_water_shoals.png
new file mode 100644
index 0000000000..8d30644679
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-misc/mask_shallow_water_shoals.png
diff --git a/crawl-ref/source/rltiles/dc-spells.txt b/crawl-ref/source/rltiles/dc-spells.txt
index 1383ea6044..29c1502964 100644
--- a/crawl-ref/source/rltiles/dc-spells.txt
+++ b/crawl-ref/source/rltiles/dc-spells.txt
@@ -70,7 +70,6 @@ sure_blade SURE_BLADE
 tame_beasts TAME_BEASTS
 tukimas_dance TUKIMAS_DANCE
 tukimas_vorpal_blade TUKIMAS_VORPAL_BLADE
-unknown UNKNOWN
 
 %sdir spells/fire
 bolt_of_fire BOLT_OF_FIRE
diff --git a/crawl-ref/source/rltiles/spells/necromancy/symbol_of_torment.png b/crawl-ref/source/rltiles/spells/necromancy/symbol_of_torment.png
index d262aaec54..0739a8361c 100644
--- a/crawl-ref/source/rltiles/spells/necromancy/symbol_of_torment.png
+++ b/crawl-ref/source/rltiles/spells/necromancy/symbol_of_torment.png
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index ab5dc9a7f7..377f63997a 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2376,6 +2376,9 @@ int tileidx_feature(int object, int gx, int gy)
         {
             return TILE_DNGN_DEEP_WATER_MURKY;
         }
+        else if (player_in_branch(BRANCH_SHOALS))
+            return TILE_SHOALS_DEEP_WATER;
+
         return TILE_DNGN_DEEP_WATER;
     case DNGN_SHALLOW_WATER:
     {
@@ -2385,6 +2388,9 @@ int tileidx_feature(int object, int gx, int gy)
         {
             t = TILE_DNGN_SHALLOW_WATER_MURKY;
         }
+        else if (player_in_branch(BRANCH_SHOALS))
+            t = TILE_SHOALS_SHALLOW_WATER;
+
         if (mgrd[gx][gy] != NON_MONSTER)
         {
             monsters *mon = &menv[mgrd[gx][gy]];
@@ -2392,6 +2398,7 @@ int tileidx_feature(int object, int gx, int gy)
             if (mons_is_submerged(mon))
                 t += tile_dngn_count(t);
         }
+
         return (t);
     }
     case DNGN_FLOOR:
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index d73085cd0f..8574d1bcfe 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -804,6 +804,10 @@ void DungeonRegion::pack_foreground(unsigned int bg, unsigned int fg, int x, int
             m_buf_main.add(TILE_MASK_DEEP_WATER, x, y);
         else if (tile_dngn_equal(TILE_DNGN_DEEP_WATER_MURKY, bg_idx))
             m_buf_main.add(TILE_MASK_DEEP_WATER_MURKY, x, y);
+        else if (tile_dngn_equal(TILE_SHOALS_DEEP_WATER, bg_idx))
+            m_buf_main.add(TILE_MASK_DEEP_WATER_SHOALS, x, y);
+        else if (tile_dngn_equal(TILE_SHOALS_SHALLOW_WATER, bg_idx))
+            m_buf_main.add(TILE_MASK_SHALLOW_WATER_SHOALS, x, y);
     }
 
     if (fg & TILE_FLAG_NET)