From 49cbcdb137a139d29903be9d9315d77a353c4a97 Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Sat, 23 Jan 2016 20:16:37 -0800
Subject: [PATCH] fix #4191 - flags.verbose vs level change messages

Suppress the "you climb/fly up the stairs/ladder" message if the
'verbose' option is off (unless punishment is going to augment the
message by "with great effort").
---
 doc/fixes36.1 |  2 ++
 src/do.c      | 27 +++++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/doc/fixes36.1 b/doc/fixes36.1
index 8e8c556e6..59d97f7b5 100644
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -109,6 +109,7 @@ don't create globs of ooze/slime/pudding with bknown flag set so pre-known to
 do allow globs with same curse/bless state to merge even when that state is
 	known for one and unknown for the other; result will have bknown clear
 fix pile mark after killing a monster carrying a potion which is destroyed
+don't list suit as likely candidate for Take-off if cloak blocks it
 only list known blank scrolls and known blank spellbooks as likely candidates
 	when choosing an item to write on for applied magic marker
 make status hilites use same color names as menucolors
@@ -122,6 +123,7 @@ allow the same color names for status hilites and menucolors
 override MSGTYPE=norep while executing the ':' command
 if a chameleon took vampire form, it would stop periodically changing shape
 corpses obtained from tipping an ice box wouldn't rot away
+suppress "you climb up the stairs" message if verbose option is off
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/do.c b/src/do.c
index bab6f04a3..4b2ac5071 100644
--- a/src/do.c
+++ b/src/do.c
@@ -1109,11 +1109,12 @@ boolean at_stairs, falling, portal;
 {
     int fd, l_idx;
     xchar new_ledger;
-    boolean cant_go_back, up = (depth(newlevel) < depth(&u.uz)),
-                          newdungeon = (u.uz.dnum != newlevel->dnum),
-                          was_in_W_tower = In_W_tower(u.ux, u.uy, &u.uz),
-                          familiar = FALSE;
-    boolean new = FALSE; /* made a new level? */
+    boolean cant_go_back, great_effort,
+            up = (depth(newlevel) < depth(&u.uz)),
+            newdungeon = (u.uz.dnum != newlevel->dnum),
+            was_in_W_tower = In_W_tower(u.ux, u.uy, &u.uz),
+            familiar = FALSE,
+            new = FALSE; /* made a new level? */
     struct monst *mtmp;
     char whynot[BUFSZ];
     char *annotation;
@@ -1314,11 +1315,13 @@ boolean at_stairs, falling, portal;
                 u_on_dnstairs();
             /* you climb up the {stairs|ladder};
                fly up the stairs; fly up along the ladder */
-            pline("%s %s up%s the %s.",
-                  (Punished && !Levitation) ? "With great effort you" : "You",
-                  Flying ? "fly" : "climb",
-                  (Flying && at_ladder) ? " along" : "",
-                  at_ladder ? "ladder" : "stairs");
+            great_effort = (Punished && !Levitation);
+            if (flags.verbose || great_effort)
+                pline("%s %s up%s the %s.",
+                      great_effort ? "With great effort, you" : "You",
+                      Flying ? "fly" : "climb",
+                      (Flying && at_ladder) ? " along" : "",
+                      at_ladder ? "ladder" : "stairs");
         } else { /* down */
             if (at_ladder)
                 u_on_newpos(xupladder, yupladder);
@@ -1332,8 +1335,8 @@ boolean at_stairs, falling, portal;
                 if (flags.verbose)
                     You("fly down %s.",
                         at_ladder ? "along the ladder" : "the stairs");
-            } else if (near_capacity() > UNENCUMBERED || Punished
-                       || Fumbling) {
+            } else if (near_capacity() > UNENCUMBERED
+                       || Punished || Fumbling) {
                 You("fall down the %s.", at_ladder ? "ladder" : "stairs");
                 if (Punished) {
                     drag_down();
-- 
2.40.0