Draugr infidels don't cast spells

They get a poisonous scratch instead like their zombie brethren. Also tweaked mhitfoo so that claw/scratch messages reflect the race of npcs/soldiers/etc.

Author: saltwaterterrapin

doc/evilhack-changelog.md

@@ -3442,3 +3442,4 @@ The following changes to date are:
 - Fix: makedefs.c merge from last commit
 - Refactor diseasemu() to allow use of racial_zombie()
 - Refactor resists_sick to allow checking racial data
+- Draugr infidels don't cast spells

src/mhitm.c

@@ -918,9 +918,9 @@ int dieroll;
                 break;
             case AT_WEAP:
                 if (!MON_WEP(magr)) { /* AT_WEAP but isn't wielding anything */
-                    if (has_claws(magr->data))
+                    if (has_claws(r_data(magr)))
                         Sprintf(buf, "%s claws", magr_name);
-                    else if (has_claws_undead(magr->data))
+                    else if (has_claws_undead(r_data(magr)))
                         Sprintf(buf, "%s scratches", magr_name);
                     else
                         Sprintf(buf, "%s %ss", magr_name,
@@ -938,9 +938,9 @@ int dieroll;
                     Sprintf(buf, "%s hits", magr_name);
                 break;
             case AT_CLAW:
-                if (has_claws(magr->data))
+                if (has_claws(r_data(magr)))
                     Sprintf(buf, "%s claws", magr_name);
-                else if (has_claws_undead(magr->data))
+                else if (has_claws_undead(r_data(magr)))
                     Sprintf(buf, "%s scratches", magr_name);
                 else
                     Sprintf(buf, "%s hits", magr_name);

src/mhitu.c

@@ -100,9 +100,9 @@ struct attack *mattk;
             break;
         case AT_WEAP:
             if (!MON_WEP(mtmp)) { /* AT_WEAP but isn't wielding anything */
-                if (has_claws(mtmp->data))
+                if (has_claws(r_data(mtmp)))
                     pfmt = "%s claws you!";
-                else if (has_claws_undead(mtmp->data))
+                else if (has_claws_undead(r_data(mtmp)))
                     pfmt = "%s scratches you!";
                 else
                     pline("%s %ss you!", Monnam(mtmp),
@@ -120,9 +120,9 @@ struct attack *mattk;
                 pfmt = "%s hits you!";
             break;
         case AT_CLAW:
-            if (has_claws(mtmp->data))
+            if (has_claws(r_data(mtmp)))
                 pfmt = "%s claws you!";
-            else if (has_claws_undead(mtmp->data))
+            else if (has_claws_undead(r_data(mtmp)))
                 pfmt = "%s scratches you!";
             else
                 pfmt = "%s hits!";

src/mplayer.c

@@ -292,8 +292,13 @@ struct monst *mtmp;
     case PM_INFIDEL:
         /* flags for all infidels regardless of race */
         rptr->mattk[0].adtyp = AD_SAMU;
-        rptr->mattk[1].aatyp = AT_MAGC;
-        rptr->mattk[1].adtyp = AD_SPEL;
+        if (rptr->mrace == MH_ZOMBIE) {
+            rptr->mattk[1].aatyp = AT_CLAW;
+            rptr->mattk[1].adtyp = AD_DRCO;
+        } else {
+            rptr->mattk[1].aatyp = AT_MAGC;
+            rptr->mattk[1].adtyp = AD_SPEL;
+        }
         mtmp->mintrinsics |= MR_FIRE;
         break;
     case PM_KNIGHT: