Revival routine for Draugr race.

This commit adds the amount of times someone playing as Draugr race can
revive each game. That amount is one to three times, chosen randomly
every game. Draugr are guaranteed one revival, it's up to the RNG if
they receive any more than that. The amount is purposely withheld from
the player; this is to prevent the player from getting a false sense of
invulnerability. Revival has a cost, reducing strength and constitution
by one point. Unlike being revived from an amulet of life saving, Draugr
will reclaim max hit points, even if above 150 max hp - they can't use
an actual amulet of life saving, so this seemed fair.

Some caveats: just as with an amulet of life saving, revival will not
work if the player genocides themselves, or encounter a condition where
they are drowning or falling, and don't have a safe space to land on.
Specific to Draugr, being decapitated means no revival - same for
monster zombies who lose their head to Vorpal Blade.

Author: k21971

doc/evilhack-changelog.md

@@ -3423,4 +3423,5 @@ The following changes to date are:
 - New conduct: never acquired magic resistance
 - New conduct: never acquired reflection
 - New race: Draugr
+- Revival routine for Draugr race
 

include/hack.h

@@ -158,12 +158,13 @@ enum game_end_types {
     CRUSHING     =  7,
     STONING      =  8,
     TURNED_SLIME =  9,
-    GENOCIDED    = 10,
-    PANICKED     = 11,
-    TRICKED      = 12,
-    QUIT         = 13,
-    ESCAPED      = 14,
-    ASCENDED     = 15
+    DECAPITATED  = 10,
+    GENOCIDED    = 11,
+    PANICKED     = 12,
+    TRICKED      = 13,
+    QUIT         = 14,
+    ESCAPED      = 15,
+    ASCENDED     = 16
 };
 
 typedef struct strbuf {

include/you.h

@@ -439,7 +439,7 @@ struct you {
     long ugallop;            /* turns steed will run after being kicked */
     int urideturns;          /* time spent riding, for skill advancement */
     int umortality;          /* how many times you died */
-    int ugrave_arise;    /* you die and become something aside from a ghost */
+    int ugrave_arise;        /* you die and become something aside from a ghost */
     int weapon_slots;        /* unused skill slots */
     int skills_advanced;     /* # of advances made so far */
     xchar skill_record[P_SKILL_LIMIT]; /* skill advancements */

src/artifact.c

@@ -2850,6 +2850,9 @@ int dieroll; /* needed for Magicbane and vorpal blades */
                 *dmgptr = 2 * (Upolyd ? u.mh : u.uhp) + FATAL_DAMAGE_MODIFIER;
                 pline(behead_msg[rn2(SIZE(behead_msg))], wepdesc, "you");
                 otmp->dknown = TRUE;
+                killer.format = NO_KILLER_PREFIX;
+                Sprintf(killer.name, "decapitated by %s", xname(otmp));
+                done(DECAPITATED);
                 /* Should amulets fall off? */
                 return TRUE;
             }

src/end.c

@@ -24,6 +24,8 @@
 #define FIRST_AMULET AMULET_OF_ESP
 #define LAST_AMULET AMULET_OF_YENDOR
 
+#define DRAUGR_REVIVE rnd(3)
+
 extern const int matprices[];
 
 struct valuable_data {
@@ -313,8 +315,8 @@ static NEARDATA const char *deaths[] = {
     /* the array of death */
     "died", "choked", "poisoned", "starvation", "drowning", "burning",
     "dissolving under the heat and pressure", "crushed", "turned to stone",
-    "turned into slime", "genocided", "panic", "trickery", "quit",
-    "escaped", "ascended"
+    "turned into slime", "decapitated", "genocided", "panic", "trickery",
+    "quit", "escaped", "ascended"
 };
 
 static NEARDATA const char *ends[] = {
@@ -323,9 +325,9 @@ static NEARDATA const char *ends[] = {
     "starved", "drowned", "burned",
     "dissolved in the lava",
     "were crushed", "turned to stone",
-    "turned into slime", "were genocided",
-    "panicked", "were tricked", "quit",
-    "escaped", "ascended"
+    "turned into slime", "were decapitated",
+    "were genocided", "panicked", "were tricked",
+    "quit", "escaped", "ascended"
 };
 
 static boolean Schroedingers_cat = FALSE;
@@ -1039,7 +1041,7 @@ int how;
     uhpmin = max(2 * u.ulevel, 10);
     if (u.uhpmax < uhpmin)
         u.uhpmax = uhpmin;
-    u.uhp = min(u.uhpmax, 150);
+    u.uhp = min(u.uhpmax, (HLifesaved ? u.uhpmax : 150));
 
     if (Upolyd) /* Unchanging, or death which bypasses losing hit points */
         u.mh = min(u.mhmax, 150);
@@ -1348,11 +1350,18 @@ int how;
         }
     }
     if (HLifesaved && (how <= GENOCIDED)) { /* Draugr */
-        You("float in a sea of nothingness.  Then suddenly, you revive!");
+        pline("But then suddenly, you start to revive!");
+        /* reviving takes a toll */
+        (void) adjattrib(A_STR, -1, TRUE);
         (void) adjattrib(A_CON, -1, TRUE);
         savelife(how);
         if (how == GENOCIDED) {
             pline("Unfortunately you are still genocided...");
+        } else if (how == DECAPITATED) { /* can't revive if you've lost your head */
+            pline("Unfortunately you've lost your %s...",
+                  body_part(HEAD));
+        } else if (u.umortality > DRAUGR_REVIVE) { /* ran out of revive chances */
+            pline("Unfortunately you weren't strong enough to revive fully...");
         } else if (is_open_air(x, y) && !Levitation
                    && !(Flying && !(Punished && !carried(uball)
                         && is_open_air(uball->ox, uball->oy)))) {
@@ -1375,7 +1384,8 @@ int how;
             || !nonliving(youmonst.data) || Race_if(PM_DRAUGR)) {
             Your("medallion %s!", !Blind ? "glows white-hot"
                                          : "sears your neck");
-            You("hear manic laughter in the distance...");
+            if (!Deaf)
+                You("hear manic laughter in the distance...");
             Your("medallion turns to ash!");
             if (uamul->cursed)
                 pline("It appears your luck has run out...");
@@ -1421,7 +1431,10 @@ int how;
     /* explore and wizard modes offer player the option to keep playing */
     if (!survive && (wizard || discover) && how <= GENOCIDED
         && !paranoid_query(ParanoidDie, "Die?")) {
-        pline("OK, so you don't %s.", (how == CHOKING) ? "choke" : "die");
+        pline("OK, so you don't %s.",
+              (how == CHOKING) ? "choke"
+                               : (how == DECAPITATED) ? "lose your head"
+                                                      : "die");
         iflags.last_msg = PLNMSG_OK_DONT_DIE;
         savelife(how);
         ukiller = (struct monst*) 0;

src/mhitu.c

@@ -2487,7 +2487,7 @@ register struct attack *mattk;
                 killer.format = NO_KILLER_PREFIX;
                 Sprintf(killer.name, "decapitated by %s",
                         an(l_monnam(mtmp)));
-                done(DIED);
+                done(DECAPITATED);
             }
             dmg = 0;
         }

src/topten.c

@@ -106,8 +106,8 @@ boolean incl_helpless;
         "killed by ", "choked on ", "poisoned by ", "died of ",
         /* DROWNING, BURNING, DISSOLVED, CRUSHING, */
         "drowned in ", "burned by ", "dissolved in ", "crushed to death by ",
-        /* STONING, TURNED_SLIME, GENOCIDED, */
-        "petrified by ", "turned to slime by ", "killed by ",
+        /* STONING, TURNED_SLIME, DECAPITATED, GENOCIDED, */
+        "petrified by ", "turned to slime by ", "decapitated by ", "killed by ",
         /* PANICKED, TRICKED, QUIT, ESCAPED, ASCENDED */
         "", "", "", "", ""
     };
@@ -1076,6 +1076,8 @@ boolean so;
             Strcat(linebuf, "was crushed to death");
         } else if (!strncmp(t1->death, "petrified by ", 13)) {
             Strcat(linebuf, "turned to stone");
+        } else if (!strncmp(t1->death, "decapitated by ", 15)) {
+            Strcat(linebuf, "decapitated");
         } else
             Strcat(linebuf, "died");