summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-place.cc
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-08 13:11:44 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-08 13:16:12 +0530
commit6d0eb3000187dd587e961ca87ddb9eca947f15dc (patch)
tree420aac3eaf6aee2ef5ccf5eebcef33d1fcd19791 /crawl-ref/source/mon-place.cc
parent2aef97c76417be892660cf4f91da3953f222d2b9 (diff)
downloadcrawl-ref-6d0eb3000187dd587e961ca87ddb9eca947f15dc.tar.gz
crawl-ref-6d0eb3000187dd587e961ca87ddb9eca947f15dc.zip
Add snapping turtles, alligator snapping turtles and sea snakes to the Shoals, remove yaktaurs, centaurs and stone giants.
Snapping turtles get reaching attacks. Sea snakes get strong venom.
Diffstat (limited to 'crawl-ref/source/mon-place.cc')
-rw-r--r--crawl-ref/source/mon-place.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc
index 884477362c..0e56e36c8f 100644
--- a/crawl-ref/source/mon-place.cc
+++ b/crawl-ref/source/mon-place.cc
@@ -199,7 +199,8 @@ bool monster_can_submerge(const monsters *mons, dungeon_feature_type grid)
{
case HT_WATER:
// Monsters can submerge in shallow water - this is intentional.
- return (feat_is_watery(grid));
+ return (feat_is_watery(grid)
+ && mons_genus(mons_base_type(mons)) != MONS_MERFOLK);
case HT_LAVA:
return (grid == DNGN_LAVA);