Block eels and lava snakes from Zot.

They're pretty pointless spawns by that time, and using real threats
would dilute the self-contained, decent regular monster set.

Also, edit and add some comments on this and the same done for
Shoals, Abyss, Pan, D:1-5, including a reader's redirect.

diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 03eab38..a1dcfe2 100644 (file)
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -3818,15 +3818,16 @@ static void _place_aquatic_in(vector<coord_def> &places, const pop_entry *pop,
 
 static void _place_aquatic_monsters()
 {
-    // [ds] Shoals relies on normal monster generation to place its monsters.
-    // Given the amount of water area in the Shoals, placing water creatures
-    // explicitly explodes the Shoals' xp budget.
-    //
-    // Also disallow water creatures below D:6.
+    // Shoals relies on normal monster generation to place its monsters.
+    // Abyss's nature discourages random movement-inhibited monsters.
+    // Default liquid creatures are harmless in Pan or Zot, and
+    // threatening ones are distracting from their sets.
+    // Random liquid monster placement is too vicious before D:6.
     //
     if (player_in_branch(BRANCH_SHOALS)
         || player_in_branch(BRANCH_ABYSS)
         || player_in_branch(BRANCH_PANDEMONIUM)
+        || player_in_branch(BRANCH_ZOT)
         || player_in_branch(BRANCH_DUNGEON) && you.depth < 6)
     {
         return;

diff --git a/crawl-ref/source/mon-pick-data.h b/crawl-ref/source/mon-pick-data.h
index 3dc1856..e63533b 100644 (file)
--- a/crawl-ref/source/mon-pick-data.h
+++ b/crawl-ref/source/mon-pick-data.h
@@ -1324,6 +1324,7 @@ static const pop_entry pop_water_hell[] =
   { 0,0,0,FLAT,MONS_0 }
 };
 
+// Shoals, Abyss, Pan, Zot, D:1-5 liquid monsters are blocked in dungeon.cc
 static const struct { const pop_entry *pop; int count; } population_water[] =
 {
     POP(water_d),
@@ -1335,7 +1336,7 @@ static const struct { const pop_entry *pop; int count; } population_water[] =
 #endif
     POP(water_generic),
     POP(water_swamp),
-    POP(water_generic), // Shoals isn't actually used
+    POP(water_generic),
     POP(water_snake),
     POP(water_generic),
     POP(water_generic),