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

Avoid "It turns into [Name]" on vamp engulf

Browse Source 
Apply a similar fix as a791b4b and f441696 ended up settling on for
normal vampire transformation to the vampire transformation that happens
when their shapeshifted form is engulfed.
This commit is contained in:
Michael Meyer
2023-02-20 12:44:43 -08:00
committed by PatR
parent c2ec99ecf1
commit 3be8e9447e
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mhitm.c
+7 -2
View File
@@ -784,8 +784,13 @@ gulpmm(
using that would be excessively verbose */ using that would be excessively verbose */
pline("%s expels %s.", Monnam(magr), pline("%s expels %s.", Monnam(magr),
canspotmon(mdef) ? "it" : something); canspotmon(mdef) ? "it" : something);
if (canspotmon(mdef)) if (canspotmon(mdef)) {
pline("It turns into %s.", a_monnam(mdef)); pline("It turns into %s.",
x_monnam(mdef, ARTICLE_A, (char *) 0,
(SUPPRESS_NAME | SUPPRESS_IT
| SUPPRESS_INVISIBLE), FALSE));
}
} }
return MM_HIT; /* bypass mdamagem() */ return MM_HIT; /* bypass mdamagem() */
} }
src/uhitm.c
+10 -3
View File
@@ -4587,10 +4587,17 @@ gulpum(struct monst *mdef, struct attack *mattk)
&& newcham(mdef, &mons[mdef->cham], NO_NC_FLAGS)) { && newcham(mdef, &mons[mdef->cham], NO_NC_FLAGS)) {
You("%s it, then %s it.", u_digest ? "swallow" : "engulf", You("%s it, then %s it.", u_digest ? "swallow" : "engulf",
expel_verb); expel_verb);
if (canspotmon(mdef)) if (canspotmon(mdef)) {
pline("It turns into %s.", a_monnam(mdef)); /* Avoiding a_monnam here: if the target is named, it gives us
else a sequence like "You bite Dracula. You swallow it, then
regurgitate it. It turns into Dracula." */
pline("It turns into %s.",
x_monnam(mdef, ARTICLE_A, (char *) 0,
(SUPPRESS_NAME | SUPPRESS_IT
| SUPPRESS_INVISIBLE), FALSE));
} else {
map_invisible(mdef->mx, mdef->my); map_invisible(mdef->mx, mdef->my);
}
return MM_HIT; return MM_HIT;
} }