Deactivate Shoals, and all Shoal-specific monsters (merfolk, mermaid,

siren, harpy, shark) to appear elsewhere.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9856 c06c8d41-db1a-0410-9941-cceddc491573

6 files changed, 15 insertions, 10 deletions

diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index 33c71802b0..07c6b5e5e5 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -1,7 +1,7 @@
 Stone Soup 0.5.0 (2009????)
 -------------------------
 
-Disclaimer: The code and this list are very much a work in progress.
+Disclaimer: These are merely the highlights, not an exhaustive list of changes.
 
 Breaks saves and bones compatibility.
 
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 6105775886..b33a6cccaf 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -3464,14 +3464,14 @@ static void _place_aquatic_monsters(int level_number, char level_type)
                     swimming_things[i] = MONS_SIREN;
             }
         }
-
+/*
         // Don't place sharks in the Swamp.
         if (!player_in_branch(BRANCH_SWAMP)
             && level_number >= 9 && one_chance_in(4))
         {
             swimming_things[3] = MONS_SHARK;
         }
-
+*/
         if (level_number >= 25 && one_chance_in(5))
             swimming_things[0] = MONS_WATER_ELEMENTAL;
 
diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc
index 9759560bde..ddcbb83900 100644
--- a/crawl-ref/source/mon-pick.cc
+++ b/crawl-ref/source/mon-pick.cc
@@ -862,8 +862,8 @@ int mons_standard_rare(int mcls)
     case MONS_SNAKE:
         return 80;
 
-    case MONS_MERFOLK:
-    case MONS_MERMAID:
+//    case MONS_MERFOLK:
+//    case MONS_MERMAID:
     case MONS_FLYING_SKULL:
     case MONS_SLIME_CREATURE:
         return 75;
@@ -1665,7 +1665,7 @@ int mons_swamp_rare(int mcls)
     case MONS_KOMODO_DRAGON:
     case MONS_VERY_UGLY_THING:
     case MONS_VAPOUR:
-    case MONS_MERMAID:
+//    case MONS_MERMAID:
         return 15;
 
     case MONS_PHANTOM:
@@ -1676,7 +1676,7 @@ int mons_swamp_rare(int mcls)
     case MONS_NECROPHAGE:
         return 12;
 
-    case MONS_SIREN:
+//    case MONS_SIREN:
     case MONS_BLINK_FROG:
     case MONS_GIANT_AMOEBA:
     case MONS_GIANT_GECKO:
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index ab38a6717f..3ac56ae4e0 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1886,6 +1886,11 @@ static bool _valid_morph( monsters *monster, int new_mclass )
         || new_mclass == MONS_PROGRAM_BUG
         || new_mclass == MONS_SHAPESHIFTER
         || new_mclass == MONS_GLOWING_SHAPESHIFTER
+        || new_mclass == MONS_MERFOLK // inhabitants of (deactivated) Shoals
+        || new_mclass == MONS_MERMAID
+        || new_mclass == MONS_SIREN
+        || new_mclass == MONS_HARPY
+        || new_mclass == MONS_SHARK
 
         // These require manual setting of mons.base_monster to indicate
         // what they are a skeleton/zombie/simulacrum/spectral thing of,
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 343ce30af1..715da38fef 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -695,7 +695,7 @@ static void _initialise_branch_depths()
     branches[BRANCH_LAIR].startdepth              = random_range(8, 13);
     branches[BRANCH_HIVE].startdepth              = random_range(11, 16);
     branches[BRANCH_SLIME_PITS].startdepth        = random_range(8, 10);
-    if ( coinflip() )
+    if (true) // always pick Swamp
     {
         branches[BRANCH_SWAMP].startdepth  = random_range(2, 7);
         branches[BRANCH_SHOALS].startdepth = -1;
diff --git a/crawl-ref/source/version.h b/crawl-ref/source/version.h
index 1670367082..cce06c75c1 100644
--- a/crawl-ref/source/version.h
+++ b/crawl-ref/source/version.h
@@ -33,10 +33,10 @@
 #define CRAWL "Dungeon Crawl Stone Soup"
 
 #define VER_NUM  "0.5"
-#define VER_QUAL "-svn"
+#define VER_QUAL ""
 
 // Undefine for official releases.
-#define DISPLAY_BUILD_REVISION
+//#define DISPLAY_BUILD_REVISION
 
 // last updated 07august2001 {mv}
 /* ***********************************************************************