diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-10 21:30:42 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-10 22:04:09 -0600 |
| commit | d209dced6edfec770b03610e54a2836fb2bc0f30 (patch) | |
| tree | 131c8f4bddb17dad5ab719bfdb7d8f825d52f4d7 /crawl-ref/source/goditem.h | |
| parent | 219ce41e6713bcdf4432f977a1fce0c770cee348 (diff) | |
| download | crawl-ref-d209dced6edfec770b03610e54a2836fb2bc0f30.tar.gz crawl-ref-d209dced6edfec770b03610e54a2836fb2bc0f30.zip | |
Properly split up unholy and evil items, reworking is_(unholy|evil)().
This is mainly for Fedhas, who hates the latter but not the former.
Diffstat (limited to 'crawl-ref/source/goditem.h')
| -rw-r--r-- | crawl-ref/source/goditem.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/goditem.h b/crawl-ref/source/goditem.h index 8503b9d204..e08c09b43b 100644 --- a/crawl-ref/source/goditem.h +++ b/crawl-ref/source/goditem.h @@ -12,12 +12,14 @@ #include "spl-util.h" bool is_holy_item(const item_def& item); +bool is_unholy_item(const item_def& item); bool is_potentially_evil_item(const item_def& item); bool is_evil_item(const item_def& item); bool is_chaotic_item(const item_def& item); bool is_holy_discipline(int discipline); bool is_evil_discipline(int discipline); bool is_holy_spell(spell_type spell, god_type god = GOD_NO_GOD); +bool is_unholy_spell(spell_type spell, god_type god = GOD_NO_GOD); bool is_evil_spell(spell_type spell, god_type god = GOD_NO_GOD); bool is_chaotic_spell(spell_type spell, god_type god = GOD_NO_GOD); bool is_hasty_spell(spell_type spell, god_type god = GOD_NO_GOD); @@ -27,11 +29,13 @@ bool is_spellbook_type(const item_def& item, bool book_or_rod, is_any_spell, god_type god = you.religion); bool is_holy_spellbook(const item_def& item); +bool is_unholy_spellbook(const item_def& item); bool is_evil_spellbook(const item_def& item); bool is_chaotic_spellbook(const item_def& item); bool is_hasty_spellbook(const item_def& item); bool god_hates_spellbook(const item_def& item); bool is_holy_rod(const item_def& item); +bool is_unholy_rod(const item_def& item); bool is_evil_rod(const item_def& item); bool is_chaotic_rod(const item_def& item); bool is_hasty_rod(const item_def& item); |