Draugr and various interactions with NPC's.

The main part of this commit is Draugr and their interactions with NPC's
like shopkeepers, priests, and guards. There's some other changes here
as well, we'll get to that.

Guards (minetown watch) that see a Draugr will instantly become hostile
at seeing 'another zombie'. Killing the watch after they become angry
actually gives Draugr a slight alignment bump, just like an Infidel.
Non-aligned priests will also become hostile (co-aligned/unaligned will
stay peaceful and tolerate Draugr). Shopkeepers treat Draugr the same as
a Convict wearing their striped shirt - player is banned, but the
shopkeeper is still peaceful.

Other bits: Draugr can stay hungry for a longer period of time before it
becomes an issue (same as Convicts). Draugr will always start with -10
alignment, Infidel being the exception. Throwing treats to non-tame
domestic animals will not tame them (same as Convict). Draugr are never
scared of ghosts appearing out of nowhere - being nearly mindless, fear
just doesn't register.

Author: k21971

doc/evilhack-changelog.md

@@ -3429,4 +3429,5 @@ The following changes to date are:
 - Clean up role-specific bits for Draugr
 - Draugr cannot gain intrinsic telepathy
 - Draugr as Infidel and crowning
+- Draugr and various interactions with NPC's
 

src/dog.c

@@ -1243,8 +1243,9 @@ struct obj *obj;
         && mtmp->data->mlet == S_DOG)
         return FALSE;
 
