U638 Juiblex's "moat"

> NetHack feedback form submitted by
> <email deleted>
> on Tuesday, September 9, 2003 at 06:41:34
> Hi, Just thought I'd point out a sort of inappropriate word
> choice or typo that I came across in Juiblex's Swamp. I got this
> message, after pushing a boulder into the swamp: There is a large
> splash as the boulder falls into the moat. Obviously it's a swamp
> and not a moat so that sounds a bit wrong. It says the same sort
> of thing when I #dip a scroll in the swamp as well.

src/do.c

@@ -55,7 +55,7 @@ boolean pushing;
 	    impossible("Not a boulder?");
 	else if (!Is_waterlevel(&u.uz) && (is_pool(rx,ry) || is_lava(rx,ry))) {
 	    boolean lava = is_lava(rx,ry), fills_up;
-	    const char *what = lava ? "lava" : "water";
+	    const char *what = waterbody_name(rx,ry);
 	    schar ltyp = levl[rx][ry].typ;
 	    int chance = rn2(10);		/* water: 90%; lava: 10% */
 	    fills_up = lava ? chance == 0 : chance != 0;
@@ -88,8 +88,7 @@ boolean pushing;
 
 			There("is a large splash as %s %s the %s.",
 			      the(xname(otmp)), fills_up? "fills":"falls into",
-			      lava ? "lava" : ltyp==POOL ? "pool" :
-			      moat ? "moat" : "water");
+			      what);
 		    } else if (flags.soundok)
 			You_hear("a%s splash.", lava ? " sizzling" : "");
 		    wake_nearto(rx, ry, 40);

src/mkmaze.c

@@ -1144,6 +1144,34 @@ register int fd;
 	was_waterlevel = TRUE;
 }
 
+const char *waterbody_name(x, y)
+xchar x,y;
+{
+	register struct rm *lev;
+	schar ltyp;
+
+	if (!isok(x,y))
+		return "drink";		/* should never happen */
+	lev = &levl[x][y];
+	ltyp = lev->typ;
+
+	if (is_lava(x,y))
+		return "lava";
+	else if (ltyp == ICE ||
+		 (ltyp == DRAWBRIDGE_UP &&
+		  (levl[x][y].drawbridgemask & DB_UNDER) == DB_ICE))
+		return "ice";
+	else if (((ltyp != POOL) && (ltyp != WATER) &&
+	  !Is_medusa_level(&u.uz) && !Is_waterlevel(&u.uz) && !Is_juiblex_level(&u.uz)) ||
+	   (ltyp == DRAWBRIDGE_UP && (levl[x][y].drawbridgemask & DB_UNDER) == DB_MOAT))
+		return "moat";
+	else if ((ltyp != POOL) && (ltyp != WATER) && Is_juiblex_level(&u.uz))
+		return "swamp";
+	else if (ltyp == POOL)
+		return "pool of water";
+	else return "water";
+}
+
 STATIC_OVL void
 set_wportal()
 {

src/potion.c

@@ -1542,7 +1542,7 @@ dodip()
 			return(1);
 		}
 	} else if (is_pool(u.ux,u.uy)) {
-		tmp = (here == POOL) ? "pool" : "moat";
+		tmp = waterbody_name(u.ux,u.uy);
 		Sprintf(qbuf, "Dip it into the %s?", tmp);
 		if (yn(qbuf) == 'y') {
 		    if (Levitation) {