From 2817900512f1f92a5d8738723373ab378fd1d6e5 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sun, 19 Jul 2009 19:04:23 +0000 Subject: Add yet more Jiyva-related cleanups. Make sure his altars are never generated if the royal jelly is dead, you don't worship Jiyva, and you're not under penance from Jiyva; don't destroy Jiyva's altars if the royal jelly dies after you start worshipping him or go under penance from him; and clean up the alternate method for unlocking the Slime Pits. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10332 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abyss.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/abyss.cc') diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index cdc11b55eb..b4136e8ba2 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -305,7 +305,9 @@ static void _generate_area(const coord_def& topleft, } while (grd(*ri) == DNGN_ALTAR_ZIN || grd(*ri) == DNGN_ALTAR_SHINING_ONE - || grd(*ri) == DNGN_ALTAR_ELYVILON); + || grd(*ri) == DNGN_ALTAR_ELYVILON + || (jiyva_is_dead() ? + grd(*ri) == DNGN_ALTAR_JIYVA : false)); // Lugonu has a flat 50% chance of corrupting the altar. if (coinflip()) -- cgit v1.2.3-54-g00ecf