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").
This commit is contained in:
@@ -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
|
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
|
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
|
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
|
only list known blank scrolls and known blank spellbooks as likely candidates
|
||||||
when choosing an item to write on for applied magic marker
|
when choosing an item to write on for applied magic marker
|
||||||
make status hilites use same color names as menucolors
|
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
|
override MSGTYPE=norep while executing the ':' command
|
||||||
if a chameleon took vampire form, it would stop periodically changing shape
|
if a chameleon took vampire form, it would stop periodically changing shape
|
||||||
corpses obtained from tipping an ice box wouldn't rot away
|
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
|
Platform- and/or Interface-Specific Fixes
|
||||||
|
|||||||
@@ -1109,11 +1109,12 @@ boolean at_stairs, falling, portal;
|
|||||||
{
|
{
|
||||||
int fd, l_idx;
|
int fd, l_idx;
|
||||||
xchar new_ledger;
|
xchar new_ledger;
|
||||||
boolean cant_go_back, up = (depth(newlevel) < depth(&u.uz)),
|
boolean cant_go_back, great_effort,
|
||||||
newdungeon = (u.uz.dnum != newlevel->dnum),
|
up = (depth(newlevel) < depth(&u.uz)),
|
||||||
was_in_W_tower = In_W_tower(u.ux, u.uy, &u.uz),
|
newdungeon = (u.uz.dnum != newlevel->dnum),
|
||||||
familiar = FALSE;
|
was_in_W_tower = In_W_tower(u.ux, u.uy, &u.uz),
|
||||||
boolean new = FALSE; /* made a new level? */
|
familiar = FALSE,
|
||||||
|
new = FALSE; /* made a new level? */
|
||||||
struct monst *mtmp;
|
struct monst *mtmp;
|
||||||
char whynot[BUFSZ];
|
char whynot[BUFSZ];
|
||||||
char *annotation;
|
char *annotation;
|
||||||
@@ -1314,11 +1315,13 @@ boolean at_stairs, falling, portal;
|
|||||||
u_on_dnstairs();
|
u_on_dnstairs();
|
||||||
/* you climb up the {stairs|ladder};
|
/* you climb up the {stairs|ladder};
|
||||||
fly up the stairs; fly up along the ladder */
|
fly up the stairs; fly up along the ladder */
|
||||||
pline("%s %s up%s the %s.",
|
great_effort = (Punished && !Levitation);
|
||||||
(Punished && !Levitation) ? "With great effort you" : "You",
|
if (flags.verbose || great_effort)
|
||||||
Flying ? "fly" : "climb",
|
pline("%s %s up%s the %s.",
|
||||||
(Flying && at_ladder) ? " along" : "",
|
great_effort ? "With great effort, you" : "You",
|
||||||
at_ladder ? "ladder" : "stairs");
|
Flying ? "fly" : "climb",
|
||||||
|
(Flying && at_ladder) ? " along" : "",
|
||||||
|
at_ladder ? "ladder" : "stairs");
|
||||||
} else { /* down */
|
} else { /* down */
|
||||||
if (at_ladder)
|
if (at_ladder)
|
||||||
u_on_newpos(xupladder, yupladder);
|
u_on_newpos(xupladder, yupladder);
|
||||||
@@ -1332,8 +1335,8 @@ boolean at_stairs, falling, portal;
|
|||||||
if (flags.verbose)
|
if (flags.verbose)
|
||||||
You("fly down %s.",
|
You("fly down %s.",
|
||||||
at_ladder ? "along the ladder" : "the stairs");
|
at_ladder ? "along the ladder" : "the stairs");
|
||||||
} else if (near_capacity() > UNENCUMBERED || Punished
|
} else if (near_capacity() > UNENCUMBERED
|
||||||
|| Fumbling) {
|
|| Punished || Fumbling) {
|
||||||
You("fall down the %s.", at_ladder ? "ladder" : "stairs");
|
You("fall down the %s.", at_ladder ? "ladder" : "stairs");
|
||||||
if (Punished) {
|
if (Punished) {
|
||||||
drag_down();
|
drag_down();
|
||||||
|
|||||||
Reference in New Issue
Block a user