diff options
| -rw-r--r-- | crawl-ref/source/describe.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/itemname.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/religion.h | 1 |
4 files changed, 18 insertions, 3 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 658191e1c8..3dd6883dc1 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1909,6 +1909,12 @@ std::string get_item_description( const item_def &item, bool verbose, } } + if (good_god_dislikes_item_handling(item)) + { + description << "$$" << god_name(you.religion) << " opposes the use of " + << "such an evil item."; + } + if (god_dislikes_item_handling(item)) { description << "$$" << god_name(you.religion) << " disapproves of the " diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 830fa06757..71f15c9565 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -2555,8 +2555,11 @@ const std::string menu_colour_item_prefix(const item_def &item, bool temp) prefixes.push_back("unidentified"); } - if (god_dislikes_item_handling(item)) + if (good_god_dislikes_item_handling(item) + || god_dislikes_item_handling(item)) + { prefixes.push_back("evil_item"); + } if (is_emergency_item(item)) prefixes.push_back("emergency_item"); diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 21dda6e4e3..644dcee506 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3052,6 +3052,12 @@ bool is_evil_item(const item_def& item) return retval; } +bool good_god_dislikes_item_handling(const item_def &item) +{ + return (is_good_god(you.religion) && is_evil_item(item) + && (is_demonic(item) || item_type_known(item))); +} + bool god_dislikes_item_handling(const item_def &item) { if (you.religion == GOD_TROG) @@ -3101,8 +3107,7 @@ bool god_dislikes_item_handling(const item_def &item) } } - return (is_good_god(you.religion) && is_evil_item(item) - && (is_demonic(item) || item_type_known(item))); + return (false); } // Is the destroyed weapon valuable enough to gain piety by doing so? diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index f950a8902f..2ff9afb3bf 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -105,6 +105,7 @@ void good_god_holy_attitude_change(monsters *holy); void beogh_convert_orc(monsters *orc, bool emergency, bool converted_by_follower = false); bool is_evil_item(const item_def& item); +bool good_god_dislikes_item_handling(const item_def &item); bool god_dislikes_item_handling(const item_def &item); bool ely_destroy_weapons(); bool trog_burn_books(); |