nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

more summon nasties

Browse Source 
If the summon nasties spell creates a single monster, the feedback
changes from "Monsters appear" to "A monster appears" but if you
were invisible or displaced it still said "around".  Avoid
| A monster appears around a spot near you!
or
| A monster appears around your displaced image!
This commit is contained in:
PatR
2022-08-31 17:23:55 -07:00
parent 3862979e88
commit 282cc9383f
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mcastu.c
+11 -7
View File
@@ -409,22 +409,26 @@ cast_wizard_spell(struct monst *mtmp, int dmg, int spellnum)
impossible("bad wizard cloning?"); impossible("bad wizard cloning?");
break; break;
case MGC_SUMMON_MONS: { case MGC_SUMMON_MONS: {
int count; int count = nasty(mtmp);
count = nasty(mtmp); /* summon something nasty */ if (!count) {
if (mtmp->iswiz) { ; /* nothing was created? */
} else if (mtmp->iswiz) {
verbalize("Destroy the thief, my pet%s!", plur(count)); verbalize("Destroy the thief, my pet%s!", plur(count));
} else { } else {
const char *mappear = (count == 1) ? "A monster appears" boolean one = (count == 1);
: "Monsters appear"; const char *mappear = one ? "A monster appears"
: "Monsters appear";
/* messages not quite right if plural monsters created but /* messages not quite right if plural monsters created but
only a single monster is seen */ only a single monster is seen */
if (Invis && !perceives(mtmp->data) if (Invis && !perceives(mtmp->data)
&& (mtmp->mux != u.ux || mtmp->muy != u.uy)) && (mtmp->mux != u.ux || mtmp->muy != u.uy))
pline("%s around a spot near you!", mappear); pline("%s %s a spot near you!", mappear,
one ? "at" : "around");
else if (Displaced && (mtmp->mux != u.ux || mtmp->muy != u.uy)) else if (Displaced && (mtmp->mux != u.ux || mtmp->muy != u.uy))
pline("%s around your displaced image!", mappear); pline("%s %s your displaced image!", mappear,
one ? "by" : "around");
else else
pline("%s from nowhere!", mappear); pline("%s from nowhere!", mappear);
} }