Skip to content

Commit

Permalink
Revert "Cursed amulet of life saving affects monsters the same way as…
Browse files Browse the repository at this point in the history
… it will the player."

This reverts commit 4abb8b8.
  • Loading branch information
elunna committed Sep 23, 2023
1 parent 3f66520 commit 6bb2136
Showing 1 changed file with 12 additions and 28 deletions.
40 changes: 12 additions & 28 deletions src/mon.c
Original file line number Diff line number Diff line change
Expand Up @@ -3434,35 +3434,19 @@ struct monst *mtmp;
* to show this for a long worm with only a tail visible.
* Nor do you check invisibility, because glowing and
* disintegrating amulets are always visible. */
if (lifesave->cursed) {
if (cansee(mtmp->mx, mtmp->my)) {
pline("But wait...");
pline("%s medallion glows white-hot!", s_suffix(Monnam(mtmp)));
makeknown(AMULET_OF_LIFE_SAVING);
}
if (!Deaf)
You_hear("diabolical laughter in the distance...");
pline("%s dies!", Monnam(mtmp));
if (cansee(mtmp->mx, mtmp->my))
pline_The("medallion crumbles to dust!");
m_useup(mtmp, lifesave);
mtmp->mhp = 0;
return;
} else {
if (cansee(mtmp->mx, mtmp->my)) {
pline("But wait...");
pline("%s medallion begins to glow!", s_suffix(Monnam(mtmp)));
makeknown(AMULET_OF_LIFE_SAVING);
/* amulet is visible, but monster might not be */
if (canseemon(mtmp)) {
if (attacktype(mtmp->data, AT_EXPL)
|| attacktype(mtmp->data, AT_BOOM))
pline("%s reconstitutes!", Monnam(mtmp));
else
pline("%s looks much better!", Monnam(mtmp));
}
pline_The("medallion crumbles to dust!");
if (cansee(mtmp->mx, mtmp->my)) {
pline("But wait...");
pline("%s medallion begins to glow!", s_suffix(Monnam(mtmp)));
makeknown(AMULET_OF_LIFE_SAVING);
/* amulet is visible, but monster might not be */
if (canseemon(mtmp)) {
if (attacktype(mtmp->data, AT_EXPL)
|| attacktype(mtmp->data, AT_BOOM))
pline("%s reconstitutes!", Monnam(mtmp));
else
pline("%s looks much better!", Monnam(mtmp));
}
pline_The("medallion crumbles to dust!");
}
m_useup(mtmp, lifesave);
/* equip replacement amulet, if any, on next move */
Expand Down

0 comments on commit 6bb2136

Please sign in to comment.