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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-09-28 20:23:05 -04:00
parent 5a6d70a952 da6c393e43
commit c26914bb55
5 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/artifact.c
View File

@@ -983,10 +983,10 @@ boolean vis; /* whether the action can be seen */
char *hittee; /* target's name: "you" or mon_nam(mdef) */
{
struct permonst *old_uasmon;
const char *verb, *fakename;
const char *verb;
boolean youattack = (magr == &g.youmonst), youdefend = (mdef == &g.youmonst),
resisted = FALSE, do_stun, do_confuse, result;
int attack_indx, scare_dieroll = MB_MAX_DIEROLL / 2;
int attack_indx, fakeidx, scare_dieroll = MB_MAX_DIEROLL / 2;
result = FALSE; /* no message given yet */
/* the most severe effects are less likely at higher enchantment */
@@ -1126,13 +1126,13 @@ char *hittee; /* target's name: "you" or mon_nam(mdef) */
mdef->mconf = 1;
}
/* now give message(s) describing side-effects;
don't let vtense() be fooled by assigned name ending in 's' */
fakename = youdefend ? "you" : "mon";
/* now give message(s) describing side-effects; Use fakename
so vtense() won't be fooled by assigned name ending in 's' */
fakeidx = youdefend ? 1 : 0;
if (youattack || youdefend || vis) {
(void) upstart(hittee); /* capitalize */
if (resisted) {
pline("%s %s!", hittee, vtense(fakename, "resist"));
pline("%s %s!", hittee, vtense(fakename[fakeidx], "resist"));
shieldeff(youdefend ? u.ux : mdef->mx,
youdefend ? u.uy : mdef->my);
}
@@ -1146,7 +1146,7 @@ char *hittee; /* target's name: "you" or mon_nam(mdef) */
Strcat(buf, " and ");
if (do_confuse)
Strcat(buf, "confused");
pline("%s %s %s%c", hittee, vtense(fakename, "are"), buf,
pline("%s %s %s%c", hittee, vtense(fakename[fakeidx], "are"), buf,
(do_stun && do_confuse) ? '!' : '.');
}
}