U856 - cockatrice and nurses

One from the way-back machine.  A nurse would hit you-as-cockatrice repeatedly
and never turned to stone.  With this change, nurses will turn to stone (and
also don't heal cockatrices, which seems fair).  I considered giving them
gloves, but that seemed like too much effort.  There are other cases where a
monster "hits" but will not petrify.  However, it doesn't seem like passiveum
detects all the specific ways the monster "hit" you so I left them alone.

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 33aa9918f2f3ca86a88d674ca271d963e60e869a..24ef684341fc10b2804d416bef63651c329560f3 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -160,6 +160,7 @@ make changes in hallucination be reflected by changes in mimickery feedback
 add Unaware pseudo-property to suppress various messages while unconscious
 missile which kills engulfer will now be placed prior to hero's return to map
 bugles affect all monsters to some extent
+nurses are affected if player is polymorphed as a cockatrice
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/mhitu.c b/src/mhitu.c
index 798fab331dbe83572eb73d305c7e5ca9d4d09dbb..c54a98efc5f9da799f2d51826223ce20635ccb1a 100644 (file)
--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -1335,8 +1335,9 @@ dopois:
                hurtarmor(AD_DCAY);
                break;
            case AD_HEAL:
-               /* a cancelled nurse is just an ordinary monster */
-               if (mtmp->mcan) {
+               /* a cancelled nurse is just an ordinary monster,
+                * nurses don't heal those that cause petrification */
+               if (mtmp->mcan || (Upolyd && touch_petrifies(youmonst.data))) {
                    hitmsg(mtmp, mattk);
                    break;
                }