pooleffects messaging vs mention_decor

With mention_decor enabled, exiting the water on the Plane of Water
would produce the series of messages "You pop into an air bubble.  You
are back on air bubble."  Suppress the second message.  The lack of
article there seems like a problem too...

Also, acknowledge flight/levitation and use ice_descr in the pooleffects
"solid land" message.  This should make it more consistent with how
mention_decor does a similar message, especially changes to how it
describes ice based on its melt timer.
This commit is contained in:
Michael Meyer
2023-11-06 16:44:37 -05:00
committed by PatR
parent 346cd9e35b
commit 702f914306

View File

@@ -2822,11 +2822,15 @@ pooleffects(
if (!is_pool(u.ux, u.uy)) {
if (Is_waterlevel(&u.uz)) {
You("pop into an air bubble.");
iflags.last_msg = PLNMSG_BACK_ON_GROUND;
} else if (is_lava(u.ux, u.uy)) {
You("leave the %s...", hliquid("water")); /* oops! */
} else {
You("are on solid %s again.",
is_ice(u.ux, u.uy) ? "ice" : "land");
char icebuf[BUFSZ];
You("are %s %s again.",
(Levitation || Flying) ? "over" : "on",
is_ice(u.ux, u.uy) ? ice_descr(u.ux, u.uy, icebuf)
: "solid land");
iflags.last_msg = PLNMSG_BACK_ON_GROUND;
}
} else if (Is_waterlevel(&u.uz)) {