Mark cyclopes, merfolk, and mermaids as native to the Shoals.

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

1 files changed, 9 insertions, 0 deletions

diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index e9291761cd..057f7696a1 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -4996,6 +4996,15 @@ static bool is_native_in_branch(const monsters *monster, const branch_type branc
                 return true;
             return false;
 
+        case BRANCH_SHOALS:
+            if (monster->type == MONS_CYCLOPS
+                || mons_species(monster->type) == MONS_MERFOLK
+                || mons_species(monster->type) == MONS_MERMAID)
+            {
+                return true;
+            }
+            return false;
+
         case BRANCH_SLIME_PITS:
             if (mons_species(monster->type) == MONS_JELLY)
                 return true;