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

36 files changed, 0 insertions, 0 deletions

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