Penalty for a chaotic Drow killing Lolth.

Now that Lolth will spawn peaceful for Drow that remain true to their
base alignment (chaotic), there's now a severe penalty for any chaotic
Drow that kill her - permanent alignment change to lawful, and a massive
ding to luck and alignment score, as well as making their new deity
pissed off (they don't like seeing one of their own being killed, even
if they are of an opposing alignment).

Author: k21971

doc/evilhack-changelog.md

@@ -3402,4 +3402,5 @@ The following changes to date are:
   riders
 - Lolth will be peaceful towards Drow players under the right
   circumstances
+- Penalty for a chaotic Drow killing Lolth
 

src/makemon.c

@@ -4059,6 +4059,9 @@ struct monst *mtmp;
             ; /* Moloch's indifference */
         else
             mtmp->malign = -20;
+    } else if (mdat == &mons[PM_LOLTH]
+               && u.ualign.type == A_CHAOTIC && Race_if(PM_DROW)) {
+        mtmp->malign = -30; /*super bad, just killed your deity */
     } else if (mal == A_NONE) {
         if (mtmp->mpeaceful)
             mtmp->malign = 0;

src/mon.c

@@ -4246,6 +4246,24 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
         change_luck(-20);
         pline("That was %sa bad idea...",
               u.uevent.qcompleted ? "probably " : "");
+    } else if (mdat == &mons[PM_LOLTH]
+               && u.ualign.type == A_CHAOTIC
+               && Race_if(PM_DROW)) { /* Super bad, just killed your deity */
+        if (canspotmon(mtmp))
+            You_feel("very guilty.");
+        else
+            You("have a vague sense of intense guilt.");
+        uchangealign(A_LAWFUL, 0); /* permanent alignment change */
+        /* even though alignment has changed and the player
+           is now bound to a different deity, they don't take
+           kindly to one of their own being killed */
+        adjalign(-(u.ualign.record + (int) ALIGNLIM / 2));
+        u.ugangr += 7; /* instantly become "extremely" angry */
+        change_luck(-20);
+        if (!Hallucination)
+            pline("That was an extremely bad idea...");
+        else
+            pline("Umm... err...");
     } else if (mndx == urole.neminum) { /* Real good! */
         if (!quest_status.killed_leader)
             adjalign((int) (ALIGNLIM / 4));

src/timeout.c

@@ -561,48 +561,53 @@ nh_timeout()
         baseluck -= 4;
 
     if (u.uluck != baseluck) {
-	int timeout = 600;
-	int time_luck = stone_luck(FALSE);
-	/* Cursed luckstones slow bad luck timing out; blessed luckstones
-	 * slow good luck timing out; normal luckstones slow both;
-	 * neither is affected if you don't have a luckstone.
+        int timeout = 600;
+        int time_luck = stone_luck(FALSE);
+
+        /* Cursed luckstones slow bad luck timing out; blessed luckstones
+         * slow good luck timing out; normal luckstones slow both;
+         * neither is affected if you don't have a luckstone.
          * Luck is based at 0 usually, +1 if a full moon and -1 on Friday 13th
          */
-	if (has_luckitem() && (!time_luck
-            || (time_luck > 0 && u.uluck > baseluck)
-            || (time_luck < 0 && u.uluck < baseluck))) {
-
-	/* The slowed timeout depends on the distance between your
-	 * luck (not including luck bonuses) and your base luck.
-	 *
-	 * distance	timeout
-	 * --------------------
-	 *  1		24800
-	 *  2		24200
-	 *  3		23200
-	 *  4		21800
-	 *  5		20000
-	 *  6		17800
-	 *  7		15200
-	 *  8		12200
-	 *  9		8800
-	 *  10		5000
-	 *  11		800
-	 */
-	int base_dist = u.uluck - baseluck;
-	int slow_timeout = 25000 - 200 * (base_dist * base_dist);
-	if (slow_timeout > timeout) timeout = slow_timeout;
-	}
-
-	if (u.uhave.amulet || u.ugangr) timeout = timeout / 2;
-
-	if (moves >= u.luckturn + timeout) {
-	    if (u.uluck > baseluck)
-		u.uluck--;
-	    else if (u.uluck < baseluck)
-		u.uluck++;
+        if (has_luckitem()
+            && (!time_luck
+                || (time_luck > 0 && u.uluck > baseluck)
+                || (time_luck < 0 && u.uluck < baseluck))) {
+
+            /* The slowed timeout depends on the distance between your
+             * luck (not including luck bonuses) and your base luck.
+             *
+             * distance     timeout
+             * --------------------
+             *  1           24800
+             *  2           24200
+             *  3           23200
+             *  4           21800
+             *  5           20000
+             *  6           17800
+             *  7           15200
+             *  8           12200
+             *  9           8800
+             *  10          5000
+             *  11          800
+             */
+            int base_dist = u.uluck - baseluck;
+            int slow_timeout = 25000 - 200 * (base_dist * base_dist);
+
+            if (slow_timeout > timeout)
+                timeout = slow_timeout;
+        }
+
+        if (u.uhave.amulet || u.ugangr)
+            timeout = timeout / 2;
+
+        if (moves >= u.luckturn + timeout) {
+            if (u.uluck > baseluck)
+                u.uluck--;
+            else if (u.uluck < baseluck)
+                u.uluck++;
             u.luckturn = moves;
-	}
+        }
     }
     if (HPasses_walls)
         phasing_dialogue();