From 43d9191f4ba2c718d5df92989a1e57fe480974d1 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Wed, 16 Sep 2009 19:46:22 +0000 Subject: 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 --- crawl-ref/source/tilepick.cc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'crawl-ref/source/tilepick.cc') 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: -- cgit v1.2.3-54-g00ecf