Implement FR#1756327: Polymorph other always works on shapeshifters, reverting them to their original form (they immediately polymorph again on their turn). Wand of polymorph other description mentions it being effective against shapechangers.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 91a9c88d47..744a90480f 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -4734,8 +4734,10 @@ mon_resist_type bolt::try_enchant_monster(monsters *mon)
     {
         if (mons_immune_magic(mon))
             return (MON_UNAFFECTED);
-        if (check_mons_resist_magic(mon, ench_power))
-            return (MON_RESIST);
+        
+        if (flavour != BEAM_POLYMORPH || !mons_is_shapeshifter(mon))
+            if (check_mons_resist_magic(mon, ench_power))
+                return (MON_RESIST);
     }
 
     return (apply_enchantment_to_monster(mon));