-    if (Role_if(PM_CONVICT) && (is_domestic(mtmp->data) && obj)) {
-        /* Domestic animals are wary of the Convict */
+    if ((Role_if(PM_CONVICT) || (!Upolyd && Race_if(PM_DRAUGR)))
+        && (is_domestic(mtmp->data) && !mtmp->mtame && obj)) {
+        /* Domestic animals are wary of Convicts and Draugr */
         pline("%s still looks wary of you.", Monnam(mtmp));
         return FALSE;
     }

src/eat.c

@@ -2141,8 +2141,9 @@ struct obj *otmp;
             /* increasing existing nausea means that it will take longer
                before eventual vomit, but also means that constitution
                will be abused more times before illness completes */
-            if (Role_if(PM_CONVICT) && (rn2(8) > u.ulevel)) {
-	        You_feel("a slight stomach ache.");	/* prisoners are used to bad food */
+            if ((!Upolyd && Race_if(PM_DRAUGR))
+                || (Role_if(PM_CONVICT) && (rn2(8) > u.ulevel))) {
+                You_feel("a slight stomach ache."); /* prisoners are used to bad food */
 	    } else
                 make_vomiting((Vomiting & TIMEOUT) + (long) d(10, 4), TRUE);
         } else {
@@ -3154,8 +3155,9 @@ gethungry()
        amount of nutrition in the 'moves % 20' ring/amulet check below */
     if ((!Unaware || !rn2(10)) /* slow metabolic rate while asleep */
         && !inediate(raceptr(&youmonst))
-        /* Convicts can last twice as long at hungry and below */
-        && (!Role_if(PM_CONVICT) || (moves % 2) || (u.uhs < HUNGRY))
+        /* Convicts/Draugr can last twice as long at hungry and below */
+        && (!Role_if(PM_CONVICT) || !Race_if(PM_DRAUGR)
+            || (moves % 2) || (u.uhs < HUNGRY))
         && !Slow_digestion)
         u.uhunger--; /* ordinary food consumption */
 

src/makemon.c

@@ -4081,8 +4081,10 @@ struct monst *mtmp;
     } else if (always_peaceful(mdat)) {
         int absmal = abs(mal);
         if (mtmp->mpeaceful) {
-            if (u.ualign.type == A_NONE) {
-                mtmp->malign += 1; /* Moloch's will */
+            if (u.ualign.type == A_NONE
+                || (!Upolyd && Race_if(PM_DRAUGR))) {
+                /* Moloch's will, or being a Draugr */
+                mtmp->malign += 1;
             } else if (Role_if(PM_CONVICT)) {
                 /* Several 'always peaceful' types become hostile
                    once they see a Convict. Still an alignment

src/monmove.c

@@ -141,7 +141,12 @@ register struct monst *mtmp;
 
     if (mtmp->mpeaceful && in_town(u.ux + u.dx, u.uy + u.dy)
         && mtmp->mcansee && m_canseeu(mtmp) && !rn2(3)) {
-        if (Role_if(PM_CONVICT) && !Upolyd) {
+        if (Race_if(PM_DRAUGR) && !Upolyd) {
+            mon_yells(mtmp, "Another zombie!  Attack!");
+            (void) angry_guards(!!Deaf);
+            stop_occupation();
+            return;
+        } else if (Role_if(PM_CONVICT) && !Upolyd) {
             mon_yells(mtmp, "Hey, you're the one from the wanted poster!");
             (void) angry_guards(!!Deaf);
             stop_occupation();

src/pray.c

@@ -1066,7 +1066,7 @@ gcrownu()
                 ; /* already got bonus above */
             } else if (obj && in_hand) {
                 if (!Blind)
-                    Your("%s briefly flares with an eldrtich glow.",
+                    Your("%s briefly flares with an eldritch glow.",
                          xname(obj));
                 obj->dknown = TRUE;
             } else if (!already_exists) {

src/priest.c

@@ -466,13 +466,19 @@ int roomno;
             epri_p->enter_time = 0L;
         }
         msg1 = msg2 = 0;
-        if (((sanctum && Is_sanctum(&u.uz)) || u.ualign.type == A_NONE)
+        if (((sanctum && Is_sanctum(&u.uz)) || u.ualign.type == A_NONE
+             || (!Upolyd && Race_if(PM_DRAUGR)))
             && !p_coaligned(priest)) {
             /* either a non-Infidel in the Sanctum, or an Infidel in any
              * non-Moloch temple; either way, the priest is not happy */
             if (priest->mpeaceful) {
                 /* first time inside */
-                if (u.ualign.type == A_NONE) {
+                if (!Upolyd && Race_if(PM_DRAUGR)
+                    && !Role_if(PM_INFIDEL)) {
+                    msg1 = "Begone, foul abomination!";
+                    msg2 = "You desecrate this holy Sanctum!";
+                    call_guards = in_town(priest->mx, priest->my);
+                } else if (u.ualign.type == A_NONE) {
                     msg1 = "Begone, infidel!";
                     msg2 = "This place is barred for your cult!";
                     call_guards = in_town(priest->mx, priest->my);
@@ -481,6 +487,7 @@ int roomno;
                     msg2 = "Be gone!";
                 }
                 priest->mpeaceful = 0;
+                newsym(priest->mx, priest->my); /* clear peaceful glyph */
                 /* became angry voluntarily; no penalty for attacking him */
                 set_malign(priest);
             } else {
@@ -498,7 +505,8 @@ int roomno;
                 verbalize1(msg2);
             epri_p->enter_time = moves + (long) d(10, 100); /* ~505 */
         }
-        /* for Infidels, visiting the Minetown temple is a very bad idea */
+        /* for Infidels or possibly Draugr, visiting the Minetown
+           temple is a very bad idea */
         if (call_guards) {
             pline("%s calls for guards!", Monnam(priest));
             (void) angry_guards(FALSE);
@@ -576,12 +584,15 @@ struct monst* ghost;
 {
     ghost->mpeaceful = 0;
     set_malign(ghost);
-    if (multi >= 0) {
-        if (flags.verbose)
-            You("are frightened to death, and unable to move.");
-        nomul(-3);
-        multi_reason = "being terrified of a ghost";
-        nomovemsg = "You regain your composure.";
+    /* Draugr do not fear the undead. Or anything else for that matter */
+    if (!maybe_polyd(is_undead(youmonst.data), Race_if(PM_DRAUGR))) {
+        if (multi >= 0) {
+            if (flags.verbose)
+                You("are frightened to death, and unable to move.");
+            nomul(-3);
+            multi_reason = "being terrified of a ghost";
+            nomovemsg = "You regain your composure.";
+        }
     }
 }
 
@@ -617,13 +628,15 @@ register struct monst *priest;
     if (priest->mflee || (!priest->ispriest && coaligned && strayed)) {
         pline("%s doesn't want anything to do with you!", Monnam(priest));
         priest->mpeaceful = 0;
+        newsym(priest->mx, priest->my); /* clear peaceful glyph */
         return;
     }
 
     /* priests don't chat unless peaceful and in their own temple */
     if (!inhistemple(priest) || !priest->mpeaceful
         || !priest->mcanmove || priest->msleeping
-        || (u.ualign.type == A_NONE && !coaligned)) {
+        || (u.ualign.type == A_NONE && !coaligned)
+        || (!Upolyd && Race_if(PM_DRAUGR) && !coaligned)) {
         static const char *cranky_msg[3] = {
             "Thou wouldst have words, eh?  I'll give thee a word or two!",
             "Talk?  Here is what I have to say!",
@@ -638,6 +651,7 @@ register struct monst *priest;
 		priest->mcanmove = 1;
         }
         priest->mpeaceful = 0;
+        newsym(priest->mx, priest->my); /* clear peaceful glyph */
         verbalize1(cranky_msg[rn2(3)]);
         return;
     }
@@ -648,6 +662,7 @@ register struct monst *priest;
         verbalize(
               "Begone!  Thou desecratest this holy place with thy presence.");
         priest->mpeaceful = 0;
+        newsym(priest->mx, priest->my); /* clear peaceful glyph */
         return;
     }
     if (!money_cnt(invent)) {

src/shk.c

@@ -608,6 +608,10 @@ char *enterstring;
         return;
     }
 
+    /* Draugr being zombies */
+    if (!Upolyd && Race_if(PM_DRAUGR))
+        eshkp->pbanned = TRUE;
+
     /* Visible striped prison shirt */
     if ((uarmu && (uarmu->otyp == STRIPED_SHIRT))
         && !uarm && !uarmc) {

src/u_init.c

@@ -1298,6 +1298,13 @@ u_init()
     case PM_DRAUGR:
         if (!Role_if(PM_CONVICT))
             ini_inv(Dra_food);
+        if (!Role_if(PM_CONVICT)
+            && !Role_if(PM_INFIDEL)) {
+            /* same alignment penalty as the typical Convict */
+            adjalign(-20);
+            /* prevent automatic alignment abuse penalty */
+            u.ualign.abuse = 0;
+        }
         break;
 
     default: /* impossible */