diff options
| author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-06-04 22:08:00 -0700 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-06-04 22:08:00 -0700 |
| commit | 1ac1213cae785d6fce990a724e5a5d5b9724f60d (patch) | |
| tree | 87b8da32120b65dc61111b50cd57268c4cda6a68 /crawl-ref/source/goditem.cc | |
| parent | 1aca2cef8295c48d5ea1bf913c2ab3e2379f9eba (diff) | |
| download | crawl-ref-1ac1213cae785d6fce990a724e5a5d5b9724f60d.tar.gz crawl-ref-1ac1213cae785d6fce990a724e5a5d5b9724f60d.zip | |
Don't misleadingly claim Chei hates +Rage/*Rage (geekosaur)
Since he doesn't hate *Rage, and as 4984cdbba notes,
the ability menu can indicate that using a +Rage
ability is a bad idea. Rage amulets are still marked
forbidden since they're not good for much else, and
it seemed more misleading to mark them OK.
Diffstat (limited to 'crawl-ref/source/goditem.cc')
| -rw-r--r-- | crawl-ref/source/goditem.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc index 72eaa4b5c0..8bede65dfd 100644 --- a/crawl-ref/source/goditem.cc +++ b/crawl-ref/source/goditem.cc @@ -351,7 +351,7 @@ bool is_hasty_item(const item_def& item) retval = (item.sub_type == WAND_HASTING); break; case OBJ_JEWELLERY: - retval = (item.sub_type == AMU_RAGE); + retval = (item.sub_type == AMU_RAGE && !is_artefact(item)); break; case OBJ_POTIONS: retval = (item.sub_type == POT_HASTE @@ -365,12 +365,6 @@ bool is_hasty_item(const item_def& item) break; } - if (is_artefact(item) && item.base_type != OBJ_BOOKS - && (artefact_wpn_property(item, ARTP_ANGRY))) - { - retval = true; - } - return retval; } |