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/artefact.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/artefact.cc')
| -rw-r--r-- | crawl-ref/source/artefact.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index 18d8343723..a311b2ea4a 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -46,6 +46,9 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item, if (which_god == GOD_NO_GOD) return (false); + if (which_god == GOD_JIYVA && jiyva_is_dead()) + return (false); + // First check the item's base_type and sub_type, then check the // item's brand and other randart properties. bool type_bad = false; |