Applying patches by dolorous:

1794789: Move "Xom is BORED" message into god channel
1795785: remove redundant check for potions of blood
1795673: claw-related clean-ups and enforcing consistency 
in transformations and claws (Lich and Statue retain
claws, Ice Beast doesn't). 

I also added a check for hooves and claws mutation for the 
% and [ you_can_wear output.


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

1 files changed, 13 insertions, 2 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index c9c0fb6d79..3afd4536d5 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1299,9 +1299,20 @@ int melee_attack::player_weapon_type_modify(int damage)
             else
                 attack_verb = "shred";
             break;
-        case TRAN_ICE_BEAST:
         case TRAN_STATUE:
         case TRAN_LICH:
+            if (you.has_usable_claws())
+            {
+                if (damage < HIT_MED)
+                    attack_verb = "claw";
+                else if (damage < HIT_STRONG)
+                    attack_verb = "mangle";
+                else
+                    attack_verb = "eviscerate";
+                break;
+            }
+            // or fall-through
+        case TRAN_ICE_BEAST:
             if (damage < HIT_MED)
                 attack_verb = "punch";
             else
@@ -2268,7 +2279,7 @@ int melee_attack::player_to_hit(bool random_factor)
         your_to_hit -= 5;
 
     const bool see_invis = player_see_invis();
-    // if you can't see yourself, you're a little less acurate.
+    // if you can't see yourself, you're a little less accurate.
     if (you.invisible() && !see_invis)
         your_to_hit -= 5;