Merge branch 'NetHack-3.6'

src/dokick.c

@@ -1200,7 +1200,7 @@ dokick()
                       !Blind
                           ? "Muddy waste pops up from the drain"
                           : !Deaf
-                              ? "You hear a sloshing sound"
+                              ? "You hear a sloshing sound"  /* Deaf-aware */
                               : "Something splashes you in the", buf);
                 if (!(g.maploc->looted & S_LRING)) { /* once per sink */
                     if (!Blind)

src/engrave.c

@@ -757,7 +757,7 @@ doengrave()
                 }
                 Strcpy(post_engr_text,
                        (Blind && !Deaf)
-                          ? "You hear drilling!"
+                          ? "You hear drilling!"    /* Deaf-aware */
                           : Blind
                              ? "You feel tremors."
                              : IS_GRAVE(levl[u.ux][u.uy].typ)

src/hack.c

@@ -151,17 +151,35 @@ moverock()
             if (mtmp && !noncorporeal(mtmp->data)
                 && (!mtmp->mtrapped
                     || !(ttmp && is_pit(ttmp->ttyp)))) {
+                boolean deliver_part1 = FALSE;
+
                 if (Blind)
                     feel_location(sx, sy);
                 if (canspotmon(mtmp)) {
                     pline("There's %s on the other side.", a_monnam(mtmp));
+                    deliver_part1 = TRUE;
                 } else {
                     You_hear("a monster behind %s.", the(xname(otmp)));
+                    if (!Deaf)
+                        deliver_part1 = TRUE;
                     map_invisible(rx, ry);
                 }
-                if (flags.verbose)
-                    pline("Perhaps that's why %s cannot move it.",
-                          u.usteed ? y_monnam(u.usteed) : "you");
+                if (flags.verbose) {
+                    char you_or_steed[BUFSZ];
+
+                    Strcpy(you_or_steed,
+                           u.usteed ? y_monnam(u.usteed) : "you");
+                    pline("%s%s cannot move %s.",
+                          deliver_part1
+                              ? "Perhaps that's why "
+                              : "",
+                          deliver_part1
+                              ? you_or_steed
+                              : upstart(you_or_steed),
+                          deliver_part1
+                              ? "it"
+                              : the(xname(otmp)));
+                }
                 goto cannot_push;
             }
 

src/mcastu.c

@@ -72,7 +72,7 @@ boolean undirected;
         pline("%s points %s.", Monnam(mtmp), point_msg);
     } else if ((!(g.moves % 4) || !rn2(4))) {
         if (!Deaf)
-            Norep("You hear a mumbled curse.");
+            Norep("You hear a mumbled curse.");   /* Deaf-aware */
     }
 }
 

src/mkmaze.c

@@ -1361,7 +1361,7 @@ fumaroles()
         }
     }
     if (snd && !Deaf)
-        Norep("You hear a %swhoosh!", loud ? "loud " : "");
+        Norep("You hear a %swhoosh!", loud ? "loud " : "");  /* Deaf-aware */
 }
 
 /*

src/mon.c

@@ -3771,7 +3771,7 @@ boolean msg;      /* "The oldmon turns into a newmon!" */
     /* take on the new form... */
     set_mon_data(mtmp, mdat);
 
-    if (!leashable(mtmp))
+    if (mtmp->mleashed && !leashable(mtmp))
         m_unleash(mtmp, TRUE);
 
     if (emits_light(olddata) != emits_light(mtmp->data)) {

src/music.c

@@ -171,7 +171,8 @@ struct monst *bugler; /* monster that played instrument */
             if (canseemon(mtmp))
                 pline("%s is now ready for battle!", Monnam(mtmp));
             else if (!Deaf)
-                Norep("You hear the rattle of battle gear being readied.");
+                Norep("%s the rattle of battle gear being readied.",
+                      "You hear");  /* Deaf-aware */
         } else if ((distm = ((bugler == &g.youmonst)
                                  ? distu(mtmp->mx, mtmp->my)
                                  : dist2(bugler->mx, bugler->my, mtmp->mx,

src/pline.c

@@ -357,7 +357,7 @@ VA_DECL(const char *, line)
     else if (Unaware)
         YouPrefix(tmp, "You dream that you hear ", line);
     else
-        YouPrefix(tmp, "You hear ", line);
+        YouPrefix(tmp, "You hear ", line);  /* Deaf-aware */
     vpline(strcat(tmp, line), VA_ARGS);
     VA_END();
 }

src/potion.c

@@ -1,4 +1,4 @@
-/* NetHack 3.6	potion.c	$NHDT-Date: 1570235292 2019/10/05 00:28:12 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.163 $ */
+/* NetHack 3.6	potion.c	$NHDT-Date: 1572887644 2019/11/04 17:14:04 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.164 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2013. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -1265,6 +1265,15 @@ const char *objphrase; /* "Your widget glows" or "Steed's saddle glows" */
                 pline("%s %s.", objphrase, glowcolor);
             iflags.last_msg = PLNMSG_OBJ_GLOWS;
             targobj->bknown = !Hallucination;
+        } else {
+            /* didn't see what happened:  forget the BUC state if that was
+               known unless the bless/curse state of the water is known;
+               without this, hero would know the new state even without
+               seeing the glow; priest[ess] will immediately relearn it */
+            if (!potion->bknown || !potion->dknown)
+                targobj->bknown = 0;
+            /* [should the bknown+dknown exception require that water
+               be discovered or at least named?] */
         }
         /* potions of water are the only shop goods whose price depends
            on their curse/bless state */

src/shk.c

@@ -2984,7 +2984,7 @@ boolean peaceful, silent;
                 Norep("%s booms: \"%s, you are a thief!\"",
                       Shknam(shkp), g.plname);
             } else if (!Deaf) {
-                Norep("You hear a scream, \"Thief!\"");
+                Norep("You hear a scream, \"Thief!\"");  /* Deaf-aware */
             }
         }
         hot_pursuit(shkp);

src/trap.c

@@ -2624,7 +2624,8 @@ register struct monst *mtmp;
                       a_your[trap->madeby_u]);
             }
             if (!in_sight && !Deaf)
-                pline("Kaablamm!  You hear an explosion in the distance!");
+                pline("Kaablamm!  %s an explosion in the distance!",
+                      "You hear");  /* Deaf-aware */
             blow_up_landmine(trap);
             /* explosion might have destroyed a drawbridge; don't
                dish out more damage if monster is already dead */

src/zap.c

@@ -4434,7 +4434,7 @@ short exploding_wand_typ;
             melt_ice(x, y, (char *) 0);
         } else if (is_pool(x, y)) {
             const char *msgtxt = (!Deaf)
-                                     ? "You hear hissing gas."
+                                     ? "You hear hissing gas." /* Deaf-aware */
                                      : "That seemed remarkably uneventful.";
 
             if (lev->typ != POOL) { /* MOAT or DRAWBRIDGE_UP */