From: PatR <rankin@nethack.org>
Date: Sat, 21 Mar 2020 02:01:34 +0000 (-0700)
Subject: praying on unaligned altar outside Gehennom
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abb492007e092c6720dd44fc8a63846d8875eb25;p=nethack

praying on unaligned altar outside Gehennom

From a reddit thread, praying on the altar in orctown behaved like an
ordinary prayer directed at Moloch rather than being an exceptional
event.  Make it always be rejected.  The penalty is very trivial.
---

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index fe83d02f6..5cafc1657 100644
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -1,4 +1,4 @@
-$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.137 $ $NHDT-Date: 1584482684 2020/03/17 22:04:44 $
+$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.140 $ $NHDT-Date: 1584756090 2020/03/21 02:01:30 $
 
 General Fixes and Modified Features
 -----------------------------------
@@ -87,6 +87,8 @@ make unique swallowing monsters (Juiblex) resist magical digging from inside
 correctly account for fuel remaining when lit candles are attached
 	to candelabrum (the previous code would make the game unwinnable if
 	there were 15 or fewer turns remaining)
+praying on an unaligned altar outside of Gehennom behaved like an ordinary
+	prayer; make that always fail
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/pray.c b/src/pray.c
index b098311d4..d69db0db4 100644
--- a/src/pray.c
+++ b/src/pray.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	pray.c	$NHDT-Date: 1581322665 2020/02/10 08:17:45 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.140 $ */
+/* NetHack 3.6	pray.c	$NHDT-Date: 1584756090 2020/03/21 02:01:30 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.141 $ */
 /* Copyright (c) Benson I. Margulies, Mike Stephenson, Steve Linhart, 1989. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1323,8 +1323,8 @@ register struct obj *otmp;
 int
 dosacrifice()
 {
-    static NEARDATA const char cloud_of_smoke[] =
-        "A cloud of %s smoke surrounds you...";
+    static NEARDATA const char
+        cloud_of_smoke[] = "A cloud of %s smoke surrounds you...";
     register struct obj *otmp;
     int value = 0, pm;
     boolean highaltar;
@@ -1605,8 +1605,7 @@ dosacrifice()
                  "So, mortal!  You dare desecrate my High Temple!");
         /* Throw everything we have at the player */
         god_zaps_you(altaralign);
-    } else if (value
-               < 0) { /* I don't think the gods are gonna like this... */
+    } else if (value < 0) { /* don't think the gods are gonna like this... */
         gods_upset(altaralign);
     } else {
         int saved_anger = u.ugangr;
@@ -1800,7 +1799,8 @@ boolean praying; /* false means no messages should be given */
     g.p_aligntyp = on_altar() ? a_align(u.ux, u.uy) : u.ualign.type;
     g.p_trouble = in_trouble();
 
-    if (is_demon(g.youmonst.data) && (g.p_aligntyp != A_CHAOTIC)) {
+    if (is_demon(g.youmonst.data) /* ok if chaotic or none (Moloch) */
+        && (g.p_aligntyp == A_LAWFUL || g.p_aligntyp != A_NEUTRAL)) {
         if (praying)
             pline_The("very idea of praying to a %s god is repugnant to you.",
                       g.p_aligntyp ? "lawful" : "neutral");
@@ -1817,9 +1817,11 @@ boolean praying; /* false means no messages should be given */
     else
         alignment = u.ualign.record;
 
-    if ((g.p_trouble > 0) ? (u.ublesscnt > 200)      /* big trouble */
-           : (g.p_trouble < 0) ? (u.ublesscnt > 100) /* minor difficulties */
-              : (u.ublesscnt > 0))                 /* not in trouble */
+    if (g.p_aligntyp == A_NONE) /* praying to Moloch */
+        g.p_type = -2;
+    else if ((g.p_trouble > 0) ? (u.ublesscnt > 200) /* big trouble */
+             : (g.p_trouble < 0) ? (u.ublesscnt > 100) /* minor difficulties */
+               : (u.ublesscnt > 0))                  /* not in trouble */
         g.p_type = 0;                     /* too soon... */
     else if ((int) Luck < 0 || u.ugangr || alignment < 0)
         g.p_type = 1; /* too naughty... */
@@ -1888,7 +1890,20 @@ prayer_done() /* M. Stephenson (1.0.3b) */
     aligntyp alignment = g.p_aligntyp;
 
     u.uinvulnerable = FALSE;
-    if (g.p_type == -1) {
+    if (g.p_type == -2) {
+        /* praying at an unaligned altar, not necessarily in Gehennom */
+        You("%s diabolical laughter all around you...",
+            !Deaf ? "hear" : "intuit");
+        wake_nearby();
+        adjalign(-2);
+        exercise(A_WIS, FALSE);
+        if (!Inhell) {
+            /* hero's god[dess] seems to be keeping his/her head down */
+            pline("Nothing else happens."); /* not actually true... */
+            return 1;
+        } /* else use regular Inhell result below */
+    } else if (g.p_type == -1) {
+        /* praying while poly'd into an undead creature while non-chaotic */
         godvoice(alignment,
                  (alignment == A_LAWFUL)
                     ? "Vile creature, thou durst call upon me?"