diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-19 19:04:23 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-19 19:04:23 +0000 |
| commit | 2817900512f1f92a5d8738723373ab378fd1d6e5 (patch) | |
| tree | be26e14a39ad8bafe9b5a63b48b01ebb8772d9c2 /crawl-ref/source/decks.cc | |
| parent | af7b69fc5936d24c9ee0bbb5bc787cb194f7c26f (diff) | |
| download | crawl-ref-2817900512f1f92a5d8738723373ab378fd1d6e5.tar.gz crawl-ref-2817900512f1f92a5d8738723373ab378fd1d6e5.zip | |
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
Diffstat (limited to 'crawl-ref/source/decks.cc')
| -rw-r--r-- | crawl-ref/source/decks.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 263a41dd4a..3636d4ce57 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -2532,6 +2532,10 @@ static bool _trowel_card(int power, deck_rarity_type rarity) { // Might get GOD_NO_GOD and no altar. god_type rgod = static_cast<god_type>(random2(NUM_GODS)); + + if (rgod == GOD_JIYVA && jiyva_is_dead()) + rgod = GOD_NO_GOD; + grd(you.pos()) = altar_for_god(rgod); if (grd(you.pos()) != DNGN_FLOOR) |