glob floor merge message

Make it more obvious that globs that just merged on the
floor may be at an adjacent location.
This commit is contained in:
nhmall
2019-05-17 11:44:39 -04:00
parent 4201c21d23
commit 53f208c48b

View File

@@ -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 {