From 53f208c48b1674cae841c639177cca4c7d00e694 Mon Sep 17 00:00:00 2001 From: nhmall Date: Fri, 17 May 2019 11:44:39 -0400 Subject: [PATCH] glob floor merge message Make it more obvious that globs that just merged on the floor may be at an adjacent location. --- src/mkobj.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mkobj.c b/src/mkobj.c index 2da16391a..b88bc25a2 100644 --- a/src/mkobj.c +++ b/src/mkobj.c @@ -2837,7 +2837,12 @@ struct obj *otmp2; * they'll be out of our view (minvent or container) * so don't actually show anything */ } else if (onfloor || inpack) { - pline("The %s coalesce%s.", makeplural(obj_typename(otmp->otyp)), + boolean adj = ((otmp->ox != u.ux || otmp->oy != u.uy) && + (otmp2->ox != u.ux || otmp2->oy != u.uy)); + + pline("The %s%s coalesce%s.", + (onfloor && adj) ? "adjacent " : "", + makeplural(obj_typename(otmp->otyp)), inpack ? " inside your pack" : ""); } } else {