Turn kenkus' hardcoded pecking attack and inability to wear helmets into

an intrinsic beak mutation (assuming, of course, that the beak is what 
makes helmets unwearable).


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

1 files changed, 4 insertions, 17 deletions

diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index 3340c16434..f677f4830a 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -881,25 +881,12 @@ void untransform(void)
 // cases to handle a large number of things (see wear_armour()) -- bwr
 bool can_equip( equipment_type use_which, bool ignore_temporary )
 {
-    // if more cases are added to this if must also change in
-    // item_use for naga barding
-    if (ignore_temporary || !player_is_shapechanged())
-        /* or a transformation which doesn't change overall shape */
+    if (use_which == EQ_HELMET
+        && (player_mutation_level(MUT_HORNS)
+            || player_mutation_level(MUT_BEAK)))
     {
-        if (use_which == EQ_HELMET)
-        {
-            switch (you.species)
-            {
-            case SP_KENKU:
-                return (false);
-            default:
-                break;
-            }
-        }
-    }
-
-    if (use_which == EQ_HELMET && player_mutation_level(MUT_HORNS))
         return (false);
+    }
 
     if (use_which == EQ_BOOTS && !player_has_feet())
         return (false);