eating amulet of unchanging redux

To keep this from growing beyond this targeted change, make eating an
amulet of unchanging "un"change you, unless you're also wearing one.

diff --git a/doc/fixes34.3 b/doc/fixes34.3
index c4701d5b3c527572eef29ffc3bfd4423a16e5377..1628d9f2ec13b599a8bc3adc88990381ad55ae8c 100644 (file)
--- a/doc/fixes34.3
+++ b/doc/fixes34.3
@@ -46,7 +46,7 @@ be more consistent with sounds when dropping into water
 surface() returns "bottom" when Underwater
 bill for all discarded, opened tins
 monsters that cannot pick things up cannot throw things either
-eating an amulet of unchanging removes intrinsic polymorph
+eating an amulet of unchanging un-changes you
 Vlad won't waste time trying to use wand of digging in his own tower
 non-weapon iron objects should rust when dipped in fountains since
        iron weapons rust

diff --git a/src/eat.c b/src/eat.c
index 447608782537cd2399714fb043095d50df13e7e0..314cf92db2b45ab1a7963bdcbbecabedc62de613 100644 (file)
--- a/src/eat.c
+++ b/src/eat.c
@@ -1543,10 +1543,11 @@ struct obj *otmp;
                context.botl = 1;
                break;
            case AMULET_OF_UNCHANGING:
-               /* remove intrinsic polymorph only */
-               if (HPolymorph & INTRINSIC) {
-                   HPolymorph &= ~INTRINSIC;
+               /* un-change: it's a pun */
+               if (!Unchanging && Upolyd) {
                    accessory_has_effect(otmp);
+                   makeknown(typ);
+                   rehumanize();
                }
                break;
            case AMULET_OF_STRANGULATION: /* bad idea! */