Draugr really are undead.

Thanks terrapin for pointing out the obvious. I forgot to set Draugr
selfmask in role.c for MH_UNDEAD as well as MH_DRAUGR. While in role.c I
fixed up some hatemask bits for other races as well.

Also in this commit - undead monsters will spawn as peaceful towards
Draugr two-thirds of the time. For zombies that spawn hostile, Draugr
can always attempt to chat them to make them tame (from initial commit).

Author: k21971

doc/evilhack-changelog.md

@@ -3425,4 +3425,5 @@ The following changes to date are:
 - New race: Draugr
 - Revival routine for Draugr race
 - Draugr and critical hits from Sunsword/The Hammer of the Gods
+- Draugr really are undead
 

include/artilist.h

@@ -187,7 +187,7 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
      *      Sunsword from SporkHack warned of nearby undead
      */
     A("Sunsword", LONG_SWORD, (SPFX_RESTR | SPFX_WARN | SPFX_DFLAGH),
-      0, (MH_UNDEAD | MH_DRAUGR), PHYS(5, 0), DFNS(AD_BLND), NO_CARY,
+      0, MH_UNDEAD, PHYS(5, 0), DFNS(AD_BLND), NO_CARY,
       0, A_LAWFUL, NON_PM, NON_PM, 2500L, NO_COLOR, GEMSTONE),
     /*
      *      Lifestealer from SporkHack - many of the same properties as Stormbringer
@@ -396,7 +396,7 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
        along with imparting disease resistance when wielded */
     A("Hammer of the Gods", HEAVY_WAR_HAMMER,
       (SPFX_NOGEN | SPFX_FORGED | SPFX_NOWISH | SPFX_RESTR | SPFX_WARN
-       | SPFX_INTEL | SPFX_DFLAGH), 0, (MH_DEMON | MH_UNDEAD | MH_DRAUGR),
+       | SPFX_INTEL | SPFX_DFLAGH), 0, (MH_DEMON | MH_UNDEAD),
       PHYS(8, 0), DFNS(AD_DISE), NO_CARY, 0, A_LAWFUL,
       NON_PM, NON_PM, 25000L, NO_COLOR, SILVER),
     /* Tempest is a halberd that can be created by forging Cleaver and
@@ -503,7 +503,7 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
 
     A("The Mitre of Holiness", HELM_OF_BRILLIANCE,
       (SPFX_NOGEN | SPFX_RESTR | SPFX_DFLAGH | SPFX_INTEL | SPFX_PROTECT),
-      0, (MH_UNDEAD | MH_DRAUGR), NO_ATTK, NO_DFNS, CARY(AD_FIRE),
+      0, MH_UNDEAD, NO_ATTK, NO_DFNS, CARY(AD_FIRE),
       ENERGY_BOOST, A_LAWFUL, PM_PRIEST, NON_PM, 2000L, NO_COLOR, METAL),
 
     /* If playing a gnomish ranger, the player receives the 'Crossbow of Carl',

src/artifact.c

@@ -2615,10 +2615,8 @@ int dieroll; /* needed for Magicbane and vorpal blades */
                               mon_nam(mdef));
                     mongone(mdef);
                 }
