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

github issue #475 revisited - Trollsbane

Browse Source 
Change Trollsbane versus troll corpse revival:  instead of revival
failing if Trollsbane is wielded at time of revival attempt, mark
the corpse no-revive if killed by Trollsbane (whether by the hero
or a monster).

If a no-revive corpse is within view when time to revive occurs,
give "the troll corpse twitches feebly" even when the hero isn't
responsible.  That used to only apply if the hero zapped the
corpse with undead turning, which would have become inoperative
because now being zapped by undead turning clears the no-revive
flag and revives as normal.  In other words, undead turning magic
overrides killed-by-Trollsbane or non-ice troll having been in an
ice box.
This commit is contained in:
PatR
2021-04-02 10:38:57 -07:00
parent 770afba463
commit 328dc5bdfa
11 changed files with 79 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/zap.c
View File

@@ -783,9 +783,9 @@ revive(struct obj *corpse, boolean by_hero)
x = xy.x, y = xy.y;
}
if ((mons[montype].mlet == S_EEL && !IS_POOL(levl[x][y].typ))
|| (mons[montype].mlet == S_TROLL && Trollsbane_wielded())) {
if (by_hero && cansee(x, y))
if (corpse->norevive
|| (mons[montype].mlet == S_EEL && !IS_POOL(levl[x][y].typ))) {
if (cansee(x, y))
pline("%s twitches feebly.",
upstart(corpse_xname(corpse, (const char *) 0, CXN_PFX_THE)));
return (struct monst *) 0;
@@ -961,6 +961,7 @@ unturn_dead(struct monst *mon)
struct obj *otmp, *otmp2;
struct monst *mtmp2;
char owner[BUFSZ], corpse[BUFSZ];
unsigned save_norevive;
boolean youseeit, different_type, is_u = (mon == &g.youmonst);
int corpsenm, res = 0;
@@ -987,6 +988,10 @@ unturn_dead(struct monst *mon)
/* for a stack, only one is revived; if is_u, revive() calls
useup() which calls update_inventory() but not encumber_msg() */
corpsenm = otmp->corpsenm;
/* norevive applies to revive timer, not to explicit unturn_dead() */
save_norevive = otmp->norevive;
otmp->norevive = 0;
if ((mtmp2 = revive(otmp, !g.context.mon_moving)) != 0) {
++res;
/* might get revived as a zombie rather than corpse's monster */
@@ -1005,9 +1010,13 @@ unturn_dead(struct monst *mon)
pline("%s%s suddenly %s%s%s!", owner, corpse,
nonliving(mtmp2->data) ? "reanimates" : "comes alive",
different_type ? " as " : "",
different_type ? an(pmname(mtmp2->data, Mgender(mtmp2))) : "");
different_type ? an(pmname(mtmp2->data, Mgender(mtmp2)))
: "");
else if (canseemon(mtmp2))
pline("%s suddenly appears!", Amonnam(mtmp2));
} else {
/* revival failed; corpse 'otmp' is intact */
otmp->norevive = save_norevive ? 1 : 0;
}
}
if (is_u && res)