From: arromdee <arromdee>
Date: Wed, 6 Feb 2002 05:11:25 +0000 (+0000)
Subject: salamanders
X-Git-Tag: MOVE2GIT~3246
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9aa253c8abee1a518d338ad8283ebd848968786c;p=nethack

salamanders
If salamanders are made immune to slime, then all the other places in the
code which check for fire creatures should be modified too.
---

diff --git a/src/eat.c b/src/eat.c
index 7de3a5159..369c1e47d 100644
--- 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;
diff --git a/src/mhitm.c b/src/mhitm.c
index 8dfc1b203..fbfef17de 100644
--- a/src/mhitm.c
+++ b/src/mhitm.c
@@ -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);
diff --git a/src/mhitu.c b/src/mhitu.c
index 0905888b6..a1db55259 100644
--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -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;
diff --git a/src/polyself.c b/src/polyself.c
index 88e226f5b..f47e1f060 100644
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -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;
diff --git a/src/uhitm.c b/src/uhitm.c
index 9c8e56e43..f81bc79d2 100644
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -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);