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

imitation spelling (trunk only)

Browse Source 
I'm not a contender to win any spelling bees.  (Mimicker does't
seem to even be a real word; I'm not sure if it ought to end in "or"
instead of "er".  But changing it to "mime" would be too weird.)
This commit is contained in:
nethack.rankin
2008-02-11 00:23:06 +00:00
parent b14eb06c69
commit 0d03958adf
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes35.0
+1 -1
View File
@@ -395,7 +395,7 @@ using F to attack wall/boulder/statue while wielding pick digs/breaks target
shapechangers shouldn't receive starting inventory of their initial shape shapechangers shouldn't receive starting inventory of their initial shape
streamline old ^X output and integrate it with enlightenment feedback; streamline old ^X output and integrate it with enlightenment feedback;
new ^X output includes expanded form of abbreviated bottom line info new ^X output includes expanded form of abbreviated bottom line info
"killed by X" becomes "killed by a chameleon immitating X" when appropriate "killed by X" becomes "killed by a chameleon imitating X" when appropriate
Platform- and/or Interface-Specific New Features Platform- and/or Interface-Specific New Features
src/end.c
+4 -4
View File
@@ -199,7 +199,7 @@ int how;
*champtr = (mtmp->cham >= LOW_PM) ? &mons[mtmp->cham] : mptr; *champtr = (mtmp->cham >= LOW_PM) ? &mons[mtmp->cham] : mptr;
boolean distorted = (boolean)(Hallucination && canspotmon(mtmp)), boolean distorted = (boolean)(Hallucination && canspotmon(mtmp)),
mimicker = (mtmp->m_ap_type == M_AP_MONSTER), mimicker = (mtmp->m_ap_type == M_AP_MONSTER),
immitator = (mptr != champtr || mimicker); imitator = (mptr != champtr || mimicker);
You((how == STONING) ? "turn to stone..." : "die..."); You((how == STONING) ? "turn to stone..." : "die...");
mark_synch(); /* flush buffered screen output */ mark_synch(); /* flush buffered screen output */
@@ -208,7 +208,7 @@ int how;
/* "killed by the high priest of Crom" is okay, /* "killed by the high priest of Crom" is okay,
"killed by the high priest" alone isn't */ "killed by the high priest" alone isn't */
if ((mptr->geno & G_UNIQ) != 0 && if ((mptr->geno & G_UNIQ) != 0 &&
!(immitator && !mimicker) && !(imitator && !mimicker) &&
!(mptr == &mons[PM_HIGH_PRIEST] && !mtmp->ispriest)) { !(mptr == &mons[PM_HIGH_PRIEST] && !mtmp->ispriest)) {
if (!type_is_pname(mptr)) if (!type_is_pname(mptr))
Strcat(buf, "the "); Strcat(buf, "the ");
@@ -224,7 +224,7 @@ int how;
if (distorted) if (distorted)
Strcat(buf, "hallucinogen-distorted "); Strcat(buf, "hallucinogen-distorted ");
if (immitator) { if (imitator) {
char shape[BUFSZ]; char shape[BUFSZ];
const char *realnm = champtr->mname, *fakenm = mptr->mname; const char *realnm = champtr->mname, *fakenm = mptr->mname;
boolean alt = is_vampshifter(mtmp); boolean alt = is_vampshifter(mtmp);
@@ -252,7 +252,7 @@ int how;
/* omit "called" to avoid excessive verbosity */ /* omit "called" to avoid excessive verbosity */
Sprintf(eos(buf), Sprintf(eos(buf),
alt ? "%s in %s form" : alt ? "%s in %s form" :
mimicker ? "%s disguised as %s" : "%s immitating %s", mimicker ? "%s disguised as %s" : "%s imitating %s",
realnm, shape); realnm, shape);
mptr = mtmp->data; /* reset for mimicker case */ mptr = mtmp->data; /* reset for mimicker case */
} else if (mptr == &mons[PM_GHOST]) { } else if (mptr == &mons[PM_GHOST]) {