Draugr and critical hits from Sunsword/The Hammer of the Gods.

If a monster is wielding either Sunsword or the Hammer of the Gods, and
they land a critical hit on a Draugr player, they'll be incinerated just
like any other undead monster, and will not be able to revive.

Author: k21971

doc/evilhack-changelog.md

@@ -3424,4 +3424,5 @@ The following changes to date are:
 - New conduct: never acquired reflection
 - New race: Draugr
 - Revival routine for Draugr race
+- Draugr and critical hits from Sunsword/The Hammer of the Gods
 

include/artilist.h

@@ -186,9 +186,9 @@ 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,
-      PHYS(5, 0), DFNS(AD_BLND), NO_CARY, 0, A_LAWFUL, NON_PM, NON_PM, 2500L,
-      NO_COLOR, GEMSTONE),
+    A("Sunsword", LONG_SWORD, (SPFX_RESTR | SPFX_WARN | SPFX_DFLAGH),
+      0, (MH_UNDEAD | MH_DRAUGR), 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
      *      Meant to be wielded by Vlad. Enjoy the buff Vlad ;)
@@ -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),
+       | SPFX_INTEL | SPFX_DFLAGH), 0, (MH_DEMON | MH_UNDEAD | MH_DRAUGR),
       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
@@ -502,9 +502,9 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
       2500L, NO_COLOR, DEFAULT_MAT),
 
     A("The Mitre of Holiness", HELM_OF_BRILLIANCE,
-      (SPFX_NOGEN | SPFX_RESTR | SPFX_DFLAGH | SPFX_INTEL | SPFX_PROTECT), 0,
-      MH_UNDEAD, NO_ATTK, NO_DFNS, CARY(AD_FIRE), ENERGY_BOOST, A_LAWFUL,
-      PM_PRIEST, NON_PM, 2000L, NO_COLOR, METAL),
+      (SPFX_NOGEN | SPFX_RESTR | SPFX_DFLAGH | SPFX_INTEL | SPFX_PROTECT),
+      0, (MH_UNDEAD | MH_DRAUGR), 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',
        otherwise rangers will receive the Longbow of Diana. Exact same properties

include/hack.h

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

src/artifact.c

@@ -2615,9 +2615,15 @@ int dieroll; /* needed for Magicbane and vorpal blades */
                               mon_nam(mdef));
                     mongone(mdef);
                 }
-            } else if (youdefend && is_undead(youmonst.data) && k) {
+            } else if (youdefend
+                       && (is_undead(youmonst.data)
+                           || maybe_polyd(is_draugr(youmonst.data), Race_if(PM_DRAUGR)))
+                       && k) {
                 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;
+                Sprintf(killer.name, "incinerated by %s", xname(otmp));
+                done(INCINERATED);
                 /* player returns to their original form */
             } else
                 return FALSE;
@@ -2730,9 +2736,14 @@ int dieroll; /* needed for Magicbane and vorpal blades */
                 pline("The Hammer of the Gods shines brilliantly, destroying you!");
                 *dmgptr = (2 * (Upolyd ? u.mh : u.uhp) + FATAL_DAMAGE_MODIFIER);
                 /* player returns to their original form if poly'd */
-            } else if (youdefend && is_undead(youmonst.data) && k) {
+            } else if (youdefend && k
+                       && (is_undead(youmonst.data)
+                           || maybe_polyd(is_draugr(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;
+                Sprintf(killer.name, "incinerated by %s", the(xname(otmp)));
+                done(INCINERATED);
                 /* player returns to their original form */
             } else
                 return FALSE;

src/end.c

@@ -315,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", "decapitated", "genocided", "panic", "trickery",
-    "quit", "escaped", "ascended"
+    "turned into slime", "decapitated", "incinerated", "genocided",
+    "panic", "trickery", "quit", "escaped", "ascended"
 };
 
 static NEARDATA const char *ends[] = {
@@ -326,7 +326,8 @@ static NEARDATA const char *ends[] = {
     "dissolved in the lava",
     "were crushed", "turned to stone",
     "turned into slime", "were decapitated",
-    "were genocided", "panicked", "were tricked",
+    "were incinerated", "were genocided",
+    "panicked", "were tricked",
     "quit", "escaped", "ascended"
 };
 
@@ -1360,6 +1361,8 @@ int how;
         } 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 (how == INCINERATED) { /* nothing to revive */
+            pline("Unfortunately there's nothing left to revive...");
         } 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

src/topten.c

@@ -106,8 +106,10 @@ 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, DECAPITATED, GENOCIDED, */
-        "petrified by ", "turned to slime by ", "decapitated by ", "killed by ",
+        /* STONING, TURNED_SLIME, DECAPITATED, */
+        "petrified by ", "turned to slime by ", "decapitated by ",
+        /* INCINERATED, GENOCIDED, */
+        "incinerated by ", "killed by ",
         /* PANICKED, TRICKED, QUIT, ESCAPED, ASCENDED */
         "", "", "", "", ""
     };
@@ -1078,6 +1080,8 @@ boolean so;
             Strcat(linebuf, "turned to stone");
         } else if (!strncmp(t1->death, "decapitated by ", 15)) {
             Strcat(linebuf, "decapitated");
+        } else if (!strncmp(t1->death, "incinerated by ", 15)) {
+            Strcat(linebuf, "incinerated");
         } else
             Strcat(linebuf, "died");