From 6bb2136266ba2822ab4bbb07199b6e79f2d3f966 Mon Sep 17 00:00:00 2001 From: Erik Lunna Date: Sat, 23 Sep 2023 12:45:13 +0200 Subject: [PATCH] Revert "Cursed amulet of life saving affects monsters the same way as it will the player." This reverts commit 4abb8b88645f23e1275f25bfb5f6b5a235a182d0. --- src/mon.c | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/src/mon.c b/src/mon.c index 7def2976a..a2a187714 100644 --- a/src/mon.c +++ b/src/mon.c @@ -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 */