More role-specific bits for Draugr.

Draugr can now be Monks (chaotic only). Not role-specific: since Draugr
max strength is 20, bump up their carrying capacity. Tweaked stats (INT
and WIS are lower).

Author: k21971

doc/evilhack-changelog.md

@@ -3422,7 +3422,7 @@ The following changes to date are:
 - Suppress livelogging whilst in explore mode
 - New conduct: never acquired magic resistance
 - New conduct: never acquired reflection
-- New race: Draugr
+- New race: Draugr (initial commit)
 - Revival routine for Draugr race
 - Draugr and critical hits from Sunsword/The Hammer of the Gods
 - Draugr really are undead
@@ -3431,4 +3431,5 @@ The following changes to date are:
 - Draugr as Infidel and crowning
 - Draugr and various interactions with NPC's
 - Draugr can regenerate hit points while in the Valley of the Dead
+- More role-specific bits for Draugr
 

src/attrib.c

@@ -270,8 +270,8 @@ boolean givemsg;
 {
     int num = incr;
 
-    if ((!num) || ((Race_if(PM_GIANT)
-                    || Race_if(PM_CENTAUR) || Race_if(PM_TORTLE))
+    if ((!num) || ((Race_if(PM_GIANT) || Race_if(PM_CENTAUR)
+                    || Race_if(PM_TORTLE) || Race_if(PM_DRAUGR))
                    && (!(otmp && otmp->cursed)))) {
         if (ABASE(A_STR) < 18)
             num = (rn2(4) ? 1 : rnd(6));

src/hack.c

@@ -3557,6 +3557,8 @@ weight_cap()
             youmonst.data->msize = MZ_LARGE;
         }
     } else if (racial_draugr(&youmonst)) {
+        carrcap += 100;
+        maxcarrcap += 200;
         /* and draugr, but just movement speed here? */
         if (!Upolyd)
             youmonst.data->mmove = 10;

src/role.c

@@ -350,7 +350,7 @@ const struct Role roles[] = {
       S_XORN,
       ART_EYES_OF_THE_OVERWORLD,
       MH_HUMAN | MH_ELF | MH_DWARF | MH_GIANT | MH_CENTAUR
-          | MH_TORTLE | MH_DROW,
+          | MH_TORTLE | MH_DROW | MH_DRAUGR,
       ROLE_MALE | ROLE_FEMALE | ROLE_LAWFUL | ROLE_NEUTRAL
           | ROLE_CHAOTIC,
       /* Str Int Wis Dex Con Cha */
@@ -961,6 +961,50 @@ const struct Role draugr_roles[] = {
       A_WIS,
       0,
       -4 },
+    { { "Monk", 0 },
+      { { "Candidate", 0 },
+        { "Novice", 0 },
+        { "Initiate", 0 },
+        { "Student of Stones", 0 },
+        { "Student of Waters", 0 },
+        { "Student of Metals", 0 },
+        { "Student of Winds", 0 },
+        { "Student of Fire", 0 },
+        { "Master", 0 } },
+      "Shan Lai Ching", "Chih Sung-tzu", "Huan Ti", /* Chinese */
+      "Mon",
+      "the Monastery of Chan-Sune",
+      "the Monastery of the Earth-Lord",
+      PM_MONK,
+      NON_PM,
+      NON_PM,
+      PM_MASTER_PO,
+      PM_ABBOT,
+      PM_MASTER_KAEN,
+      PM_EARTH_ELEMENTAL,
+      PM_XORN,
+      S_ELEMENTAL,
+      S_XORN,
+      ART_EYES_OF_THE_OVERWORLD,
+      MH_HUMAN | MH_ELF | MH_DWARF | MH_GIANT | MH_CENTAUR
+          | MH_TORTLE | MH_DROW | MH_DRAUGR,
+      ROLE_MALE | ROLE_FEMALE | ROLE_LAWFUL | ROLE_NEUTRAL
+          | ROLE_CHAOTIC,
+      /* Str Int Wis Dex Con Cha */
+      { 10, 7, 8, 8, 7, 7 },
+      { 25, 10, 20, 20, 15, 10 },
+      /* Init   Lower  Higher */
+      { 12, 0, 0, 8, 1, 0 }, /* Hit points */
+      { 2, 2, 0, 2, 0, 2 },
+      10, /* Energy */
+      10,
+      8,
+      -2,
+      2,
+      20,
+      A_WIS,
+      0,
+      -4 },
     { { "Rogue", 0 },
       { { "Footpad", 0 },
         { "Cutpurse", 0 },
@@ -1297,7 +1341,7 @@ const struct Race races[] = {
             | MH_TORTLE | MH_DROW | MH_ILLITHID,
         /*  Str    Int Wis Dex Con Cha */
         { 3, 3, 3, 3, 3, 3 },
-        { STR19(20), 10, 10, 18, 20, 6 },
+        { STR19(20), 6, 8, 18, 20, 6 },
         /* Init   Lower  Higher */
         { 2, 0, 0, 2, 1, 0 }, /* Hit points */
         { 1, 0, 2, 0, 2, 0 }  /* Energy */
@@ -2749,8 +2793,10 @@ role_init()
             urole = draugr_roles[2];
         else if (Role_if(PM_KNIGHT))
             urole = draugr_roles[3];
-        else if (Role_if(PM_ROGUE))
+        else if (Role_if(PM_MONK))
             urole = draugr_roles[4];
+        else if (Role_if(PM_ROGUE))
+            urole = draugr_roles[5];
     }
 
     /* Fix up the quest leader */

src/u_init.c

@@ -160,6 +160,19 @@ struct trobj Monk[] = {
     { FORTUNE_COOKIE, 0, FOOD_CLASS, 3, UNDEF_BLESS },
     { 0, 0, 0, 0, 0 }
 };
+struct trobj Draugr_Monk[] = {
+#define M_BOOK 2
+    { GLOVES, 2, ARMOR_CLASS, 1, UNDEF_BLESS },
+    { ROBE, 1, ARMOR_CLASS, 1, UNDEF_BLESS },
+    { UNDEF_TYP, UNDEF_SPE, SCROLL_CLASS, 1, UNDEF_BLESS },
+    { POT_HEALING, 0, POTION_CLASS, 3, UNDEF_BLESS },
+    { FOOD_RATION, 0, FOOD_CLASS, 3, 0 },
+    /* Yes, we know fortune cookies aren't really from China.  They were
+     * invented by George Jung in Los Angeles, California, USA in 1916.
+     */
+    { FORTUNE_COOKIE, 0, FOOD_CLASS, 3, UNDEF_BLESS },
+    { 0, 0, 0, 0, 0 }
+};
 struct trobj Priest[] = {
     { MACE, 1, WEAPON_CLASS, 1, 1 },
     { ROBE, 0, ARMOR_CLASS, 1, UNDEF_BLESS },
@@ -369,6 +382,7 @@ struct inv_sub {
     { PM_DROW, CLOAK_OF_PROTECTION, DARK_ELVEN_CLOAK },
     /* Draugr */
     { PM_DRAUGR, FOOD_RATION, EGG },
+    { PM_DRAUGR, FORTUNE_COOKIE, EGG },
     /* end */
     { NON_PM, STRANGE_OBJECT, STRANGE_OBJECT }
 };
@@ -630,6 +644,16 @@ static const struct def_skill Skill_Mon[] = {
     { P_MARTIAL_ARTS, P_GRAND_MASTER },
     { P_NONE, 0 }
 };
+static const struct def_skill Skill_Dra_Mon[] = {
+    { P_QUARTERSTAFF, P_EXPERT },
+    { P_SHURIKEN, P_BASIC },
+    { P_SPEAR, P_SKILLED },
+    { P_TRIDENT, P_SKILLED },
+    { P_BROAD_SWORD, P_BASIC },
+    { P_RIDING, P_BASIC },
+    { P_MARTIAL_ARTS, P_GRAND_MASTER },
+    { P_NONE, 0 }
+};
 static const struct def_skill Skill_P[] = {
     { P_CLUB, P_EXPERT },
     { P_MACE, P_EXPERT },
@@ -1013,13 +1037,19 @@ u_init()
         static short M_spell[] = { SPE_HEALING, SPE_PROTECTION, SPE_CONFUSE_MONSTER };
 
         Monk[M_BOOK].trotyp = M_spell[rn2(90) / 30]; /* [0..2] */
-        ini_inv(Monk);
+        if (Race_if(PM_DRAUGR))
+            ini_inv(Draugr_Monk);
+        else
+            ini_inv(Monk);
         if (!rn2(4) && !Race_if(PM_DROW))
             ini_inv(Lamp);
         knows_class(ARMOR_CLASS);
         /* sufficiently martial-arts oriented item to ignore language issue */
         knows_object(SHURIKEN);
-        skill_init(Skill_Mon);
+        if (Race_if(PM_DRAUGR))
+            skill_init(Skill_Dra_Mon);
+        else
+            skill_init(Skill_Mon);
         break;
     }
     case PM_PRIEST:

src/weapon.c

@@ -2228,7 +2228,9 @@ const struct def_skill *class_skill;
         P_SKILL(P_QUARTERSTAFF) = P_BASIC;
 
     /* set skills for magic */
-    if (Role_if(PM_HEALER) || Role_if(PM_MONK)) {
+    if (Role_if(PM_HEALER)
+        || (Role_if(PM_MONK)
+            && !Race_if(PM_DRAUGR))) {
         P_SKILL(P_HEALING_SPELL) = P_BASIC;
     } else if (Role_if(PM_INFIDEL)
                && !Race_if(PM_DRAUGR)) {