From: PatR Date: Sun, 14 Mar 2021 22:18:24 +0000 (-0700) Subject: genocide failure for already genocided creature X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73efacb2bc87af9cee2404c1182822256d954b4e;p=nethack genocide failure for already genocided creature Reported seven years ago: when class genoicde (blessed scroll) attempts to genocide something that has already been wiped out |All foos are already nonexistent. should be simplified to |Foos are already nonexistent. I think the redundant "All" was just there to avoid capitalization handling for the monster species but that's trivial to deal with. --- diff --git a/doc/fixes37.0 b/doc/fixes37.0 index ed77deac7..3ad38a9ae 100644 --- a/doc/fixes37.0 +++ b/doc/fixes37.0 @@ -1,4 +1,4 @@ -NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.474 $ $NHDT-Date: 1615759956 2021/03/14 22:12:36 $ +NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.475 $ $NHDT-Date: 1615760296 2021/03/14 22:18:16 $ General Fixes and Modified Features ----------------------------------- @@ -406,6 +406,8 @@ key parsing during options processing was inconsistent between OPTIONS=foo:k when creating a rolling boulder trap, don't place boulder on a path that starts on or passes over a pit/spiked pit, hole/trap door, teleport trap/level teleporter/magic portal +remove superfluous "All" from "All foos are already nonexistent." when blessed + genocide tries to remove something which has already been genocided Fixes to 3.7.0-x Problems that Were Exposed Via git Repository diff --git a/src/read.c b/src/read.c index 925bfa494..5489258cb 100644 --- a/src/read.c +++ b/src/read.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 read.c $NHDT-Date: 1613870658 2021/02/21 01:24:18 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.219 $ */ +/* NetHack 3.7 read.c $NHDT-Date: 1615760296 2021/03/14 22:18:16 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.220 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2133,7 +2133,7 @@ do_class_genocide(void) } } else if (g.mvitals[i].mvflags & G_GENOD) { if (!gameover) - pline("All %s are already nonexistent.", nam); + pline("%s are already nonexistent.", upstart(nam)); } else if (!gameover) { /* suppress feedback about quest beings except for those applicable to our own role */