summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-12 20:45:27 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-12 20:50:14 +0530
commitb091697fdc5c8cbb32452ba7ac0a296d1da652c4 (patch)
tree2b21bcdda203c21d2af94a38293765d117140fb4
parentd458a7edd3acaed9be5c777234b70cd73f2d6474 (diff)
downloadcrawl-ref-b091697fdc5c8cbb32452ba7ac0a296d1da652c4.tar.gz
crawl-ref-b091697fdc5c8cbb32452ba7ac0a296d1da652c4.zip
Make boss merfolk and sirens rarer (rob).
New average number of sirens=0.26 (was 1.3), boss merfolk=0.16 (was 0.3) on Shoal:1.
-rw-r--r--crawl-ref/source/dungeon.cc4
-rw-r--r--crawl-ref/source/mon-pick.cc6
2 files changed, 4 insertions, 6 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index fdf91dd06b..c9a29e76e7 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -3544,9 +3544,7 @@ static void _place_aquatic_monsters(int level_number, char level_type)
swimming_things[i] = MONS_MERFOLK;
else if (one_chance_in(5))
swimming_things[i] = MONS_MERMAID;
- else if (one_chance_in(8))
- swimming_things[i] = MONS_SIREN;
- else if (one_chance_in(20))
+ else if (one_chance_in(24))
swimming_things[i] = MONS_KRAKEN;
}
else if (player_in_branch( BRANCH_COCYTUS ))
diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc
index c65327d552..41ae0e5e58 100644
--- a/crawl-ref/source/mon-pick.cc
+++ b/crawl-ref/source/mon-pick.cc
@@ -1755,14 +1755,14 @@ int mons_shoals_rare(int mcls)
return 35;
case MONS_SIREN:
- case MONS_MERFOLK_AQUAMANCER:
- case MONS_MERFOLK_IMPALER:
- case MONS_MERFOLK_JAVELINEER:
return 24;
case MONS_CYCLOPS:
case MONS_HARPY:
case MONS_CENTAUR:
+ case MONS_MERFOLK_AQUAMANCER:
+ case MONS_MERFOLK_IMPALER:
+ case MONS_MERFOLK_JAVELINEER:
return 20;
case MONS_SHARK: