Fix: update to last commit (claws).

Co-authored-by: saltwaterterrapin <[email protected]>

Author: k21971

doc/evilhack-changelog.md

@@ -3396,4 +3396,5 @@ The following changes to date are:
 - Prevent levelporting throughout the Wizard's tower until the Wizard of
   Yendor has been defeated
 - Fix: various monsters showing as having claws when they don't
+- Fix: update to last commit (claws)
 

include/mondata.h

@@ -214,8 +214,9 @@
      || (ptr)->mlet == S_DRAGON || (ptr)->mlet == S_JABBERWOCK \
      || (ptr)->mlet == S_RUSTMONST || (ptr)->mlet == S_TROLL   \
      || (ptr)->mlet == S_UMBER || (ptr)->mlet == S_YETI        \
-     || (ptr)->mlet == S_DEMON || (ptr)->mlet == S_LIZARD      \
-     || (ptr)->mlet == S_DOG)
+     || ((ptr)->mlet == S_DEMON && (ptr) != &mons[PM_INCUBUS]  \
+         && (ptr) != &mons[PM_SUCCUBUS])                       \
+     || (ptr)->mlet == S_LIZARD || (ptr)->mlet == S_DOG)
 #define has_claws_undead(ptr) \
     ((ptr)->mlet == S_MUMMY || (ptr)->mlet == S_ZOMBIE          \
      || (ptr)->mlet == S_WRAITH || (ptr)->mlet == S_VAMPIRE)

src/objnam.c

@@ -1560,7 +1560,7 @@ unsigned doname_flags;
     case CHAIN_CLASS:
         add_erosion_words(obj, prefix);
         if (obj->owornmask & W_BALL)
-            Sprintf(eos(bp), " (chained to %s)", isyours ? "you" : mon_nam(owner));
+            Strcat(bp, " (chained to you)");
         break;
     case GEM_CLASS:
         if (obj->otyp == SLING_BULLET)

src/polyself.c

@@ -1965,13 +1965,7 @@ int part;
                           "head", "peduncle", "played out", "gills",
                           "dorsal fin", "caudal fin", "scales", "blood",
                           "gill", "nostril", "stomach", "scales" };
-    /* claw attacks are overloaded in mons[]; most humanoids with
-       such attacks should still reference hands rather than claws */
-    static const char not_claws[] = {
-        S_HUMAN,     S_ANGEL,   S_NYMPH,  S_LEPRECHAUN,
-        S_QUANTMECH, S_ORC,     S_GIANT,  S_GNOME, /* quest nemeses */
-        '\0' /* string terminator; assert( S_xxx != 0 ); */
-    };
+
     struct permonst *mptr = mon->data;
 
     /* some special cases */
@@ -1995,13 +1989,10 @@ int part;
         return humanoid_parts[part]; /* yeti/sasquatch, monkey/ape */
     }
     if ((part == HAND || part == HANDED)
-        && ((humanoid(mptr) && attacktype(mptr, AT_CLAW)
-             && !index(not_claws, mptr->mlet) && mptr != &mons[PM_STONE_GOLEM]
-             && mptr != &mons[PM_INCUBUS] && mptr != &mons[PM_SUCCUBUS])
-            || (has_claws(mptr) || has_claws_undead(mptr))
+        && ((humanoid(mptr) && (has_claws(mptr) || has_claws_undead(mptr)))
             || (mon == &youmonst
                 && (Race_if(PM_DEMON) || Race_if(PM_ILLITHID)
-                   || Race_if(PM_TORTLE)))))
+                    || Race_if(PM_TORTLE)))))
         return (part == HAND) ? "claw" : "clawed";
     if ((mptr == &mons[PM_MUMAK] || mptr == &mons[PM_MASTODON]
          || mptr == &mons[PM_WOOLLY_MAMMOTH])