For Yred worshippers, allow non-mindless undead to follow you if they're

not adjacent.  Mindless undead will still only follow you if they're 
adjacent.


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

1 files changed, 9 insertions, 2 deletions

diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc
index 1bbba85a91..768b10f762 100644
--- a/crawl-ref/source/stuff.cc
+++ b/crawl-ref/source/stuff.cc
@@ -368,8 +368,15 @@ static bool tag_follower_at(const coord_def &pos)
         if (!mons_friendly(fmenv))
             return (false);
 
-        // Orcs will follow Beogh worshippers.
-        if (you.religion != GOD_BEOGH || !is_follower(fmenv))
+        // Non-mindless undead will follow Yredelemnul worshippers, and
+        // orcs will follow Beogh worshippers.
+        if (you.religion != GOD_YREDELEMNUL && you.religion != GOD_BEOGH)
+            return (false);
+
+        if (you.religion == GOD_YREDELEMNUL && mons_intel(fmenv) <= I_PLANT)
+            return (false);
+
+        if (!is_follower(fmenv))
             return (false);
     }