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
QANG7WJNRRHNWPRWQSILZI4QILSXVTRZEZRGCZCAPDMWNCJEDS3AC
VR4I4EIMBG7SUFP24TQOP64OUUKQXY6BU6VLGWHN67FJ6GTA6YTQC
PQYLCUBDA6P4UY7X3NLIUUKMJ5GTQTB5X64VNSQVMCFS6ONMXXOQC
KMIAYRVC7MHCVKQ3SORXTECRFUEOLAIL5CO6636FXG36GNXGU6XQC
FS4GAKLP3QPPVMI3RCBFMOTBPJXTOXWB4FXGK3QO2IMXZ5AHVMNQC
PHZTAI6CW7JHKFW77MKDK75UCNWBXFK7VDD3D5ORVXUFWV3C3EVQC
Q3B3UVMYEVC4YJUPYVSNTR4DJH4E6J4JJDHZNT5LNOCHCPPMEMXAC
RG2VANNJZSWPOX2EZZOMANGRV7CK43BTOYMFTUFSDKTAJWEF5ISQC
4SUUJM2DQUEWHDG3UKJUDZABLHFVF2CFUX5GVAWKT7BBBGR2ISTQC
25CH7HH4LKXFIZ75YNMXS3TSXO6O27DYSOPLOD45K4OCNFWLS4LQC
UPUR43MXCLHJOHYGKGRA4XAGB4GXW4RNCGCDCB2MXJDV3DIEISIAC
VJNOAT646TRVBR44TNKO4WHBO54I2U5GLRWTIVDVWHHQ6CNYQ5ZAC
RLASB5KZ7SVY5IOZKBUQKSVLTINONJ7JEDY5SM3LFPSIUHM7DPOQC
TXVL24IFH5SK7EJAN7JAUHAZJHJV7GB364UU65P745GUBWJS6Q6AC
A4FBEPVX7W4H4R7AMJEGONTJC5N7SC2E3S3CV7RZYS2SAONUQBHQC
MPMVK6J5UQUFJ75SNRSPIBBSRTH67ZPDZKPZUF3RZRFKSERS62AAC
OELSU5HUOEW6D2AAZJUYB5G25OOGR3YU7UZKNA57EJG5HRMCQ7UAC
HBXWZNXAJ7LUX7FYUIHQYBTRMWVJC6CAQQL3NNZHK5ETLIFEZJ7QC
6WTIPODXGUFWCOP5ADMR2XCCQ63HMZR7LHZM2FX4L2ACZWLKTQQAC
X55CKEKNO5RD2JMQ4MYX6PXQLDMLH4U4PPKSBK5EQ622J5HOPD2AC
K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
BMHUBADDGIOZRVN4P3O5QKIDUYD4RFWBS7MP5X6LZWAYHUBRVD2QC
ERDDGBLUEKZ5SIVBKSK3XOWIORPGQRJKWG2RDGT3XQSWOMV36V2QC
RVST2QHYJ757ZHK4AUJ5NGPDZ44AD6RVFVXYPKQIBJXZBDNUCHXQC
U7RYFXP5Z2QXHTCPTEBZ3TH6MW2DQQBBNABBEDB7AW25LUXF3IKQC
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