diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-17 17:42:01 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-17 17:42:01 +0000 |
| commit | 8b996888e5854e912e8ae2d97e64089f44c9a372 (patch) | |
| tree | 955e57e489ac636096c7dee20c8ce955a3aa2e9c /crawl-ref/source/randart.cc | |
| parent | da621d89cd3418e99b40a2ee5b326065852bea8f (diff) | |
| download | crawl-ref-8b996888e5854e912e8ae2d97e64089f44c9a372.tar.gz crawl-ref-8b996888e5854e912e8ae2d97e64089f44c9a372.zip | |
Don't allow randart gifts from good gods to have the RAP_CURSED
property, as, according to comments in unrand.h, they tend to recurse
themselves, and if the Scythe of Curses is considered unholy for doing
the same, then it's inconsistent.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4307 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/randart.cc')
| -rw-r--r-- | crawl-ref/source/randart.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc index c388dffb26..3c68c36a7f 100644 --- a/crawl-ref/source/randart.cc +++ b/crawl-ref/source/randart.cc @@ -50,7 +50,8 @@ static bool god_fits_artefact(const god_type which_god, const item_def &item) if (is_evil_god(which_god) && brand == SPWPN_HOLY_WRATH) return (false); else if (is_good_god(which_god) && (brand == SPWPN_DRAINING - || brand == SPWPN_PAIN || brand == SPWPN_VAMPIRICISM)) + || brand == SPWPN_PAIN || brand == SPWPN_VAMPIRICISM) + || randart_wpn_property( item, RAP_CURSED )) { return (false); } @@ -100,7 +101,6 @@ static bool god_fits_artefact(const god_type which_god, const item_def &item) return (false); if (randart_wpn_property( item, RAP_INVISIBLE ) - || randart_wpn_property( item, RAP_CURSED ) || randart_wpn_property( item, RAP_STEALTH ) > 0) { return (false); |