Merge branch 'master' of https://github.com/k21971/EvilHack

Author: saltwaterterrapin

doc/evilhack-changelog.md

@@ -3443,4 +3443,5 @@ The following changes to date are:
 - Refactor diseasemu() to allow use of racial_zombie()
 - Refactor resists_sick to allow checking racial data
 - Draugr infidels don't cast spells
+- Allow player monsters to be Draugr, part two
 - Draugr can revive

src/makemon.c

@@ -187,6 +187,7 @@ extern struct trobj Elven_Knight[];
 extern struct trobj Dwarvish_Knight[];
 extern struct trobj Orcish_Knight[];
 extern struct trobj Monk[];
+extern struct trobj Draugr_Monk[];
 extern struct trobj Priest[];
 extern struct trobj Ranger[];
 extern struct trobj Rogue[];
@@ -199,6 +200,7 @@ extern struct trobj Tinopener[];
 extern struct trobj Lamp[];
 extern struct trobj Blindfold[];
 extern struct trobj Xtra_food[];
+extern struct trobj Dra_food[];
 extern struct trobj Leash[];
 extern struct trobj Towel[];
 extern struct trobj Wishing[];
@@ -225,6 +227,18 @@ struct trobj subInfidel[] = {
     { 0, 0, 0, 0, 0 }
 };
 
+struct trobj draugrInfidel[] = {
+    { FAKE_AMULET_OF_YENDOR, 0, AMULET_CLASS, 1, 0 },
+    { DAGGER, 1, WEAPON_CLASS, 1, 0 },
+    { JACKET, 1, ARMOR_CLASS, 1, CURSED },
+    { CLOAK_OF_PROTECTION, 0, ARMOR_CLASS, 1, CURSED },
+    { POT_WATER, 0, POTION_CLASS, 3, CURSED },
+    { SCR_CHARGING, 0, SCROLL_CLASS, 1, 0 },
+    { FIRE_HORN, UNDEF_SPE, TOOL_CLASS, 1, 0 },
+    { OILSKIN_SACK, 0, TOOL_CLASS, 1, 0 },
+    { 0, 0, 0, 0, 0 }
+};
+
 /* Specialized structs for centaurian player monsters */
 struct trobj Level10KitCentaur1[] = {
     { ARMOR, (2 | RND_SPE), ARMOR_CLASS, 1, UNDEF_BLESS },
@@ -872,6 +886,8 @@ register struct monst *mtmp;
             mkmonmoney(mtmp, (long) rn1(251, 250));
             if (racial_giant(mtmp))
                 ini_mon_inv(mtmp, giantInfidel, 1);
+            else if (racial_zombie(mtmp))
+                ini_mon_inv(mtmp, draugrInfidel, 1);
             else
                 ini_mon_inv(mtmp, subInfidel, 1);
             mongets(mtmp, SKELETON_KEY);
@@ -900,6 +916,8 @@ register struct monst *mtmp;
                 ini_mon_inv(mtmp, giantMonk, 1);
             else if (racial_tortle(mtmp))
                 ini_mon_inv(mtmp, tortleMonk, 1);
+            else if (racial_zombie(mtmp))
+                ini_mon_inv(mtmp, Draugr_Monk, 1);
             else
                 ini_mon_inv(mtmp, Monk, 1);
             ini_mon_inv(mtmp, Lamp, 10);

src/uhitm.c

@@ -4804,8 +4804,8 @@ boolean wep_was_destroyed;
             You("are jolted with electricity!");
             tmp = resist_reduce(tmp, SHOCK_RES);
             mdamageu(mon, tmp);
-	    break;
-	case AD_DISE: /* specifically gray fungus */
+            break;
+        case AD_DISE: /* specifically gray fungus */
             diseasemu(mon);
             break;
         case AD_DRST: /* specifically green dragons */