Note that Zin dislikes polymorphing monsters, and mark wands of polymorph

other as evil items for Zin worshipers.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6226 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 10 insertions, 0 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 458455a977..3217122067 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -676,6 +676,7 @@ std::string get_god_dislikes(god_type which_god, bool /*verbose*/)
     case GOD_ZIN:
         dislikes.push_back("cause yourself to mutate in a way that could "
                            "have been avoided");
+        dislikes.push_back("polymorph monsters");
         dislikes.push_back("eat the flesh of sentient beings");
         break;
 
@@ -3026,6 +3027,15 @@ bool god_dislikes_item_handling(const item_def &item)
                 && item.sub_type != BOOK_DESTRUCTION);
     }
 
+    if (you.religion == GOD_ZIN)
+    {
+        if (item.base_type == OBJ_WANDS
+            && item.sub_type == WAND_POLYMORPH_OTHER)
+        {
+            return (true);
+        }
+    }
+
     return (is_good_god(you.religion) && is_evil_item(item)
             && item_type_known(item));
 }