summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2006-09-22 11:57:14 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2006-09-22 11:57:14 +0000
commit9db5b6ec1ec24524e5bce03d6d6e03edcd26afa2 (patch)
treed619cdd0ac45ff960d3732204542626c7851f62f
parenta7ed5868fa0c7ebf712b518bfb2d75c3d9887128 (diff)
downloadcrawl-ref-9db5b6ec1ec24524e5bce03d6d6e03edcd26afa2.tar.gz
crawl-ref-9db5b6ec1ec24524e5bce03d6d6e03edcd26afa2.zip
Fixed the low-level jelly pit bug.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@65 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/dungeon.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 384ae35c4e..07ffa799d8 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -4994,6 +4994,7 @@ static void special_room(int level_number, spec_room &sr)
if ((level_number > 13 && spec_room_type == SROOM_LAIR_KOBOLD)
|| (level_number < 16 && spec_room_type == SROOM_MORGUE)
+ || (level_number < 12 && spec_room_type == SROOM_JELLY_PIT)
|| (level_number < 17 && one_chance_in(4)))
{
spec_room_type = SROOM_LAIR_ORC;
@@ -5002,10 +5003,9 @@ static void special_room(int level_number, spec_room &sr)
if (level_number > 19 && coinflip())
spec_room_type = SROOM_MORGUE;
- if (level_number > 13
- && one_chance_in(level_number > 23? 4 :
- level_number > 18? 5 : 6))
- spec_room_type = SROOM_JELLY_PIT;
+ if (level_number > 13 &&
+ one_chance_in(6 - (level_number > 23) - (level_number > 18)))
+ spec_room_type = SROOM_JELLY_PIT;
}
switch (spec_room_type)