]> granicus.if.org Git - nethack/commitdiff
salamanders
authorarromdee <arromdee>
Wed, 6 Feb 2002 05:11:25 +0000 (05:11 +0000)
committerarromdee <arromdee>
Wed, 6 Feb 2002 05:11:25 +0000 (05:11 +0000)
If salamanders are made immune to slime, then all the other places in the
code which check for fire creatures should be modified too.

src/eat.c
src/mhitm.c
src/mhitu.c
src/polyself.c
src/uhitm.c

index 7de3a51593bdcfc10e661e35ffdd7039652f34c6..369c1e47dd981a5413030c91e2ae1c1e51f1fa38 100644 (file)
--- a/src/eat.c
+++ b/src/eat.c
@@ -491,6 +491,7 @@ register int pm;
                if (!Slimed && !Unchanging &&
                        youmonst.data != &mons[PM_FIRE_VORTEX] &&
                        youmonst.data != &mons[PM_FIRE_ELEMENTAL] &&
+                       youmonst.data != &mons[PM_SALAMANDER] &&
                        youmonst.data != &mons[PM_GREEN_SLIME]) {
                    You("don't feel very well.");
                    Slimed = 10L;
index 8dfc1b20370bc795270ab7c4ce0ee8594ef17f68..fbfef17deb49311aea4c4fd7df9dbfd130d7c143 100644 (file)
@@ -1018,6 +1018,7 @@ label2:                   if (mdef->mhp > 0) return 0;
            case AD_SLIM:
                if (!rn2(4) && mdef->data != &mons[PM_FIRE_VORTEX] &&
                                mdef->data != &mons[PM_FIRE_ELEMENTAL] &&
+                               mdef->data != &mons[PM_SALAMANDER] &&
                                mdef->data != &mons[PM_GREEN_SLIME]) {
                    if (vis) pline("%s turns into slime.", Monnam(mdef));
                    (void) newcham(mdef, &mons[PM_GREEN_SLIME], FALSE);
index 0905888b696dc95abbc67e78bdc140a681b3cb04..a1db552591405b1d2d063362de0e086f41273bc7 100644 (file)
@@ -1416,6 +1416,7 @@ do_stone:
                hitmsg(mtmp, mattk);
                if (!uncancelled) break;
                if (youmonst.data == &mons[PM_FIRE_VORTEX] ||
+                               youmonst.data == &mons[PM_SALAMANDER] ||
                                youmonst.data == &mons[PM_FIRE_ELEMENTAL]) {
                    pline_The("slime burns away!");
                    dmg = 0;
index 88e226f5b1a3ab4ec094c192a4298bb682914ebc..f47e1f060287b9fb8720c21ee5f9c1ff746c0da5 100644 (file)
@@ -404,7 +404,7 @@ int mntmp;
                You("no longer feel sick.");
        }
        if (Slimed) {
-           if (mntmp == PM_FIRE_VORTEX || mntmp == PM_FIRE_ELEMENTAL) {
+           if (mntmp == PM_FIRE_VORTEX || mntmp == PM_FIRE_ELEMENTAL || mntmp == PM_SALAMANDER) {
                pline_The("slime burns away!");
                Slimed = 0L;
                flags.botl = 1;
index 9c8e56e43f587bacb7defb7a8125f596e51bf027..f81bc79d21e924c13fc25cb446177d7e833fdb5f 100644 (file)
@@ -1444,6 +1444,7 @@ register struct attack *mattk;
            case AD_SLIM:
                if (!rn2(4) && mdef->data != &mons[PM_FIRE_VORTEX] &&
                                mdef->data != &mons[PM_FIRE_ELEMENTAL] &&
+                               mdef->data != &mons[PM_SALAMANDER] &&
                                mdef->data != &mons[PM_GREEN_SLIME]) {
                    You("turn %s into slime.", mon_nam(mdef));
                    (void) newcham(mdef, &mons[PM_GREEN_SLIME], FALSE);