-            } else if (youdefend
-                       && (is_undead(youmonst.data)
-                           || maybe_polyd(is_draugr(youmonst.data), Race_if(PM_DRAUGR)))
-                       && k) {
+            } else if (youdefend && k
+                       && maybe_polyd(is_undead(youmonst.data), Race_if(PM_DRAUGR))) {
                 pline("The holy power of Sunsword incinerates your undead flesh!");
                 *dmgptr = (2 * (Upolyd ? u.mh : u.uhp) + FATAL_DAMAGE_MODIFIER);
                 killer.format = NO_KILLER_PREFIX;
@@ -2737,8 +2735,7 @@ int dieroll; /* needed for Magicbane and vorpal blades */
                 *dmgptr = (2 * (Upolyd ? u.mh : u.uhp) + FATAL_DAMAGE_MODIFIER);
                 /* player returns to their original form if poly'd */
             } else if (youdefend && k
-                       && (is_undead(youmonst.data)
-                           || maybe_polyd(is_draugr(youmonst.data), Race_if(PM_DRAUGR)))) {
+                       && maybe_polyd(is_undead(youmonst.data), Race_if(PM_DRAUGR))) {
                 pline("The Hammer of the Gods incinerates your undead flesh!");
                 *dmgptr = (2 * (Upolyd ? u.mh : u.uhp) + FATAL_DAMAGE_MODIFIER);
                 killer.format = NO_KILLER_PREFIX;

src/eat.c

@@ -581,7 +581,8 @@ int *dmg_p; /* for dishing out extra damage in lieu of Int loss */
             done(DIED);
             /* life-saving needed to reach here */
             exercise(A_WIS, FALSE);
-            if (Race_if(PM_ILLITHID)) {
+            if (!Upolyd
+                && (Race_if(PM_ILLITHID) || Race_if(PM_DRAUGR))) {
                 if (u.ulevel >= 26)
                     *dmg_p += rn2(10) + 7;
                 else if (u.ulevel >= 14)
@@ -600,7 +601,8 @@ int *dmg_p; /* for dishing out extra damage in lieu of Int loss */
                 context.botl = 1;
             }
             exercise(A_WIS, TRUE);
-            if (Race_if(PM_ILLITHID) || Race_if(PM_DRAUGR)) {
+            if (!Upolyd
+                && (Race_if(PM_ILLITHID) || Race_if(PM_DRAUGR))) {
                 if (u.ulevel >= 26)
                     *dmg_p += rn2(10) + 7;
                 else if (u.ulevel >= 14)
@@ -621,7 +623,7 @@ int *dmg_p; /* for dishing out extra damage in lieu of Int loss */
         /*
          * monster mind flayer is eating hero's brain
          */
-        if (Race_if(PM_DRAUGR)) {
+        if (!Upolyd && Race_if(PM_DRAUGR)) {
             You("don't notice.");
             return MM_MISS;
         } else if (ABASE(A_INT) <= ATTRMIN(A_INT)) {

src/makemon.c

@@ -3969,13 +3969,18 @@ register struct monst *mtmp;
        being non-hostile to unaligned, then the usual check for coaligned.
        For crowned Infidels, the random check is bypassed. Followers of
        Lolth - if they are Drow, stay chaotic, and are at least fervently
-       aligned, she will spawn peaceful */
+       aligned, she will spawn peaceful. Undead will be peaceful towards
+       Draugr more often than not */
     if (always_hostile(ptr)) {
         if (Role_if(PM_INFIDEL) && is_demon(ptr)
             && (u.uevent.uhand_of_elbereth || rn2(2))) {
             return TRUE;
         } else if (ptr == &mons[PM_LOLTH] && ual == A_CHAOTIC
-            && u.ualign.record >= 9 && Race_if(PM_DROW)) {
+                   && u.ualign.record >= 9
+                   && !Upolyd && Race_if(PM_DROW)) {
+            return TRUE;
+        } else if (!Upolyd && Race_if(PM_DRAUGR)
+                   && is_undead(ptr) && rn2(3)) {
             return TRUE;
         } else {
             return FALSE;

src/role.c

@@ -851,7 +851,7 @@ const struct Race races[] = {
         PM_ELF_ZOMBIE,
         MH_ELF | ROLE_MALE | ROLE_FEMALE | ROLE_NEUTRAL | ROLE_CHAOTIC,
         MH_ELF,
-        MH_ELF,
+        MH_ELF | MH_HOBBIT,
         MH_DROW | MH_ORC | MH_ILLITHID | MH_DRAUGR,
         /*  Str    Int Wis Dex Con Cha */
         { 3, 3, 3, 3, 3, 3 },
@@ -960,7 +960,7 @@ const struct Race races[] = {
         PM_HOBBIT_ZOMBIE,
         MH_HOBBIT | ROLE_MALE | ROLE_FEMALE | ROLE_LAWFUL | ROLE_NEUTRAL,
         MH_HOBBIT,
-        MH_HOBBIT | MH_TORTLE,
+        MH_HOBBIT | MH_ELF | MH_TORTLE,
         MH_ORC | MH_ILLITHID | MH_DROW | MH_DRAUGR,
         /*  Str    Int Wis Dex Con Cha */
         { 3, 3, 3, 3, 3, 3 },
@@ -1048,7 +1048,9 @@ const struct Race races[] = {
         MH_DROW | ROLE_MALE | ROLE_FEMALE | ROLE_CHAOTIC,
         MH_DROW,
         MH_DROW,
-        MH_ELF | MH_ORC | MH_ILLITHID | MH_DRAUGR,
+        MH_HUMAN | MH_ELF | MH_DWARF | MH_GNOME | MH_HOBBIT
+            | MH_GIANT | MH_CENTAUR | MH_ORC
+            | MH_TORTLE | MH_ILLITHID | MH_DRAUGR,
         /*  Str    Int Wis Dex Con Cha */
         { 3, 3, 3, 3, 3, 3 },
         { 18, 20, 20, 20, 16, 18 },
@@ -1067,14 +1069,14 @@ const struct Race races[] = {
         NON_PM,
         NON_PM,
         MH_DRAUGR | ROLE_MALE | ROLE_FEMALE | ROLE_CHAOTIC,
-        MH_DRAUGR,
-        MH_DRAUGR,
+        MH_DRAUGR | MH_UNDEAD,
+        MH_DRAUGR | MH_UNDEAD,
         MH_HUMAN | MH_ELF | MH_DWARF | MH_GNOME | MH_HOBBIT
             | MH_GIANT | MH_CENTAUR | MH_ORC
             | MH_TORTLE | MH_DROW | MH_ILLITHID,
         /*  Str    Int Wis Dex Con Cha */
         { 3, 3, 3, 3, 3, 3 },
-        { STR18(100), 18, 18, 18, 18, 18 },
+        { STR19(20), 10, 10, 18, 20, 6 },
         /* Init   Lower  Higher */
         { 2, 0, 0, 2, 1, 0 }, /* Hit points */
         { 1, 0, 2, 0, 2, 0 }  /* Energy */
@@ -1098,7 +1100,8 @@ struct Race race_demon = {
     MH_DEMON,
     MH_DEMON,
     MH_HUMAN | MH_ELF | MH_DWARF | MH_GNOME | MH_HOBBIT
-        | MH_GIANT | MH_CENTAUR | MH_TORTLE | MH_DROW,
+        | MH_GIANT | MH_CENTAUR | MH_ORC | MH_TORTLE
+        | MH_DROW | MH_ILLITHID | MH_DRAUGR,
     /*  Str    Int Wis Dex Con Cha */
     { 3, 3, 3, 3, 3, 3 },
     { STR18(100), 18, 18, 20, 20, 18 },

src/zap.c

@@ -1251,7 +1251,7 @@ unturn_you()
 {
     (void) unturn_dead(&youmonst); /* hit carried corpses and eggs */
 
-    if (is_undead(youmonst.data) || racial_draugr(&youmonst)) {
+    if (maybe_polyd(is_undead(youmonst.data), Race_if(PM_DRAUGR))) {
         if (!(Stun_resistance || wielding_artifact(ART_TEMPEST)))
             You_feel("frightened and %sstunned.", Stunned ? "even more " : "");
         make_stunned((HStun & TIMEOUT) + (long) rnd(30), FALSE);